feat: update TPG version constraints to allow 4.0 (#108)

* feat: update TPG version constraints to allow 4.0 * Update versions.tf Co-authored-by: Bharath KKB <[email protected]>
terraform-google-modules · Dec 20, 2021 · 14320e9 · 14320e9
1 parent d0fc05d
commit 14320e9
Show file tree

Hide file tree

Showing 22 changed files with 154 additions and 89 deletions.
diff --git a/examples/bigquery/billing_account/versions.tf b/examples/bigquery/billing_account/versions.tf
@@ -15,9 +15,11 @@
  */
 
 terraform {
-  required_version = ">=0.12.6"
-}
-
-provider "google" {
-  version = "~> 3.53.0"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+  }
 }
diff --git a/examples/bigquery/folder/versions.tf b/examples/bigquery/folder/versions.tf
@@ -16,9 +16,14 @@
 
 
 terraform {
-  required_version = ">=0.12.6"
-}
-
-provider "google" {
-  version = "~> 3.53.0"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+    random = {
+      source = "hashicorp/random"
+    }
+  }
 }
diff --git a/examples/bigquery/organization/versions.tf b/examples/bigquery/organization/versions.tf
@@ -16,9 +16,14 @@
 
 
 terraform {
-  required_version = ">=0.12.6"
-}
-
-provider "google" {
-  version = "~> 3.53.0"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+    random = {
+      source = "hashicorp/random"
+    }
+  }
 }
diff --git a/examples/bigquery/project/versions.tf b/examples/bigquery/project/versions.tf
@@ -16,9 +16,14 @@
 
 
 terraform {
-  required_version = ">=0.12.6"
-}
-
-provider "google" {
-  version = "~> 3.53.0"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+    random = {
+      source = "hashicorp/random"
+    }
+  }
 }
diff --git a/examples/bq-log-alerting/versions.tf b/examples/bq-log-alerting/versions.tf
@@ -15,9 +15,11 @@
  */
 
 terraform {
-  required_version = ">=0.12.6"
-}
-
-provider "google" {
-  version = "~> 3.53.0"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+  }
 }
diff --git a/examples/datadog-sink/main.tf b/examples/datadog-sink/main.tf
@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-provider "google" {
-  version = "~> 3.53.0"
-}
-
 locals {
   datadog_svc = element(google_service_account.datadog-viewer.*.email, 0)
   log_writ    = module.log_export.writer_identity

diff --git a/examples/datadog-sink/versions.tf b/examples/datadog-sink/versions.tf
@@ -16,5 +16,14 @@
 
 
 terraform {
-  required_version = ">=0.12.6"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+    local = {
+      source = "hashicorp/local"
+    }
+  }
 }
diff --git a/examples/pubsub/billing_account/versions.tf b/examples/pubsub/billing_account/versions.tf
@@ -16,9 +16,11 @@
 
 
 terraform {
-  required_version = ">=0.12.6"
-}
-
-provider "google" {
-  version = "~> 3.53.0"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+  }
 }
diff --git a/examples/pubsub/folder/versions.tf b/examples/pubsub/folder/versions.tf
@@ -16,9 +16,14 @@
 
 
 terraform {
-  required_version = ">=0.12.6"
-}
-
-provider "google" {
-  version = "~> 3.53.0"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+    random = {
+      source = "hashicorp/random"
+    }
+  }
 }
diff --git a/examples/pubsub/organization/versions.tf b/examples/pubsub/organization/versions.tf
@@ -16,9 +16,14 @@
 
 
 terraform {
-  required_version = ">=0.12.6"
-}
-
-provider "google" {
-  version = "~> 3.53.0"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+    random = {
+      source = "hashicorp/random"
+    }
+  }
 }
diff --git a/examples/pubsub/project/versions.tf b/examples/pubsub/project/versions.tf
@@ -16,9 +16,14 @@
 
 
 terraform {
-  required_version = ">=0.12.6"
-}
-
-provider "google" {
-  version = "~> 3.53.0"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+    random = {
+      source = "hashicorp/random"
+    }
+  }
 }
diff --git a/examples/splunk-sink/versions.tf b/examples/splunk-sink/versions.tf
@@ -16,9 +16,11 @@
 
 
 terraform {
-  required_version = ">=0.12.6"
-}
-
-provider "google" {
-  version = "~> 3.53.0"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+  }
 }
diff --git a/examples/storage/billing_account/versions.tf b/examples/storage/billing_account/versions.tf
@@ -16,9 +16,11 @@
 
 
 terraform {
-  required_version = ">=0.12.6"
-}
-
-provider "google" {
-  version = "~> 3.53.0"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+  }
 }
diff --git a/examples/storage/folder/versions.tf b/examples/storage/folder/versions.tf
@@ -16,9 +16,14 @@
 
 
 terraform {
-  required_version = ">=0.12.6"
-}
-
-provider "google" {
-  version = "~> 3.53.0"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+    random = {
+      source = "hashicorp/random"
+    }
+  }
 }
diff --git a/examples/storage/organization/versions.tf b/examples/storage/organization/versions.tf
@@ -16,9 +16,14 @@
 
 
 terraform {
-  required_version = ">=0.12.6"
-}
-
-provider "google" {
-  version = "~> 3.53.0"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+    random = {
+      source = "hashicorp/random"
+    }
+  }
 }
diff --git a/examples/storage/project/versions.tf b/examples/storage/project/versions.tf
@@ -16,9 +16,14 @@
 
 
 terraform {
-  required_version = ">=0.12.6"
-}
-
-provider "google" {
-  version = "~> 3.53.0"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+    random = {
+      source = "hashicorp/random"
+    }
+  }
 }
diff --git a/modules/bigquery/versions.tf b/modules/bigquery/versions.tf
@@ -20,7 +20,7 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = "~> 3.53"
+      version = ">= 3.53, < 5.0"
     }
   }
 

diff --git a/modules/bq-log-alerting/versions.tf b/modules/bq-log-alerting/versions.tf
@@ -20,7 +20,7 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = "~> 3.53"
+      version = ">= 3.53, < 5.0"
     }
   }
 }
diff --git a/modules/pubsub/versions.tf b/modules/pubsub/versions.tf
@@ -20,7 +20,7 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = "~> 3.53"
+      version = ">= 3.53, < 5.0"
     }
   }
 

diff --git a/modules/storage/versions.tf b/modules/storage/versions.tf
@@ -20,7 +20,7 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = "~> 3.53"
+      version = ">= 3.53, < 5.0"
     }
   }
 

diff --git a/test/setup/versions.tf b/test/setup/versions.tf
@@ -15,13 +15,18 @@
  */
 
 terraform {
-  required_version = ">=0.12.6"
-}
-
-provider "google" {
-  version = "~> 3.53.0"
-}
-
-provider "google-beta" {
-  version = "~> 3.53.0"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 3.53.0"
+    }
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = "~> 3.53.0"
+    }
+    null = {
+      source = "hashicorp/null"
+    }
+  }
 }
diff --git a/versions.tf b/versions.tf
@@ -20,7 +20,7 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = "~> 3.53"
+      version = ">= 3.53, < 5.0"
     }
   }