Skip to content

Commit b0a90c2

Browse files
c2thornc2thorn
authored
make authz extension wire_format O+C (#12975)
1 parent 75e910a commit b0a90c2

File tree

2 files changed

+24
-26
lines changed

2 files changed

+24
-26
lines changed

‎mmv1/products/networkservices/AuthzExtension.yaml

+2-3
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,8 @@ properties:
142142
- name: 'wireFormat'
143143
type: Enum
144144
description: |
145-
The format of communication supported by the callout extension.
146-
default_value: "EXT_PROC_GRPC"
147-
custom_flatten: 'templates/terraform/custom_flatten/default_if_empty.tmpl'
145+
The format of communication supported by the callout extension. Will be set to EXT_PROC_GRPC by the backend if no value is set.
146+
default_from_api: true
148147
enum_values:
149148
- 'WIRE_FORMAT_UNSPECIFIED'
150149
- 'EXT_PROC_GRPC'

‎mmv1/third_party/terraform/services/networkservices/resource_network_services_authz_extension_test.go

+22-23
Original file line numberDiff line numberDiff line change
@@ -47,21 +47,21 @@ func TestAccNetworkServicesAuthzExtension_update(t *testing.T) {
4747
func testAccNetworkServicesAuthzExtension_start(context map[string]interface{}) string {
4848
return acctest.Nprintf(`
4949
resource "google_compute_network" "default" {
50-
name = "lb-network"
50+
name = "tf-test-lb-network%{random_suffix}"
5151
project = "%{project}"
5252
auto_create_subnetworks = false
5353
}
5454
5555
resource "google_compute_subnetwork" "default" {
56-
name = "backend-subnet"
56+
name = "tf-test-backend-subnet%{random_suffix}"
5757
project = "%{project}"
5858
region = "us-west1"
5959
ip_cidr_range = "10.1.2.0/24"
6060
network = google_compute_network.default.id
6161
}
6262
6363
resource "google_compute_subnetwork" "proxy_only" {
64-
name = "proxy-only-subnet"
64+
name = "tf-test-proxy-only-subnet%{random_suffix}"
6565
project = "%{project}"
6666
region = "us-west1"
6767
ip_cidr_range = "10.129.0.0/23"
@@ -71,7 +71,7 @@ resource "google_compute_subnetwork" "proxy_only" {
7171
}
7272
7373
resource "google_compute_address" "default" {
74-
name = "l7-ilb-ip-address"
74+
name = "tf-test-l7-ilb-ip-address%{random_suffix}"
7575
project = "%{project}"
7676
region = "us-west1"
7777
subnetwork = google_compute_subnetwork.default.id
@@ -81,7 +81,7 @@ resource "google_compute_address" "default" {
8181
8282
8383
resource "google_compute_region_health_check" "default" {
84-
name = "l7-ilb-basic-check"
84+
name = "tf-test-l7-ilb-basic-check%{random_suffix}"
8585
project = "%{project}"
8686
region = "us-west1"
8787
@@ -91,7 +91,7 @@ resource "google_compute_region_health_check" "default" {
9191
}
9292
9393
resource "google_compute_region_backend_service" "url_map" {
94-
name = "l7-ilb-backend-service"
94+
name = "tf-test-l7-ilb-backend-service%{random_suffix}"
9595
project = "%{project}"
9696
region = "us-west1"
9797
load_balancing_scheme = "INTERNAL_MANAGED"
@@ -100,7 +100,7 @@ resource "google_compute_region_backend_service" "url_map" {
100100
}
101101
102102
resource "google_compute_forwarding_rule" "default" {
103-
name = "l7-ilb-forwarding-rule"
103+
name = "tf-test-l7-ilb-forwarding-rule%{random_suffix}"
104104
project = "%{project}"
105105
region = "us-west1"
106106
load_balancing_scheme = "INTERNAL_MANAGED"
@@ -115,21 +115,21 @@ resource "google_compute_forwarding_rule" "default" {
115115
}
116116
117117
resource "google_compute_region_url_map" "default" {
118-
name = "l7-ilb-map"
118+
name = "tf-test-l7-ilb-map%{random_suffix}"
119119
project = "%{project}"
120120
region = "us-west1"
121121
default_service = google_compute_region_backend_service.url_map.id
122122
}
123123
124124
resource "google_compute_region_target_http_proxy" "default" {
125-
name = "l7-ilb-proxy"
125+
name = "tf-test-l7-ilb-proxy%{random_suffix}"
126126
project = "%{project}"
127127
region = "us-west1"
128128
url_map = google_compute_region_url_map.default.id
129129
}
130130
131131
resource "google_compute_region_backend_service" "default" {
132-
name = "authz-service"
132+
name = "tf-test-authz-service%{random_suffix}"
133133
project = "%{project}"
134134
region = "us-west1"
135135
@@ -139,7 +139,7 @@ resource "google_compute_region_backend_service" "default" {
139139
}
140140
141141
resource "google_compute_region_backend_service" "updated" {
142-
name = "authz-service-updated"
142+
name = "tf-test-authz-service-updated%{random_suffix}"
143143
project = "%{project}"
144144
region = "us-west1"
145145
@@ -167,21 +167,21 @@ resource "google_network_services_authz_extension" "default" {
167167
func testAccNetworkServicesAuthzExtension_update(context map[string]interface{}) string {
168168
return acctest.Nprintf(`
169169
resource "google_compute_network" "default" {
170-
name = "lb-network"
170+
name = "tf-test-lb-network%{random_suffix}"
171171
project = "%{project}"
172172
auto_create_subnetworks = false
173173
}
174174
175175
resource "google_compute_subnetwork" "default" {
176-
name = "backend-subnet"
176+
name = "tf-test-backend-subnet%{random_suffix}"
177177
project = "%{project}"
178178
region = "us-west1"
179179
ip_cidr_range = "10.1.2.0/24"
180180
network = google_compute_network.default.id
181181
}
182182
183183
resource "google_compute_subnetwork" "proxy_only" {
184-
name = "proxy-only-subnet"
184+
name = "tf-test-proxy-only-subnet%{random_suffix}"
185185
project = "%{project}"
186186
region = "us-west1"
187187
ip_cidr_range = "10.129.0.0/23"
@@ -191,7 +191,7 @@ resource "google_compute_subnetwork" "proxy_only" {
191191
}
192192
193193
resource "google_compute_address" "default" {
194-
name = "l7-ilb-ip-address"
194+
name = "tf-test-l7-ilb-ip-address%{random_suffix}"
195195
project = "%{project}"
196196
region = "us-west1"
197197
subnetwork = google_compute_subnetwork.default.id
@@ -200,7 +200,7 @@ resource "google_compute_address" "default" {
200200
}
201201
202202
resource "google_compute_region_health_check" "default" {
203-
name = "l7-ilb-basic-check"
203+
name = "tf-test-l7-ilb-basic-check%{random_suffix}"
204204
project = "%{project}"
205205
region = "us-west1"
206206
@@ -210,7 +210,7 @@ resource "google_compute_region_health_check" "default" {
210210
}
211211
212212
resource "google_compute_region_backend_service" "url_map" {
213-
name = "l7-ilb-backend-service"
213+
name = "tf-test-l7-ilb-backend-service%{random_suffix}"
214214
project = "%{project}"
215215
region = "us-west1"
216216
load_balancing_scheme = "INTERNAL_MANAGED"
@@ -219,7 +219,7 @@ resource "google_compute_region_backend_service" "url_map" {
219219
}
220220
221221
resource "google_compute_forwarding_rule" "default" {
222-
name = "l7-ilb-forwarding-rule"
222+
name = "tf-test-l7-ilb-forwarding-rule%{random_suffix}"
223223
project = "%{project}"
224224
region = "us-west1"
225225
load_balancing_scheme = "INTERNAL_MANAGED"
@@ -234,21 +234,21 @@ resource "google_compute_forwarding_rule" "default" {
234234
}
235235
236236
resource "google_compute_region_url_map" "default" {
237-
name = "l7-ilb-map"
237+
name = "tf-test-l7-ilb-map%{random_suffix}"
238238
project = "%{project}"
239239
region = "us-west1"
240240
default_service = google_compute_region_backend_service.url_map.id
241241
}
242242
243243
resource "google_compute_region_target_http_proxy" "default" {
244-
name = "l7-ilb-proxy"
244+
name = "tf-test-l7-ilb-proxy%{random_suffix}"
245245
project = "%{project}"
246246
region = "us-west1"
247247
url_map = google_compute_region_url_map.default.id
248248
}
249249
250250
resource "google_compute_region_backend_service" "default" {
251-
name = "authz-service"
251+
name = "tf-test-authz-service%{random_suffix}"
252252
project = "%{project}"
253253
region = "us-west1"
254254
@@ -258,7 +258,7 @@ resource "google_compute_region_backend_service" "default" {
258258
}
259259
260260
resource "google_compute_region_backend_service" "updated" {
261-
name = "authz-service-updated"
261+
name = "tf-test-authz-service-updated%{random_suffix}"
262262
project = "%{project}"
263263
region = "us-west1"
264264
@@ -279,7 +279,6 @@ resource "google_network_services_authz_extension" "default" {
279279
timeout = "0.1s"
280280
fail_open = false
281281
forward_headers = ["Authorization"]
282-
wire_format = "EXT_PROC_GRPC"
283282
284283
metadata = {
285284
forwarding_rule_id = google_compute_forwarding_rule.default.id

0 commit comments

Comments
 (0)