From 0132d703e586b3c96a04be1b162f02c077da33a6 Mon Sep 17 00:00:00 2001
From: Roberto Jung Drebes <drebes@google.com>
Date: Wed, 26 Jun 2019 22:43:55 +0200
Subject: [PATCH] Use BootstrapKMSKey in Pub/Sub Topic KMS acceptance test

---
 .../tests/resource_pubsub_topic_test.go       | 107 ++----------------
 1 file changed, 12 insertions(+), 95 deletions(-)

diff --git a/third_party/terraform/tests/resource_pubsub_topic_test.go b/third_party/terraform/tests/resource_pubsub_topic_test.go
index a235aa98fd74..6014f6c9196b 100644
--- a/third_party/terraform/tests/resource_pubsub_topic_test.go
+++ b/third_party/terraform/tests/resource_pubsub_topic_test.go
@@ -6,7 +6,6 @@ import (
 
 	"github.com/hashicorp/terraform/helper/acctest"
 	"github.com/hashicorp/terraform/helper/resource"
-	"github.com/hashicorp/terraform/terraform"
 )
 
 func TestAccPubsubTopic_update(t *testing.T) {
@@ -44,11 +43,8 @@ func TestAccPubsubTopic_update(t *testing.T) {
 func TestAccPubsubTopic_cmek(t *testing.T) {
 	t.Parallel()
 
-	projectId := "terraform-" + acctest.RandString(10)
-	projectOrg := getTestOrgFromEnv(t)
-	projectBillingAccount := getTestBillingAccountFromEnv(t)
-	keyRingName := fmt.Sprintf("tf-test-%s", acctest.RandString(10))
-	cryptoKeyName := fmt.Sprintf("tf-test-%s", acctest.RandString(10))
+	kms := BootstrapKMSKey(t)
+	pid := getTestProjectFromEnv()
 	topicName := fmt.Sprintf("tf-test-%s", acctest.RandString(10))
 
 	resource.Test(t, resource.TestCase{
@@ -56,18 +52,13 @@ func TestAccPubsubTopic_cmek(t *testing.T) {
 		Providers: testAccProviders,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccPubsubTopic_cmek(projectId, projectOrg, projectBillingAccount, keyRingName, cryptoKeyName, topicName),
+				Config: testAccPubsubTopic_cmek(pid, topicName, kms.CryptoKey.Name),
 			},
 			{
 				ResourceName:      "google_pubsub_topic.topic",
 				ImportState:       true,
 				ImportStateVerify: true,
 			},
-			// Use a separate TestStep rather than a CheckDestroy because we need the project to still exist.
-			{
-				Config: testAccPubsubTopic_removed(projectId, projectOrg, projectBillingAccount, keyRingName, cryptoKeyName),
-				Check:  testAccCheckPubsubTopicWasRemovedFromState("google_pubsub_topic.topic"),
-			},
 		},
 	})
 }
@@ -83,96 +74,22 @@ resource "google_pubsub_topic" "foo" {
 `, topic, key, value)
 }
 
-// This test runs in its own project, otherwise the test project would start to get filled
-// with undeletable resources
-func testAccPubsubTopic_cmek(projectId, projectOrg, projectBillingAccount, keyRingName, cryptoKeyName, topicName string) string {
+func testAccPubsubTopic_cmek(pid, topicName, kmsKey string) string {
 	return fmt.Sprintf(`
-resource "google_project" "acceptance" {
-  name            = "%s"
-  project_id      = "%s"
-  org_id          = "%s"
-  billing_account = "%s"
-}
-
-resource "google_project_services" "acceptance" {
-  project = "${google_project.acceptance.project_id}"
-
-  services = [
-    "cloudkms.googleapis.com",
-    "pubsub.googleapis.com",
-  ]
-}
-
-resource "google_kms_key_ring" "key_ring" {
-  project  = "${google_project_services.acceptance.project}"
-  name     = "%s"
-  location = "global"
+data "google_project" "project" {
+  project_id = "%s"
 }
 
-resource "google_kms_crypto_key" "crypto_key" {
-  name     = "%s"
-  key_ring = "${google_kms_key_ring.key_ring.self_link}"
-}
-
-resource "google_project_iam_member" "svc-acct" {
-  project = "${google_project_services.acceptance.project}"
+resource "google_project_iam_member" "kms-project-binding" {
+  project = "${data.google_project.project.project_id}"
   role    = "roles/cloudkms.cryptoKeyEncrypterDecrypter"
-  member  = "serviceAccount:service-${google_project.acceptance.number}@gcp-sa-pubsub.iam.gserviceaccount.com"
+  member  = "serviceAccount:service-${data.google_project.project.number}@gcp-sa-pubsub.iam.gserviceaccount.com"
 }
 
 resource "google_pubsub_topic" "topic" {
   name         = "%s"
-  project      = "${google_project_iam_member.svc-acct.project}"
-  kms_key_name = "${google_kms_crypto_key.crypto_key.self_link}"
-}
-`, projectId, projectId, projectOrg, projectBillingAccount, keyRingName, cryptoKeyName, topicName)
-}
-
-func testAccPubsubTopic_removed(projectId, projectOrg, projectBillingAccount, keyRingName, cryptoKeyName string) string {
-	return fmt.Sprintf(`
-resource "google_project" "acceptance" {
-  name            = "%s"
-  project_id      = "%s"
-  org_id          = "%s"
-  billing_account = "%s"
-}
-
-resource "google_project_services" "acceptance" {
-  project = "${google_project.acceptance.project_id}"
-
-  services = [
-    "cloudkms.googleapis.com",
-    "pubsub.googleapis.com",
-  ]
-}
-
-resource "google_kms_key_ring" "key_ring" {
-  project  = "${google_project_services.acceptance.project}"
-  name     = "%s"
-  location = "global"
-}
-
-resource "google_kms_crypto_key" "crypto_key" {
-  name     = "%s"
-  key_ring = "${google_kms_key_ring.key_ring.self_link}"
-}
-
-resource "google_project_iam_member" "svc-acct" {
-  project = "${google_project_services.acceptance.project}"
-  role    = "roles/cloudkms.cryptoKeyEncrypterDecrypter"
-  member  = "serviceAccount:service-${google_project.acceptance.number}@gcp-sa-pubsub.iam.gserviceaccount.com"
+  project      = "${data.google_project.project.project_id}"
+  kms_key_name = "%s"
 }
-`, projectId, projectId, projectOrg, projectBillingAccount, keyRingName, cryptoKeyName)
-}
-
-func testAccCheckPubsubTopicWasRemovedFromState(resourceName string) resource.TestCheckFunc {
-	return func(s *terraform.State) error {
-		_, ok := s.RootModule().Resources[resourceName]
-
-		if ok {
-			return fmt.Errorf("Resource was not removed from state: %s", resourceName)
-		}
-
-		return nil
-	}
+`, pid, topicName, kmsKey)
 }