diff --git a/internal/acctest/acctest.go b/internal/acctest/acctest.go index 6e62db36f5..c177d39548 100644 --- a/internal/acctest/acctest.go +++ b/internal/acctest/acctest.go @@ -1,13 +1,15 @@ package acctest import ( + "context" "os" "strconv" "strings" "testing" "time" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-go/tfprotov5" + "github.com/hashicorp/terraform-plugin-mux/tf5muxserver" "github.com/scaleway/terraform-provider-scaleway/v2/internal/env" "github.com/scaleway/terraform-provider-scaleway/v2/internal/meta" "github.com/scaleway/terraform-provider-scaleway/v2/internal/provider" @@ -20,7 +22,7 @@ func PreCheck(_ *testing.T) {} type TestTools struct { T *testing.T Meta *meta.Meta - ProviderFactories map[string]func() (*schema.Provider, error) + ProviderFactories map[string]func() (tfprotov5.ProviderServer, error) Cleanup func() } @@ -64,9 +66,17 @@ func NewTestTools(t *testing.T) *TestTools { return &TestTools{ T: t, Meta: m, - ProviderFactories: map[string]func() (*schema.Provider, error){ - "scaleway": func() (*schema.Provider, error) { - return provider.SDKProvider(&provider.Config{Meta: m})(), nil + ProviderFactories: map[string]func() (tfprotov5.ProviderServer, error){ + "scaleway": func() (tfprotov5.ProviderServer, error) { + ctx := context.Background() + providers := provider.NewProviderList(&provider.Config{Meta: m}) + + muxServer, err := tf5muxserver.NewMuxServer(ctx, providers...) + if err != nil { + return nil, err + } + + return muxServer.ProviderServer(), nil }, }, Cleanup: cleanup, diff --git a/internal/acctest/fixtures.go b/internal/acctest/fixtures.go index 0e53111a80..a0e3f7e6ef 100644 --- a/internal/acctest/fixtures.go +++ b/internal/acctest/fixtures.go @@ -3,7 +3,8 @@ package acctest import ( "context" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-go/tfprotov5" + "github.com/hashicorp/terraform-plugin-mux/tf5muxserver" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/scaleway/scaleway-sdk-go/api/account/v3" iam "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1" @@ -17,7 +18,7 @@ import ( // given project and API key as default profile configuration. // // This is useful to test resources that need to create resources in another project. -func FakeSideProjectProviders(ctx context.Context, tt *TestTools, project *account.Project, iamAPIKey *iam.APIKey) map[string]func() (*schema.Provider, error) { +func FakeSideProjectProviders(ctx context.Context, tt *TestTools, project *account.Project, iamAPIKey *iam.APIKey) map[string]func() (tfprotov5.ProviderServer, error) { t := tt.T metaSide, err := meta.NewMeta(ctx, &meta.Config{ @@ -30,9 +31,16 @@ func FakeSideProjectProviders(ctx context.Context, tt *TestTools, project *accou }) require.NoError(t, err) - providers := map[string]func() (*schema.Provider, error){ - "side": func() (*schema.Provider, error) { - return provider.SDKProvider(&provider.Config{Meta: metaSide})(), nil + providers := map[string]func() (tfprotov5.ProviderServer, error){ + "side": func() (tfprotov5.ProviderServer, error) { + providers := provider.NewProviderList(&provider.Config{Meta: metaSide}) + + muxServer, err := tf5muxserver.NewMuxServer(ctx, providers...) + if err != nil { + return nil, err + } + + return muxServer.ProviderServer(), nil }, } diff --git a/internal/provider/provider_mux_test.go b/internal/provider/provider_mux_test.go deleted file mode 100644 index 663376547b..0000000000 --- a/internal/provider/provider_mux_test.go +++ /dev/null @@ -1,47 +0,0 @@ -package provider_test - -import ( - "context" - "testing" - - "github.com/hashicorp/terraform-plugin-framework/providerserver" - "github.com/hashicorp/terraform-plugin-go/tfprotov5" - "github.com/hashicorp/terraform-plugin-mux/tf5muxserver" - "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" - "github.com/scaleway/terraform-provider-scaleway/v2/internal/provider" - instancechecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/instance/testfuncs" -) - -func TestMuxServer(t *testing.T) { - tt := acctest.NewTestTools(t) - defer tt.Cleanup() - - resource.Test(t, resource.TestCase{ - ProtoV5ProviderFactories: map[string]func() (tfprotov5.ProviderServer, error){ - "scaleway": func() (tfprotov5.ProviderServer, error) { - ctx := context.Background() - providers := []func() tfprotov5.ProviderServer{ - providerserver.NewProtocol5(provider.NewFrameworkProvider()()), // terraform-plugin-framework provider - provider.SDKProvider(provider.DefaultConfig())().GRPCProvider, // terraform-plugin-sdk provider - } - - muxServer, err := tf5muxserver.NewMuxServer(ctx, providers...) - if err != nil { - return nil, err - } - - return muxServer.ProviderServer(), nil - }, - }, - Steps: []resource.TestStep{ - { - Config: ` - resource scaleway_instance_ip main {}`, - Check: resource.ComposeTestCheckFunc( - instancechecks.CheckIPExists(tt, "scaleway_instance_ip.main"), - ), - }, - }, - }) -} diff --git a/internal/provider/providers.go b/internal/provider/providers.go new file mode 100644 index 0000000000..f6af860267 --- /dev/null +++ b/internal/provider/providers.go @@ -0,0 +1,16 @@ +package provider + +import ( + "github.com/hashicorp/terraform-plugin-framework/providerserver" + "github.com/hashicorp/terraform-plugin-go/tfprotov5" +) + +func NewProviderList(config *Config) []func() tfprotov5.ProviderServer { + return []func() tfprotov5.ProviderServer{ + // Provider using terraform-plugin-framework + providerserver.NewProtocol5(&ScalewayProvider{}), + + // SDKProvider using terraform-plugin-sdk + SDKProvider(config)().GRPCProvider, + } +} diff --git a/internal/provider/providers_test.go b/internal/provider/providers_test.go new file mode 100644 index 0000000000..c7b7f0d4d9 --- /dev/null +++ b/internal/provider/providers_test.go @@ -0,0 +1,27 @@ +package provider_test + +import ( + "testing" + + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest" + instancechecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/instance/testfuncs" +) + +func TestMuxServer(t *testing.T) { + tt := acctest.NewTestTools(t) + defer tt.Cleanup() + + resource.Test(t, resource.TestCase{ + ProtoV5ProviderFactories: tt.ProviderFactories, + Steps: []resource.TestStep{ + { + Config: ` + resource scaleway_instance_ip main {}`, + Check: resource.ComposeTestCheckFunc( + instancechecks.CheckIPExists(tt, "scaleway_instance_ip.main"), + ), + }, + }, + }) +} diff --git a/internal/services/account/project_data_source_test.go b/internal/services/account/project_data_source_test.go index 80360762e2..5e2a0bd45e 100644 --- a/internal/services/account/project_data_source_test.go +++ b/internal/services/account/project_data_source_test.go @@ -20,8 +20,8 @@ func TestAccDataSourceProject_Basic(t *testing.T) { } resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( isProjectDestroyed(tt), ), @@ -61,8 +61,8 @@ func TestAccDataSourceProject_Default(t *testing.T) { } resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -105,8 +105,8 @@ func TestAccDataSourceProject_Extract(t *testing.T) { } resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, Steps: []resource.TestStep{ { Config: `data scaleway_account_project "project" {}`, @@ -129,8 +129,8 @@ func TestAccDataSourceProject_List(t *testing.T) { } resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( isProjectDestroyed(tt), ), diff --git a/internal/services/account/project_test.go b/internal/services/account/project_test.go index 2a426d22ea..d408f896ae 100644 --- a/internal/services/account/project_test.go +++ b/internal/services/account/project_test.go @@ -22,8 +22,8 @@ func TestAccProject_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isProjectDestroyed(tt), + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isProjectDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -60,8 +60,8 @@ func TestAccProject_NoUpdate(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isProjectDestroyed(tt), + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isProjectDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/applesilicon/server_test.go b/internal/services/applesilicon/server_test.go index 8cfc91d718..eab9ec3a9a 100644 --- a/internal/services/applesilicon/server_test.go +++ b/internal/services/applesilicon/server_test.go @@ -17,9 +17,9 @@ func TestAccServer_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isServerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isServerDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -70,9 +70,9 @@ func TestAccServer_EnableDisabledVPC(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isServerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isServerDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -125,9 +125,9 @@ func TestAccServer_EnableVPC(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isServerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isServerDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -270,9 +270,9 @@ func TestAccServer_Commitment(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isServerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isServerDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/autoscaling/instance_group_test.go b/internal/services/autoscaling/instance_group_test.go index 7374282d03..3d8f3a2fc2 100644 --- a/internal/services/autoscaling/instance_group_test.go +++ b/internal/services/autoscaling/instance_group_test.go @@ -17,9 +17,9 @@ func TestAccInstanceGroup_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckInstanceGroupDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckInstanceGroupDestroy(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/autoscaling/instance_policy_test.go b/internal/services/autoscaling/instance_policy_test.go index b53a4c5cf7..3cf57a4a77 100644 --- a/internal/services/autoscaling/instance_policy_test.go +++ b/internal/services/autoscaling/instance_policy_test.go @@ -17,9 +17,9 @@ func TestAccInstancePolicy_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckInstancePolicyDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckInstancePolicyDestroy(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/autoscaling/instance_template_test.go b/internal/services/autoscaling/instance_template_test.go index ced40e3472..15128eccd5 100644 --- a/internal/services/autoscaling/instance_template_test.go +++ b/internal/services/autoscaling/instance_template_test.go @@ -17,9 +17,9 @@ func TestAccInstanceTemplate_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckInstanceTemplateDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckInstanceTemplateDestroy(tt), Steps: []resource.TestStep{ { Config: ` @@ -74,9 +74,9 @@ func TestAccInstanceTemplate_PrivateNetwork(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckInstanceTemplateDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckInstanceTemplateDestroy(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/az/availability_zones_data_source_test.go b/internal/services/az/availability_zones_data_source_test.go index b4d3edd406..897eda6788 100644 --- a/internal/services/az/availability_zones_data_source_test.go +++ b/internal/services/az/availability_zones_data_source_test.go @@ -12,8 +12,8 @@ func TestAccDataSourceAvailabilityZones_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/baremetal/offer_data_source_test.go b/internal/services/baremetal/offer_data_source_test.go index 56741ce20e..d65e3ba289 100644 --- a/internal/services/baremetal/offer_data_source_test.go +++ b/internal/services/baremetal/offer_data_source_test.go @@ -23,8 +23,8 @@ func TestAccDataSourceOffer_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -69,8 +69,8 @@ func TestAccDataSourceOffer_SubscriptionPeriodHourly(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -119,8 +119,8 @@ func TestAccDataSourceOffer_SubscriptionPeriodMonthly(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/baremetal/option_data_source_test.go b/internal/services/baremetal/option_data_source_test.go index 8848df43a3..50a857a900 100644 --- a/internal/services/baremetal/option_data_source_test.go +++ b/internal/services/baremetal/option_data_source_test.go @@ -17,9 +17,9 @@ func TestAccDataSourceOption_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: baremetalchecks.CheckServerDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: baremetalchecks.CheckServerDestroy(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/baremetal/os_data_source_test.go b/internal/services/baremetal/os_data_source_test.go index b6487ef2bf..b99e5f5415 100644 --- a/internal/services/baremetal/os_data_source_test.go +++ b/internal/services/baremetal/os_data_source_test.go @@ -17,9 +17,9 @@ func TestAccDataSourceOS_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: baremetalchecks.CheckServerDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: baremetalchecks.CheckServerDestroy(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/baremetal/partition_schema_source_test.go b/internal/services/baremetal/partition_schema_source_test.go index 66f2a5c4dd..918f8f8808 100644 --- a/internal/services/baremetal/partition_schema_source_test.go +++ b/internal/services/baremetal/partition_schema_source_test.go @@ -29,8 +29,8 @@ func TestAccPartitionSchemaDataSource_Basic(t *testing.T) { serverName := "TestAccPartitionSchemaDataSource_Basic" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( baremetalchecks.CheckServerDestroy(tt), ), @@ -97,8 +97,8 @@ func TestAccPartitionSchemaDataSource_WithoutExtraPart(t *testing.T) { serverName := "TestAccPartitionSchemaDataSource_WithoutExtraPart" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( baremetalchecks.CheckServerDestroy(tt), ), @@ -164,8 +164,8 @@ func TestAccPartitionSchemaDataSource_WithoutSwapAndExtraPart(t *testing.T) { serverName := "TestAccPartitionSchemaDataSource_WithoutSwapAndExtraPart" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( baremetalchecks.CheckServerDestroy(tt), ), @@ -231,8 +231,8 @@ func TestAccPartitionSchemaDataSource_WithAlternateOffer(t *testing.T) { name := "TestAccPartitionSchemaDataSource_WithAlternateOffer" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( baremetalchecks.CheckServerDestroy(tt), ), @@ -300,8 +300,8 @@ func TestAccPartitionSchemaDataSource_IncompatibleOS(t *testing.T) { name := "TestAccPartitionSchemaDataSource_IncompatibleOS" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( baremetalchecks.CheckServerDestroy(tt), ), @@ -362,8 +362,8 @@ func TestAccPartitionSchemaDataSource_IncompatibleOffer(t *testing.T) { name := "TestAccPartitionSchemaDataSource_IncompatibleOffer" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( baremetalchecks.CheckServerDestroy(tt), ), diff --git a/internal/services/baremetal/server_data_source_test.go b/internal/services/baremetal/server_data_source_test.go index b2f9e48836..6454c95178 100644 --- a/internal/services/baremetal/server_data_source_test.go +++ b/internal/services/baremetal/server_data_source_test.go @@ -22,9 +22,9 @@ func TestAccDataSourceServer_Basic(t *testing.T) { name := "TestAccScalewayDataSourceBaremetalServer_Basic" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: baremetalchecks.CheckServerDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: baremetalchecks.CheckServerDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/baremetal/server_test.go b/internal/services/baremetal/server_test.go index 5cc00d1d9a..c532da9940 100644 --- a/internal/services/baremetal/server_test.go +++ b/internal/services/baremetal/server_test.go @@ -34,9 +34,9 @@ func TestAccServer_Basic(t *testing.T) { name := "TestAccServer_Basic" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: baremetalchecks.CheckServerDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: baremetalchecks.CheckServerDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -126,9 +126,9 @@ func TestAccServer_RequiredInstallConfig(t *testing.T) { } resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: baremetalchecks.CheckServerDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: baremetalchecks.CheckServerDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -151,9 +151,9 @@ func TestAccServer_WithoutInstallConfig(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: baremetalchecks.CheckServerDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: baremetalchecks.CheckServerDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -191,9 +191,9 @@ func TestAccServer_CreateServerWithCustomInstallConfig(t *testing.T) { name := "TestAccServer_CreateServerWithCustomInstallConfig" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: baremetalchecks.CheckServerDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: baremetalchecks.CheckServerDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -245,9 +245,9 @@ func TestAccServer_CreateServerWithServicePassword(t *testing.T) { password := "HelloWorld678!" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: baremetalchecks.CheckServerDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: baremetalchecks.CheckServerDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -302,9 +302,9 @@ func TestAccServer_CreateServerWithOption(t *testing.T) { name := "TestAccScalewayBaremetalServer_CreateServerWithOption" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: baremetalchecks.CheckServerDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: baremetalchecks.CheckServerDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -368,9 +368,9 @@ func TestAccServer_AddOption(t *testing.T) { name := "TestAccScalewayBaremetalServer_AddOption" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: baremetalchecks.CheckServerDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: baremetalchecks.CheckServerDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -460,9 +460,9 @@ func TestAccServer_AddTwoOptionsThenDeleteOne(t *testing.T) { name := "TestAccScalewayBaremetalServer_AddTwoOptionsThenDeleteOne" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: baremetalchecks.CheckServerDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: baremetalchecks.CheckServerDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -615,8 +615,8 @@ func TestAccServer_CreateServerWithPrivateNetwork(t *testing.T) { name := "TestAccScalewayBaremetalServer_CreateServerWithPrivateNetwork" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( baremetalchecks.CheckServerDestroy(tt), ), @@ -687,8 +687,8 @@ func TestAccServer_AddPrivateNetwork(t *testing.T) { name := "TestAccScalewayBaremetalServer_AddPrivateNetwork" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( baremetalchecks.CheckServerDestroy(tt), ), @@ -800,8 +800,8 @@ func TestAccServer_AddAnotherPrivateNetwork(t *testing.T) { name := "TestAccScalewayBaremetalServer_AddAnotherPrivateNetwork" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( baremetalchecks.CheckServerDestroy(tt), ), @@ -926,8 +926,8 @@ func TestAccServer_WithIPAMPrivateNetwork(t *testing.T) { name := "TestAccScalewayBaremetalServer_WithIPAMPrivateNetwork" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( baremetalchecks.CheckServerDestroy(tt), ), @@ -1105,8 +1105,8 @@ func TestAccServer_UpdateSubscriptionPeriod(t *testing.T) { } resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( baremetalchecks.CheckServerDestroy(tt), ), diff --git a/internal/services/billing/consumption_data_source_test.go b/internal/services/billing/consumption_data_source_test.go index 3e37242e20..6c8be3173f 100644 --- a/internal/services/billing/consumption_data_source_test.go +++ b/internal/services/billing/consumption_data_source_test.go @@ -14,8 +14,8 @@ func TestAccDataSourceConsumption_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/billing/invoices_data_source_test.go b/internal/services/billing/invoices_data_source_test.go index a22cc55601..21daaed21a 100644 --- a/internal/services/billing/invoices_data_source_test.go +++ b/internal/services/billing/invoices_data_source_test.go @@ -12,8 +12,8 @@ func TestAccDataSourceInvoices_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/block/snapshot_data_source_test.go b/internal/services/block/snapshot_data_source_test.go index 04259da6c2..2752160c4f 100644 --- a/internal/services/block/snapshot_data_source_test.go +++ b/internal/services/block/snapshot_data_source_test.go @@ -13,8 +13,8 @@ func TestAccDataSourceSnapshot_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( blocktestfuncs.IsSnapshotDestroyed(tt), ), diff --git a/internal/services/block/snapshot_test.go b/internal/services/block/snapshot_test.go index c9b035cb8d..725030b31b 100644 --- a/internal/services/block/snapshot_test.go +++ b/internal/services/block/snapshot_test.go @@ -16,9 +16,9 @@ func TestAccSnapshot_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: blocktestfuncs.IsSnapshotDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: blocktestfuncs.IsSnapshotDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -48,8 +48,8 @@ func TestAccSnapshot_FromS3(t *testing.T) { bucketName := sdkacctest.RandomWithPrefix("test-acc-scaleway-block-snapshot") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( blocktestfuncs.IsSnapshotDestroyed(tt), objectchecks.IsObjectDestroyed(tt), @@ -92,8 +92,8 @@ func TestAccSnapshot_ToS3(t *testing.T) { bucketName := sdkacctest.RandomWithPrefix("test-acc-scaleway-export-block-snapshot") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( blocktestfuncs.IsSnapshotDestroyed(tt), objectchecks.IsObjectDestroyed(tt), diff --git a/internal/services/block/volume_data_source_test.go b/internal/services/block/volume_data_source_test.go index 5a65c6a1a8..33c02a7417 100644 --- a/internal/services/block/volume_data_source_test.go +++ b/internal/services/block/volume_data_source_test.go @@ -13,8 +13,8 @@ func TestAccDataSourceVolume_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( blocktestfuncs.IsVolumeDestroyed(tt), ), diff --git a/internal/services/block/volume_test.go b/internal/services/block/volume_test.go index 82a75e46f0..0335e0155a 100644 --- a/internal/services/block/volume_test.go +++ b/internal/services/block/volume_test.go @@ -13,9 +13,9 @@ func TestAccVolume_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: blocktestfuncs.IsVolumeDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: blocktestfuncs.IsVolumeDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -43,9 +43,9 @@ func TestAccVolume_UpdateSize(t *testing.T) { var volumeID string resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: blocktestfuncs.IsVolumeDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: blocktestfuncs.IsVolumeDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -104,9 +104,9 @@ func TestAccVolume_FromSnapshot(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: blocktestfuncs.IsVolumeDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: blocktestfuncs.IsVolumeDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -143,9 +143,9 @@ func TestAccVolume_FromSnapshotWithSize(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: blocktestfuncs.IsVolumeDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: blocktestfuncs.IsVolumeDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -183,9 +183,9 @@ func TestAccVolume_UpdateIops(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: blocktestfuncs.IsVolumeDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: blocktestfuncs.IsVolumeDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/cockpit/alert_manager_test.go b/internal/services/cockpit/alert_manager_test.go index a5be7c9e03..086ccd3aaf 100644 --- a/internal/services/cockpit/alert_manager_test.go +++ b/internal/services/cockpit/alert_manager_test.go @@ -21,9 +21,9 @@ func TestAccCockpitAlertManager_CreateWithSingleContact(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCockpitAlertManagerAndContactsDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCockpitAlertManagerAndContactsDestroy(tt), Steps: []resource.TestStep{ { Config: testAccCockpitAlertManagerConfigWithContacts([]map[string]string{ @@ -59,9 +59,9 @@ func TestAccCockpitAlertManager_CreateWithMultipleContacts(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCockpitAlertManagerAndContactsDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCockpitAlertManagerAndContactsDestroy(tt), Steps: []resource.TestStep{ { Config: testAccCockpitAlertManagerConfigWithContacts([]map[string]string{ @@ -101,9 +101,9 @@ func TestAccCockpitAlertManager_UpdateSingleContact(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCockpitAlertManagerAndContactsDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCockpitAlertManagerAndContactsDestroy(tt), Steps: []resource.TestStep{ { Config: testAccCockpitAlertManagerConfigWithContacts([]map[string]string{ @@ -145,9 +145,9 @@ func TestAccCockpitAlertManager_EnableDisable(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCockpitAlertManagerAndContactsDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCockpitAlertManagerAndContactsDestroy(tt), Steps: []resource.TestStep{ { Config: testAccCockpitAlertManagerEnableConfig(true), @@ -174,9 +174,9 @@ func TestAccCockpitAlertManager_IDHandling(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCockpitAlertManagerAndContactsDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCockpitAlertManagerAndContactsDestroy(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/cockpit/cockpit_data_source_test.go b/internal/services/cockpit/cockpit_data_source_test.go index c2feb3b052..8eb9c78ba3 100644 --- a/internal/services/cockpit/cockpit_data_source_test.go +++ b/internal/services/cockpit/cockpit_data_source_test.go @@ -12,8 +12,8 @@ func TestAccDataSourceCockpit_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/cockpit/cockpit_test.go b/internal/services/cockpit/cockpit_test.go index e2c4094e7b..3cc4374c94 100644 --- a/internal/services/cockpit/cockpit_test.go +++ b/internal/services/cockpit/cockpit_test.go @@ -14,9 +14,9 @@ func TestAccCockpit_Simple(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isCockpitDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isCockpitDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -38,9 +38,9 @@ func TestAccCockpit_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isCockpitDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isCockpitDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -72,9 +72,9 @@ func TestAccCockpit_WithSourceEndpoints(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isCockpitDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isCockpitDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/cockpit/grafana_user_test.go b/internal/services/cockpit/grafana_user_test.go index 0cc61b8897..57381ae3fe 100644 --- a/internal/services/cockpit/grafana_user_test.go +++ b/internal/services/cockpit/grafana_user_test.go @@ -21,9 +21,9 @@ func TestAccGrafanaUser_Basic(t *testing.T) { grafanaTestUsername := "testuserbasic" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isGrafanaUserDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isGrafanaUserDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -65,9 +65,9 @@ func TestAccGrafanaUser_Update(t *testing.T) { grafanaTestUsername := "testuserupdate" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isGrafanaUserDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isGrafanaUserDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/cockpit/source_data_source_test.go b/internal/services/cockpit/source_data_source_test.go index b8154c3613..2b72382b49 100644 --- a/internal/services/cockpit/source_data_source_test.go +++ b/internal/services/cockpit/source_data_source_test.go @@ -13,9 +13,9 @@ func TestAccCockpitSource_DataSource_ByID(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isSourceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isSourceDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -49,9 +49,9 @@ func TestAccCockpitSource_DataSource_ByName(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isSourceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isSourceDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -92,8 +92,8 @@ func TestAccCockpitSource_DataSource_Defaults(t *testing.T) { } resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, Steps: []resource.TestStep{ { @@ -135,9 +135,9 @@ func TestAccCockpitSource_DataSource_ByRegion(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isSourceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isSourceDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/cockpit/source_test.go b/internal/services/cockpit/source_test.go index bf230691f2..bf1faf9586 100644 --- a/internal/services/cockpit/source_test.go +++ b/internal/services/cockpit/source_test.go @@ -22,9 +22,9 @@ func TestAccCockpitSource_Basic_metrics(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isSourceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isSourceDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -63,9 +63,9 @@ func TestAccCockpitSource_Basic_logs(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isSourceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isSourceDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -104,9 +104,9 @@ func TestAccCockpitSource_retention_days(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isSourceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isSourceDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -146,9 +146,9 @@ func TestAccCockpitSource_Update(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isSourceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isSourceDestroyed(tt), Steps: []resource.TestStep{ // Initial creation { diff --git a/internal/services/cockpit/sources_data_source_test.go b/internal/services/cockpit/sources_data_source_test.go index 0ab7a98813..a302a5021d 100644 --- a/internal/services/cockpit/sources_data_source_test.go +++ b/internal/services/cockpit/sources_data_source_test.go @@ -13,9 +13,9 @@ func TestAccCockpitSources_DataSource_All(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isSourceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isSourceDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -61,9 +61,9 @@ func TestAccCockpitSources_DataSource_ByType(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isSourceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isSourceDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -106,9 +106,9 @@ func TestAccCockpitSources_DataSource_ByName(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isSourceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isSourceDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -151,8 +151,8 @@ func TestAccCockpitSources_DataSource_Empty(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, Steps: []resource.TestStep{ { Config: ` @@ -182,8 +182,8 @@ func TestAccCockpitSources_DataSource_DefaultSources(t *testing.T) { } resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/cockpit/token_test.go b/internal/services/cockpit/token_test.go index 910e0ba85f..392faab7e9 100644 --- a/internal/services/cockpit/token_test.go +++ b/internal/services/cockpit/token_test.go @@ -20,9 +20,9 @@ func TestAccToken_Basic(t *testing.T) { tokenName := projectName resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isTokenDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isTokenDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -66,9 +66,9 @@ func TestAccToken_NoScopes(t *testing.T) { tokenName := "tf_tests_cockpit_token_no_scopes" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isTokenDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isTokenDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -108,9 +108,9 @@ func TestAccToken_Update(t *testing.T) { tokenName := projectName resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isTokenDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isTokenDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/container/container_data_source_test.go b/internal/services/container/container_data_source_test.go index 0187ef4fcc..41f6d9cc54 100644 --- a/internal/services/container/container_data_source_test.go +++ b/internal/services/container/container_data_source_test.go @@ -12,9 +12,9 @@ func TestAccDataSourceContainer_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isNamespaceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isNamespaceDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -55,9 +55,9 @@ func TestAccDataSourceContainer_HealthCheck(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isNamespaceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isNamespaceDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -93,9 +93,9 @@ func TestAccDataSourceContainer_ScalingOption(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isNamespaceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isNamespaceDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/container/container_test.go b/internal/services/container/container_test.go index da20c814d4..3f62cdf621 100644 --- a/internal/services/container/container_test.go +++ b/internal/services/container/container_test.go @@ -20,9 +20,9 @@ func TestAccContainer_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isContainerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isContainerDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -138,9 +138,9 @@ func TestAccContainer_Env(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isContainerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isContainerDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -224,9 +224,9 @@ func TestAccContainer_WithIMG(t *testing.T) { containerNamespace := "test-cr-ns-02" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isContainerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isContainerDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -282,9 +282,9 @@ func TestAccContainer_HTTPOption(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isContainerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isContainerDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -339,9 +339,9 @@ func TestAccContainer_Sandbox(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isContainerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isContainerDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -410,9 +410,9 @@ func TestAccContainer_HealthCheck(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isContainerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isContainerDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -465,9 +465,9 @@ func TestAccContainer_ScalingOption(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isContainerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isContainerDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -555,9 +555,9 @@ func TestAccContainer_CommandAndArgs(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isContainerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isContainerDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -638,8 +638,8 @@ func TestAccContainer_PrivateNetwork(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( isNamespaceDestroyed(tt), isContainerDestroyed(tt), diff --git a/internal/services/container/cron_test.go b/internal/services/container/cron_test.go index 0e3639a45d..38cd5a74d1 100644 --- a/internal/services/container/cron_test.go +++ b/internal/services/container/cron_test.go @@ -17,9 +17,9 @@ func TestAccCron_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isCronDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isCronDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -80,9 +80,9 @@ func TestAccCron_WithMultiArgs(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isCronDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isCronDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/container/domain_test.go b/internal/services/container/domain_test.go index 446c48085d..23bd24532f 100644 --- a/internal/services/container/domain_test.go +++ b/internal/services/container/domain_test.go @@ -21,9 +21,9 @@ func TestAccDomain_Basic(t *testing.T) { logging.L.Debugf("TestAccDomain_Basic: test dns zone: %s", testDNSZone) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isDomainDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isDomainDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/container/namespace_data_source_test.go b/internal/services/container/namespace_data_source_test.go index f39a5f94b0..b41cdbb7d2 100644 --- a/internal/services/container/namespace_data_source_test.go +++ b/internal/services/container/namespace_data_source_test.go @@ -12,9 +12,9 @@ func TestAccDataSourceNamespace_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isNamespaceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isNamespaceDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/container/namespace_test.go b/internal/services/container/namespace_test.go index 45d2eec7dc..802f388167 100644 --- a/internal/services/container/namespace_test.go +++ b/internal/services/container/namespace_test.go @@ -22,9 +22,9 @@ func TestAccNamespace_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isNamespaceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isNamespaceDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -180,9 +180,9 @@ func TestAccNamespace_SecretManagement(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isNamespaceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isNamespaceDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -242,8 +242,8 @@ func TestAccNamespace_DestroyRegistry(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( isNamespaceDestroyed(tt), isRegistryDestroyed(tt), @@ -273,8 +273,8 @@ func TestAccNamespace_VPCIntegration(t *testing.T) { namespaceID := "" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( isNamespaceDestroyed(tt), isContainerDestroyed(tt), diff --git a/internal/services/container/token_test.go b/internal/services/container/token_test.go index 609b14c2d7..8b0f2f4c82 100644 --- a/internal/services/container/token_test.go +++ b/internal/services/container/token_test.go @@ -25,9 +25,9 @@ func TestAccToken_Basic(t *testing.T) { } resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isTokenDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isTokenDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/container/trigger_test.go b/internal/services/container/trigger_test.go index ba453aa04b..31daf68cf0 100644 --- a/internal/services/container/trigger_test.go +++ b/internal/services/container/trigger_test.go @@ -62,9 +62,9 @@ func TestAccTrigger_SQS(t *testing.T) { ` resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isTriggerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isTriggerDestroyed(tt), Steps: []resource.TestStep{ { Config: basicConfig, @@ -109,9 +109,9 @@ func TestAccTrigger_Nats(t *testing.T) { ` resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isTriggerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isTriggerDestroyed(tt), Steps: []resource.TestStep{ { Config: basicConfig, diff --git a/internal/services/domain/record_data_source_test.go b/internal/services/domain/record_data_source_test.go index f000364db7..0b2d72cec3 100644 --- a/internal/services/domain/record_data_source_test.go +++ b/internal/services/domain/record_data_source_test.go @@ -13,9 +13,9 @@ func TestAccDataSourceDomainRecord_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckDomainRecordDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckDomainRecordDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/domain/record_test.go b/internal/services/domain/record_test.go index f4a8f67210..9740a6d207 100644 --- a/internal/services/domain/record_test.go +++ b/internal/services/domain/record_test.go @@ -31,9 +31,9 @@ func TestAccDomainRecord_Basic(t *testing.T) { priorityUpdated := 10 resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckDomainRecordDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckDomainRecordDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -176,9 +176,9 @@ func TestAccDomainRecord_Basic2(t *testing.T) { priority := 0 resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckDomainRecordDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckDomainRecordDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -250,9 +250,9 @@ func TestAccDomainRecord_Arobase(t *testing.T) { logging.L.Debugf("TestAccScalewayDomainRecord_Arobase: test dns zone: %s", testDNSZone) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckDomainRecordDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckDomainRecordDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -297,9 +297,9 @@ func TestAccDomainRecord_GeoIP(t *testing.T) { priority := 0 // default value resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckDomainRecordDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckDomainRecordDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -393,9 +393,9 @@ func TestAccDomainRecord_HTTPService(t *testing.T) { priority := 0 // default value resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckDomainRecordDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckDomainRecordDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -480,9 +480,9 @@ func TestAccDomainRecord_View(t *testing.T) { priority := 0 // default value resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckDomainRecordDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckDomainRecordDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -572,9 +572,9 @@ func TestAccDomainRecord_Weighted(t *testing.T) { priority := 0 // default value resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckDomainRecordDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckDomainRecordDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -664,9 +664,9 @@ func TestAccDomainRecord_SRVZone(t *testing.T) { priority := 100 // default value resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckDomainRecordDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckDomainRecordDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -706,9 +706,9 @@ func TestAccDomainRecord_SRVWithDomainDuplication(t *testing.T) { priority := 0 resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckDomainRecordDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckDomainRecordDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -802,9 +802,9 @@ func TestAccDomainRecord_CNAME(t *testing.T) { priorityUpdated := 10 resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckDomainRecordDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckDomainRecordDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/domain/registration_test.go b/internal/services/domain/registration_test.go index 544d721ccd..f07a27406f 100644 --- a/internal/services/domain/registration_test.go +++ b/internal/services/domain/registration_test.go @@ -26,9 +26,9 @@ func TestAccDomainRegistration_SingleDomainWithUpdate(t *testing.T) { singleDomain := "test-single-updates37" + ".com" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckDomainDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckDomainDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -108,9 +108,9 @@ func TestAccDomainRegistration_MultipleDomainsUpdate(t *testing.T) { domainName3 := "test-multiple-123.com" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckDomainDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckDomainDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/domain/zone_data_source_test.go b/internal/services/domain/zone_data_source_test.go index 1655c7c747..7dae2c29bb 100644 --- a/internal/services/domain/zone_data_source_test.go +++ b/internal/services/domain/zone_data_source_test.go @@ -15,9 +15,9 @@ func TestAccDataSourceDomainZone_Basic(t *testing.T) { testDNSZone := "test-zone2" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckDomainZoneDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckDomainZoneDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/domain/zone_test.go b/internal/services/domain/zone_test.go index f0ce537eee..460dce32a6 100644 --- a/internal/services/domain/zone_test.go +++ b/internal/services/domain/zone_test.go @@ -21,9 +21,9 @@ func TestAccDomainZone_Basic(t *testing.T) { logging.L.Debugf("TestAccScalewayDomainZone_Basic: test dns zone: %s, with domain: %s", testDNSZone, acctest.TestDomain) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckDomainZoneDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckDomainZoneDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -50,9 +50,9 @@ func TestAccDomainZone_RootZone(t *testing.T) { logging.L.Debugf("TestAccDomainZone_RootZone: test root zone with domain: %s", acctest.TestDomain) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckDomainZoneDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckDomainZoneDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/edgeservices/backend_stage_test.go b/internal/services/edgeservices/backend_stage_test.go index 843844ceba..947508d492 100644 --- a/internal/services/edgeservices/backend_stage_test.go +++ b/internal/services/edgeservices/backend_stage_test.go @@ -13,9 +13,9 @@ func TestAccEdgeServicesBackend_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: edgeservicestestfuncs.CheckEdgeServicesBackendDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: edgeservicestestfuncs.CheckEdgeServicesBackendDestroy(tt), Steps: []resource.TestStep{ { Config: ` @@ -60,9 +60,9 @@ func TestAccEdgeServicesBackend_LB(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: edgeservicestestfuncs.CheckEdgeServicesBackendDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: edgeservicestestfuncs.CheckEdgeServicesBackendDestroy(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/edgeservices/cache_stage_test.go b/internal/services/edgeservices/cache_stage_test.go index 0dd0edec73..6129be2326 100644 --- a/internal/services/edgeservices/cache_stage_test.go +++ b/internal/services/edgeservices/cache_stage_test.go @@ -13,9 +13,9 @@ func TestAccEdgeServicesCache_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: edgeservicestestfuncs.CheckEdgeServicesCacheDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: edgeservicestestfuncs.CheckEdgeServicesCacheDestroy(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/edgeservices/dns_stage_test.go b/internal/services/edgeservices/dns_stage_test.go index 093888083e..d14c4eb8e5 100644 --- a/internal/services/edgeservices/dns_stage_test.go +++ b/internal/services/edgeservices/dns_stage_test.go @@ -13,9 +13,9 @@ func TestAccEdgeServicesDNS_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: edgeservicestestfuncs.CheckEdgeServicesDNSDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: edgeservicestestfuncs.CheckEdgeServicesDNSDestroy(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/edgeservices/pipeline_test.go b/internal/services/edgeservices/pipeline_test.go index 88c954bb09..1cd86a7f02 100644 --- a/internal/services/edgeservices/pipeline_test.go +++ b/internal/services/edgeservices/pipeline_test.go @@ -13,9 +13,9 @@ func TestAccEdgeServicesPipeline_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: edgeservicestestfuncs.CheckEdgeServicesCacheDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: edgeservicestestfuncs.CheckEdgeServicesCacheDestroy(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/edgeservices/plan_test.go b/internal/services/edgeservices/plan_test.go index 7b3196f84a..bf6ca632fb 100644 --- a/internal/services/edgeservices/plan_test.go +++ b/internal/services/edgeservices/plan_test.go @@ -13,9 +13,9 @@ func TestAccEdgeServicesPlan_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: edgeservicestestfuncs.CheckEdgeServicesDNSDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: edgeservicestestfuncs.CheckEdgeServicesDNSDestroy(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/edgeservices/route_stage_test.go b/internal/services/edgeservices/route_stage_test.go index c8eb8d1d1b..8ee32ba965 100644 --- a/internal/services/edgeservices/route_stage_test.go +++ b/internal/services/edgeservices/route_stage_test.go @@ -13,9 +13,9 @@ func TestAccEdgeServicesRoute_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: edgeservicestestfuncs.CheckEdgeServicesRouteDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: edgeservicestestfuncs.CheckEdgeServicesRouteDestroy(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/edgeservices/tls_stage_test.go b/internal/services/edgeservices/tls_stage_test.go index e0ec426175..37f6c8a44f 100644 --- a/internal/services/edgeservices/tls_stage_test.go +++ b/internal/services/edgeservices/tls_stage_test.go @@ -13,9 +13,9 @@ func TestAccEdgeServicesTLS_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: edgeservicestestfuncs.CheckEdgeServicesTLSDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: edgeservicestestfuncs.CheckEdgeServicesTLSDestroy(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/edgeservices/waf_stage_test.go b/internal/services/edgeservices/waf_stage_test.go index f2e37a756f..7118a83828 100644 --- a/internal/services/edgeservices/waf_stage_test.go +++ b/internal/services/edgeservices/waf_stage_test.go @@ -13,9 +13,9 @@ func TestAccEdgeServicesWAF_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: edgeservicestestfuncs.CheckEdgeServicesWAFDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: edgeservicestestfuncs.CheckEdgeServicesWAFDestroy(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/file/filesystem_test.go b/internal/services/file/filesystem_test.go index 026cb72e11..e0e501dcbc 100644 --- a/internal/services/file/filesystem_test.go +++ b/internal/services/file/filesystem_test.go @@ -23,9 +23,9 @@ func TestAccFileSystem_Basic(t *testing.T) { size := int64(100_000_000_000) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: filetestfuncs.CheckFileDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: filetestfuncs.CheckFileDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -64,9 +64,9 @@ func TestAccFileSystem_SizeTooSmallFails(t *testing.T) { size := int64(10_000_000_000) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: filetestfuncs.CheckFileDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: filetestfuncs.CheckFileDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -89,9 +89,9 @@ func TestAccFileSystem_InvalidSizeGranularityFails(t *testing.T) { size := int64(25_000_000_000) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: filetestfuncs.CheckFileDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: filetestfuncs.CheckFileDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/flexibleip/data_source_flexible_ip_test.go b/internal/services/flexibleip/data_source_flexible_ip_test.go index a60aa98b8f..07bcad33bd 100644 --- a/internal/services/flexibleip/data_source_flexible_ip_test.go +++ b/internal/services/flexibleip/data_source_flexible_ip_test.go @@ -12,9 +12,9 @@ func TestAccDataSourceFlexibleIP_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckFlexibleIPDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckFlexibleIPDestroy(tt), Steps: []resource.TestStep{ { Config: ` @@ -50,9 +50,9 @@ func TestAccDataSourceFlexibleIP_Multiple(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckFlexibleIPDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckFlexibleIPDestroy(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/flexibleip/data_source_flexible_ips_test.go b/internal/services/flexibleip/data_source_flexible_ips_test.go index 704b461b0f..04af02f774 100644 --- a/internal/services/flexibleip/data_source_flexible_ips_test.go +++ b/internal/services/flexibleip/data_source_flexible_ips_test.go @@ -13,9 +13,9 @@ func TestAccDataSourceFlexibleIPs_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: lbchecks.IsIPDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: lbchecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -63,9 +63,9 @@ func TestAccDataSourceFlexibleIPs_WithBaremetalIDs(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: lbchecks.IsIPDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: lbchecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/flexibleip/ip_test.go b/internal/services/flexibleip/ip_test.go index 07a59634e8..869f4c8cc9 100644 --- a/internal/services/flexibleip/ip_test.go +++ b/internal/services/flexibleip/ip_test.go @@ -29,8 +29,8 @@ func TestAccFlexibleIP_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckFlexibleIPDestroy(tt), + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckFlexibleIPDestroy(tt), Steps: []resource.TestStep{ { Config: ` @@ -55,8 +55,8 @@ func TestAccFlexibleIP_WithZone(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckFlexibleIPDestroy(tt), + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckFlexibleIPDestroy(tt), Steps: []resource.TestStep{ { Config: ` @@ -87,8 +87,8 @@ func TestAccFlexibleIP_IPv6(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckFlexibleIPDestroy(tt), + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckFlexibleIPDestroy(tt), Steps: []resource.TestStep{ { Config: ` @@ -114,7 +114,7 @@ func TestAccFlexibleIP_CreateAndAttachToBaremetalServer(t *testing.T) { name := "TestAccScalewayFlexibleIP_CreateAndAttachToBaremetalServer" resource.ParallelTest(t, resource.TestCase{ - ProviderFactories: tt.ProviderFactories, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckFlexibleIPDestroy(tt), baremetalchecks.CheckServerDestroy(tt), @@ -208,7 +208,7 @@ func TestAccFlexibleIP_AttachAndDetachFromBaremetalServer(t *testing.T) { SSHKeyName := "TestAccScalewayFlexibleIP_AttachAndDetachFromBaremetalServer" name := "TestAccScalewayFlexibleIP_AttachAndDetachFromBaremetalServer" resource.ParallelTest(t, resource.TestCase{ - ProviderFactories: tt.ProviderFactories, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckFlexibleIPDestroy(tt), baremetalchecks.CheckServerDestroy(tt), diff --git a/internal/services/flexibleip/mac_address_test.go b/internal/services/flexibleip/mac_address_test.go index bbfa5d3b09..a3c4d5fda5 100644 --- a/internal/services/flexibleip/mac_address_test.go +++ b/internal/services/flexibleip/mac_address_test.go @@ -18,8 +18,8 @@ func TestAccFlexibleIPMACAddress_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckFlexibleIPDestroy(tt), + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckFlexibleIPDestroy(tt), Steps: []resource.TestStep{ { Config: ` @@ -47,8 +47,8 @@ func TestAccFlexibleIPMACAddress_MoveToAnotherFlexibleIP(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckFlexibleIPDestroy(tt), + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckFlexibleIPDestroy(tt), Steps: []resource.TestStep{ { Config: ` @@ -103,7 +103,7 @@ func TestAccFlexibleIPMACAddress_DuplicateOnOtherFlexibleIPs(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProviderFactories: tt.ProviderFactories, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckFlexibleIPDestroy(tt), baremetalchecks.CheckServerDestroy(tt), diff --git a/internal/services/function/cron_test.go b/internal/services/function/cron_test.go index 6e53b9461b..7533092fd5 100644 --- a/internal/services/function/cron_test.go +++ b/internal/services/function/cron_test.go @@ -17,9 +17,9 @@ func TestAccFunctionCron_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckFunctionCronDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckFunctionCronDestroy(tt), Steps: []resource.TestStep{ { Config: ` @@ -57,9 +57,9 @@ func TestAccFunctionCron_NameUpdate(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckFunctionCronDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckFunctionCronDestroy(tt), Steps: []resource.TestStep{ { Config: ` @@ -123,9 +123,9 @@ func TestAccFunctionCron_WithArgs(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckFunctionCronDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckFunctionCronDestroy(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/function/data_source_function_namespace_test.go b/internal/services/function/data_source_function_namespace_test.go index f35df50620..64c690ef1d 100644 --- a/internal/services/function/data_source_function_namespace_test.go +++ b/internal/services/function/data_source_function_namespace_test.go @@ -12,9 +12,9 @@ func TestAccDataSourceFunctionNamespace_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckFunctionNamespaceDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckFunctionNamespaceDestroy(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/function/data_source_function_test.go b/internal/services/function/data_source_function_test.go index bee48a5675..32656faffc 100644 --- a/internal/services/function/data_source_function_test.go +++ b/internal/services/function/data_source_function_test.go @@ -12,9 +12,9 @@ func TestAccDataSourceFunction_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckFunctionDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckFunctionDestroy(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/function/domain_test.go b/internal/services/function/domain_test.go index 1e09e555f1..58926c8f8b 100644 --- a/internal/services/function/domain_test.go +++ b/internal/services/function/domain_test.go @@ -21,9 +21,9 @@ func TestAccFunctionDomain_Basic(t *testing.T) { logging.L.Debugf("TestAccScalewayContainerDomain_Basic: test dns zone: %s", testDNSZone) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckFunctionDomainDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckFunctionDomainDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/function/function_test.go b/internal/services/function/function_test.go index ed14c78b41..befd6387e0 100644 --- a/internal/services/function/function_test.go +++ b/internal/services/function/function_test.go @@ -20,9 +20,9 @@ func TestAccFunction_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckFunctionDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckFunctionDestroy(tt), Steps: []resource.TestStep{ { Config: ` @@ -59,9 +59,9 @@ func TestAccFunction_Timeout(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckFunctionDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckFunctionDestroy(tt), Steps: []resource.TestStep{ { Config: ` @@ -94,9 +94,9 @@ func TestAccFunction_NoName(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckFunctionNamespaceDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckFunctionNamespaceDestroy(tt), Steps: []resource.TestStep{ { Config: ` @@ -123,9 +123,9 @@ func TestAccFunction_EnvironmentVariables(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckFunctionDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckFunctionDestroy(tt), Steps: []resource.TestStep{ { Config: ` @@ -186,9 +186,9 @@ func TestAccFunction_Upload(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckFunctionDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckFunctionDestroy(tt), Steps: []resource.TestStep{ { Config: ` @@ -216,9 +216,9 @@ func TestAccFunction_Deploy(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckFunctionDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckFunctionDestroy(tt), Steps: []resource.TestStep{ { Config: ` @@ -266,9 +266,9 @@ func TestAccFunction_HTTPOption(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckFunctionDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckFunctionDestroy(tt), Steps: []resource.TestStep{ { Config: ` @@ -332,9 +332,9 @@ func TestAccFunction_Sandbox(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckFunctionDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckFunctionDestroy(tt), Steps: []resource.TestStep{ { Config: ` @@ -416,8 +416,8 @@ func TestAccFunction_PrivateNetwork(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckFunctionNamespaceDestroy(tt), testAccCheckFunctionDestroy(tt), diff --git a/internal/services/function/namespace_test.go b/internal/services/function/namespace_test.go index b186edf6a5..dd4c358e27 100644 --- a/internal/services/function/namespace_test.go +++ b/internal/services/function/namespace_test.go @@ -18,9 +18,9 @@ func TestAccFunctionNamespace_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckFunctionNamespaceDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckFunctionNamespaceDestroy(tt), Steps: []resource.TestStep{ { Config: ` @@ -110,9 +110,9 @@ func TestAccFunctionNamespace_NoName(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckFunctionNamespaceDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckFunctionNamespaceDestroy(tt), Steps: []resource.TestStep{ { Config: ` @@ -132,9 +132,9 @@ func TestAccFunctionNamespace_EnvironmentVariables(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckFunctionNamespaceDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckFunctionNamespaceDestroy(tt), Steps: []resource.TestStep{ { Config: ` @@ -187,8 +187,8 @@ func TestAccFunctionNamespace_VPCIntegration(t *testing.T) { namespaceID := "" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckFunctionNamespaceDestroy(tt), testAccCheckFunctionDestroy(tt), diff --git a/internal/services/function/token_test.go b/internal/services/function/token_test.go index 599612a9c3..bac886a3ec 100644 --- a/internal/services/function/token_test.go +++ b/internal/services/function/token_test.go @@ -25,9 +25,9 @@ func TestAccFunctionToken_Basic(t *testing.T) { } resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckFunctionTokenDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckFunctionTokenDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/function/trigger_test.go b/internal/services/function/trigger_test.go index c09eb28364..0e07eab025 100644 --- a/internal/services/function/trigger_test.go +++ b/internal/services/function/trigger_test.go @@ -67,9 +67,9 @@ func TestAccFunctionTrigger_SQS(t *testing.T) { ` resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckFunctionTriggerDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckFunctionTriggerDestroy(tt), Steps: []resource.TestStep{ { Config: config, @@ -119,9 +119,9 @@ func TestAccFunctionTrigger_Nats(t *testing.T) { ` resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckFunctionTriggerDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckFunctionTriggerDestroy(tt), Steps: []resource.TestStep{ { Config: config, @@ -148,9 +148,9 @@ func TestAccFunctionTrigger_Error(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckFunctionTriggerDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckFunctionTriggerDestroy(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/iam/api_key_data_source_test.go b/internal/services/iam/api_key_data_source_test.go index 7cc174684e..b72cdb5888 100644 --- a/internal/services/iam/api_key_data_source_test.go +++ b/internal/services/iam/api_key_data_source_test.go @@ -12,8 +12,8 @@ func TestAccDataSourceApiKey_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckIamAPIKeyDestroy(tt), ), diff --git a/internal/services/iam/api_key_test.go b/internal/services/iam/api_key_test.go index 3ed7e5b455..237f6ae7ef 100644 --- a/internal/services/iam/api_key_test.go +++ b/internal/services/iam/api_key_test.go @@ -20,7 +20,7 @@ func TestAccApiKey_WithApplication(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProviderFactories: tt.ProviderFactories, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckIamAPIKeyDestroy(tt), testAccCheckIamApplicationDestroy(tt), @@ -77,7 +77,7 @@ func TestAccApiKey_WithApplicationChange(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProviderFactories: tt.ProviderFactories, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckIamAPIKeyDestroy(tt), testAccCheckIamApplicationDestroy(tt), @@ -142,7 +142,7 @@ func TestAccApiKey_Expires(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProviderFactories: tt.ProviderFactories, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckIamAPIKeyDestroy(tt), testAccCheckIamApplicationDestroy(tt), @@ -190,8 +190,8 @@ func TestAccApiKey_NoUpdate(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckIamAPIKeyDestroy(tt), + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckIamAPIKeyDestroy(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/iam/application_data_source_test.go b/internal/services/iam/application_data_source_test.go index 89e1d7c62a..80e47f9a6b 100644 --- a/internal/services/iam/application_data_source_test.go +++ b/internal/services/iam/application_data_source_test.go @@ -12,8 +12,8 @@ func TestAccDataSourceApplication_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckIamApplicationDestroy(tt), ), diff --git a/internal/services/iam/application_test.go b/internal/services/iam/application_test.go index 39d7b6c625..7fb401ad64 100644 --- a/internal/services/iam/application_test.go +++ b/internal/services/iam/application_test.go @@ -20,8 +20,8 @@ func TestAccApplication_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckIamApplicationDestroy(tt), + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckIamApplicationDestroy(tt), Steps: []resource.TestStep{ { Config: ` @@ -64,8 +64,8 @@ func TestAccApplication_NoUpdate(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckIamApplicationDestroy(tt), + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckIamApplicationDestroy(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/iam/group_data_source_test.go b/internal/services/iam/group_data_source_test.go index 0807871136..7c22774d03 100644 --- a/internal/services/iam/group_data_source_test.go +++ b/internal/services/iam/group_data_source_test.go @@ -12,8 +12,8 @@ func TestAccDataSourceGroup_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckIamGroupDestroy(tt), ), @@ -50,8 +50,8 @@ func TestAccDataSourceGroup_UsersAndApplications(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckIamGroupDestroy(tt), ), diff --git a/internal/services/iam/group_membership_test.go b/internal/services/iam/group_membership_test.go index 6e3719fc37..9fc296a327 100644 --- a/internal/services/iam/group_membership_test.go +++ b/internal/services/iam/group_membership_test.go @@ -17,8 +17,8 @@ func TestAccGroupMembership_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckIamGroupDestroy(tt), testAccCheckIamApplicationDestroy(tt), @@ -107,8 +107,8 @@ func TestAccGroupMembership_User(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckIamGroupDestroy(tt), testAccCheckIamApplicationDestroy(tt), diff --git a/internal/services/iam/group_test.go b/internal/services/iam/group_test.go index 4fa36e7c7a..e16e2c7909 100644 --- a/internal/services/iam/group_test.go +++ b/internal/services/iam/group_test.go @@ -20,8 +20,8 @@ func TestAccGroup_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckIamGroupDestroy(tt), + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckIamGroupDestroy(tt), Steps: []resource.TestStep{ { Config: ` @@ -108,7 +108,7 @@ func TestAccGroup_Applications(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProviderFactories: tt.ProviderFactories, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckIamGroupDestroy(tt), testAccCheckIamApplicationDestroy(tt), @@ -207,7 +207,7 @@ func TestAccGroup_Users(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProviderFactories: tt.ProviderFactories, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckIamGroupDestroy(tt), ), @@ -299,7 +299,7 @@ func TestAccGroup_UsersAndApplications(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProviderFactories: tt.ProviderFactories, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckIamGroupDestroy(tt), testAccCheckIamApplicationDestroy(tt), diff --git a/internal/services/iam/policy_test.go b/internal/services/iam/policy_test.go index c01b76fd8d..af1913cb68 100644 --- a/internal/services/iam/policy_test.go +++ b/internal/services/iam/policy_test.go @@ -22,7 +22,7 @@ func TestAccPolicy_Basic(t *testing.T) { require.NoError(t, err) resource.ParallelTest(t, resource.TestCase{ - ProviderFactories: acctest.FakeSideProjectProviders(ctx, tt, project, iamAPIKey), + ProtoV5ProviderFactories: acctest.FakeSideProjectProviders(ctx, tt, project, iamAPIKey), CheckDestroy: resource.ComposeAggregateTestCheckFunc( func(_ *terraform.State) error { return terminateFakeSideProject() @@ -96,7 +96,7 @@ func TestAccPolicy_NoUpdate(t *testing.T) { require.NoError(t, err) resource.ParallelTest(t, resource.TestCase{ - ProviderFactories: acctest.FakeSideProjectProviders(ctx, tt, project, iamAPIKey), + ProtoV5ProviderFactories: acctest.FakeSideProjectProviders(ctx, tt, project, iamAPIKey), CheckDestroy: resource.ComposeAggregateTestCheckFunc( func(_ *terraform.State) error { return terminateFakeSideProject() @@ -162,7 +162,7 @@ func TestAccPolicy_ChangeLinkedEntity(t *testing.T) { randGroupName := "tf-tests-scaleway-iam-group-policy-permissions" resource.ParallelTest(t, resource.TestCase{ - ProviderFactories: acctest.FakeSideProjectProviders(ctx, tt, project, iamAPIKey), + ProtoV5ProviderFactories: acctest.FakeSideProjectProviders(ctx, tt, project, iamAPIKey), CheckDestroy: resource.ComposeAggregateTestCheckFunc( func(_ *terraform.State) error { return terminateFakeSideProject() @@ -265,7 +265,7 @@ func TestAccPolicy_ChangePermissions(t *testing.T) { require.NoError(t, err) resource.ParallelTest(t, resource.TestCase{ - ProviderFactories: acctest.FakeSideProjectProviders(ctx, tt, project, iamAPIKey), + ProtoV5ProviderFactories: acctest.FakeSideProjectProviders(ctx, tt, project, iamAPIKey), CheckDestroy: resource.ComposeAggregateTestCheckFunc( func(_ *terraform.State) error { return terminateFakeSideProject() @@ -356,7 +356,7 @@ func TestAccPolicy_ProjectID(t *testing.T) { require.NoError(t, err) resource.ParallelTest(t, resource.TestCase{ - ProviderFactories: acctest.FakeSideProjectProviders(ctx, tt, project, iamAPIKey), + ProtoV5ProviderFactories: acctest.FakeSideProjectProviders(ctx, tt, project, iamAPIKey), CheckDestroy: resource.ComposeAggregateTestCheckFunc( func(_ *terraform.State) error { return terminateFakeSideProject() @@ -422,7 +422,7 @@ func TestAccPolicy_Condition(t *testing.T) { require.NoError(t, err) resource.ParallelTest(t, resource.TestCase{ - ProviderFactories: acctest.FakeSideProjectProviders(ctx, tt, project, iamAPIKey), + ProtoV5ProviderFactories: acctest.FakeSideProjectProviders(ctx, tt, project, iamAPIKey), CheckDestroy: resource.ComposeAggregateTestCheckFunc( func(_ *terraform.State) error { return terminateFakeSideProject() @@ -517,7 +517,7 @@ func TestAccPolicy_ChangeRulePrincipal(t *testing.T) { require.NoError(t, err) resource.ParallelTest(t, resource.TestCase{ - ProviderFactories: acctest.FakeSideProjectProviders(ctx, tt, project, iamAPIKey), + ProtoV5ProviderFactories: acctest.FakeSideProjectProviders(ctx, tt, project, iamAPIKey), CheckDestroy: resource.ComposeAggregateTestCheckFunc( func(_ *terraform.State) error { return terminateFakeSideProject() diff --git a/internal/services/iam/ssh_key_account_data_source_test.go b/internal/services/iam/ssh_key_account_data_source_test.go index d782973d2d..2eb6b52252 100644 --- a/internal/services/iam/ssh_key_account_data_source_test.go +++ b/internal/services/iam/ssh_key_account_data_source_test.go @@ -18,9 +18,9 @@ func TestAccDataSourceAccountSSHKey_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: iamchecks.CheckSSHKeyDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: iamchecks.CheckSSHKeyDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/iam/ssh_key_account_test.go b/internal/services/iam/ssh_key_account_test.go index a2c5373689..3a285f9842 100644 --- a/internal/services/iam/ssh_key_account_test.go +++ b/internal/services/iam/ssh_key_account_test.go @@ -18,9 +18,9 @@ func TestAccSSHKeyAccount_basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: iamchecks.CheckSSHKeyDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: iamchecks.CheckSSHKeyDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -61,9 +61,9 @@ func TestAccSSHKeyAccount_WithNewLine(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: iamchecks.CheckSSHKeyDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: iamchecks.CheckSSHKeyDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -91,9 +91,9 @@ func TestAccSSHKeyAccount_ChangeResourceName(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: iamchecks.CheckSSHKeyDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: iamchecks.CheckSSHKeyDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/iam/ssh_key_data_source_test.go b/internal/services/iam/ssh_key_data_source_test.go index 34ffe0ce65..dee2960fde 100644 --- a/internal/services/iam/ssh_key_data_source_test.go +++ b/internal/services/iam/ssh_key_data_source_test.go @@ -18,9 +18,9 @@ func TestAccDataSourceSSHKey_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: iamchecks.CheckSSHKeyDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: iamchecks.CheckSSHKeyDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/iam/ssh_key_test.go b/internal/services/iam/ssh_key_test.go index ded0f9d18d..84091d0d47 100644 --- a/internal/services/iam/ssh_key_test.go +++ b/internal/services/iam/ssh_key_test.go @@ -21,9 +21,9 @@ func TestAccSSHKey_basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: iamchecks.CheckSSHKeyDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: iamchecks.CheckSSHKeyDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -62,9 +62,9 @@ func TestAccSSHKey_WithNewLine(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: iamchecks.CheckSSHKeyDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: iamchecks.CheckSSHKeyDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -90,9 +90,9 @@ func TestAccSSHKey_ChangeResourceName(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: iamchecks.CheckSSHKeyDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: iamchecks.CheckSSHKeyDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -131,9 +131,9 @@ func TestAccSSHKey_Disabled(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: iamchecks.CheckSSHKeyDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: iamchecks.CheckSSHKeyDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/iam/user_data_source_test.go b/internal/services/iam/user_data_source_test.go index a64e94a955..98ce3305ef 100644 --- a/internal/services/iam/user_data_source_test.go +++ b/internal/services/iam/user_data_source_test.go @@ -16,8 +16,8 @@ func TestAccDataSourceUser_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/iam/user_test.go b/internal/services/iam/user_test.go index 22fa908114..f63d9ad97b 100644 --- a/internal/services/iam/user_test.go +++ b/internal/services/iam/user_test.go @@ -17,8 +17,8 @@ func TestAccUser_Member(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isUserDestroyed(tt), + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isUserDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/inference/deployment_test.go b/internal/services/inference/deployment_test.go index f16a01f8db..4551c5d9c7 100644 --- a/internal/services/inference/deployment_test.go +++ b/internal/services/inference/deployment_test.go @@ -22,9 +22,9 @@ func TestAccDeployment_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: inferencetestfuncs.IsDeploymentDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: inferencetestfuncs.IsDeploymentDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -57,9 +57,9 @@ func TestAccDeployment_Endpoint(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: inferencetestfuncs.IsDeploymentDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: inferencetestfuncs.IsDeploymentDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/inference/model_data_source_test.go b/internal/services/inference/model_data_source_test.go index 8c292a103e..237ceef9af 100644 --- a/internal/services/inference/model_data_source_test.go +++ b/internal/services/inference/model_data_source_test.go @@ -15,8 +15,8 @@ func TestAccDataSourceModel_Basic(t *testing.T) { modelName := "mistral/pixtral-12b-2409:bf16" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -41,9 +41,9 @@ func TestAccDataSourceModel_Custom(t *testing.T) { modelName := "TestAccDataSourceModel_Custom" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: inferencetestfuncs.IsModelDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: inferencetestfuncs.IsModelDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/inference/model_test.go b/internal/services/inference/model_test.go index c5f4204180..a329ebea1d 100644 --- a/internal/services/inference/model_test.go +++ b/internal/services/inference/model_test.go @@ -24,9 +24,9 @@ func TestAccModel_Basic(t *testing.T) { modelName := "TestAccModel_Basic" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: inferencetestfuncs.IsModelDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: inferencetestfuncs.IsModelDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -50,9 +50,9 @@ func TestAccModel_DeployModelOnServer(t *testing.T) { modelName := "TestAccModel_DeployModelOnServer" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: inferencetestfuncs.IsModelDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: inferencetestfuncs.IsModelDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/instance/data_source_instance_private_nic_test.go b/internal/services/instance/data_source_instance_private_nic_test.go index 6fd21fb9fb..8f4c4cb946 100644 --- a/internal/services/instance/data_source_instance_private_nic_test.go +++ b/internal/services/instance/data_source_instance_private_nic_test.go @@ -12,8 +12,8 @@ func TestAccDataSourcePrivateNIC_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( isPrivateNICDestroyed(tt), ), diff --git a/internal/services/instance/image_data_source_test.go b/internal/services/instance/image_data_source_test.go index d7b28a959f..9a21ba3222 100644 --- a/internal/services/instance/image_data_source_test.go +++ b/internal/services/instance/image_data_source_test.go @@ -13,8 +13,8 @@ func TestAccDataSourceImage_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/instance/image_test.go b/internal/services/instance/image_test.go index 8cbb82893d..ca8ce0f66b 100644 --- a/internal/services/instance/image_test.go +++ b/internal/services/instance/image_test.go @@ -22,8 +22,8 @@ func TestAccImage_BlockVolume(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( isImageDestroyed(tt), isSnapshotDestroyed(tt), @@ -119,8 +119,8 @@ func TestAccImage_ExternalBlockVolume(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( isImageDestroyed(tt), isSnapshotDestroyed(tt), @@ -217,8 +217,8 @@ func TestAccImage_Server(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( isImageDestroyed(tt), blocktestfuncs.IsSnapshotDestroyed(tt), @@ -293,8 +293,8 @@ func TestAccImage_ServerWithBlockVolume(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( isImageDestroyed(tt), isSnapshotDestroyed(tt), @@ -446,8 +446,8 @@ func TestAccImage_ServerWithLocalVolume(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( isImageDestroyed(tt), isSnapshotDestroyed(tt), @@ -577,8 +577,8 @@ func TestAccImage_ServerWithSBSVolume(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( isImageDestroyed(tt), blocktestfuncs.IsSnapshotDestroyed(tt), diff --git a/internal/services/instance/ip_data_source_test.go b/internal/services/instance/ip_data_source_test.go index b2e3695bdb..02d656a288 100644 --- a/internal/services/instance/ip_data_source_test.go +++ b/internal/services/instance/ip_data_source_test.go @@ -13,9 +13,9 @@ func TestAccDataSourceIP_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsServerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { Config: `resource "scaleway_instance_ip" "ip" {}`, diff --git a/internal/services/instance/ip_reverse_dns_test.go b/internal/services/instance/ip_reverse_dns_test.go index 1accfaeba8..69913bf0c5 100644 --- a/internal/services/instance/ip_reverse_dns_test.go +++ b/internal/services/instance/ip_reverse_dns_test.go @@ -15,9 +15,9 @@ func TestAccIPReverseDns_Basic(t *testing.T) { testDNSZone := "tf-reverse-instance." + acctest.TestDomain resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsIPDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/instance/ip_test.go b/internal/services/instance/ip_test.go index cd9fc7e2eb..3adf54ca31 100644 --- a/internal/services/instance/ip_test.go +++ b/internal/services/instance/ip_test.go @@ -19,8 +19,8 @@ func TestAccIP_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsIPDestroyed(tt), + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -41,8 +41,8 @@ func TestAccIP_WithZone(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsIPDestroyed(tt), + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -73,8 +73,8 @@ func TestAccIP_Tags(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsIPDestroyed(tt), + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -106,8 +106,8 @@ func TestAccIP_RoutedIPV6(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsIPDestroyed(tt), + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/instance/placement_group_data_source_test.go b/internal/services/instance/placement_group_data_source_test.go index 0cebb2cebc..24db8e3f29 100644 --- a/internal/services/instance/placement_group_data_source_test.go +++ b/internal/services/instance/placement_group_data_source_test.go @@ -12,8 +12,8 @@ func TestAccDataSourcePlacementGroup_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( isPlacementGroupDestroyed(tt), ), diff --git a/internal/services/instance/placement_group_test.go b/internal/services/instance/placement_group_test.go index e32b3e73c4..5285dd5809 100644 --- a/internal/services/instance/placement_group_test.go +++ b/internal/services/instance/placement_group_test.go @@ -20,9 +20,9 @@ func TestAccPlacementGroup_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isPlacementGroupDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isPlacementGroupDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -67,9 +67,9 @@ func TestAccPlacementGroup_Rename(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isPlacementGroupDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isPlacementGroupDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -110,8 +110,8 @@ func TestAccPlacementGroup_Tags(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsIPDestroyed(tt), + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/instance/private_nic_test.go b/internal/services/instance/private_nic_test.go index ed78079f05..5d8ec361ee 100644 --- a/internal/services/instance/private_nic_test.go +++ b/internal/services/instance/private_nic_test.go @@ -20,9 +20,9 @@ func TestAccPrivateNIC_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isPrivateNICDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isPrivateNICDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -63,9 +63,9 @@ func TestAccPrivateNIC_Tags(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isPrivateNICDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isPrivateNICDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -167,9 +167,9 @@ func TestAccPrivateNIC_WithIPAM(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isPrivateNICDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isPrivateNICDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/instance/security_group_data_source_test.go b/internal/services/instance/security_group_data_source_test.go index c2c03e1b77..d30ce6af9a 100644 --- a/internal/services/instance/security_group_data_source_test.go +++ b/internal/services/instance/security_group_data_source_test.go @@ -14,9 +14,9 @@ func TestAccDataSourceSecurityGroup_Basic(t *testing.T) { securityGroupName := "tf-security-group" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isSecurityGroupDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isSecurityGroupDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/instance/security_group_rules_test.go b/internal/services/instance/security_group_rules_test.go index b1c8f0279a..ca4de27ce7 100644 --- a/internal/services/instance/security_group_rules_test.go +++ b/internal/services/instance/security_group_rules_test.go @@ -12,9 +12,9 @@ func TestAccSecurityGroupRules_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isSecurityGroupDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isSecurityGroupDestroyed(tt), Steps: []resource.TestStep{ { // Simple empty configuration @@ -182,9 +182,9 @@ func TestAccSecurityGroupRules_IPRanges(t *testing.T) { ` resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isSecurityGroupDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isSecurityGroupDestroyed(tt), Steps: []resource.TestStep{ { Config: config, @@ -242,9 +242,9 @@ func TestAccSecurityGroupRules_Basic2(t *testing.T) { ` resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isSecurityGroupDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isSecurityGroupDestroyed(tt), Steps: []resource.TestStep{ { Config: config, diff --git a/internal/services/instance/security_group_test.go b/internal/services/instance/security_group_test.go index e9b2020e78..e30da342b8 100644 --- a/internal/services/instance/security_group_test.go +++ b/internal/services/instance/security_group_test.go @@ -31,9 +31,9 @@ func TestAccSecurityGroup_Basic(t *testing.T) { ipnetTest, err := types.ExpandIPNet("8.8.8.8") require.NoError(t, err) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isSecurityGroupDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isSecurityGroupDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -181,9 +181,9 @@ func TestAccSecurityGroup_ICMP(t *testing.T) { ipnetTest, err := types.ExpandIPNet("8.8.8.8") require.NoError(t, err) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isSecurityGroupDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isSecurityGroupDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -246,9 +246,9 @@ func TestAccSecurityGroup_ANY(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isSecurityGroupDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isSecurityGroupDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -294,9 +294,9 @@ func TestAccSecurityGroup_WithNoPort(t *testing.T) { ipnetZero, err := types.ExpandIPNet("0.0.0.0/0") require.NoError(t, err) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isSecurityGroupDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isSecurityGroupDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -330,9 +330,9 @@ func TestAccSecurityGroup_RemovePort(t *testing.T) { ipnetZero, err := types.ExpandIPNet("0.0.0.0/0") require.NoError(t, err) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isSecurityGroupDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isSecurityGroupDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -388,9 +388,9 @@ func TestAccSecurityGroup_WithPortRange(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isSecurityGroupDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isSecurityGroupDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -446,9 +446,9 @@ func TestAccSecurityGroup_Tags(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isSecurityGroupDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isSecurityGroupDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -604,9 +604,9 @@ func TestAccSecurityGroup_EnableDefaultSecurity(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isSecurityGroupDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isSecurityGroupDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/instance/server_data_source_test.go b/internal/services/instance/server_data_source_test.go index 5363d0f38f..8f9cb6dc79 100644 --- a/internal/services/instance/server_data_source_test.go +++ b/internal/services/instance/server_data_source_test.go @@ -15,9 +15,9 @@ func TestAccDataSourceServer_Basic(t *testing.T) { serverName := "tf-server" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsServerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/instance/server_test.go b/internal/services/instance/server_test.go index 701149127d..5293d215e8 100644 --- a/internal/services/instance/server_test.go +++ b/internal/services/instance/server_test.go @@ -25,9 +25,9 @@ func TestAccServer_Minimal1(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsServerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -82,9 +82,9 @@ func TestAccServer_Minimal2(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsServerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -155,9 +155,9 @@ func TestAccServer_RootVolume1(t *testing.T) { serverID := "" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsServerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -206,9 +206,9 @@ func TestAccServer_RootVolume_Boot(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsServerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -257,9 +257,9 @@ func TestAccServer_RootVolume_ID(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsServerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -294,9 +294,9 @@ func TestAccServer_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsServerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { // DEV1-M @@ -356,9 +356,9 @@ func TestAccServer_State1(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsServerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { // started @@ -426,9 +426,9 @@ func TestAccServer_State2(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsServerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { // stopped @@ -477,9 +477,9 @@ func TestAccServer_UserData_WithCloudInitAtStart(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsServerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -511,9 +511,9 @@ func TestAccServer_UserData_WithoutCloudInitAtStart(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsServerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { // Without cloud-init @@ -565,9 +565,9 @@ func TestAccServer_AdditionalVolumes(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsServerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { // With additional local @@ -644,8 +644,8 @@ func TestAccServer_AdditionalVolumesDetach(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( instancechecks.IsVolumeDestroyed(tt), instancechecks.IsServerDestroyed(tt), @@ -712,9 +712,9 @@ func TestAccServer_WithPlacementGroup(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsServerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -753,9 +753,9 @@ func TestAccServer_Ipv6(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsServerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -798,9 +798,9 @@ func TestAccServer_Basic2(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsServerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -829,9 +829,9 @@ func TestAccServer_WithReservedIP(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsServerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -996,9 +996,9 @@ func TestAccServer_AlterTags(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsServerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -1040,9 +1040,9 @@ func TestAccServer_WithDefaultRootVolumeAndAdditionalVolume(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsServerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -1075,9 +1075,9 @@ func TestAccServer_ServerWithBlockNonDefaultZone(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsServerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -1112,9 +1112,9 @@ func TestAccServer_PrivateNetwork(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsServerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -1300,9 +1300,9 @@ func TestAccServer_Migrate(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsServerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -1349,9 +1349,9 @@ func TestAccServer_MigrateInvalidLocalVolumeSize(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsServerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -1392,9 +1392,9 @@ func TestAccServer_CustomDiffImage(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsServerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -1547,9 +1547,9 @@ func TestAccServer_IPs(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsServerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -1632,9 +1632,9 @@ func TestAccServer_IPRemoved(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsServerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -1679,9 +1679,9 @@ func TestAccServer_IPsRemoved(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsServerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -1729,9 +1729,9 @@ func TestAccServer_BlockExternal(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsServerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -1820,8 +1820,8 @@ func TestAccServer_BlockExternalRootVolume(t *testing.T) { serverID := "" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( instancechecks.IsServerDestroyed(tt), instancechecks.IsServerRootVolumeDestroyed(tt), @@ -1878,9 +1878,9 @@ func TestAccServer_BlockExternalRootVolumeUpdate(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsServerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -1931,9 +1931,9 @@ func TestAccServer_RootVolumeFromExternalSnapshot(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsServerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -2007,9 +2007,9 @@ func TestAccServer_PrivateNetworkMissingPNIC(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsServerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -2206,8 +2206,8 @@ func TestAccServer_AdminPasswordEncryptionSSHKeyID(t *testing.T) { sshKey := "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEEYrzDOZmhItdKaDAEqJQ4ORS2GyBMtBozYsK5kiXXX opensource@scaleway.com" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( instancechecks.IsServerDestroyed(tt), iamchecks.CheckSSHKeyDestroy(tt), diff --git a/internal/services/instance/server_type_data_source_test.go b/internal/services/instance/server_type_data_source_test.go index 43e5a0c3ea..aa54113e85 100644 --- a/internal/services/instance/server_type_data_source_test.go +++ b/internal/services/instance/server_type_data_source_test.go @@ -19,8 +19,8 @@ func TestAccDataSourceServerType_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, Steps: []resource.TestStep{ { Config: ` @@ -202,8 +202,8 @@ func TestAccDataSourceServerType_CompareWithPCU(t *testing.T) { } resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - Steps: steps, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + Steps: steps, }) } diff --git a/internal/services/instance/servers_data_source_test.go b/internal/services/instance/servers_data_source_test.go index fba22a4671..4ed3a590c5 100644 --- a/internal/services/instance/servers_data_source_test.go +++ b/internal/services/instance/servers_data_source_test.go @@ -13,9 +13,9 @@ func TestAccDataSourceServers_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsServerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -95,9 +95,9 @@ func TestAccDataSourceServers_PrivateIPs(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsServerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/instance/snapshot_data_source_test.go b/internal/services/instance/snapshot_data_source_test.go index 6f3e2c6ed9..12b8c96b63 100644 --- a/internal/services/instance/snapshot_data_source_test.go +++ b/internal/services/instance/snapshot_data_source_test.go @@ -18,8 +18,8 @@ func TestAccDataSourceSnapshot_Basic(t *testing.T) { snapshotName := "tf-snapshot-ds-basic" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( instancetestfuncs.IsVolumeDestroyed(tt), isSnapshotDestroyed(tt), diff --git a/internal/services/instance/snapshot_test.go b/internal/services/instance/snapshot_test.go index c098a27503..9749b0add3 100644 --- a/internal/services/instance/snapshot_test.go +++ b/internal/services/instance/snapshot_test.go @@ -20,9 +20,9 @@ func TestAccSnapshot_Server(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsVolumeDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsVolumeDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -51,8 +51,8 @@ func TestAccSnapshot_FromS3(t *testing.T) { bucketName := sdkacctest.RandomWithPrefix("test-acc-scaleway-instance-snapshot") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( isSnapshotDestroyed(tt), objectchecks.IsObjectDestroyed(tt), diff --git a/internal/services/instance/user_data_test.go b/internal/services/instance/user_data_test.go index 144ff56d34..a099b1010b 100644 --- a/internal/services/instance/user_data_test.go +++ b/internal/services/instance/user_data_test.go @@ -13,9 +13,9 @@ func TestAccServerUserData_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsServerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/instance/volume_data_source_test.go b/internal/services/instance/volume_data_source_test.go index 539a82d8c3..d9e0a8016f 100644 --- a/internal/services/instance/volume_data_source_test.go +++ b/internal/services/instance/volume_data_source_test.go @@ -15,9 +15,9 @@ func TestAccDataSourceVolume_Basic(t *testing.T) { volumeName := "tf-volume" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancetestfuncs.IsVolumeDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancetestfuncs.IsVolumeDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/instance/volume_test.go b/internal/services/instance/volume_test.go index d9b3443292..9df7d91073 100644 --- a/internal/services/instance/volume_test.go +++ b/internal/services/instance/volume_test.go @@ -14,9 +14,9 @@ func TestAccVolume_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancetestfuncs.IsVolumeDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancetestfuncs.IsVolumeDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -56,9 +56,9 @@ func TestAccVolume_DifferentNameGenerated(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancetestfuncs.IsVolumeDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancetestfuncs.IsVolumeDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -87,9 +87,9 @@ func TestAccVolume_ResizeBlock(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancetestfuncs.IsVolumeDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancetestfuncs.IsVolumeDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -122,9 +122,9 @@ func TestAccVolume_ResizeNotBlock(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancetestfuncs.IsVolumeDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancetestfuncs.IsVolumeDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -156,9 +156,9 @@ func TestAccVolume_CannotResizeBlockDown(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancetestfuncs.IsVolumeDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancetestfuncs.IsVolumeDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -184,9 +184,9 @@ func TestAccVolume_Scratch(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancetestfuncs.IsVolumeDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancetestfuncs.IsVolumeDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/iot/data_source_iot_device_test.go b/internal/services/iot/data_source_iot_device_test.go index d483614d55..a5e7b14d05 100644 --- a/internal/services/iot/data_source_iot_device_test.go +++ b/internal/services/iot/data_source_iot_device_test.go @@ -12,9 +12,9 @@ func TestAccDataSourceDevice_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isHubDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isHubDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/iot/data_source_iot_hub_test.go b/internal/services/iot/data_source_iot_hub_test.go index 3072529760..32dfccb28c 100644 --- a/internal/services/iot/data_source_iot_hub_test.go +++ b/internal/services/iot/data_source_iot_hub_test.go @@ -12,9 +12,9 @@ func TestAccDataSourceHub_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isHubDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isHubDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/iot/device_test.go b/internal/services/iot/device_test.go index b65e6d54dc..4bf982f84c 100644 --- a/internal/services/iot/device_test.go +++ b/internal/services/iot/device_test.go @@ -40,8 +40,8 @@ func TestAccDevice_Minimal(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, // Destruction is done via the hub destruction. CheckDestroy: isHubDestroyed(tt), Steps: []resource.TestStep{ @@ -76,8 +76,8 @@ func TestAccDevice_MessageFilters(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, // Destruction is done via the hub destruction. CheckDestroy: isHubDestroyed(tt), Steps: []resource.TestStep{ @@ -133,8 +133,8 @@ func TestAccDevice_AllowInsecure(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, // Destruction is done via the hub destruction. CheckDestroy: isHubDestroyed(tt), Steps: []resource.TestStep{ @@ -189,8 +189,8 @@ func TestAccDevice_Certificate(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, // Destruction is done via the hub destruction. CheckDestroy: isHubDestroyed(tt), Steps: []resource.TestStep{ diff --git a/internal/services/iot/hub_test.go b/internal/services/iot/hub_test.go index af195ffc29..17aeac8e68 100644 --- a/internal/services/iot/hub_test.go +++ b/internal/services/iot/hub_test.go @@ -22,9 +22,9 @@ func TestAccHub_Minimal(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isHubDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isHubDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -72,9 +72,9 @@ func TestAccHub_Dedicated(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isHubDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isHubDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/iot/network_test.go b/internal/services/iot/network_test.go index 3a9cdea88b..4e13f0175f 100644 --- a/internal/services/iot/network_test.go +++ b/internal/services/iot/network_test.go @@ -16,8 +16,8 @@ func TestAccNetwork_Minimal(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, // Destruction is done via the hub destruction. CheckDestroy: isHubDestroyed(tt), Steps: []resource.TestStep{ @@ -55,8 +55,8 @@ func TestAccNetwork_RESTWithTopicPrefix(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, // Destruction is done via the hub destruction. CheckDestroy: isHubDestroyed(tt), Steps: []resource.TestStep{ @@ -96,8 +96,8 @@ func TestAccNetwork_Sigfox(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, // Destruction is done via the hub destruction. CheckDestroy: isHubDestroyed(tt), Steps: []resource.TestStep{ diff --git a/internal/services/iot/routes_test.go b/internal/services/iot/routes_test.go index 31d74d5062..e50b9db635 100644 --- a/internal/services/iot/routes_test.go +++ b/internal/services/iot/routes_test.go @@ -23,8 +23,8 @@ func TestAccRoute_RDB(t *testing.T) { latestEngineVersion := rdbchecks.GetLatestEngineVersion(tt, postgreSQLEngineName) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, // Destruction is done via the hub destruction. CheckDestroy: resource.ComposeTestCheckFunc( isHubDestroyed(tt), @@ -91,8 +91,8 @@ func TestAccRoute_S3(t *testing.T) { bucketName := sdkacctest.RandomWithPrefix("tf-tests-scaleway-iot-route-s3") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, // Destruction is done via the hub destruction. CheckDestroy: resource.ComposeAggregateTestCheckFunc( isHubDestroyed(tt), @@ -152,8 +152,8 @@ func TestAccRoute_REST(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, // Destruction is done via the hub destruction. CheckDestroy: isHubDestroyed(tt), Steps: []resource.TestStep{ diff --git a/internal/services/ipam/ip_data_source_test.go b/internal/services/ipam/ip_data_source_test.go index 602a3243df..e4f3b5e6bc 100644 --- a/internal/services/ipam/ip_data_source_test.go +++ b/internal/services/ipam/ip_data_source_test.go @@ -16,9 +16,9 @@ func TestAccDataSourceIPAMIP_Instance(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsServerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -70,9 +70,9 @@ func TestAccDataSourceIPAMIP_InstanceLB(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsServerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -130,9 +130,9 @@ func TestAccDataSourceIPAMIP_RDB(t *testing.T) { latestEngineVersion := rdbchecks.GetLatestEngineVersion(tt, "PostgreSQL") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -186,9 +186,9 @@ func TestAccDataSourceIPAMIP_ID(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: ipamchecks.CheckIPDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: ipamchecks.CheckIPDestroy(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/ipam/ip_reverse_dns_test.go b/internal/services/ipam/ip_reverse_dns_test.go index 7913d536e2..d843456b7c 100644 --- a/internal/services/ipam/ip_reverse_dns_test.go +++ b/internal/services/ipam/ip_reverse_dns_test.go @@ -17,9 +17,9 @@ func TestAccIPAMIPReverseDNS_Basic(t *testing.T) { testDNSZone := "tf-reverse-ipam." + acctest.TestDomain resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsIPDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/ipam/ip_test.go b/internal/services/ipam/ip_test.go index d516896efb..da496de4a4 100644 --- a/internal/services/ipam/ip_test.go +++ b/internal/services/ipam/ip_test.go @@ -17,9 +17,9 @@ func TestAccIPAMIP_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: ipamchecks.CheckIPDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: ipamchecks.CheckIPDestroy(tt), Steps: []resource.TestStep{ { Config: ` @@ -59,9 +59,9 @@ func TestAccIPAMIP_WithStandaloneAddress(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: ipamchecks.CheckIPDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: ipamchecks.CheckIPDestroy(tt), Steps: []resource.TestStep{ { Config: ` @@ -97,9 +97,9 @@ func TestAccIPAMIP_WithTags(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: ipamchecks.CheckIPDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: ipamchecks.CheckIPDestroy(tt), Steps: []resource.TestStep{ { Config: ` @@ -165,9 +165,9 @@ func TestAccIPAMIP_WithCustomResource(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: ipamchecks.CheckIPDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: ipamchecks.CheckIPDestroy(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/ipam/ips_data_source_test.go b/internal/services/ipam/ips_data_source_test.go index ab64538f93..bd4d3d79d1 100644 --- a/internal/services/ipam/ips_data_source_test.go +++ b/internal/services/ipam/ips_data_source_test.go @@ -13,9 +13,9 @@ func TestAccDataSourceIPAMIPs_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: ipamchecks.CheckIPDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: ipamchecks.CheckIPDestroy(tt), Steps: []resource.TestStep{ { Config: ` @@ -99,9 +99,9 @@ func TestAccDataSourceIPAMIPs_RedisCluster(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: ipamchecks.CheckIPDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: ipamchecks.CheckIPDestroy(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/jobs/jobs_test.go b/internal/services/jobs/jobs_test.go index 43877deea8..05130bd8db 100644 --- a/internal/services/jobs/jobs_test.go +++ b/internal/services/jobs/jobs_test.go @@ -22,9 +22,9 @@ func TestAccJobDefinition_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckJobDefinitionDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckJobDefinitionDestroy(tt), Steps: []resource.TestStep{ { Config: ` @@ -50,9 +50,9 @@ func TestAccJobDefinition_Timeout(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckJobDefinitionDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckJobDefinitionDestroy(tt), Steps: []resource.TestStep{ { Config: ` @@ -97,9 +97,9 @@ func TestAccJobDefinition_Cron(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckJobDefinitionDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckJobDefinitionDestroy(tt), Steps: []resource.TestStep{ { Config: ` @@ -170,9 +170,9 @@ func TestAccJobDefinition_SecretReference(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckJobDefinitionDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckJobDefinitionDestroy(tt), Steps: []resource.TestStep{ { Config: ` @@ -289,9 +289,9 @@ func TestAccJobDefinition_WrongSecretReference(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckJobDefinitionDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckJobDefinitionDestroy(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/k8s/acl_test.go b/internal/services/k8s/acl_test.go index c81ee37b80..1e3eb1ccd4 100644 --- a/internal/services/k8s/acl_test.go +++ b/internal/services/k8s/acl_test.go @@ -19,9 +19,9 @@ func TestAccACL_Basic(t *testing.T) { latestK8sVersion := testAccK8SClusterGetLatestK8SVersion(tt) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckK8SClusterDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckK8SClusterDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -213,9 +213,9 @@ func TestAccACL_RulesOrder(t *testing.T) { latestK8sVersion := testAccK8SClusterGetLatestK8SVersion(tt) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckK8SClusterDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckK8SClusterDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/k8s/cluster_data_source_test.go b/internal/services/k8s/cluster_data_source_test.go index 7ce4f49ff7..c9689ce481 100644 --- a/internal/services/k8s/cluster_data_source_test.go +++ b/internal/services/k8s/cluster_data_source_test.go @@ -16,8 +16,8 @@ func TestAccDataSourceCluster_Basic(t *testing.T) { clusterName := "tf-cluster-basic" version := testAccK8SClusterGetLatestK8SVersion(tt) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckK8SPoolDestroy(tt, "scaleway_k8s_pool.default"), testAccCheckK8SClusterDestroy(tt), diff --git a/internal/services/k8s/cluster_test.go b/internal/services/k8s/cluster_test.go index 32a8e0b2cb..0d384fa647 100644 --- a/internal/services/k8s/cluster_test.go +++ b/internal/services/k8s/cluster_test.go @@ -101,7 +101,7 @@ func TestAccCluster_Basic(t *testing.T) { PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckK8SClusterDestroy(tt), vpcchecks.CheckPrivateNetworkDestroy(tt), @@ -194,7 +194,7 @@ func TestAccCluster_Autoscaling(t *testing.T) { PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckK8SClusterDestroy(tt), vpcchecks.CheckPrivateNetworkDestroy(tt), @@ -270,7 +270,7 @@ func TestAccCluster_OIDC(t *testing.T) { PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckK8SClusterDestroy(tt), vpcchecks.CheckPrivateNetworkDestroy(tt), @@ -340,7 +340,7 @@ func TestAccCluster_AutoUpgrade(t *testing.T) { PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckK8SClusterDestroy(tt), vpcchecks.CheckPrivateNetworkDestroy(tt), @@ -422,7 +422,7 @@ func TestAccCluster_PrivateNetwork(t *testing.T) { PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckK8SClusterDestroy(tt), vpcchecks.CheckPrivateNetworkDestroy(tt), @@ -461,8 +461,8 @@ func TestAccCluster_Multicloud(t *testing.T) { PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckK8SClusterDestroy(tt), + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckK8SClusterDestroy(tt), Steps: []resource.TestStep{ { Config: testAccCheckK8SClusterMulticloud(latestK8SVersion), @@ -487,7 +487,7 @@ func TestAccCluster_TypeChange(t *testing.T) { PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckK8SClusterDestroy(tt), vpcchecks.CheckPrivateNetworkDestroy(tt), diff --git a/internal/services/k8s/k8s_version_data_source_test.go b/internal/services/k8s/k8s_version_data_source_test.go index e467cfeede..c0d92039ff 100644 --- a/internal/services/k8s/k8s_version_data_source_test.go +++ b/internal/services/k8s/k8s_version_data_source_test.go @@ -16,9 +16,9 @@ func TestAccDataSourceVersion_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckK8SClusterDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckK8SClusterDestroy(tt), Steps: []resource.TestStep{ { Config: ` @@ -54,9 +54,9 @@ func TestAccDataSourceVersion_Latest(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckK8SClusterDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckK8SClusterDestroy(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/k8s/pool_data_source_test.go b/internal/services/k8s/pool_data_source_test.go index a4f0ef24a1..16f8f1f8d0 100644 --- a/internal/services/k8s/pool_data_source_test.go +++ b/internal/services/k8s/pool_data_source_test.go @@ -17,8 +17,8 @@ func TestAccDataSourcePool_Basic(t *testing.T) { poolName := "tf-pool" version := testAccK8SClusterGetLatestK8SVersion(tt) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckK8SPoolDestroy(tt, "scaleway_k8s_pool.default"), testAccCheckK8SClusterDestroy(tt), diff --git a/internal/services/k8s/pool_test.go b/internal/services/k8s/pool_test.go index eb4fece2fa..8058a18b52 100644 --- a/internal/services/k8s/pool_test.go +++ b/internal/services/k8s/pool_test.go @@ -28,8 +28,8 @@ func TestAccPool_Basic(t *testing.T) { latestK8SVersion := testAccK8SClusterGetLatestK8SVersion(tt) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckK8SPoolDestroy(tt, "scaleway_k8s_pool.default"), testAccCheckK8SPoolDestroy(tt, "scaleway_k8s_pool.minimal"), @@ -101,8 +101,8 @@ func TestAccPool_Wait(t *testing.T) { latestK8SVersion := testAccK8SClusterGetLatestK8SVersion(tt) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckK8SPoolDestroy(tt, "scaleway_k8s_pool.default"), testAccCheckK8SPoolDestroy(tt, "scaleway_k8s_pool.minimal"), @@ -182,8 +182,8 @@ func TestAccPool_PlacementGroup(t *testing.T) { latestK8SVersion := testAccK8SClusterGetLatestK8SVersion(tt) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckK8SPoolDestroy(tt, "scaleway_k8s_pool.placement_group"), testAccCheckK8SPoolDestroy(tt, "scaleway_k8s_pool.placement_group_2"), @@ -239,8 +239,8 @@ func TestAccPool_UpgradePolicy(t *testing.T) { latestK8SVersion := testAccK8SClusterGetLatestK8SVersion(tt) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckK8SPoolDestroy(tt, "scaleway_k8s_pool.upgrade_policy"), testAccCheckK8SClusterDestroy(tt), @@ -294,8 +294,8 @@ func TestAccPool_KubeletArgs(t *testing.T) { latestK8SVersion := testAccK8SClusterGetLatestK8SVersion(tt) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckK8SPoolDestroy(tt, "scaleway_k8s_pool.kubelet_args"), testAccCheckK8SClusterDestroy(tt), @@ -333,8 +333,8 @@ func TestAccPool_Zone(t *testing.T) { latestK8SVersion := testAccK8SClusterGetLatestK8SVersion(tt) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckK8SPoolDestroy(tt, "scaleway_k8s_pool.zone"), testAccCheckK8SClusterDestroy(tt), @@ -362,8 +362,8 @@ func TestAccPool_Size(t *testing.T) { latestK8SVersionMinor := testAccK8SClusterGetLatestK8SVersionMinor(tt) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckK8SPoolDestroy(tt, "scaleway_k8s_pool.pool"), testAccCheckK8SClusterDestroy(tt), @@ -447,8 +447,8 @@ func TestAccPool_PublicIPDisabled(t *testing.T) { latestK8SVersion := testAccK8SClusterGetLatestK8SVersion(tt) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckK8SPoolDestroy(tt, "scaleway_k8s_pool.public_ip"), testAccCheckK8SClusterDestroy(tt), diff --git a/internal/services/keymanager/key_resource_test.go b/internal/services/keymanager/key_resource_test.go index f61504b369..dcdc24f14b 100644 --- a/internal/services/keymanager/key_resource_test.go +++ b/internal/services/keymanager/key_resource_test.go @@ -17,9 +17,9 @@ func TestAccKeyManagerKey_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: IsKeyManagerKeyDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: IsKeyManagerKeyDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -50,9 +50,9 @@ func TestAccKeyManagerKey_Update(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: IsKeyManagerKeyDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: IsKeyManagerKeyDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -129,9 +129,9 @@ func TestAccKeyManagerKey_WithRotationPolicy(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: IsKeyManagerKeyDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: IsKeyManagerKeyDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/lb/acl_test.go b/internal/services/lb/acl_test.go index d36fa4342e..2fc5c76867 100644 --- a/internal/services/lb/acl_test.go +++ b/internal/services/lb/acl_test.go @@ -17,9 +17,9 @@ func TestAccAcl_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isACLDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isACLDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/lb/acls_data_source_test.go b/internal/services/lb/acls_data_source_test.go index df407d7823..bf784ac282 100644 --- a/internal/services/lb/acls_data_source_test.go +++ b/internal/services/lb/acls_data_source_test.go @@ -12,9 +12,9 @@ func TestAccDataSourceACLs_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isLbDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isLbDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/lb/backend_data_source_test.go b/internal/services/lb/backend_data_source_test.go index 578fbe53d4..9e9eab3f68 100644 --- a/internal/services/lb/backend_data_source_test.go +++ b/internal/services/lb/backend_data_source_test.go @@ -13,9 +13,9 @@ func TestAccDataSourceBackend_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: lbchecks.IsIPDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: lbchecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/lb/backend_test.go b/internal/services/lb/backend_test.go index c0d2330c85..6172e9d139 100644 --- a/internal/services/lb/backend_test.go +++ b/internal/services/lb/backend_test.go @@ -19,9 +19,9 @@ func TestAccBackend_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isBackendDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isBackendDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -137,9 +137,9 @@ func TestAccBackend_HealthCheck(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isBackendDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isBackendDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -243,8 +243,8 @@ func TestAccBackend_WithFailoverHost(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( isBackendDestroyed(tt), objectchecks.IsObjectDestroyed(tt), @@ -390,9 +390,9 @@ func TestAccBackend_HealthCheck_Port(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isBackendDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isBackendDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/lb/backends_data_source_test.go b/internal/services/lb/backends_data_source_test.go index 80a39b6e43..0091d4c91e 100644 --- a/internal/services/lb/backends_data_source_test.go +++ b/internal/services/lb/backends_data_source_test.go @@ -12,9 +12,9 @@ func TestAccDataSourceBackends_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isLbDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isLbDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/lb/certificate_data_source_test.go b/internal/services/lb/certificate_data_source_test.go index 2747c6cec7..a208b8e9a9 100644 --- a/internal/services/lb/certificate_data_source_test.go +++ b/internal/services/lb/certificate_data_source_test.go @@ -13,9 +13,9 @@ func TestAccDataSourceCertificate_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: lbchecks.IsIPDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: lbchecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/lb/certificate_test.go b/internal/services/lb/certificate_test.go index 64a3ff12f3..7e1f3553fe 100644 --- a/internal/services/lb/certificate_test.go +++ b/internal/services/lb/certificate_test.go @@ -25,8 +25,8 @@ func TestAccCertificate_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( isLbDestroyed(tt), lbchecks.IsIPDestroyed(tt), diff --git a/internal/services/lb/data_source_lb_frontends_test.go b/internal/services/lb/data_source_lb_frontends_test.go index 92b5ee5e66..9f31c8384b 100644 --- a/internal/services/lb/data_source_lb_frontends_test.go +++ b/internal/services/lb/data_source_lb_frontends_test.go @@ -12,9 +12,9 @@ func TestAccDataSourceFrontends_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isLbDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isLbDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/lb/data_source_lb_ip_test.go b/internal/services/lb/data_source_lb_ip_test.go index b01358936f..74593f5ec0 100644 --- a/internal/services/lb/data_source_lb_ip_test.go +++ b/internal/services/lb/data_source_lb_ip_test.go @@ -13,9 +13,9 @@ func TestAccDataSourceIP_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: lbchecks.IsIPDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: lbchecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/lb/frontend_data_source_test.go b/internal/services/lb/frontend_data_source_test.go index 7c745d5e93..0736a76737 100644 --- a/internal/services/lb/frontend_data_source_test.go +++ b/internal/services/lb/frontend_data_source_test.go @@ -13,9 +13,9 @@ func TestAccDataSourceFrontend_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: lbchecks.IsIPDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: lbchecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/lb/frontend_test.go b/internal/services/lb/frontend_test.go index 77d5003ff6..6afb9240af 100644 --- a/internal/services/lb/frontend_test.go +++ b/internal/services/lb/frontend_test.go @@ -22,9 +22,9 @@ func TestAccFrontend_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isFrontendDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isFrontendDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -108,9 +108,9 @@ func TestAccFrontend_Certificate(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isFrontendDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isFrontendDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -251,9 +251,9 @@ func TestAccFrontend_ACLBasic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isFrontendDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isFrontendDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -464,9 +464,9 @@ func TestAccFrontend_ACLRedirectAction(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isFrontendDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isFrontendDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/lb/ip_test.go b/internal/services/lb/ip_test.go index d677ada58f..bffe6f6ecb 100644 --- a/internal/services/lb/ip_test.go +++ b/internal/services/lb/ip_test.go @@ -17,9 +17,9 @@ func TestAccIP_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: lbchecks.IsIPDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: lbchecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -85,9 +85,9 @@ func TestAccIP_IPv6(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: lbchecks.IsIPDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: lbchecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -110,9 +110,9 @@ func TestAccIP_WithTags(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: lbchecks.IsIPDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: lbchecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/lb/ips_data_source_test.go b/internal/services/lb/ips_data_source_test.go index 011ed5ad12..cc5fd99397 100644 --- a/internal/services/lb/ips_data_source_test.go +++ b/internal/services/lb/ips_data_source_test.go @@ -13,9 +13,9 @@ func TestAccDataSourceIPs_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: lbchecks.IsIPDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: lbchecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -58,9 +58,9 @@ func TestAccDataSourceIPs_WithType(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: lbchecks.IsIPDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: lbchecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -119,9 +119,9 @@ func TestAccDataSourceIPs_WithTags(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: lbchecks.IsIPDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: lbchecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/lb/lb_data_source_test.go b/internal/services/lb/lb_data_source_test.go index 7e2a6358e9..6dd526e889 100644 --- a/internal/services/lb/lb_data_source_test.go +++ b/internal/services/lb/lb_data_source_test.go @@ -13,9 +13,9 @@ func TestAccDataSourceLb_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: lbchecks.IsIPDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: lbchecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/lb/lb_test.go b/internal/services/lb/lb_test.go index cad9f97dc4..dfe9c5d390 100644 --- a/internal/services/lb/lb_test.go +++ b/internal/services/lb/lb_test.go @@ -21,9 +21,9 @@ func TestAccLB_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isLbDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isLbDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -80,9 +80,9 @@ func TestAccLB_Private(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isLbDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isLbDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -136,9 +136,9 @@ func TestAccLB_AssignedIPs(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isLbDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isLbDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -168,9 +168,9 @@ func TestAccLB_WithIPv6(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isLbDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isLbDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -208,9 +208,9 @@ func TestAccLB_UpdateToIPv6(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isLbDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isLbDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -257,9 +257,9 @@ func TestAccLB_Migrate(t *testing.T) { lbID := "" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isLbDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isLbDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -370,8 +370,8 @@ func TestAccLB_WithPrivateNetworksIPAMIDs(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( isLbDestroyed(tt), vpcchecks.CheckPrivateNetworkDestroy(tt), @@ -439,9 +439,9 @@ func TestAccLB_WithoutPNConfig(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isLbDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isLbDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -481,9 +481,9 @@ func TestAccLB_DifferentLocalityIPID(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isLbDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isLbDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/lb/lbs_data_source_test.go b/internal/services/lb/lbs_data_source_test.go index 444c692f46..44426ba950 100644 --- a/internal/services/lb/lbs_data_source_test.go +++ b/internal/services/lb/lbs_data_source_test.go @@ -12,9 +12,9 @@ func TestAccDataSourceLbs_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isLbDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isLbDestroyed(tt), Steps: []resource.TestStep{ { // Create one IP first because its POST request cannot be matched correctly diff --git a/internal/services/lb/route_data_source_test.go b/internal/services/lb/route_data_source_test.go index 68a13b7aca..70c2167f30 100644 --- a/internal/services/lb/route_data_source_test.go +++ b/internal/services/lb/route_data_source_test.go @@ -13,8 +13,8 @@ func TestAccDataSourceRoute_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( lbchecks.IsIPDestroyed(tt), isLbDestroyed(tt), diff --git a/internal/services/lb/route_test.go b/internal/services/lb/route_test.go index 2de3070c61..690e0feb1e 100644 --- a/internal/services/lb/route_test.go +++ b/internal/services/lb/route_test.go @@ -17,9 +17,9 @@ func TestAccRoute_WithSNI(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isRouteDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isRouteDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -97,9 +97,9 @@ func TestAccRoute_WithHostHeader(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isRouteDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isRouteDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -142,9 +142,9 @@ func TestAccRoute_WithPathBegin(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isRouteDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isRouteDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/lb/routes_data_source_test.go b/internal/services/lb/routes_data_source_test.go index fd92c6f1e8..32f6cf93d3 100644 --- a/internal/services/lb/routes_data_source_test.go +++ b/internal/services/lb/routes_data_source_test.go @@ -12,9 +12,9 @@ func TestAccDataSourceRoutes_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isLbDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isLbDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/marketplace/image_data_source_test.go b/internal/services/marketplace/image_data_source_test.go index f0f0388068..6122c83db4 100644 --- a/internal/services/marketplace/image_data_source_test.go +++ b/internal/services/marketplace/image_data_source_test.go @@ -13,8 +13,8 @@ func TestAccDataSourceMarketplaceImage_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, Steps: []resource.TestStep{ { Config: ` @@ -37,8 +37,8 @@ func TestAccDataSourceMarketplaceImage_SBS(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/mnq/nats_account_test.go b/internal/services/mnq/nats_account_test.go index 1a87da4c6a..b243b23199 100644 --- a/internal/services/mnq/nats_account_test.go +++ b/internal/services/mnq/nats_account_test.go @@ -17,9 +17,9 @@ func TestAccNatsAccount_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isNatsAccountDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isNatsAccountDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/mnq/nats_credentials_test.go b/internal/services/mnq/nats_credentials_test.go index 97ebfbc0fa..77bb7b5d51 100644 --- a/internal/services/mnq/nats_credentials_test.go +++ b/internal/services/mnq/nats_credentials_test.go @@ -17,9 +17,9 @@ func TestAccNatsCredentials_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isNatsCredentialsDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isNatsCredentialsDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -50,9 +50,9 @@ func TestAccNatsCredentials_UpdateName(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isNatsCredentialsDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isNatsCredentialsDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/mnq/sns_credentials_test.go b/internal/services/mnq/sns_credentials_test.go index b444cb4a96..7d27d07d1f 100644 --- a/internal/services/mnq/sns_credentials_test.go +++ b/internal/services/mnq/sns_credentials_test.go @@ -17,9 +17,9 @@ func TestAccSNSCredentials_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isSNSCredentialsDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isSNSCredentialsDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/mnq/sns_data_source_test.go b/internal/services/mnq/sns_data_source_test.go index f02fef98d9..90bf69553f 100644 --- a/internal/services/mnq/sns_data_source_test.go +++ b/internal/services/mnq/sns_data_source_test.go @@ -12,8 +12,8 @@ func TestAccDataSourceSNS_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( isSNSDestroyed(tt), ), diff --git a/internal/services/mnq/sns_test.go b/internal/services/mnq/sns_test.go index 0514f70cda..5858c9d4bc 100644 --- a/internal/services/mnq/sns_test.go +++ b/internal/services/mnq/sns_test.go @@ -17,9 +17,9 @@ func TestAccSNS_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isSNSDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isSNSDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/mnq/sns_topic_subscription_test.go b/internal/services/mnq/sns_topic_subscription_test.go index 64248acd1d..5a7dcdf0be 100644 --- a/internal/services/mnq/sns_topic_subscription_test.go +++ b/internal/services/mnq/sns_topic_subscription_test.go @@ -21,9 +21,9 @@ func TestAccSNSTopicSubscription_Basic(t *testing.T) { ctx := t.Context() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isSNSTopicSubscriptionDestroyed(ctx, tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isSNSTopicSubscriptionDestroyed(ctx, tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/mnq/sns_topic_test.go b/internal/services/mnq/sns_topic_test.go index a1dd9e83ea..7d9f4486b5 100644 --- a/internal/services/mnq/sns_topic_test.go +++ b/internal/services/mnq/sns_topic_test.go @@ -23,9 +23,9 @@ func TestAccSNSTopic_Basic(t *testing.T) { ctx := t.Context() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isSNSTopicDestroyed(ctx, tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isSNSTopicDestroyed(ctx, tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/mnq/sqs_credentials_test.go b/internal/services/mnq/sqs_credentials_test.go index fba48c90a1..0e6f8e2cdf 100644 --- a/internal/services/mnq/sqs_credentials_test.go +++ b/internal/services/mnq/sqs_credentials_test.go @@ -17,9 +17,9 @@ func TestAccSQSCredentials_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isSQSCredentialsDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isSQSCredentialsDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/mnq/sqs_data_source_test.go b/internal/services/mnq/sqs_data_source_test.go index 0dff84d7e8..f6da699f21 100644 --- a/internal/services/mnq/sqs_data_source_test.go +++ b/internal/services/mnq/sqs_data_source_test.go @@ -12,8 +12,8 @@ func TestAccDataSourceSQS_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( isSQSDestroyed(tt), ), diff --git a/internal/services/mnq/sqs_queue_test.go b/internal/services/mnq/sqs_queue_test.go index c7d27fd6c1..5497d6c003 100644 --- a/internal/services/mnq/sqs_queue_test.go +++ b/internal/services/mnq/sqs_queue_test.go @@ -29,9 +29,9 @@ func TestAccSQSQueue_Basic(t *testing.T) { ctx := t.Context() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isSQSQueueDestroyed(ctx, tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isSQSQueueDestroyed(ctx, tt), Steps: []resource.TestStep{ { Config: ` @@ -178,9 +178,9 @@ func TestAccSQSQueue_DeadLetterQueue(t *testing.T) { ctx := t.Context() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isSQSQueueDestroyed(ctx, tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isSQSQueueDestroyed(ctx, tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/mnq/sqs_test.go b/internal/services/mnq/sqs_test.go index 7a74bf6df2..ec8e713f7b 100644 --- a/internal/services/mnq/sqs_test.go +++ b/internal/services/mnq/sqs_test.go @@ -18,9 +18,9 @@ func TestAccSQS_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isSQSDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isSQSDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -47,9 +47,9 @@ func TestAccSQS_AlreadyActivated(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isSQSDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isSQSDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/mongodb/data_source_instance_test.go b/internal/services/mongodb/data_source_instance_test.go index 9740a840c8..96bc54e014 100644 --- a/internal/services/mongodb/data_source_instance_test.go +++ b/internal/services/mongodb/data_source_instance_test.go @@ -12,9 +12,9 @@ func TestAccDataSourceMongoDBInstance_ByName(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: IsInstanceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -47,9 +47,9 @@ func TestAccDataSourceMongoDBInstance_ByID(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: IsInstanceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/mongodb/instance_test.go b/internal/services/mongodb/instance_test.go index e6046071de..a46012d639 100644 --- a/internal/services/mongodb/instance_test.go +++ b/internal/services/mongodb/instance_test.go @@ -23,9 +23,9 @@ func TestAccMongoDBInstance_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: IsInstanceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -58,9 +58,9 @@ func TestAccMongoDBInstance_VolumeUpdate(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: IsInstanceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -105,9 +105,9 @@ func TestAccMongoDBInstance_SnapshotSchedule(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: IsInstanceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -160,9 +160,9 @@ func TestAccMongoDBInstance_UpdateNameTagsUser(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: IsInstanceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -217,9 +217,9 @@ func TestAccMongoDBInstance_FromSnapshot(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: IsInstanceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -265,9 +265,9 @@ func TestAccMongoDBInstance_WithPrivateNetwork(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: IsInstanceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -333,9 +333,9 @@ func TestAccMongoDBInstance_UpdatePrivateNetwork(t *testing.T) { var previousPrivateNetworkID string resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: IsInstanceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -485,9 +485,9 @@ func TestAccMongoDBInstance_WithPublicNetwork(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: IsInstanceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/mongodb/snapshot_test.go b/internal/services/mongodb/snapshot_test.go index 8c41a31e52..ff2f38e388 100644 --- a/internal/services/mongodb/snapshot_test.go +++ b/internal/services/mongodb/snapshot_test.go @@ -17,9 +17,9 @@ func TestAccMongoDBSnapshot_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isSnapshotDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isSnapshotDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -51,9 +51,9 @@ func TestAccMongoDBSnapshot_Update(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isSnapshotDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isSnapshotDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/mongodb/user_test.go b/internal/services/mongodb/user_test.go index 600610c488..b98cde2f69 100644 --- a/internal/services/mongodb/user_test.go +++ b/internal/services/mongodb/user_test.go @@ -19,9 +19,9 @@ func TestAccMongoDBUser_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckMongoDBUserDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckMongoDBUserDestroy(tt), Steps: []resource.TestStep{ { Config: ` @@ -101,9 +101,9 @@ func TestAccMongoDBUser_StateImport(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckMongoDBUserDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckMongoDBUserDestroy(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/object/bucket_acl_test.go b/internal/services/object/bucket_acl_test.go index f35b88ef9e..5692eea2dd 100644 --- a/internal/services/object/bucket_acl_test.go +++ b/internal/services/object/bucket_acl_test.go @@ -30,9 +30,9 @@ func TestAccObjectBucketACL_Basic(t *testing.T) { testBucketName := sdkacctest.RandomWithPrefix("tf-tests-scw-object-acl-basic") resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: objectchecks.IsBucketDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: objectchecks.IsBucketDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -82,9 +82,9 @@ func TestAccObjectBucketACL_Grantee(t *testing.T) { ownerID := "105bdce1-64c0-48ab-899d-868455867ecf" // scaleway-dev-tools-org resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: objectchecks.IsBucketDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: objectchecks.IsBucketDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -203,9 +203,9 @@ func TestAccObjectBucketACL_GranteeWithOwner(t *testing.T) { testBucketName := sdkacctest.RandomWithPrefix("tf-tests-scw-object-acl-owner") ownerID := "105bdce1-64c0-48ab-899d-868455867ecf" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: objectchecks.IsBucketDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: objectchecks.IsBucketDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -256,9 +256,9 @@ func TestAccObjectBucketACL_WithBucketName(t *testing.T) { testBucketName := sdkacctest.RandomWithPrefix("tf-tests-scw-object-acl-name") resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: objectchecks.IsBucketDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: objectchecks.IsBucketDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -305,9 +305,9 @@ func TestAccObjectBucketACL_Remove(t *testing.T) { testBucketName := sdkacctest.RandomWithPrefix("tf-tests-scw-object-acl-remove") resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: objectchecks.IsBucketDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: objectchecks.IsBucketDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/object/bucket_lock_configuration_test.go b/internal/services/object/bucket_lock_configuration_test.go index 96668a9a0c..f0119527e3 100644 --- a/internal/services/object/bucket_lock_configuration_test.go +++ b/internal/services/object/bucket_lock_configuration_test.go @@ -31,9 +31,9 @@ func TestAccObjectBucketLockConfiguration_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ErrorCheck: object.ErrorCheck(t, EndpointsID), - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ErrorCheck: object.ErrorCheck(t, EndpointsID), + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckBucketLockConfigurationDestroy(tt), objectchecks.IsBucketDestroyed(tt), @@ -130,9 +130,9 @@ func TestAccObjectBucketLockConfiguration_Update(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ErrorCheck: object.ErrorCheck(t, EndpointsID), - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ErrorCheck: object.ErrorCheck(t, EndpointsID), + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckBucketLockConfigurationDestroy(tt), objectchecks.IsBucketDestroyed(tt), @@ -224,9 +224,9 @@ func TestAccObjectBucketLockConfiguration_WithBucketName(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ErrorCheck: object.ErrorCheck(t, EndpointsID), - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ErrorCheck: object.ErrorCheck(t, EndpointsID), + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckBucketLockConfigurationDestroy(tt), objectchecks.IsBucketDestroyed(tt), diff --git a/internal/services/object/bucket_policy_test.go b/internal/services/object/bucket_policy_test.go index 58fd9b36c7..f5fde3463a 100644 --- a/internal/services/object/bucket_policy_test.go +++ b/internal/services/object/bucket_policy_test.go @@ -80,10 +80,10 @@ func TestAccObjectBucketPolicy_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ErrorCheck: object.ErrorCheck(t, EndpointsID), - ProviderFactories: tt.ProviderFactories, - CheckDestroy: objectchecks.IsBucketDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ErrorCheck: object.ErrorCheck(t, EndpointsID), + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: objectchecks.IsBucketDestroyed(tt), Steps: []resource.TestStep{ { Config: tfConfig, @@ -166,10 +166,10 @@ func TestAccObjectBucketPolicy_OtherRegionWithBucketID(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ErrorCheck: object.ErrorCheck(t, EndpointsID), - ProviderFactories: tt.ProviderFactories, - CheckDestroy: objectchecks.IsBucketDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ErrorCheck: object.ErrorCheck(t, EndpointsID), + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: objectchecks.IsBucketDestroyed(tt), Steps: []resource.TestStep{ { Config: tfConfig, @@ -200,10 +200,10 @@ func TestAccObjectBucketPolicy_OtherRegionWithBucketName(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ErrorCheck: object.ErrorCheck(t, EndpointsID), - ProviderFactories: tt.ProviderFactories, - CheckDestroy: objectchecks.IsBucketDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ErrorCheck: object.ErrorCheck(t, EndpointsID), + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: objectchecks.IsBucketDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/object/bucket_test.go b/internal/services/object/bucket_test.go index 9ce62f07db..f141acadda 100644 --- a/internal/services/object/bucket_test.go +++ b/internal/services/object/bucket_test.go @@ -37,9 +37,9 @@ func TestAccObjectBucket_Basic(t *testing.T) { objectBucketTestDefaultRegion, _ := tt.Meta.ScwClient().GetDefaultRegion() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: objectchecks.IsBucketDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: objectchecks.IsBucketDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -127,9 +127,9 @@ func TestAccObjectBucket_Lifecycle(t *testing.T) { bucketLifecycle := sdkacctest.RandomWithPrefix("tf-tests-scaleway-object-bucket-lifecycle") resourceNameLifecycle := "scaleway_object_bucket.main-bucket-lifecycle" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: objectchecks.IsBucketDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: objectchecks.IsBucketDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -413,9 +413,9 @@ func TestAccObjectBucket_ObjectLock(t *testing.T) { bucketObjectLock := sdkacctest.RandomWithPrefix("tf-tests-scaleway-object-bucket-lock") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: objectchecks.IsBucketDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: objectchecks.IsBucketDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -479,9 +479,9 @@ func TestAccObjectBucket_Cors_Update(t *testing.T) { resourceName := "scaleway_object_bucket.bucket-cors-update" bucketName := sdkacctest.RandomWithPrefix("tf-tests-scaleway-object-bucket-cors-update") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: objectchecks.IsBucketDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: objectchecks.IsBucketDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -608,9 +608,9 @@ func TestAccObjectBucket_Cors_Delete(t *testing.T) { } resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: objectchecks.IsBucketDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: objectchecks.IsBucketDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -641,9 +641,9 @@ func TestAccObjectBucket_Cors_EmptyOrigin(t *testing.T) { bucketName := sdkacctest.RandomWithPrefix("tf-tests-scaleway-object-cors-empty-origin") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: objectchecks.IsBucketDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: objectchecks.IsBucketDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -753,9 +753,9 @@ func TestAccObjectBucket_DestroyForce(t *testing.T) { } resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: objectchecks.IsBucketDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: objectchecks.IsBucketDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/object/bucket_website_configuration_test.go b/internal/services/object/bucket_website_configuration_test.go index 58cb7c4940..44e17e20f0 100644 --- a/internal/services/object/bucket_website_configuration_test.go +++ b/internal/services/object/bucket_website_configuration_test.go @@ -25,9 +25,9 @@ func TestAccObjectBucketWebsiteConfiguration_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ErrorCheck: object.ErrorCheck(t, EndpointsID), - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ErrorCheck: object.ErrorCheck(t, EndpointsID), + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( objectchecks.IsWebsiteConfigurationDestroyed(tt), objectchecks.IsBucketDestroyed(tt), @@ -78,9 +78,9 @@ func TestAccObjectBucketWebsiteConfiguration_WithPolicy(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ErrorCheck: object.ErrorCheck(t, EndpointsID), - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ErrorCheck: object.ErrorCheck(t, EndpointsID), + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( objectchecks.IsWebsiteConfigurationDestroyed(tt), objectchecks.IsBucketDestroyed(tt), @@ -154,9 +154,9 @@ func TestAccObjectBucketWebsiteConfiguration_Update(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ErrorCheck: object.ErrorCheck(t, EndpointsID), - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ErrorCheck: object.ErrorCheck(t, EndpointsID), + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( objectchecks.IsWebsiteConfigurationDestroyed(tt), objectchecks.IsBucketDestroyed(tt), @@ -234,9 +234,9 @@ func TestAccObjectBucketWebsiteConfiguration_WithBucketName(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ErrorCheck: object.ErrorCheck(t, EndpointsID), - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ErrorCheck: object.ErrorCheck(t, EndpointsID), + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( objectchecks.IsWebsiteConfigurationDestroyed(tt), objectchecks.IsBucketDestroyed(tt), diff --git a/internal/services/object/data_source_object_bucket_policy_test.go b/internal/services/object/data_source_object_bucket_policy_test.go index b39f33b4c0..3c98fe8c2f 100644 --- a/internal/services/object/data_source_object_bucket_policy_test.go +++ b/internal/services/object/data_source_object_bucket_policy_test.go @@ -37,9 +37,9 @@ func TestAccDataSourceObjectBucketPolicy_Basic(t *testing.T) { }` resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: objectchecks.IsBucketDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: objectchecks.IsBucketDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/object/data_source_object_bucket_test.go b/internal/services/object/data_source_object_bucket_test.go index 2d8b7a6052..bdb32d9397 100644 --- a/internal/services/object/data_source_object_bucket_test.go +++ b/internal/services/object/data_source_object_bucket_test.go @@ -21,9 +21,9 @@ func TestAccDataSourceObjectBucket_Basic(t *testing.T) { objectBucketTestDefaultRegion, _ := tt.Meta.ScwClient().GetDefaultRegion() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: objectchecks.IsBucketDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: objectchecks.IsBucketDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -99,8 +99,8 @@ func TestAccDataSourceObjectBucket_ProjectIDAllowed(t *testing.T) { ctx := t.Context() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: acctest.FakeSideProjectProviders(ctx, tt, project, iamAPIKey), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: acctest.FakeSideProjectProviders(ctx, tt, project, iamAPIKey), CheckDestroy: resource.ComposeAggregateTestCheckFunc( func(_ *terraform.State) error { return terminateFakeSideProject() @@ -149,8 +149,8 @@ func TestAccDataSourceObjectBucket_ProjectIDForbidden(t *testing.T) { ctx := t.Context() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: acctest.FakeSideProjectProviders(ctx, tt, project, iamAPIKey), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: acctest.FakeSideProjectProviders(ctx, tt, project, iamAPIKey), CheckDestroy: resource.ComposeAggregateTestCheckFunc( func(_ *terraform.State) error { return terminateFakeSideProject() diff --git a/internal/services/object/object_test.go b/internal/services/object/object_test.go index e75a390946..3da97ef7d8 100644 --- a/internal/services/object/object_test.go +++ b/internal/services/object/object_test.go @@ -26,8 +26,8 @@ func TestAccObject_Basic(t *testing.T) { bucketName := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-basic") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( objectchecks.IsObjectDestroyed(tt), objectchecks.IsBucketDestroyed(tt), @@ -106,8 +106,8 @@ func TestAccObject_ContentType(t *testing.T) { bucketName := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-content-type") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( objectchecks.IsObjectDestroyed(tt), objectchecks.IsBucketDestroyed(tt), @@ -145,8 +145,8 @@ func TestAccObject_Hash(t *testing.T) { bucketName := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-hash") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( objectchecks.IsObjectDestroyed(tt), objectchecks.IsBucketDestroyed(tt), @@ -206,8 +206,8 @@ func TestAccObject_Move(t *testing.T) { bucketName := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-move") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( objectchecks.IsObjectDestroyed(tt), objectchecks.IsBucketDestroyed(tt), @@ -263,8 +263,8 @@ func TestAccObject_StorageClass(t *testing.T) { bucketName := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-storage-class") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( objectchecks.IsObjectDestroyed(tt), objectchecks.IsBucketDestroyed(tt), @@ -328,8 +328,8 @@ func TestAccObject_Metadata(t *testing.T) { bucketName := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-metadata") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( objectchecks.IsObjectDestroyed(tt), objectchecks.IsBucketDestroyed(tt), @@ -399,8 +399,8 @@ func TestAccObject_Tags(t *testing.T) { bucketName := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-tags") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( objectchecks.IsObjectDestroyed(tt), objectchecks.IsBucketDestroyed(tt), @@ -464,8 +464,8 @@ func TestAccObject_Visibility(t *testing.T) { bucketName := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-visibility") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( objectchecks.IsObjectDestroyed(tt), objectchecks.IsBucketDestroyed(tt), @@ -523,8 +523,8 @@ func TestAccObject_State(t *testing.T) { bucketName := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-visibility") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( objectchecks.IsObjectDestroyed(tt), objectchecks.IsBucketDestroyed(tt), @@ -597,8 +597,8 @@ func TestAccObject_ByContent(t *testing.T) { fileContentStep2 := "This is a different content" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( objectchecks.IsObjectDestroyed(tt), objectchecks.IsBucketDestroyed(tt), @@ -658,8 +658,8 @@ func TestAccObject_ByContentBase64(t *testing.T) { fileEncodedStep2 := base64.StdEncoding.EncodeToString([]byte(fileContentStep2)) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( objectchecks.IsObjectDestroyed(tt), objectchecks.IsBucketDestroyed(tt), @@ -728,8 +728,8 @@ func TestAccObject_WithBucketName(t *testing.T) { bucketName := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-basic") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( objectchecks.IsObjectDestroyed(tt), objectchecks.IsBucketDestroyed(tt), @@ -785,8 +785,8 @@ func TestAccObject_Encryption(t *testing.T) { bucketName := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-encryption") resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( objectchecks.IsObjectDestroyed(tt), objectchecks.IsBucketDestroyed(tt), diff --git a/internal/services/rdb/acl_data_source_test.go b/internal/services/rdb/acl_data_source_test.go index 9f80c91859..0157ffe0ab 100644 --- a/internal/services/rdb/acl_data_source_test.go +++ b/internal/services/rdb/acl_data_source_test.go @@ -17,9 +17,9 @@ func TestAccDataSourceACL_Basic(t *testing.T) { latestEngineVersion := rdbchecks.GetLatestEngineVersion(tt, postgreSQLEngineName) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/rdb/acl_test.go b/internal/services/rdb/acl_test.go index 937d7e72ab..a749744a29 100644 --- a/internal/services/rdb/acl_test.go +++ b/internal/services/rdb/acl_test.go @@ -17,9 +17,9 @@ func TestAccACL_Basic(t *testing.T) { latestEngineVersion := rdbchecks.GetLatestEngineVersion(tt, postgreSQLEngineName) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/rdb/data_source_rdb_database_backup_test.go b/internal/services/rdb/data_source_rdb_database_backup_test.go index 96e0798ea1..80ccba2628 100644 --- a/internal/services/rdb/data_source_rdb_database_backup_test.go +++ b/internal/services/rdb/data_source_rdb_database_backup_test.go @@ -16,8 +16,8 @@ func TestAccDataSourceDatabaseBackup_Basic(t *testing.T) { latestEngineVersion := rdbchecks.GetLatestEngineVersion(tt, postgreSQLEngineName) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( rdbchecks.IsInstanceDestroyed(tt), isBackupDestroyed(tt), diff --git a/internal/services/rdb/data_source_rdb_instance_test.go b/internal/services/rdb/data_source_rdb_instance_test.go index 8bd4b9ff0f..c0186ba49b 100644 --- a/internal/services/rdb/data_source_rdb_instance_test.go +++ b/internal/services/rdb/data_source_rdb_instance_test.go @@ -16,9 +16,9 @@ func TestAccDataSourceInstance_Basic(t *testing.T) { latestEngineVersion := rdbchecks.GetLatestEngineVersion(tt, postgreSQLEngineName) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/rdb/database_backup_test.go b/internal/services/rdb/database_backup_test.go index d5dd9d54c4..bd66636492 100644 --- a/internal/services/rdb/database_backup_test.go +++ b/internal/services/rdb/database_backup_test.go @@ -59,8 +59,8 @@ func TestAccDatabaseBackup_Basic(t *testing.T) { latestEngineVersion := rdbchecks.GetLatestEngineVersion(tt, postgreSQLEngineName) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( rdbchecks.IsInstanceDestroyed(tt), isBackupDestroyed(tt), diff --git a/internal/services/rdb/database_data_source_test.go b/internal/services/rdb/database_data_source_test.go index f0dfd4fbc2..f43331f2c5 100644 --- a/internal/services/rdb/database_data_source_test.go +++ b/internal/services/rdb/database_data_source_test.go @@ -16,9 +16,9 @@ func TestAccDataSourceDatabase_Basic(t *testing.T) { latestEngineVersion := rdbchecks.GetLatestEngineVersion(tt, postgreSQLEngineName) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/rdb/database_test.go b/internal/services/rdb/database_test.go index baa71e9aec..d3a3ed7394 100644 --- a/internal/services/rdb/database_test.go +++ b/internal/services/rdb/database_test.go @@ -24,9 +24,9 @@ func TestAccDatabase_Basic(t *testing.T) { instanceName := "TestAccScalewayRdbDatabase_Basic" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -58,9 +58,9 @@ func TestAccDatabase_ManualDelete(t *testing.T) { latestEngineVersion := rdbchecks.GetLatestEngineVersion(tt, postgreSQLEngineName) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/rdb/instance_test.go b/internal/services/rdb/instance_test.go index e2adbaee70..e778b26e96 100644 --- a/internal/services/rdb/instance_test.go +++ b/internal/services/rdb/instance_test.go @@ -25,9 +25,9 @@ func TestAccInstance_Basic(t *testing.T) { latestEngineVersion := rdbchecks.GetLatestEngineVersion(tt, postgreSQLEngineName) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -106,9 +106,9 @@ func TestAccInstance_WithCluster(t *testing.T) { latestEngineVersion := rdbchecks.GetLatestEngineVersion(tt, postgreSQLEngineName) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -147,9 +147,9 @@ func TestAccInstance_LogsPolicy(t *testing.T) { latestEngineVersion := rdbchecks.GetLatestEngineVersion(tt, postgreSQLEngineName) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -208,9 +208,9 @@ func TestAccInstance_Settings(t *testing.T) { latestEngineVersion := rdbchecks.GetLatestEngineVersion(tt, postgreSQLEngineName) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -252,9 +252,9 @@ func TestAccInstance_InitSettings(t *testing.T) { latestEngineVersion := rdbchecks.GetLatestEngineVersion(tt, mySQLEngineName) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -290,9 +290,9 @@ func TestAccInstance_Capitalize(t *testing.T) { latestEngineVersion := rdbchecks.GetLatestEngineVersion(tt, postgreSQLEngineName) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -321,8 +321,8 @@ func TestAccInstance_PrivateNetworkUpdate(t *testing.T) { latestEngineVersion := rdbchecks.GetLatestEngineVersion(tt, postgreSQLEngineName) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( rdbchecks.IsInstanceDestroyed(tt), vpcchecks.CheckPrivateNetworkDestroy(tt), @@ -548,9 +548,9 @@ func TestAccInstance_PrivateNetwork(t *testing.T) { latestEngineVersion := rdbchecks.GetLatestEngineVersion(tt, postgreSQLEngineName) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -674,9 +674,9 @@ func TestAccInstance_BackupSchedule(t *testing.T) { latestEngineVersion := rdbchecks.GetLatestEngineVersion(tt, postgreSQLEngineName) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -714,9 +714,9 @@ func TestAccInstance_Volume(t *testing.T) { latestEngineVersion := rdbchecks.GetLatestEngineVersion(tt, postgreSQLEngineName) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -789,9 +789,9 @@ func TestAccInstance_SBSVolume(t *testing.T) { latestEngineVersion := rdbchecks.GetLatestEngineVersion(tt, postgreSQLEngineName) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -870,9 +870,9 @@ func TestAccInstance_ChangeVolumeType(t *testing.T) { latestEngineVersion := rdbchecks.GetLatestEngineVersion(tt, postgreSQLEngineName) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -931,8 +931,8 @@ func TestAccInstance_ChangeNodeType(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -987,9 +987,9 @@ func TestAccInstance_Endpoints(t *testing.T) { latestEngineVersion := rdbchecks.GetLatestEngineVersion(tt, postgreSQLEngineName) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -1094,9 +1094,9 @@ func TestAccInstance_EncryptionAtRest(t *testing.T) { latestEngineVersion := rdbchecks.GetLatestEngineVersion(tt, postgreSQLEngineName) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -1138,9 +1138,9 @@ func TestAccInstance_EncryptionAtRestFalse(t *testing.T) { latestEngineVersion := rdbchecks.GetLatestEngineVersion(tt, postgreSQLEngineName) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -1182,9 +1182,9 @@ func TestAccInstance_UpdateEncryptionAtRest(t *testing.T) { latestEngineVersion := rdbchecks.GetLatestEngineVersion(tt, postgreSQLEngineName) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ // Step 1: Create without encryption { @@ -1237,9 +1237,9 @@ func TestAccInstance_CompleteWorkflow(t *testing.T) { latestEngineVersion := rdbchecks.GetLatestEngineVersion(tt, postgreSQLEngineName) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: IsSnapshotDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: IsSnapshotDestroyed(tt), Steps: []resource.TestStep{ // Step 1: Create an instance and a snapshot { @@ -1334,9 +1334,9 @@ func TestAccInstance_FromSnapshotWithPrivateNetwork(t *testing.T) { latestEngineVersion := rdbchecks.GetLatestEngineVersion(tt, postgreSQLEngineName) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: IsSnapshotDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: IsSnapshotDestroyed(tt), Steps: []resource.TestStep{ // Step 1: Create an instance, private network, and a snapshot { @@ -1416,8 +1416,8 @@ func TestAccInstance_PrivateNetworkCleanup(t *testing.T) { latestEngineVersion := rdbchecks.GetLatestEngineVersion(tt, postgreSQLEngineName) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( rdbchecks.IsInstanceDestroyed(tt), vpcchecks.CheckPrivateNetworkDestroy(tt), @@ -1466,8 +1466,8 @@ func TestAccInstance_EndpointErrorHandling(t *testing.T) { latestEngineVersion := rdbchecks.GetLatestEngineVersion(tt, postgreSQLEngineName) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( rdbchecks.IsInstanceDestroyed(tt), vpcchecks.CheckPrivateNetworkDestroy(tt), diff --git a/internal/services/rdb/privilege_data_source_test.go b/internal/services/rdb/privilege_data_source_test.go index f32fe683d9..e5d9efa14c 100644 --- a/internal/services/rdb/privilege_data_source_test.go +++ b/internal/services/rdb/privilege_data_source_test.go @@ -16,9 +16,9 @@ func TestAccDataSourcePrivilege_Basic(t *testing.T) { latestEngineVersion := rdbchecks.GetLatestEngineVersion(tt, postgreSQLEngineName) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/rdb/privilege_test.go b/internal/services/rdb/privilege_test.go index 70ac9bd0a3..8fe5149b58 100644 --- a/internal/services/rdb/privilege_test.go +++ b/internal/services/rdb/privilege_test.go @@ -21,9 +21,9 @@ func TestAccPrivilege_Basic(t *testing.T) { latestEngineVersion := rdbchecks.GetLatestEngineVersion(tt, postgreSQLEngineName) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/rdb/read_replica_test.go b/internal/services/rdb/read_replica_test.go index b44afd83a8..65670cfef1 100644 --- a/internal/services/rdb/read_replica_test.go +++ b/internal/services/rdb/read_replica_test.go @@ -21,8 +21,8 @@ func TestAccReadReplica_Basic(t *testing.T) { latestEngineVersion := rdbchecks.GetLatestEngineVersion(tt, postgreSQLEngineName) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( rdbchecks.IsInstanceDestroyed(tt), isReadReplicaDestroyed(tt), @@ -64,8 +64,8 @@ func TestAccReadReplica_PrivateNetwork(t *testing.T) { latestEngineVersion := rdbchecks.GetLatestEngineVersion(tt, postgreSQLEngineName) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( rdbchecks.IsInstanceDestroyed(tt), isReadReplicaDestroyed(tt), @@ -112,8 +112,8 @@ func TestAccReadReplica_Update(t *testing.T) { latestEngineVersion := rdbchecks.GetLatestEngineVersion(tt, postgreSQLEngineName) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( rdbchecks.IsInstanceDestroyed(tt), isReadReplicaDestroyed(tt), @@ -329,8 +329,8 @@ func TestAccReadReplica_MultipleEndpoints(t *testing.T) { latestEngineVersion := rdbchecks.GetLatestEngineVersion(tt, postgreSQLEngineName) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( rdbchecks.IsInstanceDestroyed(tt), isReadReplicaDestroyed(tt), @@ -381,8 +381,8 @@ func TestAccReadReplica_DifferentZone(t *testing.T) { readReplicaID := "" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( rdbchecks.IsInstanceDestroyed(tt), isReadReplicaDestroyed(tt), @@ -498,8 +498,8 @@ func TestAccReadReplica_WithInstanceAlsoInPrivateNetwork(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( rdbchecks.IsInstanceDestroyed(tt), isReadReplicaDestroyed(tt), diff --git a/internal/services/rdb/snapshots_test.go b/internal/services/rdb/snapshots_test.go index 771f57d46c..3a805979c5 100644 --- a/internal/services/rdb/snapshots_test.go +++ b/internal/services/rdb/snapshots_test.go @@ -20,9 +20,9 @@ func TestAccRdbSnapshot_Basic(t *testing.T) { latestEngineVersion := rdbchecks.GetLatestEngineVersion(tt, postgreSQLEngineName) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: IsSnapshotDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: IsSnapshotDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -62,9 +62,9 @@ func TestAccRdbSnapshot_Update(t *testing.T) { latestEngineVersion := rdbchecks.GetLatestEngineVersion(tt, postgreSQLEngineName) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: IsSnapshotDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: IsSnapshotDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/rdb/user_test.go b/internal/services/rdb/user_test.go index df1f138bd0..7d81dc2280 100644 --- a/internal/services/rdb/user_test.go +++ b/internal/services/rdb/user_test.go @@ -21,9 +21,9 @@ func TestAccUser_Basic(t *testing.T) { latestEngineVersion := rdbchecks.GetLatestEngineVersion(tt, postgreSQLEngineName) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/redis/cluster_data_source_test.go b/internal/services/redis/cluster_data_source_test.go index e33594d929..2787e334a5 100644 --- a/internal/services/redis/cluster_data_source_test.go +++ b/internal/services/redis/cluster_data_source_test.go @@ -14,9 +14,9 @@ func TestAccDataSourceCluster_Basic(t *testing.T) { latestRedisVersion := getLatestVersion(tt) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isClusterDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isClusterDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/redis/cluster_test.go b/internal/services/redis/cluster_test.go index 03f8249cc0..7a7ad47697 100644 --- a/internal/services/redis/cluster_test.go +++ b/internal/services/redis/cluster_test.go @@ -27,9 +27,9 @@ func TestAccCluster_Basic(t *testing.T) { latestRedisVersion := getLatestVersion(tt) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isClusterDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isClusterDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -96,9 +96,9 @@ func TestAccCluster_Migrate(t *testing.T) { latestRedisVersion := getLatestVersion(tt) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isClusterDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isClusterDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -161,9 +161,9 @@ func TestAccCluster_MigrateClusterSizeWithIPAMEndpoint(t *testing.T) { latestRedisVersion := getLatestVersion(tt) clusterID := "" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isClusterDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isClusterDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -257,9 +257,9 @@ func TestAccCluster_ACL(t *testing.T) { latestRedisVersion := getLatestVersion(tt) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isClusterDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isClusterDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -334,9 +334,9 @@ func TestAccCluster_Settings(t *testing.T) { latestRedisVersion := getLatestVersion(tt) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isClusterDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isClusterDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -411,9 +411,9 @@ func TestAccCluster_Endpoints_Standalone(t *testing.T) { latestRedisVersion := getLatestVersion(tt) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isClusterDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isClusterDestroyed(tt), Steps: []resource.TestStep{ { // Step 1: First we define a single private network @@ -604,9 +604,9 @@ func TestAccCluster_Endpoints_ClusterMode(t *testing.T) { latestRedisVersion := getLatestVersion(tt) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isClusterDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isClusterDestroyed(tt), Steps: []resource.TestStep{ { // Step 1: We define a single private network @@ -671,9 +671,9 @@ func TestAccCluster_Certificate(t *testing.T) { latestRedisVersion := getLatestVersion(tt) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isClusterDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isClusterDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -713,9 +713,9 @@ func TestAccCluster_NoCertificate(t *testing.T) { latestRedisVersion := getLatestVersion(tt) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isClusterDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isClusterDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -756,9 +756,9 @@ func TestAccCluster_MigrateToHAMode(t *testing.T) { latestRedisVersion := getLatestVersion(tt) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isClusterDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isClusterDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/registry/image_data_source_test.go b/internal/services/registry/image_data_source_test.go index 64abd84d46..4913665b0e 100644 --- a/internal/services/registry/image_data_source_test.go +++ b/internal/services/registry/image_data_source_test.go @@ -20,9 +20,9 @@ func TestAccDataSourceImage_Basic(t *testing.T) { ubuntuImageID := "4b5a47c0-6fbf-4388-8783-c07c28d3c2eb" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isNamespaceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isNamespaceDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/registry/namespace_data_source_test.go b/internal/services/registry/namespace_data_source_test.go index f082cc29da..50ab336983 100644 --- a/internal/services/registry/namespace_data_source_test.go +++ b/internal/services/registry/namespace_data_source_test.go @@ -12,9 +12,9 @@ func TestAccDataSourceNamespace_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isNamespaceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isNamespaceDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/registry/namespace_test.go b/internal/services/registry/namespace_test.go index 89e95d6ada..2091a5203c 100644 --- a/internal/services/registry/namespace_test.go +++ b/internal/services/registry/namespace_test.go @@ -22,9 +22,9 @@ func TestAccNamespace_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isNamespaceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isNamespaceDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/registry/tag_data_source_test.go b/internal/services/registry/tag_data_source_test.go index de737fb09c..34d16d3910 100644 --- a/internal/services/registry/tag_data_source_test.go +++ b/internal/services/registry/tag_data_source_test.go @@ -22,9 +22,9 @@ func TestAccDataSourceImageTag_Basic(t *testing.T) { namespaceName := "test-namespace-2" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isNamespaceDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isNamespaceDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/sdb/database_test.go b/internal/services/sdb/database_test.go index 8ec4ef784d..9bd313c7fa 100644 --- a/internal/services/sdb/database_test.go +++ b/internal/services/sdb/database_test.go @@ -17,9 +17,9 @@ func TestAccServerlessSQLDBDatabase_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckServerlessSQLDBDatabaseDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckServerlessSQLDBDatabaseDestroy(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/secret/secret_data_source_test.go b/internal/services/secret/secret_data_source_test.go index 11ea4a0810..98a6563a1b 100644 --- a/internal/services/secret/secret_data_source_test.go +++ b/internal/services/secret/secret_data_source_test.go @@ -20,7 +20,7 @@ func TestAccDataSourceSecret_Basic(t *testing.T) { require.NoError(t, err) resource.ParallelTest(t, resource.TestCase{ - ProviderFactories: acctest.FakeSideProjectProviders(ctx, tt, project, iamAPIKey), + ProtoV5ProviderFactories: acctest.FakeSideProjectProviders(ctx, tt, project, iamAPIKey), CheckDestroy: resource.ComposeAggregateTestCheckFunc( func(_ *terraform.State) error { return terminateFakeSideProject() @@ -65,9 +65,9 @@ func TestAccDataSourceSecret_Path(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - CheckDestroy: testAccCheckSecretDestroy(tt), - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + CheckDestroy: testAccCheckSecretDestroy(tt), + ProtoV5ProviderFactories: tt.ProviderFactories, Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/secret/secret_test.go b/internal/services/secret/secret_test.go index abbb2f84ad..cb79bc33a8 100644 --- a/internal/services/secret/secret_test.go +++ b/internal/services/secret/secret_test.go @@ -26,9 +26,9 @@ func TestAccSecret_Basic(t *testing.T) { updatedName := "secretNameBasicUpdated" secretDescription := "secret description" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckSecretDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckSecretDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -94,9 +94,9 @@ func TestAccSecret_Path(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckSecretDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckSecretDestroy(tt), Steps: []resource.TestStep{ { Config: ` @@ -170,9 +170,9 @@ func TestAccSecret_Protected(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckSecretDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckSecretDestroy(tt), Steps: []resource.TestStep{ { Config: ` @@ -223,9 +223,9 @@ func TestAccSecret_EphemeralPolicy(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckSecretDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckSecretDestroy(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/secret/version_data_source_test.go b/internal/services/secret/version_data_source_test.go index 9a9f3264f7..4ff8806d69 100644 --- a/internal/services/secret/version_data_source_test.go +++ b/internal/services/secret/version_data_source_test.go @@ -21,9 +21,9 @@ func TestAccDataSourceSecretVersion_Basic(t *testing.T) { ) resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckSecretVersionDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckSecretVersionDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -124,9 +124,9 @@ func TestAccDataSourceSecretVersion_ByNameSecret(t *testing.T) { secretName := "dataSourceSecretVersionByNameSecret" secretVersionData := "my_super_secret" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckSecretVersionDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckSecretVersionDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/secret/version_test.go b/internal/services/secret/version_test.go index 528b354b34..2fc314a83f 100644 --- a/internal/services/secret/version_test.go +++ b/internal/services/secret/version_test.go @@ -24,9 +24,9 @@ func TestAccSecretVersion_Basic(t *testing.T) { secretVersionDescription := "secret version description" secretVersionData := "my_super_secret" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckSecretVersionDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckSecretVersionDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -127,9 +127,9 @@ func TestAccSecretVersion_Type(t *testing.T) { secretVersionDataInvalid := "{\"key\": \"value\", \"invalid\": {}}" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckSecretVersionDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckSecretVersionDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/tem/blockedlist_test.go b/internal/services/tem/blockedlist_test.go index 5770f74d9a..e07c0e368d 100644 --- a/internal/services/tem/blockedlist_test.go +++ b/internal/services/tem/blockedlist_test.go @@ -22,9 +22,9 @@ func TestAccBlockedList_Basic(t *testing.T) { blockedEmail := "spam@example.com" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isBlockedEmailDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isBlockedEmailDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/tem/domain_data_source_test.go b/internal/services/tem/domain_data_source_test.go index 416f2e53e9..cfb84584b1 100644 --- a/internal/services/tem/domain_data_source_test.go +++ b/internal/services/tem/domain_data_source_test.go @@ -15,9 +15,9 @@ func TestAccDataSourceDomain_Basic(t *testing.T) { domainName := "terraform-ds.test.local" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isDomainDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isDomainDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -53,9 +53,9 @@ func TestAccDataSourceDomain_Reputation(t *testing.T) { subDomainName := "test-reputation" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isDomainDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isDomainDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/tem/domain_test.go b/internal/services/tem/domain_test.go index 956d5c0dd6..fee9703306 100644 --- a/internal/services/tem/domain_test.go +++ b/internal/services/tem/domain_test.go @@ -22,9 +22,9 @@ func TestAccDomain_Basic(t *testing.T) { domainName := "terraform-rs.test.local" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isDomainDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isDomainDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -56,9 +56,9 @@ func TestAccDomain_Tos(t *testing.T) { domainName := "terraform-rs.test.local" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isDomainDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isDomainDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -80,9 +80,9 @@ func TestAccDomain_Autoconfig(t *testing.T) { subDomainName := "test-autoconfig" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isDomainDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isDomainDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -130,9 +130,9 @@ func TestAccDomain_AutoconfigUpdate(t *testing.T) { subDomainName := "test-autoconfig-update" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isDomainDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isDomainDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/tem/domain_validation_test.go b/internal/services/tem/domain_validation_test.go index f5930ff8ac..d9b5f2eaaa 100644 --- a/internal/services/tem/domain_validation_test.go +++ b/internal/services/tem/domain_validation_test.go @@ -18,9 +18,9 @@ func TestAccDomainValidation_Validation(t *testing.T) { subDomainName := "validation-validation" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isDomainDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isDomainDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -57,9 +57,9 @@ func TestAccDomainValidation_TimeoutError(t *testing.T) { subDomainName := "validation-timeout" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isDomainDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isDomainDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/tem/offer_subscription_data_source_test.go b/internal/services/tem/offer_subscription_data_source_test.go index 9eb136d5fa..a31e31e3b3 100644 --- a/internal/services/tem/offer_subscription_data_source_test.go +++ b/internal/services/tem/offer_subscription_data_source_test.go @@ -19,8 +19,8 @@ func TestAccDataSourceOfferSubscription_Basic(t *testing.T) { } resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/tem/webhook_test.go b/internal/services/tem/webhook_test.go index 832978f36e..884a08fd49 100644 --- a/internal/services/tem/webhook_test.go +++ b/internal/services/tem/webhook_test.go @@ -30,9 +30,9 @@ func TestAccWebhook_BasicAndUpdate(t *testing.T) { updatedEventTypes := []string{"email_queued"} resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isWebhookDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isWebhookDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/vpc/acl_test.go b/internal/services/vpc/acl_test.go index 1e9c602516..295c34c20f 100644 --- a/internal/services/vpc/acl_test.go +++ b/internal/services/vpc/acl_test.go @@ -17,9 +17,9 @@ func TestAccACL_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isACLDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isACLDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -67,9 +67,9 @@ func TestAccACL_WithRules(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isACLDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isACLDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/vpc/private_network_data_source_test.go b/internal/services/vpc/private_network_data_source_test.go index 8dc0c0982b..44fd546b93 100644 --- a/internal/services/vpc/private_network_data_source_test.go +++ b/internal/services/vpc/private_network_data_source_test.go @@ -15,9 +15,9 @@ func TestAccDataSourceVPCPrivateNetwork_Basic(t *testing.T) { pnName := "TestAccScalewayDataSourceVPCPrivateNetwork_Basic" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: vpcchecks.CheckPrivateNetworkDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: vpcchecks.CheckPrivateNetworkDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -82,9 +82,9 @@ func TestAccDataSourceVPCPrivateNetwork_VpcID(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: vpcchecks.CheckPrivateNetworkDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: vpcchecks.CheckPrivateNetworkDestroy(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/vpc/private_network_test.go b/internal/services/vpc/private_network_test.go index e2f2ded4e3..a34be17acd 100644 --- a/internal/services/vpc/private_network_test.go +++ b/internal/services/vpc/private_network_test.go @@ -15,9 +15,9 @@ func TestAccVPCPrivateNetwork_Basic(t *testing.T) { privateNetworkName := "private-network-test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: vpcchecks.CheckPrivateNetworkDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: vpcchecks.CheckPrivateNetworkDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -94,9 +94,9 @@ func TestAccVPCPrivateNetwork_DefaultName(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: vpcchecks.CheckPrivateNetworkDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: vpcchecks.CheckPrivateNetworkDestroy(tt), Steps: []resource.TestStep{ { Config: ` @@ -123,9 +123,9 @@ func TestAccVPCPrivateNetwork_Subnets(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: vpcchecks.CheckPrivateNetworkDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: vpcchecks.CheckPrivateNetworkDestroy(tt), Steps: []resource.TestStep{ { Config: ` @@ -229,9 +229,9 @@ func TestAccVPCPrivateNetwork_OneSubnet(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: vpcchecks.CheckPrivateNetworkDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: vpcchecks.CheckPrivateNetworkDestroy(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/vpc/route_test.go b/internal/services/vpc/route_test.go index 37f1caa5ae..3bae1bd4fb 100644 --- a/internal/services/vpc/route_test.go +++ b/internal/services/vpc/route_test.go @@ -17,9 +17,9 @@ func TestAccVPCRoute_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: isRouteDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: isRouteDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/vpc/routes_data_source_test.go b/internal/services/vpc/routes_data_source_test.go index 8683e87952..bc5a40bf31 100644 --- a/internal/services/vpc/routes_data_source_test.go +++ b/internal/services/vpc/routes_data_source_test.go @@ -13,9 +13,9 @@ func TestAccDataSourceRoutes_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: vpcchecks.CheckPrivateNetworkDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: vpcchecks.CheckPrivateNetworkDestroy(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/vpc/vpc_data_source_test.go b/internal/services/vpc/vpc_data_source_test.go index 4a3d16c137..60d60a4388 100644 --- a/internal/services/vpc/vpc_data_source_test.go +++ b/internal/services/vpc/vpc_data_source_test.go @@ -14,9 +14,9 @@ func TestAccDataSourceVPC_Basic(t *testing.T) { vpcName := "DataSourceVPC_Basic" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckVPCDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckVPCDestroy(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -53,8 +53,8 @@ func TestAccDataSourceVPC_Default(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/vpc/vpc_test.go b/internal/services/vpc/vpc_test.go index 213eac6590..1ab65da2ab 100644 --- a/internal/services/vpc/vpc_test.go +++ b/internal/services/vpc/vpc_test.go @@ -21,9 +21,9 @@ func TestAccVPC_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckVPCDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckVPCDestroy(tt), Steps: []resource.TestStep{ { Config: ` @@ -50,9 +50,9 @@ func TestAccVPC_WithRegion(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckVPCDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckVPCDestroy(tt), Steps: []resource.TestStep{ { Config: ` @@ -86,9 +86,9 @@ func TestAccVPC_WithTags(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckVPCDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckVPCDestroy(tt), Steps: []resource.TestStep{ { Config: ` @@ -124,9 +124,9 @@ func TestAccVPC_DisableRouting(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckVPCDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckVPCDestroy(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/vpc/vpcs_data_source_test.go b/internal/services/vpc/vpcs_data_source_test.go index 02cbeffa1b..5f25c2b329 100644 --- a/internal/services/vpc/vpcs_data_source_test.go +++ b/internal/services/vpc/vpcs_data_source_test.go @@ -13,9 +13,9 @@ func TestAccDataSourceVPCs_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsServerDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/vpcgw/ip_data_source_test.go b/internal/services/vpcgw/ip_data_source_test.go index 8000f24c24..49b0a5d114 100644 --- a/internal/services/vpcgw/ip_data_source_test.go +++ b/internal/services/vpcgw/ip_data_source_test.go @@ -13,9 +13,9 @@ func TestAccDataSourceVPCPublicGatewayIP_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: vpcgwchecks.IsIPDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: vpcgwchecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/vpcgw/ip_reverse_test.go b/internal/services/vpcgw/ip_reverse_test.go index 822a6fc967..8e784be94a 100644 --- a/internal/services/vpcgw/ip_reverse_test.go +++ b/internal/services/vpcgw/ip_reverse_test.go @@ -19,9 +19,9 @@ func TestAccVPCPublicGatewayIPReverseDns_Basic(t *testing.T) { testDNSZone := "tf-reverse-vpcgw." + acctest.TestDomain resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: instancechecks.IsIPDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: instancechecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/vpcgw/ip_test.go b/internal/services/vpcgw/ip_test.go index 32017ced1c..17183b1e67 100644 --- a/internal/services/vpcgw/ip_test.go +++ b/internal/services/vpcgw/ip_test.go @@ -17,8 +17,8 @@ func TestAccVPCPublicGatewayIP_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProviderFactories: tt.ProviderFactories, - CheckDestroy: vpcgwchecks.IsIPDestroyed(tt), + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: vpcgwchecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -40,8 +40,8 @@ func TestAccVPCPublicGatewayIP_WithZone(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProviderFactories: tt.ProviderFactories, - CheckDestroy: vpcgwchecks.IsIPDestroyed(tt), + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: vpcgwchecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { Config: ` @@ -72,8 +72,8 @@ func TestAccVPCPublicGatewayIP_WithTags(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProviderFactories: tt.ProviderFactories, - CheckDestroy: vpcgwchecks.IsIPDestroyed(tt), + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: vpcgwchecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/vpcgw/network_data_source_test.go b/internal/services/vpcgw/network_data_source_test.go index 8557daaaf0..0d54a63233 100644 --- a/internal/services/vpcgw/network_data_source_test.go +++ b/internal/services/vpcgw/network_data_source_test.go @@ -13,9 +13,9 @@ func TestAccDataSourceVPCGatewayNetwork_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: vpcgwchecks.IsGatewayNetworkDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: vpcgwchecks.IsGatewayNetworkDestroyed(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/vpcgw/network_test.go b/internal/services/vpcgw/network_test.go index e6bf0a0a4b..3ba1319c70 100644 --- a/internal/services/vpcgw/network_test.go +++ b/internal/services/vpcgw/network_test.go @@ -18,8 +18,8 @@ func TestAccVPCGatewayNetwork_WithIPAMConfig(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( vpcgwchecks.IsGatewayNetworkDestroyed(tt), ipamchecks.CheckIPDestroy(tt), diff --git a/internal/services/vpcgw/pat_rule_data_source_test.go b/internal/services/vpcgw/pat_rule_data_source_test.go index 4cd64f6491..375df2edf2 100644 --- a/internal/services/vpcgw/pat_rule_data_source_test.go +++ b/internal/services/vpcgw/pat_rule_data_source_test.go @@ -12,9 +12,9 @@ func TestAccDataSourceVPCPublicGatewayPATRule_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckVPCPublicGatewayPATRuleDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckVPCPublicGatewayPATRuleDestroy(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/vpcgw/pat_rule_test.go b/internal/services/vpcgw/pat_rule_test.go index 3563715534..3dbd2b3467 100644 --- a/internal/services/vpcgw/pat_rule_test.go +++ b/internal/services/vpcgw/pat_rule_test.go @@ -17,9 +17,9 @@ func TestAccVPCPublicGatewayPATRule_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckVPCPublicGatewayPATRuleDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckVPCPublicGatewayPATRuleDestroy(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/vpcgw/public_gateway_data_source_test.go b/internal/services/vpcgw/public_gateway_data_source_test.go index 0bab1503a5..7ffcfc3c8c 100644 --- a/internal/services/vpcgw/public_gateway_data_source_test.go +++ b/internal/services/vpcgw/public_gateway_data_source_test.go @@ -15,9 +15,9 @@ func TestAccDataSourceVPCPublicGateway_Basic(t *testing.T) { pgName := "TestAccScalewayDataSourceVPCPublicGateway_Basic" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: vpcgwchecks.IsGatewayDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: vpcgwchecks.IsGatewayDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/vpcgw/public_gateway_test.go b/internal/services/vpcgw/public_gateway_test.go index 5c1616e611..0550a6841e 100644 --- a/internal/services/vpcgw/public_gateway_test.go +++ b/internal/services/vpcgw/public_gateway_test.go @@ -18,9 +18,9 @@ func TestAccVPCPublicGateway_Basic(t *testing.T) { publicGatewayName := "public-gateway-test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: vpcgwchecks.IsGatewayDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: vpcgwchecks.IsGatewayDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -95,9 +95,9 @@ func TestAccVPCPublicGateway_Bastion(t *testing.T) { publicGatewayName := "public-gateway-bastion-test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: vpcgwchecks.IsGatewayDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: vpcgwchecks.IsGatewayDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -143,8 +143,8 @@ func TestAccVPCPublicGateway_AttachToIP(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeAggregateTestCheckFunc( vpcgwchecks.IsIPDestroyed(tt), vpcgwchecks.IsGatewayDestroyed(tt), @@ -179,9 +179,9 @@ func TestAccVPCPublicGateway_Upgrade(t *testing.T) { publicGatewayName := "public-gateway-upgrade-test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: vpcgwchecks.IsGatewayDestroyed(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: vpcgwchecks.IsGatewayDestroyed(tt), Steps: []resource.TestStep{ { Config: fmt.Sprintf(` diff --git a/internal/services/webhosting/offer_data_source_test.go b/internal/services/webhosting/offer_data_source_test.go index 82a9c40956..20c48e2faa 100644 --- a/internal/services/webhosting/offer_data_source_test.go +++ b/internal/services/webhosting/offer_data_source_test.go @@ -12,8 +12,8 @@ func TestAccDataSourceOffer_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/webhosting/webhosting_data_source_test.go b/internal/services/webhosting/webhosting_data_source_test.go index 01a9ca06c4..8d230f8f90 100644 --- a/internal/services/webhosting/webhosting_data_source_test.go +++ b/internal/services/webhosting/webhosting_data_source_test.go @@ -12,9 +12,9 @@ func TestAccDataSourceWebhosting_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckWebhostingDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckWebhostingDestroy(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/webhosting/webhosting_test.go b/internal/services/webhosting/webhosting_test.go index a71bea68f5..b37720bb5c 100644 --- a/internal/services/webhosting/webhosting_test.go +++ b/internal/services/webhosting/webhosting_test.go @@ -22,9 +22,9 @@ func TestAccWebhosting_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(t) }, - ProviderFactories: tt.ProviderFactories, - CheckDestroy: testAccCheckWebhostingDestroy(tt), + PreCheck: func() { acctest.PreCheck(t) }, + ProtoV5ProviderFactories: tt.ProviderFactories, + CheckDestroy: testAccCheckWebhostingDestroy(tt), Steps: []resource.TestStep{ { Config: ` diff --git a/main.go b/main.go index ded766545f..db0950ce61 100644 --- a/main.go +++ b/main.go @@ -5,7 +5,6 @@ import ( "flag" "log" - "github.com/hashicorp/terraform-plugin-go/tfprotov5" "github.com/hashicorp/terraform-plugin-go/tfprotov5/tf5server" "github.com/hashicorp/terraform-plugin-mux/tf5muxserver" "github.com/scaleway/terraform-provider-scaleway/v2/internal/provider" @@ -24,10 +23,7 @@ func main() { serveOpts = append(serveOpts, tf5server.WithManagedDebug()) } - providers := []func() tfprotov5.ProviderServer{ - // SDKProvider using terraform-plugin-sdk - provider.SDKProvider(provider.DefaultConfig())().GRPCProvider, - } + providers := provider.NewProviderList(nil) muxServer, err := tf5muxserver.NewMuxServer(ctx, providers...) if err != nil {