chore: update tests to use blueprint test framework (#70)

* chore: update tests to use blueprint test framework

* keep sa

Makefile

@@ -18,7 +18,7 @@
 # Make will use bash instead of sh
 SHELL := /usr/bin/env bash
 
-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.0
+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.4
 DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
 REGISTRY_URL := gcr.io/cloud-foundation-cicd
 

build/int.cloudbuild.yaml

@@ -23,19 +23,19 @@ steps:
   - 'TF_VAR_billing_account=$_BILLING_ACCOUNT'
 - id: create
   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']
+  args: ['/bin/bash', '-c', 'cft test run all --stage init --verbose']
 - id: converge
   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']
+  args: ['/bin/bash', '-c', 'cft test run all --stage apply --verbose']
 - id: verify
   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']
+  args: ['/bin/bash', '-c', 'cft test run all --stage verify --verbose']
 - id: destroy
   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']
+  args: ['/bin/bash', '-c', 'cft test run all --stage teardown --verbose']
 tags:
 - 'ci'
 - 'integration'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.0'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.4'

build/lint.cloudbuild.yaml

@@ -21,4 +21,4 @@ tags:
 - 'lint'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.0'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.4'

test/integration/pubsub_scheduled/inspec.yml → examples/logs-slack-alerts/test.yaml

@@ -1,4 +1,4 @@
-# Copyright 2021 Google LLC
+# Copyright 2022 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,15 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: pubsub_scheduled
-depends:
-  - name: inspec-gcp
-    git: https://github.com/inspec/inspec-gcp.git
-    tag: v0.10.0
-attributes:
-  - name: project_id
-    required: true
-    type: string
-  - name: name
-    required: true
-    type: string
+apiVersion: blueprints.cloud.google.com/v1alpha1
+kind: BlueprintTest
+metadata:
+  name: logs-slack-alerts
+spec:
+  skip: true

examples/pubsub_scheduled/README.md

@@ -11,7 +11,6 @@ More information is in the [root readme](../../README.md#app-engine).
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
 | project\_id | The project ID to host the network in | `string` | n/a | yes |
-| region | The region the project is in (App Engine specific) | `string` | `"us-central1"` | no |
 
 ## Outputs
 

examples/pubsub_scheduled/main.tf

@@ -27,6 +27,6 @@ module "pubsub_scheduled_example" {
   function_entry_point      = "doSomething"
   function_source_directory = "${path.module}/function_source"
   function_name             = "testfunction-${random_pet.main.id}"
-  region                    = var.region
+  region                    = "us-central1"
   topic_name                = "pubsub_example_topic_${random_pet.main.id}"
 }

examples/pubsub_scheduled/variables.tf

@@ -19,8 +19,3 @@ variable "project_id" {
   description = "The project ID to host the network in"
 }
 
-variable "region" {
-  type        = string
-  description = "The region the project is in (App Engine specific)"
-  default     = "us-central1"
-}

examples/pubsub_scheduled_multiple/README.md

@@ -19,6 +19,5 @@ More information is in the [root readme](../../README.md#app-engine).
 |------|-------------|
 | name | The name of the job created |
 | project\_id | The project ID |
-| scheduler\_job | An existing Cloud Scheduler job instance |
 
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

examples/pubsub_scheduled_multiple/outputs.tf

@@ -23,9 +23,3 @@ output "project_id" {
   value       = var.project_id
   description = "The project ID"
 }
-
-output "scheduler_job" {
-  value       = module.pubsub_scheduled_1.scheduler_job
-  description = "An existing Cloud Scheduler job instance"
-}
-

test/integration/discover_test.go

@@ -0,0 +1,25 @@
+// Copyright 2022 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 (
+	"testing"
+
+	"github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test/pkg/tft"
+)
+
+func TestAll(t *testing.T) {
+	tft.AutoDiscoverAndTest(t)
+}

test/integration/go.mod

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