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

* feat: update TPG version constraints to allow 4.0 * bump dep modules * pin pf to minor Co-authored-by: bharathkkb <bharathkrishnakb@gmail.com>
terraform-google-modules · Dec 13, 2021 · 71aa344 · 71aa344
1 parent a7f39a9
commit 71aa344
Show file tree

Hide file tree

Showing 11 changed files with 126 additions and 59 deletions.
diff --git a/examples/cloudbuild_enabled/main.tf b/examples/cloudbuild_enabled/main.tf
@@ -14,23 +14,6 @@
  * limitations under the License.
  */
 
-
-provider "google" {
-  version = ">= 3.50"
-}
-
-provider "google-beta" {
-  version = ">= 3.50"
-}
-
-provider "null" {
-  version = "~> 2.1"
-}
-
-provider "random" {
-  version = "~> 2.2"
-}
-
 /*************************************************
   Bootstrap GCP Organization.
 *************************************************/

diff --git a/examples/cloudbuild_enabled/versions.tf b/examples/cloudbuild_enabled/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_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = "~> 4.0"
+    }
+    null = {
+      source  = "hashicorp/null"
+      version = "~> 2.1"
+    }
+    random = {
+      source  = "hashicorp/random"
+      version = "~> 2.2"
+    }
+  }
+  required_version = ">= 0.13"
+}
diff --git a/examples/simple-folder/main.tf b/examples/simple-folder/main.tf
@@ -14,18 +14,6 @@
  * limitations under the License.
  */
 
-provider "google" {
-  version = ">= 3.50"
-}
-
-provider "null" {
-  version = "~> 2.1"
-}
-
-provider "random" {
-  version = "~> 2.2"
-}
-
 /*************************************************
   Bootstrap GCP Folder.
 *************************************************/

diff --git a/examples/simple-folder/versions.tf b/examples/simple-folder/versions.tf
@@ -0,0 +1,33 @@
+/**
+ * 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_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+    null = {
+      source  = "hashicorp/null"
+      version = "~> 2.1"
+    }
+    random = {
+      source  = "hashicorp/random"
+      version = "~> 2.2"
+    }
+  }
+  required_version = ">= 0.13"
+}
diff --git a/examples/simple/main.tf b/examples/simple/main.tf
@@ -14,18 +14,6 @@
  * limitations under the License.
  */
 
-provider "google" {
-  version = ">= 3.50"
-}
-
-provider "null" {
-  version = "~> 2.1"
-}
-
-provider "random" {
-  version = "~> 2.2"
-}
-
 /*************************************************
   Bootstrap GCP Organization.
 *************************************************/

diff --git a/examples/simple/versions.tf b/examples/simple/versions.tf
@@ -0,0 +1,33 @@
+/**
+ * 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_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+    null = {
+      source  = "hashicorp/null"
+      version = "~> 2.1"
+    }
+    random = {
+      source  = "hashicorp/random"
+      version = "~> 2.2"
+    }
+  }
+  required_version = ">= 0.13"
+}
diff --git a/main.tf b/main.tf
@@ -56,7 +56,7 @@ resource "google_folder_iam_member" "tmp_project_creator" {
 
 module "seed_project" {
   source                      = "terraform-google-modules/project-factory/google"
-  version                     = "~> 11.2"
+  version                     = "~> 11.3"
   name                        = local.seed_project_id
   random_project_id           = var.random_suffix
   disable_services_on_destroy = false
@@ -93,7 +93,7 @@ data "google_storage_project_service_account" "gcs_account" {
 module "kms" {
   count   = var.encrypt_gcs_bucket_tfstate ? 1 : 0
   source  = "terraform-google-modules/kms/google"
-  version = "~> 1.2"
+  version = "~> 2.1"
 
   project_id           = module.seed_project.project_id
   location             = var.default_region

diff --git a/modules/cloudbuild/main.tf b/modules/cloudbuild/main.tf
@@ -39,7 +39,7 @@ data "google_organization" "org" {
 
 module "cloudbuild_project" {
   source                      = "terraform-google-modules/project-factory/google"
-  version                     = "~> 11.2"
+  version                     = "~> 11.3"
   name                        = local.cloudbuild_project_id
   random_project_id           = var.random_suffix
   disable_services_on_destroy = false
@@ -97,15 +97,15 @@ resource "google_kms_key_ring" "tf_keyring" {
 
 resource "google_kms_crypto_key" "tf_key" {
   name     = "tf-key"
-  key_ring = google_kms_key_ring.tf_keyring.self_link
+  key_ring = google_kms_key_ring.tf_keyring.id
 }
 
 /******************************************
   Permissions to decrypt.
  *****************************************/
 
 resource "google_kms_crypto_key_iam_binding" "cloudbuild_crypto_key_decrypter" {
-  crypto_key_id = google_kms_crypto_key.tf_key.self_link
+  crypto_key_id = google_kms_crypto_key.tf_key.id
   role          = "roles/cloudkms.cryptoKeyDecrypter"
 
   members = [
@@ -119,7 +119,7 @@ resource "google_kms_crypto_key_iam_binding" "cloudbuild_crypto_key_decrypter" {
  *****************************************/
 
 resource "google_kms_crypto_key_iam_binding" "cloud_build_crypto_key_encrypter" {
-  crypto_key_id = google_kms_crypto_key.tf_key.self_link
+  crypto_key_id = google_kms_crypto_key.tf_key.id
   role          = "roles/cloudkms.cryptoKeyEncrypter"
 
   members = [

diff --git a/modules/cloudbuild/versions.tf b/modules/cloudbuild/versions.tf
@@ -20,11 +20,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 3.50"
+      version = ">= 3.50, < 5.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 3.50"
+      version = ">= 3.50, < 5.0"
     }
   }
 

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