Updating google provider version

Author: anshukaira

Makefile

@@ -62,7 +62,7 @@ docker_test_integration:
 		-e SERVICE_ACCOUNT_JSON \
 		-v "$(CURDIR)":/workspace \
 		$(REGISTRY_URL)/${DOCKER_IMAGE_DEVELOPER_TOOLS}:${DOCKER_TAG_VERSION_DEVELOPER_TOOLS} \
-		/usr/local/bin/test_integration.sh
+		cft test run all
 
 # Execute lint tests within the docker container
 .PHONY: docker_test_lint

examples/gcs_event_arc_trigger_workflow/main.tf

@@ -69,6 +69,7 @@ module "service_account" {
   prefix     = "gcs-eventarc-workflow"
   names      = ["simple"]
   project_roles = ["${var.project_id}=>roles/workflows.invoker",
+  "${var.project_id}=>roles/eventarc.serviceAgent",
   "${var.project_id}=>roles/eventarc.eventReceiver"]
 }
 

examples/simple_workflow/README.md

@@ -9,7 +9,6 @@
 
 | Name | Description |
 |------|-------------|
-| project\_id | Google Cloud project in which the workflow is deployed |
 | revision\_id | The revision\_id  of the workflow. |
 | workflow\_id | The id  of the workflow. |
 

examples/simple_workflow/outputs.tf

@@ -23,8 +23,3 @@ output "revision_id" {
   description = "The revision_id  of the workflow."
   value       = module.standalone_workflow.revision_id
 }
-
-output "project_id" {
-  description = "Google Cloud project in which the workflow is deployed"
-  value       = var.project_id
-}

modules/simple_workflow/metadata.yaml

@@ -25,7 +25,7 @@ spec:
       repo: https://github.com/GoogleCloudPlatform/terraform-google-cloud-workflows.git
       sourceType: git
       dir: /modules/simple_workflow
-    version: 0.1.0
+    version: 0.1.3
     actuationTool:
       flavor: Terraform
       version: ">= 1.3"
@@ -89,6 +89,7 @@ spec:
     roles:
       - level: Project
         roles:
+          - roles/workflows.admin
           - roles/workflows.invoker
     services:
       - iam.googleapis.com
@@ -100,4 +101,4 @@ spec:
       - storage.googleapis.com
     providerVersions:
       - source: hashicorp/google
-        version: ">= 3.53, < 5.0"
+        version: ">= 3.53, < 7"

modules/simple_workflow/versions.tf

@@ -19,11 +19,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 3.53, < 5.0"
+      version = ">= 3.53, < 7"
     }
   }
 
   provider_meta "google" {
-    module_name = "blueprints/terraform/terraform-google-cloud-workflow:simple-workflow/v0.1.0"
+    module_name = "blueprints/terraform/terraform-google-cloud-workflow:simple-workflow/v0.1.3"
   }
 }

test/integration/gcs_event_arc_trigger_workflow/gcs_event_arc_trigger_workflow_test.go

@@ -47,13 +47,22 @@ func uploadToGCS(bucket, file string) {
 	check(err)
 }
 
+// Retry if these errors are encountered.
+var retryErrors = map[string]string{
+	".*Provider produced inconsistent final plan.*": "Provider bug, retry",
+}
+
+
 func TestGcsEventArcTriggerWorkflow(t *testing.T) {
-	bpt := tft.NewTFBlueprintTest(t)
+	bpt := tft.NewTFBlueprintTest(t, tft.WithRetryableTerraformErrors(retryErrors, 5, time.Minute))
 
 	bpt.DefineVerify(func(assert *assert.Assertions) {
 		waitSeconds := 5
 		bpt.DefaultVerify(assert)
 
+		fmt.Println("Sleeping for ", waitSeconds, " seconds")
+		time.Sleep(5 * time.Second)
+
 		projectId := bpt.GetStringOutput("project_id")
 		workflowId := bpt.GetStringOutput("workflow_id")
 		workflowRegion := bpt.GetStringOutput("workflow_region")

test/integration/go.mod

@@ -3,6 +3,6 @@ module github.com/terraform-google-modules/workspace/test/integration
 go 1.16
 
 require (
-	github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.0.0-20220317050137-1c8897fbd42c
+	github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.4.0
 	github.com/stretchr/testify v1.7.0
 )

test/integration/go.sum

@@ -33,7 +33,7 @@ func TestSimpleWorkflow(t *testing.T) {
 		waitSeconds := 5
 		bpt.DefaultVerify(assert)
 
-		projectId := bpt.GetStringOutput("project_id")
+		projectId := bpt.GetTFSetupStringOutput("project_id")
 		workflowId := bpt.GetStringOutput("workflow_id")
 		workflowRevisionId := bpt.GetStringOutput("revision_id")
 		gcOps := gcloud.WithCommonArgs([]string{"--project", projectId, "--location", "us-central1", "--format", "json"})