make authz extension wire_format O+C (#12975) (#9245)

[upstream:b0a90c2e7fd158a9030db2f2c3d66ea8e39c3ca9]

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

Author: modular-magician

Diff for: .changelog/12975.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+networkservices: fixed a bug with `google_network_services_authz_extension.wire_format` sending an invalid default value by removing the Terraform default and letting the API set the default.
+```

Diff for: google-beta/services/networkservices/resource_network_services_authz_extension.go

@@ -134,10 +134,10 @@ Please refer to the field 'effective_labels' for all of the labels present on th
 			},
 			"wire_format": {
 				Type:         schema.TypeString,
+				Computed:     true,
 				Optional:     true,
 				ValidateFunc: verify.ValidateEnum([]string{"WIRE_FORMAT_UNSPECIFIED", "EXT_PROC_GRPC", ""}),
-				Description:  `The format of communication supported by the callout extension. Default value: "EXT_PROC_GRPC" Possible values: ["WIRE_FORMAT_UNSPECIFIED", "EXT_PROC_GRPC"]`,
-				Default:      "EXT_PROC_GRPC",
+				Description:  `The format of communication supported by the callout extension. Will be set to EXT_PROC_GRPC by the backend if no value is set. Possible values: ["WIRE_FORMAT_UNSPECIFIED", "EXT_PROC_GRPC"]`,
 			},
 			"create_time": {
 				Type:        schema.TypeString,
@@ -709,10 +709,6 @@ func flattenNetworkServicesAuthzExtensionForwardHeaders(v interface{}, d *schema
 }
 
 func flattenNetworkServicesAuthzExtensionWireFormat(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
-	if v == nil || tpgresource.IsEmptyValue(reflect.ValueOf(v)) {
-		return "EXT_PROC_GRPC"
-	}
-
 	return v
 }
 

Diff for: google-beta/services/networkservices/resource_network_services_authz_extension_test.go

@@ -49,21 +49,21 @@ func TestAccNetworkServicesAuthzExtension_update(t *testing.T) {
 func testAccNetworkServicesAuthzExtension_start(context map[string]interface{}) string {
 	return acctest.Nprintf(`
 resource "google_compute_network" "default" {
-  name                    = "lb-network"
+  name                    = "tf-test-lb-network%{random_suffix}"
   project                 = "%{project}"
   auto_create_subnetworks = false
 }
 
 resource "google_compute_subnetwork" "default" {
-  name          = "backend-subnet"
+  name          = "tf-test-backend-subnet%{random_suffix}"
   project       = "%{project}"
   region        = "us-west1"
   ip_cidr_range = "10.1.2.0/24"
   network       = google_compute_network.default.id
 }
 
 resource "google_compute_subnetwork" "proxy_only" {
-  name          = "proxy-only-subnet"
+  name          = "tf-test-proxy-only-subnet%{random_suffix}"
   project       = "%{project}"
   region        = "us-west1"
   ip_cidr_range = "10.129.0.0/23"
@@ -73,7 +73,7 @@ resource "google_compute_subnetwork" "proxy_only" {
 }
 
 resource "google_compute_address" "default" {
-  name         = "l7-ilb-ip-address"
+  name         = "tf-test-l7-ilb-ip-address%{random_suffix}"
   project      = "%{project}"
   region       = "us-west1"
   subnetwork   = google_compute_subnetwork.default.id
@@ -83,7 +83,7 @@ resource "google_compute_address" "default" {
 
 
 resource "google_compute_region_health_check" "default" {
-  name    = "l7-ilb-basic-check"
+  name    = "tf-test-l7-ilb-basic-check%{random_suffix}"
   project = "%{project}"
   region  = "us-west1"
 
@@ -93,7 +93,7 @@ resource "google_compute_region_health_check" "default" {
 }
 
 resource "google_compute_region_backend_service" "url_map" {
-  name                  = "l7-ilb-backend-service"
+  name                  = "tf-test-l7-ilb-backend-service%{random_suffix}"
   project               = "%{project}"
   region                = "us-west1"
   load_balancing_scheme = "INTERNAL_MANAGED"
@@ -102,7 +102,7 @@ resource "google_compute_region_backend_service" "url_map" {
 }
 
 resource "google_compute_forwarding_rule" "default" {
-  name                  = "l7-ilb-forwarding-rule"
+  name                  = "tf-test-l7-ilb-forwarding-rule%{random_suffix}"
   project               = "%{project}"
   region                = "us-west1"
   load_balancing_scheme = "INTERNAL_MANAGED"
@@ -117,21 +117,21 @@ resource "google_compute_forwarding_rule" "default" {
 }
 
 resource "google_compute_region_url_map" "default" {
-  name            = "l7-ilb-map"
+  name            = "tf-test-l7-ilb-map%{random_suffix}"
   project         = "%{project}"
   region          = "us-west1"
   default_service = google_compute_region_backend_service.url_map.id
 }
 
 resource "google_compute_region_target_http_proxy" "default" {
-  name    = "l7-ilb-proxy"
+  name    = "tf-test-l7-ilb-proxy%{random_suffix}"
   project = "%{project}"
   region  = "us-west1"
   url_map = google_compute_region_url_map.default.id
 }
 
 resource "google_compute_region_backend_service" "default" {
-  name                  = "authz-service"
+  name                  = "tf-test-authz-service%{random_suffix}"
   project               = "%{project}"
   region                = "us-west1"
 
@@ -141,7 +141,7 @@ resource "google_compute_region_backend_service" "default" {
 }
 
 resource "google_compute_region_backend_service" "updated" {
-  name                  = "authz-service-updated"
+  name                  = "tf-test-authz-service-updated%{random_suffix}"
   project               = "%{project}"
   region                = "us-west1"
   
@@ -169,21 +169,21 @@ resource "google_network_services_authz_extension" "default" {
 func testAccNetworkServicesAuthzExtension_update(context map[string]interface{}) string {
 	return acctest.Nprintf(`
 resource "google_compute_network" "default" {
-  name                    = "lb-network"
+  name                    = "tf-test-lb-network%{random_suffix}"
   project                 = "%{project}"
   auto_create_subnetworks = false
 }
 
 resource "google_compute_subnetwork" "default" {
-  name          = "backend-subnet"
+  name          = "tf-test-backend-subnet%{random_suffix}"
   project       = "%{project}"
   region        = "us-west1"
   ip_cidr_range = "10.1.2.0/24"
   network       = google_compute_network.default.id
 }
 
 resource "google_compute_subnetwork" "proxy_only" {
-  name          = "proxy-only-subnet"
+  name          = "tf-test-proxy-only-subnet%{random_suffix}"
   project       = "%{project}"
   region        = "us-west1"
   ip_cidr_range = "10.129.0.0/23"
@@ -193,7 +193,7 @@ resource "google_compute_subnetwork" "proxy_only" {
 }
 
 resource "google_compute_address" "default" {
-  name         = "l7-ilb-ip-address"
+  name         = "tf-test-l7-ilb-ip-address%{random_suffix}"
   project      = "%{project}"
   region       = "us-west1"
   subnetwork   = google_compute_subnetwork.default.id
@@ -202,7 +202,7 @@ resource "google_compute_address" "default" {
 }
 
 resource "google_compute_region_health_check" "default" {
-  name    = "l7-ilb-basic-check"
+  name    = "tf-test-l7-ilb-basic-check%{random_suffix}"
   project = "%{project}"
   region  = "us-west1"
 
@@ -212,7 +212,7 @@ resource "google_compute_region_health_check" "default" {
 }
 
 resource "google_compute_region_backend_service" "url_map" {
-  name                  = "l7-ilb-backend-service"
+  name                  = "tf-test-l7-ilb-backend-service%{random_suffix}"
   project               = "%{project}"
   region                = "us-west1"
   load_balancing_scheme = "INTERNAL_MANAGED"
@@ -221,7 +221,7 @@ resource "google_compute_region_backend_service" "url_map" {
 }
 
 resource "google_compute_forwarding_rule" "default" {
-  name                  = "l7-ilb-forwarding-rule"
+  name                  = "tf-test-l7-ilb-forwarding-rule%{random_suffix}"
   project               = "%{project}"
   region                = "us-west1"
   load_balancing_scheme = "INTERNAL_MANAGED"
@@ -236,21 +236,21 @@ resource "google_compute_forwarding_rule" "default" {
 }
 
 resource "google_compute_region_url_map" "default" {
-  name            = "l7-ilb-map"
+  name            = "tf-test-l7-ilb-map%{random_suffix}"
   project         = "%{project}"
   region          = "us-west1"
   default_service = google_compute_region_backend_service.url_map.id
 }
 
 resource "google_compute_region_target_http_proxy" "default" {
-  name    = "l7-ilb-proxy"
+  name    = "tf-test-l7-ilb-proxy%{random_suffix}"
   project = "%{project}"
   region  = "us-west1"
   url_map = google_compute_region_url_map.default.id
 }
 
 resource "google_compute_region_backend_service" "default" {
-  name                  = "authz-service"
+  name                  = "tf-test-authz-service%{random_suffix}"
   project               = "%{project}"
   region                = "us-west1"
 
@@ -260,7 +260,7 @@ resource "google_compute_region_backend_service" "default" {
 }
 
 resource "google_compute_region_backend_service" "updated" {
-  name                  = "authz-service-updated"
+  name                  = "tf-test-authz-service-updated%{random_suffix}"
   project               = "%{project}"
   region                = "us-west1"
   
@@ -281,7 +281,6 @@ resource "google_network_services_authz_extension" "default" {
   timeout               = "0.1s"
   fail_open             = false
   forward_headers       = ["Authorization"]
-  wire_format           = "EXT_PROC_GRPC"
 
   metadata = {
     forwarding_rule_id = google_compute_forwarding_rule.default.id

Diff for: website/docs/r/network_services_authz_extension.html.markdown

@@ -121,8 +121,7 @@ The following arguments are supported:
 
 * `wire_format` -
   (Optional)
-  The format of communication supported by the callout extension.
-  Default value is `EXT_PROC_GRPC`.
+  The format of communication supported by the callout extension. Will be set to EXT_PROC_GRPC by the backend if no value is set.
   Possible values are: `WIRE_FORMAT_UNSPECIFIED`, `EXT_PROC_GRPC`.
 
 * `project` - (Optional) The ID of the project in which the resource belongs.