Skip to content

Commit c86660e

Browse files
cgoetz-inovexcgoetz-inovex
committed
refac(acc_test) replace provider snippets with CofigBuilder
- sets region eu01 by default - sets custom endpoints from env vars by default - sets enable beta resoures by default - replace client configuration in acc tests with ConfigBuilder - use ConfigBuilder for provider snippet funcs
1 parent 585cfee commit c86660e

31 files changed

Lines changed: 502 additions & 963 deletions

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
"github.com/stackitcloud/stackit-sdk-go/services/alb/wait"
1616
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core"
1717

18-
stackitSdkConfig "github.com/stackitcloud/stackit-sdk-go/core/config"
1918
"github.com/stackitcloud/stackit-sdk-go/core/utils"
2019
"github.com/stackitcloud/stackit-sdk-go/services/alb"
2120
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/testutil"
@@ -621,15 +620,7 @@ func TestAccALBResourceMax(t *testing.T) {
621620

622621
func testAccCheckALBDestroy(s *terraform.State) error {
623622
ctx := context.Background()
624-
var client *alb.APIClient
625-
var err error
626-
if testutil.ALBCustomEndpoint == "" {
627-
client, err = alb.NewAPIClient()
628-
} else {
629-
client, err = alb.NewAPIClient(
630-
stackitSdkConfig.WithEndpoint(testutil.ALBCustomEndpoint),
631-
)
632-
}
623+
client, err := alb.NewAPIClient(testutil.NewConfigBuilder().BuildClientOptions(testutil.ALBCustomEndpoint)...)
633624
if err != nil {
634625
return fmt.Errorf("creating client: %w", err)
635626
}

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

Lines changed: 4 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import (
1616
"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
1717
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
1818
"github.com/hashicorp/terraform-plugin-testing/terraform"
19-
stackitSdkConfig "github.com/stackitcloud/stackit-sdk-go/core/config"
2019
"github.com/stackitcloud/stackit-sdk-go/core/utils"
2120
"github.com/stackitcloud/stackit-sdk-go/services/authorization"
2221
"github.com/stackitcloud/stackit-sdk-go/services/resourcemanager"
@@ -553,15 +552,7 @@ func testAccCheckDestroy(s *terraform.State) error {
553552

554553
func testAccCheckResourceManagerProjectsDestroy(s *terraform.State) error {
555554
ctx := context.Background()
556-
var client *resourcemanager.APIClient
557-
var err error
558-
if testutil.ResourceManagerCustomEndpoint == "" {
559-
client, err = resourcemanager.NewAPIClient()
560-
} else {
561-
client, err = resourcemanager.NewAPIClient(
562-
stackitSdkConfig.WithEndpoint(testutil.ResourceManagerCustomEndpoint),
563-
)
564-
}
555+
client, err := resourcemanager.NewAPIClient(testutil.NewConfigBuilder().BuildClientOptions(testutil.ResourceManagerCustomEndpoint)...)
565556
if err != nil {
566557
return fmt.Errorf("creating client: %w", err)
567558
}
@@ -609,15 +600,7 @@ func testAccCheckResourceManagerProjectsDestroy(s *terraform.State) error {
609600

610601
func testAccCheckResourceManagerFoldersDestroy(s *terraform.State) error {
611602
ctx := context.Background()
612-
var client *resourcemanager.APIClient
613-
var err error
614-
if testutil.ResourceManagerCustomEndpoint == "" {
615-
client, err = resourcemanager.NewAPIClient()
616-
} else {
617-
client, err = resourcemanager.NewAPIClient(
618-
stackitSdkConfig.WithEndpoint(testutil.ResourceManagerCustomEndpoint),
619-
)
620-
}
603+
client, err := resourcemanager.NewAPIClient(testutil.NewConfigBuilder().BuildClientOptions(testutil.ResourceManagerCustomEndpoint)...)
621604
if err != nil {
622605
return fmt.Errorf("creating client: %w", err)
623606
}
@@ -658,15 +641,7 @@ func testAccCheckResourceManagerFoldersDestroy(s *terraform.State) error {
658641

659642
func testAccCheckOrganizationRoleAssignmentDestroy(s *terraform.State) error {
660643
ctx := context.Background()
661-
var client *authorization.APIClient
662-
var err error
663-
if testutil.AuthorizationCustomEndpoint == "" {
664-
client, err = authorization.NewAPIClient()
665-
} else {
666-
client, err = authorization.NewAPIClient(
667-
stackitSdkConfig.WithEndpoint(testutil.AuthorizationCustomEndpoint),
668-
)
669-
}
644+
client, err := authorization.NewAPIClient(testutil.NewConfigBuilder().BuildClientOptions(testutil.AuthorizationCustomEndpoint)...)
670645
if err != nil {
671646
return fmt.Errorf("creating client: %w", err)
672647
}
@@ -705,15 +680,7 @@ func testAccCheckOrganizationRoleAssignmentDestroy(s *terraform.State) error {
705680

706681
func testAccCheckServiceAccountRoleAssignmentDestroy(s *terraform.State) error {
707682
ctx := context.Background()
708-
var client *authorization.APIClient
709-
var err error
710-
if testutil.AuthorizationCustomEndpoint == "" {
711-
client, err = authorization.NewAPIClient()
712-
} else {
713-
client, err = authorization.NewAPIClient(
714-
stackitSdkConfig.WithEndpoint(testutil.AuthorizationCustomEndpoint),
715-
)
716-
}
683+
client, err := authorization.NewAPIClient(testutil.NewConfigBuilder().BuildClientOptions(testutil.AuthorizationCustomEndpoint)...)
717684
if err != nil {
718685
return fmt.Errorf("creating client: %w", err)
719686
}

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import (
1818
"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
1919
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
2020
"github.com/hashicorp/terraform-plugin-testing/terraform"
21-
"github.com/stackitcloud/stackit-sdk-go/core/config"
2221
"github.com/stackitcloud/stackit-sdk-go/services/cdn"
2322
"github.com/stackitcloud/stackit-sdk-go/services/cdn/wait"
2423
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core"
@@ -536,15 +535,7 @@ func TestAccCDNDistributionBucketResource(t *testing.T) {
536535
}
537536
func testAccCheckCDNDistributionDestroy(s *terraform.State) error {
538537
ctx := context.Background()
539-
var client *cdn.APIClient
540-
var err error
541-
if testutil.MongoDBFlexCustomEndpoint == "" {
542-
client, err = cdn.NewAPIClient()
543-
} else {
544-
client, err = cdn.NewAPIClient(
545-
config.WithEndpoint(testutil.MongoDBFlexCustomEndpoint),
546-
)
547-
}
538+
client, err := cdn.NewAPIClient(testutil.NewConfigBuilder().BuildClientOptions(testutil.CdnCustomEndpoint)...)
548539
if err != nil {
549540
return fmt.Errorf("creating client: %w", err)
550541
}

‎stackit/internal/services/dns/dns_acc_test.go‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
1414
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
1515
"github.com/hashicorp/terraform-plugin-testing/terraform"
16-
core_config "github.com/stackitcloud/stackit-sdk-go/core/config"
1716
"github.com/stackitcloud/stackit-sdk-go/core/utils"
1817
"github.com/stackitcloud/stackit-sdk-go/services/dns"
1918
"github.com/stackitcloud/stackit-sdk-go/services/dns/wait"
@@ -509,15 +508,7 @@ func TestAccDnsMaxResource(t *testing.T) {
509508

510509
func testAccCheckDnsDestroy(s *terraform.State) error {
511510
ctx := context.Background()
512-
var client *dns.APIClient
513-
var err error
514-
if testutil.DnsCustomEndpoint == "" {
515-
client, err = dns.NewAPIClient()
516-
} else {
517-
client, err = dns.NewAPIClient(
518-
core_config.WithEndpoint(testutil.DnsCustomEndpoint),
519-
)
520-
}
511+
client, err := dns.NewAPIClient(testutil.NewConfigBuilder().BuildClientOptions(testutil.DnsCustomEndpoint)...)
521512
if err != nil {
522513
return fmt.Errorf("creating client: %w", err)
523514
}

‎stackit/internal/services/edgecloud/edge_acc_test.go‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
1616
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
1717
"github.com/hashicorp/terraform-plugin-testing/terraform"
18-
coreConfig "github.com/stackitcloud/stackit-sdk-go/core/config"
1918
"github.com/stackitcloud/stackit-sdk-go/core/oapierror"
2019
"github.com/stackitcloud/stackit-sdk-go/services/edge"
2120
"github.com/stackitcloud/stackit-sdk-go/services/edge/wait"
@@ -75,7 +74,7 @@ func TestAccEdgeCloudInstanceMin(t *testing.T) {
7574
Check: resource.ComposeAggregateTestCheckFunc(
7675
// instance
7776
resource.TestCheckResourceAttr("stackit_edgecloud_instance.test_instance", "project_id", testutil.ProjectId),
78-
// testutil.Region is also used in testutils.EdgeCloudProviderConfig to define a default_region
77+
// testutil.region is also used in testutils.EdgeCloudProviderConfig to define a default_region
7978
// this checks that this is successfully used for the resource, even if no region is specifically set
8079
resource.TestCheckResourceAttr("stackit_edgecloud_instance.test_instance", "region", testutil.Region),
8180
resource.TestCheckResourceAttr("stackit_edgecloud_instance.test_instance", "display_name", minTestName),
@@ -333,14 +332,7 @@ func TestAccEdgeCloudKubeconfigToken_validation(t *testing.T) {
333332
// testAccCheckEdgeCloudInstanceDestroy verifies that test resources are properly destroyed
334333
func testAccCheckEdgeCloudInstanceDestroy(s *terraform.State) error {
335334
ctx := context.Background()
336-
var client *edge.APIClient
337-
var err error
338-
339-
if testutil.EdgeCloudCustomEndpoint != "" {
340-
client, err = edge.NewAPIClient(coreConfig.WithEndpoint(testutil.EdgeCloudCustomEndpoint))
341-
} else {
342-
client, err = edge.NewAPIClient()
343-
}
335+
client, err := edge.NewAPIClient(testutil.NewConfigBuilder().BuildClientOptions(testutil.EdgeCloudCustomEndpoint)...)
344336
if err != nil {
345337
return fmt.Errorf("creating client: %w", err)
346338
}

‎stackit/internal/services/git/git_acc_test.go‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
1313
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
1414
"github.com/hashicorp/terraform-plugin-testing/terraform"
15-
stackitSdkConfig "github.com/stackitcloud/stackit-sdk-go/core/config"
1615
"github.com/stackitcloud/stackit-sdk-go/core/utils"
1716
"github.com/stackitcloud/stackit-sdk-go/services/git"
1817
"github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core"
@@ -297,16 +296,7 @@ func TestAccGitMax(t *testing.T) {
297296

298297
func testAccCheckGitInstanceDestroy(s *terraform.State) error {
299298
ctx := context.Background()
300-
var client *git.APIClient
301-
var err error
302-
303-
if testutil.GitCustomEndpoint == "" {
304-
client, err = git.NewAPIClient()
305-
} else {
306-
client, err = git.NewAPIClient(
307-
stackitSdkConfig.WithEndpoint(testutil.GitCustomEndpoint),
308-
)
309-
}
299+
client, err := git.NewAPIClient(testutil.NewConfigBuilder().BuildClientOptions(testutil.GitCustomEndpoint)...)
310300

311301
if err != nil {
312302
return fmt.Errorf("creating client: %w", err)

0 commit comments

Comments
 (0)