chore: migrate to terraform protocol v6

Author: remyleone

internal/acctest/acctest.go

@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/terraform-plugin-go/tfprotov5"
+	"github.com/hashicorp/terraform-plugin-go/tfprotov6"
 	"github.com/hashicorp/terraform-plugin-mux/tf5muxserver"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/env"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/meta"
@@ -22,7 +22,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,8 +66,8 @@ func NewTestTools(t *testing.T) *TestTools {
 	return &TestTools{
 		T:    t,
 		Meta: m,
-		ProviderFactories: map[string]func() (tfprotov5.ProviderServer, error){
-			"scaleway": func() (tfprotov5.ProviderServer, error) {
+		ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){
+			"scaleway": func() (tfprotov6.ProviderServer, error) {
 				ctx := context.Background()
 				providers := provider.NewProviderList(&provider.Config{Meta: m})
 

internal/acctest/fixtures.go

@@ -3,7 +3,7 @@ package acctest
 import (
 	"context"
 
-	"github.com/hashicorp/terraform-plugin-go/tfprotov5"
+	"github.com/hashicorp/terraform-plugin-go/tfprotov6"
 	"github.com/hashicorp/terraform-plugin-mux/tf5muxserver"
 	sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest"
 	"github.com/scaleway/scaleway-sdk-go/api/account/v3"
@@ -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,8 +31,8 @@ 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 := map[string]func() (tfprotov6.ProviderServer, error){
+		"side": func() (tfprotov6.ProviderServer, error) {
 			providers := provider.NewProviderList(&provider.Config{Meta: metaSide})
 
 			muxServer, err := tf5muxserver.NewMuxServer(ctx, providers...)

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
 }

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,19 @@ 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)
 
-	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...,