Cleaned up arguments being passed in to be more inline with other tests

GoogleCloudPlatform · Mar 3, 2023 · a94cf68 · a94cf68
1 parent 2961a73
commit a94cf68
Showing 1 changed file with 22 additions and 13 deletions.
diff --git a/mmv1/third_party/terraform/tests/resource_compute_instance_template_test.go.erb b/mmv1/third_party/terraform/tests/resource_compute_instance_template_test.go.erb
@@ -1205,16 +1205,20 @@ func TestAccComputeInstanceTemplate_sourceSnapshotEncryptionKey(t *testing.T) {
 
 	var instanceTemplate compute.InstanceTemplate
 	kmsKey := BootstrapKMSKeyInLocation(t, "us-central1")
-	kmsKeyName := GetResourceNameFromSelfLink(kmsKey.CryptoKey.Name)
-	kmsRingName := GetResourceNameFromSelfLink(kmsKey.KeyRing.Name)
+
+	context := map[string]interface{}{
+		"kmsRingName":        GetResourceNameFromSelfLink(kmsKey.CryptoKey.Name),
+		"kmsKeyName":      GetResourceNameFromSelfLink(kmsKey.KeyRing.Name),
+		"random_suffix": randString(t, 10),
+	}
 
 	vcrTest(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckComputeInstanceTemplateDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
-				Config: testAccComputeInstanceTemplate_sourceSnapshotEncryptionKey(kmsRingName, kmsKeyName, randString(t, 10)),
+				Config: testAccComputeInstanceTemplate_sourceSnapshotEncryptionKey(context),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckComputeInstanceTemplateExists(
 						t, "google_compute_instance_template.template", &instanceTemplate),
@@ -1235,16 +1239,20 @@ func TestAccComputeInstanceTemplate_sourceImageEncryptionKey(t *testing.T) {
 
 	var instanceTemplate compute.InstanceTemplate
 	kmsKey := BootstrapKMSKeyInLocation(t, "us-central1")
-	kmsKeyName := GetResourceNameFromSelfLink(kmsKey.CryptoKey.Name)
-	kmsRingName := GetResourceNameFromSelfLink(kmsKey.KeyRing.Name)
+
+	context := map[string]interface{}{
+		"kmsRingName":        GetResourceNameFromSelfLink(kmsKey.CryptoKey.Name),
+		"kmsKeyName":      GetResourceNameFromSelfLink(kmsKey.KeyRing.Name),
+		"random_suffix": randString(t, 10),
+	}
 
 	vcrTest(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckComputeInstanceTemplateDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
-				Config: testAccComputeInstanceTemplate_sourceImageEncryptionKey(kmsRingName, kmsKeyName, randString(t, 10)),
+				Config: testAccComputeInstanceTemplate_sourceImageEncryptionKey(context),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckComputeInstanceTemplateExists(
 						t, "google_compute_instance_template.template", &instanceTemplate),
@@ -3127,8 +3135,9 @@ resource "google_compute_instance_template" "foobar" {
 `, suffix)
 }
 
-func testAccComputeInstanceTemplate_sourceSnapshotEncryptionKey(kmsRingName, kmsKeyName, suffix string) string {
-	return fmt.Sprintf(`
+func testAccComputeInstanceTemplate_sourceSnapshotEncryptionKey(context map[string]interface{}) string {
+	# kmsRingName, kmsKeyName, suffix string
+	return Nprintf(`
 data "google_kms_key_ring" "ring" {
   name     = "%s"
   location = "us-central1"
@@ -3156,7 +3165,7 @@ data "google_compute_image" "debian" {
 }
 
 resource "google_compute_disk" "persistent" {
-  name  = "tf-test-debian-disk-%{suffix}"
+  name  = "tf-test-debian-disk-%{random_suffix}"
   image = data.google_compute_image.debian.self_link
   size  = 10
   type  = "pd-ssd"
@@ -3191,11 +3200,11 @@ resource "google_compute_instance_template" "template" {
     network = "default"
   }
 }
-`, kmsRingName, kmsKeyName, suffix, suffix)
+`, context)
 }
 
-func testAccComputeInstanceTemplate_sourceImageEncryptionKey(kmsRingName, kmsKeyName, suffix string) string {
-	return fmt.Sprintf(`
+func testAccComputeInstanceTemplate_sourceImageEncryptionKey(context map[string]interface{}) string {
+	return Nprintf(`
 data "google_kms_key_ring" "ring" {
   name     = "%s"
   location = "us-central1"
@@ -3250,5 +3259,5 @@ resource "google_compute_instance_template" "template" {
     network = "default"
   }
 }
-`, kmsRingName, kmsKeyName, suffix, suffix)
+`, context)
 }