Skip to content

Commit 0b8791f

Browse files
remyleoneremyleone
committed
migrate test acceptance
1 parent ff3d0b3 commit 0b8791f

File tree

213 files changed

+571
-570
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

213 files changed

+571
-570
lines changed

‎internal/acctest/acctest.go‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
package acctest
22

33
import (
4-
"context"
54
"os"
65
"strconv"
76
"strings"
87
"testing"
98
"time"
109

1110
"github.com/hashicorp/terraform-plugin-go/tfprotov6"
12-
"github.com/hashicorp/terraform-plugin-mux/tf5muxserver"
11+
"github.com/hashicorp/terraform-plugin-mux/tf6muxserver"
1312
"github.com/scaleway/terraform-provider-scaleway/v2/internal/env"
1413
"github.com/scaleway/terraform-provider-scaleway/v2/internal/meta"
1514
"github.com/scaleway/terraform-provider-scaleway/v2/internal/provider"
@@ -68,10 +67,9 @@ func NewTestTools(t *testing.T) *TestTools {
6867
Meta: m,
6968
ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){
7069
"scaleway": func() (tfprotov6.ProviderServer, error) {
71-
ctx := context.Background()
72-
providers := provider.NewProviderList(&provider.Config{Meta: m})
70+
providers, err := provider.NewProviderList(ctx, &provider.Config{Meta: m})
7371

74-
muxServer, err := tf5muxserver.NewMuxServer(ctx, providers...)
72+
muxServer, err := tf6muxserver.NewMuxServer(ctx, providers...)
7573
if err != nil {
7674
return nil, err
7775
}

‎internal/acctest/fixtures.go‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55

66
"github.com/hashicorp/terraform-plugin-go/tfprotov6"
7-
"github.com/hashicorp/terraform-plugin-mux/tf5muxserver"
7+
"github.com/hashicorp/terraform-plugin-mux/tf6muxserver"
88
sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest"
99
"github.com/scaleway/scaleway-sdk-go/api/account/v3"
1010
iam "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1"
@@ -33,11 +33,14 @@ func FakeSideProjectProviders(ctx context.Context, tt *TestTools, project *accou
3333

3434
providers := map[string]func() (tfprotov6.ProviderServer, error){
3535
"side": func() (tfprotov6.ProviderServer, error) {
36-
providers := provider.NewProviderList(&provider.Config{Meta: metaSide})
36+
providers, errProvider := provider.NewProviderList(ctx, &provider.Config{Meta: metaSide})
37+
if errProvider != nil {
38+
return nil, errProvider
39+
}
3740

38-
muxServer, err := tf5muxserver.NewMuxServer(ctx, providers...)
39-
if err != nil {
40-
return nil, err
41+
muxServer, errMux := tf6muxserver.NewMuxServer(ctx, providers...)
42+
if errMux != nil {
43+
return nil, errMux
4144
}
4245

4346
return muxServer.ProviderServer(), nil

‎internal/provider/providers_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ func TestMuxServer(t *testing.T) {
1313
defer tt.Cleanup()
1414

1515
resource.Test(t, resource.TestCase{
16-
ProtoV5ProviderFactories: tt.ProviderFactories,
16+
ProtoV6ProviderFactories: tt.ProviderFactories,
1717
Steps: []resource.TestStep{
1818
{
1919
Config: `

‎internal/services/account/project_data_source_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func TestAccDataSourceProject_Basic(t *testing.T) {
2121

2222
resource.ParallelTest(t, resource.TestCase{
2323
PreCheck: func() { acctest.PreCheck(t) },
24-
ProtoV5ProviderFactories: tt.ProviderFactories,
24+
ProtoV6ProviderFactories: tt.ProviderFactories,
2525
CheckDestroy: resource.ComposeTestCheckFunc(
2626
isProjectDestroyed(tt),
2727
),
@@ -62,7 +62,7 @@ func TestAccDataSourceProject_Default(t *testing.T) {
6262

6363
resource.ParallelTest(t, resource.TestCase{
6464
PreCheck: func() { acctest.PreCheck(t) },
65-
ProtoV5ProviderFactories: tt.ProviderFactories,
65+
ProtoV6ProviderFactories: tt.ProviderFactories,
6666
Steps: []resource.TestStep{
6767
{
6868
Config: fmt.Sprintf(`
@@ -106,7 +106,7 @@ func TestAccDataSourceProject_Extract(t *testing.T) {
106106

107107
resource.ParallelTest(t, resource.TestCase{
108108
PreCheck: func() { acctest.PreCheck(t) },
109-
ProtoV5ProviderFactories: tt.ProviderFactories,
109+
ProtoV6ProviderFactories: tt.ProviderFactories,
110110
Steps: []resource.TestStep{
111111
{
112112
Config: `data scaleway_account_project "project" {}`,
@@ -130,7 +130,7 @@ func TestAccDataSourceProject_List(t *testing.T) {
130130

131131
resource.ParallelTest(t, resource.TestCase{
132132
PreCheck: func() { acctest.PreCheck(t) },
133-
ProtoV5ProviderFactories: tt.ProviderFactories,
133+
ProtoV6ProviderFactories: tt.ProviderFactories,
134134
CheckDestroy: resource.ComposeTestCheckFunc(
135135
isProjectDestroyed(tt),
136136
),

‎internal/services/account/project_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func TestAccProject_Basic(t *testing.T) {
2222
defer tt.Cleanup()
2323

2424
resource.ParallelTest(t, resource.TestCase{
25-
ProtoV5ProviderFactories: tt.ProviderFactories,
25+
ProtoV6ProviderFactories: tt.ProviderFactories,
2626
CheckDestroy: isProjectDestroyed(tt),
2727
Steps: []resource.TestStep{
2828
{
@@ -60,7 +60,7 @@ func TestAccProject_NoUpdate(t *testing.T) {
6060
defer tt.Cleanup()
6161

6262
resource.ParallelTest(t, resource.TestCase{
63-
ProtoV5ProviderFactories: tt.ProviderFactories,
63+
ProtoV6ProviderFactories: tt.ProviderFactories,
6464
CheckDestroy: isProjectDestroyed(tt),
6565
Steps: []resource.TestStep{
6666
{

‎internal/services/applesilicon/server_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func TestAccServer_Basic(t *testing.T) {
1818

1919
resource.ParallelTest(t, resource.TestCase{
2020
PreCheck: func() { acctest.PreCheck(t) },
21-
ProtoV5ProviderFactories: tt.ProviderFactories,
21+
ProtoV6ProviderFactories: tt.ProviderFactories,
2222
CheckDestroy: isServerDestroyed(tt),
2323
Steps: []resource.TestStep{
2424
{
@@ -71,7 +71,7 @@ func TestAccServer_EnableDisabledVPC(t *testing.T) {
7171

7272
resource.ParallelTest(t, resource.TestCase{
7373
PreCheck: func() { acctest.PreCheck(t) },
74-
ProtoV5ProviderFactories: tt.ProviderFactories,
74+
ProtoV6ProviderFactories: tt.ProviderFactories,
7575
CheckDestroy: isServerDestroyed(tt),
7676
Steps: []resource.TestStep{
7777
{
@@ -126,7 +126,7 @@ func TestAccServer_EnableVPC(t *testing.T) {
126126

127127
resource.ParallelTest(t, resource.TestCase{
128128
PreCheck: func() { acctest.PreCheck(t) },
129-
ProtoV5ProviderFactories: tt.ProviderFactories,
129+
ProtoV6ProviderFactories: tt.ProviderFactories,
130130
CheckDestroy: isServerDestroyed(tt),
131131
Steps: []resource.TestStep{
132132
{
@@ -271,7 +271,7 @@ func TestAccServer_Commitment(t *testing.T) {
271271

272272
resource.ParallelTest(t, resource.TestCase{
273273
PreCheck: func() { acctest.PreCheck(t) },
274-
ProtoV5ProviderFactories: tt.ProviderFactories,
274+
ProtoV6ProviderFactories: tt.ProviderFactories,
275275
CheckDestroy: isServerDestroyed(tt),
276276
Steps: []resource.TestStep{
277277
{

‎internal/services/autoscaling/instance_group_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func TestAccInstanceGroup_Basic(t *testing.T) {
1818

1919
resource.ParallelTest(t, resource.TestCase{
2020
PreCheck: func() { acctest.PreCheck(t) },
21-
ProtoV5ProviderFactories: tt.ProviderFactories,
21+
ProtoV6ProviderFactories: tt.ProviderFactories,
2222
CheckDestroy: testAccCheckInstanceGroupDestroy(tt),
2323
Steps: []resource.TestStep{
2424
{

‎internal/services/autoscaling/instance_policy_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func TestAccInstancePolicy_Basic(t *testing.T) {
1818

1919
resource.ParallelTest(t, resource.TestCase{
2020
PreCheck: func() { acctest.PreCheck(t) },
21-
ProtoV5ProviderFactories: tt.ProviderFactories,
21+
ProtoV6ProviderFactories: tt.ProviderFactories,
2222
CheckDestroy: testAccCheckInstancePolicyDestroy(tt),
2323
Steps: []resource.TestStep{
2424
{

‎internal/services/autoscaling/instance_template_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func TestAccInstanceTemplate_Basic(t *testing.T) {
1818

1919
resource.ParallelTest(t, resource.TestCase{
2020
PreCheck: func() { acctest.PreCheck(t) },
21-
ProtoV5ProviderFactories: tt.ProviderFactories,
21+
ProtoV6ProviderFactories: tt.ProviderFactories,
2222
CheckDestroy: testAccCheckInstanceTemplateDestroy(tt),
2323
Steps: []resource.TestStep{
2424
{
@@ -75,7 +75,7 @@ func TestAccInstanceTemplate_PrivateNetwork(t *testing.T) {
7575

7676
resource.ParallelTest(t, resource.TestCase{
7777
PreCheck: func() { acctest.PreCheck(t) },
78-
ProtoV5ProviderFactories: tt.ProviderFactories,
78+
ProtoV6ProviderFactories: tt.ProviderFactories,
7979
CheckDestroy: testAccCheckInstanceTemplateDestroy(tt),
8080
Steps: []resource.TestStep{
8181
{

‎internal/services/az/availability_zones_data_source_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ func TestAccDataSourceAvailabilityZones_Basic(t *testing.T) {
1313

1414
resource.ParallelTest(t, resource.TestCase{
1515
PreCheck: func() { acctest.PreCheck(t) },
16-
ProtoV5ProviderFactories: tt.ProviderFactories,
16+
ProtoV6ProviderFactories: tt.ProviderFactories,
1717
Steps: []resource.TestStep{
1818
{
1919
Config: `

0 commit comments

Comments
 (0)