Merge pull request #83 from opencredo/modify-vm

Preventing VM recreation when `network_interface` is changed

Author: matpimenta

skytap/resource_label_category_test.go

@@ -3,7 +3,6 @@ package skytap
 import (
 	"context"
 	"fmt"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"log"
 	"regexp"
 	"strconv"
@@ -23,9 +22,7 @@ func init() {
 }
 
 func TestAccSkytapLabelCategory_Basic(t *testing.T) {
-	uniqueSuffix := acctest.RandInt()
-
-	label := fmt.Sprintf("tftest-label-%d", uniqueSuffix)
+	label := fmt.Sprintf("tftest-label-%s", t.Name())
 
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:          func() { testAccPreCheck(t) },
@@ -47,9 +44,7 @@ func TestAccSkytapLabelCategory_Basic(t *testing.T) {
 }
 
 func TestAccSkytapLabelCategory_Update(t *testing.T) {
-	uniqueSuffix := acctest.RandInt()
-
-	label := fmt.Sprintf("tftest-label-%d", uniqueSuffix)
+	label := fmt.Sprintf("tftest-label-%s", t.Name())
 
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:          func() { testAccPreCheck(t) },
@@ -61,19 +56,16 @@ func TestAccSkytapLabelCategory_Update(t *testing.T) {
 				Check:  testAccCheckSkytapLabelCategoryExists("skytap_label_category.env_category"),
 			},
 			{
-				ExpectNonEmptyPlan: true,
-				Config:             testAccSkytapLabelCategory_basic(label, false),
-				Check:              testAccCheckSkytapLabelCategoryExists("skytap_label_category.env_category"),
-				ExpectError:        regexp.MustCompile(`can not be created with this single value property as it is recreated from a existing label category`),
+				Config:      testAccSkytapLabelCategory_basic(label, false),
+				Check:       testAccCheckSkytapLabelCategoryExists("skytap_label_category.env_category"),
+				ExpectError: regexp.MustCompile(`can not be created with this single value property as it is recreated from a existing label category`),
 			},
 		},
 	})
 }
 
 func TestAccSkytapLabelCategory_MultiValueBasic(t *testing.T) {
-	uniqueSuffix := acctest.RandInt()
-
-	label := fmt.Sprintf("tftest-label-multi-%d", uniqueSuffix)
+	label := fmt.Sprintf("tftest-label-multi-%s", t.Name())
 
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:          func() { testAccPreCheck(t) },
@@ -95,20 +87,20 @@ func TestAccSkytapLabelCategory_MultiValueBasic(t *testing.T) {
 }
 
 func TestAccSkytapLabelCategory_Duplicated(t *testing.T) {
-	labelCategoryDuplicated := `
+	labelCategoryDuplicated := fmt.Sprintf(`
 		resource skytap_label_category "duplabel1" {
-		  name = "tftest-dup"
+		  name = "tftest-dup-%s"
 		  single_value = true
 		}
 		
 		resource skytap_label_category "duplabel2" {
 		  // making sure the first category is created before trying to create the second
 		  // to avoid flakiness.
           depends_on = [skytap_label_category.duplabel1]
-		  name = "tftest-dup"
+		  name = "tftest-dup-%s"
 		  single_value = true
 		}
-	`
+	`, t.Name(), t.Name())
 	expectedError := regexp.MustCompile(".* Validation failed: Name has already been taken")
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:          func() { testAccPreCheck(t) },

skytap/resource_skytap_environment_test.go

@@ -244,15 +244,15 @@ func TestAccSkytapEnvironment_UserDataUpdate(t *testing.T) {
 	})
 }
 
-func labelRequirements(uniqueSuffix int) string {
+func labelRequirements(uniqueSuffix string) string {
 	return fmt.Sprintf(`
 		resource skytap_label_category "environment_label" {
-			name = "tftest-Environment-%d"
+			name = "tftest-Environment-%s"
 			single_value = true
 		}
 
 		resource skytap_label_category "owners_label" {
-			name = "tftest-Owners-%d"
+			name = "tftest-Owners-%s"
 			single_value = false
 		}
 	`, uniqueSuffix, uniqueSuffix)
@@ -285,7 +285,7 @@ func TestAccSkytapEnvironment_Labels(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				PreventDiskCleanup: true,
-				Config:             testAccSkytapEnvironmentConfigBlock(uniqueSuffix, templateID, labelRequirements(uniqueSuffix), labels),
+				Config:             testAccSkytapEnvironmentConfigBlock(uniqueSuffix, templateID, labelRequirements(t.Name()), labels),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckSkytapEnvironmentExists("skytap_environment.foo", &environment),
 				),
@@ -325,8 +325,8 @@ func TestAccSkytapEnvironment_LabelsUpdate(t *testing.T) {
 		}
 	`
 
-	labelEnv := fmt.Sprintf("tftest-Environment-%d", uniqueSuffix)
-	labelOwners := fmt.Sprintf("tftest-Owners-%d", uniqueSuffix)
+	labelEnv := fmt.Sprintf("tftest-Environment-%s", t.Name())
+	labelOwners := fmt.Sprintf("tftest-Owners-%s", t.Name())
 
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:          func() { testAccPreCheck(t) },
@@ -335,7 +335,7 @@ func TestAccSkytapEnvironment_LabelsUpdate(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				PreventDiskCleanup: true,
-				Config:             testAccSkytapEnvironmentConfigBlock(uniqueSuffix, templateID, labelRequirements(uniqueSuffix), labels),
+				Config:             testAccSkytapEnvironmentConfigBlock(uniqueSuffix, templateID, labelRequirements(t.Name()), labels),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckSkytapEnvironmentExists("skytap_environment.foo", &environment),
 					testAccCheckSkytapEnvironmentContainsLabel(&environment, labelEnv, "Prod"),
@@ -345,7 +345,7 @@ func TestAccSkytapEnvironment_LabelsUpdate(t *testing.T) {
 			},
 			{
 				PreventDiskCleanup: true,
-				Config:             testAccSkytapEnvironmentConfigBlock(uniqueSuffix, templateID, labelRequirements(uniqueSuffix), labelsUpdated),
+				Config:             testAccSkytapEnvironmentConfigBlock(uniqueSuffix, templateID, labelRequirements(t.Name()), labelsUpdated),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckSkytapEnvironmentExists("skytap_environment.foo", &environment),
 					testAccCheckSkytapEnvironmentContainsLabel(&environment, labelEnv, "UAT"),