diff --git a/README.md b/README.md index f1d05bfec..562534103 100644 --- a/README.md +++ b/README.md @@ -10,22 +10,18 @@ ## Requirements -- [Terraform](https://www.terraform.io/downloads.html) 0.10.x -- [Go](https://golang.org/doc/install) 1.11 (to build the provider plugin) +- [Terraform](https://www.terraform.io/downloads.html) 1.0 +- [Go](https://golang.org/doc/install) 1.25 (to build the provider plugin) ## Building The Provider -Clone repository to: `$GOPATH/src/github.com/scaleway/terraform-provider-scaleway` - ```sh -$ mkdir -p $GOPATH/src/github.com/scaleway; cd $GOPATH/src/github.com/scaleway $ git clone git@github.com:scaleway/terraform-provider-scaleway.git ``` Enter the provider directory and build the provider ```sh -$ cd $GOPATH/src/github.com/scaleway/terraform-provider-scaleway $ make build ``` diff --git a/internal/acctest/acctest.go b/internal/acctest/acctest.go index c177d3954..6fdcae1a8 100644 --- a/internal/acctest/acctest.go +++ b/internal/acctest/acctest.go @@ -1,15 +1,14 @@ package acctest import ( - "context" "os" "strconv" "strings" "testing" "time" - "github.com/hashicorp/terraform-plugin-go/tfprotov5" - "github.com/hashicorp/terraform-plugin-mux/tf5muxserver" + "github.com/hashicorp/terraform-plugin-go/tfprotov6" + "github.com/hashicorp/terraform-plugin-mux/tf6muxserver" "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" @@ -22,7 +21,7 @@ func PreCheck(_ *testing.T) {} type TestTools struct { T *testing.T Meta *meta.Meta - ProviderFactories map[string]func() (tfprotov5.ProviderServer, error) + ProviderFactories map[string]func() (tfprotov6.ProviderServer, error) Cleanup func() } @@ -66,14 +65,16 @@ func NewTestTools(t *testing.T) *TestTools { return &TestTools{ T: t, Meta: m, - 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 + ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){ + "scaleway": func() (tfprotov6.ProviderServer, error) { + providers, errProvider := provider.NewProviderList(ctx, &provider.Config{Meta: m}) + if errProvider != nil { + return nil, errProvider + } + + muxServer, errMux := tf6muxserver.NewMuxServer(ctx, providers...) + if errMux != nil { + return nil, errMux } return muxServer.ProviderServer(), nil diff --git a/internal/acctest/fixtures.go b/internal/acctest/fixtures.go index a0e3f7e6e..c5545bca3 100644 --- a/internal/acctest/fixtures.go +++ b/internal/acctest/fixtures.go @@ -3,8 +3,8 @@ package acctest import ( "context" - "github.com/hashicorp/terraform-plugin-go/tfprotov5" - "github.com/hashicorp/terraform-plugin-mux/tf5muxserver" + "github.com/hashicorp/terraform-plugin-go/tfprotov6" + "github.com/hashicorp/terraform-plugin-mux/tf6muxserver" 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" @@ -18,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() (tfprotov5.ProviderServer, error) { +func FakeSideProjectProviders(ctx context.Context, tt *TestTools, project *account.Project, iamAPIKey *iam.APIKey) map[string]func() (tfprotov6.ProviderServer, error) { t := tt.T metaSide, err := meta.NewMeta(ctx, &meta.Config{ @@ -31,13 +31,16 @@ func FakeSideProjectProviders(ctx context.Context, tt *TestTools, project *accou }) require.NoError(t, err) - providers := map[string]func() (tfprotov5.ProviderServer, error){ - "side": func() (tfprotov5.ProviderServer, error) { - providers := provider.NewProviderList(&provider.Config{Meta: metaSide}) + providers := map[string]func() (tfprotov6.ProviderServer, error){ + "side": func() (tfprotov6.ProviderServer, error) { + providers, errProvider := provider.NewProviderList(ctx, &provider.Config{Meta: metaSide}) + if errProvider != nil { + return nil, errProvider + } - muxServer, err := tf5muxserver.NewMuxServer(ctx, providers...) - if err != nil { - return nil, err + muxServer, errMux := tf6muxserver.NewMuxServer(ctx, providers...) + if errMux != nil { + return nil, errMux } return muxServer.ProviderServer(), nil diff --git a/internal/provider/providers.go b/internal/provider/providers.go index f6af86026..c87b81565 100644 --- a/internal/provider/providers.go +++ b/internal/provider/providers.go @@ -1,16 +1,29 @@ package provider import ( + "context" + "github.com/hashicorp/terraform-plugin-framework/providerserver" - "github.com/hashicorp/terraform-plugin-go/tfprotov5" + "github.com/hashicorp/terraform-plugin-go/tfprotov6" + "github.com/hashicorp/terraform-plugin-mux/tf5to6server" ) -func NewProviderList(config *Config) []func() tfprotov5.ProviderServer { - return []func() tfprotov5.ProviderServer{ - // Provider using terraform-plugin-framework - providerserver.NewProtocol5(&ScalewayProvider{}), - - // SDKProvider using terraform-plugin-sdk +func NewProviderList(ctx context.Context, config *Config) ([]func() tfprotov6.ProviderServer, error) { + // SDKProvider using terraform-plugin-sdk + upgradedSdkProvider, err := tf5to6server.UpgradeServer( + ctx, SDKProvider(config)().GRPCProvider, + ) + if err != nil { + return nil, err } + + return []func() tfprotov6.ProviderServer{ + // Provider using terraform-plugin-framework + providerserver.NewProtocol6(&ScalewayProvider{}), + + func() tfprotov6.ProviderServer { + return upgradedSdkProvider + }, + }, nil } diff --git a/internal/provider/providers_test.go b/internal/provider/providers_test.go index c7b7f0d4d..4f700c476 100644 --- a/internal/provider/providers_test.go +++ b/internal/provider/providers_test.go @@ -13,7 +13,7 @@ func TestMuxServer(t *testing.T) { defer tt.Cleanup() resource.Test(t, resource.TestCase{ - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/account/project_data_source_test.go b/internal/services/account/project_data_source_test.go index 5e2a0bd45..03fd4ea94 100644 --- a/internal/services/account/project_data_source_test.go +++ b/internal/services/account/project_data_source_test.go @@ -21,7 +21,7 @@ func TestAccDataSourceProject_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( isProjectDestroyed(tt), ), @@ -62,7 +62,7 @@ func TestAccDataSourceProject_Default(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -106,7 +106,7 @@ func TestAccDataSourceProject_Extract(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, Steps: []resource.TestStep{ { Config: `data scaleway_account_project "project" {}`, @@ -130,7 +130,7 @@ func TestAccDataSourceProject_List(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( isProjectDestroyed(tt), ), diff --git a/internal/services/account/project_test.go b/internal/services/account/project_test.go index d408f896a..360636db2 100644 --- a/internal/services/account/project_test.go +++ b/internal/services/account/project_test.go @@ -22,7 +22,7 @@ func TestAccProject_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isProjectDestroyed(tt), Steps: []resource.TestStep{ { @@ -60,7 +60,7 @@ func TestAccProject_NoUpdate(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isProjectDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/applesilicon/server_test.go b/internal/services/applesilicon/server_test.go index eab9ec3a9..9cf4c466b 100644 --- a/internal/services/applesilicon/server_test.go +++ b/internal/services/applesilicon/server_test.go @@ -18,7 +18,7 @@ func TestAccServer_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isServerDestroyed(tt), Steps: []resource.TestStep{ { @@ -71,7 +71,7 @@ func TestAccServer_EnableDisabledVPC(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isServerDestroyed(tt), Steps: []resource.TestStep{ { @@ -126,7 +126,7 @@ func TestAccServer_EnableVPC(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isServerDestroyed(tt), Steps: []resource.TestStep{ { @@ -271,7 +271,7 @@ func TestAccServer_Commitment(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isServerDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/autoscaling/instance_group_test.go b/internal/services/autoscaling/instance_group_test.go index 3d8f3a2fc..e4dda24f1 100644 --- a/internal/services/autoscaling/instance_group_test.go +++ b/internal/services/autoscaling/instance_group_test.go @@ -18,7 +18,7 @@ func TestAccInstanceGroup_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckInstanceGroupDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/autoscaling/instance_policy_test.go b/internal/services/autoscaling/instance_policy_test.go index 3cf57a4a7..312788487 100644 --- a/internal/services/autoscaling/instance_policy_test.go +++ b/internal/services/autoscaling/instance_policy_test.go @@ -18,7 +18,7 @@ func TestAccInstancePolicy_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckInstancePolicyDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/autoscaling/instance_template_test.go b/internal/services/autoscaling/instance_template_test.go index 15128eccd..03c474fbf 100644 --- a/internal/services/autoscaling/instance_template_test.go +++ b/internal/services/autoscaling/instance_template_test.go @@ -18,7 +18,7 @@ func TestAccInstanceTemplate_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckInstanceTemplateDestroy(tt), Steps: []resource.TestStep{ { @@ -75,7 +75,7 @@ func TestAccInstanceTemplate_PrivateNetwork(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckInstanceTemplateDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/az/availability_zones_data_source_test.go b/internal/services/az/availability_zones_data_source_test.go index 897eda678..99a43fdbe 100644 --- a/internal/services/az/availability_zones_data_source_test.go +++ b/internal/services/az/availability_zones_data_source_test.go @@ -13,7 +13,7 @@ func TestAccDataSourceAvailabilityZones_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 d65e3ba28..8187b7100 100644 --- a/internal/services/baremetal/offer_data_source_test.go +++ b/internal/services/baremetal/offer_data_source_test.go @@ -24,7 +24,7 @@ func TestAccDataSourceOffer_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -70,7 +70,7 @@ func TestAccDataSourceOffer_SubscriptionPeriodHourly(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -120,7 +120,7 @@ func TestAccDataSourceOffer_SubscriptionPeriodMonthly(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 50a857a90..34553bb3e 100644 --- a/internal/services/baremetal/option_data_source_test.go +++ b/internal/services/baremetal/option_data_source_test.go @@ -18,7 +18,7 @@ func TestAccDataSourceOption_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: baremetalchecks.CheckServerDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/baremetal/os_data_source_test.go b/internal/services/baremetal/os_data_source_test.go index b99e5f541..f00f26c60 100644 --- a/internal/services/baremetal/os_data_source_test.go +++ b/internal/services/baremetal/os_data_source_test.go @@ -18,7 +18,7 @@ func TestAccDataSourceOS_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: baremetalchecks.CheckServerDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/baremetal/partition_schema_source_test.go b/internal/services/baremetal/partition_schema_source_test.go index 918f8f880..e221f40d4 100644 --- a/internal/services/baremetal/partition_schema_source_test.go +++ b/internal/services/baremetal/partition_schema_source_test.go @@ -30,7 +30,7 @@ func TestAccPartitionSchemaDataSource_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( baremetalchecks.CheckServerDestroy(tt), ), @@ -98,7 +98,7 @@ func TestAccPartitionSchemaDataSource_WithoutExtraPart(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( baremetalchecks.CheckServerDestroy(tt), ), @@ -165,7 +165,7 @@ func TestAccPartitionSchemaDataSource_WithoutSwapAndExtraPart(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( baremetalchecks.CheckServerDestroy(tt), ), @@ -232,7 +232,7 @@ func TestAccPartitionSchemaDataSource_WithAlternateOffer(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( baremetalchecks.CheckServerDestroy(tt), ), @@ -301,7 +301,7 @@ func TestAccPartitionSchemaDataSource_IncompatibleOS(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( baremetalchecks.CheckServerDestroy(tt), ), @@ -363,7 +363,7 @@ func TestAccPartitionSchemaDataSource_IncompatibleOffer(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 6454c9517..09fc5a41d 100644 --- a/internal/services/baremetal/server_data_source_test.go +++ b/internal/services/baremetal/server_data_source_test.go @@ -23,7 +23,7 @@ func TestAccDataSourceServer_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: baremetalchecks.CheckServerDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/baremetal/server_test.go b/internal/services/baremetal/server_test.go index c532da994..4be460763 100644 --- a/internal/services/baremetal/server_test.go +++ b/internal/services/baremetal/server_test.go @@ -35,7 +35,7 @@ func TestAccServer_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: baremetalchecks.CheckServerDestroy(tt), Steps: []resource.TestStep{ { @@ -127,7 +127,7 @@ func TestAccServer_RequiredInstallConfig(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: baremetalchecks.CheckServerDestroy(tt), Steps: []resource.TestStep{ { @@ -152,7 +152,7 @@ func TestAccServer_WithoutInstallConfig(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: baremetalchecks.CheckServerDestroy(tt), Steps: []resource.TestStep{ { @@ -192,7 +192,7 @@ func TestAccServer_CreateServerWithCustomInstallConfig(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: baremetalchecks.CheckServerDestroy(tt), Steps: []resource.TestStep{ { @@ -246,7 +246,7 @@ func TestAccServer_CreateServerWithServicePassword(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: baremetalchecks.CheckServerDestroy(tt), Steps: []resource.TestStep{ { @@ -303,7 +303,7 @@ func TestAccServer_CreateServerWithOption(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: baremetalchecks.CheckServerDestroy(tt), Steps: []resource.TestStep{ { @@ -369,7 +369,7 @@ func TestAccServer_AddOption(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: baremetalchecks.CheckServerDestroy(tt), Steps: []resource.TestStep{ { @@ -461,7 +461,7 @@ func TestAccServer_AddTwoOptionsThenDeleteOne(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: baremetalchecks.CheckServerDestroy(tt), Steps: []resource.TestStep{ { @@ -616,7 +616,7 @@ func TestAccServer_CreateServerWithPrivateNetwork(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( baremetalchecks.CheckServerDestroy(tt), ), @@ -688,7 +688,7 @@ func TestAccServer_AddPrivateNetwork(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( baremetalchecks.CheckServerDestroy(tt), ), @@ -801,7 +801,7 @@ func TestAccServer_AddAnotherPrivateNetwork(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( baremetalchecks.CheckServerDestroy(tt), ), @@ -927,7 +927,7 @@ func TestAccServer_WithIPAMPrivateNetwork(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( baremetalchecks.CheckServerDestroy(tt), ), @@ -1106,7 +1106,7 @@ func TestAccServer_UpdateSubscriptionPeriod(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 6c8be3173..bcb7be6b0 100644 --- a/internal/services/billing/consumption_data_source_test.go +++ b/internal/services/billing/consumption_data_source_test.go @@ -15,7 +15,7 @@ func TestAccDataSourceConsumption_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 21daaed21..1d08267fd 100644 --- a/internal/services/billing/invoices_data_source_test.go +++ b/internal/services/billing/invoices_data_source_test.go @@ -13,7 +13,7 @@ func TestAccDataSourceInvoices_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 2752160c4..2d0b28349 100644 --- a/internal/services/block/snapshot_data_source_test.go +++ b/internal/services/block/snapshot_data_source_test.go @@ -14,7 +14,7 @@ func TestAccDataSourceSnapshot_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 725030b31..35f333095 100644 --- a/internal/services/block/snapshot_test.go +++ b/internal/services/block/snapshot_test.go @@ -17,7 +17,7 @@ func TestAccSnapshot_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: blocktestfuncs.IsSnapshotDestroyed(tt), Steps: []resource.TestStep{ { @@ -49,7 +49,7 @@ func TestAccSnapshot_FromS3(t *testing.T) { bucketName := sdkacctest.RandomWithPrefix("test-acc-scaleway-block-snapshot") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( blocktestfuncs.IsSnapshotDestroyed(tt), objectchecks.IsObjectDestroyed(tt), @@ -93,7 +93,7 @@ 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) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 33c02a741..a1b7d6e9e 100644 --- a/internal/services/block/volume_data_source_test.go +++ b/internal/services/block/volume_data_source_test.go @@ -14,7 +14,7 @@ func TestAccDataSourceVolume_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 0335e0155..660482073 100644 --- a/internal/services/block/volume_test.go +++ b/internal/services/block/volume_test.go @@ -14,7 +14,7 @@ func TestAccVolume_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: blocktestfuncs.IsVolumeDestroyed(tt), Steps: []resource.TestStep{ { @@ -44,7 +44,7 @@ func TestAccVolume_UpdateSize(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: blocktestfuncs.IsVolumeDestroyed(tt), Steps: []resource.TestStep{ { @@ -105,7 +105,7 @@ func TestAccVolume_FromSnapshot(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: blocktestfuncs.IsVolumeDestroyed(tt), Steps: []resource.TestStep{ { @@ -144,7 +144,7 @@ func TestAccVolume_FromSnapshotWithSize(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: blocktestfuncs.IsVolumeDestroyed(tt), Steps: []resource.TestStep{ { @@ -184,7 +184,7 @@ func TestAccVolume_UpdateIops(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: blocktestfuncs.IsVolumeDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/cockpit/alert_manager_test.go b/internal/services/cockpit/alert_manager_test.go index 086ccd3aa..e4b86162a 100644 --- a/internal/services/cockpit/alert_manager_test.go +++ b/internal/services/cockpit/alert_manager_test.go @@ -22,7 +22,7 @@ func TestAccCockpitAlertManager_CreateWithSingleContact(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCockpitAlertManagerAndContactsDestroy(tt), Steps: []resource.TestStep{ { @@ -60,7 +60,7 @@ func TestAccCockpitAlertManager_CreateWithMultipleContacts(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCockpitAlertManagerAndContactsDestroy(tt), Steps: []resource.TestStep{ { @@ -102,7 +102,7 @@ func TestAccCockpitAlertManager_UpdateSingleContact(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCockpitAlertManagerAndContactsDestroy(tt), Steps: []resource.TestStep{ { @@ -146,7 +146,7 @@ func TestAccCockpitAlertManager_EnableDisable(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCockpitAlertManagerAndContactsDestroy(tt), Steps: []resource.TestStep{ { @@ -175,7 +175,7 @@ func TestAccCockpitAlertManager_IDHandling(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCockpitAlertManagerAndContactsDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/cockpit/cockpit_data_source_test.go b/internal/services/cockpit/cockpit_data_source_test.go index 8eb9c78ba..45fa9b10f 100644 --- a/internal/services/cockpit/cockpit_data_source_test.go +++ b/internal/services/cockpit/cockpit_data_source_test.go @@ -13,7 +13,7 @@ func TestAccDataSourceCockpit_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/cockpit/cockpit_test.go b/internal/services/cockpit/cockpit_test.go index 3cc4374c9..490bb213c 100644 --- a/internal/services/cockpit/cockpit_test.go +++ b/internal/services/cockpit/cockpit_test.go @@ -15,7 +15,7 @@ func TestAccCockpit_Simple(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isCockpitDestroyed(tt), Steps: []resource.TestStep{ { @@ -39,7 +39,7 @@ func TestAccCockpit_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isCockpitDestroyed(tt), Steps: []resource.TestStep{ { @@ -73,7 +73,7 @@ func TestAccCockpit_WithSourceEndpoints(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isCockpitDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/cockpit/grafana_user_test.go b/internal/services/cockpit/grafana_user_test.go index 57381ae3f..e10af70a6 100644 --- a/internal/services/cockpit/grafana_user_test.go +++ b/internal/services/cockpit/grafana_user_test.go @@ -22,7 +22,7 @@ func TestAccGrafanaUser_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isGrafanaUserDestroyed(tt), Steps: []resource.TestStep{ { @@ -66,7 +66,7 @@ func TestAccGrafanaUser_Update(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isGrafanaUserDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/cockpit/source_data_source_test.go b/internal/services/cockpit/source_data_source_test.go index 2b72382b4..39dd58e6d 100644 --- a/internal/services/cockpit/source_data_source_test.go +++ b/internal/services/cockpit/source_data_source_test.go @@ -14,7 +14,7 @@ func TestAccCockpitSource_DataSource_ByID(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isSourceDestroyed(tt), Steps: []resource.TestStep{ { @@ -50,7 +50,7 @@ func TestAccCockpitSource_DataSource_ByName(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isSourceDestroyed(tt), Steps: []resource.TestStep{ { @@ -93,7 +93,7 @@ func TestAccCockpitSource_DataSource_Defaults(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, Steps: []resource.TestStep{ { @@ -136,7 +136,7 @@ func TestAccCockpitSource_DataSource_ByRegion(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isSourceDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/cockpit/source_test.go b/internal/services/cockpit/source_test.go index bf1faf958..ce410bdc3 100644 --- a/internal/services/cockpit/source_test.go +++ b/internal/services/cockpit/source_test.go @@ -23,7 +23,7 @@ func TestAccCockpitSource_Basic_metrics(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isSourceDestroyed(tt), Steps: []resource.TestStep{ { @@ -64,7 +64,7 @@ func TestAccCockpitSource_Basic_logs(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isSourceDestroyed(tt), Steps: []resource.TestStep{ { @@ -105,7 +105,7 @@ func TestAccCockpitSource_retention_days(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isSourceDestroyed(tt), Steps: []resource.TestStep{ { @@ -147,7 +147,7 @@ func TestAccCockpitSource_Update(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 a302a5021..7eee0baf2 100644 --- a/internal/services/cockpit/sources_data_source_test.go +++ b/internal/services/cockpit/sources_data_source_test.go @@ -14,7 +14,7 @@ func TestAccCockpitSources_DataSource_All(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isSourceDestroyed(tt), Steps: []resource.TestStep{ { @@ -62,7 +62,7 @@ func TestAccCockpitSources_DataSource_ByType(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isSourceDestroyed(tt), Steps: []resource.TestStep{ { @@ -107,7 +107,7 @@ func TestAccCockpitSources_DataSource_ByName(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isSourceDestroyed(tt), Steps: []resource.TestStep{ { @@ -152,7 +152,7 @@ func TestAccCockpitSources_DataSource_Empty(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, Steps: []resource.TestStep{ { Config: ` @@ -183,7 +183,7 @@ func TestAccCockpitSources_DataSource_DefaultSources(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 392faab7e..c75ae42f4 100644 --- a/internal/services/cockpit/token_test.go +++ b/internal/services/cockpit/token_test.go @@ -21,7 +21,7 @@ func TestAccToken_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isTokenDestroyed(tt), Steps: []resource.TestStep{ { @@ -67,7 +67,7 @@ func TestAccToken_NoScopes(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isTokenDestroyed(tt), Steps: []resource.TestStep{ { @@ -109,7 +109,7 @@ func TestAccToken_Update(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isTokenDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/container/container_data_source_test.go b/internal/services/container/container_data_source_test.go index 41f6d9cc5..ee0bec4a6 100644 --- a/internal/services/container/container_data_source_test.go +++ b/internal/services/container/container_data_source_test.go @@ -13,7 +13,7 @@ func TestAccDataSourceContainer_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isNamespaceDestroyed(tt), Steps: []resource.TestStep{ { @@ -56,7 +56,7 @@ func TestAccDataSourceContainer_HealthCheck(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isNamespaceDestroyed(tt), Steps: []resource.TestStep{ { @@ -94,7 +94,7 @@ func TestAccDataSourceContainer_ScalingOption(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isNamespaceDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/container/container_test.go b/internal/services/container/container_test.go index 3f62cdf62..d91dfee19 100644 --- a/internal/services/container/container_test.go +++ b/internal/services/container/container_test.go @@ -21,7 +21,7 @@ func TestAccContainer_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isContainerDestroyed(tt), Steps: []resource.TestStep{ { @@ -139,7 +139,7 @@ func TestAccContainer_Env(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isContainerDestroyed(tt), Steps: []resource.TestStep{ { @@ -225,7 +225,7 @@ func TestAccContainer_WithIMG(t *testing.T) { containerNamespace := "test-cr-ns-02" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isContainerDestroyed(tt), Steps: []resource.TestStep{ { @@ -283,7 +283,7 @@ func TestAccContainer_HTTPOption(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isContainerDestroyed(tt), Steps: []resource.TestStep{ { @@ -340,7 +340,7 @@ func TestAccContainer_Sandbox(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isContainerDestroyed(tt), Steps: []resource.TestStep{ { @@ -411,7 +411,7 @@ func TestAccContainer_HealthCheck(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isContainerDestroyed(tt), Steps: []resource.TestStep{ { @@ -466,7 +466,7 @@ func TestAccContainer_ScalingOption(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isContainerDestroyed(tt), Steps: []resource.TestStep{ { @@ -556,7 +556,7 @@ func TestAccContainer_CommandAndArgs(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isContainerDestroyed(tt), Steps: []resource.TestStep{ { @@ -639,7 +639,7 @@ func TestAccContainer_PrivateNetwork(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 38cd5a74d..c8abfefdc 100644 --- a/internal/services/container/cron_test.go +++ b/internal/services/container/cron_test.go @@ -18,7 +18,7 @@ func TestAccCron_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isCronDestroyed(tt), Steps: []resource.TestStep{ { @@ -81,7 +81,7 @@ func TestAccCron_WithMultiArgs(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isCronDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/container/domain_test.go b/internal/services/container/domain_test.go index 23bd24532..f6608086e 100644 --- a/internal/services/container/domain_test.go +++ b/internal/services/container/domain_test.go @@ -22,7 +22,7 @@ func TestAccDomain_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isDomainDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/container/namespace_data_source_test.go b/internal/services/container/namespace_data_source_test.go index b41cdbb7d..72528ae12 100644 --- a/internal/services/container/namespace_data_source_test.go +++ b/internal/services/container/namespace_data_source_test.go @@ -13,7 +13,7 @@ func TestAccDataSourceNamespace_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isNamespaceDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/container/namespace_test.go b/internal/services/container/namespace_test.go index 802f38816..a434e33d4 100644 --- a/internal/services/container/namespace_test.go +++ b/internal/services/container/namespace_test.go @@ -23,7 +23,7 @@ func TestAccNamespace_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isNamespaceDestroyed(tt), Steps: []resource.TestStep{ { @@ -181,7 +181,7 @@ func TestAccNamespace_SecretManagement(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isNamespaceDestroyed(tt), Steps: []resource.TestStep{ { @@ -243,7 +243,7 @@ func TestAccNamespace_DestroyRegistry(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( isNamespaceDestroyed(tt), isRegistryDestroyed(tt), @@ -274,7 +274,7 @@ func TestAccNamespace_VPCIntegration(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 8b0f2f4c8..3c601501b 100644 --- a/internal/services/container/token_test.go +++ b/internal/services/container/token_test.go @@ -26,7 +26,7 @@ func TestAccToken_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isTokenDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/container/trigger_test.go b/internal/services/container/trigger_test.go index 31daf68cf..e0cb94cd7 100644 --- a/internal/services/container/trigger_test.go +++ b/internal/services/container/trigger_test.go @@ -63,7 +63,7 @@ func TestAccTrigger_SQS(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isTriggerDestroyed(tt), Steps: []resource.TestStep{ { @@ -110,7 +110,7 @@ func TestAccTrigger_Nats(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isTriggerDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/domain/record_data_source_test.go b/internal/services/domain/record_data_source_test.go index 0b2d72cec..0df540026 100644 --- a/internal/services/domain/record_data_source_test.go +++ b/internal/services/domain/record_data_source_test.go @@ -14,7 +14,7 @@ func TestAccDataSourceDomainRecord_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckDomainRecordDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/domain/record_test.go b/internal/services/domain/record_test.go index 9740a6d20..54d93a528 100644 --- a/internal/services/domain/record_test.go +++ b/internal/services/domain/record_test.go @@ -32,7 +32,7 @@ func TestAccDomainRecord_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckDomainRecordDestroy(tt), Steps: []resource.TestStep{ { @@ -177,7 +177,7 @@ func TestAccDomainRecord_Basic2(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckDomainRecordDestroy(tt), Steps: []resource.TestStep{ { @@ -251,7 +251,7 @@ func TestAccDomainRecord_Arobase(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckDomainRecordDestroy(tt), Steps: []resource.TestStep{ { @@ -298,7 +298,7 @@ func TestAccDomainRecord_GeoIP(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckDomainRecordDestroy(tt), Steps: []resource.TestStep{ { @@ -394,7 +394,7 @@ func TestAccDomainRecord_HTTPService(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckDomainRecordDestroy(tt), Steps: []resource.TestStep{ { @@ -481,7 +481,7 @@ func TestAccDomainRecord_View(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckDomainRecordDestroy(tt), Steps: []resource.TestStep{ { @@ -573,7 +573,7 @@ func TestAccDomainRecord_Weighted(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckDomainRecordDestroy(tt), Steps: []resource.TestStep{ { @@ -665,7 +665,7 @@ func TestAccDomainRecord_SRVZone(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckDomainRecordDestroy(tt), Steps: []resource.TestStep{ { @@ -707,7 +707,7 @@ func TestAccDomainRecord_SRVWithDomainDuplication(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckDomainRecordDestroy(tt), Steps: []resource.TestStep{ { @@ -803,7 +803,7 @@ func TestAccDomainRecord_CNAME(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckDomainRecordDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/domain/registration_test.go b/internal/services/domain/registration_test.go index f07a27406..51b25257e 100644 --- a/internal/services/domain/registration_test.go +++ b/internal/services/domain/registration_test.go @@ -27,7 +27,7 @@ func TestAccDomainRegistration_SingleDomainWithUpdate(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckDomainDestroy(tt), Steps: []resource.TestStep{ { @@ -109,7 +109,7 @@ func TestAccDomainRegistration_MultipleDomainsUpdate(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckDomainDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/domain/zone_data_source_test.go b/internal/services/domain/zone_data_source_test.go index 7dae2c29b..20d74dc9d 100644 --- a/internal/services/domain/zone_data_source_test.go +++ b/internal/services/domain/zone_data_source_test.go @@ -16,7 +16,7 @@ func TestAccDataSourceDomainZone_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckDomainZoneDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/domain/zone_test.go b/internal/services/domain/zone_test.go index 460dce32a..9e060afbd 100644 --- a/internal/services/domain/zone_test.go +++ b/internal/services/domain/zone_test.go @@ -22,7 +22,7 @@ func TestAccDomainZone_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckDomainZoneDestroy(tt), Steps: []resource.TestStep{ { @@ -51,7 +51,7 @@ func TestAccDomainZone_RootZone(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckDomainZoneDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/edgeservices/backend_stage_test.go b/internal/services/edgeservices/backend_stage_test.go index 947508d49..cc773b25f 100644 --- a/internal/services/edgeservices/backend_stage_test.go +++ b/internal/services/edgeservices/backend_stage_test.go @@ -14,7 +14,7 @@ func TestAccEdgeServicesBackend_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: edgeservicestestfuncs.CheckEdgeServicesBackendDestroy(tt), Steps: []resource.TestStep{ { @@ -61,7 +61,7 @@ func TestAccEdgeServicesBackend_LB(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: edgeservicestestfuncs.CheckEdgeServicesBackendDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/edgeservices/cache_stage_test.go b/internal/services/edgeservices/cache_stage_test.go index 6129be232..f0891f52a 100644 --- a/internal/services/edgeservices/cache_stage_test.go +++ b/internal/services/edgeservices/cache_stage_test.go @@ -14,7 +14,7 @@ func TestAccEdgeServicesCache_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: edgeservicestestfuncs.CheckEdgeServicesCacheDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/edgeservices/dns_stage_test.go b/internal/services/edgeservices/dns_stage_test.go index d14c4eb8e..415c82b66 100644 --- a/internal/services/edgeservices/dns_stage_test.go +++ b/internal/services/edgeservices/dns_stage_test.go @@ -14,7 +14,7 @@ func TestAccEdgeServicesDNS_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: edgeservicestestfuncs.CheckEdgeServicesDNSDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/edgeservices/pipeline_test.go b/internal/services/edgeservices/pipeline_test.go index 1cd86a7f0..8a2e97695 100644 --- a/internal/services/edgeservices/pipeline_test.go +++ b/internal/services/edgeservices/pipeline_test.go @@ -14,7 +14,7 @@ func TestAccEdgeServicesPipeline_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: edgeservicestestfuncs.CheckEdgeServicesCacheDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/edgeservices/plan_test.go b/internal/services/edgeservices/plan_test.go index bf6ca632f..a39221165 100644 --- a/internal/services/edgeservices/plan_test.go +++ b/internal/services/edgeservices/plan_test.go @@ -14,7 +14,7 @@ func TestAccEdgeServicesPlan_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: edgeservicestestfuncs.CheckEdgeServicesDNSDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/edgeservices/route_stage_test.go b/internal/services/edgeservices/route_stage_test.go index 8ee32ba96..dbe491f87 100644 --- a/internal/services/edgeservices/route_stage_test.go +++ b/internal/services/edgeservices/route_stage_test.go @@ -14,7 +14,7 @@ func TestAccEdgeServicesRoute_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: edgeservicestestfuncs.CheckEdgeServicesRouteDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/edgeservices/tls_stage_test.go b/internal/services/edgeservices/tls_stage_test.go index 37f6c8a44..71165daa1 100644 --- a/internal/services/edgeservices/tls_stage_test.go +++ b/internal/services/edgeservices/tls_stage_test.go @@ -14,7 +14,7 @@ func TestAccEdgeServicesTLS_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: edgeservicestestfuncs.CheckEdgeServicesTLSDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/edgeservices/waf_stage_test.go b/internal/services/edgeservices/waf_stage_test.go index 7118a8382..6c85cbb00 100644 --- a/internal/services/edgeservices/waf_stage_test.go +++ b/internal/services/edgeservices/waf_stage_test.go @@ -14,7 +14,7 @@ func TestAccEdgeServicesWAF_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: edgeservicestestfuncs.CheckEdgeServicesWAFDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/file/filesystem_test.go b/internal/services/file/filesystem_test.go index e0e501dcb..1f1577ae9 100644 --- a/internal/services/file/filesystem_test.go +++ b/internal/services/file/filesystem_test.go @@ -24,7 +24,7 @@ func TestAccFileSystem_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: filetestfuncs.CheckFileDestroy(tt), Steps: []resource.TestStep{ { @@ -65,7 +65,7 @@ func TestAccFileSystem_SizeTooSmallFails(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: filetestfuncs.CheckFileDestroy(tt), Steps: []resource.TestStep{ { @@ -90,7 +90,7 @@ func TestAccFileSystem_InvalidSizeGranularityFails(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: filetestfuncs.CheckFileDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/flexibleip/data_source_flexible_ip_test.go b/internal/services/flexibleip/data_source_flexible_ip_test.go index 07bcad33b..dde87caa8 100644 --- a/internal/services/flexibleip/data_source_flexible_ip_test.go +++ b/internal/services/flexibleip/data_source_flexible_ip_test.go @@ -13,7 +13,7 @@ func TestAccDataSourceFlexibleIP_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckFlexibleIPDestroy(tt), Steps: []resource.TestStep{ { @@ -51,7 +51,7 @@ func TestAccDataSourceFlexibleIP_Multiple(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckFlexibleIPDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/flexibleip/data_source_flexible_ips_test.go b/internal/services/flexibleip/data_source_flexible_ips_test.go index 04af02f77..ea9875758 100644 --- a/internal/services/flexibleip/data_source_flexible_ips_test.go +++ b/internal/services/flexibleip/data_source_flexible_ips_test.go @@ -14,7 +14,7 @@ func TestAccDataSourceFlexibleIPs_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: lbchecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { @@ -64,7 +64,7 @@ func TestAccDataSourceFlexibleIPs_WithBaremetalIDs(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: lbchecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/flexibleip/ip_test.go b/internal/services/flexibleip/ip_test.go index 869f4c8cc..253eaba0b 100644 --- a/internal/services/flexibleip/ip_test.go +++ b/internal/services/flexibleip/ip_test.go @@ -29,7 +29,7 @@ func TestAccFlexibleIP_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckFlexibleIPDestroy(tt), Steps: []resource.TestStep{ { @@ -55,7 +55,7 @@ func TestAccFlexibleIP_WithZone(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckFlexibleIPDestroy(tt), Steps: []resource.TestStep{ { @@ -87,7 +87,7 @@ func TestAccFlexibleIP_IPv6(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckFlexibleIPDestroy(tt), Steps: []resource.TestStep{ { @@ -114,7 +114,7 @@ func TestAccFlexibleIP_CreateAndAttachToBaremetalServer(t *testing.T) { name := "TestAccScalewayFlexibleIP_CreateAndAttachToBaremetalServer" resource.ParallelTest(t, resource.TestCase{ - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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{ - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 a3c4d5fda..fcf1e7980 100644 --- a/internal/services/flexibleip/mac_address_test.go +++ b/internal/services/flexibleip/mac_address_test.go @@ -18,7 +18,7 @@ func TestAccFlexibleIPMACAddress_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckFlexibleIPDestroy(tt), Steps: []resource.TestStep{ { @@ -47,7 +47,7 @@ func TestAccFlexibleIPMACAddress_MoveToAnotherFlexibleIP(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckFlexibleIPDestroy(tt), Steps: []resource.TestStep{ { @@ -103,7 +103,7 @@ func TestAccFlexibleIPMACAddress_DuplicateOnOtherFlexibleIPs(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 7533092fd..dbc95cd09 100644 --- a/internal/services/function/cron_test.go +++ b/internal/services/function/cron_test.go @@ -18,7 +18,7 @@ func TestAccFunctionCron_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckFunctionCronDestroy(tt), Steps: []resource.TestStep{ { @@ -58,7 +58,7 @@ func TestAccFunctionCron_NameUpdate(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckFunctionCronDestroy(tt), Steps: []resource.TestStep{ { @@ -124,7 +124,7 @@ func TestAccFunctionCron_WithArgs(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckFunctionCronDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/function/data_source_function_namespace_test.go b/internal/services/function/data_source_function_namespace_test.go index 64c690ef1..72fa64064 100644 --- a/internal/services/function/data_source_function_namespace_test.go +++ b/internal/services/function/data_source_function_namespace_test.go @@ -13,7 +13,7 @@ func TestAccDataSourceFunctionNamespace_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckFunctionNamespaceDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/function/data_source_function_test.go b/internal/services/function/data_source_function_test.go index 32656faff..97f3ff7c4 100644 --- a/internal/services/function/data_source_function_test.go +++ b/internal/services/function/data_source_function_test.go @@ -13,7 +13,7 @@ func TestAccDataSourceFunction_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckFunctionDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/function/domain_test.go b/internal/services/function/domain_test.go index 58926c8f8..01a17a034 100644 --- a/internal/services/function/domain_test.go +++ b/internal/services/function/domain_test.go @@ -22,7 +22,7 @@ func TestAccFunctionDomain_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckFunctionDomainDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/function/function_test.go b/internal/services/function/function_test.go index befd6387e..0de152d85 100644 --- a/internal/services/function/function_test.go +++ b/internal/services/function/function_test.go @@ -21,7 +21,7 @@ func TestAccFunction_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckFunctionDestroy(tt), Steps: []resource.TestStep{ { @@ -60,7 +60,7 @@ func TestAccFunction_Timeout(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckFunctionDestroy(tt), Steps: []resource.TestStep{ { @@ -95,7 +95,7 @@ func TestAccFunction_NoName(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckFunctionNamespaceDestroy(tt), Steps: []resource.TestStep{ { @@ -124,7 +124,7 @@ func TestAccFunction_EnvironmentVariables(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckFunctionDestroy(tt), Steps: []resource.TestStep{ { @@ -187,7 +187,7 @@ func TestAccFunction_Upload(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckFunctionDestroy(tt), Steps: []resource.TestStep{ { @@ -217,7 +217,7 @@ func TestAccFunction_Deploy(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckFunctionDestroy(tt), Steps: []resource.TestStep{ { @@ -267,7 +267,7 @@ func TestAccFunction_HTTPOption(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckFunctionDestroy(tt), Steps: []resource.TestStep{ { @@ -333,7 +333,7 @@ func TestAccFunction_Sandbox(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckFunctionDestroy(tt), Steps: []resource.TestStep{ { @@ -417,7 +417,7 @@ func TestAccFunction_PrivateNetwork(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 dd4c358e2..9f43927a1 100644 --- a/internal/services/function/namespace_test.go +++ b/internal/services/function/namespace_test.go @@ -19,7 +19,7 @@ func TestAccFunctionNamespace_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckFunctionNamespaceDestroy(tt), Steps: []resource.TestStep{ { @@ -111,7 +111,7 @@ func TestAccFunctionNamespace_NoName(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckFunctionNamespaceDestroy(tt), Steps: []resource.TestStep{ { @@ -133,7 +133,7 @@ func TestAccFunctionNamespace_EnvironmentVariables(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckFunctionNamespaceDestroy(tt), Steps: []resource.TestStep{ { @@ -188,7 +188,7 @@ func TestAccFunctionNamespace_VPCIntegration(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 bac886a3e..a40e8ca08 100644 --- a/internal/services/function/token_test.go +++ b/internal/services/function/token_test.go @@ -26,7 +26,7 @@ func TestAccFunctionToken_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckFunctionTokenDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/function/trigger_test.go b/internal/services/function/trigger_test.go index 0e07eab02..f6f6e9662 100644 --- a/internal/services/function/trigger_test.go +++ b/internal/services/function/trigger_test.go @@ -68,7 +68,7 @@ func TestAccFunctionTrigger_SQS(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckFunctionTriggerDestroy(tt), Steps: []resource.TestStep{ { @@ -120,7 +120,7 @@ func TestAccFunctionTrigger_Nats(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckFunctionTriggerDestroy(tt), Steps: []resource.TestStep{ { @@ -149,7 +149,7 @@ func TestAccFunctionTrigger_Error(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckFunctionTriggerDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/iam/api_key_data_source_test.go b/internal/services/iam/api_key_data_source_test.go index b72cdb588..c5420ef7d 100644 --- a/internal/services/iam/api_key_data_source_test.go +++ b/internal/services/iam/api_key_data_source_test.go @@ -13,7 +13,7 @@ func TestAccDataSourceApiKey_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 237f6ae7e..58c11c0cb 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{ - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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{ - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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{ - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckIamAPIKeyDestroy(tt), testAccCheckIamApplicationDestroy(tt), @@ -190,7 +190,7 @@ func TestAccApiKey_NoUpdate(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckIamAPIKeyDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/iam/application_data_source_test.go b/internal/services/iam/application_data_source_test.go index 80e47f9a6..6844d0642 100644 --- a/internal/services/iam/application_data_source_test.go +++ b/internal/services/iam/application_data_source_test.go @@ -13,7 +13,7 @@ func TestAccDataSourceApplication_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckIamApplicationDestroy(tt), ), diff --git a/internal/services/iam/application_test.go b/internal/services/iam/application_test.go index 7fb401ad6..a62f11159 100644 --- a/internal/services/iam/application_test.go +++ b/internal/services/iam/application_test.go @@ -20,7 +20,7 @@ func TestAccApplication_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckIamApplicationDestroy(tt), Steps: []resource.TestStep{ { @@ -64,7 +64,7 @@ func TestAccApplication_NoUpdate(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckIamApplicationDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/iam/group_data_source_test.go b/internal/services/iam/group_data_source_test.go index 7c22774d0..e9c274e75 100644 --- a/internal/services/iam/group_data_source_test.go +++ b/internal/services/iam/group_data_source_test.go @@ -13,7 +13,7 @@ func TestAccDataSourceGroup_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckIamGroupDestroy(tt), ), @@ -51,7 +51,7 @@ func TestAccDataSourceGroup_UsersAndApplications(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 9fc296a32..b5e2bfe8a 100644 --- a/internal/services/iam/group_membership_test.go +++ b/internal/services/iam/group_membership_test.go @@ -18,7 +18,7 @@ func TestAccGroupMembership_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckIamGroupDestroy(tt), testAccCheckIamApplicationDestroy(tt), @@ -108,7 +108,7 @@ func TestAccGroupMembership_User(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 e16e2c790..7228140c3 100644 --- a/internal/services/iam/group_test.go +++ b/internal/services/iam/group_test.go @@ -20,7 +20,7 @@ func TestAccGroup_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckIamGroupDestroy(tt), Steps: []resource.TestStep{ { @@ -108,7 +108,7 @@ func TestAccGroup_Applications(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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{ - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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{ - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 af1913cb6..127380eb8 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{ - ProtoV5ProviderFactories: acctest.FakeSideProjectProviders(ctx, tt, project, iamAPIKey), + ProtoV6ProviderFactories: 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{ - ProtoV5ProviderFactories: acctest.FakeSideProjectProviders(ctx, tt, project, iamAPIKey), + ProtoV6ProviderFactories: 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{ - ProtoV5ProviderFactories: acctest.FakeSideProjectProviders(ctx, tt, project, iamAPIKey), + ProtoV6ProviderFactories: 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{ - ProtoV5ProviderFactories: acctest.FakeSideProjectProviders(ctx, tt, project, iamAPIKey), + ProtoV6ProviderFactories: 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{ - ProtoV5ProviderFactories: acctest.FakeSideProjectProviders(ctx, tt, project, iamAPIKey), + ProtoV6ProviderFactories: 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{ - ProtoV5ProviderFactories: acctest.FakeSideProjectProviders(ctx, tt, project, iamAPIKey), + ProtoV6ProviderFactories: 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{ - ProtoV5ProviderFactories: acctest.FakeSideProjectProviders(ctx, tt, project, iamAPIKey), + ProtoV6ProviderFactories: 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 2eb6b5225..1c6d769ef 100644 --- a/internal/services/iam/ssh_key_account_data_source_test.go +++ b/internal/services/iam/ssh_key_account_data_source_test.go @@ -19,7 +19,7 @@ func TestAccDataSourceAccountSSHKey_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: iamchecks.CheckSSHKeyDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/iam/ssh_key_account_test.go b/internal/services/iam/ssh_key_account_test.go index 3a285f984..9e99547f9 100644 --- a/internal/services/iam/ssh_key_account_test.go +++ b/internal/services/iam/ssh_key_account_test.go @@ -19,7 +19,7 @@ func TestAccSSHKeyAccount_basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: iamchecks.CheckSSHKeyDestroy(tt), Steps: []resource.TestStep{ { @@ -62,7 +62,7 @@ func TestAccSSHKeyAccount_WithNewLine(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: iamchecks.CheckSSHKeyDestroy(tt), Steps: []resource.TestStep{ { @@ -92,7 +92,7 @@ func TestAccSSHKeyAccount_ChangeResourceName(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: iamchecks.CheckSSHKeyDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/iam/ssh_key_data_source_test.go b/internal/services/iam/ssh_key_data_source_test.go index dee2960fd..a5d7b1eb6 100644 --- a/internal/services/iam/ssh_key_data_source_test.go +++ b/internal/services/iam/ssh_key_data_source_test.go @@ -19,7 +19,7 @@ func TestAccDataSourceSSHKey_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: iamchecks.CheckSSHKeyDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/iam/ssh_key_test.go b/internal/services/iam/ssh_key_test.go index 84091d0d4..55a5d2ab9 100644 --- a/internal/services/iam/ssh_key_test.go +++ b/internal/services/iam/ssh_key_test.go @@ -22,7 +22,7 @@ func TestAccSSHKey_basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: iamchecks.CheckSSHKeyDestroy(tt), Steps: []resource.TestStep{ { @@ -63,7 +63,7 @@ func TestAccSSHKey_WithNewLine(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: iamchecks.CheckSSHKeyDestroy(tt), Steps: []resource.TestStep{ { @@ -91,7 +91,7 @@ func TestAccSSHKey_ChangeResourceName(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: iamchecks.CheckSSHKeyDestroy(tt), Steps: []resource.TestStep{ { @@ -132,7 +132,7 @@ func TestAccSSHKey_Disabled(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: iamchecks.CheckSSHKeyDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/iam/user_data_source_test.go b/internal/services/iam/user_data_source_test.go index 98ce3305e..0a12566ca 100644 --- a/internal/services/iam/user_data_source_test.go +++ b/internal/services/iam/user_data_source_test.go @@ -17,7 +17,7 @@ func TestAccDataSourceUser_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/iam/user_test.go b/internal/services/iam/user_test.go index f63d9ad97..7e544ef50 100644 --- a/internal/services/iam/user_test.go +++ b/internal/services/iam/user_test.go @@ -17,7 +17,7 @@ func TestAccUser_Member(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isUserDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/inference/deployment_test.go b/internal/services/inference/deployment_test.go index 4551c5d9c..d95cb8cc9 100644 --- a/internal/services/inference/deployment_test.go +++ b/internal/services/inference/deployment_test.go @@ -23,7 +23,7 @@ func TestAccDeployment_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: inferencetestfuncs.IsDeploymentDestroyed(tt), Steps: []resource.TestStep{ { @@ -58,7 +58,7 @@ func TestAccDeployment_Endpoint(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: inferencetestfuncs.IsDeploymentDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/inference/model_data_source_test.go b/internal/services/inference/model_data_source_test.go index 237ceef9a..48dd908b8 100644 --- a/internal/services/inference/model_data_source_test.go +++ b/internal/services/inference/model_data_source_test.go @@ -16,7 +16,7 @@ func TestAccDataSourceModel_Basic(t *testing.T) { modelName := "mistral/pixtral-12b-2409:bf16" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, Steps: []resource.TestStep{ { Config: fmt.Sprintf(` @@ -42,7 +42,7 @@ func TestAccDataSourceModel_Custom(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: inferencetestfuncs.IsModelDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/inference/model_test.go b/internal/services/inference/model_test.go index a329ebea1..753ef0092 100644 --- a/internal/services/inference/model_test.go +++ b/internal/services/inference/model_test.go @@ -25,7 +25,7 @@ func TestAccModel_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: inferencetestfuncs.IsModelDestroyed(tt), Steps: []resource.TestStep{ { @@ -51,7 +51,7 @@ func TestAccModel_DeployModelOnServer(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: inferencetestfuncs.IsModelDestroyed(tt), Steps: []resource.TestStep{ { 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 8f4c4cb94..c55257a16 100644 --- a/internal/services/instance/data_source_instance_private_nic_test.go +++ b/internal/services/instance/data_source_instance_private_nic_test.go @@ -13,7 +13,7 @@ func TestAccDataSourcePrivateNIC_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 9a21ba322..e569b058b 100644 --- a/internal/services/instance/image_data_source_test.go +++ b/internal/services/instance/image_data_source_test.go @@ -14,7 +14,7 @@ func TestAccDataSourceImage_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/instance/image_test.go b/internal/services/instance/image_test.go index ca8ce0f66..e89b8b05f 100644 --- a/internal/services/instance/image_test.go +++ b/internal/services/instance/image_test.go @@ -23,7 +23,7 @@ func TestAccImage_BlockVolume(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( isImageDestroyed(tt), isSnapshotDestroyed(tt), @@ -120,7 +120,7 @@ func TestAccImage_ExternalBlockVolume(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( isImageDestroyed(tt), isSnapshotDestroyed(tt), @@ -218,7 +218,7 @@ func TestAccImage_Server(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( isImageDestroyed(tt), blocktestfuncs.IsSnapshotDestroyed(tt), @@ -294,7 +294,7 @@ func TestAccImage_ServerWithBlockVolume(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( isImageDestroyed(tt), isSnapshotDestroyed(tt), @@ -447,7 +447,7 @@ func TestAccImage_ServerWithLocalVolume(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( isImageDestroyed(tt), isSnapshotDestroyed(tt), @@ -578,7 +578,7 @@ func TestAccImage_ServerWithSBSVolume(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 02d656a28..8e777b617 100644 --- a/internal/services/instance/ip_data_source_test.go +++ b/internal/services/instance/ip_data_source_test.go @@ -14,7 +14,7 @@ func TestAccDataSourceIP_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/instance/ip_reverse_dns_test.go b/internal/services/instance/ip_reverse_dns_test.go index 69913bf0c..2456535cf 100644 --- a/internal/services/instance/ip_reverse_dns_test.go +++ b/internal/services/instance/ip_reverse_dns_test.go @@ -16,7 +16,7 @@ func TestAccIPReverseDns_Basic(t *testing.T) { testDNSZone := "tf-reverse-instance." + acctest.TestDomain resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/instance/ip_test.go b/internal/services/instance/ip_test.go index 3adf54ca3..e265670d6 100644 --- a/internal/services/instance/ip_test.go +++ b/internal/services/instance/ip_test.go @@ -19,7 +19,7 @@ func TestAccIP_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { @@ -41,7 +41,7 @@ func TestAccIP_WithZone(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { @@ -73,7 +73,7 @@ func TestAccIP_Tags(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { @@ -106,7 +106,7 @@ func TestAccIP_RoutedIPV6(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/instance/placement_group_data_source_test.go b/internal/services/instance/placement_group_data_source_test.go index 24db8e3f2..d85c2a34b 100644 --- a/internal/services/instance/placement_group_data_source_test.go +++ b/internal/services/instance/placement_group_data_source_test.go @@ -13,7 +13,7 @@ func TestAccDataSourcePlacementGroup_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 5285dd580..986c13d5c 100644 --- a/internal/services/instance/placement_group_test.go +++ b/internal/services/instance/placement_group_test.go @@ -21,7 +21,7 @@ func TestAccPlacementGroup_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isPlacementGroupDestroyed(tt), Steps: []resource.TestStep{ { @@ -68,7 +68,7 @@ func TestAccPlacementGroup_Rename(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isPlacementGroupDestroyed(tt), Steps: []resource.TestStep{ { @@ -110,7 +110,7 @@ func TestAccPlacementGroup_Tags(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/instance/private_nic_test.go b/internal/services/instance/private_nic_test.go index 5d8ec361e..853f68e83 100644 --- a/internal/services/instance/private_nic_test.go +++ b/internal/services/instance/private_nic_test.go @@ -21,7 +21,7 @@ func TestAccPrivateNIC_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isPrivateNICDestroyed(tt), Steps: []resource.TestStep{ { @@ -64,7 +64,7 @@ func TestAccPrivateNIC_Tags(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isPrivateNICDestroyed(tt), Steps: []resource.TestStep{ { @@ -168,7 +168,7 @@ func TestAccPrivateNIC_WithIPAM(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isPrivateNICDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/instance/security_group_data_source_test.go b/internal/services/instance/security_group_data_source_test.go index d30ce6af9..dc9fe5d08 100644 --- a/internal/services/instance/security_group_data_source_test.go +++ b/internal/services/instance/security_group_data_source_test.go @@ -15,7 +15,7 @@ func TestAccDataSourceSecurityGroup_Basic(t *testing.T) { securityGroupName := "tf-security-group" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isSecurityGroupDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/instance/security_group_rules_test.go b/internal/services/instance/security_group_rules_test.go index ca4de27ce..23ea79ec4 100644 --- a/internal/services/instance/security_group_rules_test.go +++ b/internal/services/instance/security_group_rules_test.go @@ -13,7 +13,7 @@ func TestAccSecurityGroupRules_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isSecurityGroupDestroyed(tt), Steps: []resource.TestStep{ { @@ -183,7 +183,7 @@ func TestAccSecurityGroupRules_IPRanges(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isSecurityGroupDestroyed(tt), Steps: []resource.TestStep{ { @@ -243,7 +243,7 @@ func TestAccSecurityGroupRules_Basic2(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isSecurityGroupDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/instance/security_group_test.go b/internal/services/instance/security_group_test.go index e30da342b..568e5d570 100644 --- a/internal/services/instance/security_group_test.go +++ b/internal/services/instance/security_group_test.go @@ -32,7 +32,7 @@ func TestAccSecurityGroup_Basic(t *testing.T) { require.NoError(t, err) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isSecurityGroupDestroyed(tt), Steps: []resource.TestStep{ { @@ -182,7 +182,7 @@ func TestAccSecurityGroup_ICMP(t *testing.T) { require.NoError(t, err) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isSecurityGroupDestroyed(tt), Steps: []resource.TestStep{ { @@ -247,7 +247,7 @@ func TestAccSecurityGroup_ANY(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isSecurityGroupDestroyed(tt), Steps: []resource.TestStep{ { @@ -295,7 +295,7 @@ func TestAccSecurityGroup_WithNoPort(t *testing.T) { require.NoError(t, err) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isSecurityGroupDestroyed(tt), Steps: []resource.TestStep{ { @@ -331,7 +331,7 @@ func TestAccSecurityGroup_RemovePort(t *testing.T) { require.NoError(t, err) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isSecurityGroupDestroyed(tt), Steps: []resource.TestStep{ { @@ -389,7 +389,7 @@ func TestAccSecurityGroup_WithPortRange(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isSecurityGroupDestroyed(tt), Steps: []resource.TestStep{ { @@ -447,7 +447,7 @@ func TestAccSecurityGroup_Tags(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isSecurityGroupDestroyed(tt), Steps: []resource.TestStep{ { @@ -605,7 +605,7 @@ func TestAccSecurityGroup_EnableDefaultSecurity(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isSecurityGroupDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/instance/server_data_source_test.go b/internal/services/instance/server_data_source_test.go index 8f9cb6dc7..7abf8da85 100644 --- a/internal/services/instance/server_data_source_test.go +++ b/internal/services/instance/server_data_source_test.go @@ -16,7 +16,7 @@ func TestAccDataSourceServer_Basic(t *testing.T) { serverName := "tf-server" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/instance/server_test.go b/internal/services/instance/server_test.go index 5293d215e..23122c405 100644 --- a/internal/services/instance/server_test.go +++ b/internal/services/instance/server_test.go @@ -26,7 +26,7 @@ func TestAccServer_Minimal1(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { @@ -83,7 +83,7 @@ func TestAccServer_Minimal2(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { @@ -156,7 +156,7 @@ func TestAccServer_RootVolume1(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { @@ -207,7 +207,7 @@ func TestAccServer_RootVolume_Boot(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { @@ -258,7 +258,7 @@ func TestAccServer_RootVolume_ID(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { @@ -295,7 +295,7 @@ func TestAccServer_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { @@ -357,7 +357,7 @@ func TestAccServer_State1(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { @@ -427,7 +427,7 @@ func TestAccServer_State2(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { @@ -478,7 +478,7 @@ func TestAccServer_UserData_WithCloudInitAtStart(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { @@ -512,7 +512,7 @@ func TestAccServer_UserData_WithoutCloudInitAtStart(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { @@ -566,7 +566,7 @@ func TestAccServer_AdditionalVolumes(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { @@ -645,7 +645,7 @@ func TestAccServer_AdditionalVolumesDetach(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( instancechecks.IsVolumeDestroyed(tt), instancechecks.IsServerDestroyed(tt), @@ -713,7 +713,7 @@ func TestAccServer_WithPlacementGroup(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { @@ -754,7 +754,7 @@ func TestAccServer_Ipv6(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { @@ -799,7 +799,7 @@ func TestAccServer_Basic2(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { @@ -830,7 +830,7 @@ func TestAccServer_WithReservedIP(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { @@ -997,7 +997,7 @@ func TestAccServer_AlterTags(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { @@ -1041,7 +1041,7 @@ func TestAccServer_WithDefaultRootVolumeAndAdditionalVolume(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { @@ -1076,7 +1076,7 @@ func TestAccServer_ServerWithBlockNonDefaultZone(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { @@ -1113,7 +1113,7 @@ func TestAccServer_PrivateNetwork(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { @@ -1301,7 +1301,7 @@ func TestAccServer_Migrate(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { @@ -1350,7 +1350,7 @@ func TestAccServer_MigrateInvalidLocalVolumeSize(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { @@ -1393,7 +1393,7 @@ func TestAccServer_CustomDiffImage(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { @@ -1548,7 +1548,7 @@ func TestAccServer_IPs(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { @@ -1633,7 +1633,7 @@ func TestAccServer_IPRemoved(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { @@ -1680,7 +1680,7 @@ func TestAccServer_IPsRemoved(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { @@ -1730,7 +1730,7 @@ func TestAccServer_BlockExternal(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { @@ -1821,7 +1821,7 @@ func TestAccServer_BlockExternalRootVolume(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( instancechecks.IsServerDestroyed(tt), instancechecks.IsServerRootVolumeDestroyed(tt), @@ -1879,7 +1879,7 @@ func TestAccServer_BlockExternalRootVolumeUpdate(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { @@ -1932,7 +1932,7 @@ func TestAccServer_RootVolumeFromExternalSnapshot(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { @@ -2008,7 +2008,7 @@ func TestAccServer_PrivateNetworkMissingPNIC(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { @@ -2207,7 +2207,7 @@ func TestAccServer_AdminPasswordEncryptionSSHKeyID(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 aa54113e8..93dfaa92c 100644 --- a/internal/services/instance/server_type_data_source_test.go +++ b/internal/services/instance/server_type_data_source_test.go @@ -20,7 +20,7 @@ func TestAccDataSourceServerType_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, Steps: []resource.TestStep{ { Config: ` @@ -203,7 +203,7 @@ func TestAccDataSourceServerType_CompareWithPCU(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 4ed3a590c..2e81d71b4 100644 --- a/internal/services/instance/servers_data_source_test.go +++ b/internal/services/instance/servers_data_source_test.go @@ -14,7 +14,7 @@ func TestAccDataSourceServers_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { @@ -96,7 +96,7 @@ func TestAccDataSourceServers_PrivateIPs(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/instance/snapshot_data_source_test.go b/internal/services/instance/snapshot_data_source_test.go index 12b8c96b6..b4fc4458c 100644 --- a/internal/services/instance/snapshot_data_source_test.go +++ b/internal/services/instance/snapshot_data_source_test.go @@ -19,7 +19,7 @@ func TestAccDataSourceSnapshot_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 9749b0add..04b305767 100644 --- a/internal/services/instance/snapshot_test.go +++ b/internal/services/instance/snapshot_test.go @@ -21,7 +21,7 @@ func TestAccSnapshot_Server(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsVolumeDestroyed(tt), Steps: []resource.TestStep{ { @@ -52,7 +52,7 @@ func TestAccSnapshot_FromS3(t *testing.T) { bucketName := sdkacctest.RandomWithPrefix("test-acc-scaleway-instance-snapshot") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 a099b1010..2609ecf10 100644 --- a/internal/services/instance/user_data_test.go +++ b/internal/services/instance/user_data_test.go @@ -14,7 +14,7 @@ func TestAccServerUserData_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/instance/volume_data_source_test.go b/internal/services/instance/volume_data_source_test.go index d9e0a8016..0631bf26f 100644 --- a/internal/services/instance/volume_data_source_test.go +++ b/internal/services/instance/volume_data_source_test.go @@ -16,7 +16,7 @@ func TestAccDataSourceVolume_Basic(t *testing.T) { volumeName := "tf-volume" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancetestfuncs.IsVolumeDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/instance/volume_test.go b/internal/services/instance/volume_test.go index 9df7d9107..4521e23df 100644 --- a/internal/services/instance/volume_test.go +++ b/internal/services/instance/volume_test.go @@ -15,7 +15,7 @@ func TestAccVolume_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancetestfuncs.IsVolumeDestroyed(tt), Steps: []resource.TestStep{ { @@ -57,7 +57,7 @@ func TestAccVolume_DifferentNameGenerated(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancetestfuncs.IsVolumeDestroyed(tt), Steps: []resource.TestStep{ { @@ -88,7 +88,7 @@ func TestAccVolume_ResizeBlock(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancetestfuncs.IsVolumeDestroyed(tt), Steps: []resource.TestStep{ { @@ -123,7 +123,7 @@ func TestAccVolume_ResizeNotBlock(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancetestfuncs.IsVolumeDestroyed(tt), Steps: []resource.TestStep{ { @@ -157,7 +157,7 @@ func TestAccVolume_CannotResizeBlockDown(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancetestfuncs.IsVolumeDestroyed(tt), Steps: []resource.TestStep{ { @@ -185,7 +185,7 @@ func TestAccVolume_Scratch(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancetestfuncs.IsVolumeDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/iot/data_source_iot_device_test.go b/internal/services/iot/data_source_iot_device_test.go index a5e7b14d0..c1cbf032f 100644 --- a/internal/services/iot/data_source_iot_device_test.go +++ b/internal/services/iot/data_source_iot_device_test.go @@ -13,7 +13,7 @@ func TestAccDataSourceDevice_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isHubDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/iot/data_source_iot_hub_test.go b/internal/services/iot/data_source_iot_hub_test.go index 32dfccb28..aa51902e0 100644 --- a/internal/services/iot/data_source_iot_hub_test.go +++ b/internal/services/iot/data_source_iot_hub_test.go @@ -13,7 +13,7 @@ func TestAccDataSourceHub_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isHubDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/iot/device_test.go b/internal/services/iot/device_test.go index 4bf982f84..bd7ff6a81 100644 --- a/internal/services/iot/device_test.go +++ b/internal/services/iot/device_test.go @@ -41,7 +41,7 @@ func TestAccDevice_Minimal(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, // Destruction is done via the hub destruction. CheckDestroy: isHubDestroyed(tt), Steps: []resource.TestStep{ @@ -77,7 +77,7 @@ func TestAccDevice_MessageFilters(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, // Destruction is done via the hub destruction. CheckDestroy: isHubDestroyed(tt), Steps: []resource.TestStep{ @@ -134,7 +134,7 @@ func TestAccDevice_AllowInsecure(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, // Destruction is done via the hub destruction. CheckDestroy: isHubDestroyed(tt), Steps: []resource.TestStep{ @@ -190,7 +190,7 @@ func TestAccDevice_Certificate(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 17aeac8e6..235a1148c 100644 --- a/internal/services/iot/hub_test.go +++ b/internal/services/iot/hub_test.go @@ -23,7 +23,7 @@ func TestAccHub_Minimal(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isHubDestroyed(tt), Steps: []resource.TestStep{ { @@ -73,7 +73,7 @@ func TestAccHub_Dedicated(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isHubDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/iot/network_test.go b/internal/services/iot/network_test.go index 4e13f0175..3d83bbc4c 100644 --- a/internal/services/iot/network_test.go +++ b/internal/services/iot/network_test.go @@ -17,7 +17,7 @@ func TestAccNetwork_Minimal(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, // Destruction is done via the hub destruction. CheckDestroy: isHubDestroyed(tt), Steps: []resource.TestStep{ @@ -56,7 +56,7 @@ func TestAccNetwork_RESTWithTopicPrefix(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, // Destruction is done via the hub destruction. CheckDestroy: isHubDestroyed(tt), Steps: []resource.TestStep{ @@ -97,7 +97,7 @@ func TestAccNetwork_Sigfox(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 e50b9db63..a17773e82 100644 --- a/internal/services/iot/routes_test.go +++ b/internal/services/iot/routes_test.go @@ -24,7 +24,7 @@ func TestAccRoute_RDB(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, // Destruction is done via the hub destruction. CheckDestroy: resource.ComposeTestCheckFunc( isHubDestroyed(tt), @@ -92,7 +92,7 @@ func TestAccRoute_S3(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, // Destruction is done via the hub destruction. CheckDestroy: resource.ComposeAggregateTestCheckFunc( isHubDestroyed(tt), @@ -153,7 +153,7 @@ func TestAccRoute_REST(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 e4f3b5e6b..61d6e760c 100644 --- a/internal/services/ipam/ip_data_source_test.go +++ b/internal/services/ipam/ip_data_source_test.go @@ -17,7 +17,7 @@ func TestAccDataSourceIPAMIP_Instance(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { @@ -71,7 +71,7 @@ func TestAccDataSourceIPAMIP_InstanceLB(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { @@ -131,7 +131,7 @@ func TestAccDataSourceIPAMIP_RDB(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { @@ -187,7 +187,7 @@ func TestAccDataSourceIPAMIP_ID(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: ipamchecks.CheckIPDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/ipam/ip_reverse_dns_test.go b/internal/services/ipam/ip_reverse_dns_test.go index d843456b7..180973d9e 100644 --- a/internal/services/ipam/ip_reverse_dns_test.go +++ b/internal/services/ipam/ip_reverse_dns_test.go @@ -18,7 +18,7 @@ func TestAccIPAMIPReverseDNS_Basic(t *testing.T) { testDNSZone := "tf-reverse-ipam." + acctest.TestDomain resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/ipam/ip_test.go b/internal/services/ipam/ip_test.go index da496de4a..d67558ed9 100644 --- a/internal/services/ipam/ip_test.go +++ b/internal/services/ipam/ip_test.go @@ -18,7 +18,7 @@ func TestAccIPAMIP_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: ipamchecks.CheckIPDestroy(tt), Steps: []resource.TestStep{ { @@ -60,7 +60,7 @@ func TestAccIPAMIP_WithStandaloneAddress(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: ipamchecks.CheckIPDestroy(tt), Steps: []resource.TestStep{ { @@ -98,7 +98,7 @@ func TestAccIPAMIP_WithTags(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: ipamchecks.CheckIPDestroy(tt), Steps: []resource.TestStep{ { @@ -166,7 +166,7 @@ func TestAccIPAMIP_WithCustomResource(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: ipamchecks.CheckIPDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/ipam/ips_data_source_test.go b/internal/services/ipam/ips_data_source_test.go index bd4d3d79d..d71c48bd9 100644 --- a/internal/services/ipam/ips_data_source_test.go +++ b/internal/services/ipam/ips_data_source_test.go @@ -14,7 +14,7 @@ func TestAccDataSourceIPAMIPs_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: ipamchecks.CheckIPDestroy(tt), Steps: []resource.TestStep{ { @@ -100,7 +100,7 @@ func TestAccDataSourceIPAMIPs_RedisCluster(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: ipamchecks.CheckIPDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/jobs/jobs_test.go b/internal/services/jobs/jobs_test.go index 05130bd8d..01a211d7d 100644 --- a/internal/services/jobs/jobs_test.go +++ b/internal/services/jobs/jobs_test.go @@ -23,7 +23,7 @@ func TestAccJobDefinition_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckJobDefinitionDestroy(tt), Steps: []resource.TestStep{ { @@ -51,7 +51,7 @@ func TestAccJobDefinition_Timeout(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckJobDefinitionDestroy(tt), Steps: []resource.TestStep{ { @@ -98,7 +98,7 @@ func TestAccJobDefinition_Cron(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckJobDefinitionDestroy(tt), Steps: []resource.TestStep{ { @@ -171,7 +171,7 @@ func TestAccJobDefinition_SecretReference(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckJobDefinitionDestroy(tt), Steps: []resource.TestStep{ { @@ -290,7 +290,7 @@ func TestAccJobDefinition_WrongSecretReference(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckJobDefinitionDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/k8s/acl_test.go b/internal/services/k8s/acl_test.go index 1e3eb1ccd..6fd2508f8 100644 --- a/internal/services/k8s/acl_test.go +++ b/internal/services/k8s/acl_test.go @@ -20,7 +20,7 @@ func TestAccACL_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckK8SClusterDestroy(tt), Steps: []resource.TestStep{ { @@ -214,7 +214,7 @@ func TestAccACL_RulesOrder(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckK8SClusterDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/k8s/cluster_data_source_test.go b/internal/services/k8s/cluster_data_source_test.go index c9689ce48..a9c7aa463 100644 --- a/internal/services/k8s/cluster_data_source_test.go +++ b/internal/services/k8s/cluster_data_source_test.go @@ -17,7 +17,7 @@ func TestAccDataSourceCluster_Basic(t *testing.T) { version := testAccK8SClusterGetLatestK8SVersion(tt) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 0d384fa64..9ed6d7be3 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) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckK8SClusterDestroy(tt), vpcchecks.CheckPrivateNetworkDestroy(tt), @@ -461,7 +461,7 @@ func TestAccCluster_Multicloud(t *testing.T) { PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckK8SClusterDestroy(tt), Steps: []resource.TestStep{ { @@ -487,7 +487,7 @@ func TestAccCluster_TypeChange(t *testing.T) { PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 c0d92039f..5b1db5c51 100644 --- a/internal/services/k8s/k8s_version_data_source_test.go +++ b/internal/services/k8s/k8s_version_data_source_test.go @@ -17,7 +17,7 @@ func TestAccDataSourceVersion_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckK8SClusterDestroy(tt), Steps: []resource.TestStep{ { @@ -55,7 +55,7 @@ func TestAccDataSourceVersion_Latest(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckK8SClusterDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/k8s/pool_data_source_test.go b/internal/services/k8s/pool_data_source_test.go index 16f8f1f8d..1261ad6ca 100644 --- a/internal/services/k8s/pool_data_source_test.go +++ b/internal/services/k8s/pool_data_source_test.go @@ -18,7 +18,7 @@ func TestAccDataSourcePool_Basic(t *testing.T) { version := testAccK8SClusterGetLatestK8SVersion(tt) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 8058a18b5..aa57b04a4 100644 --- a/internal/services/k8s/pool_test.go +++ b/internal/services/k8s/pool_test.go @@ -29,7 +29,7 @@ func TestAccPool_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckK8SPoolDestroy(tt, "scaleway_k8s_pool.default"), testAccCheckK8SPoolDestroy(tt, "scaleway_k8s_pool.minimal"), @@ -102,7 +102,7 @@ func TestAccPool_Wait(t *testing.T) { latestK8SVersion := testAccK8SClusterGetLatestK8SVersion(tt) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckK8SPoolDestroy(tt, "scaleway_k8s_pool.default"), testAccCheckK8SPoolDestroy(tt, "scaleway_k8s_pool.minimal"), @@ -183,7 +183,7 @@ func TestAccPool_PlacementGroup(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckK8SPoolDestroy(tt, "scaleway_k8s_pool.placement_group"), testAccCheckK8SPoolDestroy(tt, "scaleway_k8s_pool.placement_group_2"), @@ -240,7 +240,7 @@ func TestAccPool_UpgradePolicy(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckK8SPoolDestroy(tt, "scaleway_k8s_pool.upgrade_policy"), testAccCheckK8SClusterDestroy(tt), @@ -295,7 +295,7 @@ func TestAccPool_KubeletArgs(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckK8SPoolDestroy(tt, "scaleway_k8s_pool.kubelet_args"), testAccCheckK8SClusterDestroy(tt), @@ -334,7 +334,7 @@ func TestAccPool_Zone(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckK8SPoolDestroy(tt, "scaleway_k8s_pool.zone"), testAccCheckK8SClusterDestroy(tt), @@ -363,7 +363,7 @@ func TestAccPool_Size(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckK8SPoolDestroy(tt, "scaleway_k8s_pool.pool"), testAccCheckK8SClusterDestroy(tt), @@ -448,7 +448,7 @@ func TestAccPool_PublicIPDisabled(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 dcdc24f14..a820fdffa 100644 --- a/internal/services/keymanager/key_resource_test.go +++ b/internal/services/keymanager/key_resource_test.go @@ -18,7 +18,7 @@ func TestAccKeyManagerKey_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: IsKeyManagerKeyDestroyed(tt), Steps: []resource.TestStep{ { @@ -51,7 +51,7 @@ func TestAccKeyManagerKey_Update(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: IsKeyManagerKeyDestroyed(tt), Steps: []resource.TestStep{ { @@ -130,7 +130,7 @@ func TestAccKeyManagerKey_WithRotationPolicy(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: IsKeyManagerKeyDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/lb/acl_test.go b/internal/services/lb/acl_test.go index 2fc5c7686..66e55be28 100644 --- a/internal/services/lb/acl_test.go +++ b/internal/services/lb/acl_test.go @@ -18,7 +18,7 @@ func TestAccAcl_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isACLDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/lb/acls_data_source_test.go b/internal/services/lb/acls_data_source_test.go index bf784ac28..0c4ad95de 100644 --- a/internal/services/lb/acls_data_source_test.go +++ b/internal/services/lb/acls_data_source_test.go @@ -13,7 +13,7 @@ func TestAccDataSourceACLs_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isLbDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/lb/backend_data_source_test.go b/internal/services/lb/backend_data_source_test.go index 9e9eab3f6..568663159 100644 --- a/internal/services/lb/backend_data_source_test.go +++ b/internal/services/lb/backend_data_source_test.go @@ -14,7 +14,7 @@ func TestAccDataSourceBackend_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: lbchecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/lb/backend_test.go b/internal/services/lb/backend_test.go index 6172e9d13..4d316f7ba 100644 --- a/internal/services/lb/backend_test.go +++ b/internal/services/lb/backend_test.go @@ -20,7 +20,7 @@ func TestAccBackend_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isBackendDestroyed(tt), Steps: []resource.TestStep{ { @@ -138,7 +138,7 @@ func TestAccBackend_HealthCheck(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isBackendDestroyed(tt), Steps: []resource.TestStep{ { @@ -244,7 +244,7 @@ func TestAccBackend_WithFailoverHost(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( isBackendDestroyed(tt), objectchecks.IsObjectDestroyed(tt), @@ -391,7 +391,7 @@ func TestAccBackend_HealthCheck_Port(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isBackendDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/lb/backends_data_source_test.go b/internal/services/lb/backends_data_source_test.go index 0091d4c91..9c9161623 100644 --- a/internal/services/lb/backends_data_source_test.go +++ b/internal/services/lb/backends_data_source_test.go @@ -13,7 +13,7 @@ func TestAccDataSourceBackends_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isLbDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/lb/certificate_data_source_test.go b/internal/services/lb/certificate_data_source_test.go index a208b8e9a..fe569381d 100644 --- a/internal/services/lb/certificate_data_source_test.go +++ b/internal/services/lb/certificate_data_source_test.go @@ -14,7 +14,7 @@ func TestAccDataSourceCertificate_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: lbchecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/lb/certificate_test.go b/internal/services/lb/certificate_test.go index 7e1f3553f..1b86b6f48 100644 --- a/internal/services/lb/certificate_test.go +++ b/internal/services/lb/certificate_test.go @@ -26,7 +26,7 @@ func TestAccCertificate_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 9f31c8384..c1e0fb9f7 100644 --- a/internal/services/lb/data_source_lb_frontends_test.go +++ b/internal/services/lb/data_source_lb_frontends_test.go @@ -13,7 +13,7 @@ func TestAccDataSourceFrontends_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isLbDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/lb/data_source_lb_ip_test.go b/internal/services/lb/data_source_lb_ip_test.go index 74593f5ec..c7c8b50d2 100644 --- a/internal/services/lb/data_source_lb_ip_test.go +++ b/internal/services/lb/data_source_lb_ip_test.go @@ -14,7 +14,7 @@ func TestAccDataSourceIP_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: lbchecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/lb/frontend_data_source_test.go b/internal/services/lb/frontend_data_source_test.go index 0736a7673..64583bd3f 100644 --- a/internal/services/lb/frontend_data_source_test.go +++ b/internal/services/lb/frontend_data_source_test.go @@ -14,7 +14,7 @@ func TestAccDataSourceFrontend_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: lbchecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/lb/frontend_test.go b/internal/services/lb/frontend_test.go index 6afb9240a..96016d684 100644 --- a/internal/services/lb/frontend_test.go +++ b/internal/services/lb/frontend_test.go @@ -23,7 +23,7 @@ func TestAccFrontend_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isFrontendDestroyed(tt), Steps: []resource.TestStep{ { @@ -109,7 +109,7 @@ func TestAccFrontend_Certificate(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isFrontendDestroyed(tt), Steps: []resource.TestStep{ { @@ -252,7 +252,7 @@ func TestAccFrontend_ACLBasic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isFrontendDestroyed(tt), Steps: []resource.TestStep{ { @@ -465,7 +465,7 @@ func TestAccFrontend_ACLRedirectAction(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isFrontendDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/lb/ip_test.go b/internal/services/lb/ip_test.go index bffe6f6ec..f84896dd8 100644 --- a/internal/services/lb/ip_test.go +++ b/internal/services/lb/ip_test.go @@ -18,7 +18,7 @@ func TestAccIP_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: lbchecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { @@ -86,7 +86,7 @@ func TestAccIP_IPv6(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: lbchecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { @@ -111,7 +111,7 @@ func TestAccIP_WithTags(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: lbchecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/lb/ips_data_source_test.go b/internal/services/lb/ips_data_source_test.go index cc5fd9939..41e5cbdab 100644 --- a/internal/services/lb/ips_data_source_test.go +++ b/internal/services/lb/ips_data_source_test.go @@ -14,7 +14,7 @@ func TestAccDataSourceIPs_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: lbchecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { @@ -59,7 +59,7 @@ func TestAccDataSourceIPs_WithType(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: lbchecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { @@ -120,7 +120,7 @@ func TestAccDataSourceIPs_WithTags(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: lbchecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/lb/lb_data_source_test.go b/internal/services/lb/lb_data_source_test.go index 6dd526e88..384c7f114 100644 --- a/internal/services/lb/lb_data_source_test.go +++ b/internal/services/lb/lb_data_source_test.go @@ -14,7 +14,7 @@ func TestAccDataSourceLb_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: lbchecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/lb/lb_test.go b/internal/services/lb/lb_test.go index dfe9c5d39..66459f02b 100644 --- a/internal/services/lb/lb_test.go +++ b/internal/services/lb/lb_test.go @@ -22,7 +22,7 @@ func TestAccLB_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isLbDestroyed(tt), Steps: []resource.TestStep{ { @@ -81,7 +81,7 @@ func TestAccLB_Private(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isLbDestroyed(tt), Steps: []resource.TestStep{ { @@ -137,7 +137,7 @@ func TestAccLB_AssignedIPs(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isLbDestroyed(tt), Steps: []resource.TestStep{ { @@ -169,7 +169,7 @@ func TestAccLB_WithIPv6(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isLbDestroyed(tt), Steps: []resource.TestStep{ { @@ -209,7 +209,7 @@ func TestAccLB_UpdateToIPv6(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isLbDestroyed(tt), Steps: []resource.TestStep{ { @@ -258,7 +258,7 @@ func TestAccLB_Migrate(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isLbDestroyed(tt), Steps: []resource.TestStep{ { @@ -371,7 +371,7 @@ func TestAccLB_WithPrivateNetworksIPAMIDs(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( isLbDestroyed(tt), vpcchecks.CheckPrivateNetworkDestroy(tt), @@ -440,7 +440,7 @@ func TestAccLB_WithoutPNConfig(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isLbDestroyed(tt), Steps: []resource.TestStep{ { @@ -482,7 +482,7 @@ func TestAccLB_DifferentLocalityIPID(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isLbDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/lb/lbs_data_source_test.go b/internal/services/lb/lbs_data_source_test.go index 44426ba95..8c3b27774 100644 --- a/internal/services/lb/lbs_data_source_test.go +++ b/internal/services/lb/lbs_data_source_test.go @@ -13,7 +13,7 @@ func TestAccDataSourceLbs_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isLbDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/lb/route_data_source_test.go b/internal/services/lb/route_data_source_test.go index 70c2167f3..ef98ed41e 100644 --- a/internal/services/lb/route_data_source_test.go +++ b/internal/services/lb/route_data_source_test.go @@ -14,7 +14,7 @@ func TestAccDataSourceRoute_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 690e0feb1..73477921d 100644 --- a/internal/services/lb/route_test.go +++ b/internal/services/lb/route_test.go @@ -18,7 +18,7 @@ func TestAccRoute_WithSNI(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isRouteDestroyed(tt), Steps: []resource.TestStep{ { @@ -98,7 +98,7 @@ func TestAccRoute_WithHostHeader(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isRouteDestroyed(tt), Steps: []resource.TestStep{ { @@ -143,7 +143,7 @@ func TestAccRoute_WithPathBegin(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isRouteDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/lb/routes_data_source_test.go b/internal/services/lb/routes_data_source_test.go index 32f6cf93d..9071a950c 100644 --- a/internal/services/lb/routes_data_source_test.go +++ b/internal/services/lb/routes_data_source_test.go @@ -13,7 +13,7 @@ func TestAccDataSourceRoutes_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isLbDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/marketplace/image_data_source_test.go b/internal/services/marketplace/image_data_source_test.go index 6122c83db..7daad649c 100644 --- a/internal/services/marketplace/image_data_source_test.go +++ b/internal/services/marketplace/image_data_source_test.go @@ -14,7 +14,7 @@ func TestAccDataSourceMarketplaceImage_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, Steps: []resource.TestStep{ { Config: ` @@ -38,7 +38,7 @@ func TestAccDataSourceMarketplaceImage_SBS(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 b243b2319..a81cd0f2d 100644 --- a/internal/services/mnq/nats_account_test.go +++ b/internal/services/mnq/nats_account_test.go @@ -18,7 +18,7 @@ func TestAccNatsAccount_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isNatsAccountDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/mnq/nats_credentials_test.go b/internal/services/mnq/nats_credentials_test.go index 77bb7b5d5..ebb5d8d32 100644 --- a/internal/services/mnq/nats_credentials_test.go +++ b/internal/services/mnq/nats_credentials_test.go @@ -18,7 +18,7 @@ func TestAccNatsCredentials_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isNatsCredentialsDestroyed(tt), Steps: []resource.TestStep{ { @@ -51,7 +51,7 @@ func TestAccNatsCredentials_UpdateName(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isNatsCredentialsDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/mnq/sns_credentials_test.go b/internal/services/mnq/sns_credentials_test.go index 7d27d07d1..d81e95193 100644 --- a/internal/services/mnq/sns_credentials_test.go +++ b/internal/services/mnq/sns_credentials_test.go @@ -18,7 +18,7 @@ func TestAccSNSCredentials_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isSNSCredentialsDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/mnq/sns_data_source_test.go b/internal/services/mnq/sns_data_source_test.go index 90bf69553..f140dcd4a 100644 --- a/internal/services/mnq/sns_data_source_test.go +++ b/internal/services/mnq/sns_data_source_test.go @@ -13,7 +13,7 @@ func TestAccDataSourceSNS_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( isSNSDestroyed(tt), ), diff --git a/internal/services/mnq/sns_test.go b/internal/services/mnq/sns_test.go index 5858c9d4b..cf31e18c8 100644 --- a/internal/services/mnq/sns_test.go +++ b/internal/services/mnq/sns_test.go @@ -18,7 +18,7 @@ func TestAccSNS_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isSNSDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/mnq/sns_topic_subscription_test.go b/internal/services/mnq/sns_topic_subscription_test.go index 5a7dcdf0b..e7e6a0a78 100644 --- a/internal/services/mnq/sns_topic_subscription_test.go +++ b/internal/services/mnq/sns_topic_subscription_test.go @@ -22,7 +22,7 @@ func TestAccSNSTopicSubscription_Basic(t *testing.T) { ctx := t.Context() resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isSNSTopicSubscriptionDestroyed(ctx, tt), Steps: []resource.TestStep{ { diff --git a/internal/services/mnq/sns_topic_test.go b/internal/services/mnq/sns_topic_test.go index 7d9f4486b..ba89e5e77 100644 --- a/internal/services/mnq/sns_topic_test.go +++ b/internal/services/mnq/sns_topic_test.go @@ -24,7 +24,7 @@ func TestAccSNSTopic_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isSNSTopicDestroyed(ctx, tt), Steps: []resource.TestStep{ { diff --git a/internal/services/mnq/sqs_credentials_test.go b/internal/services/mnq/sqs_credentials_test.go index 0e6f8e2cd..9847bbd1f 100644 --- a/internal/services/mnq/sqs_credentials_test.go +++ b/internal/services/mnq/sqs_credentials_test.go @@ -18,7 +18,7 @@ func TestAccSQSCredentials_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isSQSCredentialsDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/mnq/sqs_data_source_test.go b/internal/services/mnq/sqs_data_source_test.go index f6da699f2..db4862629 100644 --- a/internal/services/mnq/sqs_data_source_test.go +++ b/internal/services/mnq/sqs_data_source_test.go @@ -13,7 +13,7 @@ func TestAccDataSourceSQS_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 5497d6c00..a9d950031 100644 --- a/internal/services/mnq/sqs_queue_test.go +++ b/internal/services/mnq/sqs_queue_test.go @@ -30,7 +30,7 @@ func TestAccSQSQueue_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isSQSQueueDestroyed(ctx, tt), Steps: []resource.TestStep{ { @@ -179,7 +179,7 @@ func TestAccSQSQueue_DeadLetterQueue(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isSQSQueueDestroyed(ctx, tt), Steps: []resource.TestStep{ { diff --git a/internal/services/mnq/sqs_test.go b/internal/services/mnq/sqs_test.go index ec8e713f7..ff2bc34f9 100644 --- a/internal/services/mnq/sqs_test.go +++ b/internal/services/mnq/sqs_test.go @@ -19,7 +19,7 @@ func TestAccSQS_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isSQSDestroyed(tt), Steps: []resource.TestStep{ { @@ -48,7 +48,7 @@ func TestAccSQS_AlreadyActivated(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isSQSDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/mongodb/data_source_instance_test.go b/internal/services/mongodb/data_source_instance_test.go index 96bc54e01..625ee2bef 100644 --- a/internal/services/mongodb/data_source_instance_test.go +++ b/internal/services/mongodb/data_source_instance_test.go @@ -13,7 +13,7 @@ func TestAccDataSourceMongoDBInstance_ByName(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { @@ -48,7 +48,7 @@ func TestAccDataSourceMongoDBInstance_ByID(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/mongodb/instance_test.go b/internal/services/mongodb/instance_test.go index a46012d63..88954ded2 100644 --- a/internal/services/mongodb/instance_test.go +++ b/internal/services/mongodb/instance_test.go @@ -24,7 +24,7 @@ func TestAccMongoDBInstance_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { @@ -59,7 +59,7 @@ func TestAccMongoDBInstance_VolumeUpdate(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { @@ -106,7 +106,7 @@ func TestAccMongoDBInstance_SnapshotSchedule(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { @@ -161,7 +161,7 @@ func TestAccMongoDBInstance_UpdateNameTagsUser(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { @@ -218,7 +218,7 @@ func TestAccMongoDBInstance_FromSnapshot(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { @@ -266,7 +266,7 @@ func TestAccMongoDBInstance_WithPrivateNetwork(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { @@ -334,7 +334,7 @@ func TestAccMongoDBInstance_UpdatePrivateNetwork(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { @@ -486,7 +486,7 @@ func TestAccMongoDBInstance_WithPublicNetwork(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/mongodb/snapshot_test.go b/internal/services/mongodb/snapshot_test.go index ff2f38e38..b5a9fba96 100644 --- a/internal/services/mongodb/snapshot_test.go +++ b/internal/services/mongodb/snapshot_test.go @@ -18,7 +18,7 @@ func TestAccMongoDBSnapshot_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isSnapshotDestroyed(tt), Steps: []resource.TestStep{ { @@ -52,7 +52,7 @@ func TestAccMongoDBSnapshot_Update(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isSnapshotDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/mongodb/user_test.go b/internal/services/mongodb/user_test.go index b98cde2f6..bae104a2e 100644 --- a/internal/services/mongodb/user_test.go +++ b/internal/services/mongodb/user_test.go @@ -20,7 +20,7 @@ func TestAccMongoDBUser_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckMongoDBUserDestroy(tt), Steps: []resource.TestStep{ { @@ -102,7 +102,7 @@ func TestAccMongoDBUser_StateImport(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckMongoDBUserDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/object/bucket_acl_test.go b/internal/services/object/bucket_acl_test.go index 5692eea2d..99b8d3382 100644 --- a/internal/services/object/bucket_acl_test.go +++ b/internal/services/object/bucket_acl_test.go @@ -31,7 +31,7 @@ func TestAccObjectBucketACL_Basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: objectchecks.IsBucketDestroyed(tt), Steps: []resource.TestStep{ { @@ -83,7 +83,7 @@ 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) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: objectchecks.IsBucketDestroyed(tt), Steps: []resource.TestStep{ { @@ -204,7 +204,7 @@ func TestAccObjectBucketACL_GranteeWithOwner(t *testing.T) { ownerID := "105bdce1-64c0-48ab-899d-868455867ecf" resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: objectchecks.IsBucketDestroyed(tt), Steps: []resource.TestStep{ { @@ -257,7 +257,7 @@ func TestAccObjectBucketACL_WithBucketName(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: objectchecks.IsBucketDestroyed(tt), Steps: []resource.TestStep{ { @@ -306,7 +306,7 @@ func TestAccObjectBucketACL_Remove(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: objectchecks.IsBucketDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/object/bucket_lock_configuration_test.go b/internal/services/object/bucket_lock_configuration_test.go index f0119527e..bbf079d5a 100644 --- a/internal/services/object/bucket_lock_configuration_test.go +++ b/internal/services/object/bucket_lock_configuration_test.go @@ -33,7 +33,7 @@ func TestAccObjectBucketLockConfiguration_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, ErrorCheck: object.ErrorCheck(t, EndpointsID), - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckBucketLockConfigurationDestroy(tt), objectchecks.IsBucketDestroyed(tt), @@ -132,7 +132,7 @@ func TestAccObjectBucketLockConfiguration_Update(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, ErrorCheck: object.ErrorCheck(t, EndpointsID), - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( testAccCheckBucketLockConfigurationDestroy(tt), objectchecks.IsBucketDestroyed(tt), @@ -226,7 +226,7 @@ func TestAccObjectBucketLockConfiguration_WithBucketName(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, ErrorCheck: object.ErrorCheck(t, EndpointsID), - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 f5fde3463..3b58e38f9 100644 --- a/internal/services/object/bucket_policy_test.go +++ b/internal/services/object/bucket_policy_test.go @@ -82,7 +82,7 @@ func TestAccObjectBucketPolicy_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, ErrorCheck: object.ErrorCheck(t, EndpointsID), - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: objectchecks.IsBucketDestroyed(tt), Steps: []resource.TestStep{ { @@ -168,7 +168,7 @@ func TestAccObjectBucketPolicy_OtherRegionWithBucketID(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, ErrorCheck: object.ErrorCheck(t, EndpointsID), - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: objectchecks.IsBucketDestroyed(tt), Steps: []resource.TestStep{ { @@ -202,7 +202,7 @@ func TestAccObjectBucketPolicy_OtherRegionWithBucketName(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, ErrorCheck: object.ErrorCheck(t, EndpointsID), - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: objectchecks.IsBucketDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/object/bucket_test.go b/internal/services/object/bucket_test.go index f141acadd..868306763 100644 --- a/internal/services/object/bucket_test.go +++ b/internal/services/object/bucket_test.go @@ -38,7 +38,7 @@ func TestAccObjectBucket_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: objectchecks.IsBucketDestroyed(tt), Steps: []resource.TestStep{ { @@ -128,7 +128,7 @@ func TestAccObjectBucket_Lifecycle(t *testing.T) { resourceNameLifecycle := "scaleway_object_bucket.main-bucket-lifecycle" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: objectchecks.IsBucketDestroyed(tt), Steps: []resource.TestStep{ { @@ -414,7 +414,7 @@ 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) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: objectchecks.IsBucketDestroyed(tt), Steps: []resource.TestStep{ { @@ -480,7 +480,7 @@ func TestAccObjectBucket_Cors_Update(t *testing.T) { bucketName := sdkacctest.RandomWithPrefix("tf-tests-scaleway-object-bucket-cors-update") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: objectchecks.IsBucketDestroyed(tt), Steps: []resource.TestStep{ { @@ -609,7 +609,7 @@ func TestAccObjectBucket_Cors_Delete(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: objectchecks.IsBucketDestroyed(tt), Steps: []resource.TestStep{ { @@ -642,7 +642,7 @@ 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) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: objectchecks.IsBucketDestroyed(tt), Steps: []resource.TestStep{ { @@ -754,7 +754,7 @@ func TestAccObjectBucket_DestroyForce(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: objectchecks.IsBucketDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/object/bucket_website_configuration_test.go b/internal/services/object/bucket_website_configuration_test.go index 44e17e20f..5c5dae1c6 100644 --- a/internal/services/object/bucket_website_configuration_test.go +++ b/internal/services/object/bucket_website_configuration_test.go @@ -27,7 +27,7 @@ func TestAccObjectBucketWebsiteConfiguration_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, ErrorCheck: object.ErrorCheck(t, EndpointsID), - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( objectchecks.IsWebsiteConfigurationDestroyed(tt), objectchecks.IsBucketDestroyed(tt), @@ -80,7 +80,7 @@ func TestAccObjectBucketWebsiteConfiguration_WithPolicy(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, ErrorCheck: object.ErrorCheck(t, EndpointsID), - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( objectchecks.IsWebsiteConfigurationDestroyed(tt), objectchecks.IsBucketDestroyed(tt), @@ -156,7 +156,7 @@ func TestAccObjectBucketWebsiteConfiguration_Update(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, ErrorCheck: object.ErrorCheck(t, EndpointsID), - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( objectchecks.IsWebsiteConfigurationDestroyed(tt), objectchecks.IsBucketDestroyed(tt), @@ -236,7 +236,7 @@ func TestAccObjectBucketWebsiteConfiguration_WithBucketName(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, ErrorCheck: object.ErrorCheck(t, EndpointsID), - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 3c98fe8c2..fb6f1f7bd 100644 --- a/internal/services/object/data_source_object_bucket_policy_test.go +++ b/internal/services/object/data_source_object_bucket_policy_test.go @@ -38,7 +38,7 @@ func TestAccDataSourceObjectBucketPolicy_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: objectchecks.IsBucketDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/object/data_source_object_bucket_test.go b/internal/services/object/data_source_object_bucket_test.go index bdb32d939..4298f738d 100644 --- a/internal/services/object/data_source_object_bucket_test.go +++ b/internal/services/object/data_source_object_bucket_test.go @@ -22,7 +22,7 @@ func TestAccDataSourceObjectBucket_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: objectchecks.IsBucketDestroyed(tt), Steps: []resource.TestStep{ { @@ -100,7 +100,7 @@ func TestAccDataSourceObjectBucket_ProjectIDAllowed(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: acctest.FakeSideProjectProviders(ctx, tt, project, iamAPIKey), + ProtoV6ProviderFactories: acctest.FakeSideProjectProviders(ctx, tt, project, iamAPIKey), CheckDestroy: resource.ComposeAggregateTestCheckFunc( func(_ *terraform.State) error { return terminateFakeSideProject() @@ -150,7 +150,7 @@ func TestAccDataSourceObjectBucket_ProjectIDForbidden(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: acctest.FakeSideProjectProviders(ctx, tt, project, iamAPIKey), + ProtoV6ProviderFactories: 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 3da97ef7d..2025d4641 100644 --- a/internal/services/object/object_test.go +++ b/internal/services/object/object_test.go @@ -27,7 +27,7 @@ func TestAccObject_Basic(t *testing.T) { bucketName := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-basic") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( objectchecks.IsObjectDestroyed(tt), objectchecks.IsBucketDestroyed(tt), @@ -107,7 +107,7 @@ 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) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( objectchecks.IsObjectDestroyed(tt), objectchecks.IsBucketDestroyed(tt), @@ -146,7 +146,7 @@ func TestAccObject_Hash(t *testing.T) { bucketName := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-hash") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( objectchecks.IsObjectDestroyed(tt), objectchecks.IsBucketDestroyed(tt), @@ -207,7 +207,7 @@ func TestAccObject_Move(t *testing.T) { bucketName := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-move") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( objectchecks.IsObjectDestroyed(tt), objectchecks.IsBucketDestroyed(tt), @@ -264,7 +264,7 @@ 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) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( objectchecks.IsObjectDestroyed(tt), objectchecks.IsBucketDestroyed(tt), @@ -329,7 +329,7 @@ func TestAccObject_Metadata(t *testing.T) { bucketName := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-metadata") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( objectchecks.IsObjectDestroyed(tt), objectchecks.IsBucketDestroyed(tt), @@ -400,7 +400,7 @@ func TestAccObject_Tags(t *testing.T) { bucketName := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-tags") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( objectchecks.IsObjectDestroyed(tt), objectchecks.IsBucketDestroyed(tt), @@ -465,7 +465,7 @@ func TestAccObject_Visibility(t *testing.T) { bucketName := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-visibility") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( objectchecks.IsObjectDestroyed(tt), objectchecks.IsBucketDestroyed(tt), @@ -524,7 +524,7 @@ func TestAccObject_State(t *testing.T) { bucketName := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-visibility") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( objectchecks.IsObjectDestroyed(tt), objectchecks.IsBucketDestroyed(tt), @@ -598,7 +598,7 @@ func TestAccObject_ByContent(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( objectchecks.IsObjectDestroyed(tt), objectchecks.IsBucketDestroyed(tt), @@ -659,7 +659,7 @@ func TestAccObject_ByContentBase64(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( objectchecks.IsObjectDestroyed(tt), objectchecks.IsBucketDestroyed(tt), @@ -729,7 +729,7 @@ func TestAccObject_WithBucketName(t *testing.T) { bucketName := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-basic") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( objectchecks.IsObjectDestroyed(tt), objectchecks.IsBucketDestroyed(tt), @@ -786,7 +786,7 @@ func TestAccObject_Encryption(t *testing.T) { bucketName := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-encryption") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 0157ffe0a..7499c6777 100644 --- a/internal/services/rdb/acl_data_source_test.go +++ b/internal/services/rdb/acl_data_source_test.go @@ -18,7 +18,7 @@ func TestAccDataSourceACL_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/rdb/acl_test.go b/internal/services/rdb/acl_test.go index a749744a2..69efabdd3 100644 --- a/internal/services/rdb/acl_test.go +++ b/internal/services/rdb/acl_test.go @@ -18,7 +18,7 @@ func TestAccACL_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { 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 80ccba262..5001efcbc 100644 --- a/internal/services/rdb/data_source_rdb_database_backup_test.go +++ b/internal/services/rdb/data_source_rdb_database_backup_test.go @@ -17,7 +17,7 @@ func TestAccDataSourceDatabaseBackup_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 c0186ba49..e22b596eb 100644 --- a/internal/services/rdb/data_source_rdb_instance_test.go +++ b/internal/services/rdb/data_source_rdb_instance_test.go @@ -17,7 +17,7 @@ func TestAccDataSourceInstance_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/rdb/database_backup_test.go b/internal/services/rdb/database_backup_test.go index bd6663649..829fb6f70 100644 --- a/internal/services/rdb/database_backup_test.go +++ b/internal/services/rdb/database_backup_test.go @@ -60,7 +60,7 @@ func TestAccDatabaseBackup_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 f43331f2c..00c427b54 100644 --- a/internal/services/rdb/database_data_source_test.go +++ b/internal/services/rdb/database_data_source_test.go @@ -17,7 +17,7 @@ func TestAccDataSourceDatabase_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/rdb/database_test.go b/internal/services/rdb/database_test.go index d3a3ed739..d01892af0 100644 --- a/internal/services/rdb/database_test.go +++ b/internal/services/rdb/database_test.go @@ -25,7 +25,7 @@ func TestAccDatabase_Basic(t *testing.T) { instanceName := "TestAccScalewayRdbDatabase_Basic" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { @@ -59,7 +59,7 @@ func TestAccDatabase_ManualDelete(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/rdb/instance_test.go b/internal/services/rdb/instance_test.go index e778b26e9..38a680f3b 100644 --- a/internal/services/rdb/instance_test.go +++ b/internal/services/rdb/instance_test.go @@ -26,7 +26,7 @@ func TestAccInstance_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { @@ -107,7 +107,7 @@ func TestAccInstance_WithCluster(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { @@ -148,7 +148,7 @@ func TestAccInstance_LogsPolicy(t *testing.T) { latestEngineVersion := rdbchecks.GetLatestEngineVersion(tt, postgreSQLEngineName) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { @@ -209,7 +209,7 @@ func TestAccInstance_Settings(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { @@ -253,7 +253,7 @@ func TestAccInstance_InitSettings(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { @@ -291,7 +291,7 @@ func TestAccInstance_Capitalize(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { @@ -322,7 +322,7 @@ func TestAccInstance_PrivateNetworkUpdate(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( rdbchecks.IsInstanceDestroyed(tt), vpcchecks.CheckPrivateNetworkDestroy(tt), @@ -549,7 +549,7 @@ func TestAccInstance_PrivateNetwork(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { @@ -675,7 +675,7 @@ func TestAccInstance_BackupSchedule(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { @@ -715,7 +715,7 @@ func TestAccInstance_Volume(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { @@ -790,7 +790,7 @@ func TestAccInstance_SBSVolume(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { @@ -871,7 +871,7 @@ func TestAccInstance_ChangeVolumeType(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { @@ -931,7 +931,7 @@ func TestAccInstance_ChangeNodeType(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { @@ -988,7 +988,7 @@ func TestAccInstance_Endpoints(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { @@ -1095,7 +1095,7 @@ func TestAccInstance_EncryptionAtRest(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { @@ -1139,7 +1139,7 @@ func TestAccInstance_EncryptionAtRestFalse(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { @@ -1183,7 +1183,7 @@ func TestAccInstance_UpdateEncryptionAtRest(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ // Step 1: Create without encryption @@ -1238,7 +1238,7 @@ func TestAccInstance_CompleteWorkflow(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: IsSnapshotDestroyed(tt), Steps: []resource.TestStep{ // Step 1: Create an instance and a snapshot @@ -1335,7 +1335,7 @@ func TestAccInstance_FromSnapshotWithPrivateNetwork(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: IsSnapshotDestroyed(tt), Steps: []resource.TestStep{ // Step 1: Create an instance, private network, and a snapshot @@ -1417,7 +1417,7 @@ func TestAccInstance_PrivateNetworkCleanup(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( rdbchecks.IsInstanceDestroyed(tt), vpcchecks.CheckPrivateNetworkDestroy(tt), @@ -1467,7 +1467,7 @@ func TestAccInstance_EndpointErrorHandling(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 e5d9efa14..fa8617a71 100644 --- a/internal/services/rdb/privilege_data_source_test.go +++ b/internal/services/rdb/privilege_data_source_test.go @@ -17,7 +17,7 @@ func TestAccDataSourcePrivilege_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/rdb/privilege_test.go b/internal/services/rdb/privilege_test.go index 8fe5149b5..3d3dd52d8 100644 --- a/internal/services/rdb/privilege_test.go +++ b/internal/services/rdb/privilege_test.go @@ -22,7 +22,7 @@ func TestAccPrivilege_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/rdb/read_replica_test.go b/internal/services/rdb/read_replica_test.go index 65670cfef..426ff22f7 100644 --- a/internal/services/rdb/read_replica_test.go +++ b/internal/services/rdb/read_replica_test.go @@ -22,7 +22,7 @@ func TestAccReadReplica_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( rdbchecks.IsInstanceDestroyed(tt), isReadReplicaDestroyed(tt), @@ -65,7 +65,7 @@ func TestAccReadReplica_PrivateNetwork(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( rdbchecks.IsInstanceDestroyed(tt), isReadReplicaDestroyed(tt), @@ -113,7 +113,7 @@ func TestAccReadReplica_Update(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( rdbchecks.IsInstanceDestroyed(tt), isReadReplicaDestroyed(tt), @@ -330,7 +330,7 @@ func TestAccReadReplica_MultipleEndpoints(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( rdbchecks.IsInstanceDestroyed(tt), isReadReplicaDestroyed(tt), @@ -382,7 +382,7 @@ func TestAccReadReplica_DifferentZone(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeTestCheckFunc( rdbchecks.IsInstanceDestroyed(tt), isReadReplicaDestroyed(tt), @@ -499,7 +499,7 @@ func TestAccReadReplica_WithInstanceAlsoInPrivateNetwork(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 3a805979c..e2c1f532c 100644 --- a/internal/services/rdb/snapshots_test.go +++ b/internal/services/rdb/snapshots_test.go @@ -21,7 +21,7 @@ func TestAccRdbSnapshot_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: IsSnapshotDestroyed(tt), Steps: []resource.TestStep{ { @@ -63,7 +63,7 @@ func TestAccRdbSnapshot_Update(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: IsSnapshotDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/rdb/user_test.go b/internal/services/rdb/user_test.go index 7d81dc228..0861e970a 100644 --- a/internal/services/rdb/user_test.go +++ b/internal/services/rdb/user_test.go @@ -22,7 +22,7 @@ func TestAccUser_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: rdbchecks.IsInstanceDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/redis/cluster_data_source_test.go b/internal/services/redis/cluster_data_source_test.go index 2787e334a..992ecc2a2 100644 --- a/internal/services/redis/cluster_data_source_test.go +++ b/internal/services/redis/cluster_data_source_test.go @@ -15,7 +15,7 @@ func TestAccDataSourceCluster_Basic(t *testing.T) { latestRedisVersion := getLatestVersion(tt) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isClusterDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/redis/cluster_test.go b/internal/services/redis/cluster_test.go index 7a7ad4769..15a9cc664 100644 --- a/internal/services/redis/cluster_test.go +++ b/internal/services/redis/cluster_test.go @@ -28,7 +28,7 @@ func TestAccCluster_Basic(t *testing.T) { latestRedisVersion := getLatestVersion(tt) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isClusterDestroyed(tt), Steps: []resource.TestStep{ { @@ -97,7 +97,7 @@ func TestAccCluster_Migrate(t *testing.T) { latestRedisVersion := getLatestVersion(tt) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isClusterDestroyed(tt), Steps: []resource.TestStep{ { @@ -162,7 +162,7 @@ func TestAccCluster_MigrateClusterSizeWithIPAMEndpoint(t *testing.T) { clusterID := "" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isClusterDestroyed(tt), Steps: []resource.TestStep{ { @@ -258,7 +258,7 @@ func TestAccCluster_ACL(t *testing.T) { latestRedisVersion := getLatestVersion(tt) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isClusterDestroyed(tt), Steps: []resource.TestStep{ { @@ -335,7 +335,7 @@ func TestAccCluster_Settings(t *testing.T) { latestRedisVersion := getLatestVersion(tt) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isClusterDestroyed(tt), Steps: []resource.TestStep{ { @@ -412,7 +412,7 @@ func TestAccCluster_Endpoints_Standalone(t *testing.T) { latestRedisVersion := getLatestVersion(tt) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isClusterDestroyed(tt), Steps: []resource.TestStep{ { @@ -605,7 +605,7 @@ func TestAccCluster_Endpoints_ClusterMode(t *testing.T) { latestRedisVersion := getLatestVersion(tt) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isClusterDestroyed(tt), Steps: []resource.TestStep{ { @@ -672,7 +672,7 @@ func TestAccCluster_Certificate(t *testing.T) { latestRedisVersion := getLatestVersion(tt) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isClusterDestroyed(tt), Steps: []resource.TestStep{ { @@ -714,7 +714,7 @@ func TestAccCluster_NoCertificate(t *testing.T) { latestRedisVersion := getLatestVersion(tt) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isClusterDestroyed(tt), Steps: []resource.TestStep{ { @@ -757,7 +757,7 @@ func TestAccCluster_MigrateToHAMode(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isClusterDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/registry/image_data_source_test.go b/internal/services/registry/image_data_source_test.go index 4913665b0..2431e4fe4 100644 --- a/internal/services/registry/image_data_source_test.go +++ b/internal/services/registry/image_data_source_test.go @@ -21,7 +21,7 @@ func TestAccDataSourceImage_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isNamespaceDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/registry/namespace_data_source_test.go b/internal/services/registry/namespace_data_source_test.go index 50ab33698..342ff47c3 100644 --- a/internal/services/registry/namespace_data_source_test.go +++ b/internal/services/registry/namespace_data_source_test.go @@ -13,7 +13,7 @@ func TestAccDataSourceNamespace_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isNamespaceDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/registry/namespace_test.go b/internal/services/registry/namespace_test.go index 2091a5203..f0e1ef7c4 100644 --- a/internal/services/registry/namespace_test.go +++ b/internal/services/registry/namespace_test.go @@ -23,7 +23,7 @@ func TestAccNamespace_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isNamespaceDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/registry/tag_data_source_test.go b/internal/services/registry/tag_data_source_test.go index 34d16d391..52234b22b 100644 --- a/internal/services/registry/tag_data_source_test.go +++ b/internal/services/registry/tag_data_source_test.go @@ -23,7 +23,7 @@ func TestAccDataSourceImageTag_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isNamespaceDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/sdb/database_test.go b/internal/services/sdb/database_test.go index 9bd313c7f..d26b9b92c 100644 --- a/internal/services/sdb/database_test.go +++ b/internal/services/sdb/database_test.go @@ -18,7 +18,7 @@ func TestAccServerlessSQLDBDatabase_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckServerlessSQLDBDatabaseDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/secret/secret_data_source_test.go b/internal/services/secret/secret_data_source_test.go index 98a6563a1..6f1302d55 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{ - ProtoV5ProviderFactories: acctest.FakeSideProjectProviders(ctx, tt, project, iamAPIKey), + ProtoV6ProviderFactories: acctest.FakeSideProjectProviders(ctx, tt, project, iamAPIKey), CheckDestroy: resource.ComposeAggregateTestCheckFunc( func(_ *terraform.State) error { return terminateFakeSideProject() @@ -67,7 +67,7 @@ func TestAccDataSourceSecret_Path(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, CheckDestroy: testAccCheckSecretDestroy(tt), - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/secret/secret_test.go b/internal/services/secret/secret_test.go index cb79bc33a..db1288885 100644 --- a/internal/services/secret/secret_test.go +++ b/internal/services/secret/secret_test.go @@ -27,7 +27,7 @@ func TestAccSecret_Basic(t *testing.T) { secretDescription := "secret description" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckSecretDestroy(tt), Steps: []resource.TestStep{ { @@ -95,7 +95,7 @@ func TestAccSecret_Path(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckSecretDestroy(tt), Steps: []resource.TestStep{ { @@ -171,7 +171,7 @@ func TestAccSecret_Protected(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckSecretDestroy(tt), Steps: []resource.TestStep{ { @@ -224,7 +224,7 @@ func TestAccSecret_EphemeralPolicy(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckSecretDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/secret/version_data_source_test.go b/internal/services/secret/version_data_source_test.go index 4ff8806d6..f5b7fc50d 100644 --- a/internal/services/secret/version_data_source_test.go +++ b/internal/services/secret/version_data_source_test.go @@ -22,7 +22,7 @@ func TestAccDataSourceSecretVersion_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckSecretVersionDestroy(tt), Steps: []resource.TestStep{ { @@ -125,7 +125,7 @@ func TestAccDataSourceSecretVersion_ByNameSecret(t *testing.T) { secretVersionData := "my_super_secret" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckSecretVersionDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/secret/version_test.go b/internal/services/secret/version_test.go index 2fc314a83..db47892a2 100644 --- a/internal/services/secret/version_test.go +++ b/internal/services/secret/version_test.go @@ -25,7 +25,7 @@ func TestAccSecretVersion_Basic(t *testing.T) { secretVersionData := "my_super_secret" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckSecretVersionDestroy(tt), Steps: []resource.TestStep{ { @@ -128,7 +128,7 @@ func TestAccSecretVersion_Type(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckSecretVersionDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/tem/blockedlist_test.go b/internal/services/tem/blockedlist_test.go index e07c0e368..4b38abbd6 100644 --- a/internal/services/tem/blockedlist_test.go +++ b/internal/services/tem/blockedlist_test.go @@ -23,7 +23,7 @@ func TestAccBlockedList_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isBlockedEmailDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/tem/domain_data_source_test.go b/internal/services/tem/domain_data_source_test.go index cfb84584b..b166e9931 100644 --- a/internal/services/tem/domain_data_source_test.go +++ b/internal/services/tem/domain_data_source_test.go @@ -16,7 +16,7 @@ func TestAccDataSourceDomain_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isDomainDestroyed(tt), Steps: []resource.TestStep{ { @@ -54,7 +54,7 @@ func TestAccDataSourceDomain_Reputation(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isDomainDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/tem/domain_test.go b/internal/services/tem/domain_test.go index fee970330..9224d7fe8 100644 --- a/internal/services/tem/domain_test.go +++ b/internal/services/tem/domain_test.go @@ -23,7 +23,7 @@ func TestAccDomain_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isDomainDestroyed(tt), Steps: []resource.TestStep{ { @@ -57,7 +57,7 @@ func TestAccDomain_Tos(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isDomainDestroyed(tt), Steps: []resource.TestStep{ { @@ -81,7 +81,7 @@ func TestAccDomain_Autoconfig(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isDomainDestroyed(tt), Steps: []resource.TestStep{ { @@ -131,7 +131,7 @@ func TestAccDomain_AutoconfigUpdate(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isDomainDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/tem/domain_validation_test.go b/internal/services/tem/domain_validation_test.go index d9b5f2eaa..d666e77eb 100644 --- a/internal/services/tem/domain_validation_test.go +++ b/internal/services/tem/domain_validation_test.go @@ -19,7 +19,7 @@ func TestAccDomainValidation_Validation(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isDomainDestroyed(tt), Steps: []resource.TestStep{ { @@ -58,7 +58,7 @@ func TestAccDomainValidation_TimeoutError(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isDomainDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/tem/offer_subscription_data_source_test.go b/internal/services/tem/offer_subscription_data_source_test.go index a31e31e3b..50d47c817 100644 --- a/internal/services/tem/offer_subscription_data_source_test.go +++ b/internal/services/tem/offer_subscription_data_source_test.go @@ -20,7 +20,7 @@ func TestAccDataSourceOfferSubscription_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 884a08fd4..7b96ab54d 100644 --- a/internal/services/tem/webhook_test.go +++ b/internal/services/tem/webhook_test.go @@ -31,7 +31,7 @@ func TestAccWebhook_BasicAndUpdate(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isWebhookDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/vpc/acl_test.go b/internal/services/vpc/acl_test.go index 295c34c20..0a3a642b3 100644 --- a/internal/services/vpc/acl_test.go +++ b/internal/services/vpc/acl_test.go @@ -18,7 +18,7 @@ func TestAccACL_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isACLDestroyed(tt), Steps: []resource.TestStep{ { @@ -68,7 +68,7 @@ func TestAccACL_WithRules(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isACLDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/vpc/private_network_data_source_test.go b/internal/services/vpc/private_network_data_source_test.go index 44fd546b9..4903892a8 100644 --- a/internal/services/vpc/private_network_data_source_test.go +++ b/internal/services/vpc/private_network_data_source_test.go @@ -16,7 +16,7 @@ func TestAccDataSourceVPCPrivateNetwork_Basic(t *testing.T) { pnName := "TestAccScalewayDataSourceVPCPrivateNetwork_Basic" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: vpcchecks.CheckPrivateNetworkDestroy(tt), Steps: []resource.TestStep{ { @@ -83,7 +83,7 @@ func TestAccDataSourceVPCPrivateNetwork_VpcID(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: vpcchecks.CheckPrivateNetworkDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/vpc/private_network_test.go b/internal/services/vpc/private_network_test.go index a34be17ac..41bff0c78 100644 --- a/internal/services/vpc/private_network_test.go +++ b/internal/services/vpc/private_network_test.go @@ -16,7 +16,7 @@ func TestAccVPCPrivateNetwork_Basic(t *testing.T) { privateNetworkName := "private-network-test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: vpcchecks.CheckPrivateNetworkDestroy(tt), Steps: []resource.TestStep{ { @@ -95,7 +95,7 @@ func TestAccVPCPrivateNetwork_DefaultName(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: vpcchecks.CheckPrivateNetworkDestroy(tt), Steps: []resource.TestStep{ { @@ -124,7 +124,7 @@ func TestAccVPCPrivateNetwork_Subnets(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: vpcchecks.CheckPrivateNetworkDestroy(tt), Steps: []resource.TestStep{ { @@ -230,7 +230,7 @@ func TestAccVPCPrivateNetwork_OneSubnet(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: vpcchecks.CheckPrivateNetworkDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/vpc/route_test.go b/internal/services/vpc/route_test.go index 3bae1bd4f..d6aa55084 100644 --- a/internal/services/vpc/route_test.go +++ b/internal/services/vpc/route_test.go @@ -18,7 +18,7 @@ func TestAccVPCRoute_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: isRouteDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/vpc/routes_data_source_test.go b/internal/services/vpc/routes_data_source_test.go index bc5a40bf3..eb54ea1de 100644 --- a/internal/services/vpc/routes_data_source_test.go +++ b/internal/services/vpc/routes_data_source_test.go @@ -14,7 +14,7 @@ func TestAccDataSourceRoutes_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: vpcchecks.CheckPrivateNetworkDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/vpc/vpc_data_source_test.go b/internal/services/vpc/vpc_data_source_test.go index 60d60a438..524e25a69 100644 --- a/internal/services/vpc/vpc_data_source_test.go +++ b/internal/services/vpc/vpc_data_source_test.go @@ -15,7 +15,7 @@ func TestAccDataSourceVPC_Basic(t *testing.T) { vpcName := "DataSourceVPC_Basic" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckVPCDestroy(tt), Steps: []resource.TestStep{ { @@ -54,7 +54,7 @@ func TestAccDataSourceVPC_Default(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, Steps: []resource.TestStep{ { Config: ` diff --git a/internal/services/vpc/vpc_test.go b/internal/services/vpc/vpc_test.go index 1ab65da2a..5e028466a 100644 --- a/internal/services/vpc/vpc_test.go +++ b/internal/services/vpc/vpc_test.go @@ -22,7 +22,7 @@ func TestAccVPC_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckVPCDestroy(tt), Steps: []resource.TestStep{ { @@ -51,7 +51,7 @@ func TestAccVPC_WithRegion(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckVPCDestroy(tt), Steps: []resource.TestStep{ { @@ -87,7 +87,7 @@ func TestAccVPC_WithTags(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckVPCDestroy(tt), Steps: []resource.TestStep{ { @@ -125,7 +125,7 @@ func TestAccVPC_DisableRouting(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckVPCDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/vpc/vpcs_data_source_test.go b/internal/services/vpc/vpcs_data_source_test.go index 5f25c2b32..30d295f1d 100644 --- a/internal/services/vpc/vpcs_data_source_test.go +++ b/internal/services/vpc/vpcs_data_source_test.go @@ -14,7 +14,7 @@ func TestAccDataSourceVPCs_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsServerDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/vpcgw/ip_data_source_test.go b/internal/services/vpcgw/ip_data_source_test.go index 49b0a5d11..9abcdf8a0 100644 --- a/internal/services/vpcgw/ip_data_source_test.go +++ b/internal/services/vpcgw/ip_data_source_test.go @@ -14,7 +14,7 @@ func TestAccDataSourceVPCPublicGatewayIP_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: vpcgwchecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/vpcgw/ip_reverse_test.go b/internal/services/vpcgw/ip_reverse_test.go index 8e784be94..007eb7129 100644 --- a/internal/services/vpcgw/ip_reverse_test.go +++ b/internal/services/vpcgw/ip_reverse_test.go @@ -20,7 +20,7 @@ func TestAccVPCPublicGatewayIPReverseDns_Basic(t *testing.T) { testDNSZone := "tf-reverse-vpcgw." + acctest.TestDomain resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: instancechecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/vpcgw/ip_test.go b/internal/services/vpcgw/ip_test.go index 17183b1e6..f1943bf67 100644 --- a/internal/services/vpcgw/ip_test.go +++ b/internal/services/vpcgw/ip_test.go @@ -17,7 +17,7 @@ func TestAccVPCPublicGatewayIP_Basic(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: vpcgwchecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { @@ -40,7 +40,7 @@ func TestAccVPCPublicGatewayIP_WithZone(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: vpcgwchecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { @@ -72,7 +72,7 @@ func TestAccVPCPublicGatewayIP_WithTags(t *testing.T) { defer tt.Cleanup() resource.ParallelTest(t, resource.TestCase{ - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: vpcgwchecks.IsIPDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/vpcgw/network_data_source_test.go b/internal/services/vpcgw/network_data_source_test.go index 0d54a6323..041d0a452 100644 --- a/internal/services/vpcgw/network_data_source_test.go +++ b/internal/services/vpcgw/network_data_source_test.go @@ -14,7 +14,7 @@ func TestAccDataSourceVPCGatewayNetwork_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: vpcgwchecks.IsGatewayNetworkDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/vpcgw/network_test.go b/internal/services/vpcgw/network_test.go index 3ba1319c7..9ec4ab128 100644 --- a/internal/services/vpcgw/network_test.go +++ b/internal/services/vpcgw/network_test.go @@ -19,7 +19,7 @@ func TestAccVPCGatewayNetwork_WithIPAMConfig(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 375df2edf..8f66dff4f 100644 --- a/internal/services/vpcgw/pat_rule_data_source_test.go +++ b/internal/services/vpcgw/pat_rule_data_source_test.go @@ -13,7 +13,7 @@ func TestAccDataSourceVPCPublicGatewayPATRule_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckVPCPublicGatewayPATRuleDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/vpcgw/pat_rule_test.go b/internal/services/vpcgw/pat_rule_test.go index 3dbd2b346..29a44cd0b 100644 --- a/internal/services/vpcgw/pat_rule_test.go +++ b/internal/services/vpcgw/pat_rule_test.go @@ -18,7 +18,7 @@ func TestAccVPCPublicGatewayPATRule_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckVPCPublicGatewayPATRuleDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/vpcgw/public_gateway_data_source_test.go b/internal/services/vpcgw/public_gateway_data_source_test.go index 7ffcfc3c8..b919ce745 100644 --- a/internal/services/vpcgw/public_gateway_data_source_test.go +++ b/internal/services/vpcgw/public_gateway_data_source_test.go @@ -16,7 +16,7 @@ func TestAccDataSourceVPCPublicGateway_Basic(t *testing.T) { pgName := "TestAccScalewayDataSourceVPCPublicGateway_Basic" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: vpcgwchecks.IsGatewayDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/vpcgw/public_gateway_test.go b/internal/services/vpcgw/public_gateway_test.go index 0550a6841..507446605 100644 --- a/internal/services/vpcgw/public_gateway_test.go +++ b/internal/services/vpcgw/public_gateway_test.go @@ -19,7 +19,7 @@ func TestAccVPCPublicGateway_Basic(t *testing.T) { publicGatewayName := "public-gateway-test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: vpcgwchecks.IsGatewayDestroyed(tt), Steps: []resource.TestStep{ { @@ -96,7 +96,7 @@ func TestAccVPCPublicGateway_Bastion(t *testing.T) { publicGatewayName := "public-gateway-bastion-test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: vpcgwchecks.IsGatewayDestroyed(tt), Steps: []resource.TestStep{ { @@ -144,7 +144,7 @@ func TestAccVPCPublicGateway_AttachToIP(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: resource.ComposeAggregateTestCheckFunc( vpcgwchecks.IsIPDestroyed(tt), vpcgwchecks.IsGatewayDestroyed(tt), @@ -180,7 +180,7 @@ func TestAccVPCPublicGateway_Upgrade(t *testing.T) { publicGatewayName := "public-gateway-upgrade-test" resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: vpcgwchecks.IsGatewayDestroyed(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/webhosting/offer_data_source_test.go b/internal/services/webhosting/offer_data_source_test.go index 20c48e2fa..5e7725de1 100644 --- a/internal/services/webhosting/offer_data_source_test.go +++ b/internal/services/webhosting/offer_data_source_test.go @@ -13,7 +13,7 @@ func TestAccDataSourceOffer_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: 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 8d230f8f9..68921e940 100644 --- a/internal/services/webhosting/webhosting_data_source_test.go +++ b/internal/services/webhosting/webhosting_data_source_test.go @@ -13,7 +13,7 @@ func TestAccDataSourceWebhosting_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckWebhostingDestroy(tt), Steps: []resource.TestStep{ { diff --git a/internal/services/webhosting/webhosting_test.go b/internal/services/webhosting/webhosting_test.go index b37720bb5..0f3e1a85e 100644 --- a/internal/services/webhosting/webhosting_test.go +++ b/internal/services/webhosting/webhosting_test.go @@ -23,7 +23,7 @@ func TestAccWebhosting_Basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(t) }, - ProtoV5ProviderFactories: tt.ProviderFactories, + ProtoV6ProviderFactories: tt.ProviderFactories, CheckDestroy: testAccCheckWebhostingDestroy(tt), Steps: []resource.TestStep{ { diff --git a/main.go b/main.go index db0950ce6..836931640 100644 --- a/main.go +++ b/main.go @@ -5,8 +5,8 @@ import ( "flag" "log" - "github.com/hashicorp/terraform-plugin-go/tfprotov5/tf5server" - "github.com/hashicorp/terraform-plugin-mux/tf5muxserver" + "github.com/hashicorp/terraform-plugin-go/tfprotov6/tf6server" + "github.com/hashicorp/terraform-plugin-mux/tf6muxserver" "github.com/scaleway/terraform-provider-scaleway/v2/internal/provider" ) @@ -18,19 +18,22 @@ func main() { flag.BoolVar(&debugMode, "debuggable", false, "set to true to run the provider with support for debuggers like delve") flag.Parse() - var serveOpts []tf5server.ServeOpt + var serveOpts []tf6server.ServeOpt if debugMode { - serveOpts = append(serveOpts, tf5server.WithManagedDebug()) + serveOpts = append(serveOpts, tf6server.WithManagedDebug()) } - providers := provider.NewProviderList(nil) + providers, err := provider.NewProviderList(ctx, nil) + if err != nil { + log.Fatal(err) + } - muxServer, err := tf5muxserver.NewMuxServer(ctx, providers...) + muxServer, err := tf6muxserver.NewMuxServer(ctx, providers...) if err != nil { log.Fatal(err) } - err = tf5server.Serve( + err = tf6server.Serve( "registry.terraform.io/scaleway/scaleway", muxServer.ProviderServer, serveOpts...,