replace : with - in output keys

This commit is contained in:
Ludovico Magnocavallo 2022-02-16 08:20:22 +01:00
parent 442e647caf
commit c0f73cb3be
5 changed files with 32 additions and 34 deletions

View File

@ -383,10 +383,10 @@ Don't forget to add a peering zone in the landing project and point it to the ne
| name | description | sensitive | consumers |
|---|---|:---:|---|
| [host_project_ids](outputs.tf#L52) | Network project ids. | | |
| [host_project_numbers](outputs.tf#L57) | Network project numbers. | | |
| [shared_vpc_self_links](outputs.tf#L62) | Shared VPC host projects. | | |
| [tfvars](outputs.tf#L81) | Terraform variables file for the following stages. | ✓ | |
| [vpn_gateway_endpoints](outputs.tf#L67) | External IP Addresses for the GCP VPN gateways. | | |
| [host_project_ids](outputs.tf#L51) | Network project ids. | | |
| [host_project_numbers](outputs.tf#L56) | Network project numbers. | | |
| [shared_vpc_self_links](outputs.tf#L61) | Shared VPC host projects. | | |
| [tfvars](outputs.tf#L80) | Terraform variables file for the following stages. | ✓ | |
| [vpn_gateway_endpoints](outputs.tf#L66) | External IP Addresses for the GCP VPN gateways. | | |
<!-- END TFDOC -->

View File

@ -16,21 +16,20 @@
locals {
host_project_ids = {
"dev:spoke-0" = module.dev-spoke-project.project_id
"prod:landing" = module.landing-project.project_id
"prod:spoke-0" = module.prod-spoke-project.project_id
dev-spoke-0 = module.dev-spoke-project.project_id
prod-landing = module.landing-project.project_id
prod-spoke-0 = module.prod-spoke-project.project_id
}
host_project_numbers = {
"dev:spoke-0" = module.dev-spoke-project.number
"prod:landing" = module.landing-project.number
"prod:spoke-0" = module.prod-spoke-project.number
dev-spoke-0 = module.dev-spoke-project.number
prod-landing = module.landing-project.number
prod-spoke-0 = module.prod-spoke-project.number
}
vpc_self_links = {
"prod:landing-trusted" = module.landing-trusted-vpc.self_link
"prod:landing-untrusted" = module.landing-untrusted-vpc.self_link
"dev:spoke-0" = module.dev-spoke-vpc.self_link
"prod:spoke-0" = module.prod-spoke-vpc.self_link
prod-landing-trusted = module.landing-trusted-vpc.self_link
prod-landing-untrusted = module.landing-untrusted-vpc.self_link
dev-spoke-0 = module.dev-spoke-vpc.self_link
prod-spoke-0 = module.prod-spoke-vpc.self_link
}
}

View File

@ -328,11 +328,11 @@ DNS configurations are centralised in the `dns.tf` file. Spokes delegate DNS res
| name | description | sensitive | consumers |
|---|---|:---:|---|
| [cloud_dns_inbound_policy](outputs.tf#L51) | IP Addresses for Cloud DNS inbound policy. | | |
| [host_project_ids](outputs.tf#L56) | Network project ids. | | |
| [host_project_numbers](outputs.tf#L61) | Network project numbers. | | |
| [shared_vpc_self_links](outputs.tf#L66) | Shared VPC host projects. | | |
| [tfvars](outputs.tf#L81) | Terraform variables file for the following stages. | ✓ | |
| [vpn_gateway_endpoints](outputs.tf#L71) | External IP Addresses for the GCP VPN gateways. | | |
| [cloud_dns_inbound_policy](outputs.tf#L50) | IP Addresses for Cloud DNS inbound policy. | | |
| [host_project_ids](outputs.tf#L55) | Network project ids. | | |
| [host_project_numbers](outputs.tf#L60) | Network project numbers. | | |
| [shared_vpc_self_links](outputs.tf#L65) | Shared VPC host projects. | | |
| [tfvars](outputs.tf#L80) | Terraform variables file for the following stages. | ✓ | |
| [vpn_gateway_endpoints](outputs.tf#L70) | External IP Addresses for the GCP VPN gateways. | | |
<!-- END TFDOC -->

View File

@ -16,20 +16,19 @@
locals {
host_project_ids = {
"dev:spoke-0" = module.dev-spoke-project.project_id
"prod:landing" = module.landing-project.project_id
"prod:spoke-0" = module.prod-spoke-project.project_id
dev-spoke-0 = module.dev-spoke-project.project_id
prod-landing = module.landing-project.project_id
prod-spoke-0 = module.prod-spoke-project.project_id
}
host_project_numbers = {
"dev:spoke-0" = module.dev-spoke-project.number
"prod:landing" = module.landing-project.number
"prod:spoke-0" = module.prod-spoke-project.number
dev-spoke-0 = module.dev-spoke-project.number
prod-landing = module.landing-project.number
prod-spoke-0 = module.prod-spoke-project.number
}
vpc_self_links = {
"prod:landing" = module.landing-vpc.self_link
"dev:spoke-0" = module.dev-spoke-vpc.self_link
"prod:spoke-0" = module.prod-spoke-vpc.self_link
prod-landing = module.landing-vpc.self_link
dev-spoke-0 = module.dev-spoke-vpc.self_link
prod-spoke-0 = module.prod-spoke-vpc.self_link
}
}

View File

@ -19,7 +19,7 @@ locals {
flatten([
for location, mod in module.dev-sec-kms : [
for name, id in mod.key_ids : {
key = "dev:${name}:${location}"
key = "dev-${name}:${location}"
id = id
}
]
@ -27,7 +27,7 @@ locals {
flatten([
for location, mod in module.prod-sec-kms : [
for name, id in mod.key_ids : {
key = "prod:${name}:${location}"
key = "prod-${name}:${location}"
id = id
}
]