这是indexloc提供的服务，不要输入任何密码
Skip to content

Check env vars for tests are set when used #304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 29, 2025
Merged

Check env vars for tests are set when used #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
53cd36e
refactor env vars checking
kitfoster Apr 29, 2025
8565d13
remove VERCEL_TERRAFORM_TESTING_GITLAB_REPO
kitfoster Apr 29, 2025
193874d
🪼
kitfoster Apr 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions vercel/data_source_access_group_project_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@ import (
func TestAcc_AccessGroupProjectDataSource(t *testing.T) {
name := acctest.RandString(16)
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
Steps: []resource.TestStep{
{
Config: testAccAccessGroupProjectDataSource(name),
Config: testAccAccessGroupProjectDataSource(teamIDConfig(t), name),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("data.vercel_access_group_project.test", "role", "ADMIN"),
),
Expand All @@ -24,7 +23,7 @@ func TestAcc_AccessGroupProjectDataSource(t *testing.T) {
})
}

func testAccAccessGroupProjectDataSource(name string) string {
func testAccAccessGroupProjectDataSource(teamIDConfig string, name string) string {
return fmt.Sprintf(`
resource "vercel_project" "test" {
%[1]s
Expand All @@ -51,5 +50,5 @@ data "vercel_access_group_project" "test" {
vercel_access_group_project.test
]
}
`, teamIDConfig(), name)
`, teamIDConfig, name)
}
7 changes: 3 additions & 4 deletions vercel/data_source_access_group_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@ import (
func TestAcc_AccessGroupDataSource(t *testing.T) {
name := acctest.RandString(16)
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
Steps: []resource.TestStep{
{
Config: testAccAccessGroupDataSource(name),
Config: testAccAccessGroupDataSource(teamIDConfig(t), name),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("data.vercel_access_group.test", "name", "test-acc-"+name),
),
Expand All @@ -24,7 +23,7 @@ func TestAcc_AccessGroupDataSource(t *testing.T) {
})
}

func testAccAccessGroupDataSource(name string) string {
func testAccAccessGroupDataSource(teamIDConfig string, name string) string {
return fmt.Sprintf(`
resource "vercel_access_group" "test" {
name = "test-acc-%[2]s"
Expand All @@ -35,5 +34,5 @@ data "vercel_access_group" "test" {
id = vercel_access_group.test.id
%[1]s
}
`, teamIDConfig(), name)
`, teamIDConfig, name)
}
9 changes: 4 additions & 5 deletions vercel/data_source_alias_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,13 @@ import (
func TestAcc_AliasDataSource(t *testing.T) {
name := acctest.RandString(16)
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
Steps: []resource.TestStep{
{
Config: testAccAliasDataSourceConfig(name, teamIDConfig()),
Config: testAccAliasDataSourceConfig(name, teamIDConfig(t), testGithubRepo(t)),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("data.vercel_alias.test", "alias", fmt.Sprintf("test-acc-%s.vercel.app", name)),
resource.TestCheckResourceAttr("data.vercel_alias.test", "team_id", testTeam()),
resource.TestCheckResourceAttr("data.vercel_alias.test", "team_id", testTeam(t)),
resource.TestCheckResourceAttrSet("data.vercel_alias.test", "id"),
resource.TestCheckResourceAttrSet("data.vercel_alias.test", "deployment_id"),
),
Expand All @@ -27,7 +26,7 @@ func TestAcc_AliasDataSource(t *testing.T) {
})
}

func testAccAliasDataSourceConfig(name, team string) string {
func testAccAliasDataSourceConfig(name, team string, testGithubRepo string) string {
return fmt.Sprintf(`
resource "vercel_project" "test" {
name = "test-acc-%[1]s"
Expand All @@ -54,5 +53,5 @@ data "vercel_alias" "test" {
alias = vercel_alias.test.alias
%[2]s
}
`, name, team, testGithubRepo())
`, name, team, testGithubRepo)
}
3 changes: 1 addition & 2 deletions vercel/data_source_attack_challenge_mode_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@ import (
func TestAcc_AttackChallengeModeDataSource(t *testing.T) {
name := acctest.RandString(16)
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
Steps: []resource.TestStep{
{
Config: testAccAttackChallengeModeConfig(name, teamIDConfig()),
Config: testAccAttackChallengeModeConfig(name, teamIDConfig(t)),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("data.vercel_attack_challenge_mode.never_enabled", "enabled", "false"),
resource.TestCheckResourceAttr("data.vercel_attack_challenge_mode.enabled", "enabled", "true"),
Expand Down
9 changes: 4 additions & 5 deletions vercel/data_source_custom_environment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,11 @@ import (
func TestAcc_CustomEnvironmentDataSource(t *testing.T) {
projectSuffix := acctest.RandString(16)
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
CheckDestroy: testAccProjectDestroy("vercel_project.test", testTeam()),
CheckDestroy: testAccProjectDestroy(testClient(t), "vercel_project.test", testTeam(t)),
Steps: []resource.TestStep{
{
Config: testAccCustomEnvironmentDataSource(projectSuffix),
Config: testAccCustomEnvironmentDataSource(projectSuffix, teamIDConfig(t)),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttrSet("data.vercel_custom_environment.test", "id"),
resource.TestCheckResourceAttrSet("data.vercel_custom_environment.test", "project_id"),
Expand All @@ -30,7 +29,7 @@ func TestAcc_CustomEnvironmentDataSource(t *testing.T) {
})
}

func testAccCustomEnvironmentDataSource(projectSuffix string) string {
func testAccCustomEnvironmentDataSource(projectSuffix, teamIDConfig string) string {
return fmt.Sprintf(`
resource "vercel_project" "test" {
name = "test-acc-custom-env-data-source-%[1]s"
Expand All @@ -53,5 +52,5 @@ data "vercel_custom_environment" "test" {
%[2]s
name = vercel_custom_environment.test.name
}
`, projectSuffix, teamIDConfig())
`, projectSuffix, teamIDConfig)
}
3 changes: 1 addition & 2 deletions vercel/data_source_deployment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@ import (
func TestAcc_DeploymentDataSource(t *testing.T) {
name := acctest.RandString(16)
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
Steps: []resource.TestStep{
{
Config: testAccDeploymentDataSourceConfig(name, teamIDConfig()),
Config: testAccDeploymentDataSourceConfig(name, teamIDConfig(t)),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttrSet("data.vercel_deployment.by_id", "id"),
resource.TestCheckResourceAttrSet("data.vercel_deployment.by_id", "project_id"),
Expand Down
5 changes: 2 additions & 3 deletions vercel/data_source_edge_config_item_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,10 @@ import (
func TestAcc_EdgeConfigItemDataSource(t *testing.T) {
name := acctest.RandString(16)
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
Steps: []resource.TestStep{
{
Config: testAccEdgeConfigItemDataSourceConfig(name, teamIDConfig()),
Config: testAccEdgeConfigItemDataSourceConfig(name, teamIDConfig(t)),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttrSet("data.vercel_edge_config_item.test", "id"),
resource.TestCheckResourceAttrSet("data.vercel_edge_config_item.test", "team_id"),
Expand All @@ -25,7 +24,7 @@ func TestAcc_EdgeConfigItemDataSource(t *testing.T) {
),
},
{
Config: testAccEdgeConfigItemDataSourceConfigNoItem(name, teamIDConfig()),
Config: testAccEdgeConfigItemDataSourceConfigNoItem(name, teamIDConfig(t)),
ExpectError: regexp.MustCompile("not_found"),
},
},
Expand Down
5 changes: 2 additions & 3 deletions vercel/data_source_edge_config_schema_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,18 @@ import (
func TestAcc_EdgeConfigSchemaDataSource(t *testing.T) {
name := acctest.RandString(16)
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
Steps: []resource.TestStep{
{
Config: testAccEdgeConfigSchemaDataSourceConfig(name, teamIDConfig()),
Config: testAccEdgeConfigSchemaDataSourceConfig(name, teamIDConfig(t)),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttrSet("data.vercel_edge_config_schema.test", "id"),
resource.TestCheckResourceAttrSet("data.vercel_edge_config_schema.test", "team_id"),
resource.TestCheckResourceAttrSet("data.vercel_edge_config_schema.test", "definition"),
),
},
{
Config: testAccEdgeConfigSchemaDataSourceConfigNoSchema(name, teamIDConfig()),
Config: testAccEdgeConfigSchemaDataSourceConfigNoSchema(name, teamIDConfig(t)),
ExpectError: regexp.MustCompile("not_found"),
},
},
Expand Down
3 changes: 1 addition & 2 deletions vercel/data_source_edge_config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@ import (
func TestAcc_EdgeConfigDataSource(t *testing.T) {
name := acctest.RandString(16)
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
Steps: []resource.TestStep{
{
Config: testAccEdgeConfigDataSourceConfig(name, teamIDConfig()),
Config: testAccEdgeConfigDataSourceConfig(name, teamIDConfig(t)),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("data.vercel_edge_config.test", "name", name),
),
Expand Down
3 changes: 1 addition & 2 deletions vercel/data_source_edge_config_token_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@ import (
func TestAcc_EdgeConfigTokenDataSource(t *testing.T) {
name := acctest.RandString(16)
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
Steps: []resource.TestStep{
{
Config: testAccEdgeConfigTokenDataSourceConfig(name, teamIDConfig()),
Config: testAccEdgeConfigTokenDataSourceConfig(name, teamIDConfig(t)),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("data.vercel_edge_config_token.test", "label", "test-acc-token"),
resource.TestCheckResourceAttrSet("data.vercel_edge_config_token.test", "edge_config_id"),
Expand Down
3 changes: 1 addition & 2 deletions vercel/data_source_endpoint_verification_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@ import (

func TestAcc_EndpointVerificationDataSource(t *testing.T) {
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
Steps: []resource.TestStep{
{
Config: testAccEndpointVerificationDataSourceConfig(teamIDConfig()),
Config: testAccEndpointVerificationDataSourceConfig(teamIDConfig(t)),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttrSet("data.vercel_endpoint_verification.test", "verification_code"),
),
Expand Down
1 change: 0 additions & 1 deletion vercel/data_source_file_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ func testChecksum(n, attribute string, checksums Checksums) resource.TestCheckFu

func TestAcc_DataSourceFile(t *testing.T) {
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
Steps: []resource.TestStep{
{
Expand Down
3 changes: 1 addition & 2 deletions vercel/data_source_microfrontend_group_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (
func TestAcc_MicrofrontendGroupDataSource(t *testing.T) {
name := acctest.RandString(16)
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
Steps: []resource.TestStep{
{
Expand Down Expand Up @@ -45,7 +44,7 @@ func TestAcc_MicrofrontendGroupDataSource(t *testing.T) {
project_id = vercel_project.test_project_2.id
%[2]s
}
`, name, teamIDConfig()),
`, name, teamIDConfig(t)),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("data.vercel_microfrontend_group.test_group", "name", "test-acc-microfrontend-group-"+name),
resource.TestCheckResourceAttrSet("data.vercel_microfrontend_group.test_group", "default_app.project_id"),
Expand Down
1 change: 0 additions & 1 deletion vercel/data_source_prebuilt_project_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (

func TestAcc_DataSourcePrebuiltProject(t *testing.T) {
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
Steps: []resource.TestStep{
{
Expand Down
11 changes: 5 additions & 6 deletions vercel/data_source_project_deployment_retention_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,15 @@ import (
func TestAcc_ProjectDeploymentRetentionDataSource(t *testing.T) {
nameSuffix := acctest.RandString(16)
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
CheckDestroy: resource.ComposeAggregateTestCheckFunc(
testAccProjectDestroy("vercel_project.example", testTeam()),
testAccProjectDestroy(testClient(t), "vercel_project.example", testTeam(t)),
),
Steps: []resource.TestStep{
{
Config: testAccProjectDeploymentRetentionDataSourceConfig(nameSuffix),
Config: testAccProjectDeploymentRetentionDataSourceConfig(nameSuffix, testGithubRepo(t), teamIDConfig(t)),
Check: resource.ComposeAggregateTestCheckFunc(
testAccProjectDeploymentRetentionExists("vercel_project_deployment_retention.example", testTeam()),
testAccProjectDeploymentRetentionExists(testClient(t), "vercel_project_deployment_retention.example", testTeam(t)),
resource.TestCheckResourceAttr("data.vercel_project_deployment_retention.example", "expiration_preview", "1m"),
resource.TestCheckResourceAttr("data.vercel_project_deployment_retention.example", "expiration_production", "unlimited"),
resource.TestCheckResourceAttr("data.vercel_project_deployment_retention.example", "expiration_canceled", "unlimited"),
Expand All @@ -36,7 +35,7 @@ func TestAcc_ProjectDeploymentRetentionDataSource(t *testing.T) {
})
}

func testAccProjectDeploymentRetentionDataSourceConfig(projectName string) string {
func testAccProjectDeploymentRetentionDataSourceConfig(projectName string, githubRepo string, teamIDConfig string) string {
return fmt.Sprintf(`
resource "vercel_project" "example" {
name = "test-acc-example-project-%[1]s"
Expand Down Expand Up @@ -73,5 +72,5 @@ data "vercel_project_deployment_retention" "example_2" {
project_id = vercel_project.example_2.id
%[3]s
}
`, projectName, testGithubRepo(), teamIDConfig())
`, projectName, githubRepo, teamIDConfig)
}
1 change: 0 additions & 1 deletion vercel/data_source_project_directory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (

func TestAcc_DataSourceProjectDirectory(t *testing.T) {
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
Steps: []resource.TestStep{
{
Expand Down
9 changes: 4 additions & 5 deletions vercel/data_source_project_members_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,11 @@ import (
func TestAcc_ProjectMembersDataSource(t *testing.T) {
projectSuffix := acctest.RandString(16)
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
CheckDestroy: testAccProjectDestroy("vercel_project.test", testTeam()),
CheckDestroy: testAccProjectDestroy(testClient(t), "vercel_project.test", testTeam(t)),
Steps: []resource.TestStep{
{
Config: testAccProjectMembersDataSourceConfig(projectSuffix),
Config: testAccProjectMembersDataSourceConfig(projectSuffix, teamIDConfig(t)),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttrSet("data.vercel_project_members.test", "project_id"),
resource.TestCheckResourceAttr("data.vercel_project_members.test", "members.#", "1"),
Expand All @@ -26,7 +25,7 @@ func TestAcc_ProjectMembersDataSource(t *testing.T) {
})
}

func testAccProjectMembersDataSourceConfig(projectSuffix string) string {
func testAccProjectMembersDataSourceConfig(projectSuffix string, teamIDConfig string) string {
return fmt.Sprintf(`
resource "vercel_project" "test" {
name = "test-acc-project-members-%[1]s"
Expand All @@ -47,5 +46,5 @@ data "vercel_project_members" "test" {
project_id = vercel_project_members.test.project_id
%[2]s
}
`, projectSuffix, teamIDConfig())
`, projectSuffix, teamIDConfig)
}
7 changes: 3 additions & 4 deletions vercel/data_source_project_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@ import (
func TestAcc_ProjectDataSource(t *testing.T) {
name := acctest.RandString(16)
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
Steps: []resource.TestStep{
{
Config: testAccProjectDataSourceConfig(name, teamIDConfig()),
Config: testAccProjectDataSourceConfig(name, teamIDConfig(t), testGithubRepo(t)),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("data.vercel_project.test", "name", "test-acc-"+name),
resource.TestCheckResourceAttr("data.vercel_project.test", "build_command", "npm run build"),
Expand Down Expand Up @@ -63,7 +62,7 @@ func TestAcc_ProjectDataSource(t *testing.T) {
})
}

func testAccProjectDataSourceConfig(name, teamID string) string {
func testAccProjectDataSourceConfig(name, teamID, githubRepo string) string {
return fmt.Sprintf(`
resource "vercel_project" "test" {
name = "test-acc-%s"
Expand Down Expand Up @@ -144,5 +143,5 @@ data "vercel_project" "test" {
name = vercel_project.test.name
%[2]s
}
`, name, teamID, testGithubRepo())
`, name, teamID, githubRepo)
}
3 changes: 1 addition & 2 deletions vercel/data_source_shared_environment_variable_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@ import (
func TestAcc_SharedEnvironmentVariableDataSource(t *testing.T) {
name := acctest.RandString(16)
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
Steps: []resource.TestStep{
{
Config: testAccSharedEnvironmentVariableDataSource(name, teamIDConfig()),
Config: testAccSharedEnvironmentVariableDataSource(name, teamIDConfig(t)),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("data.vercel_shared_environment_variable.test", "key", "test_acc_"+name),
resource.TestCheckResourceAttr("data.vercel_shared_environment_variable.test", "value", "foobar"),
Expand Down
3 changes: 1 addition & 2 deletions vercel/data_source_team_config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@ func TestAcc_TeamConfigDataSource(t *testing.T) {
resourceName := "data.vercel_team_config.test"

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
Steps: []resource.TestStep{
{
Config: testAccVercelTeamConfigDataSource(testTeam()),
Config: testAccVercelTeamConfigDataSource(testTeam(t)),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttrSet(resourceName, "id"),
resource.TestCheckResourceAttrSet(resourceName, "name"),
Expand Down
Loading