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

* feat: update TPG version constraints to allow 4.0 * pin example using gke to 3.x * Delete make_source.sh * mark ca cert sensitive * fix test .netrc permissions Co-authored-by: bharathkkb <[email protected]>
terraform-google-modules · Nov 22, 2021 · 9b769df · 9b769df
1 parent 28e9123
commit 9b769df
Show file tree

Hide file tree

Showing 13 changed files with 60 additions and 51 deletions.
diff --git a/build/int.cloudbuild.yaml b/build/int.cloudbuild.yaml
@@ -16,7 +16,7 @@ timeout: 3600s
 steps:
 - id: prepare
   name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
-  args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && prepare_environment']
+  args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && prepare_environment && chmod 600 /builder/home/.netrc']
   env:
   - 'TF_VAR_org_id=$_ORG_ID'
   - 'TF_VAR_folder_id=$_FOLDER_ID'

diff --git a/examples/dependency_example/versions.tf b/examples/dependency_example/versions.tf
@@ -15,5 +15,10 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.13"
+  required_providers {
+    random = {
+      source = "hashicorp/random"
+    }
+  }
 }
diff --git a/examples/kubectl_wrapper_example/main.tf b/examples/kubectl_wrapper_example/main.tf
@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-provider "google" {
-  version = "~> 3.53"
-}
-
 locals {
   manifest_path = "${path.module}/manifests"
 }

diff --git a/examples/kubectl_wrapper_example/versions.tf b/examples/kubectl_wrapper_example/versions.tf
@@ -0,0 +1,25 @@
+/**
+ * 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 = "~> 3.53"
+    }
+  }
+  required_version = ">= 0.13"
+}
diff --git a/examples/script_example/main.tf b/examples/script_example/main.tf
@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-provider "google" {
-  version = "~> 3.53"
-}
-
 module "cli" {
   source = "../.."
 

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

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

diff --git a/test/fixtures/kubectl_wrapper_example/outputs.tf b/test/fixtures/kubectl_wrapper_example/outputs.tf
@@ -29,6 +29,7 @@ output "client_token" {
 
 output "ca_certificate" {
   description = "The cluster ca certificate (base64 encoded)"
+  sensitive   = true
   value       = module.gke.ca_certificate
 }
 
diff --git a/test/setup/make_source.sh b/test/setup/make_source.sh
diff --git a/test/setup/versions.tf b/test/setup/versions.tf
@@ -15,13 +15,15 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
-}
-
-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"
+    }
+  }
 }
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"
     }
   }