fix: update based on pr feedback

terraform-google-modules · Apr 24, 2023 · 5d88abd · 5d88abd
1 parent 15a94ad
commit 5d88abd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 14 deletions.
diff --git a/.kitchen.yml b/.kitchen.yml
@@ -102,9 +102,4 @@ suites:
     driver:
       name: terraform
       command_timeout: 1800
-      root_module_directory: test/fixtures/mig_with_percent/simple
-  - name: mig_stateful
-    driver:
-      name: terraform
-      command_timeout: 1800
-      root_module_directory: test/fixtures/mig_stateful
+      root_module_directory: test/fixtures/mig_with_percent/simple
diff --git a/build/int.cloudbuild.yaml b/build/int.cloudbuild.yaml
@@ -232,23 +232,23 @@ steps:
   waitFor:
     - create-all
   name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
-  args: ['/bin/bash', '-c', 'cd test/integration && RUN_STAGE=init go test -v -run TestMigStatefulModule ./... -p 1']
+  args: ['/bin/bash', '-c', 'cft test run TestMigStatefulModule --stage apply --verbose']
 - id: go-apply-statful-mig
   waitFor:
     - go-init-statful-mig
   name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
-  args: ['/bin/bash', '-c', 'cd test/integration && RUN_STAGE=apply go test -v -run TestMigStatefulModule ./... -p 1']
+  args: ['/bin/bash', '-c', 'cft test run TestMigStatefulModule --stage apply --verbose']
   timeout: 3600s
 - id: go-verify-statful-mig
   waitFor:
     - go-apply-statful-mig
   name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
-  args: ['/bin/bash', '-c', 'cd test/integration && RUN_STAGE=verify go test -v -run TestMigStatefulModule ./... -p 1']
+  args: ['/bin/bash', '-c', 'cft test run TestMigStatefulModule --stage apply --verbose']
 - id: go-destroy-statful-mig
   waitFor:
     - go-verify-statful-mig
   name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
-  args: ['/bin/bash', '-c', 'cd test/integration && RUN_STAGE=teardown go test -v -run TestMigStatefulModule ./... -p 1']
+  args: ['/bin/bash', '-c', 'cft test run TestMigStatefulModule --stage apply --verbose']
   timeout: 1800s
 tags:
 - 'ci'

diff --git a/examples/mig_stateful/main.tf b/examples/mig_stateful/main.tf
@@ -15,13 +15,9 @@
  */
 
 provider "google" {
-  project = var.project_id
-  region  = var.region
 }
 
 provider "google-beta" {
-  project = var.project_id
-  region  = var.region
 }
 
 resource "random_string" "suffix" {