Add diff suppress for time format to google_compute_resource_policies (#11486)

Author: karolgorc

mmv1/products/compute/ResourcePolicy.yaml

@@ -47,6 +47,12 @@ examples:
     primary_resource_id: 'foo'
     vars:
       name: 'gce-policy'
+  - !ruby/object:Provider::Terraform::Examples
+    name: 'resource_policy_hourly_format'
+    primary_resource_id: 'foo'
+    skip_docs: true
+    vars:
+      name: 'gce-policy'
   - !ruby/object:Provider::Terraform::Examples
     name: 'resource_policy_full'
     primary_resource_id: 'bar'
@@ -78,6 +84,8 @@ examples:
     primary_resource_id: 'cgroup'
     vars:
       name: 'gce-policy'
+custom_code: !ruby/object:Provider::Terraform::CustomCode
+  constants: templates/terraform/constants/compute_resource_policy.go.erb
 parameters:
   - !ruby/object:Api::Type::ResourceRef
     name: region
@@ -143,6 +151,7 @@ properties:
                 required: true
                 validation: !ruby/object:Provider::Terraform::Validation
                   function: 'verify.ValidateHourlyOnly'
+                diff_suppress_func: 'HourlyFormatSuppressDiff'
           - !ruby/object:Api::Type::NestedObject
             name: 'dailySchedule'
             description: |
@@ -166,6 +175,7 @@ properties:
                 required: true
                 validation: !ruby/object:Provider::Terraform::Validation
                   function: 'verify.ValidateHourlyOnly'
+                diff_suppress_func: 'HourlyFormatSuppressDiff'
           - !ruby/object:Api::Type::NestedObject
             name: 'weeklySchedule'
             description: |

mmv1/templates/terraform/constants/compute_resource_policy.go.erb

@@ -0,0 +1,5 @@
+// Suppresses a diff on cases like 1:00 when it should be 01:00.
+// Because API will normalize this value
+func HourlyFormatSuppressDiff(_, old, new string, _ *schema.ResourceData) bool {
+    return old == "0"+new
+}

mmv1/templates/terraform/examples/resource_policy_hourly_format.tf.erb

@@ -0,0 +1,12 @@
+resource "google_compute_resource_policy" "foo" {
+  name   = "<%= ctx[:vars]['name'] %>"
+  region = "us-central1"
+  snapshot_schedule_policy {
+    schedule {
+      daily_schedule {
+        days_in_cycle = 1
+        start_time    = "4:00"
+      }
+    }
+  }
+}

mmv1/third_party/terraform/services/compute/resource_compute_resource_policy_test.go

@@ -6,8 +6,49 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-provider-google/google/acctest"
+	"github.com/hashicorp/terraform-provider-google/google/services/compute"
 )
 
+// Value returned from the API will always be in format "HH:MM", so we need the suppress only on new values
+func TestHourlyFormatSuppressDiff(t *testing.T) {
+	cases := map[string]struct {
+		Old, New           string
+		ExpectDiffSuppress bool
+	}{
+		"Same value": {
+			Old:                "01:00",
+			New:                "01:00",
+			ExpectDiffSuppress: false,
+		},
+		"Same value but different format": {
+			Old:                "01:00",
+			New:                "1:00",
+			ExpectDiffSuppress: true,
+		},
+		"Changed value": {
+			Old:                "01:00",
+			New:                "02:00",
+			ExpectDiffSuppress: false,
+		},
+		"Changed value but different format": {
+			Old:                "01:00",
+			New:                "2:00",
+			ExpectDiffSuppress: false,
+		},
+		"Check interference with unaffected values": {
+			Old:                "11:00",
+			New:                "22:00",
+			ExpectDiffSuppress: false,
+		},
+	}
+
+	for tn, tc := range cases {
+		if compute.HourlyFormatSuppressDiff("", tc.Old, tc.New, nil) != tc.ExpectDiffSuppress {
+			t.Errorf("bad: %s, %q => %q expect DiffSuppress to return %t", tn, tc.Old, tc.New, tc.ExpectDiffSuppress)
+		}
+	}
+}
+
 func TestAccComputeResourcePolicy_attached(t *testing.T) {
 	t.Parallel()