zecfoundation
/
cloud-foundation-fabric
mirror of https://github.com/ZcashFoundation/cloud-foundation-fabric.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix tag outputs (#1012)

This commit is contained in:
Ludovico Magnocavallo 2022-11-25 14:06:31 +01:00 committed by GitHub
parent 0191ca620f
commit f3788fcd27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/organization/README.md
View File

@ -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. | |
<!-- END TFDOC -->

18
modules/organization/outputs.tf
View File

@ -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 == ""
)
}
}