fix: provider_meta and test boilerplate (#6)

Author: apeabody

Makefile

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

README.md

@@ -72,7 +72,7 @@ These sections describe requirements for using this module.
 The following dependencies must be available:
 
 - [Terraform][terraform] v0.13
-- [Terraform Provider for GCP][terraform-provider-gcp] plugin v3.0
+- [Terraform Provider for GCP][terraform-provider-gcp] plugin v3.53
 
 ### Service Account
 

build/int.cloudbuild.yaml

@@ -38,4 +38,4 @@ tags:
 - 'integration'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.19'

examples/simple_example/README.md

@@ -7,14 +7,14 @@ This example illustrates how to use the `enterprise-application` module.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| bucket\_name | The name of the bucket to create. | `string` | n/a | yes |
 | project\_id | The ID of the project in which to provision resources. | `string` | n/a | yes |
 
 ## Outputs
 
 | Name | Description |
 |------|-------------|
 | bucket\_name | The name of the bucket. |
+| project\_id | The ID of the project in which to provision resources. |
 
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 

examples/simple_example/main.tf

@@ -18,5 +18,5 @@ module "enterprise_application" {
   source = "../.."
 
   project_id  = var.project_id
-  bucket_name = var.bucket_name
+  bucket_name = "${var.project_id}-bucket"
 }

examples/simple_example/outputs.tf

@@ -18,3 +18,8 @@ output "bucket_name" {
   description = "The name of the bucket."
   value       = module.enterprise_application.bucket_name
 }
+
+output "project_id" {
+  description = "The ID of the project in which to provision resources."
+  value       = var.project_id
+}

examples/simple_example/variables.tf

@@ -18,8 +18,3 @@ variable "project_id" {
   description = "The ID of the project in which to provision resources."
   type        = string
 }
-
-variable "bucket_name" {
-  description = "The name of the bucket to create."
-  type        = string
-}

test/integration/simple_example/simple_example_test.go

@@ -15,6 +15,7 @@
 package multiple_buckets
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test/pkg/gcloud"
@@ -30,10 +31,14 @@ func TestSimpleExample(t *testing.T) {
 		example.DefaultVerify(assert)
 
 		projectID := example.GetStringOutput("project_id")
+		bucketName := example.GetStringOutput("bucket_name")
+
 		services := gcloud.Run(t, "services list", gcloud.WithCommonArgs([]string{"--project", projectID, "--format", "json"})).Array()
+		projectMatch := utils.GetFirstMatchResult(t, services, "config.name", "storage-api.googleapis.com")
+		assert.Equal("ENABLED", projectMatch.Get("state").String(), "storage service should be enabled")
 
-		match := utils.GetFirstMatchResult(t, services, "config.name", "storage.googleapis.com")
-		assert.Equal("ENABLED", match.Get("state").String(), "storage service should be enabled")
+		bucket := gcloud.Run(t, fmt.Sprintf("storage ls --buckets gs://%s", bucketName), gcloud.WithCommonArgs([]string{"--project", projectID, "--json"})).Array()[0]
+		assert.Equal(fmt.Sprintf("gs://%s/", bucketName), bucket.Get("url").String(), "bucket should exist")
 	})
 	example.Test()
 }

versions.tf

@@ -24,6 +24,6 @@ terraform {
   }
 
   provider_meta "google" {
-    module_name = "blueprints/terraform/enterprise-application/v0.0.1"
+    module_name = "blueprints/terraform/terraform-google-enterprise-application/v0.0.1"
   }
 }