fixes

Author: mariammartins

2-environments/modules/env_baseline/README.md

@@ -4,6 +4,7 @@
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
 | assured\_workload\_configuration | Assured Workload configuration. See https://cloud.google.com/assured-workloads ."<br>  enabled: If the assured workload should be created.<br>  location: The location where the workload will be created.<br>  display\_name: User-assigned resource display name.<br>  compliance\_regime: Supported Compliance Regimes. See https://cloud.google.com/assured-workloads/docs/reference/rest/Shared.Types/ComplianceRegime .<br>  resource\_type: The type of resource. One of CONSUMER\_FOLDER, KEYRING, or ENCRYPTION\_KEYS\_PROJECT. | <pre>object({<br>    enabled           = optional(bool, false)<br>    location          = optional(string, "us-central1")<br>    display_name      = optional(string, "FEDRAMP-MODERATE")<br>    compliance_regime = optional(string, "FEDRAMP_MODERATE")<br>    resource_type     = optional(string, "CONSUMER_FOLDER")<br>  })</pre> | `{}` | no |
+| auto\_create\_network | Control whether the 'default' network will be created in the project. | `bool` | `true` | no |
 | env | The environment to prepare (ex. development) | `string` | n/a | yes |
 | environment\_code | A short form of the folder level resources (environment) within the Google Cloud organization (ex. d). | `string` | n/a | yes |
 | project\_budget | Budget configuration for projects.<br>  budget\_amount: The amount to use as the budget.<br>  alert\_spent\_percents: A list of percentages of the budget to alert on when threshold is exceeded.<br>  alert\_pubsub\_topic: The name of the Cloud Pub/Sub topic where budget related messages will be published, in the form of `projects/{project_id}/topics/{topic_id}`.<br>  alert\_spend\_basis: The type of basis used to determine if spend has passed the threshold. Possible choices are `CURRENT_SPEND` or `FORECASTED_SPEND` (default). | <pre>object({<br>    base_network_budget_amount                  = optional(number, 1000)<br>    base_network_alert_spent_percents           = optional(list(number), [1.2])<br>    base_network_alert_pubsub_topic             = optional(string, null)<br>    base_network_budget_alert_spend_basis       = optional(string, "FORECASTED_SPEND")<br>    restricted_network_budget_amount            = optional(number, 1000)<br>    restricted_network_alert_spent_percents     = optional(list(number), [1.2])<br>    restricted_network_alert_pubsub_topic       = optional(string, null)<br>    restricted_network_budget_alert_spend_basis = optional(string, "FORECASTED_SPEND")<br>    secret_budget_amount                        = optional(number, 1000)<br>    secret_alert_spent_percents                 = optional(list(number), [1.2])<br>    secret_alert_pubsub_topic                   = optional(string, null)<br>    secret_budget_alert_spend_basis             = optional(string, "FORECASTED_SPEND")<br>    kms_budget_amount                           = optional(number, 1000)<br>    kms_alert_spent_percents                    = optional(list(number), [1.2])<br>    kms_alert_pubsub_topic                      = optional(string, null)<br>    kms_budget_alert_spend_basis                = optional(string, "FORECASTED_SPEND")<br>  })</pre> | `{}` | no |

2-environments/modules/env_baseline/kms.tf

@@ -33,7 +33,7 @@ module "env_kms" {
   disable_services_on_destroy = false
   depends_on                  = [time_sleep.wait_60_seconds]
   activate_apis               = ["logging.googleapis.com", "cloudkms.googleapis.com", "billingbudgets.googleapis.com"]
-  auto_create_network         = "true"
+  auto_create_network         = var.auto_create_network
 
   labels = {
     environment       = var.env

2-environments/modules/env_baseline/secrets.tf

@@ -33,7 +33,7 @@ module "env_secrets" {
   disable_services_on_destroy = false
   depends_on                  = [time_sleep.wait_60_seconds]
   activate_apis               = ["logging.googleapis.com", "secretmanager.googleapis.com"]
-  auto_create_network         = "true"
+  auto_create_network         = var.auto_create_network
 
   labels = {
     environment       = var.env

2-environments/modules/env_baseline/variables.tf

@@ -81,3 +81,9 @@ variable "assured_workload_configuration" {
   })
   default = {}
 }
+
+variable "auto_create_network" {
+  description = "Control whether the 'default' network will be created in the project."
+  type        = bool
+  default     = true
+}

4-projects/modules/single_project/README.md

@@ -6,6 +6,7 @@
 | activate\_apis | The api to activate for the GCP project | `list(string)` | `[]` | no |
 | app\_infra\_pipeline\_service\_accounts | The Service Accounts from App Infra Pipeline. | `map(string)` | `{}` | no |
 | application\_name | The name of application where GCP resources relate | `string` | n/a | yes |
+| auto\_create\_network | Control whether the 'default' network will be created in the project. | `bool` | `true` | no |
 | billing\_account | The ID of the billing account to associated this project with | `string` | n/a | yes |
 | billing\_code | The code that's used to provide chargeback information | `string` | n/a | yes |
 | business\_code | The code that describes which business unit owns the project | `string` | `"shared"` | no |

4-projects/modules/single_project/main.tf

@@ -55,7 +55,7 @@ module "project" {
   org_id                   = var.org_id
   billing_account          = var.billing_account
   folder_id                = var.folder_id
-  auto_create_network      = "true"
+  auto_create_network      = var.auto_create_network
 
   svpc_host_project_id = var.shared_vpc_host_project_id
   shared_vpc_subnets   = var.shared_vpc_subnets # Optional: To enable subnetting, replace to "module.networking_project.subnetwork_self_link"

4-projects/modules/single_project/variables.tf

@@ -160,3 +160,9 @@ variable "enable_cloudbuild_deploy" {
   type        = bool
   default     = false
 }
+
+variable "auto_create_network" {
+  description = "Control whether the 'default' network will be created in the project."
+  type        = bool
+  default     = true
+}

test/setup/main.tf

@@ -54,7 +54,7 @@ module "project" {
   org_id                   = var.org_id
   folder_id                = var.folder_id
   billing_account          = var.billing_account
-  auto_create_network      = "true"
+  auto_create_network      = var.auto_create_network
 
   activate_apis = [
     "cloudresourcemanager.googleapis.com",

test/setup/variables.tf

@@ -37,3 +37,9 @@ variable "example_foundations_mode" {
 variable "domain_to_allow" {
   description = "The test domain_to_allow allow users from in IAM."
 }
+
+variable "auto_create_network" {
+  description = "Control whether the 'default' network will be created in the project."
+  type        = bool
+  default     = true
+}