Merge branch 'master' into fix/mongodb-snapshot-expiration-dates

Author: jremy42

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 [email protected]: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
 ```
 

docs/resources/instance_image.md

@@ -69,7 +69,7 @@ resource "scaleway_instance_snapshot" "server_snapshot" {
 resource "scaleway_instance_image" "image" {
   name           = "image_with_extra_volumes"
   root_volume_id = scaleway_instance_snapshot.server_snapshot.id
-  additional_volumes = [
+  additional_volume_ids = [
     scaleway_instance_snapshot.volume_snapshot.id
   ]
 }
@@ -83,9 +83,6 @@ The following arguments are supported:
 - `name` - (Optional) The name of the image. If not provided it will be randomly generated.
 - `architecture` - (Optional, default `x86_64`) The architecture the image is compatible with. Possible values are: `x86_64` or `arm`.
 - `additional_volume_ids` - (Optional) List of IDs of the snapshots of the additional volumes to be attached to the image.
-
--> **Important:** For now it is only possible to have 1 additional_volume.
-
 - `tags` - (Optional) A list of tags to apply to the image.
 - `public` - (Optional) Set to `true` if the image is public.
 - `zone` - (Defaults to provider `zone`) The [zone](../guides/regions_and_zones.md#zones) in which the image should be created.
@@ -104,26 +101,27 @@ In addition to all arguments above, the following attributes are exported:
 - `from_server_id` - ID of the server the image is based on (in case it is a backup).
 - `state` - State of the image. Possible values are: `available`, `creating` or `error`.
 - `organization_id` - The organization ID the image is associated with.
+- `root_volume` - The description of the root volume attached to the image.
+
+  -> The `root_volume` block contains :
+    - `id` - The ID of the volume.
+    - `name` - The name of the volume.
+    - `size` - The size of the volume.
+    - `volume_type` - The type of volume, possible values are `l_ssd` and `sbs_snapshot`.
+
 - `additional_volumes` - The description of the extra volumes attached to the image.
 
     -> The `additional_volumes` block contains :
     - `id` - The ID of the volume.
     - `name` - The name of the volume.
-    - `export_uri` - The export URI of the volume.
     - `size` - The size of the volume.
-    - `volume_type` - The type of volume, possible values are `l_ssd` and `b_ssd`.
-    - `creation_date` - Date of the volume creation.
-    - `modification_date` - Date of volume latest update.
-    - `organization` - The organization ID the volume is associated with.
-    - `project` - ID of the project the volume is associated with
+    - `volume_type` - The type of volume, possible values are `l_ssd` and `sbs_snapshot`.
     - `tags` - List of tags associated with the volume.
-    - `state` - State of the volume.
-    - `zone` - The [zone](../guides/regions_and_zones.md#zones) in which the volume is.
     - `server` - Description of the server containing the volume (in case the image is a backup from a server).
 
-    -> The `server` block contains :
-      - `id` - ID of the server containing the volume.
-      - `name` - Name of the server containing the volume.
+        -> The `server` block contains :
+        - `id` - ID of the server containing the volume.
+        - `name` - Name of the server containing the volume.
 
 ## Import
 

internal/acctest/acctest.go

@@ -7,7 +7,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"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"
@@ -20,7 +21,7 @@ func PreCheck(_ *testing.T) {}
 type TestTools struct {
 	T                 *testing.T
 	Meta              *meta.Meta
-	ProviderFactories map[string]func() (*schema.Provider, error)
+	ProviderFactories map[string]func() (tfprotov6.ProviderServer, error)
 	Cleanup           func()
 }
 
@@ -64,9 +65,19 @@ func NewTestTools(t *testing.T) *TestTools {
 	return &TestTools{
 		T:    t,
 		Meta: m,
-		ProviderFactories: map[string]func() (*schema.Provider, error){
-			"scaleway": func() (*schema.Provider, error) {
-				return provider.SDKProvider(&provider.Config{Meta: m})(), nil
+		ProviderFactories: map[string]func() (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
 			},
 		},
 		Cleanup: cleanup,

internal/acctest/fixtures.go

@@ -3,7 +3,8 @@ package acctest
 import (
 	"context"
 
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-go/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"
@@ -17,7 +18,7 @@ import (
 // given project and API key as default profile configuration.
 //
 // This is useful to test resources that need to create resources in another project.
-func FakeSideProjectProviders(ctx context.Context, tt *TestTools, project *account.Project, iamAPIKey *iam.APIKey) map[string]func() (*schema.Provider, error) {
+func FakeSideProjectProviders(ctx context.Context, tt *TestTools, project *account.Project, iamAPIKey *iam.APIKey) map[string]func() (tfprotov6.ProviderServer, error) {
 	t := tt.T
 
 	metaSide, err := meta.NewMeta(ctx, &meta.Config{
@@ -30,9 +31,19 @@ func FakeSideProjectProviders(ctx context.Context, tt *TestTools, project *accou
 	})
 	require.NoError(t, err)
 
-	providers := map[string]func() (*schema.Provider, error){
-		"side": func() (*schema.Provider, error) {
-			return provider.SDKProvider(&provider.Config{Meta: metaSide})(), nil
+	providers := map[string]func() (tfprotov6.ProviderServer, error){
+		"side": func() (tfprotov6.ProviderServer, error) {
+			providers, errProvider := provider.NewProviderList(ctx, &provider.Config{Meta: metaSide})
+			if errProvider != nil {
+				return nil, errProvider
+			}
+
+			muxServer, errMux := tf6muxserver.NewMuxServer(ctx, providers...)
+			if errMux != nil {
+				return nil, errMux
+			}
+
+			return muxServer.ProviderServer(), nil
 		},
 	}
 

internal/provider/provider_mux_test.go

@@ -354,7 +354,7 @@ func SDKProvider(config *Config) plugin.ProviderFunc {
 			terraformVersion := p.TerraformVersion
 
 			// If we provide meta in config use it. This is useful for tests
-			if config.Meta != nil {
+			if config != nil && config.Meta != nil {
 				return config.Meta, nil
 			}
 

internal/provider/provider_sdkv2.go

@@ -0,0 +1,29 @@
+package provider
+
+import (
+	"context"
+
+	"github.com/hashicorp/terraform-plugin-framework/providerserver"
+	"github.com/hashicorp/terraform-plugin-go/tfprotov6"
+	"github.com/hashicorp/terraform-plugin-mux/tf5to6server"
+)
+
+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
+}

internal/provider/providers.go

@@ -0,0 +1,27 @@
+package provider_test
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest"
+	instancechecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/instance/testfuncs"
+)
+
+func TestMuxServer(t *testing.T) {
+	tt := acctest.NewTestTools(t)
+	defer tt.Cleanup()
+
+	resource.Test(t, resource.TestCase{
+		ProtoV6ProviderFactories: tt.ProviderFactories,
+		Steps: []resource.TestStep{
+			{
+				Config: `
+					resource scaleway_instance_ip main {}`,
+				Check: resource.ComposeTestCheckFunc(
+					instancechecks.CheckIPExists(tt, "scaleway_instance_ip.main"),
+				),
+			},
+		},
+	})
+}

internal/provider/providers_test.go

@@ -20,8 +20,8 @@ func TestAccDataSourceProject_Basic(t *testing.T) {
 	}
 
 	resource.ParallelTest(t, resource.TestCase{
-		PreCheck:          func() { acctest.PreCheck(t) },
-		ProviderFactories: tt.ProviderFactories,
+		PreCheck:                 func() { acctest.PreCheck(t) },
+		ProtoV6ProviderFactories: tt.ProviderFactories,
 		CheckDestroy: resource.ComposeTestCheckFunc(
 			isProjectDestroyed(tt),
 		),
@@ -61,8 +61,8 @@ func TestAccDataSourceProject_Default(t *testing.T) {
 	}
 
 	resource.ParallelTest(t, resource.TestCase{
-		PreCheck:          func() { acctest.PreCheck(t) },
-		ProviderFactories: tt.ProviderFactories,
+		PreCheck:                 func() { acctest.PreCheck(t) },
+		ProtoV6ProviderFactories: tt.ProviderFactories,
 		Steps: []resource.TestStep{
 			{
 				Config: fmt.Sprintf(`
@@ -105,8 +105,8 @@ func TestAccDataSourceProject_Extract(t *testing.T) {
 	}
 
 	resource.ParallelTest(t, resource.TestCase{
-		PreCheck:          func() { acctest.PreCheck(t) },
-		ProviderFactories: tt.ProviderFactories,
+		PreCheck:                 func() { acctest.PreCheck(t) },
+		ProtoV6ProviderFactories: tt.ProviderFactories,
 		Steps: []resource.TestStep{
 			{
 				Config: `data scaleway_account_project "project" {}`,
@@ -129,8 +129,8 @@ func TestAccDataSourceProject_List(t *testing.T) {
 	}
 
 	resource.ParallelTest(t, resource.TestCase{
-		PreCheck:          func() { acctest.PreCheck(t) },
-		ProviderFactories: tt.ProviderFactories,
+		PreCheck:                 func() { acctest.PreCheck(t) },
+		ProtoV6ProviderFactories: tt.ProviderFactories,
 		CheckDestroy: resource.ComposeTestCheckFunc(
 			isProjectDestroyed(tt),
 		),

internal/services/account/project_data_source_test.go

@@ -22,8 +22,8 @@ func TestAccProject_Basic(t *testing.T) {
 	defer tt.Cleanup()
 
 	resource.ParallelTest(t, resource.TestCase{
-		ProviderFactories: tt.ProviderFactories,
-		CheckDestroy:      isProjectDestroyed(tt),
+		ProtoV6ProviderFactories: tt.ProviderFactories,
+		CheckDestroy:             isProjectDestroyed(tt),
 		Steps: []resource.TestStep{
 			{
 				Config: `
@@ -60,8 +60,8 @@ func TestAccProject_NoUpdate(t *testing.T) {
 	defer tt.Cleanup()
 
 	resource.ParallelTest(t, resource.TestCase{
-		ProviderFactories: tt.ProviderFactories,
-		CheckDestroy:      isProjectDestroyed(tt),
+		ProtoV6ProviderFactories: tt.ProviderFactories,
+		CheckDestroy:             isProjectDestroyed(tt),
 		Steps: []resource.TestStep{
 			{
 				Config: `