Merge branch 'master' into sql-multi-region

.github/workflows/linting.yml

@@ -37,7 +37,7 @@ jobs:
       - name: Set up Terraform
         uses: hashicorp/setup-terraform@v1
         with:
-          terraform_version: 1.0.9
+          terraform_version: 1.1.8
 
       - name: Install dependencies
         run: |

CHANGELOG.md

@@ -5,11 +5,13 @@ All notable changes to this project will be documented in this file.
 ## Unreleased
 
 - SQL Server AlwaysOn availability groups example
-- CloudSQ: fixed Terraform change detection when backup is disabled
-- Allow multiple CIDR blocks in the ip_range for Apigee Instance
-- Add prefix to project factory SA bindings
+- fixed Terraform change detection in CloudSQL when backup is disabled
+- allow multiple CIDR blocks in the ip_range for Apigee Instance
+- add prefix to project factory SA bindings
 - **incompatible change** `subnets_l7ilb` variable is deprecated in the `net-vpc` module, instead `subnets_proxy_only` variable [should be used](https://cloud.google.com/load-balancing/docs/proxy-only-subnets#proxy_only_subnet_create)
-- Add support for [Private Service Connect](https://cloud.google.com/vpc/docs/private-service-connect#psc-subnets) and [Proxy-only](https://cloud.google.com/load-balancing/docs/proxy-only-subnets) subnets to `net-vpc` module
+- add support for [Private Service Connect](https://cloud.google.com/vpc/docs/private-service-connect#psc-subnets) and [Proxy-only](https://cloud.google.com/load-balancing/docs/proxy-only-subnets) subnets to `net-vpc` module
+- bump Google provider versions to `>= 4.17.0`
+- bump Terraform version to `>= 1.1.0`
 
 **FAST**
 
@@ -51,6 +53,7 @@ All notable changes to this project will be documented in this file.
 - Support for resource management tags in the `organization`, `folder`, `project`, `compute-vm`, and `kms` modules
 
 **FAST**
+
 - new [data platform](fast/stages/03-data-platform) stage 3
 - new [02-networking-nva](fast/stages/02-networking-nva) networking stage
 - allow customizing the names of custom roles
@@ -62,7 +65,6 @@ All notable changes to this project will be documented in this file.
 - swtich to folder-level `xpnAdmin` and `xpnServiceAdmin`
 - moved networking projects to folder matching their enviroments
 
-
 ## [13.0.0] - 2022-01-27
 
 - **initial Fabric Fast implementation**
@@ -119,7 +121,7 @@ All notable changes to this project will be documented in this file.
 - added gVNIC support to `compute-vm` module
 - added a rule factory to `net-vpc-firewall` module
 - added a subnet factory to `net-vpc` module
-- **incompatible change** added support for partitioned tables to `organization` module sinks 
+- **incompatible change** added support for partitioned tables to `organization` module sinks
 - **incompatible change** renamed `private_service_networking_range` variable to `psc_ranges` in `net-vpc`module, and changed its type to `list(string)`
 - added a firewall policy factory to `organization` and `firewall` module
 - refactored `tfdoc`
@@ -150,11 +152,10 @@ All notable changes to this project will be documented in this file.
 - **incompatible change** changed maintenance window definition from `maintenance_start_time` to `maintenance_config` in `gke-cluster`
 - added `monitoring_config`,`logging_config`, `dns_config` and `enable_l4_ilb_subsetting` to `gke-cluster`
 
-
 ## [6.0.0] - 2021-10-04
 
 - new `apigee-organization` and `apigee-x-instance`
-- generate `email` and `iam_email` statically in the `iam-service-account` module 
+- generate `email` and `iam_email` statically in the `iam-service-account` module
 - new `billing-budget` module
 - fix `scheduled-asset-inventory-export-bq` module
 - output custom role information from the `organization` module
@@ -453,7 +454,6 @@ All notable changes to this project will be documented in this file.
 - new `envoy-traffic-director` module in the `cloud-config-container` suite
 - new `pubsub` module
 
-
 ## [1.4.1] - 2020-05-02
 
 - new `secret-manager` module

default-versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

examples/cloud-operations/asset-inventory-feed-remediation/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

examples/cloud-operations/dns-fine-grained-iam/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

examples/cloud-operations/dns-shared-vpc/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

examples/cloud-operations/iam-delegated-role-grants/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

examples/cloud-operations/onprem-sa-key-management/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

examples/cloud-operations/packer-image-builder/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

examples/cloud-operations/quota-monitoring/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

examples/cloud-operations/scheduled-asset-inventory-export-bq/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

examples/data-solutions/cmek-via-centralized-kms/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

examples/data-solutions/gcs-to-bq-with-least-privileges/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

examples/factories/net-vpc-firewall-yaml/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

examples/foundations/business-units/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

examples/foundations/environments/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

examples/networking/decentralized-firewall/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

examples/networking/filtering-proxy/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

examples/networking/hub-and-spoke-peering/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

examples/networking/hub-and-spoke-vpn/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

examples/networking/ilb-next-hop/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

examples/networking/onprem-google-access-dns/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

examples/networking/private-cloud-function-from-onprem/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

examples/networking/shared-vpc-gke/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

examples/third-party-solutions/openshift/tf/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

fast/assets/templates/workflow-gitlab.yaml

@@ -0,0 +1,167 @@
+# Copyright 2022 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.
+
+default:
+  image:
+    name: registry.gitlab.com/gitlab-org/terraform-images/releases/1.1 
+
+variables:
+  FAST_OUTPUTS_BUCKET: ${outputs_bucket}
+  FAST_SERVICE_ACCOUNT: ${service_account}
+  FAST_WIF_PROVIDER: ${identity_provider}
+  SSH_AUTH_SOCK: /tmp/ssh_agent.sock
+  TF_PROVIDERS_FILE: ${tf_providers_file}
+  TF_VAR_FILES: ${tf_var_files == [] ? "''" : join("\n    ", tf_var_files)}
+  TF_VERSION: 1.1.7
+  TF_ROOT: $${CI_PROJECT_DIR}  # The relative path to the root directory of the Terraform project
+
+stages:
+  - gcp-auth
+  - tf-setup
+  - tf-init
+  - tf-validate
+  - tf-plan
+  - tf-apply
+
+cache:
+  key: "$${TF_ROOT}"
+  paths:
+    - $${TF_ROOT}/.terraform/
+    - $${TF_ROOT}/.tf-setup/
+
+# Configure GCP Auth with Access Token
+gcp-auth:
+  stage: gcp-auth
+  script:
+    - |
+      PAYLOAD="$(cat <<EOF
+      {
+        "audience": "//iam.googleapis.com/$${FAST_WIF_PROVIDER}",
+        "grantType": "urn:ietf:params:oauth:grant-type:token-exchange",
+        "requestedTokenType": "urn:ietf:params:oauth:token-type:access_token",
+        "scope": "https://www.googleapis.com/auth/cloud-platform",
+        "subjectTokenType": "urn:ietf:params:oauth:token-type:jwt",
+        "subjectToken": "$${CI_JOB_JWT_V2}"
+      }
+      EOF
+      )"
+
+      FEDERATED_TOKEN="$(curl --silent "https://sts.googleapis.com/v1/token" \
+        --header "Accept: application/json" \
+        --header "Content-Type: application/json" \
+        --data "$${PAYLOAD}" \
+        | jq -r '.access_token'
+      )"
+
+      GOOGLE_OAUTH_ACCESS_TOKEN="$(curl --silent --show-error --fail "https://iamcredentials.googleapis.com/v1/projects/-/serviceAccounts/$${FAST_SERVICE_ACCOUNT}:generateAccessToken" \
+        --header "Accept: application/json" \
+        --header "Content-Type: application/json" \
+        --header "Authorization: Bearer $${FEDERATED_TOKEN}" \
+        --data '{"scope": ["https://www.googleapis.com/auth/cloud-platform"]}' \
+        | jq -r '.accessToken'
+      )"
+
+      echo "GOOGLE_OAUTH_ACCESS_TOKEN=$GOOGLE_OAUTH_ACCESS_TOKEN" >> gcp-auth.env
+
+      if [ -z "$GOOGLE_OAUTH_ACCESS_TOKEN" ]; then exit 1; fi
+# WIP - will have to find a better way of doing this
+  artifacts:
+    reports:
+      dotenv: gcp-auth.env
+
+# Downloading from bucket into cache
+tf-setup:
+  stage: tf-setup
+  script:
+    - |
+      mkdir -p .tf-setup
+      curl -X GET \
+        -H "Authorization: Bearer $GOOGLE_OAUTH_ACCESS_TOKEN" \
+        -o ".tf-setup/$${TF_PROVIDERS_FILE}" \
+        "https://storage.googleapis.com/$${FAST_OUTPUTS_BUCKET}/providers/$${TF_PROVIDERS_FILE}"
+      for f in $TF_VAR_FILES; do
+        curl -X GET \
+          -H "Authorization: Bearer $GOOGLE_OAUTH_ACCESS_TOKEN" \
+          -o ".tf-setup/$f" \
+          "https://storage.googleapis.com/$${FAST_OUTPUTS_BUCKET}/tfvars/$f"
+      done
+  dependencies:
+    - gcp-auth
+
+# Terraform Init
+tf-init:
+  stage: tf-init
+  script:
+    - |
+      ssh-agent -a $SSH_AUTH_SOCK > /dev/null
+      echo "$CICD_MODULES_KEY" | tr -d '\r' | ssh-add - > /dev/null
+      mkdir -p ~/.ssh
+      ssh-keyscan -H 'gitlab.com' >> ~/.ssh/known_hosts
+      ssh-keyscan gitlab.com | sort -u - ~/.ssh/known_hosts -o ~/.ssh/known_hosts
+      cd "$${TF_ROOT}"
+      cp -R .tf-setup/. .
+      gitlab-terraform init
+  dependencies:
+    - gcp-auth
+
+# Terraform Validate
+tf-validate: 
+  stage: tf-validate
+  script:
+    - |
+      ssh-agent -a $SSH_AUTH_SOCK > /dev/null
+      echo "$CICD_MODULES_KEY" | tr -d '\r' | ssh-add - > /dev/null
+      mkdir -p ~/.ssh
+      ssh-keyscan -H 'gitlab.com' >> ~/.ssh/known_hosts
+      ssh-keyscan gitlab.com | sort -u - ~/.ssh/known_hosts -o ~/.ssh/known_hosts
+      cd "$${TF_ROOT}"
+      cp -R .tf-setup/. .
+      gitlab-terraform validate
+  dependencies:
+    - gcp-auth
+
+# Terraform Plan
+tf-plan:
+  stage: tf-plan
+    script:
+    - |
+      ssh-agent -a $SSH_AUTH_SOCK > /dev/null
+      echo "$CICD_MODULES_KEY" | tr -d '\r' | ssh-add - > /dev/null
+      mkdir -p ~/.ssh
+      ssh-keyscan -H 'gitlab.com' >> ~/.ssh/known_hosts
+      ssh-keyscan gitlab.com | sort -u - ~/.ssh/known_hosts -o ~/.ssh/known_hosts
+      cd "$${TF_ROOT}"
+      cp -R .tf-setup/. .
+      gitlab-terraform plan
+      gitlab-terraform plan-json
+  dependencies:
+    - gcp-auth
+  artifacts:
+    paths:
+      - $${TF_ROOT}/plan.cache
+    reports:
+      terraform: $${TF_ROOT}/plan.json
+
+# Terraform Apply
+tf-apply:
+  stage: tf-apply
+  script:
+    - cd "$${TF_ROOT}"
+    - gitlab-terraform apply
+  when: manual
+  only:
+    variables:
+      - $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+  dependencies:
+    - gcp-auth

fast/stages/00-bootstrap/README.md

@@ -446,15 +446,15 @@ The remaining configuration is manual, as it regards the repositories themselves
 
 | name | description | sensitive | consumers |
 |---|---|:---:|---|
-| [automation](outputs.tf#L89) | Automation resources. |  |  |
-| [billing_dataset](outputs.tf#L94) | BigQuery dataset prepared for billing export. |  |  |
-| [cicd_repositories](outputs.tf#L99) | CI/CD repository configurations. |  |  |
-| [custom_roles](outputs.tf#L111) | Organization-level custom roles. |  |  |
-| [federated_identity](outputs.tf#L116) | Workload Identity Federation pool and providers. |  |  |
-| [outputs_bucket](outputs.tf#L126) | GCS bucket where generated output files are stored. |  |  |
-| [project_ids](outputs.tf#L131) | Projects created by this stage. |  |  |
-| [providers](outputs.tf#L150) | Terraform provider files for this stage and dependent stages. | ✓ | <code>stage-01</code> |
-| [service_accounts](outputs.tf#L140) | Automation service accounts created by this stage. |  |  |
-| [tfvars](outputs.tf#L159) | Terraform variable files for the following stages. | ✓ |  |
+| [automation](outputs.tf#L93) | Automation resources. |  |  |
+| [billing_dataset](outputs.tf#L98) | BigQuery dataset prepared for billing export. |  |  |
+| [cicd_repositories](outputs.tf#L103) | CI/CD repository configurations. |  |  |
+| [custom_roles](outputs.tf#L115) | Organization-level custom roles. |  |  |
+| [federated_identity](outputs.tf#L120) | Workload Identity Federation pool and providers. |  |  |
+| [outputs_bucket](outputs.tf#L130) | GCS bucket where generated output files are stored. |  |  |
+| [project_ids](outputs.tf#L135) | Projects created by this stage. |  |  |
+| [providers](outputs.tf#L154) | Terraform provider files for this stage and dependent stages. | ✓ | <code>stage-01</code> |
+| [service_accounts](outputs.tf#L144) | Automation service accounts created by this stage. |  |  |
+| [tfvars](outputs.tf#L163) | Terraform variable files for the following stages. | ✓ |  |
 
 <!-- END TFDOC -->

fast/stages/00-bootstrap/identity-providers.tf

@@ -40,12 +40,12 @@ locals {
         "google.subject"       = "assertion.sub"
         "attribute.sub"        = "assertion.sub"
         "attribute.actor"      = "assertion.actor"
-        "attribute.repository" = "assertion.repository"
+        "attribute.repository" = "assertion.project_path"
         "attribute.ref"        = "assertion.ref"
       }
       allowed_audiences = ["https://gitlab.com"]
       issuer_uri        = "https://gitlab.com"
-      principal_tpl     = "principal://iam.googleapis.com/%s/subject/project_path:%s:ref_type:branch:ref:%s"
+      principal_tpl     = "principalSet://iam.googleapis.com/%s/attribute.sub/project_path:%s:ref_type:branch:ref:%s"
       principalset_tpl  = "principalSet://iam.googleapis.com/%s/attribute.repository/%s"
     }
   }

fast/stages/00-bootstrap/outputs.tf

@@ -17,12 +17,16 @@
 locals {
   _cicd_workflow_attrs = {
     bootstrap = {
-      service_account   = module.automation-tf-bootstrap-sa.email
+      service_account = try(
+        module.automation-tf-cicd-sa["bootstrap"].email, null
+      )
       tf_providers_file = "00-bootstrap-providers.tf"
       tf_var_files      = []
     }
     resman = {
-      service_account   = module.automation-tf-resman-sa.email
+      service_account = try(
+        module.automation-tf-cicd-sa["resman"].email, null
+      )
       tf_providers_file = "01-resman-providers.tf"
       tf_var_files = [
         "00-bootstrap.auto.tfvars.json",

fast/stages/00-bootstrap/variables.tf

@@ -61,10 +61,10 @@ variable "cicd_repositories" {
     condition = alltrue([
       for k, v in coalesce(var.cicd_repositories, {}) :
       v == null || (
-        contains(["github"], coalesce(try(v.type, null), "null"))
+        contains(["gitlab", "github"], coalesce(try(v.type, null), "null"))
       )
     ])
-    error_message = "Invalid repository type, supported types: 'github'."
+    error_message = "Invalid repository type, supported types: 'github' or 'gitlab'."
   }
 }
 

fast/stages/01-resman/variables.tf

@@ -99,10 +99,10 @@ variable "cicd_repositories" {
     condition = alltrue([
       for k, v in coalesce(var.cicd_repositories, {}) :
       v == null || (
-        contains(["github"], coalesce(try(v.type, null), "null"))
+        contains(["gitlab", "github"], coalesce(try(v.type, null), "null"))
       )
     ])
-    error_message = "Invalid repository type, supported types: 'github'."
+    error_message = "Invalid repository type, supported types: 'github' or 'gitlab'."
   }
 }
 

modules/__experimental/net-neg/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/api-gateway/versions.tf

@@ -1,29 +1,29 @@
-/**
- * Copyright 2022 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.
- */
+# Copyright 2022 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
+#
+#     https://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 = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
-}
+}
+
+

modules/apigee-organization/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/apigee-x-instance/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/artifact-registry/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/bigquery-dataset/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/bigtable-instance/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/billing-budget/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/cloud-config-container/coredns/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/cloud-config-container/cos-generic-metadata/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/cloud-config-container/envoy-traffic-director/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/cloud-config-container/mysql/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/cloud-config-container/nginx/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/cloud-config-container/onprem/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/cloud-config-container/squid/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/cloud-function/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/cloud-identity-group/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/cloud-run/versions.tf

@@ -1,20 +1,29 @@
-
-/**
- * Copyright 2022 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.
- */
+# Copyright 2022 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
+#
+#     https://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.12.6"
+  required_version = ">= 1.1.0"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = ">= 4.17.0"
+    }
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = ">= 4.17.0"
+    }
+  }
 }
+
+

modules/cloudsql-instance/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/compute-mig/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/compute-vm/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/container-registry/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/data-catalog-policy-tag/versions.tf

@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/datafusion/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/dns/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/endpoints/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/folder/versions.tf

@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/folders-unit/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/gcs/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/gke-cluster/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/gke-hub/versions.tf

@@ -13,15 +13,17 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }
+
+

modules/gke-nodepool/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/iam-service-account/versions.tf

@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/kms/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/logging-bucket/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/naming-convention/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/net-address/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/net-cloudnat/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/net-glb/versions.tf

@@ -13,15 +13,17 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }
+
+

modules/net-ilb-l7/versions.tf

@@ -13,15 +13,17 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }
+
+

modules/net-ilb/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/net-interconnect-attachment-direct/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/net-vpc-firewall/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/net-vpc-peering/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/net-vpc/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/net-vpn-dynamic/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/net-vpn-ha/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/net-vpn-static/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/organization/versions.tf

@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/project/versions.tf

@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/projects-data-source/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/pubsub/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/secret-manager/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/service-directory/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/source-repository/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }

modules/vpc-sc/versions.tf

@@ -13,15 +13,15 @@
 # limitations under the License.
 
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = ">= 1.1.0"
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.0.0"
+      version = ">= 4.17.0"
     }
   }
 }