chore: This updates instance-simple test to use new framework (#208)

* This adds an instance-simple integration test based on the GO test framework * Takes out the kitchen test and fixes versions in go.mod * Takes out the old kitchen test * Minor fixes Co-authored-by: Awais Malik <[email protected]>
terraform-google-modules · Oct 1, 2021 · 2cc11ee · 2cc11ee
1 parent 11523d3
commit 2cc11ee
Show file tree

Hide file tree

Showing 15 changed files with 956 additions and 130 deletions.
diff --git a/.kitchen.yml b/.kitchen.yml
@@ -45,11 +45,6 @@ suites:
       name: terraform
       command_timeout: 1800
       root_module_directory: test/fixtures/preemptible_and_regular_instance_templates/simple
-  - name: instance_simple
-    driver:
-      name: terraform
-      command_timeout: 1800
-      root_module_directory: test/fixtures/compute_instance/simple
   - name: instance_simple_zone
     driver:
       name: terraform

diff --git a/build/int.cloudbuild.yaml b/build/int.cloudbuild.yaml
@@ -81,26 +81,28 @@ steps:
     - verify-preemptible-and-regular-instance-templates-simple-local
   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 && kitchen_do destroy preemptible-and-regular-instance-templates-simple-local']
-- id: create-instance-simple-local
-  wait_for:
+- id: go-init-instance-simple
+  waitFor:
     - 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 && kitchen_do create instance-simple-local']
-- id: converge-instance-simple-local
-  wait_for:
-    - create-instance-simple-local
+  args: ['/bin/bash', '-c', 'cd test/integration && RUN_STAGE=init go test -v -run TestInstanceSimpleModule ./... -p 1']
+- id: go-apply-instance-simple
+  waitFor:
+    - go-init-instance-simple
   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 && kitchen_do converge instance-simple-local']
-- id: verify-instance-simple-local
-  wait_for:
-    - converge-instance-simple-local
+  args: ['/bin/bash', '-c', 'cd test/integration && RUN_STAGE=apply go test -v -run TestInstanceSimpleModule ./... -p 1']
+  timeout: 3600s
+- id: go-verify-instance-simple
+  waitFor:
+    - go-apply-instance-simple
   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 && kitchen_do verify instance-simple-local']
-- id: destroy-instance-simple-local
-  wait_for:
-    - verify-instance-simple-local
+  args: ['/bin/bash', '-c', 'cd test/integration && RUN_STAGE=verify go test -v -run TestInstanceSimpleModule ./... -p 1']
+- id: go-destroy-instance-simple
+  waitFor:
+    - go-verify-instance-simple
   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 && kitchen_do destroy instance-simple-local']
+  args: ['/bin/bash', '-c', 'cd test/integration && RUN_STAGE=teardown go test -v -run TestInstanceSimpleModule ./... -p 1']
+  timeout: 1800s
 - id: create-mig-simple-local
   wait_for:
     - prepare
@@ -126,7 +128,7 @@ steps:
     - destroy-it-simple-local
     - destroy-it-additional-disks-local
     - destroy-preemptible-and-regular-instance-templates-simple-local
-    - destroy-instance-simple-local
+    - go-destroy-instance-simple
     - destroy-mig-simple-local
   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 && kitchen_do create mig-autoscaler-local']
@@ -150,7 +152,7 @@ steps:
     - destroy-it-simple-local
     - destroy-it-additional-disks-local
     - destroy-preemptible-and-regular-instance-templates-simple-local
-    - destroy-instance-simple-local
+    - go-destroy-instance-simple
     - destroy-mig-simple-local
   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 && kitchen_do create umig-simple-local']
@@ -174,7 +176,7 @@ steps:
     - destroy-it-simple-local
     - destroy-it-additional-disks-local
     - destroy-preemptible-and-regular-instance-templates-simple-local
-    - destroy-instance-simple-local
+    - go-destroy-instance-simple
     - destroy-mig-simple-local
   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 && kitchen_do create umig-named-ports-local']
@@ -198,7 +200,7 @@ steps:
     - destroy-it-simple-local
     - destroy-it-additional-disks-local
     - destroy-preemptible-and-regular-instance-templates-simple-local
-    - destroy-instance-simple-local
+    - go-destroy-instance-simple
     - destroy-mig-simple-local
   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 && kitchen_do create umig-static-ips-local']
@@ -222,7 +224,7 @@ steps:
     - destroy-it-simple-local
     - destroy-it-additional-disks-local
     - destroy-preemptible-and-regular-instance-templates-simple-local
-    - destroy-instance-simple-local
+    - go-destroy-instance-simple
     - destroy-mig-simple-local
   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 && kitchen_do create mig-with-percent-simple-local']
@@ -241,6 +243,7 @@ steps:
     - verify-mig-with-percent-simple-local
   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 && kitchen_do destroy mig-with-percent-simple-local']
+
 tags:
 - 'ci'
 - 'integration'

diff --git a/test/fixtures/compute_instance/simple/network.tf b/test/fixtures/compute_instance/simple/network.tf
diff --git a/test/fixtures/compute_instance/simple/terraform.tfvars b/test/fixtures/compute_instance/simple/terraform.tfvars
diff --git a/.../fixtures/compute_instance/simple/main.tf → test/fixtures/instance_simple/main.tf b/.../fixtures/compute_instance/simple/main.tf → test/fixtures/instance_simple/main.tf
@@ -16,7 +16,7 @@
 
 
 module "instance_simple" {
-  source          = "../../../../examples/compute_instance/simple"
+  source          = "../../../examples/compute_instance/simple"
   project_id      = var.project_id
   region          = "us-central1"
   subnetwork      = google_compute_subnetwork.main.self_link

diff --git a/test/fixtures/instance_simple/network.tf b/test/fixtures/instance_simple/network.tf
@@ -0,0 +1 @@
+../shared/network.tf
diff --git a/...xtures/compute_instance/simple/outputs.tf → test/fixtures/instance_simple/outputs.tf b/...xtures/compute_instance/simple/outputs.tf → test/fixtures/instance_simple/outputs.tf
@@ -24,5 +24,7 @@ output "project_id" {
   value       = var.project_id
 }
 
-
-
+output "service_account" {
+  description = "Service account to attach to the instance"
+  value       = var.service_account
+}
diff --git a/...ures/compute_instance/simple/variables.tf → test/fixtures/instance_simple/variables.tf b/...ures/compute_instance/simple/variables.tf → test/fixtures/instance_simple/variables.tf
diff --git a/...tures/compute_instance/simple/versions.tf → test/fixtures/instance_simple/versions.tf b/...tures/compute_instance/simple/versions.tf → test/fixtures/instance_simple/versions.tf
diff --git a/test/integration/discover_test.go b/test/integration/discover_test.go
@@ -0,0 +1,29 @@
+// 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.
+
+package test
+
+import (
+	// should be imported to enable testing for GO modules
+	"testing"
+
+	// should be imported to use terraform helpers in blueprints test framework
+	"github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test/pkg/tft"
+)
+
+// entry function for the test; can be named as Test*
+func TestAll(t *testing.T) {
+	// the helper to autodiscover and test blueprint examples
+	tft.AutoDiscoverAndTest(t)
+}
diff --git a/test/integration/go.mod b/test/integration/go.mod
@@ -0,0 +1,8 @@
+module github.com/terraform-google-modules/terraform-google-sql-db/test/integration
+
+go 1.16
+
+require (
+	github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.0.0-20210930021043-39b4ef08bb23
+	github.com/stretchr/testify v1.7.0
+)