From 7baa1f98d4a45abbd9a8a8a02aa00b3959a73d68 Mon Sep 17 00:00:00 2001 From: Julio Castillo Date: Thu, 23 Nov 2023 08:41:31 +0100 Subject: [PATCH] Output all neg ids in app lbs (#1879) Co-authored-by: Ludovico Magnocavallo --- modules/net-lb-app-ext/README.md | 11 +++++++---- modules/net-lb-app-ext/outputs.tf | 23 ++++++++++++++++++++++- modules/net-lb-app-int/README.md | 4 +++- modules/net-lb-app-int/outputs.tf | 17 ++++++++++++++++- 4 files changed, 48 insertions(+), 7 deletions(-) diff --git a/modules/net-lb-app-ext/README.md b/modules/net-lb-app-ext/README.md index 72b1e48f..ad345b0e 100644 --- a/modules/net-lb-app-ext/README.md +++ b/modules/net-lb-app-ext/README.md @@ -888,8 +888,11 @@ module "glb-0" { | [backend_service_ids](outputs.tf#L22) | Backend service resources. | | | [backend_service_names](outputs.tf#L29) | Backend service resource names. | | | [forwarding_rule](outputs.tf#L36) | Forwarding rule resource. | | -| [group_ids](outputs.tf#L41) | Autogenerated instance group ids. | | -| [health_check_ids](outputs.tf#L48) | Autogenerated health check ids. | | -| [id](outputs.tf#L55) | Fully qualified forwarding rule id. | | -| [neg_ids](outputs.tf#L60) | Autogenerated network endpoint group ids. | | +| [global_neg_ids](outputs.tf#L41) | Autogenerated global network endpoint group ids. | | +| [group_ids](outputs.tf#L48) | Autogenerated instance group ids. | | +| [health_check_ids](outputs.tf#L55) | Autogenerated health check ids. | | +| [id](outputs.tf#L62) | Fully qualified forwarding rule id. | | +| [neg_ids](outputs.tf#L67) | Autogenerated network endpoint group ids. | | +| [psc_neg_ids](outputs.tf#L74) | Autogenerated PSC network endpoint group ids. | | +| [serverless_neg_ids](outputs.tf#L81) | Autogenerated serverless network endpoint group ids. | | diff --git a/modules/net-lb-app-ext/outputs.tf b/modules/net-lb-app-ext/outputs.tf index 47f5607f..92aa1354 100644 --- a/modules/net-lb-app-ext/outputs.tf +++ b/modules/net-lb-app-ext/outputs.tf @@ -1,5 +1,5 @@ /** - * Copyright 2022 Google LLC + * Copyright 2023 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -38,6 +38,13 @@ output "forwarding_rule" { value = google_compute_global_forwarding_rule.default } +output "global_neg_ids" { + description = "Autogenerated global network endpoint group ids." + value = { + for k, v in google_compute_global_network_endpoint_group.default : k => v.id + } +} + output "group_ids" { description = "Autogenerated instance group ids." value = { @@ -63,3 +70,17 @@ output "neg_ids" { for k, v in google_compute_network_endpoint_group.default : k => v.id } } + +output "psc_neg_ids" { + description = "Autogenerated PSC network endpoint group ids." + value = { + for k, v in google_compute_region_network_endpoint_group.psc : k => v.id + } +} + +output "serverless_neg_ids" { + description = "Autogenerated serverless network endpoint group ids." + value = { + for k, v in google_compute_region_network_endpoint_group.serverless : k => v.id + } +} diff --git a/modules/net-lb-app-int/README.md b/modules/net-lb-app-int/README.md index 3616494a..bf4b65e1 100644 --- a/modules/net-lb-app-int/README.md +++ b/modules/net-lb-app-int/README.md @@ -687,5 +687,7 @@ module "ilb-l7" { | [group_ids](outputs.tf#L41) | Autogenerated instance group ids. | | | [health_check_ids](outputs.tf#L48) | Autogenerated health check ids. | | | [id](outputs.tf#L55) | Fully qualified forwarding rule id. | | -| [neg_ids](outputs.tf#L60) | Autogenerated network endpoint group ids. | | +| [neg_ids](outputs.tf#L61) | Autogenerated network endpoint group ids. | | +| [psc_neg_ids](outputs.tf#L68) | Autogenerated PSC network endpoint group ids. | | +| [regional_neg_ids](outputs.tf#L75) | Autogenerated regional network endpoint group ids. | | diff --git a/modules/net-lb-app-int/outputs.tf b/modules/net-lb-app-int/outputs.tf index 1491d8ca..e26b594b 100644 --- a/modules/net-lb-app-int/outputs.tf +++ b/modules/net-lb-app-int/outputs.tf @@ -1,5 +1,5 @@ /** - * Copyright 2022 Google LLC + * Copyright 2023 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -57,9 +57,24 @@ output "id" { value = google_compute_forwarding_rule.default.id } + output "neg_ids" { description = "Autogenerated network endpoint group ids." value = { for k, v in google_compute_network_endpoint_group.default : k => v.id } } + +output "psc_neg_ids" { + description = "Autogenerated PSC network endpoint group ids." + value = { + for k, v in google_compute_region_network_endpoint_group.psc : k => v.id + } +} + +output "regional_neg_ids" { + description = "Autogenerated regional network endpoint group ids." + value = { + for k, v in google_compute_region_network_endpoint_group.default : k => v.id + } +}