hashicorp · modular-magician · Dec 4, 2020 · Dec 4, 2020
diff --git a/.changelog/4286.txt b/.changelog/4286.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+compute: removed `custom_response_headers` from GA `google_compute_backend_service` since it only works in the Beta version
+```
diff --git a/google/resource_compute_backend_service.go b/google/resource_compute_backend_service.go
@@ -466,16 +466,6 @@ requests.`,
 				},
 				Set: schema.HashString,
 			},
-			"custom_response_headers": {
-				Type:     schema.TypeSet,
-				Optional: true,
-				Description: `Headers that the HTTP/S load balancer should add to proxied
-responses.`,
-				Elem: &schema.Schema{
-					Type: schema.TypeString,
-				},
-				Set: schema.HashString,
-			},
 			"description": {
 				Type:        schema.TypeString,
 				Optional:    true,
@@ -988,12 +978,6 @@ func resourceComputeBackendServiceCreate(d *schema.ResourceData, meta interface{
 	} else if v, ok := d.GetOkExists("custom_request_headers"); !isEmptyValue(reflect.ValueOf(customRequestHeadersProp)) && (ok || !reflect.DeepEqual(v, customRequestHeadersProp)) {
 		obj["customRequestHeaders"] = customRequestHeadersProp
 	}
-	customResponseHeadersProp, err := expandComputeBackendServiceCustomResponseHeaders(d.Get("custom_response_headers"), d, config)
-	if err != nil {
-		return err
-	} else if v, ok := d.GetOkExists("custom_response_headers"); !isEmptyValue(reflect.ValueOf(customResponseHeadersProp)) && (ok || !reflect.DeepEqual(v, customResponseHeadersProp)) {
-		obj["customResponseHeaders"] = customResponseHeadersProp
-	}
 	fingerprintProp, err := expandComputeBackendServiceFingerprint(d.Get("fingerprint"), d, config)
 	if err != nil {
 		return err
@@ -1238,9 +1222,6 @@ func resourceComputeBackendServiceRead(d *schema.ResourceData, meta interface{})
 	if err := d.Set("custom_request_headers", flattenComputeBackendServiceCustomRequestHeaders(res["customRequestHeaders"], d, config)); err != nil {
 		return fmt.Errorf("Error reading BackendService: %s", err)
 	}
-	if err := d.Set("custom_response_headers", flattenComputeBackendServiceCustomResponseHeaders(res["customResponseHeaders"], d, config)); err != nil {
-		return fmt.Errorf("Error reading BackendService: %s", err)
-	}
 	if err := d.Set("fingerprint", flattenComputeBackendServiceFingerprint(res["fingerprint"], d, config)); err != nil {
 		return fmt.Errorf("Error reading BackendService: %s", err)
 	}
@@ -1351,12 +1332,6 @@ func resourceComputeBackendServiceUpdate(d *schema.ResourceData, meta interface{
 	} else if v, ok := d.GetOkExists("custom_request_headers"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, customRequestHeadersProp)) {
 		obj["customRequestHeaders"] = customRequestHeadersProp
 	}
-	customResponseHeadersProp, err := expandComputeBackendServiceCustomResponseHeaders(d.Get("custom_response_headers"), d, config)
-	if err != nil {
-		return err
-	} else if v, ok := d.GetOkExists("custom_response_headers"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, customResponseHeadersProp)) {
-		obj["customResponseHeaders"] = customResponseHeadersProp
-	}
 	fingerprintProp, err := expandComputeBackendServiceFingerprint(d.Get("fingerprint"), d, config)
 	if err != nil {
 		return err
@@ -2050,13 +2025,6 @@ func flattenComputeBackendServiceCustomRequestHeaders(v interface{}, d *schema.R
 	return schema.NewSet(schema.HashString, v.([]interface{}))
 }
 
-func flattenComputeBackendServiceCustomResponseHeaders(v interface{}, d *schema.ResourceData, config *Config) interface{} {
-	if v == nil {
-		return v
-	}
-	return schema.NewSet(schema.HashString, v.([]interface{}))
-}
-
 func flattenComputeBackendServiceFingerprint(v interface{}, d *schema.ResourceData, config *Config) interface{} {
 	return v
 }
@@ -2901,11 +2869,6 @@ func expandComputeBackendServiceCustomRequestHeaders(v interface{}, d TerraformR
 	return v, nil
 }
 
-func expandComputeBackendServiceCustomResponseHeaders(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
-	v = v.(*schema.Set).List()
-	return v, nil
-}
-
 func expandComputeBackendServiceFingerprint(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
 	return v, nil
 }

diff --git a/google/resource_compute_backend_service_generated_test.go b/google/resource_compute_backend_service_generated_test.go
@@ -118,63 +118,6 @@ resource "google_compute_http_health_check" "default" {
 `, context)
 }
 
-func TestAccComputeBackendService_backendServiceNetworkEndpointExample(t *testing.T) {
-	t.Parallel()
-
-	context := map[string]interface{}{
-		"random_suffix": randString(t, 10),
-	}
-
-	vcrTest(t, resource.TestCase{
-		PreCheck:  func() { testAccPreCheck(t) },
-		Providers: testAccProviders,
-		ExternalProviders: map[string]resource.ExternalProvider{
-			"random": {},
-		},
-		CheckDestroy: testAccCheckComputeBackendServiceDestroyProducer(t),
-		Steps: []resource.TestStep{
-			{
-				Config: testAccComputeBackendService_backendServiceNetworkEndpointExample(context),
-			},
-			{
-				ResourceName:      "google_compute_backend_service.default",
-				ImportState:       true,
-				ImportStateVerify: true,
-			},
-		},
-	})
-}
-
-func testAccComputeBackendService_backendServiceNetworkEndpointExample(context map[string]interface{}) string {
-	return Nprintf(`
-resource "google_compute_global_network_endpoint_group" "external_proxy" {
-  name                  = "tf-test-network-endpoint%{random_suffix}"
-  network_endpoint_type = "INTERNET_FQDN_PORT"
-  default_port          = "443"
-}
-
-resource "google_compute_global_network_endpoint" "proxy" {
-  global_network_endpoint_group = google_compute_global_network_endpoint_group.external_proxy.id
-  fqdn                          = "test.example.com"
-  port                          = google_compute_global_network_endpoint_group.external_proxy.default_port
-}
-
-resource "google_compute_backend_service" "default" {
-  name                            = "tf-test-backend-service%{random_suffix}"
-  enable_cdn                      = true
-  timeout_sec                     = 10
-  connection_draining_timeout_sec = 10
-
-  custom_request_headers          = ["host: ${google_compute_global_network_endpoint.proxy.fqdn}"]
-  custom_response_headers         = ["X-Cache-Hit: {cdn_cache_status}"]
-
-  backend {
-    group = google_compute_global_network_endpoint_group.external_proxy.id
-  }
-}
-`, context)
-}
-
 func testAccCheckComputeBackendServiceDestroyProducer(t *testing.T) func(s *terraform.State) error {
 	return func(s *terraform.State) error {
 		for name, rs := range s.RootModule().Resources {

diff --git a/google/resource_compute_backend_service_test.go b/google/resource_compute_backend_service_test.go
@@ -535,37 +535,6 @@ func TestAccComputeBackendService_withMaxConnectionsPerEndpoint(t *testing.T) {
 	})
 }
 
-func TestAccComputeBackendService_withCustomHeaders(t *testing.T) {
-	t.Parallel()
-
-	serviceName := fmt.Sprintf("tf-test-%s", randString(t, 10))
-	checkName := fmt.Sprintf("tf-test-%s", randString(t, 10))
-
-	vcrTest(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
-		Providers:    testAccProviders,
-		CheckDestroy: testAccCheckComputeBackendServiceDestroyProducer(t),
-		Steps: []resource.TestStep{
-			{
-				Config: testAccComputeBackendService_withCustomHeaders(serviceName, checkName),
-			},
-			{
-				ResourceName:      "google_compute_backend_service.foobar",
-				ImportState:       true,
-				ImportStateVerify: true,
-			},
-			{
-				Config: testAccComputeBackendService_basic(serviceName, checkName),
-			},
-			{
-				ResourceName:      "google_compute_backend_service.foobar",
-				ImportState:       true,
-				ImportStateVerify: true,
-			},
-		},
-	})
-}
-
 func TestAccComputeBackendService_internalLoadBalancing(t *testing.T) {
 	t.Parallel()
 
@@ -1336,25 +1305,6 @@ resource "google_compute_health_check" "default" {
 `, service, maxRate, instance, neg, network, network, check)
 }
 
-func testAccComputeBackendService_withCustomHeaders(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]
-
-  custom_request_headers = ["Client-Region: {client_region}", "Client-Rtt: {client_rtt_msec}"]
-  custom_response_headers = ["X-Cache-Hit: {cdn_cache_status}", "X-Cache-Id: {cdn_cache_id}"]
-}
-
-resource "google_compute_http_health_check" "zero" {
-  name               = "%s"
-  request_path       = "/"
-  check_interval_sec = 1
-  timeout_sec        = 1
-}
-`, serviceName, checkName)
-}
-
 func testAccComputeBackendService_internalLoadBalancing(fr, proxy, backend, hc, urlmap string) string {
 	return fmt.Sprintf(`
 resource "google_compute_global_forwarding_rule" "forwarding_rule" {

diff --git a/website/docs/r/compute_backend_service.html.markdown b/website/docs/r/compute_backend_service.html.markdown
@@ -171,18 +171,21 @@ resource "google_compute_health_check" "health_check" {
 
 ```hcl
 resource "google_compute_global_network_endpoint_group" "external_proxy" {
+  provider=google-beta
   name                  = "network-endpoint"
   network_endpoint_type = "INTERNET_FQDN_PORT"
   default_port          = "443"
 }
 
 resource "google_compute_global_network_endpoint" "proxy" {
+  provider=google-beta
   global_network_endpoint_group = google_compute_global_network_endpoint_group.external_proxy.id
   fqdn                          = "test.example.com"
   port                          = google_compute_global_network_endpoint_group.external_proxy.default_port
 }
 
 resource "google_compute_backend_service" "default" {
+  provider=google-beta
   name                            = "backend-service"
   enable_cdn                      = true
   timeout_sec                     = 10
@@ -263,7 +266,7 @@ The following arguments are supported:
   requests.
 
 * `custom_response_headers` -
-  (Optional)
+  (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
   Headers that the HTTP/S load balancer should add to proxied
   responses.