diff --git a/fast/stages/03-project-factory/dev/README.md b/fast/stages/03-project-factory/dev/README.md index 19eda302..ba505614 100644 --- a/fast/stages/03-project-factory/dev/README.md +++ b/fast/stages/03-project-factory/dev/README.md @@ -113,8 +113,8 @@ terraform apply | [data_dir](variables.tf#L28) | Relative path for the folder storing configuration data. | string | | "data/projects" | | | [defaults_file](variables.tf#L41) | Relative path for the file storing the project factory configuration. | string | | "data/defaults.yaml" | | | [environment_dns_zone](variables.tf#L34) | DNS zone suffix for environment. | string | | null | 02-networking | -| [shared_vpc_self_links](variables.tf#L58) | Self link for the shared VPC. | object({…}) | | null | 02-networking | -| [vpc_host_project_ids](variables.tf#L67) | Host project for the shared VPC. | object({…}) | | null | 02-networking | +| [host_project_ids](variables.tf#L67) | Host project for the shared VPC. | object({…}) | | null | 02-networking | +| [vpc_self_links](variables.tf#L58) | Self link for the shared VPC. | object({…}) | | null | 02-networking | ## Outputs diff --git a/fast/stages/03-project-factory/dev/main.tf b/fast/stages/03-project-factory/dev/main.tf index 20b74029..802bff9d 100644 --- a/fast/stages/03-project-factory/dev/main.tf +++ b/fast/stages/03-project-factory/dev/main.tf @@ -22,8 +22,8 @@ locals { _defaults_net = { billing_account_id = var.billing_account.id environment_dns_zone = var.environment_dns_zone - shared_vpc_self_link = try(var.shared_vpc_self_links["dev-spoke-0"], null) - vpc_host_project = try(var.vpc_host_project_ids["dev-spoke-0"], null) + shared_vpc_self_link = try(var.vpc_self_links["dev-spoke-0"], null) + vpc_host_project = try(var.host_project_ids["dev-spoke-0"], null) } defaults = merge(local._defaults, local._defaults_net) projects = { diff --git a/fast/stages/03-project-factory/dev/variables.tf b/fast/stages/03-project-factory/dev/variables.tf index 3773902d..0fe8c7dc 100644 --- a/fast/stages/03-project-factory/dev/variables.tf +++ b/fast/stages/03-project-factory/dev/variables.tf @@ -55,7 +55,7 @@ variable "prefix" { } } -variable "shared_vpc_self_links" { +variable "vpc_self_links" { # tfdoc:variable:source 02-networking description = "Self link for the shared VPC." type = object({ @@ -64,7 +64,7 @@ variable "shared_vpc_self_links" { default = null } -variable "vpc_host_project_ids" { +variable "host_project_ids" { # tfdoc:variable:source 02-networking description = "Host project for the shared VPC." type = object({ diff --git a/tests/fast/stages/s03_project_factory/fixture/main.tf b/tests/fast/stages/s03_project_factory/fixture/main.tf index 4da676ef..420cc256 100644 --- a/tests/fast/stages/s03_project_factory/fixture/main.tf +++ b/tests/fast/stages/s03_project_factory/fixture/main.tf @@ -24,7 +24,7 @@ module "projects" { id = "000000-111111-222222" organization_id = 123456789012 } - shared_vpc_self_links = { + vpc_self_links = { dev-spoke-0 = "link" } }