Skip to content

Commit acb8230

Browse files
cgoetz-inovexcgoetz-inovex
committed
fix(acc_test) inline calls to ConfigBuilder, delete inline funcs
- resourcemanager inlined manually - add empty line after provider config
1 parent c86660e commit acb8230

30 files changed

Lines changed: 266 additions & 411 deletions

‎stackit/internal/services/alb/alb_acc_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ func TestAccALBResourceMin(t *testing.T) {
148148
// Creation
149149
{
150150
ConfigVariables: testConfigVarsMin,
151-
Config: testutil.ALBProviderConfig() + resourceMinConfig,
151+
Config: testutil.NewConfigBuilder().BuildProviderConfig() + resourceMinConfig,
152152
Check: resource.ComposeAggregateTestCheckFunc(
153153
// Load balancer instance resource
154154
resource.TestCheckResourceAttr("stackit_application_load_balancer.loadbalancer", "project_id", testutil.ConvertConfigVariable(testConfigVarsMin["project_id"])),
@@ -186,7 +186,7 @@ func TestAccALBResourceMin(t *testing.T) {
186186
name = stackit_application_load_balancer.loadbalancer.name
187187
}
188188
`,
189-
testutil.ALBProviderConfig()+resourceMinConfig,
189+
testutil.NewConfigBuilder().BuildProviderConfig()+resourceMinConfig,
190190
),
191191
Check: resource.ComposeAggregateTestCheckFunc(
192192
// Load balancer instance
@@ -283,7 +283,7 @@ func TestAccALBResourceMin(t *testing.T) {
283283
// Update
284284
{
285285
ConfigVariables: configVarsMinUpdated(),
286-
Config: testutil.ALBProviderConfig() + resourceMinConfig,
286+
Config: testutil.NewConfigBuilder().BuildProviderConfig() + resourceMinConfig,
287287
Check: resource.ComposeAggregateTestCheckFunc(
288288
resource.TestCheckResourceAttr("stackit_application_load_balancer.loadbalancer", "project_id", testutil.ConvertConfigVariable(testConfigVarsMin["project_id"])),
289289
resource.TestCheckResourceAttr("stackit_application_load_balancer.loadbalancer", "name", testutil.ConvertConfigVariable(testConfigVarsMin["loadbalancer_name"])),
@@ -324,7 +324,7 @@ func TestAccALBResourceMax(t *testing.T) {
324324
// Creation
325325
{
326326
ConfigVariables: testConfigVarsMax,
327-
Config: testutil.ALBProviderConfig() + resourceMaxConfig,
327+
Config: testutil.NewConfigBuilder().BuildProviderConfig() + resourceMaxConfig,
328328
Check: resource.ComposeAggregateTestCheckFunc(
329329
// Load balancer instance resource
330330
resource.TestCheckResourceAttr("stackit_application_load_balancer.loadbalancer", "project_id", testutil.ConvertConfigVariable(testConfigVarsMax["project_id"])),
@@ -419,7 +419,7 @@ func TestAccALBResourceMax(t *testing.T) {
419419
name = stackit_application_load_balancer.loadbalancer.name
420420
}
421421
`,
422-
testutil.ALBProviderConfig()+resourceMaxConfig,
422+
testutil.NewConfigBuilder().BuildProviderConfig()+resourceMaxConfig,
423423
),
424424
Check: resource.ComposeAggregateTestCheckFunc(
425425
// Load balancer instance
@@ -528,7 +528,7 @@ func TestAccALBResourceMax(t *testing.T) {
528528
// Update
529529
{
530530
ConfigVariables: configVarsMaxUpdated(),
531-
Config: testutil.ALBProviderConfig() + resourceMaxConfig,
531+
Config: testutil.NewConfigBuilder().BuildProviderConfig() + resourceMaxConfig,
532532
Check: resource.ComposeAggregateTestCheckFunc(
533533
resource.TestCheckResourceAttr("stackit_application_load_balancer.loadbalancer", "project_id", testutil.ConvertConfigVariable(testConfigVarsMax["project_id"])),
534534
resource.TestCheckResourceAttr("stackit_application_load_balancer.loadbalancer", "region", testutil.ConvertConfigVariable(testConfigVarsMax["region"])),

‎stackit/internal/services/authorization/authorization_acc_test.go‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ func TestAccProjectRoleAssignmentResource(t *testing.T) {
146146
// Creation
147147
{
148148
ConfigVariables: testConfigVarsProjectRoleAssignment,
149-
Config: testutil.AuthorizationProviderConfig() + "\n" + resourceProjectRoleAssignment,
149+
Config: testutil.NewConfigBuilder().Experiments(testutil.ExperimentIAM).BuildProviderConfig() + "\n" + resourceProjectRoleAssignment,
150150
Check: resource.ComposeAggregateTestCheckFunc(
151151
resource.TestCheckResourceAttr("stackit_resourcemanager_project.project", "name", testutil.ConvertConfigVariable(testConfigVarsProjectRoleAssignment["name"])),
152152
resource.TestCheckResourceAttr("stackit_resourcemanager_project.project", "owner_email", testutil.ConvertConfigVariable(testConfigVarsProjectRoleAssignment["owner_email"])),
@@ -193,7 +193,7 @@ func TestAccProjectRoleAssignmentResource(t *testing.T) {
193193
// Update
194194
{
195195
ConfigVariables: testConfigVarsProjectRoleAssignmentUpdated(),
196-
Config: testutil.AuthorizationProviderConfig() + "\n" + resourceProjectRoleAssignment,
196+
Config: testutil.NewConfigBuilder().Experiments(testutil.ExperimentIAM).BuildProviderConfig() + "\n" + resourceProjectRoleAssignment,
197197
Check: resource.ComposeAggregateTestCheckFunc(
198198
resource.TestCheckResourceAttr("stackit_resourcemanager_project.project", "name", testutil.ConvertConfigVariable(testConfigVarsProjectRoleAssignmentUpdated()["name"])),
199199
resource.TestCheckResourceAttr("stackit_resourcemanager_project.project", "owner_email", testutil.ConvertConfigVariable(testConfigVarsProjectRoleAssignmentUpdated()["owner_email"])),
@@ -213,7 +213,7 @@ func TestAccProjectRoleAssignmentResource(t *testing.T) {
213213
// Duplicate assignment should fail
214214
{
215215
ConfigVariables: testConfigVarsProjectRoleAssignmentUpdated(),
216-
Config: testutil.AuthorizationProviderConfig() + "\n" + resourceProjectRoleAssignmentDuplicate,
216+
Config: testutil.NewConfigBuilder().Experiments(testutil.ExperimentIAM).BuildProviderConfig() + "\n" + resourceProjectRoleAssignmentDuplicate,
217217
ExpectError: regexp.MustCompile(`Error while checking for duplicate role assignments`),
218218
},
219219

@@ -232,7 +232,7 @@ func TestAccFolderRoleAssignmentResource(t *testing.T) {
232232
// Creation
233233
{
234234
ConfigVariables: testConfigVarsFolderRoleAssignment,
235-
Config: testutil.AuthorizationProviderConfig() + "\n" + resourceFolderRoleAssignment,
235+
Config: testutil.NewConfigBuilder().Experiments(testutil.ExperimentIAM).BuildProviderConfig() + "\n" + resourceFolderRoleAssignment,
236236
Check: resource.ComposeAggregateTestCheckFunc(
237237
resource.TestCheckResourceAttr("stackit_resourcemanager_folder.folder", "name", testutil.ConvertConfigVariable(testConfigVarsFolderRoleAssignment["name"])),
238238
resource.TestCheckResourceAttr("stackit_resourcemanager_folder.folder", "owner_email", testutil.ConvertConfigVariable(testConfigVarsFolderRoleAssignment["owner_email"])),
@@ -279,7 +279,7 @@ func TestAccFolderRoleAssignmentResource(t *testing.T) {
279279
// Update
280280
{
281281
ConfigVariables: testConfigVarsFolderRoleAssignmentUpdated(),
282-
Config: testutil.AuthorizationProviderConfig() + "\n" + resourceFolderRoleAssignment,
282+
Config: testutil.NewConfigBuilder().Experiments(testutil.ExperimentIAM).BuildProviderConfig() + "\n" + resourceFolderRoleAssignment,
283283
Check: resource.ComposeAggregateTestCheckFunc(
284284
resource.TestCheckResourceAttr("stackit_resourcemanager_folder.folder", "name", testutil.ConvertConfigVariable(testConfigVarsFolderRoleAssignmentUpdated()["name"])),
285285
resource.TestCheckResourceAttr("stackit_resourcemanager_folder.folder", "owner_email", testutil.ConvertConfigVariable(testConfigVarsFolderRoleAssignmentUpdated()["owner_email"])),
@@ -299,7 +299,7 @@ func TestAccFolderRoleAssignmentResource(t *testing.T) {
299299
// Duplicate assignment should fail
300300
{
301301
ConfigVariables: testConfigVarsFolderRoleAssignmentUpdated(),
302-
Config: testutil.AuthorizationProviderConfig() + "\n" + resourceFolderRoleAssignmentDuplicate,
302+
Config: testutil.NewConfigBuilder().Experiments(testutil.ExperimentIAM).BuildProviderConfig() + "\n" + resourceFolderRoleAssignmentDuplicate,
303303
ExpectError: regexp.MustCompile(`Error while checking for duplicate role assignments`),
304304
},
305305
// Deletion is done by the framework implicitly
@@ -317,7 +317,7 @@ func TestAccOrgRoleAssignmentResource(t *testing.T) {
317317
// Creation
318318
{
319319
ConfigVariables: testConfigVarsOrgRoleAssignment,
320-
Config: testutil.AuthorizationProviderConfig() + "\n" + resourceOrgRoleAssignment,
320+
Config: testutil.NewConfigBuilder().Experiments(testutil.ExperimentIAM).BuildProviderConfig() + "\n" + resourceOrgRoleAssignment,
321321
Check: resource.ComposeAggregateTestCheckFunc(
322322
resource.TestCheckResourceAttrSet("stackit_authorization_organization_role_assignment.ora", "resource_id"),
323323
resource.TestCheckResourceAttrSet("stackit_authorization_organization_role_assignment.ora", "id"),
@@ -355,7 +355,7 @@ func TestAccOrgRoleAssignmentResource(t *testing.T) {
355355
// Update
356356
{
357357
ConfigVariables: testConfigVarsOrgRoleAssignmentUpdated(),
358-
Config: testutil.AuthorizationProviderConfig() + "\n" + resourceOrgRoleAssignment,
358+
Config: testutil.NewConfigBuilder().Experiments(testutil.ExperimentIAM).BuildProviderConfig() + "\n" + resourceOrgRoleAssignment,
359359
Check: resource.ComposeAggregateTestCheckFunc(
360360
resource.TestCheckResourceAttrSet("stackit_authorization_organization_role_assignment.ora", "resource_id"),
361361
resource.TestCheckResourceAttrSet("stackit_authorization_organization_role_assignment.ora", "id"),
@@ -366,7 +366,7 @@ func TestAccOrgRoleAssignmentResource(t *testing.T) {
366366
// Duplicate assignment should fail
367367
{
368368
ConfigVariables: testConfigVarsOrgRoleAssignmentUpdated(),
369-
Config: testutil.AuthorizationProviderConfig() + "\n" + resourceOrgRoleAssignmentDuplicate,
369+
Config: testutil.NewConfigBuilder().Experiments(testutil.ExperimentIAM).BuildProviderConfig() + "\n" + resourceOrgRoleAssignmentDuplicate,
370370
ExpectError: regexp.MustCompile(`Error while checking for duplicate role assignments`),
371371
},
372372
// Deletion is done by the framework implicitly
@@ -383,7 +383,7 @@ func TestAccServiceAccountRoleAssignmentResource(t *testing.T) {
383383
// Creation
384384
{
385385
ConfigVariables: testConfigVarsServiceAccountRoleAssignment,
386-
Config: testutil.AuthorizationProviderConfig() + "\n" + resourceServiceAccountRoleAssignment,
386+
Config: testutil.NewConfigBuilder().Experiments(testutil.ExperimentIAM).BuildProviderConfig() + "\n" + resourceServiceAccountRoleAssignment,
387387
Check: resource.ComposeAggregateTestCheckFunc(
388388
resource.TestCheckResourceAttrSet("stackit_authorization_service_account_role_assignment.sa", "resource_id"),
389389
resource.TestCheckResourceAttrSet("stackit_authorization_service_account_role_assignment.sa", "id"),
@@ -411,7 +411,7 @@ func TestAccServiceAccountRoleAssignmentResource(t *testing.T) {
411411
// Update
412412
{
413413
ConfigVariables: testConfigVarsServiceAccountRoleAssignmentUpdated(),
414-
Config: testutil.AuthorizationProviderConfig() + "\n" + resourceServiceAccountRoleAssignment,
414+
Config: testutil.NewConfigBuilder().Experiments(testutil.ExperimentIAM).BuildProviderConfig() + "\n" + resourceServiceAccountRoleAssignment,
415415
Check: resource.ComposeAggregateTestCheckFunc(
416416
resource.TestCheckResourceAttrSet("stackit_authorization_service_account_role_assignment.sa", "resource_id"),
417417
resource.TestCheckResourceAttrSet("stackit_authorization_service_account_role_assignment.sa", "id"),
@@ -425,7 +425,7 @@ func TestAccServiceAccountRoleAssignmentResource(t *testing.T) {
425425
// Duplicate assignment should fail
426426
{
427427
ConfigVariables: testConfigVarsServiceAccountRoleAssignmentUpdated(),
428-
Config: testutil.AuthorizationProviderConfig() + "\n" + resourceServiceAccountRoleAssignmentDuplicate,
428+
Config: testutil.NewConfigBuilder().Experiments(testutil.ExperimentIAM).BuildProviderConfig() + "\n" + resourceServiceAccountRoleAssignmentDuplicate,
429429
ExpectError: regexp.MustCompile(`Error while checking for duplicate role assignments`),
430430
},
431431
// Deletion is done by the framework implicitly
@@ -440,7 +440,7 @@ func TestAccProjectCustomRoleResource(t *testing.T) {
440440
Steps: []resource.TestStep{
441441
{
442442
ConfigVariables: testConfigVarsCustomRole,
443-
Config: testutil.AuthorizationProviderConfig() + resourceCustomRole,
443+
Config: testutil.NewConfigBuilder().Experiments(testutil.ExperimentIAM).BuildProviderConfig() + resourceCustomRole,
444444
Check: resource.ComposeAggregateTestCheckFunc(
445445
resource.TestCheckResourceAttr("stackit_authorization_project_custom_role.custom_role", "resource_id", testutil.ConvertConfigVariable(testConfigVarsCustomRole["project_id"])),
446446
resource.TestCheckResourceAttr("stackit_authorization_project_custom_role.custom_role", "name", testutil.ConvertConfigVariable(testConfigVarsCustomRole["role_name"])),
@@ -461,7 +461,7 @@ func TestAccProjectCustomRoleResource(t *testing.T) {
461461
role_id = stackit_authorization_project_custom_role.custom_role.role_id
462462
}
463463
`,
464-
testutil.AuthorizationProviderConfig()+resourceCustomRole,
464+
testutil.NewConfigBuilder().Experiments(testutil.ExperimentIAM).BuildProviderConfig()+resourceCustomRole,
465465
),
466466
Check: resource.ComposeAggregateTestCheckFunc(
467467
resource.TestCheckResourceAttr("data.stackit_authorization_project_custom_role.custom_role", "resource_id", testutil.ConvertConfigVariable(testConfigVarsCustomRole["project_id"])),
@@ -509,7 +509,7 @@ func TestAccProjectCustomRoleResource(t *testing.T) {
509509
// Update
510510
{
511511
ConfigVariables: testConfigVarsCustomRoleUpdated,
512-
Config: testutil.AuthorizationProviderConfig() + resourceCustomRole,
512+
Config: testutil.NewConfigBuilder().Experiments(testutil.ExperimentIAM).BuildProviderConfig() + resourceCustomRole,
513513
Check: resource.ComposeAggregateTestCheckFunc(
514514
resource.TestCheckResourceAttr("stackit_authorization_project_custom_role.custom_role", "resource_id", testutil.ConvertConfigVariable(testConfigVarsCustomRoleUpdated["project_id"])),
515515
resource.TestCheckResourceAttr("stackit_authorization_project_custom_role.custom_role", "name", testutil.ConvertConfigVariable(testConfigVarsCustomRoleUpdated["role_name"])),

‎stackit/internal/services/cdn/cdn_acc_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ func configResources(regions string, geofencingCountries []string, blockedCountr
8585
type = "CNAME"
8686
records = ["${stackit_cdn_distribution.distribution.domains[0].name}."]
8787
}
88-
`, testutil.CdnProviderConfig(), testutil.ProjectId, instanceResource["config_backend_origin_url"], instanceResource["config_backend_origin_url"], geofencingList,
88+
`, testutil.NewConfigBuilder().BuildProviderConfig(), testutil.ProjectId, instanceResource["config_backend_origin_url"], instanceResource["config_backend_origin_url"], geofencingList,
8989
regions, blockedCountriesConfig, testutil.ProjectId, instanceResource["dns_name"],
9090
testutil.ProjectId, instanceResource["custom_domain_prefix"])
9191
}
@@ -400,7 +400,7 @@ func configBucketResources(bucketName, credentialsGroupName string) string {
400400
}
401401
}
402402
}
403-
`, testutil.CdnProviderConfig(),
403+
`, testutil.NewConfigBuilder().BuildProviderConfig(),
404404
testutil.ProjectId, bucketName,
405405
testutil.ProjectId, credentialsGroupName,
406406
testutil.ProjectId,
@@ -605,7 +605,7 @@ func blockUntilDomainResolves(domain string) (net.IP, error) {
605605
func retry[T any](attempts int, sleep time.Duration, f func() (T, error)) (T, error) {
606606
var zero T
607607
var errOuter error
608-
for i := 0; i < attempts; i++ {
608+
for range attempts {
609609
dist, err := f()
610610
if err == nil {
611611
return dist, nil

0 commit comments

Comments
 (0)