Skip to content

fix: updated iap_config behavior to match TPG 6.0 #469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 11, 2024
Merged

fix: updated iap_config behavior to match TPG 6.0 #469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c66a83
updated iap_config behavior to match TPG 6.0
imrannayer Nov 11, 2024
96e80db
updated
imrannayer Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions autogen/main.tf.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,13 +256,10 @@ resource "google_compute_backend_service" "default" {
}
}

dynamic "iap" {
for_each = try(each.value["iap_config"], null) != null && lookup(try(each.value["iap_config"], {}), "enable", false) ? [1] : []
content {
enabled = lookup(each.value["iap_config"], "enable", false)
oauth2_client_id = lookup(each.value["iap_config"], "oauth2_client_id")
oauth2_client_secret = lookup(each.value["iap_config"], "oauth2_client_secret")
}
iap {
enabled = try(each.value["iap_config"], null) == null ? false : lookup(try(each.value["iap_config"], {}), "enable", false)
oauth2_client_id = try(each.value["iap_config"], null) == null ? null : lookup(each.value["iap_config"], "oauth2_client_id")
oauth2_client_secret = try(each.value["iap_config"], null) == null ? null : lookup(each.value["iap_config"], "oauth2_client_secret")
}

dynamic "cdn_policy" {
Expand Down
2 changes: 1 addition & 1 deletion examples/user-managed-google-managed-ssl/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ locals {

module "gce-lb-https" {
source = "terraform-google-modules/lb-http/google"
version = "~> 11.0"
version = "~> 12.0"

name = var.network_name
project = var.project_id
Expand Down
11 changes: 4 additions & 7 deletions main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,13 +238,10 @@ resource "google_compute_backend_service" "default" {
}
}

dynamic "iap" {
for_each = try(each.value["iap_config"], null) != null && lookup(try(each.value["iap_config"], {}), "enable", false) ? [1] : []
content {
enabled = lookup(each.value["iap_config"], "enable", false)
oauth2_client_id = lookup(each.value["iap_config"], "oauth2_client_id")
oauth2_client_secret = lookup(each.value["iap_config"], "oauth2_client_secret")
}
iap {
enabled = try(each.value["iap_config"], null) == null ? false : lookup(try(each.value["iap_config"], {}), "enable", false)
oauth2_client_id = try(each.value["iap_config"], null) == null ? null : lookup(each.value["iap_config"], "oauth2_client_id")
oauth2_client_secret = try(each.value["iap_config"], null) == null ? null : lookup(each.value["iap_config"], "oauth2_client_secret")
}

dynamic "cdn_policy" {
Expand Down
11 changes: 4 additions & 7 deletions modules/dynamic_backends/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,13 +238,10 @@ resource "google_compute_backend_service" "default" {
}
}

dynamic "iap" {
for_each = try(each.value["iap_config"], null) != null && lookup(try(each.value["iap_config"], {}), "enable", false) ? [1] : []
content {
enabled = lookup(each.value["iap_config"], "enable", false)
oauth2_client_id = lookup(each.value["iap_config"], "oauth2_client_id")
oauth2_client_secret = lookup(each.value["iap_config"], "oauth2_client_secret")
}
iap {
enabled = try(each.value["iap_config"], null) == null ? false : lookup(try(each.value["iap_config"], {}), "enable", false)
oauth2_client_id = try(each.value["iap_config"], null) == null ? null : lookup(each.value["iap_config"], "oauth2_client_id")
oauth2_client_secret = try(each.value["iap_config"], null) == null ? null : lookup(each.value["iap_config"], "oauth2_client_secret")
}

dynamic "cdn_policy" {
Expand Down
11 changes: 4 additions & 7 deletions modules/serverless_negs/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,13 +233,10 @@ resource "google_compute_backend_service" "default" {
}
}

dynamic "iap" {
for_each = try(each.value["iap_config"], null) != null && lookup(try(each.value["iap_config"], {}), "enable", false) ? [1] : []
content {
enabled = lookup(each.value["iap_config"], "enable", false)
oauth2_client_id = lookup(each.value["iap_config"], "oauth2_client_id")
oauth2_client_secret = lookup(each.value["iap_config"], "oauth2_client_secret")
}
iap {
enabled = try(each.value["iap_config"], null) == null ? false : lookup(try(each.value["iap_config"], {}), "enable", false)
oauth2_client_id = try(each.value["iap_config"], null) == null ? null : lookup(each.value["iap_config"], "oauth2_client_id")
oauth2_client_secret = try(each.value["iap_config"], null) == null ? null : lookup(each.value["iap_config"], "oauth2_client_secret")
}

dynamic "cdn_policy" {
Expand Down
2 changes: 2 additions & 0 deletions test/setup/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ module "project-ci-lb-http" {
default_service_account = "keep"
disable_dependent_services = false
disable_services_on_destroy = false
deletion_policy = "DELETE"

activate_apis = [
"cloudresourcemanager.googleapis.com",
Expand All @@ -50,6 +51,7 @@ module "project-ci-lb-http-1" {
default_service_account = "keep"
disable_dependent_services = false
disable_services_on_destroy = false
deletion_policy = "DELETE"

activate_apis = [
"cloudresourcemanager.googleapis.com",
Expand Down
Loading