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

* feat: update TPG version constraints to allow 4.0 * remove kms id in example * kitchen verify version skip Co-authored-by: bharathkkb <[email protected]>
terraform-google-modules · Feb 23, 2022 · 374ab2d · 374ab2d
1 parent ed5c200
commit 374ab2d
Show file tree

Hide file tree

Showing 12 changed files with 40 additions and 18 deletions.
diff --git a/.kitchen.yml b/.kitchen.yml
@@ -16,6 +16,7 @@
 driver:
   name: "terraform"
   command_timeout: 1800
+  verify_version: false
 
 provisioner:
   name: "terraform"

diff --git a/Makefile b/Makefile
@@ -18,7 +18,7 @@
 # Make will use bash instead of sh
 SHELL := /usr/bin/env bash
 
-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.0
+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.3
 DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
 REGISTRY_URL := gcr.io/cloud-foundation-cicd
 

diff --git a/build/int.cloudbuild.yaml b/build/int.cloudbuild.yaml
@@ -38,4 +38,4 @@ tags:
   - 'integration'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.0'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.3'
diff --git a/build/lint.cloudbuild.yaml b/build/lint.cloudbuild.yaml
@@ -21,4 +21,4 @@ tags:
   - 'lint'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.0'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.3'
diff --git a/examples/dlp_api_example/main.tf b/examples/dlp_api_example/main.tf
@@ -15,8 +15,7 @@
  */
 
 provider "google" {
-  version = "~> 3.53"
-  region  = var.region
+  region = var.region
 }
 
 resource "random_id" "random_suffix" {
@@ -86,7 +85,7 @@ resource "google_kms_key_ring" "create_kms_ring" {
 resource "google_kms_crypto_key" "create_kms_key" {
   count      = var.create_key_ring ? 1 : 0
   name       = var.kms_key_name
-  key_ring   = google_kms_key_ring.create_kms_ring[0].self_link
+  key_ring   = google_kms_key_ring.create_kms_ring[0].id
   depends_on = [google_kms_key_ring.create_kms_ring]
 }
 

diff --git a/examples/dlp_api_example/versions.tf b/examples/dlp_api_example/versions.tf
@@ -15,5 +15,17 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+    null = {
+      source = "hashicorp/null"
+    }
+    random = {
+      source = "hashicorp/random"
+    }
+  }
 }
diff --git a/examples/simple_example/main.tf b/examples/simple_example/main.tf
@@ -15,8 +15,7 @@
  */
 
 provider "google" {
-  version = "~> 3.53"
-  region  = var.region
+  region = var.region
 }
 
 resource "random_id" "random_suffix" {
@@ -29,7 +28,7 @@ locals {
 
 module "vpc" {
   source       = "terraform-google-modules/network/google"
-  version      = "~> 3.0"
+  version      = "~> 4.0"
   project_id   = var.project_id
   network_name = "dataflow-network"
 

diff --git a/examples/simple_example/versions.tf b/examples/simple_example/versions.tf
@@ -15,5 +15,14 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 4.0"
+    }
+    random = {
+      source = "hashicorp/random"
+    }
+  }
 }
diff --git a/modules/dataflow_bucket/versions.tf b/modules/dataflow_bucket/versions.tf
@@ -20,7 +20,7 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = "~> 3.53"
+      version = ">= 3.53, < 5.0"
     }
   }
 

diff --git a/test/setup/main.tf b/test/setup/main.tf
@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-provider "google" {
-  version = "~> 3.53"
-}
-
 module "project-ci-dataflow" {
   source  = "terraform-google-modules/project-factory/google"
   version = "~> 10.0"

diff --git a/test/setup/versions.tf b/test/setup/versions.tf
@@ -15,5 +15,11 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.13"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 3.53"
+    }
+  }
 }
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"
     }
   }