[FAST] Rename stage 2-networking-d-separate-envs to 2-netwroking-c-se…

…parate-envs (#2328) Co-authored-by: Luca Prete <[email protected]>
GoogleCloudPlatform · May 31, 2024 · eb5754e · eb5754e
1 parent f8f1873
commit eb5754e
Show file tree

Hide file tree

Showing 36 changed files with 5 additions and 5 deletions.
diff --git a/blueprints/gcve/pc-minimal/README.md b/blueprints/gcve/pc-minimal/README.md
@@ -30,7 +30,7 @@ Based on our GCP best practices, a GCVE private cloud relies on user groups to a
 
 ### Network
 
-This blueprints expects the user to provision a VPC upfront, either from one of the FAST networking stages (e.g. [Networking with separated single environment](../../../fast/stages/2-networking-d-separate-envs)) or from an external source.
+This blueprints expects the user to provision a VPC upfront, either from one of the FAST networking stages (e.g. [Networking with separated single environment](../../../fast/stages/2-networking-c-separate-envs)) or from an external source.
 The blueprint can optionally configure the [VMware Engine Network peering](https://cloud.google.com/vmware-engine/docs/networking/peer-vpc-network) on the peer VPC by granting the following permissions on the project that hosts the VPC:
 - vmwareengine.networkPeerings.create
 - vmwareengine.networkPeerings.get

diff --git a/...s/2-networking-d-separate-envs/.gitignore → ...s/2-networking-c-separate-envs/.gitignore b/...s/2-networking-d-separate-envs/.gitignore → ...s/2-networking-c-separate-envs/.gitignore
diff --git a/...tages/2-networking-d-separate-envs/IAM.md → ...tages/2-networking-c-separate-envs/IAM.md b/...tages/2-networking-d-separate-envs/IAM.md → ...tages/2-networking-c-separate-envs/IAM.md
diff --git a/...es/2-networking-d-separate-envs/README.md → ...es/2-networking-c-separate-envs/README.md b/...es/2-networking-d-separate-envs/README.md → ...es/2-networking-c-separate-envs/README.md
diff --git a/...etworking-d-separate-envs/data/cidrs.yaml → ...etworking-c-separate-envs/data/cidrs.yaml b/...etworking-d-separate-envs/data/cidrs.yaml → ...etworking-c-separate-envs/data/cidrs.yaml
diff --git a/...vs/data/dashboards/firewall_insights.json → ...vs/data/dashboards/firewall_insights.json b/...vs/data/dashboards/firewall_insights.json → ...vs/data/dashboards/firewall_insights.json
diff --git a/...rds/vpc_and_vpc_peering_group_quotas.json → ...rds/vpc_and_vpc_peering_group_quotas.json b/...rds/vpc_and_vpc_peering_group_quotas.json → ...rds/vpc_and_vpc_peering_group_quotas.json
diff --git a/...-d-separate-envs/data/dashboards/vpn.json → ...-c-separate-envs/data/dashboards/vpn.json b/...-d-separate-envs/data/dashboards/vpn.json → ...-c-separate-envs/data/dashboards/vpn.json
diff --git a/...-separate-envs/data/dns-policy-rules.yaml → ...-separate-envs/data/dns-policy-rules.yaml b/...-separate-envs/data/dns-policy-rules.yaml → ...-separate-envs/data/dns-policy-rules.yaml
diff --git a/...a/firewall-rules/dev/default-ingress.yaml → ...a/firewall-rules/dev/default-ingress.yaml b/...a/firewall-rules/dev/default-ingress.yaml → ...a/firewall-rules/dev/default-ingress.yaml
diff --git a/...e-envs/data/firewall-rules/dev/rules.yaml → ...e-envs/data/firewall-rules/dev/rules.yaml b/...e-envs/data/firewall-rules/dev/rules.yaml → ...e-envs/data/firewall-rules/dev/rules.yaml
diff --git a/.../firewall-rules/prod/default-ingress.yaml → .../firewall-rules/prod/default-ingress.yaml b/.../firewall-rules/prod/default-ingress.yaml → .../firewall-rules/prod/default-ingress.yaml
diff --git a/...envs/data/hierarchical-ingress-rules.yaml → ...envs/data/hierarchical-ingress-rules.yaml b/...envs/data/hierarchical-ingress-rules.yaml → ...envs/data/hierarchical-ingress-rules.yaml
diff --git a/...ata/subnets/dev/dev-dataplatform-ew1.yaml → ...ata/subnets/dev/dev-dataplatform-ew1.yaml b/...ata/subnets/dev/dev-dataplatform-ew1.yaml → ...ata/subnets/dev/dev-dataplatform-ew1.yaml
diff --git a/...nvs/data/subnets/dev/dev-default-ew1.yaml → ...nvs/data/subnets/dev/dev-default-ew1.yaml b/...nvs/data/subnets/dev/dev-default-ew1.yaml → ...nvs/data/subnets/dev/dev-default-ew1.yaml
diff --git a/...s/data/subnets/dev/dev-gke-nodes-ew1.yaml → ...s/data/subnets/dev/dev-gke-nodes-ew1.yaml b/...s/data/subnets/dev/dev-gke-nodes-ew1.yaml → ...s/data/subnets/dev/dev-gke-nodes-ew1.yaml
diff --git a/...s/data/subnets/prod/prod-default-ew1.yaml → ...s/data/subnets/prod/prod-default-ew1.yaml b/...s/data/subnets/prod/prod-default-ew1.yaml → ...s/data/subnets/prod/prod-default-ew1.yaml
diff --git a/.../2-networking-d-separate-envs/diagram.png → .../2-networking-c-separate-envs/diagram.png b/.../2-networking-d-separate-envs/diagram.png → .../2-networking-c-separate-envs/diagram.png
diff --git a/.../2-networking-d-separate-envs/diagram.svg → .../2-networking-c-separate-envs/diagram.svg b/.../2-networking-d-separate-envs/diagram.svg → .../2-networking-c-separate-envs/diagram.svg
diff --git a/...s/2-networking-d-separate-envs/dns-dev.tf → ...s/2-networking-c-separate-envs/dns-dev.tf b/...s/2-networking-d-separate-envs/dns-dev.tf → ...s/2-networking-c-separate-envs/dns-dev.tf
diff --git a/.../2-networking-d-separate-envs/dns-prod.tf → .../2-networking-c-separate-envs/dns-prod.tf b/.../2-networking-d-separate-envs/dns-prod.tf → .../2-networking-c-separate-envs/dns-prod.tf
diff --git a/...ages/2-networking-d-separate-envs/main.tf → ...ages/2-networking-c-separate-envs/main.tf b/...ages/2-networking-d-separate-envs/main.tf → ...ages/2-networking-c-separate-envs/main.tf
diff --git a/...-d-separate-envs/monitoring-vpn-onprem.tf → ...-c-separate-envs/monitoring-vpn-onprem.tf b/...-d-separate-envs/monitoring-vpn-onprem.tf → ...-c-separate-envs/monitoring-vpn-onprem.tf
diff --git a/...-networking-d-separate-envs/monitoring.tf → ...-networking-c-separate-envs/monitoring.tf b/...-networking-d-separate-envs/monitoring.tf → ...-networking-c-separate-envs/monitoring.tf
diff --git a/...s/2-networking-d-separate-envs/net-dev.tf → ...s/2-networking-c-separate-envs/net-dev.tf b/...s/2-networking-d-separate-envs/net-dev.tf → ...s/2-networking-c-separate-envs/net-dev.tf
diff --git a/.../2-networking-d-separate-envs/net-prod.tf → .../2-networking-c-separate-envs/net-prod.tf b/.../2-networking-d-separate-envs/net-prod.tf → .../2-networking-c-separate-envs/net-prod.tf
diff --git a/...s/2-networking-d-separate-envs/outputs.tf → ...s/2-networking-c-separate-envs/outputs.tf b/...s/2-networking-d-separate-envs/outputs.tf → ...s/2-networking-c-separate-envs/outputs.tf
diff --git a/...s/2-networking-d-separate-envs/regions.tf → ...s/2-networking-c-separate-envs/regions.tf b/...s/2-networking-d-separate-envs/regions.tf → ...s/2-networking-c-separate-envs/regions.tf
diff --git a/...working-d-separate-envs/test-resources.tf → ...working-c-separate-envs/test-resources.tf b/...working-d-separate-envs/test-resources.tf → ...working-c-separate-envs/test-resources.tf
diff --git a/...working-d-separate-envs/variables-fast.tf → ...working-c-separate-envs/variables-fast.tf b/...working-d-separate-envs/variables-fast.tf → ...working-c-separate-envs/variables-fast.tf
diff --git a/...2-networking-d-separate-envs/variables.tf → ...2-networking-c-separate-envs/variables.tf b/...2-networking-d-separate-envs/variables.tf → ...2-networking-c-separate-envs/variables.tf
diff --git a/...-networking-d-separate-envs/vpn-onprem.tf → ...-networking-c-separate-envs/vpn-onprem.tf b/...-networking-d-separate-envs/vpn-onprem.tf → ...-networking-c-separate-envs/vpn-onprem.tf
diff --git a/fast/stages/README.md b/fast/stages/README.md
@@ -37,8 +37,8 @@ Implemented as an [add-on stage 1](./1-tenant-factory/), with optional FAST comp
 - [Security](2-security/README.md)  
   Manages centralized security configurations in a separate stage, and is typically owned by the security team. This stage implements VPC Security Controls via separate perimeters for environments and central services, and creates projects to host centralized KMS keys used by the whole organization. It's meant to be easily extended to include other security-related resources which are required, like Secret Manager.\
   Exports: KMS key ids
-- Networking ([Peering/VPN](2-networking-a-simple/README.md)/[NVA (w/ optional BGP support)](2-networking-b-nva/README.md)/[Separate environments](2-networking-d-separate-envs/README.md))  
-  Manages centralized network resources in a separate stage, and is typically owned by the networking team. This stage implements a hub-and-spoke design, and includes connectivity via VPN to on-premises, and YAML-based factories for firewall rules (hierarchical and VPC-level) and subnets. It's currently available in four flavors: [spokes connected via VPC peering/VPN](2-networking-a-simple/README.md), [spokes connected via appliances (w/ optional BGP support)](2-networking-b-nva/README.md) and [separated network environments](2-networking-d-separate-envs/README.md).\
+- Networking ([Peering/VPN](2-networking-a-simple/README.md)/[NVA (w/ optional BGP support)](2-networking-b-nva/README.md)/[Separate environments](2-networking-c-separate-envs/README.md))  
+  Manages centralized network resources in a separate stage, and is typically owned by the networking team. This stage implements a hub-and-spoke design, and includes connectivity via VPN to on-premises, and YAML-based factories for firewall rules (hierarchical and VPC-level) and subnets. It's currently available in four flavors: [spokes connected via VPC peering/VPN](2-networking-a-simple/README.md), [spokes connected via appliances (w/ optional BGP support)](2-networking-b-nva/README.md) and [separated network environments](2-networking-c-separate-envs/README.md).\
   Exports: host project ids and numbers, vpc self links
 
 ## Environment-level resources (3)

diff --git a/..._networking_d_separate_envs/simple.tfvars → ..._networking_c_separate_envs/simple.tfvars b/..._networking_d_separate_envs/simple.tfvars → ..._networking_c_separate_envs/simple.tfvars
diff --git a/...s2_networking_d_separate_envs/simple.yaml → ...s2_networking_c_separate_envs/simple.yaml b/...s2_networking_d_separate_envs/simple.yaml → ...s2_networking_c_separate_envs/simple.yaml
diff --git a/...s2_networking_d_separate_envs/tftest.yaml → ...s2_networking_c_separate_envs/tftest.yaml b/...s2_networking_d_separate_envs/tftest.yaml → ...s2_networking_c_separate_envs/tftest.yaml
@@ -1,4 +1,4 @@
-# Copyright 2023 Google LLC
+# Copyright 2024 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-module: fast/stages/2-networking-d-separate-envs
+module: fast/stages/2-networking-c-separate-envs
 
 tests:
   simple: