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

terraform-google-modules · Jan 4, 2022 · 36a2f59 · 36a2f59
1 parent c0e1fd1
commit 36a2f59
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 12 deletions.
diff --git a/examples/key_distributor/versions.tf b/examples/key_distributor/versions.tf
@@ -0,0 +1,25 @@
+/**
+ * Copyright 2019 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 = "~> 4.0"
+    }
+  }
+}
diff --git a/examples/multiple_service_accounts/main.tf b/examples/multiple_service_accounts/main.tf
@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-provider "google" {
-  version = "~> 3.53"
-}
-
 module "service_accounts" {
   source        = "../.."
   project_id    = var.project_id

diff --git a/examples/multiple_service_accounts/versions.tf b/examples/multiple_service_accounts/versions.tf
@@ -15,5 +15,11 @@
  */
 
 terraform {
-  required_version = ">= 0.12.6"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+  }
 }
diff --git a/examples/single_service_account/main.tf b/examples/single_service_account/main.tf
@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-provider "google" {
-  version = "~> 3.53"
-}
-
 module "service_accounts" {
   source        = "../.."
   project_id    = var.project_id

diff --git a/examples/single_service_account/versions.tf b/examples/single_service_account/versions.tf
@@ -15,5 +15,11 @@
  */
 
 terraform {
-  required_version = ">= 0.12.6"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+  }
 }
diff --git a/modules/key-distributor/versions.tf b/modules/key-distributor/versions.tf
@@ -20,7 +20,7 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = "~> 3.53"
+      version = ">= 3.53, < 5.0"
     }
   }
 

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"
     }
   }