test case fix

IBM-Cloud · Dec 6, 2021 · 43f9e3d · 43f9e3d
1 parent 0b3ebd2
commit 43f9e3d
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/ibm/resource_ibm_is_instance_test.go b/ibm/resource_ibm_is_instance_test.go
@@ -167,7 +167,7 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCKVmnMOlHKcZK8tpt3MP1lqOLAcqcJzhsvJcjscgVE
 				),
 			},
 			{
-				Config: testAccCheckIBMISInstanceConfigActionStop(vpcname, subnetname, sshname, publicKey, name),
+				Config: testAccCheckIBMISInstanceConfigActionStop(vpcname, subnetname, sshname, publicKey, name, userData),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckIBMISInstanceExists("ibm_is_instance.testacc_instance", instance),
 					resource.TestCheckResourceAttr(
@@ -177,7 +177,7 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCKVmnMOlHKcZK8tpt3MP1lqOLAcqcJzhsvJcjscgVE
 				),
 			},
 			{
-				Config: testAccCheckIBMISInstanceConfigActionStart(vpcname, subnetname, sshname, publicKey, name),
+				Config: testAccCheckIBMISInstanceConfigActionStart(vpcname, subnetname, sshname, publicKey, name, userData),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckIBMISInstanceExists("ibm_is_instance.testacc_instance", instance),
 					resource.TestCheckResourceAttr(
@@ -187,7 +187,7 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCKVmnMOlHKcZK8tpt3MP1lqOLAcqcJzhsvJcjscgVE
 				),
 			},
 			{
-				Config: testAccCheckIBMISInstanceConfigActionReboot(vpcname, subnetname, sshname, publicKey, name),
+				Config: testAccCheckIBMISInstanceConfigActionReboot(vpcname, subnetname, sshname, publicKey, name, userData),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckIBMISInstanceExists("ibm_is_instance.testacc_instance", instance),
 					resource.TestCheckResourceAttr(
@@ -664,7 +664,7 @@ func testAccCheckIBMISInstanceBandwidthUpdateConfig(vpcname, subnetname, sshname
 	  }`, vpcname, subnetname, ISZoneName, ISCIDR, sshname, publicKey, name, isImage, instanceProfileName, bandwidth, ISZoneName)
 }
 
-func testAccCheckIBMISInstanceConfigActionStop(vpcname, subnetname, sshname, publicKey, name string) string {
+func testAccCheckIBMISInstanceConfigActionStop(vpcname, subnetname, sshname, publicKey, name, userData string) string {
 	return fmt.Sprintf(`
 	resource "ibm_is_vpc" "testacc_vpc" {
 		name = "%s"
@@ -689,6 +689,7 @@ func testAccCheckIBMISInstanceConfigActionStop(vpcname, subnetname, sshname, pub
 		primary_network_interface {
 		  subnet     = ibm_is_subnet.testacc_subnet.id
 		}
+		user_data = "%s"
 		action = "stop"
 		vpc  = ibm_is_vpc.testacc_vpc.id
 		zone = "%s"
@@ -697,10 +698,10 @@ func testAccCheckIBMISInstanceConfigActionStop(vpcname, subnetname, sshname, pub
 		  subnet = ibm_is_subnet.testacc_subnet.id
 		  name   = "eth1"
 		}
-	  }`, vpcname, subnetname, ISZoneName, ISCIDR, sshname, publicKey, name, isImage, instanceProfileName, ISZoneName)
+	  }`, vpcname, subnetname, ISZoneName, ISCIDR, sshname, publicKey, name, isImage, instanceProfileName, userData, ISZoneName)
 }
 
-func testAccCheckIBMISInstanceConfigActionStart(vpcname, subnetname, sshname, publicKey, name string) string {
+func testAccCheckIBMISInstanceConfigActionStart(vpcname, subnetname, sshname, publicKey, name, userData string) string {
 	return fmt.Sprintf(`
 	resource "ibm_is_vpc" "testacc_vpc" {
 		name = "%s"
@@ -725,6 +726,7 @@ func testAccCheckIBMISInstanceConfigActionStart(vpcname, subnetname, sshname, pu
 		primary_network_interface {
 		  subnet     = ibm_is_subnet.testacc_subnet.id
 		}
+		user_data = "%s"
 		action = "start"
 		vpc  = ibm_is_vpc.testacc_vpc.id
 		zone = "%s"
@@ -733,10 +735,10 @@ func testAccCheckIBMISInstanceConfigActionStart(vpcname, subnetname, sshname, pu
 		  subnet = ibm_is_subnet.testacc_subnet.id
 		  name   = "eth1"
 		}
-	  }`, vpcname, subnetname, ISZoneName, ISCIDR, sshname, publicKey, name, isImage, instanceProfileName, ISZoneName)
+	  }`, vpcname, subnetname, ISZoneName, ISCIDR, sshname, publicKey, name, isImage, instanceProfileName, userData, ISZoneName)
 }
 
-func testAccCheckIBMISInstanceConfigActionReboot(vpcname, subnetname, sshname, publicKey, name string) string {
+func testAccCheckIBMISInstanceConfigActionReboot(vpcname, subnetname, sshname, publicKey, name, userData string) string {
 	return fmt.Sprintf(`
 	resource "ibm_is_vpc" "testacc_vpc" {
 		name = "%s"
@@ -761,6 +763,7 @@ func testAccCheckIBMISInstanceConfigActionReboot(vpcname, subnetname, sshname, p
 		primary_network_interface {
 		  subnet     = ibm_is_subnet.testacc_subnet.id
 		}
+		user_data = "%s"
 		action = "reboot"
 		vpc  = ibm_is_vpc.testacc_vpc.id
 		zone = "%s"
@@ -769,7 +772,7 @@ func testAccCheckIBMISInstanceConfigActionReboot(vpcname, subnetname, sshname, p
 		  subnet = ibm_is_subnet.testacc_subnet.id
 		  name   = "eth1"
 		}
-	  }`, vpcname, subnetname, ISZoneName, ISCIDR, sshname, publicKey, name, isImage, instanceProfileName, ISZoneName)
+	  }`, vpcname, subnetname, ISZoneName, ISCIDR, sshname, publicKey, name, isImage, instanceProfileName, userData, ISZoneName)
 }
 
 func testAccCheckIBMISInstanceSnapshotRestoreConfig(vpcname, subnetname, sshname, publicKey, name, snapshot, insRestore string) string {