Merge pull request #519 from spacelift-io/extend-vcs-tests

Extend VCS tests
spacelift-io · Feb 29, 2024 · 7813e2d · 7813e2d
2 parents d68f0c2 + 85e1060
commit 7813e2d
Show file tree

Hide file tree

Showing 6 changed files with 1,050 additions and 41 deletions.
diff --git a/.github/workflows/test-prod.yml b/.github/workflows/test-prod.yml
@@ -91,3 +91,18 @@ jobs:
           SPACELIFT_PROVIDER_TEST_SOURCECODE_GITLAB_SPACELEVEL_APIHOST: "https://gitlab.com"
           SPACELIFT_PROVIDER_TEST_SOURCECODE_GITLAB_SPACELEVEL_WEBHOOKSECRET: ${{ secrets.PROD_SPACELIFT_PROVIDER_TEST_SOURCECODE_GITLAB_SPACELEVEL_WEBHOOKSECRET }}
           SPACELIFT_PROVIDER_TEST_SOURCECODE_GITLAB_SPACELEVEL_WEBHOOKURL: ${{ secrets.PROD_SPACELIFT_PROVIDER_TEST_SOURCECODE_GITLAB_SPACELEVEL_WEBHOOKURL }}
+          SPACELIFT_PROVIDER_TEST_SOURCECODE_AZUREDEVOPS_REPOSITORY_NAME: "spacelift-ci"
+          SPACELIFT_PROVIDER_TEST_SOURCECODE_AZUREDEVOPS_REPOSITORY_NAMESPACE: "spacelift-ci"
+          SPACELIFT_PROVIDER_TEST_SOURCECODE_AZUREDEVOPS_REPOSITORY_BRANCH: "main"
+          SPACELIFT_PROVIDER_TEST_SOURCECODE_BITBUCKETCLOUD_REPOSITORY_NAME: "empty"
+          SPACELIFT_PROVIDER_TEST_SOURCECODE_BITBUCKETCLOUD_REPOSITORY_NAMESPACE: "thespacelift"
+          SPACELIFT_PROVIDER_TEST_SOURCECODE_BITBUCKETCLOUD_REPOSITORY_BRANCH: "master"
+          SPACELIFT_PROVIDER_TEST_SOURCECODE_BITBUCKETDATACENTER_REPOSITORY_NAME: "tfprovider-test"
+          SPACELIFT_PROVIDER_TEST_SOURCECODE_BITBUCKETDATACENTER_REPOSITORY_NAMESPACE: "E2E"
+          SPACELIFT_PROVIDER_TEST_SOURCECODE_BITBUCKETDATACENTER_REPOSITORY_BRANCH: "master"
+          SPACELIFT_PROVIDER_TEST_SOURCECODE_GITHUBENTERPRISE_REPOSITORY_NAME: "empty"
+          SPACELIFT_PROVIDER_TEST_SOURCECODE_GITHUBENTERPRISE_REPOSITORY_NAMESPACE: "spacelift-ci-org"
+          SPACELIFT_PROVIDER_TEST_SOURCECODE_GITHUBENTERPRISE_REPOSITORY_BRANCH: "main"
+          SPACELIFT_PROVIDER_TEST_SOURCECODE_GITLAB_REPOSITORY_NAME: "multimodule"
+          SPACELIFT_PROVIDER_TEST_SOURCECODE_GITLAB_REPOSITORY_NAMESPACE: "spacelift-ci"
+          SPACELIFT_PROVIDER_TEST_SOURCECODE_GITLAB_REPOSITORY_BRANCH: "main"
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -93,3 +93,18 @@ jobs:
           SPACELIFT_PROVIDER_TEST_SOURCECODE_GITLAB_SPACELEVEL_APIHOST: "https://gitlab.com"
           SPACELIFT_PROVIDER_TEST_SOURCECODE_GITLAB_SPACELEVEL_WEBHOOKSECRET: ${{ secrets.PREPROD_SPACELIFT_PROVIDER_TEST_SOURCECODE_GITLAB_SPACELEVEL_WEBHOOKSECRET }}
           SPACELIFT_PROVIDER_TEST_SOURCECODE_GITLAB_SPACELEVEL_WEBHOOKURL: ${{ secrets.PREPROD_SPACELIFT_PROVIDER_TEST_SOURCECODE_GITLAB_SPACELEVEL_WEBHOOKURL }}
+          SPACELIFT_PROVIDER_TEST_SOURCECODE_AZUREDEVOPS_REPOSITORY_NAME: "spacelift-ci"
+          SPACELIFT_PROVIDER_TEST_SOURCECODE_AZUREDEVOPS_REPOSITORY_NAMESPACE: "spacelift-ci"
+          SPACELIFT_PROVIDER_TEST_SOURCECODE_AZUREDEVOPS_REPOSITORY_BRANCH: "main"
+          SPACELIFT_PROVIDER_TEST_SOURCECODE_BITBUCKETCLOUD_REPOSITORY_NAME: "empty"
+          SPACELIFT_PROVIDER_TEST_SOURCECODE_BITBUCKETCLOUD_REPOSITORY_NAMESPACE: "thespacelift"
+          SPACELIFT_PROVIDER_TEST_SOURCECODE_BITBUCKETCLOUD_REPOSITORY_BRANCH: "master"
+          SPACELIFT_PROVIDER_TEST_SOURCECODE_BITBUCKETDATACENTER_REPOSITORY_NAME: "tfprovider-test"
+          SPACELIFT_PROVIDER_TEST_SOURCECODE_BITBUCKETDATACENTER_REPOSITORY_NAMESPACE: "E2E"
+          SPACELIFT_PROVIDER_TEST_SOURCECODE_BITBUCKETDATACENTER_REPOSITORY_BRANCH: "master"
+          SPACELIFT_PROVIDER_TEST_SOURCECODE_GITHUBENTERPRISE_REPOSITORY_NAME: "empty"
+          SPACELIFT_PROVIDER_TEST_SOURCECODE_GITHUBENTERPRISE_REPOSITORY_NAMESPACE: "spacelift-ci-org"
+          SPACELIFT_PROVIDER_TEST_SOURCECODE_GITHUBENTERPRISE_REPOSITORY_BRANCH: "main"
+          SPACELIFT_PROVIDER_TEST_SOURCECODE_GITLAB_REPOSITORY_NAME: "multimodule"
+          SPACELIFT_PROVIDER_TEST_SOURCECODE_GITLAB_REPOSITORY_NAMESPACE: "spacelift-ci"
+          SPACELIFT_PROVIDER_TEST_SOURCECODE_GITLAB_REPOSITORY_BRANCH: "main"
diff --git a/spacelift/config_test.go b/spacelift/config_test.go
@@ -27,6 +27,11 @@ var testConfig struct {
 				WebhookSecret   string
 				WebhookURL      string
 			}
+			Repository struct {
+				Name      string
+				Namespace string
+				Branch    string
+			}
 		}
 		BitbucketCloud struct {
 			Default struct {
@@ -42,6 +47,11 @@ var testConfig struct {
 				Username   string
 				WebhookURL string
 			}
+			Repository struct {
+				Name      string
+				Namespace string
+				Branch    string
+			}
 		}
 		BitbucketDatacenter struct {
 			Default struct {
@@ -63,6 +73,11 @@ var testConfig struct {
 				WebhookSecret  string
 				WebhookURL     string
 			}
+			Repository struct {
+				Name      string
+				Namespace string
+				Branch    string
+			}
 		}
 		GithubEnterprise struct {
 			Default struct {
@@ -82,6 +97,11 @@ var testConfig struct {
 				WebhookSecret string
 				WebhookURL    string
 			}
+			Repository struct {
+				Name      string
+				Namespace string
+				Branch    string
+			}
 		}
 		Gitlab struct {
 			Default struct {
@@ -99,6 +119,11 @@ var testConfig struct {
 				WebhookSecret string
 				WebhookURL    string
 			}
+			Repository struct {
+				Name      string
+				Namespace string
+				Branch    string
+			}
 		}
 	}
 }

diff --git a/spacelift/resource_module_test.go b/spacelift/resource_module_test.go
@@ -69,26 +69,6 @@ func TestModuleResource(t *testing.T) {
 		})
 	})
 
-	t.Run("vcs integration id", func(t *testing.T) {
-		testSteps(t, []resource.TestStep{
-			{
-				Config: `resource "spacelift_module" "test" {
-						name                            = "integration-id-check-test"
-						repository                      = "multimodule"
-						branch                          = "main"
-						administrative                  = false
-						gitlab {
-							namespace = "spacelift-ci"
-						}
-					 }`,
-				Check: Resource(
-					"spacelift_module.test",
-					Attribute("gitlab.0.id", Equals(testConfig.SourceCode.Gitlab.Default.ID)),
-				),
-			},
-		})
-	})
-
 	t.Run("project root and custom name", func(t *testing.T) {
 		randomID := acctest.RandStringFromCharSet(5, acctest.CharSetAlphaNum)
 

diff --git a/spacelift/resource_stack_test.go b/spacelift/resource_stack_test.go
@@ -356,27 +356,6 @@ func TestStackResource(t *testing.T) {
 		}})
 	})
 
-	t.Run("vcs integration id", func(t *testing.T) {
-		testSteps(t, []resource.TestStep{
-			{
-				Config: `resource "spacelift_stack" "test" {
-						name                            = "VCS Integration ID setting test"
-						repository                      = "multimodule"
-						branch                          = "main"
-						administrative                  = false
-						manage_state                    = true
-						gitlab {
-							namespace = "spacelift-ci"
-						}
-					 }`,
-				Check: Resource(
-					"spacelift_stack.test",
-					Attribute("gitlab.0.id", Equals(testConfig.SourceCode.Gitlab.Default.ID)),
-				),
-			},
-		})
-	})
-
 	t.Run("external state access", func(t *testing.T) {
 		testSteps(t, []resource.TestStep{
 			{