Updated tests

OctopusDeployLabs · Jan 11, 2021 · 8079363 · 8079363
1 parent a62a3a2
commit 8079363
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 13 deletions.
diff --git a/octopusdeploy/deployment_process_test.go b/octopusdeploy/deployment_process_test.go
@@ -27,13 +27,17 @@ func TestAccOctopusDeployDeploymentProcessBasic(t *testing.T) {
 }
 
 func testAccDeploymentProcessBasic() string {
+	lifecycleLocalName := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
+	lifecycleName := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
+	projectGroupLocalName := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
+	projectGroupName := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
 	localName := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
 	name := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
 	description := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
 
 	projectID := "octopusdeploy_project." + localName + ".id"
 
-	return fmt.Sprintf(testAccProjectBasic(localName, name, description)+"\n"+
+	return fmt.Sprintf(testAccProjectBasic(lifecycleLocalName, lifecycleName, projectGroupLocalName, projectGroupName, localName, name, description)+"\n"+
 		`resource "octopusdeploy_deployment_process" "test" {
 			project_id = %s
 
@@ -122,13 +126,17 @@ func testAccDeploymentProcessBasic() string {
 }
 
 func testAccBuildTestAction(action string) string {
+	lifecycleLocalName := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
+	lifecycleName := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
+	projectGroupLocalName := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
+	projectGroupName := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
 	localName := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
 	name := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
 	description := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
 
 	projectID := "octopusdeploy_project." + localName + ".id"
 
-	return fmt.Sprintf(testAccProjectBasic(localName, name, description)+"\n"+
+	return fmt.Sprintf(testAccProjectBasic(lifecycleLocalName, lifecycleName, projectGroupLocalName, projectGroupName, localName, name, description)+"\n"+
 		`resource "octopusdeploy_deployment_process" "test" {
 			project_id = %s
 

diff --git a/octopusdeploy/resource_channel_test.go b/octopusdeploy/resource_channel_test.go
@@ -157,11 +157,15 @@ func TestAccOctopusDeployChannelWithTwoRules(t *testing.T) {
 }
 
 func testAccChannelBasic(name string, description string) string {
+	lifecycleLocalName := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
+	lifecycleName := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
+	projectGroupLocalName := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
+	projectGroupName := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
 	projectDescription := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
 	projectLocalName := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
 	projectName := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
 
-	return fmt.Sprintf(testAccProjectBasic(projectLocalName, projectName, projectDescription)+"\n"+`		
+	return fmt.Sprintf(testAccProjectBasic(lifecycleLocalName, lifecycleName, projectGroupLocalName, projectGroupName, projectLocalName, projectName, projectDescription)+"\n"+`		
 		resource "octopusdeploy_channel" "ch" {
 			description = "%s"
 			name        = "%s"

diff --git a/octopusdeploy/resource_project_test.go b/octopusdeploy/resource_project_test.go
@@ -11,6 +11,10 @@ import (
 )
 
 func TestAccOctopusDeployProjectBasic(t *testing.T) {
+	lifecycleLocalName := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
+	lifecycleName := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
+	projectGroupLocalName := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
+	projectGroupName := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
 	localName := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
 	prefix := "octopusdeploy_project." + localName
 
@@ -32,13 +36,17 @@ func TestAccOctopusDeployProjectBasic(t *testing.T) {
 					resource.TestCheckResourceAttr(prefix, "description", description),
 					resource.TestCheckResourceAttr(prefix, "name", name),
 				),
-				Config: testAccProjectBasic(localName, name, description),
+				Config: testAccProjectBasic(lifecycleLocalName, lifecycleName, projectGroupLocalName, projectGroupName, localName, name, description),
 			},
 		},
 	})
 }
 
 func TestAccOctopusDeployProjectWithUpdate(t *testing.T) {
+	lifecycleLocalName := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
+	lifecycleName := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
+	projectGroupLocalName := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
+	projectGroupName := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
 	localName := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
 	prefix := "octopusdeploy_project." + localName
 
@@ -59,7 +67,7 @@ func TestAccOctopusDeployProjectWithUpdate(t *testing.T) {
 					resource.TestCheckResourceAttr(prefix, "description", description),
 					resource.TestCheckResourceAttr(prefix, "name", name),
 				),
-				Config: testAccProjectBasic(localName, name, description),
+				Config: testAccProjectBasic(lifecycleLocalName, lifecycleName, projectGroupLocalName, projectGroupName, localName, name, description),
 			},
 			{
 				Check: resource.ComposeTestCheckFunc(
@@ -70,18 +78,13 @@ func TestAccOctopusDeployProjectWithUpdate(t *testing.T) {
 					resource.TestCheckNoResourceAttr(prefix, "deployment_step.0.windows_service.1.step_name"),
 					resource.TestCheckNoResourceAttr(prefix, "deployment_step.0.iis_website.0.step_name"),
 				),
-				Config: testAccProjectBasic(localName, name, description),
+				Config: testAccProjectBasic(lifecycleLocalName, lifecycleName, projectGroupLocalName, projectGroupName, localName, name, description),
 			},
 		},
 	})
 }
 
-func testAccProjectBasic(localName string, name string, description string) string {
-	lifecycleLocalName := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
-	lifecycleName := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
-	projectGroupLocalName := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
-	projectGroupName := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
-
+func testAccProjectBasic(lifecycleLocalName string, lifecycleName string, projectGroupLocalName string, projectGroupName string, localName string, name string, description string) string {
 	lifecycleID := "octopusdeploy_lifecycle." + lifecycleLocalName + ".id"
 	projectGroupID := "octopusdeploy_project_group." + projectGroupLocalName + ".id"
 

diff --git a/octopusdeploy/resource_variable_test.go b/octopusdeploy/resource_variable_test.go
@@ -37,11 +37,15 @@ func TestAccOctopusDeployVariableBasic(t *testing.T) {
 }
 
 func testVariableBasic(localName string, name string, description string, value string) string {
+	lifecycleLocalName := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
+	lifecycleName := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
+	projectGroupLocalName := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
+	projectGroupName := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
 	projectDescription := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
 	projectLocalName := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
 	projectName := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
 
-	config := fmt.Sprintf(testAccProjectBasic(projectLocalName, projectName, projectDescription)+"\n"+
+	config := fmt.Sprintf(testAccProjectBasic(lifecycleLocalName, lifecycleName, projectGroupLocalName, projectGroupName, projectLocalName, projectName, projectDescription)+"\n"+
 		`resource "octopusdeploy_variable" "%s" {
 			description = "%s"
 			name        = "%s"