Changing Ansible to point to our fork

Change-Id: I5ad6ecf1344621cb40d4123dfc80cc5861c28c8d
GoogleCloudPlatform · May 3, 2018 · 4c16d7c · 4c16d7c
1 parent a27c7b5
commit 4c16d7c
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 15 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -66,7 +66,8 @@
 	url = git@github.com:GoogleCloudPlatform/chef-google-logging
 [submodule "build/ansible"]
 	path = build/ansible
-	url = git@github.com:ansible/ansible.git
+	url = git@github.com:modular-magician/ansible
+  branch = devel
 [submodule "build/terraform"]
 	path = build/terraform
 	url = git@github.com:terraform-providers/terraform-provider-google.git

diff --git a/provider/ansible/common~compile.yaml b/provider/ansible/common~compile.yaml
@@ -23,8 +23,13 @@
 'test/units/module_utils/gcp/test_gcp_utils.py': 'provider/ansible/test_gcp_utils.py'
 <% unless config.nil? -%>
 <%
+  # Overrides have not been assembled yet.
+  overrides = config.overrides
+  excludes = overrides.instance_variables
+                      .select { |x| overrides.instance_variable_get(x).exclude }
+                      .map { |x| x.to_s.tr(':@', '') }
   object_names = api.objects
-                    .select { |o| !o.exclude }
+                    .select { |o| !excludes.include?(o.name) }
                     .map do |object|
                       ["gcp_#{object.__product.prefix[1..-1]}",
                       Google::StringUtils.underscore(object.name)].join('_')

diff --git a/provider/ansible/resource_override.rb b/provider/ansible/resource_override.rb
@@ -21,10 +21,10 @@ module OverrideProperties
       attr_reader :aliases
       attr_reader :collection
       attr_reader :create
+      attr_reader :custom_decoder
+      attr_reader :custom_encoder
       attr_reader :custom_self_link
-      attr_reader :decoder
       attr_reader :delete
-      attr_reader :encoder
       attr_reader :exclude
       attr_reader :editable
       attr_reader :hidden
@@ -51,9 +51,20 @@ def validate
 
         check_property :access_api_results, :boolean
         check_property :aliases, ::Hash
+        check_optional_property :collection, ::String
+        check_optional_property :create, ::String
+        check_optional_property :custom_decoder, ::String
+        check_optional_property :custom_encoder, ::String
+        check_optional_property :custom_self_link, ::String
+        check_optional_property :delete, ::String
         check_property :editable, :boolean
         check_property :exclude, :boolean
+        check_optional_property :hidden, ::Array
+        check_optional_property :hidden, ::Array
         check_property :imports, ::Array
+        check_property :provider_helpers, ::Array
+        check_optional_property :update, ::String
+        check_optional_property :version_added, ::String
       end
 
       private

diff --git a/provider/config.rb b/provider/config.rb
@@ -188,8 +188,6 @@ def self.parse(cfg_file, api = nil)
       raise "Config #{cfg_file}(#{config.class}) is not a Provider::Config" \
         unless config.class <= Provider::Config
       # Config must be validated so items are properly setup for next compile
-      config.default_overrides
-      config.spread_api config, api, [], '' unless api.nil?
       config.validate
       # Compile step #2: Now that we have the target class, compile with that
       # class features

diff --git a/templates/ansible/resource.erb b/templates/ansible/resource.erb
@@ -269,11 +269,11 @@ def resource_to_request(module):
 <%
   encoder_name = if object.encoder?
                    object.transport.encoder
-                 else object.encoder
-                   object.encoder
+                 else object.custom_encoder
+                   object.custom_encoder
                  end
 -%>
-<% if object.encoder? || object.encoder -%>
+<% if object.encoder? || object.custom_encoder -%>
     request = <%= encoder_name -%>(request, module)
 <% end -%>
     return_vals = {}
@@ -320,11 +320,11 @@ def resource_to_request(module):
 <%
   decoder_name = if object.decoder?
                    object.transport.decoder
-                 else object.decoder
-                   object.decoder
+                 else object.custom_decoder
+                   object.custom_decoder
                  end
 -%>
-<% if object.decoder? || object.decoder -%>
+<% if object.decoder? || object.custom_decoder -%>
     result = <%= decoder_name -%>(result, module)
 
 <% end -%>
@@ -344,11 +344,11 @@ def is_different(module, response):
 <%
   decoder_name = if object.decoder?
                    object.transport.decoder
-                 else object.decoder
-                   object.decoder
+                 else object.custom_decoder
+                   object.custom_decoder
                  end
 -%>
-<% if object.decoder? || object.decoder -%>
+<% if object.decoder? || object.custom_decoder -%>
     request = <%= decoder_name -%>(request, module)
 <% end -%>