Skip to content

Commit acff1dd

Browse files
authored
fix: explicitly configure disabled IAP (#4139)
1 parent 0734f00 commit acff1dd

4 files changed

Lines changed: 20 additions & 32 deletions

File tree

modules/net-lb-app-ext-regional/backend-service.tf

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -194,14 +194,11 @@ resource "google_compute_region_backend_service" "default" {
194194
}
195195
}
196196

197-
dynamic "iap" {
198-
for_each = each.value.iap_config == null ? [] : [each.value.iap_config]
199-
content {
200-
enabled = true
201-
oauth2_client_id = try(iap.value.oauth2_client_id, null)
202-
oauth2_client_secret = try(iap.value.oauth2_client_secret, null)
203-
oauth2_client_secret_sha256 = try(iap.value.oauth2_client_secret_sha256, null)
204-
}
197+
iap {
198+
enabled = each.value.iap_config != null
199+
oauth2_client_id = try(each.value.iap_config.oauth2_client_id, null)
200+
oauth2_client_secret = try(each.value.iap_config.oauth2_client_secret, null)
201+
oauth2_client_secret_sha256 = try(each.value.iap_config.oauth2_client_secret_sha256, null)
205202
}
206203

207204
dynamic "log_config" {

modules/net-lb-app-ext/backend-service.tf

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -209,14 +209,11 @@ resource "google_compute_backend_service" "default" {
209209
}
210210
}
211211

212-
dynamic "iap" {
213-
for_each = each.value.iap_config == null ? [] : [each.value.iap_config]
214-
content {
215-
enabled = true
216-
oauth2_client_id = try(iap.value.oauth2_client_id, null)
217-
oauth2_client_secret = try(iap.value.oauth2_client_secret, null)
218-
oauth2_client_secret_sha256 = try(iap.value.oauth2_client_secret_sha256, null)
219-
}
212+
iap {
213+
enabled = each.value.iap_config != null
214+
oauth2_client_id = try(each.value.iap_config.oauth2_client_id, null)
215+
oauth2_client_secret = try(each.value.iap_config.oauth2_client_secret, null)
216+
oauth2_client_secret_sha256 = try(each.value.iap_config.oauth2_client_secret_sha256, null)
220217
}
221218

222219
dynamic "log_config" {

modules/net-lb-app-int-cross-region/backend-service.tf

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -139,14 +139,11 @@ resource "google_compute_backend_service" "default" {
139139
}
140140
}
141141

142-
dynamic "iap" {
143-
for_each = each.value.iap_config == null ? [] : [each.value.iap_config]
144-
content {
145-
enabled = true
146-
oauth2_client_id = try(iap.value.oauth2_client_id, null)
147-
oauth2_client_secret = try(iap.value.oauth2_client_secret, null)
148-
oauth2_client_secret_sha256 = try(iap.value.oauth2_client_secret_sha256, null)
149-
}
142+
iap {
143+
enabled = each.value.iap_config != null
144+
oauth2_client_id = try(each.value.iap_config.oauth2_client_id, null)
145+
oauth2_client_secret = try(each.value.iap_config.oauth2_client_secret, null)
146+
oauth2_client_secret_sha256 = try(each.value.iap_config.oauth2_client_secret_sha256, null)
150147
}
151148

152149
dynamic "log_config" {

modules/net-lb-app-int/backend-service.tf

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -152,14 +152,11 @@ resource "google_compute_region_backend_service" "default" {
152152
}
153153
}
154154

155-
dynamic "iap" {
156-
for_each = each.value.iap_config == null ? [] : [each.value.iap_config]
157-
content {
158-
enabled = true
159-
oauth2_client_id = try(iap.value.oauth2_client_id, null)
160-
oauth2_client_secret = try(iap.value.oauth2_client_secret, null)
161-
oauth2_client_secret_sha256 = try(iap.value.oauth2_client_secret_sha256, null)
162-
}
155+
iap {
156+
enabled = each.value.iap_config != null
157+
oauth2_client_id = try(each.value.iap_config.oauth2_client_id, null)
158+
oauth2_client_secret = try(each.value.iap_config.oauth2_client_secret, null)
159+
oauth2_client_secret_sha256 = try(each.value.iap_config.oauth2_client_secret_sha256, null)
163160
}
164161

165162
dynamic "log_config" {

0 commit comments

Comments
 (0)