Merge pull request #706 from GoogleCloudPlatform/jccb/fix-705

Bump providers versions and pin versions for tests
GoogleCloudPlatform · Jun 28, 2022 · 6458073 · 6458073
2 parents 09f86f8 + 07b00c3
commit 6458073
Show file tree

Hide file tree

Showing 82 changed files with 188 additions and 170 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -48,6 +48,11 @@ jobs:
         with:
           python-version: ${{ env.PYTHON_VERSION }}
 
+      - name: Pin provider versions
+        run: |
+          sed -i 's/>=\(.*# tftest\)/=\1/g' default-versions.tf
+          find -name versions.tf -exec cp default-versions.tf {} \;
+
       - name: Run tests on documentation examples
         id: pytest
         run: |
@@ -76,6 +81,11 @@ jobs:
           terraform_version: ${{ env.TF_VERSION }}
           terraform_wrapper: false
 
+      - name: Pin provider versions
+        run: |
+          sed -i 's/>=\(.*# tftest\)/=\1/g' default-versions.tf
+          find -name versions.tf -exec cp default-versions.tf {} \;
+
       - name: Run tests environments
         id: pytest
         run: |
@@ -104,6 +114,11 @@ jobs:
           terraform_version: ${{ env.TF_VERSION }}
           terraform_wrapper: false
 
+      - name: Pin provider versions
+        run: |
+          sed -i 's/>=\(.*# tftest\)/=\1/g' default-versions.tf
+          find -name versions.tf -exec cp default-versions.tf {} \;
+
       - name: Run tests modules
         id: pytest
         run: |
@@ -132,6 +147,11 @@ jobs:
           terraform_version: ${{ env.TF_VERSION }}
           terraform_wrapper: false
 
+      - name: Pin provider versions
+        run: |
+          sed -i 's/>=\(.*# tftest\)/=\1/g' default-versions.tf
+          find -name versions.tf -exec cp default-versions.tf {} \;
+
       - name: Run tests on FAST stages
         id: pytest
         run: |

diff --git a/default-versions.tf b/default-versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
   }
 }

diff --git a/examples/cloud-operations/asset-inventory-feed-remediation/versions.tf b/examples/cloud-operations/asset-inventory-feed-remediation/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
   }
 }

diff --git a/examples/cloud-operations/dns-fine-grained-iam/versions.tf b/examples/cloud-operations/dns-fine-grained-iam/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
   }
 }

diff --git a/examples/cloud-operations/dns-shared-vpc/versions.tf b/examples/cloud-operations/dns-shared-vpc/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
   }
 }

diff --git a/examples/cloud-operations/iam-delegated-role-grants/versions.tf b/examples/cloud-operations/iam-delegated-role-grants/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
   }
 }

diff --git a/examples/cloud-operations/onprem-sa-key-management/versions.tf b/examples/cloud-operations/onprem-sa-key-management/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
   }
 }

diff --git a/examples/cloud-operations/packer-image-builder/versions.tf b/examples/cloud-operations/packer-image-builder/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
   }
 }

diff --git a/examples/cloud-operations/quota-monitoring/versions.tf b/examples/cloud-operations/quota-monitoring/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
   }
 }

diff --git a/examples/cloud-operations/scheduled-asset-inventory-export-bq/versions.tf b/examples/cloud-operations/scheduled-asset-inventory-export-bq/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
   }
 }

diff --git a/examples/data-solutions/cmek-via-centralized-kms/versions.tf b/examples/data-solutions/cmek-via-centralized-kms/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
   }
 }

diff --git a/examples/data-solutions/gcs-to-bq-with-least-privileges/versions.tf b/examples/data-solutions/gcs-to-bq-with-least-privileges/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
   }
 }

diff --git a/examples/factories/net-vpc-firewall-yaml/versions.tf b/examples/factories/net-vpc-firewall-yaml/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
   }
 }

diff --git a/examples/foundations/business-units/versions.tf b/examples/foundations/business-units/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
   }
 }

diff --git a/examples/foundations/environments/versions.tf b/examples/foundations/environments/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
   }
 }

diff --git a/examples/networking/decentralized-firewall/versions.tf b/examples/networking/decentralized-firewall/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
   }
 }

diff --git a/examples/networking/filtering-proxy/versions.tf b/examples/networking/filtering-proxy/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
   }
 }

diff --git a/examples/networking/hub-and-spoke-peering/versions.tf b/examples/networking/hub-and-spoke-peering/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
   }
 }

diff --git a/examples/networking/hub-and-spoke-vpn/versions.tf b/examples/networking/hub-and-spoke-vpn/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
   }
 }

diff --git a/examples/networking/ilb-next-hop/versions.tf b/examples/networking/ilb-next-hop/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
   }
 }

diff --git a/examples/networking/onprem-google-access-dns/versions.tf b/examples/networking/onprem-google-access-dns/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
   }
 }

diff --git a/examples/networking/private-cloud-function-from-onprem/versions.tf b/examples/networking/private-cloud-function-from-onprem/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
   }
 }

diff --git a/examples/networking/shared-vpc-gke/versions.tf b/examples/networking/shared-vpc-gke/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
   }
 }

diff --git a/examples/third-party-solutions/openshift/tf/versions.tf b/examples/third-party-solutions/openshift/tf/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.17.0"
+      version = ">= 4.20.0" # tftest
     }
   }
 }

diff --git a/fast/stages/00-cicd/versions.tf b/fast/stages/00-cicd/versions.tf
@@ -15,17 +15,15 @@
 terraform {
   required_version = ">= 1.1.0"
   required_providers {
-    gitlab = {
-      source  = "gitlabhq/gitlab"
-      version = ">= 3.15.0"
+    google = {
+      source  = "hashicorp/google"
+      version = ">= 4.20.0" # tftest
     }
-    github = {
-      source  = "integrations/github"
-      version = ">= 4.26.0"
-    }
-    tls = {
-      source  = "hashicorp/tls"
-      version = "3.4.0"
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = ">= 4.20.0" # tftest
     }
   }
 }
+
+