Moving Ansible fingerprint to match TF (#2787)

Merged PR #2787.
GoogleCloudPlatform · Dec 6, 2019 · 91fbba4 · 91fbba4
1 parent 5d5f51e
commit 91fbba4
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 19 deletions.
diff --git a/build/ansible b/build/ansible
diff --git a/build/inspec b/build/inspec
diff --git a/build/terraform b/build/terraform
diff --git a/build/terraform-beta b/build/terraform-beta
diff --git a/build/terraform-mapper b/build/terraform-mapper
diff --git a/products/compute/ansible.yaml b/products/compute/ansible.yaml
@@ -286,9 +286,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
           * global/gateways/default-internet-gateway
   Subnetwork: !ruby/object:Overrides::Ansible::ResourceOverride
     properties:
-      fingerprint: !ruby/object:Overrides::Ansible::PropertyOverride
-        update_verb: :PATCH
-        update_url:  projects/{{project}}/regions/{{region}}/subnetworks/{{name}}
       logConfig: !ruby/object:Overrides::Ansible::PropertyOverride
         exclude: true
   TargetPool: !ruby/object:Overrides::Ansible::ResourceOverride

diff --git a/products/compute/api.yaml b/products/compute/api.yaml
@@ -10316,12 +10316,6 @@ objects:
           Only networks that are in the distributed mode can have subnetworks.
         input: true
         required: true
-      # TODO(rileykarson): Work with rambleraptor to remove this field from downstreams.
-      - !ruby/object:Api::Type::Fingerprint
-        name: 'fingerprint'
-        description: |
-          Fingerprint of this resource. This field is used internally during
-          updates of this resource.
       - !ruby/object:Api::Type::Enum
         name: 'purpose'
         min_version: beta

diff --git a/products/compute/terraform.yaml b/products/compute/terraform.yaml
@@ -1726,8 +1726,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
       secondaryIpRanges.ipCidrRange: !ruby/object:Overrides::Terraform::PropertyOverride
         validation: !ruby/object:Provider::Terraform::Validation
           function: 'validateIpCidrRange'
-      fingerprint: !ruby/object:Overrides::Terraform::PropertyOverride
-        exclude: false
       logConfig: !ruby/object:Overrides::Terraform::PropertyOverride
         send_empty_value: true
         custom_expand: 'templates/terraform/custom_expand/subnetwork_log_config.go.erb'

diff --git a/provider/core.rb b/provider/core.rb
@@ -290,7 +290,7 @@ def properties_by_custom_update(properties, behavior = :new)
       # TODO(rambleraptor): Add support to Ansible for one-at-a-time updates.
       if behavior == :old
         update_props.group_by do |p|
-          { update_url: p.update_url, update_verb: p.update_verb }
+          { update_url: p.update_url, update_verb: p.update_verb, fingerprint: p.fingerprint_name }
         end
       else
         update_props.group_by do |p|

diff --git a/templates/ansible/resource.erb b/templates/ansible/resource.erb
@@ -269,12 +269,26 @@ def update_fields(module, request, response):
 <% unless object.hidden.include?(func_name) -%>
 def <%= func_name -%>(module, request, response):
     auth = GcpSession(module, <%= quote_string(prod_name) -%>)
+<% if key[:fingerprint_name] -%>
+    new_resource = <%= method_call('fetch_resource', ['module', 'self_link(module)',
+                                          ('kind' if object.kind?),
+                                          ])
+                    %>
+    fingerprint = new_resource[:<%= key[:fingerprint_name] -%>]
+<% end -%>
+<%
+    request_props = if key[:fingerprint_name]
+                      request_properties(props).merge({fingerprint_name => Google::PythonUtils::PythonCode.new("new_resource[:#{key[:fingerprint_name]}]")})
+                    else
+                      request_properties(props)
+                    end
+-%>
     auth.<%= key[:update_verb].downcase -%>(
         ''.join([
             "<%= object.__product.base_url -%>",
             "<%= key[:update_url].gsub('{{', '{').gsub('}}', '}') -%>"
         ]).format(**module.params),
-<%= lines(python_literal(request_properties(props), use_hash_brackets: true)) -%>
+<%= lines(python_literal(request_props, use_hash_brackets: true)) -%>
     )
 
 <% end # unless object.hidden.include? -%>

diff --git a/templates/terraform/extra_schema_entry/subnetwork.erb b/templates/terraform/extra_schema_entry/subnetwork.erb
@@ -17,4 +17,10 @@
 	Computed:   true,
 	Optional:   true,
 	Removed:    "This field is being removed in favor of log_config. If log_config is present, flow logs are enabled. Please remove this field",
-},
+},
+"fingerprint": {
+  Type:        schema.TypeString,
+  Computed:    true,
+  Description: "Fingerprint of this resource. This field is used internally during updates of this resource.",
+  Deprecated:  "This field is not useful for users, and has been removed as an output.",
+},
+15 −0		test/integration/build/gcp-mm.tf
+27 −0		test/integration/verify/controls/google_spanner_instance_iam_policy.rb