0-bootstrap/README-Jenkins.md

@@ -24,8 +24,6 @@ It is a best practice to have two separate projects here (`prj-b-seed` and `prj-
 
 - **Note: these instructions do not indicate how to create a Jenkins Master.** To deploy a Jenkins Master, you should follow [Jenkins Architecture](https://www.jenkins.io/doc/book/architecting-for-scale/) recommendations.
 
-#### If you don't want to use Jenkins
-
 **If you don't have a Jenkins implementation and don't want one**, then we recommend you to [use the Cloud Build module](./README.md) instead.
 
 ## Requirements
@@ -125,7 +123,7 @@ You arrived to these instructions because you are using the `jenkins_bootstrap`
 ### II. Create the SEED and CICD projects using Terraform
 
 - Required information:
-  - Terraform version 0.13.6 - See [Requirements](#requirements) section for more details.
+  - Terraform version 0.13.7 - See [Requirements](#requirements) section for more details.
   - The `terraform.tfvars` file with all the necessary values.
 
 1. Get the appropriate credentials: run the following command with an account that has the [necessary permissions](./modules/jenkins-agent/README.md#Permissions).
@@ -137,7 +135,7 @@ You arrived to these instructions because you are using the `jenkins_bootstrap`
 1. Run terraform commands.
     - After the credentials are configured, we will create the `prj-b-seed` project (which contains the GCS state bucket and Terraform custom service account) and the `prj-b-cicd` project (which contains the Jenkins Agent, its custom service account and where we will add VPN configuration)
     - **WARNING: Make sure you have commented-out the `cloudbuild_bootstrap` module and enabled the `jenkins_bootstrap` module in the `./main.tf` file**
-    - **Use Terraform 0.13.6** to run the terraform script with the commands below
+    - **Use Terraform 0.13.7** to run the terraform script with the commands below
     ```
     terraform init
     terraform plan

0-bootstrap/README.md

@@ -63,7 +63,7 @@ To run the commands described in this document, you need to have the following
 installed:
 
 - The [Google Cloud SDK](https://cloud.google.com/sdk/install) version 319.0.0 or later
-- [Terraform](https://www.terraform.io/downloads.html) version 0.13.6.
+- [Terraform](https://www.terraform.io/downloads.html) version 0.13.7.
 - An existing project which the user has access to be used by terraform-validator.
 
 **Note:** Make sure that you use the same version of Terraform throughout this

0-bootstrap/main.tf

@@ -118,8 +118,8 @@ module "cloudbuild_bootstrap" {
   project_prefix              = var.project_prefix
   cloud_source_repos          = var.cloud_source_repos
   terraform_validator_release = "2021-03-22"
-  terraform_version           = "0.13.6"
-  terraform_version_sha256sum = "55f2db00b05675026be9c898bdd3e8230ff0c5c78dd12d743ca38032092abfc9"
+  terraform_version           = "0.13.7"
+  terraform_version_sha256sum = "4a52886e019b4fdad2439da5ff43388bbcc6cce9784fde32c53dcd0e28ca9957"
 
   activate_apis = [
     "serviceusage.googleapis.com",

0-bootstrap/modules/jenkins-agent/README.md

@@ -79,8 +79,8 @@ module "jenkins_bootstrap" {
 | terraform\_sa\_name | Fully-qualified name of the terraform service account. It must be supplied by the seed project | `string` | n/a | yes |
 | terraform\_service\_account | Email for terraform service account. It must be supplied by the seed project | `string` | n/a | yes |
 | terraform\_state\_bucket | Default state bucket, used in Cloud Build substitutions. It must be supplied by the seed project | `string` | n/a | yes |
-| terraform\_version | Default terraform version. | `string` | `"0.13.6"` | no |
-| terraform\_version\_sha256sum | sha256sum for default terraform version. | `string` | `"55f2db00b05675026be9c898bdd3e8230ff0c5c78dd12d743ca38032092abfc9"` | no |
+| terraform\_version | Default terraform version. | `string` | `"0.13.7"` | no |
+| terraform\_version\_sha256sum | sha256sum for default terraform version. | `string` | `"4a52886e019b4fdad2439da5ff43388bbcc6cce9784fde32c53dcd0e28ca9957"` | no |
 | tunnel0\_bgp\_peer\_address | BGP peer address for tunnel 0 | `string` | n/a | yes |
 | tunnel0\_bgp\_session\_range | BGP session range for tunnel 0 | `string` | n/a | yes |
 | tunnel1\_bgp\_peer\_address | BGP peer address for tunnel 1 | `string` | n/a | yes |
@@ -105,8 +105,8 @@ module "jenkins_bootstrap" {
 ### Software
 
 - [gcloud sdk](https://cloud.google.com/sdk/install) >= 206.0.0
-- [Terraform](https://www.terraform.io/downloads.html) = 0.13.6
-    - The scripts in this codebase use Terraform v0.13.6. You should use the same version in the manual steps to avoid [Terraform State Snapshot Lock](https://github.com/hashicorp/terraform/issues/23290) errors caused by differences in terraform versions.
+- [Terraform](https://www.terraform.io/downloads.html) = 0.13.7
+    - The scripts in this codebase use Terraform v0.13.7. You should use the same version in the manual steps to avoid [Terraform State Snapshot Lock](https://github.com/hashicorp/terraform/issues/23290) errors caused by differences in terraform versions.
 
 ### Infrastructure
 

0-bootstrap/modules/jenkins-agent/variables.tf

@@ -224,11 +224,11 @@ variable "folder_id" {
 variable "terraform_version" {
   description = "Default terraform version."
   type        = string
-  default     = "0.13.6"
+  default     = "0.13.7"
 }
 
 variable "terraform_version_sha256sum" {
   description = "sha256sum for default terraform version."
   type        = string
-  default     = "55f2db00b05675026be9c898bdd3e8230ff0c5c78dd12d743ca38032092abfc9"
+  default     = "4a52886e019b4fdad2439da5ff43388bbcc6cce9784fde32c53dcd0e28ca9957"
 }

0-bootstrap/versions.tf

@@ -31,4 +31,9 @@ terraform {
       version = "~> 2.3"
     }
   }
+
+  provider_meta "google" {
+    module_name = "blueprints/terraform/terraform-example-foundation:bootstrap/v2.1.1"
+  }
+
 }

1-org/envs/shared/versions.tf

@@ -26,4 +26,12 @@ terraform {
       version = ">= 3.50"
     }
   }
+
+  provider_meta "google" {
+    module_name = "blueprints/terraform/terraform-example-foundation:org/v2.1.1"
+  }
+
+  provider_meta "google-beta" {
+    module_name = "blueprints/terraform/terraform-example-foundation:org/v2.1.1"
+  }
 }

2-environments/envs/development/versions.tf → 2-environments/modules/env_baseline/versions.tf

@@ -26,4 +26,12 @@ terraform {
       version = ">= 3.50"
     }
   }
+
+  provider_meta "google" {
+    module_name = "blueprints/terraform/terraform-example-foundation:org/v2.1.1"
+  }
+
+  provider_meta "google-beta" {
+    module_name = "blueprints/terraform/terraform-example-foundation:org/v2.1.1"
+  }
 }

3-networks/modules/base_shared_vpc/versions.tf

@@ -16,4 +16,22 @@
 
 terraform {
   required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = ">= 3.50"
+    }
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = ">= 3.50"
+    }
+  }
+
+  provider_meta "google" {
+    module_name = "blueprints/terraform/terraform-example-foundation:base_shared_vpc/v2.1.1"
+  }
+
+  provider_meta "google-beta" {
+    module_name = "blueprints/terraform/terraform-example-foundation:base_shared_vpc/v2.1.1"
+  }
 }

3-networks/modules/dedicated_interconnect/versions.tf

@@ -0,0 +1,37 @@
+/**
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+terraform {
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = ">= 3.50"
+    }
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = ">= 3.50"
+    }
+  }
+
+  provider_meta "google" {
+    module_name = "blueprints/terraform/terraform-example-foundation:dedicated_interconnect/v2.1.1"
+  }
+
+  provider_meta "google-beta" {
+    module_name = "blueprints/terraform/terraform-example-foundation:dedicated_interconnect/v2.1.1"
+  }
+}

3-networks/modules/hierarchical_firewall_policy/versions.tf

@@ -0,0 +1,37 @@
+/**
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+terraform {
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = ">= 3.50"
+    }
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = ">= 3.50"
+    }
+  }
+
+  provider_meta "google" {
+    module_name = "blueprints/terraform/terraform-example-foundation:hierarchical_firewall_policy/v2.1.1"
+  }
+
+  provider_meta "google-beta" {
+    module_name = "blueprints/terraform/terraform-example-foundation:hierarchical_firewall_policy/v2.1.1"
+  }
+}

3-networks/modules/partner_interconnect/versions.tf

@@ -0,0 +1,37 @@
+/**
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+terraform {
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = ">= 3.50"
+    }
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = ">= 3.50"
+    }
+  }
+
+  provider_meta "google" {
+    module_name = "blueprints/terraform/terraform-example-foundation:partner_interconnect/v2.1.1"
+  }
+
+  provider_meta "google-beta" {
+    module_name = "blueprints/terraform/terraform-example-foundation:partner_interconnect/v2.1.1"
+  }
+}

3-networks/modules/restricted_shared_vpc/versions.tf

@@ -16,4 +16,22 @@
 
 terraform {
   required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = ">= 3.50"
+    }
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = ">= 3.50"
+    }
+  }
+
+  provider_meta "google" {
+    module_name = "blueprints/terraform/terraform-example-foundation:restricted_shared_vpc/v2.1.1"
+  }
+
+  provider_meta "google-beta" {
+    module_name = "blueprints/terraform/terraform-example-foundation:restricted_shared_vpc/v2.1.1"
+  }
 }

2-environments/envs/non-production/versions.tf → 3-networks/modules/transitivity/versions.tf

@@ -26,4 +26,12 @@ terraform {
       version = ">= 3.50"
     }
   }
+
+  provider_meta "google" {
+    module_name = "blueprints/terraform/terraform-example-foundation:transitivity/v2.1.1"
+  }
+
+  provider_meta "google-beta" {
+    module_name = "blueprints/terraform/terraform-example-foundation:transitivity/v2.1.1"
+  }
 }