From f3788fcd27ed952d6076d68e1b2de7bbcd97b6ea Mon Sep 17 00:00:00 2001 From: Ludovico Magnocavallo Date: Fri, 25 Nov 2022 14:06:31 +0100 Subject: [PATCH] fix tag outputs (#1012) --- modules/organization/README.md | 10 +++++----- modules/organization/outputs.tf | 18 ++++++++++++++---- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/modules/organization/README.md b/modules/organization/README.md index 31dc3de0..2e24c91b 100644 --- a/modules/organization/README.md +++ b/modules/organization/README.md @@ -471,10 +471,10 @@ module "org" { | [firewall_policies](outputs.tf#L35) | Map of firewall policy resources created in the organization. | | | [firewall_policy_id](outputs.tf#L40) | Map of firewall policy ids created in the organization. | | | [network_tag_keys](outputs.tf#L45) | Tag key resources. | | -| [network_tag_values](outputs.tf#L52) | Tag value resources. | | -| [organization_id](outputs.tf#L60) | Organization id dependent on module resources. | | -| [sink_writer_identities](outputs.tf#L77) | Writer identities created for each sink. | | -| [tag_keys](outputs.tf#L85) | Tag key resources. | | -| [tag_values](outputs.tf#L92) | Tag value resources. | | +| [network_tag_values](outputs.tf#L54) | Tag value resources. | | +| [organization_id](outputs.tf#L65) | Organization id dependent on module resources. | | +| [sink_writer_identities](outputs.tf#L82) | Writer identities created for each sink. | | +| [tag_keys](outputs.tf#L90) | Tag key resources. | | +| [tag_values](outputs.tf#L99) | Tag value resources. | | diff --git a/modules/organization/outputs.tf b/modules/organization/outputs.tf index 3617bafb..40d84b47 100644 --- a/modules/organization/outputs.tf +++ b/modules/organization/outputs.tf @@ -45,7 +45,9 @@ output "firewall_policy_id" { output "network_tag_keys" { description = "Tag key resources." value = { - for k, v in google_tags_tag_key.default : k => v if v.purpose != null + for k, v in google_tags_tag_key.default : k => v if( + v.purpose != null && v.purpose != "" + ) } } @@ -53,7 +55,10 @@ output "network_tag_values" { description = "Tag value resources." value = { for k, v in google_tags_tag_value.default - : k => v if google_tags_tag_key.default[split("/", k)[0]].purpose != null + : k => v if( + google_tags_tag_key.default[split("/", k)[0]].purpose != null && + google_tags_tag_key.default[split("/", k)[0]].purpose != "" + ) } } @@ -85,7 +90,9 @@ output "sink_writer_identities" { output "tag_keys" { description = "Tag key resources." value = { - for k, v in google_tags_tag_key.default : k => v if v.purpose == null + for k, v in google_tags_tag_key.default : k => v if( + v.purpose == null || v.purpose == "" + ) } } @@ -93,6 +100,9 @@ output "tag_values" { description = "Tag value resources." value = { for k, v in google_tags_tag_value.default - : k => v if google_tags_tag_key.default[split("/", k)[0]].purpose == null + : k => v if( + google_tags_tag_key.default[split("/", k)[0]].purpose == null || + google_tags_tag_key.default[split("/", k)[0]].purpose == "" + ) } }