From dca6e383b72b5f27dd8cbf67b6e7bad75ca86287 Mon Sep 17 00:00:00 2001 From: Elia <79325566+eliamaldini@users.noreply.github.com> Date: Fri, 20 Sep 2024 13:35:18 +0200 Subject: [PATCH] Fix permadiff on iap attribute in net-lb-app-int module (#2590) * fixed attribute default * fix blueprint inventory * fix outputs --------- Co-authored-by: Ludo --- modules/net-lb-int/README.md | 26 +++++++++---------- modules/net-lb-int/main.tf | 2 ++ modules/net-lb-int/outputs.tf | 1 + .../examples/multiple-fw-rules.yaml | 3 ++- 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/modules/net-lb-int/README.md b/modules/net-lb-int/README.md index 67065a3a28..80568945a3 100644 --- a/modules/net-lb-int/README.md +++ b/modules/net-lb-int/README.md @@ -383,17 +383,17 @@ One other issue is a `Provider produced inconsistent final plan` error which is | name | description | sensitive | |---|---|:---:| -| [backend_service](outputs.tf#L17) | Backend resource. | | -| [backend_service_id](outputs.tf#L22) | Backend id. | | -| [backend_service_self_link](outputs.tf#L27) | Backend self link. | | -| [forwarding_rule_addresses](outputs.tf#L32) | Forwarding rule address. | | -| [forwarding_rule_self_links](outputs.tf#L40) | Forwarding rule self links. | | -| [forwarding_rules](outputs.tf#L48) | Forwarding rule resources. | | -| [group_self_links](outputs.tf#L56) | Optional unmanaged instance group self links. | | -| [groups](outputs.tf#L63) | Optional unmanaged instance group resources. | | -| [health_check](outputs.tf#L68) | Auto-created health-check resource. | | -| [health_check_id](outputs.tf#L73) | Auto-created health-check id. | | -| [health_check_self_link](outputs.tf#L78) | Auto-created health-check self link. | | -| [id](outputs.tf#L83) | Fully qualified forwarding rule ids. | | -| [service_attachment_ids](outputs.tf#L91) | Service attachment ids. | | +| [backend_service](outputs.tf#L17) | Backend resource. | ✓ | +| [backend_service_id](outputs.tf#L23) | Backend id. | | +| [backend_service_self_link](outputs.tf#L28) | Backend self link. | | +| [forwarding_rule_addresses](outputs.tf#L33) | Forwarding rule address. | | +| [forwarding_rule_self_links](outputs.tf#L41) | Forwarding rule self links. | | +| [forwarding_rules](outputs.tf#L49) | Forwarding rule resources. | | +| [group_self_links](outputs.tf#L57) | Optional unmanaged instance group self links. | | +| [groups](outputs.tf#L64) | Optional unmanaged instance group resources. | | +| [health_check](outputs.tf#L69) | Auto-created health-check resource. | | +| [health_check_id](outputs.tf#L74) | Auto-created health-check id. | | +| [health_check_self_link](outputs.tf#L79) | Auto-created health-check self link. | | +| [id](outputs.tf#L84) | Fully qualified forwarding rule ids. | | +| [service_attachment_ids](outputs.tf#L92) | Service attachment ids. | | diff --git a/modules/net-lb-int/main.tf b/modules/net-lb-int/main.tf index 895a824980..2b53bd38ef 100644 --- a/modules/net-lb-int/main.tf +++ b/modules/net-lb-int/main.tf @@ -79,6 +79,8 @@ resource "google_compute_region_backend_service" "default" { session_affinity = var.backend_service_config.session_affinity timeout_sec = var.backend_service_config.timeout_sec + iap { enabled = false } + dynamic "backend" { for_each = { for b in var.backends : b.group => b } content { diff --git a/modules/net-lb-int/outputs.tf b/modules/net-lb-int/outputs.tf index 53ce6878b5..29c925443e 100644 --- a/modules/net-lb-int/outputs.tf +++ b/modules/net-lb-int/outputs.tf @@ -16,6 +16,7 @@ output "backend_service" { description = "Backend resource." + sensitive = true value = google_compute_region_backend_service.default } diff --git a/tests/blueprints/third_party_solutions/f5_bigip/f5_bigip_ha_active/examples/multiple-fw-rules.yaml b/tests/blueprints/third_party_solutions/f5_bigip/f5_bigip_ha_active/examples/multiple-fw-rules.yaml index 87094a361c..324e1878cc 100644 --- a/tests/blueprints/third_party_solutions/f5_bigip/f5_bigip_ha_active/examples/multiple-fw-rules.yaml +++ b/tests/blueprints/third_party_solutions/f5_bigip/f5_bigip_ha_active/examples/multiple-fw-rules.yaml @@ -320,7 +320,8 @@ values: description: Terraform managed. enable_cdn: null failover_policy: [] - iap: [] + iap: + - enabled: false load_balancing_scheme: INTERNAL locality_lb_policy: null name: test-ilb