Terraform: Fix issue with FQDN SSL Managed certs causing a diff

GoogleCloudPlatform · Apr 27, 2019 · 5d49073 · 5d49073
1 parent 78694ff
commit 5d49073
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/products/compute/terraform.yaml b/products/compute/terraform.yaml
@@ -991,6 +991,8 @@ overrides: !ruby/object:Overrides::ResourceOverrides
           {{description}}
 
           These are in the same namespace as the managed SSL certificates.
+      managed.domains: !ruby/object:Overrides::Terraform::PropertyOverride
+        diff_suppress_func: 'absoluteDomainSuppress'
   SslCertificate: !ruby/object:Overrides::Terraform::ResourceOverride
     docs: !ruby/object:Provider::Terraform::Docs
       optional_properties: |

diff --git a/provider/terraform_object_library.rb b/provider/terraform_object_library.rb
@@ -43,7 +43,10 @@ def generate_resource(data)
     def compile_common_files(output_folder, version_name = 'ga')
       Google::LOGGER.info 'Compiling common files.'
       compile_file_list(output_folder, [
-                          ['google/config.go', 'third_party/terraform/utils/config.go.erb']
+                       ['google/config.go',
+                        'third_party/terraform/utils/config.go.erb'],
+                       ['google/utils.go',
+                        'third_party/terraform/utils/utils.go.erb']
                         ], version_name)
     end
 
@@ -88,8 +91,6 @@ def copy_common_files(output_folder, _version_name)
                         'third_party/terraform/utils/field_helpers.go'],
                        ['google/self_link_helpers.go',
                         'third_party/terraform/utils/self_link_helpers.go'],
-                       ['google/utils.go',
-                        'third_party/terraform/utils/utils.go'],
                        ['google/transport.go',
                         'third_party/terraform/utils/transport.go'],
                        ['google/bigtable_client_factory.go',

diff --git a/templates/terraform/examples/managed_ssl_certificate_basic.tf.erb b/templates/terraform/examples/managed_ssl_certificate_basic.tf.erb
@@ -4,7 +4,7 @@ resource "google_compute_managed_ssl_certificate" "default" {
   name = "<%= ctx[:vars]['cert_name'] %>"
 
   managed {
-    domains = ["sslcert.tf-test.club"]
+    domains = ["sslcert.tf-test.club."]
   }
 }
 

diff --git a/third_party/terraform/utils/utils.go → third_party/terraform/utils/utils.go.erb b/third_party/terraform/utils/utils.go → third_party/terraform/utils/utils.go.erb
@@ -1,3 +1,4 @@
+<% autogen_exception -%>
 // Contains functions that don't really belong anywhere else.
 
 package google
@@ -466,3 +467,13 @@ func paginatedListRequest(baseUrl string, config *Config, flattener func(map[str
 
 	return ls, nil
 }
+
+<% unless version == 'ga' -%>
+// For managed SSL certs, if new is an absolute FQDN (trailing '.') but old isn't, treat them as equals.
+func absoluteDomainSuppress(k, old, new string, _ *schema.ResourceData) bool {
+	if k == "managed.0.domains.0" {
+		return old == strings.TrimRight(new, ".")
+	}
+	return old == new
+}
+<% end -%>