From ebe9c7b5a27a8403b59f652ac6ca11ee98c53995 Mon Sep 17 00:00:00 2001 From: Alex Stephen Date: Wed, 16 Oct 2019 10:50:16 -0700 Subject: [PATCH 1/3] with collections, no need to build deprecated facts modules --- provider/ansible.rb | 8 -------- templates/ansible/facts.erb | 9 +-------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/provider/ansible.rb b/provider/ansible.rb index 4bfca7a2e351..9554de1a8523 100644 --- a/provider/ansible.rb +++ b/provider/ansible.rb @@ -291,14 +291,6 @@ def compile_datasource(data) "plugins/modules/#{name}_info.py"), self) - # Generate symlink for old `facts` modules. - return if version_added(data.object, :facts) >= '2.9' - - deprecated_facts_path = File.join(target_folder, - "plugins/modules/_#{name}_facts.py") - return if File.exist?(deprecated_facts_path) - - File.symlink "#{name}_info.py", deprecated_facts_path end def generate_objects(output_folder, types) diff --git a/templates/ansible/facts.erb b/templates/ansible/facts.erb index a7b16bbffc23..c7d7506672c4 100644 --- a/templates/ansible/facts.erb +++ b/templates/ansible/facts.erb @@ -26,9 +26,7 @@ DOCUMENTATION = ''' --- <%= ansible_style_yaml({ 'module' => "#{module_name(object)}_info", - 'description' => ["Gather info for GCP #{object.name}", - (version_added(object, :facts) < '2.9' ? "This module was called C(#{module_name(object)}_facts) before Ansible 2.9. The usage has not changed." : nil) - ].compact, + 'description' => ["Gather info for GCP #{object.name}"], 'short_description' => "Gather info for GCP #{object.name}", 'version_added' => version_added(object, :facts), 'author' => "Google Inc. (@googlecloudplatform)", @@ -91,11 +89,6 @@ def main(): })), 12) -%> ) -<% if version_added(object, :facts) < '2.9' -%> - - if module._name == '<%= module_name(object) -%>_facts': - module.deprecate("The '<%= module_name(object) -%>_facts' module has been renamed to '<%= module_name(object) -%>_info'", version='2.13') -<% end -%> if not module.params['scopes']: module.params['scopes'] = <%= python_literal(object.__product.scopes) %> From 628a399857dce38ccb37644422800b4173c73699 Mon Sep 17 00:00:00 2001 From: Alex Stephen Date: Wed, 16 Oct 2019 10:54:49 -0700 Subject: [PATCH 2/3] rubocop, i curse thee --- provider/ansible.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/provider/ansible.rb b/provider/ansible.rb index 9554de1a8523..58a11aee5e90 100644 --- a/provider/ansible.rb +++ b/provider/ansible.rb @@ -290,7 +290,6 @@ def compile_datasource(data) File.join(target_folder, "plugins/modules/#{name}_info.py"), self) - end def generate_objects(output_folder, types) From 8751edabc14302db4c1ba0cd699a321ad64b232f Mon Sep 17 00:00:00 2001 From: Modular Magician Date: Wed, 16 Oct 2019 19:59:31 +0000 Subject: [PATCH 3/3] Update tracked submodules -> HEAD on Wed Oct 16 19:59:31 UTC 2019 Tracked submodules are build/terraform-beta build/terraform-mapper build/terraform build/ansible build/inspec. --- build/ansible | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ansible b/build/ansible index e5ab367a20e3..bc4c90ad080d 160000 --- a/build/ansible +++ b/build/ansible @@ -1 +1 @@ -Subproject commit e5ab367a20e34b45076858cc2c1e45a8641b36b3 +Subproject commit bc4c90ad080d16e4ff8e402b6edd7a318541fa2e