feat: Fix failing tests in master (#53)

* Bumped devtools container, provider version, project factory version to fix failing tests in master
terraform-google-modules · Sep 22, 2020 · 79f0249 · 79f0249
1 parent 6193ee2
commit 79f0249
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 53 deletions.
diff --git a/.gitignore b/.gitignore
@@ -43,4 +43,3 @@ crash.log
 **/*.tfvars
 
 credentials.json
-test/source.sh
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 := 0.6.1
+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.12.0
 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: '0.6.1'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.12.0'
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: '0.6.1'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.12.0'
diff --git a/examples/bastion_group/variables.tf b/examples/bastion_group/variables.tf
@@ -25,7 +25,7 @@ variable "target_size" {
 }
 variable "project" {
   description = "Project ID where the bastion will run"
-  type        = "string"
+  type        = string
 }
 
 variable "region" {

diff --git a/examples/simple_example/variables.tf b/examples/simple_example/variables.tf
@@ -21,7 +21,7 @@ variable "members" {
 
 variable "project" {
   description = "Project ID where the bastion will run"
-  type        = "string"
+  type        = string
 }
 
 variable "region" {

diff --git a/modules/bastion-group/versions.tf b/modules/bastion-group/versions.tf
@@ -14,8 +14,5 @@
  * limitations under the License.
  */
 terraform {
-  required_version = "~> 0.12"
-  required_providers {
-    google = "~> 3.15"
-  }
+  required_version = ">=0.12.6, <0.14"
 }
diff --git a/modules/iap-tunneling/versions.tf b/modules/iap-tunneling/versions.tf
@@ -14,8 +14,5 @@
  * limitations under the License.
  */
 terraform {
-  required_version = "~> 0.12"
-  required_providers {
-    google = "~> 3.15"
-  }
+  required_version = ">=0.12.6, <0.14"
 }
diff --git a/test/setup/main.tf b/test/setup/main.tf
@@ -16,7 +16,7 @@
 
 module "project_ci" {
   source  = "terraform-google-modules/project-factory/google"
-  version = "~> 3.0"
+  version = "~> 9.0"
 
   name              = "ci-bastion-module"
   random_project_id = true

diff --git a/test/setup/make_source.sh b/test/setup/make_source.sh
diff --git a/test/setup/outputs.tf b/test/setup/outputs.tf
@@ -18,6 +18,9 @@ output "project_id" {
   value = module.project_ci.project_id
 }
 
-output "sa_email" {
-  value = google_service_account.ci_account.email
+output "service_account" {
+  value = {
+    email  = google_service_account.ci_account.email
+    scopes = ["cloud-platform"]
+  }
 }
diff --git a/test/setup/versions.tf b/test/setup/versions.tf
@@ -15,13 +15,5 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
-}
-
-provider "google" {
-  version = "~> 2.13.0"
-}
-
-provider "google-beta" {
-  version = "~> 2.13.0"
+  required_version = ">=0.12.6, <0.14"
 }
diff --git a/versions.tf b/versions.tf
@@ -14,8 +14,5 @@
  * limitations under the License.
  */
 terraform {
-  required_version = "~> 0.12"
-  required_providers {
-    google = "~> 3.15"
-  }
+  required_version = ">=0.12.6, <0.14"
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -43,4 +43,3 @@ crash.log
		*/.tfvars

		credentials.json
		test/source.sh