Skip to content

Refac/stackittpr 229 provider config builder #1313

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

Open
cgoetz-inovex wants to merge 5 commits into
base: main
Choose a base branch
from
+669 −1,256
Open

Refac/stackittpr 229 provider config builder #1313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c86660e
refac(acc_test) replace provider snippets with CofigBuilder
cgoetz-inovex Mar 19, 2026
acb8230
fix(acc_test) inline calls to ConfigBuilder, delete inline funcs
cgoetz-inovex Mar 19, 2026
c7223fd
Merge branch 'main' into refac/STACKITTPR-229_provider-config-builder
cgoetz-inovex Mar 19, 2026
34bded6
fix(testutil) errcheck linter
cgoetz-inovex Mar 19, 2026
8cbc47e
fix(acc_test) set region in BuildClientOptions, fix redis tests
cgoetz-inovex Mar 19, 2026
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
23 changes: 7 additions & 16 deletions stackit/internal/services/alb/alb_acc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import (
"github.com/stackitcloud/stackit-sdk-go/services/alb/wait"
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core"

stackitSdkConfig "github.com/stackitcloud/stackit-sdk-go/core/config"
"github.com/stackitcloud/stackit-sdk-go/core/utils"
"github.com/stackitcloud/stackit-sdk-go/services/alb"
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/testutil"
Expand Down Expand Up @@ -149,7 +148,7 @@ func TestAccALBResourceMin(t *testing.T) {
// Creation
{
ConfigVariables: testConfigVarsMin,
Config: testutil.ALBProviderConfig() + resourceMinConfig,
Config: testutil.NewConfigBuilder().BuildProviderConfig() + resourceMinConfig,
Check: resource.ComposeAggregateTestCheckFunc(
// Load balancer instance resource
resource.TestCheckResourceAttr("stackit_application_load_balancer.loadbalancer", "project_id", testutil.ConvertConfigVariable(testConfigVarsMin["project_id"])),
Expand Down Expand Up @@ -187,7 +186,7 @@ func TestAccALBResourceMin(t *testing.T) {
name = stackit_application_load_balancer.loadbalancer.name
}
`,
testutil.ALBProviderConfig()+resourceMinConfig,
testutil.NewConfigBuilder().BuildProviderConfig()+resourceMinConfig,
),
Check: resource.ComposeAggregateTestCheckFunc(
// Load balancer instance
Expand Down Expand Up @@ -284,7 +283,7 @@ func TestAccALBResourceMin(t *testing.T) {
// Update
{
ConfigVariables: configVarsMinUpdated(),
Config: testutil.ALBProviderConfig() + resourceMinConfig,
Config: testutil.NewConfigBuilder().BuildProviderConfig() + resourceMinConfig,
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("stackit_application_load_balancer.loadbalancer", "project_id", testutil.ConvertConfigVariable(testConfigVarsMin["project_id"])),
resource.TestCheckResourceAttr("stackit_application_load_balancer.loadbalancer", "name", testutil.ConvertConfigVariable(testConfigVarsMin["loadbalancer_name"])),
Expand Down Expand Up @@ -325,7 +324,7 @@ func TestAccALBResourceMax(t *testing.T) {
// Creation
{
ConfigVariables: testConfigVarsMax,
Config: testutil.ALBProviderConfig() + resourceMaxConfig,
Config: testutil.NewConfigBuilder().BuildProviderConfig() + resourceMaxConfig,
Check: resource.ComposeAggregateTestCheckFunc(
// Load balancer instance resource
resource.TestCheckResourceAttr("stackit_application_load_balancer.loadbalancer", "project_id", testutil.ConvertConfigVariable(testConfigVarsMax["project_id"])),
Expand Down Expand Up @@ -420,7 +419,7 @@ func TestAccALBResourceMax(t *testing.T) {
name = stackit_application_load_balancer.loadbalancer.name
}
`,
testutil.ALBProviderConfig()+resourceMaxConfig,
testutil.NewConfigBuilder().BuildProviderConfig()+resourceMaxConfig,
),
Check: resource.ComposeAggregateTestCheckFunc(
// Load balancer instance
Expand Down Expand Up @@ -529,7 +528,7 @@ func TestAccALBResourceMax(t *testing.T) {
// Update
{
ConfigVariables: configVarsMaxUpdated(),
Config: testutil.ALBProviderConfig() + resourceMaxConfig,
Config: testutil.NewConfigBuilder().BuildProviderConfig() + resourceMaxConfig,
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("stackit_application_load_balancer.loadbalancer", "project_id", testutil.ConvertConfigVariable(testConfigVarsMax["project_id"])),
resource.TestCheckResourceAttr("stackit_application_load_balancer.loadbalancer", "region", testutil.ConvertConfigVariable(testConfigVarsMax["region"])),
Expand Down Expand Up @@ -621,15 +620,7 @@ func TestAccALBResourceMax(t *testing.T) {

func testAccCheckALBDestroy(s *terraform.State) error {
ctx := context.Background()
var client *alb.APIClient
var err error
if testutil.ALBCustomEndpoint == "" {
client, err = alb.NewAPIClient()
} else {
client, err = alb.NewAPIClient(
stackitSdkConfig.WithEndpoint(testutil.ALBCustomEndpoint),
)
}
client, err := alb.NewAPIClient(testutil.NewConfigBuilder().BuildClientOptions(testutil.ALBCustomEndpoint)...)
if err != nil {
return fmt.Errorf("creating client: %w", err)
}
Expand Down
71 changes: 19 additions & 52 deletions stackit/internal/services/authorization/authorization_acc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import (
"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
"github.com/hashicorp/terraform-plugin-testing/terraform"
stackitSdkConfig "github.com/stackitcloud/stackit-sdk-go/core/config"
"github.com/stackitcloud/stackit-sdk-go/core/utils"
"github.com/stackitcloud/stackit-sdk-go/services/authorization"
"github.com/stackitcloud/stackit-sdk-go/services/resourcemanager"
Expand Down Expand Up @@ -147,7 +146,7 @@ func TestAccProjectRoleAssignmentResource(t *testing.T) {
// Creation
{
ConfigVariables: testConfigVarsProjectRoleAssignment,
Config: testutil.AuthorizationProviderConfig() + "\n" + resourceProjectRoleAssignment,
Config: testutil.NewConfigBuilder().Experiments(testutil.ExperimentIAM).BuildProviderConfig() + "\n" + resourceProjectRoleAssignment,
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("stackit_resourcemanager_project.project", "name", testutil.ConvertConfigVariable(testConfigVarsProjectRoleAssignment["name"])),
resource.TestCheckResourceAttr("stackit_resourcemanager_project.project", "owner_email", testutil.ConvertConfigVariable(testConfigVarsProjectRoleAssignment["owner_email"])),
Expand Down Expand Up @@ -194,7 +193,7 @@ func TestAccProjectRoleAssignmentResource(t *testing.T) {
// Update
{
ConfigVariables: testConfigVarsProjectRoleAssignmentUpdated(),
Config: testutil.AuthorizationProviderConfig() + "\n" + resourceProjectRoleAssignment,
Config: testutil.NewConfigBuilder().Experiments(testutil.ExperimentIAM).BuildProviderConfig() + "\n" + resourceProjectRoleAssignment,
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("stackit_resourcemanager_project.project", "name", testutil.ConvertConfigVariable(testConfigVarsProjectRoleAssignmentUpdated()["name"])),
resource.TestCheckResourceAttr("stackit_resourcemanager_project.project", "owner_email", testutil.ConvertConfigVariable(testConfigVarsProjectRoleAssignmentUpdated()["owner_email"])),
Expand All @@ -214,7 +213,7 @@ func TestAccProjectRoleAssignmentResource(t *testing.T) {
// Duplicate assignment should fail
{
ConfigVariables: testConfigVarsProjectRoleAssignmentUpdated(),
Config: testutil.AuthorizationProviderConfig() + "\n" + resourceProjectRoleAssignmentDuplicate,
Config: testutil.NewConfigBuilder().Experiments(testutil.ExperimentIAM).BuildProviderConfig() + "\n" + resourceProjectRoleAssignmentDuplicate,
ExpectError: regexp.MustCompile(`Error while checking for duplicate role assignments`),
},

Expand All @@ -233,7 +232,7 @@ func TestAccFolderRoleAssignmentResource(t *testing.T) {
// Creation
{
ConfigVariables: testConfigVarsFolderRoleAssignment,
Config: testutil.AuthorizationProviderConfig() + "\n" + resourceFolderRoleAssignment,
Config: testutil.NewConfigBuilder().Experiments(testutil.ExperimentIAM).BuildProviderConfig() + "\n" + resourceFolderRoleAssignment,
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("stackit_resourcemanager_folder.folder", "name", testutil.ConvertConfigVariable(testConfigVarsFolderRoleAssignment["name"])),
resource.TestCheckResourceAttr("stackit_resourcemanager_folder.folder", "owner_email", testutil.ConvertConfigVariable(testConfigVarsFolderRoleAssignment["owner_email"])),
Expand Down Expand Up @@ -280,7 +279,7 @@ func TestAccFolderRoleAssignmentResource(t *testing.T) {
// Update
{
ConfigVariables: testConfigVarsFolderRoleAssignmentUpdated(),
Config: testutil.AuthorizationProviderConfig() + "\n" + resourceFolderRoleAssignment,
Config: testutil.NewConfigBuilder().Experiments(testutil.ExperimentIAM).BuildProviderConfig() + "\n" + resourceFolderRoleAssignment,
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("stackit_resourcemanager_folder.folder", "name", testutil.ConvertConfigVariable(testConfigVarsFolderRoleAssignmentUpdated()["name"])),
resource.TestCheckResourceAttr("stackit_resourcemanager_folder.folder", "owner_email", testutil.ConvertConfigVariable(testConfigVarsFolderRoleAssignmentUpdated()["owner_email"])),
Expand All @@ -300,7 +299,7 @@ func TestAccFolderRoleAssignmentResource(t *testing.T) {
// Duplicate assignment should fail
{
ConfigVariables: testConfigVarsFolderRoleAssignmentUpdated(),
Config: testutil.AuthorizationProviderConfig() + "\n" + resourceFolderRoleAssignmentDuplicate,
Config: testutil.NewConfigBuilder().Experiments(testutil.ExperimentIAM).BuildProviderConfig() + "\n" + resourceFolderRoleAssignmentDuplicate,
ExpectError: regexp.MustCompile(`Error while checking for duplicate role assignments`),
},
// Deletion is done by the framework implicitly
Expand All @@ -318,7 +317,7 @@ func TestAccOrgRoleAssignmentResource(t *testing.T) {
// Creation
{
ConfigVariables: testConfigVarsOrgRoleAssignment,
Config: testutil.AuthorizationProviderConfig() + "\n" + resourceOrgRoleAssignment,
Config: testutil.NewConfigBuilder().Experiments(testutil.ExperimentIAM).BuildProviderConfig() + "\n" + resourceOrgRoleAssignment,
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttrSet("stackit_authorization_organization_role_assignment.ora", "resource_id"),
resource.TestCheckResourceAttrSet("stackit_authorization_organization_role_assignment.ora", "id"),
Expand Down Expand Up @@ -356,7 +355,7 @@ func TestAccOrgRoleAssignmentResource(t *testing.T) {
// Update
{
ConfigVariables: testConfigVarsOrgRoleAssignmentUpdated(),
Config: testutil.AuthorizationProviderConfig() + "\n" + resourceOrgRoleAssignment,
Config: testutil.NewConfigBuilder().Experiments(testutil.ExperimentIAM).BuildProviderConfig() + "\n" + resourceOrgRoleAssignment,
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttrSet("stackit_authorization_organization_role_assignment.ora", "resource_id"),
resource.TestCheckResourceAttrSet("stackit_authorization_organization_role_assignment.ora", "id"),
Expand All @@ -367,7 +366,7 @@ func TestAccOrgRoleAssignmentResource(t *testing.T) {
// Duplicate assignment should fail
{
ConfigVariables: testConfigVarsOrgRoleAssignmentUpdated(),
Config: testutil.AuthorizationProviderConfig() + "\n" + resourceOrgRoleAssignmentDuplicate,
Config: testutil.NewConfigBuilder().Experiments(testutil.ExperimentIAM).BuildProviderConfig() + "\n" + resourceOrgRoleAssignmentDuplicate,
ExpectError: regexp.MustCompile(`Error while checking for duplicate role assignments`),
},
// Deletion is done by the framework implicitly
Expand All @@ -384,7 +383,7 @@ func TestAccServiceAccountRoleAssignmentResource(t *testing.T) {
// Creation
{
ConfigVariables: testConfigVarsServiceAccountRoleAssignment,
Config: testutil.AuthorizationProviderConfig() + "\n" + resourceServiceAccountRoleAssignment,
Config: testutil.NewConfigBuilder().Experiments(testutil.ExperimentIAM).BuildProviderConfig() + "\n" + resourceServiceAccountRoleAssignment,
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttrSet("stackit_authorization_service_account_role_assignment.sa", "resource_id"),
resource.TestCheckResourceAttrSet("stackit_authorization_service_account_role_assignment.sa", "id"),
Expand Down Expand Up @@ -412,7 +411,7 @@ func TestAccServiceAccountRoleAssignmentResource(t *testing.T) {
// Update
{
ConfigVariables: testConfigVarsServiceAccountRoleAssignmentUpdated(),
Config: testutil.AuthorizationProviderConfig() + "\n" + resourceServiceAccountRoleAssignment,
Config: testutil.NewConfigBuilder().Experiments(testutil.ExperimentIAM).BuildProviderConfig() + "\n" + resourceServiceAccountRoleAssignment,
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttrSet("stackit_authorization_service_account_role_assignment.sa", "resource_id"),
resource.TestCheckResourceAttrSet("stackit_authorization_service_account_role_assignment.sa", "id"),
Expand All @@ -426,7 +425,7 @@ func TestAccServiceAccountRoleAssignmentResource(t *testing.T) {
// Duplicate assignment should fail
{
ConfigVariables: testConfigVarsServiceAccountRoleAssignmentUpdated(),
Config: testutil.AuthorizationProviderConfig() + "\n" + resourceServiceAccountRoleAssignmentDuplicate,
Config: testutil.NewConfigBuilder().Experiments(testutil.ExperimentIAM).BuildProviderConfig() + "\n" + resourceServiceAccountRoleAssignmentDuplicate,
ExpectError: regexp.MustCompile(`Error while checking for duplicate role assignments`),
},
// Deletion is done by the framework implicitly
Expand All @@ -441,7 +440,7 @@ func TestAccProjectCustomRoleResource(t *testing.T) {
Steps: []resource.TestStep{
{
ConfigVariables: testConfigVarsCustomRole,
Config: testutil.AuthorizationProviderConfig() + resourceCustomRole,
Config: testutil.NewConfigBuilder().Experiments(testutil.ExperimentIAM).BuildProviderConfig() + resourceCustomRole,
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("stackit_authorization_project_custom_role.custom_role", "resource_id", testutil.ConvertConfigVariable(testConfigVarsCustomRole["project_id"])),
resource.TestCheckResourceAttr("stackit_authorization_project_custom_role.custom_role", "name", testutil.ConvertConfigVariable(testConfigVarsCustomRole["role_name"])),
Expand All @@ -462,7 +461,7 @@ func TestAccProjectCustomRoleResource(t *testing.T) {
role_id = stackit_authorization_project_custom_role.custom_role.role_id
}
`,
testutil.AuthorizationProviderConfig()+resourceCustomRole,
testutil.NewConfigBuilder().Experiments(testutil.ExperimentIAM).BuildProviderConfig()+resourceCustomRole,
),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("data.stackit_authorization_project_custom_role.custom_role", "resource_id", testutil.ConvertConfigVariable(testConfigVarsCustomRole["project_id"])),
Expand Down Expand Up @@ -510,7 +509,7 @@ func TestAccProjectCustomRoleResource(t *testing.T) {
// Update
{
ConfigVariables: testConfigVarsCustomRoleUpdated,
Config: testutil.AuthorizationProviderConfig() + resourceCustomRole,
Config: testutil.NewConfigBuilder().Experiments(testutil.ExperimentIAM).BuildProviderConfig() + resourceCustomRole,
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("stackit_authorization_project_custom_role.custom_role", "resource_id", testutil.ConvertConfigVariable(testConfigVarsCustomRoleUpdated["project_id"])),
resource.TestCheckResourceAttr("stackit_authorization_project_custom_role.custom_role", "name", testutil.ConvertConfigVariable(testConfigVarsCustomRoleUpdated["role_name"])),
Expand Down Expand Up @@ -553,15 +552,7 @@ func testAccCheckDestroy(s *terraform.State) error {

func testAccCheckResourceManagerProjectsDestroy(s *terraform.State) error {
ctx := context.Background()
var client *resourcemanager.APIClient
var err error
if testutil.ResourceManagerCustomEndpoint == "" {
client, err = resourcemanager.NewAPIClient()
} else {
client, err = resourcemanager.NewAPIClient(
stackitSdkConfig.WithEndpoint(testutil.ResourceManagerCustomEndpoint),
)
}
client, err := resourcemanager.NewAPIClient(testutil.NewConfigBuilder().BuildClientOptions(testutil.ResourceManagerCustomEndpoint)...)
if err != nil {
return fmt.Errorf("creating client: %w", err)
}
Expand Down Expand Up @@ -609,15 +600,7 @@ func testAccCheckResourceManagerProjectsDestroy(s *terraform.State) error {

func testAccCheckResourceManagerFoldersDestroy(s *terraform.State) error {
ctx := context.Background()
var client *resourcemanager.APIClient
var err error
if testutil.ResourceManagerCustomEndpoint == "" {
client, err = resourcemanager.NewAPIClient()
} else {
client, err = resourcemanager.NewAPIClient(
stackitSdkConfig.WithEndpoint(testutil.ResourceManagerCustomEndpoint),
)
}
client, err := resourcemanager.NewAPIClient(testutil.NewConfigBuilder().BuildClientOptions(testutil.ResourceManagerCustomEndpoint)...)
if err != nil {
return fmt.Errorf("creating client: %w", err)
}
Expand Down Expand Up @@ -658,15 +641,7 @@ func testAccCheckResourceManagerFoldersDestroy(s *terraform.State) error {

func testAccCheckOrganizationRoleAssignmentDestroy(s *terraform.State) error {
ctx := context.Background()
var client *authorization.APIClient
var err error
if testutil.AuthorizationCustomEndpoint == "" {
client, err = authorization.NewAPIClient()
} else {
client, err = authorization.NewAPIClient(
stackitSdkConfig.WithEndpoint(testutil.AuthorizationCustomEndpoint),
)
}
client, err := authorization.NewAPIClient(testutil.NewConfigBuilder().BuildClientOptions(testutil.AuthorizationCustomEndpoint)...)
if err != nil {
return fmt.Errorf("creating client: %w", err)
}
Expand Down Expand Up @@ -705,15 +680,7 @@ func testAccCheckOrganizationRoleAssignmentDestroy(s *terraform.State) error {

func testAccCheckServiceAccountRoleAssignmentDestroy(s *terraform.State) error {
ctx := context.Background()
var client *authorization.APIClient
var err error
if testutil.AuthorizationCustomEndpoint == "" {
client, err = authorization.NewAPIClient()
} else {
client, err = authorization.NewAPIClient(
stackitSdkConfig.WithEndpoint(testutil.AuthorizationCustomEndpoint),
)
}
client, err := authorization.NewAPIClient(testutil.NewConfigBuilder().BuildClientOptions(testutil.AuthorizationCustomEndpoint)...)
if err != nil {
return fmt.Errorf("creating client: %w", err)
}
Expand Down
Loading
Loading