@@ -21,7 +21,6 @@ import (
2121 "github.com/hashicorp/terraform-plugin-testing/helper/acctest"
2222 "github.com/hashicorp/terraform-plugin-testing/helper/resource"
2323 "github.com/hashicorp/terraform-plugin-testing/terraform"
24- coreConfig "github.com/stackitcloud/stackit-sdk-go/core/config"
2524 "github.com/stackitcloud/stackit-sdk-go/services/cdn"
2625 "github.com/stackitcloud/stackit-sdk-go/services/cdn/wait"
2726 "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core"
@@ -150,7 +149,7 @@ func TestAccCDNDistributionHttp(t *testing.T) {
150149 Steps : []resource.TestStep {
151150 // Distribution Create (Only Base config)
152151 {
153- Config : testutil .CdnProviderConfig () + "\n " + resourceHttpBase ,
152+ Config : testutil .NewConfigBuilder (). EnableBetaResources ( true ). BuildProviderConfig () + "\n " + resourceHttpBase ,
154153 ConfigVariables : testConfigVarsHttp ,
155154 Check : resource .ComposeAggregateTestCheckFunc (
156155 resource .TestCheckResourceAttrSet ("stackit_cdn_distribution.distribution" , "distribution_id" ),
@@ -187,7 +186,7 @@ func TestAccCDNDistributionHttp(t *testing.T) {
187186 },
188187 // Wait step, confirms the CNAME record has "propagated" before trying to add the custom domain
189188 {
190- Config : testutil .CdnProviderConfig () + "\n " + resourceHttpBase ,
189+ Config : testutil .NewConfigBuilder (). EnableBetaResources ( true ). BuildProviderConfig () + "\n " + resourceHttpBase ,
191190 ConfigVariables : testConfigVarsHttp ,
192191 Check : func (_ * terraform.State ) error {
193192 _ , err := blockUntilDomainResolves (fullDomainNameHttp )
@@ -196,7 +195,7 @@ func TestAccCDNDistributionHttp(t *testing.T) {
196195 },
197196 // Custom Domain Create (Now using Full config)
198197 {
199- Config : testutil .CdnProviderConfig () + "\n " + resourceHttpFull ,
198+ Config : testutil .NewConfigBuilder (). EnableBetaResources ( true ). BuildProviderConfig () + "\n " + resourceHttpFull ,
200199 ConfigVariables : testConfigVarsHttp ,
201200 Check : resource .ComposeAggregateTestCheckFunc (
202201 resource .TestCheckResourceAttr ("stackit_cdn_custom_domain.custom_domain" , "status" , "ACTIVE" ),
@@ -254,7 +253,7 @@ func TestAccCDNDistributionHttp(t *testing.T) {
254253 },
255254 // Data Source
256255 {
257- Config : testutil .CdnProviderConfig () + "\n " + resourceHttpFull ,
256+ Config : testutil .NewConfigBuilder (). EnableBetaResources ( true ). BuildProviderConfig () + "\n " + resourceHttpFull ,
258257 ConfigVariables : testConfigVarsHttp ,
259258 Check : resource .ComposeAggregateTestCheckFunc (
260259 resource .TestCheckResourceAttrSet ("data.stackit_cdn_distribution.distribution" , "distribution_id" ),
@@ -297,7 +296,7 @@ func TestAccCDNDistributionHttp(t *testing.T) {
297296 },
298297 // Update
299298 {
300- Config : testutil .CdnProviderConfig () + "\n " + resourceHttpFull ,
299+ Config : testutil .NewConfigBuilder (). EnableBetaResources ( true ). BuildProviderConfig () + "\n " + resourceHttpFull ,
301300 ConfigVariables : configVarsHttpUpdated (),
302301 Check : resource .ComposeAggregateTestCheckFunc (
303302 resource .TestCheckResourceAttrSet ("stackit_cdn_distribution.distribution" , "distribution_id" ),
@@ -355,7 +354,7 @@ func TestAccCDNDistributionBucket(t *testing.T) {
355354 Steps : []resource.TestStep {
356355 // Distribution Create
357356 {
358- Config : testutil .CdnProviderConfig () + "\n " + resourceBucket ,
357+ Config : testutil .NewConfigBuilder (). EnableBetaResources ( true ). BuildProviderConfig () + "\n " + resourceBucket ,
359358 ConfigVariables : testConfigVarsBucket ,
360359 Check : resource .ComposeAggregateTestCheckFunc (
361360 resource .TestCheckResourceAttrSet ("stackit_cdn_distribution.distribution" , "distribution_id" ),
@@ -414,7 +413,7 @@ func TestAccCDNDistributionBucket(t *testing.T) {
414413 },
415414 // Data Source
416415 {
417- Config : testutil .CdnProviderConfig () + "\n " + resourceBucket ,
416+ Config : testutil .NewConfigBuilder (). EnableBetaResources ( true ). BuildProviderConfig () + "\n " + resourceBucket ,
418417 ConfigVariables : testConfigVarsBucket ,
419418 Check : resource .ComposeAggregateTestCheckFunc (
420419 resource .TestCheckResourceAttrSet ("data.stackit_cdn_distribution.bucket_ds" , "distribution_id" ),
@@ -441,7 +440,7 @@ func TestAccCDNDistributionBucket(t *testing.T) {
441440 },
442441 // Update
443442 {
444- Config : testutil .CdnProviderConfig () + "\n " + resourceBucket ,
443+ Config : testutil .NewConfigBuilder (). EnableBetaResources ( true ). BuildProviderConfig () + "\n " + resourceBucket ,
445444 ConfigVariables : configVarsBucketUpdated (),
446445 Check : resource .ComposeAggregateTestCheckFunc (
447446 resource .TestCheckResourceAttr ("stackit_cdn_distribution.distribution" , "status" , "ACTIVE" ),
@@ -467,7 +466,7 @@ func TestAccCDNDistributionBucket(t *testing.T) {
467466 // empty list '[]', causing a state mismatch. The 'Default' modifier in the schema now
468467 // ensures the missing config is treated as an empty list, matching the API response.
469468 {
470- Config : testutil .CdnProviderConfig () + "\n " + resourceBucket ,
469+ Config : testutil .NewConfigBuilder (). EnableBetaResources ( true ). BuildProviderConfig () + "\n " + resourceBucket ,
471470 ConfigVariables : configVarsBucketUpdated (),
472471 Check : resource .ComposeAggregateTestCheckFunc (
473472 resource .TestCheckResourceAttr ("stackit_cdn_distribution.distribution" , "config.blocked_countries.#" , "0" ),
@@ -479,15 +478,7 @@ func TestAccCDNDistributionBucket(t *testing.T) {
479478
480479func testAccCheckCDNDistributionDestroy (s * terraform.State ) error {
481480 ctx := context .Background ()
482- var client * cdn.APIClient
483- var err error
484- if testutil .CdnCustomEndpoint == "" {
485- client , err = cdn .NewAPIClient ()
486- } else {
487- client , err = cdn .NewAPIClient (
488- coreConfig .WithEndpoint (testutil .CdnCustomEndpoint ),
489- )
490- }
481+ client , err := cdn .NewAPIClient (testutil .NewConfigBuilder ().BuildClientOptions (testutil .CdnCustomEndpoint , false )... )
491482 if err != nil {
492483 return fmt .Errorf ("creating client: %w" , err )
493484 }
@@ -557,7 +548,7 @@ func blockUntilDomainResolves(domain string) (net.IP, error) {
557548func retry [T any ](attempts int , sleep time.Duration , f func () (T , error )) (T , error ) {
558549 var zero T
559550 var errOuter error
560- for i := 0 ; i < attempts ; i ++ {
551+ for range attempts {
561552 dist , err := f ()
562553 if err == nil {
563554 return dist , nil
0 commit comments