Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changing name field on google_compute_disk for TestAccComputeInstanceTemplate_sourceSnapshotEncryptionKey to include randomly generated string #7392

Merged
merged 5 commits into from
Mar 14, 2023
Merged

Changing name field on google_compute_disk for TestAccComputeInstanceTemplate_sourceSnapshotEncryptionKey to include randomly generated string #7392

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2961a73
Changed name within google_compute_disk on line 3162 to inclue and r…
NA2047 Mar 2, 2023
e669d6e
Cleaned up arguments being passed in to be more inline with other tests
NA2047 Mar 3, 2023
4f15813
Merge branch 'main' into issue13609
NA2047 Mar 6, 2023
3fbdedb
Updated based on addtional PR comments
NA2047 Mar 6, 2023
0503dfb
Fixed swapping of values within new context
NA2047 Mar 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 30 additions & 21 deletions mmv1/third_party/terraform/tests/resource_compute_instance_template_test.go.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1205,16 +1205,21 @@ 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{}{
"kms_ring_name": GetResourceNameFromSelfLink(kmsKey.KeyRing.Name),
"kms_key_name": GetResourceNameFromSelfLink(kmsKey.CryptoKey.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),
Expand All @@ -1235,16 +1240,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{}{
"kms_ring_name": GetResourceNameFromSelfLink(kmsKey.KeyRing.Name),
"kms_key_name": GetResourceNameFromSelfLink(kmsKey.CryptoKey.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),
Expand Down Expand Up @@ -3127,20 +3136,20 @@ 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 {
return Nprintf(`
NA2047 marked this conversation as resolved.
Show resolved Hide resolved
data "google_kms_key_ring" "ring" {
name = "%s"
name = "%{kms_ring_name}"
location = "us-central1"
}

data "google_kms_crypto_key" "key" {
name = "%s"
name = "%{kms_key_name}"
key_ring = data.google_kms_key_ring.ring.id
}

resource "google_service_account" "test" {
account_id = "test-sa-%s"
account_id = "tf-test-sa-%{random_suffix}"
display_name = "KMS Ops Account"
}

Expand All @@ -3156,7 +3165,7 @@ data "google_compute_image" "debian" {
}

resource "google_compute_disk" "persistent" {
name = "debian-disk"
name = "tf-test-debian-disk-%{random_suffix}"
image = data.google_compute_image.debian.self_link
size = 10
type = "pd-ssd"
Expand All @@ -3174,7 +3183,7 @@ resource "google_compute_snapshot" "snapshot" {
}

resource "google_compute_instance_template" "template" {
name = "tf-test-instance-template-%s"
name = "tf-test-instance-template-%{random_suffix}"
machine_type = "e2-medium"

disk {
Expand All @@ -3191,23 +3200,23 @@ 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"
name = "%{kms_ring_name}"
location = "us-central1"
}

data "google_kms_crypto_key" "key" {
name = "%s"
name = "%{kms_key_name}"
key_ring = data.google_kms_key_ring.ring.id
}

resource "google_service_account" "test" {
account_id = "tf-test-sa-%s"
account_id = "tf-test-sa-%{random_suffix}"
display_name = "KMS Ops Account"
}

Expand All @@ -3233,7 +3242,7 @@ resource "google_compute_image" "image" {


resource "google_compute_instance_template" "template" {
name = "tf-test-instance-template-%s"
name = "tf-test-instance-template-%{random_suffix}"
machine_type = "e2-medium"

disk {
Expand All @@ -3250,5 +3259,5 @@ resource "google_compute_instance_template" "template" {
network = "default"
}
}
`, kmsRingName, kmsKeyName, suffix, suffix)
`, context)
}