fix stage links, fix stage 1 output file names (#1134)

GoogleCloudPlatform · Feb 6, 2023 · 9b8de3e · 9b8de3e
1 parent 44af6e5
commit 9b8de3e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/fast/stage-links.sh b/fast/stage-links.sh
@@ -73,8 +73,8 @@ case $STAGE_NAME in
   PROVIDER="tenants/${TENANT}/providers/1-resman-tenant-providers.tf"
   TFVARS="tenants/${TENANT}/tfvars/0-bootstrap-tenant.auto.tfvars.json"
   ;;
-"2-"*)
-  PROVIDER="providers/multitenant/${STAGE_NAME}-providers.tf"
+"2-networking"*)
+  PROVIDER="providers/2-networking-providers.tf"
   TFVARS="tfvars/0-bootstrap.auto.tfvars.json
   tfvars/1-resman.auto.tfvars.json"
   ;;

diff --git a/fast/stages/1-resman/outputs.tf b/fast/stages/1-resman/outputs.tf
@@ -98,63 +98,63 @@ locals {
   )
   providers = merge(
     {
-      "2-0-networking" = templatefile(local._tpl_providers, {
+      "2-networking" = templatefile(local._tpl_providers, {
         backend_extra = null
         bucket        = module.branch-network-gcs.name
         name          = "networking"
         sa            = module.branch-network-sa.email
       })
-      "2-0-security" = templatefile(local._tpl_providers, {
+      "2-security" = templatefile(local._tpl_providers, {
         backend_extra = null
         bucket        = module.branch-security-gcs.name
         name          = "security"
         sa            = module.branch-security-sa.email
       })
     },
     !var.fast_features.data_platform ? {} : {
-      "3-0-data-platform-dev" = templatefile(local._tpl_providers, {
+      "3-data-platform-dev" = templatefile(local._tpl_providers, {
         backend_extra = null
         bucket        = module.branch-dp-dev-gcs.0.name
         name          = "dp-dev"
         sa            = module.branch-dp-dev-sa.0.email
       })
-      "3-0-data-platform-prod" = templatefile(local._tpl_providers, {
+      "3-data-platform-prod" = templatefile(local._tpl_providers, {
         backend_extra = null
         bucket        = module.branch-dp-prod-gcs.0.name
         name          = "dp-prod"
         sa            = module.branch-dp-prod-sa.0.email
       })
     },
     !var.fast_features.gke ? {} : {
-      "3-0-gke-dev" = templatefile(local._tpl_providers, {
+      "3-gke-dev" = templatefile(local._tpl_providers, {
         backend_extra = null
         bucket        = module.branch-gke-dev-gcs.0.name
         name          = "gke-dev"
         sa            = module.branch-gke-dev-sa.0.email
       })
-      "3-0-gke-prod" = templatefile(local._tpl_providers, {
+      "3-gke-prod" = templatefile(local._tpl_providers, {
         backend_extra = null
         bucket        = module.branch-gke-prod-gcs.0.name
         name          = "gke-prod"
         sa            = module.branch-gke-prod-sa.0.email
       })
     },
     !var.fast_features.project_factory ? {} : {
-      "3-0-project-factory-dev" = templatefile(local._tpl_providers, {
+      "3-project-factory-dev" = templatefile(local._tpl_providers, {
         backend_extra = null
         bucket        = module.branch-pf-dev-gcs.0.name
         name          = "team-dev"
         sa            = module.branch-pf-dev-sa.0.email
       })
-      "3-0-project-factory-prod" = templatefile(local._tpl_providers, {
+      "3-project-factory-prod" = templatefile(local._tpl_providers, {
         backend_extra = null
         bucket        = module.branch-pf-prod-gcs.0.name
         name          = "team-prod"
         sa            = module.branch-pf-prod-sa.0.email
       })
     },
     !var.fast_features.sandbox ? {} : {
-      "9-0-sandbox" = templatefile(local._tpl_providers, {
+      "9-sandbox" = templatefile(local._tpl_providers, {
         backend_extra = null
         bucket        = module.branch-sandbox-gcs.0.name
         name          = "sandbox"