Fixed not being able to update preview status in SecurityPolicyRule and RegionSecurityPolicyRule (#13360) (#9614)

[upstream:70b6472fd53f87291cf3c8e58c3cada07c6aa98b]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/13360.txt

@@ -0,0 +1,6 @@
+```release-note:bug
+compute: fixed unable to update the `preview` field for `google_compute_security_policy_rule` resource
+```
+```release-note:bug
+compute: fixed unable to update the `preview` field for `google_compute_region_security_policy_rule` resource (beta)
+```

google-beta/services/compute/resource_compute_region_security_policy_rule.go

@@ -577,7 +577,7 @@ func resourceComputeRegionSecurityPolicyRuleCreate(d *schema.ResourceData, meta
 	previewProp, err := expandComputeRegionSecurityPolicyRulePreview(d.Get("preview"), d, config)
 	if err != nil {
 		return err
-	} else if v, ok := d.GetOkExists("preview"); !tpgresource.IsEmptyValue(reflect.ValueOf(previewProp)) && (ok || !reflect.DeepEqual(v, previewProp)) {
+	} else if v, ok := d.GetOkExists("preview"); ok || !reflect.DeepEqual(v, previewProp) {
 		obj["preview"] = previewProp
 	}
 	networkMatchProp, err := expandComputeRegionSecurityPolicyRuleNetworkMatch(d.Get("network_match"), d, config)
@@ -779,7 +779,7 @@ func resourceComputeRegionSecurityPolicyRuleUpdate(d *schema.ResourceData, meta
 	previewProp, err := expandComputeRegionSecurityPolicyRulePreview(d.Get("preview"), d, config)
 	if err != nil {
 		return err
-	} else if v, ok := d.GetOkExists("preview"); !tpgresource.IsEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, previewProp)) {
+	} else if v, ok := d.GetOkExists("preview"); ok || !reflect.DeepEqual(v, previewProp) {
 		obj["preview"] = previewProp
 	}
 	networkMatchProp, err := expandComputeRegionSecurityPolicyRuleNetworkMatch(d.Get("network_match"), d, config)

google-beta/services/compute/resource_compute_region_security_policy_rule_test.go

@@ -38,6 +38,14 @@ func TestAccComputeRegionSecurityPolicyRule_regionSecurityPolicyRuleBasicUpdate(
 				ImportState:       true,
 				ImportStateVerify: true,
 			},
+			{
+				Config: testAccComputeRegionSecurityPolicyRule_regionSecurityPolicyRulePreUpdate(context),
+			},
+			{
+				ResourceName:      "google_compute_region_security_policy_rule.policy_rule",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }

google-beta/services/compute/resource_compute_security_policy_rule.go

@@ -594,7 +594,7 @@ func resourceComputeSecurityPolicyRuleCreate(d *schema.ResourceData, meta interf
 	previewProp, err := expandComputeSecurityPolicyRulePreview(d.Get("preview"), d, config)
 	if err != nil {
 		return err
-	} else if v, ok := d.GetOkExists("preview"); !tpgresource.IsEmptyValue(reflect.ValueOf(previewProp)) && (ok || !reflect.DeepEqual(v, previewProp)) {
+	} else if v, ok := d.GetOkExists("preview"); ok || !reflect.DeepEqual(v, previewProp) {
 		obj["preview"] = previewProp
 	}
 
@@ -805,7 +805,7 @@ func resourceComputeSecurityPolicyRuleUpdate(d *schema.ResourceData, meta interf
 	previewProp, err := expandComputeSecurityPolicyRulePreview(d.Get("preview"), d, config)
 	if err != nil {
 		return err
-	} else if v, ok := d.GetOkExists("preview"); !tpgresource.IsEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, previewProp)) {
+	} else if v, ok := d.GetOkExists("preview"); ok || !reflect.DeepEqual(v, previewProp) {
 		obj["preview"] = previewProp
 	}
 

google-beta/services/compute/resource_compute_security_policy_rule_test.go

@@ -39,6 +39,14 @@ func TestAccComputeSecurityPolicyRule_basicUpdate(t *testing.T) {
 				ImportState:       true,
 				ImportStateVerify: true,
 			},
+			{
+				Config: testAccComputeSecurityPolicyRule_preBasicUpdate(context),
+			},
+			{
+				ResourceName:      "google_compute_security_policy_rule.policy_rule",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }