Add default_if_empty to google_compute_router_nat defaults (#2946)

Merged PR #2946.
GoogleCloudPlatform · Jan 9, 2020 · 0b6ac1b · 0b6ac1b
1 parent 1b1fa73
commit 0b6ac1b
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 5 deletions.
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/terraform.yaml b/products/compute/terraform.yaml
@@ -1483,6 +1483,14 @@ overrides: !ruby/object:Overrides::ResourceOverrides
         required: false
         default_from_api: true
         custom_flatten: 'templates/terraform/custom_flatten/name_from_self_link.erb'
+      udpIdleTimeoutSec: !ruby/object:Overrides::Terraform::PropertyOverride
+        custom_flatten: 'templates/terraform/custom_flatten/default_if_empty.erb'
+      icmpIdleTimeoutSec: !ruby/object:Overrides::Terraform::PropertyOverride
+        custom_flatten: 'templates/terraform/custom_flatten/default_if_empty.erb'
+      tcpEstablishedIdleTimeoutSec: !ruby/object:Overrides::Terraform::PropertyOverride
+        custom_flatten: 'templates/terraform/custom_flatten/default_if_empty.erb'
+      tcpTransitoryIdleTimeoutSec: !ruby/object:Overrides::Terraform::PropertyOverride
+        custom_flatten: 'templates/terraform/custom_flatten/default_if_empty.erb'
     custom_code: !ruby/object:Provider::Terraform::CustomCode
       constants: 'templates/terraform/constants/router_nat.go.erb'
       resource_definition: 'templates/terraform/resource_definition/router_nat.go.erb'

diff --git a/templates/terraform/custom_flatten/default_if_empty.erb b/templates/terraform/custom_flatten/default_if_empty.erb
@@ -13,8 +13,16 @@
 	# limitations under the License.
 -%>
 func flatten<%= prefix -%><%= titlelize_property(property) -%>(v interface{}, d *schema.ResourceData) interface{} {
-	if v == nil || v.(string) == "" {
+	if v == nil || isEmptyValue(reflect.ValueOf(v)) {
 		return <%= go_literal(property.default_value) -%>
 	}
+<%- if property.is_a?(Api::Type::Integer) -%>
+	// Handles the string fixed64 format
+	if strVal, ok := v.(string); ok {
+		if intVal, err := strconv.ParseInt(strVal, 10, 64); err == nil {
+			return intVal
+		} // let terraform core handle it if we can't convert the string to an int.
+	}
+<%- end %>
 	return v
 }
+2 −2		test/integration/verify/controls/google_kms_crypto_key_iam_binding.rb
+20 −0		test/integration/verify/controls/google_kms_crypto_key_iam_policy.rb
+3 −3		test/integration/verify/controls/google_kms_key_ring_iam_binding.rb
+20 −0		test/integration/verify/controls/google_kms_key_ring_iam_policy.rb
+7 −4		test/integration/verify/controls/google_spanner_instance_iam_policy.rb