fix: [CDS-101927]: Remove Test Project Dependency (#1109)

* fix: [CDS-101927]: Updated Skip with Ticket * fix: [CDS-101927]: Remove Project Dependency * fix: [CDS-101927]: Remove Project Dependency
harness · Nov 13, 2024 · 62aa516 · 62aa516
1 parent 7eb49ac
commit 62aa516
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 25 deletions.
diff --git a/internal/service/cd_nextgen/_PreRequisites/main.tf b/internal/service/cd_nextgen/_PreRequisites/main.tf
@@ -16,13 +16,6 @@ variable "TF_VAR_harness_automation_github_token" {
   type = string
 }
 
-resource "harness_platform_project" "TF_Pipeline_Test" {
-		identifier = "TF_Pipeline_Test"
-		name = "TF_Pipeline_Test"
-		color = "#0063F7"
-		org_id = "default"
-}
-
 resource "harness_platform_secret_text" "TF_spot_account_id" {
   identifier                = "TF_spot_account_id"
   name                      = "TF_spot_account_id"
@@ -31,7 +24,6 @@ resource "harness_platform_secret_text" "TF_spot_account_id" {
   secret_manager_identifier = "harnessSecretManager"
   value_type                = "Inline"
   value                     = "my_secret_value"
-  depends_on                = [harness_platform_project.TF_Pipeline_Test]
 }
 
 resource "harness_platform_secret_text" "TF_spot_api_token" {

diff --git a/internal/service/cd_nextgen/overrides/data_source_overrides_test.go b/internal/service/cd_nextgen/overrides/data_source_overrides_test.go
@@ -9,8 +9,7 @@ import (
 )
 
 func TestAccDataSourceOverrides(t *testing.T) {
-	t.Skip("Skipping this test as it need to check if overrides are supported or not")
-
+	t.Skip("Skipping Test until https://harness.atlassian.net/browse/CDS-81394 is done")
 	id := fmt.Sprintf("%s_%s", t.Name(), utils.RandStringBytes(6))
 	name := id
 	resourceName := "data.harness_platform_overrides.test"
@@ -31,8 +30,7 @@ func TestAccDataSourceOverrides(t *testing.T) {
 }
 
 func TestDataSourceRemoteOverrides(t *testing.T) {
-	t.Skip("Skipping this test as it need to check if overrides are supported or not")
-
+	t.Skip("Skipping Test until https://harness.atlassian.net/browse/CDS-81394 is done")
 	id := fmt.Sprintf("%s_%s", t.Name(), utils.RandStringBytes(6))
 	name := id
 	resourceName := "data.harness_platform_overrides.test"

diff --git a/internal/service/cd_nextgen/overrides/resource_overrides_test.go b/internal/service/cd_nextgen/overrides/resource_overrides_test.go
@@ -13,8 +13,7 @@ import (
 )
 
 func TestAccOverrides_ProjectScope(t *testing.T) {
-	t.Skip("Skipping this test as it need to check if overrides are supported or not")
-
+	t.Skip("Skipping Test until https://harness.atlassian.net/browse/CDS-81394 is done")
 	id := fmt.Sprintf("%s_%s", t.Name(), utils.RandStringBytes(4))
 	name := id
 	resourceName := "harness_platform_overrides.test"
@@ -42,8 +41,7 @@ func TestAccOverrides_ProjectScope(t *testing.T) {
 }
 
 func TestAccOverrides_OrgScope(t *testing.T) {
-	t.Skip("Skipping this test as it need to check if overrides are supported or not")
-
+	t.Skip("Skipping Test until https://harness.atlassian.net/browse/CDS-81394 is done")
 	id := fmt.Sprintf("%s_%s", t.Name(), utils.RandStringBytes(4))
 	name := id
 	resourceName := "harness_platform_overrides.test"
@@ -70,8 +68,7 @@ func TestAccOverrides_OrgScope(t *testing.T) {
 }
 
 func TestAccOverrides_AccountScope(t *testing.T) {
-	t.Skip("Skipping this test as it need to check if overrides are supported or not")
-
+	t.Skip("Skipping Test until https://harness.atlassian.net/browse/CDS-81394 is done")
 	id := fmt.Sprintf("%s_%s", t.Name(), utils.RandStringBytes(4))
 	name := id
 	resourceName := "harness_platform_overrides.test"
@@ -96,8 +93,7 @@ func TestAccOverrides_AccountScope(t *testing.T) {
 }
 
 func TestAccRemoteOverrides(t *testing.T) {
-	t.Skip("Skipping this test as it need to check if overrides are supported or not")
-
+	t.Skip("Skipping Test until https://harness.atlassian.net/browse/CDS-81394 is done")
 	id := fmt.Sprintf("%s_%s", t.Name(), utils.RandStringBytes(4))
 	name := id
 	resourceName := "harness_platform_overrides.test"

diff --git a/internal/service/pipeline/gitx/webhook/data_source_gitx_webhook_service_test.go b/internal/service/pipeline/gitx/webhook/data_source_gitx_webhook_service_test.go
@@ -98,10 +98,16 @@ func testDataSourceGitXOrgLevel(webhook_identifier string, webhook_name string)
 
 func testDataSourceGitXProjectLevel(webhook_identifier string, webhook_name string) string {
 	return fmt.Sprintf(`
+		resource "harness_platform_project" "Project_Test" {
+				identifier = "%[1]s_project"
+				name = "%[2]s_project"
+				color = "#0063F7"
+				org_id = "default"
+		}
 		resource "harness_platform_gitx_webhook" "test" {
 			identifier= "%[1]s"
 			name = "%[2]s"
-			project_id = "TF_Pipeline_Test"
+			project_id = harness_platform_project.Project_Test.identifier
 			org_id = "default"
 			repo_name =  "GitXTest3"
 			connector_ref = "account.TF_github_account_level_connector"

diff --git a/internal/service/pipeline/gitx/webhook/resource_gitx_webhook_service_test.go b/internal/service/pipeline/gitx/webhook/resource_gitx_webhook_service_test.go
@@ -181,10 +181,16 @@ func testGitXAccountLevel(webhook_identifier string, webhook_name string) string
 
 func testGitXProjectProjectLevel(webhook_identifier string, webhook_name string) string {
 	return fmt.Sprintf(`
+		resource "harness_platform_project" "Project_Test" {
+				identifier = "%[1]s_project"
+				name = "%[2]s_project"
+				color = "#0063F7"
+				org_id = "default"
+		}
 		resource "harness_platform_gitx_webhook" "test" {
 			identifier= "%[1]s"
 			name = "%[2]s"
-			project_id = "TF_Pipeline_Test"
+			project_id = harness_platform_project.Project_Test.identifier
 			org_id = "default"
 			repo_name =  "GitXTest3"
 			connector_ref = "account.TF_github_account_level_connector"

diff --git a/internal/service/pipeline/input_set/input_set_resource_test.go b/internal/service/pipeline/input_set/input_set_resource_test.go
@@ -728,10 +728,16 @@ func testAccResourceInputSetImportFromGit(id string, name string) string {
 					identifier = "%[1]s"
 					name = "%[2]s"
 				}
+		resource "harness_platform_project" "Project_Test" {
+				identifier = "TF_InputSet_Pipeline_Test"
+				name = "TF_InputSet_Pipeline_Test"
+				color = "#0063F7"
+				org_id = "default"
+		}
         resource "harness_platform_input_set" "test" {
                         identifier = "inputset"
                         org_id = "default"
-						project_id = "TF_Pipeline_Test"
+						project_id = harness_platform_project.Project_Test.identifier
                         name = "inputset"
                         pipeline_id = "DoNotDeletePipeline"
                         import_from_git = true

diff --git a/internal/service/pipeline/pipeline/resource_pipeline_test.go b/internal/service/pipeline/pipeline/resource_pipeline_test.go
@@ -412,10 +412,16 @@ func testAccResourcePipelineImportFromGit(id string, name string) string {
 					identifier = "%[1]s"
 					name = "%[2]s"
 				}
+		resource "harness_platform_project" "Project_Test" {
+				identifier = "TF_GitX_Pipeline_Test"
+				name = "TF_GitX_Pipeline_Test"
+				color = "#0063F7"
+				org_id = "default"
+		}
         resource "harness_platform_pipeline" "test" {
                         identifier = "gitx"
                         org_id = "default"
-						project_id = "TF_Pipeline_Test"
+						project_id = "TF_GitX_Pipeline_Test"
                         name = "gitx"
                         import_from_git = true
                         git_import_info {

diff --git a/internal/service/pipeline/template/resource_template_test.go b/internal/service/pipeline/template/resource_template_test.go
@@ -1406,10 +1406,16 @@ func testAccResourceTemplateOrgScopeImportFromGit(id string, name string) string
 func testAccResourceTemplateProjectScopeImportFromGit(id string, name string) string {
 	// This has project and org id static due to its config in the git.
 	return fmt.Sprintf(`
+		resource "harness_platform_project" "Project_Test" {
+				identifier = "TF_Project_Pipeline_Test"
+				name = "TF_Project_Pipeline_Test"
+				color = "#0063F7"
+				org_id = "default"
+		}
         resource "harness_platform_template" "test" {
                         identifier = "%[1]s"
                         org_id = "default"
-						project_id = "TF_Pipeline_Test"
+						project_id = harness_platform_project.Project_Test.identifier
                         name = "%[2]s"
 						version = "v2"
                         import_from_git = true