send_empty_value for two fields (#4805) (#3278)

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

Author: modular-magician

.changelog/4805.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+compute: fixed missing values for `negative_caching` and `serve_while_stale` on `google_compute_backend_service`
+```

google-beta/resource_compute_backend_bucket.go

@@ -727,7 +727,7 @@ func expandComputeBackendBucketCdnPolicy(v interface{}, d TerraformResourceData,
 	transformedNegativeCaching, err := expandComputeBackendBucketCdnPolicyNegativeCaching(original["negative_caching"], d, config)
 	if err != nil {
 		return nil, err
-	} else if val := reflect.ValueOf(transformedNegativeCaching); val.IsValid() && !isEmptyValue(val) {
+	} else {
 		transformed["negativeCaching"] = transformedNegativeCaching
 	}
 
@@ -748,7 +748,7 @@ func expandComputeBackendBucketCdnPolicy(v interface{}, d TerraformResourceData,
 	transformedServeWhileStale, err := expandComputeBackendBucketCdnPolicyServeWhileStale(original["serve_while_stale"], d, config)
 	if err != nil {
 		return nil, err
-	} else if val := reflect.ValueOf(transformedServeWhileStale); val.IsValid() && !isEmptyValue(val) {
+	} else {
 		transformed["serveWhileStale"] = transformedServeWhileStale
 	}
 

google-beta/resource_compute_backend_service.go

@@ -3150,7 +3150,7 @@ func expandComputeBackendServiceCdnPolicy(v interface{}, d TerraformResourceData
 	transformedNegativeCaching, err := expandComputeBackendServiceCdnPolicyNegativeCaching(original["negative_caching"], d, config)
 	if err != nil {
 		return nil, err
-	} else if val := reflect.ValueOf(transformedNegativeCaching); val.IsValid() && !isEmptyValue(val) {
+	} else {
 		transformed["negativeCaching"] = transformedNegativeCaching
 	}
 
@@ -3171,7 +3171,7 @@ func expandComputeBackendServiceCdnPolicy(v interface{}, d TerraformResourceData
 	transformedServeWhileStale, err := expandComputeBackendServiceCdnPolicyServeWhileStale(original["serve_while_stale"], d, config)
 	if err != nil {
 		return nil, err
-	} else if val := reflect.ValueOf(transformedServeWhileStale); val.IsValid() && !isEmptyValue(val) {
+	} else {
 		transformed["serveWhileStale"] = transformedServeWhileStale
 	}
 

google-beta/resource_compute_backend_service_test.go

@@ -274,6 +274,14 @@ func TestAccComputeBackendService_withCdnPolicy(t *testing.T) {
 				ImportState:       true,
 				ImportStateVerify: true,
 			},
+			{
+				Config: testAccComputeBackendService_withCdnPolicy2(serviceName, checkName),
+			},
+			{
+				ResourceName:      "google_compute_backend_service.foobar",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }
@@ -1166,6 +1174,33 @@ resource "google_compute_backend_service" "foobar" {
   name          = "%s"
   health_checks = [google_compute_http_health_check.zero.self_link]
 
+  cdn_policy {
+    negative_caching = false
+    serve_while_stale = 0
+    cache_key_policy {
+      include_protocol       = true
+      include_host           = true
+      include_query_string   = true
+      query_string_whitelist = ["foo", "bar"]
+    }
+  }
+}
+
+resource "google_compute_http_health_check" "zero" {
+  name               = "%s"
+  request_path       = "/"
+  check_interval_sec = 1
+  timeout_sec        = 1
+}
+`, serviceName, checkName)
+}
+
+func testAccComputeBackendService_withCdnPolicy2(serviceName, checkName string) string {
+	return fmt.Sprintf(`
+resource "google_compute_backend_service" "foobar" {
+  name          = "%s"
+  health_checks = [google_compute_http_health_check.zero.self_link]
+
   cdn_policy {
     cache_key_policy {
       include_protocol       = true

google-beta/resource_compute_region_backend_service.go

@@ -3081,7 +3081,7 @@ func expandComputeRegionBackendServiceCdnPolicy(v interface{}, d TerraformResour
 	transformedNegativeCaching, err := expandComputeRegionBackendServiceCdnPolicyNegativeCaching(original["negative_caching"], d, config)
 	if err != nil {
 		return nil, err
-	} else if val := reflect.ValueOf(transformedNegativeCaching); val.IsValid() && !isEmptyValue(val) {
+	} else {
 		transformed["negativeCaching"] = transformedNegativeCaching
 	}
 
@@ -3102,7 +3102,7 @@ func expandComputeRegionBackendServiceCdnPolicy(v interface{}, d TerraformResour
 	transformedServeWhileStale, err := expandComputeRegionBackendServiceCdnPolicyServeWhileStale(original["serve_while_stale"], d, config)
 	if err != nil {
 		return nil, err
-	} else if val := reflect.ValueOf(transformedServeWhileStale); val.IsValid() && !isEmptyValue(val) {
+	} else {
 		transformed["serveWhileStale"] = transformedServeWhileStale
 	}