rm inside periemter prj references, shared_gce and shared_interconnect

Author: mariammartins

3-networks-hub-and-spoke/envs/shared/partner_interconnect.tf.example

@@ -15,7 +15,7 @@
  */
 
 
-module "shared_interconnect" {
+module "interconnect" {
   source = "../../modules/partner_interconnect"
 
   attachment_project_id = local.net_hub_project_id

3-networks-hub-and-spoke/modules/shared_vpc/README.md

@@ -31,7 +31,7 @@
 | private\_service\_cidr | CIDR range for private service networking. Used for Cloud SQL and other managed services. | `string` | `null` | no |
 | private\_service\_connect\_ip | Internal IP to be used as the private service connect endpoint. | `string` | n/a | yes |
 | project\_id | Project ID for Shared VPC. | `string` | n/a | yes |
-| project\_number | Project number for Shared VPC. It is the project INSIDE the regular service perimeter. | `number` | n/a | yes |
+| project\_number | Project number for Shared VPC. | `number` | n/a | yes |
 | restricted\_services | List of services to restrict in an enforced perimeter. | `list(string)` | n/a | yes |
 | restricted\_services\_dry\_run | List of services to restrict in a dry-run perimeter. | `list(string)` | n/a | yes |
 | secondary\_ranges | Secondary ranges that will be used in some of the subnets | `map(list(object({ range_name = string, ip_cidr_range = string })))` | `{}` | no |

3-networks-hub-and-spoke/modules/shared_vpc/variables.tf

@@ -31,7 +31,7 @@ variable "project_id" {
 
 variable "project_number" {
   type        = number
-  description = "Project number for Shared VPC. It is the project INSIDE the regular service perimeter."
+  description = "Project number for Shared VPC."
 }
 
 variable "net_hub_project_id" {

3-networks-svpc/modules/base_env/interconnect.tf.example

@@ -83,7 +83,7 @@ locals {
   }
 }
 
-module "shared_interconnect" {
+module "interconnect" {
   source = "../dedicated_interconnect"
 
   vpc_name                = "${var.environment_code}-svpc"

3-networks-svpc/modules/base_env/partner_interconnect.tf.example

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-module "shared_interconnect" {
+module "interconnect" {
   source = "../partner_interconnect"
 
   attachment_project_id = local.shared_vpc_project_id

3-networks-svpc/modules/shared_vpc/README.md

@@ -28,7 +28,7 @@
 | private\_service\_cidr | CIDR range for private service networking. Used for Cloud SQL and other managed services. | `string` | `null` | no |
 | private\_service\_connect\_ip | Internal IP to be used as the private service connect endpoint. | `string` | n/a | yes |
 | project\_id | Project ID for Shared VPC. | `string` | n/a | yes |
-| project\_number | Project number for Shared VPC. It is the project INSIDE the regular service perimeter. | `number` | n/a | yes |
+| project\_number | Project number for Shared VPC. | `number` | n/a | yes |
 | restricted\_services | List of services to restrict in an enforced perimeter. | `list(string)` | n/a | yes |
 | restricted\_services\_dry\_run | List of services to restrict in a dry-run perimeter. | `list(string)` | n/a | yes |
 | secondary\_ranges | Secondary ranges that will be used in some of the subnets | `map(list(object({ range_name = string, ip_cidr_range = string })))` | `{}` | no |

3-networks-svpc/modules/shared_vpc/variables.tf

@@ -37,7 +37,7 @@ variable "project_id" {
 
 variable "project_number" {
   type        = number
-  description = "Project number for Shared VPC. It is the project INSIDE the regular service perimeter."
+  description = "Project number for Shared VPC."
 }
 
 variable "environment_code" {

5-app-infra/business_unit_1/development/main.tf

@@ -19,7 +19,7 @@ locals {
   environment   = "development"
 }
 
-module "shared_gce_instance" {
+module "gce_instance" {
   source = "../../modules/env_base"
 
   environment         = local.environment

5-app-infra/business_unit_1/development/outputs.tf

@@ -16,38 +16,38 @@
 
 output "instances_self_links" {
   description = "List of self-links for compute instances"
-  value       = module.shared_gce_instance.instances_self_links
+  value       = module.gce_instance.instances_self_links
 }
 
 output "instances_names" {
   description = "List of names for compute instances"
-  value       = [for u in module.shared_gce_instance.instances_details : u.name]
+  value       = [for u in module.gce_instance.instances_details : u.name]
   sensitive   = true
 }
 
 output "instances_zones" {
   description = "List of zone for compute instances"
-  value       = [for u in module.shared_gce_instance.instances_details : u.zone]
+  value       = [for u in module.gce_instance.instances_details : u.zone]
   sensitive   = true
 }
 
 output "instances_details" {
   description = "List of details for compute instances"
-  value       = module.shared_gce_instance.instances_details
+  value       = module.gce_instance.instances_details
   sensitive   = true
 }
 
 output "available_zones" {
   description = "List of available zones in region"
-  value       = module.shared_gce_instance.available_zones
+  value       = module.gce_instance.available_zones
 }
 
 output "project_id" {
   description = "Project where compute instance was created"
-  value       = module.shared_gce_instance.project_id
+  value       = module.gce_instance.project_id
 }
 
 output "region" {
   description = "Region where compute instance was created"
-  value       = module.shared_gce_instance.region
+  value       = module.gce_instance.region
 }

5-app-infra/business_unit_1/nonproduction/main.tf

@@ -19,7 +19,7 @@ locals {
   environment   = "nonproduction"
 }
 
-module "shared_gce_instance" {
+module "gce_instance" {
   source = "../../modules/env_base"
 
   environment         = local.environment