chore: migrate provider to its own package (#2459)

* chore: migrate provider to its own package

* Fix

* migrate cassettes

Author: remyleone

cmd/tftemplate/datasource.go.tmpl

@@ -8,7 +8,7 @@ import (
     "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
-func dataSourceScaleway{{.Resource}}() *schema.Resource {
+func DataSourceScaleway{{.Resource}}() *schema.Resource {
     // Generate datasource schema from resource
     dsSchema := datasourceSchemaFromResourceSchema(resourceScaleway{{.Resource}}().Schema)
 

cmd/tftemplate/resource.go.tmpl

@@ -9,7 +9,7 @@ import (
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
-func resourceScaleway{{ .Resource }}() *schema.Resource {
+func ResourceScaleway{{ .Resource }}() *schema.Resource {
 	return &schema.Resource{
 		CreateContext: resourceScaleway{{ .Resource }}Create,
 		ReadContext:   resourceScaleway{{ .Resource }}Read,

internal/acctest/acctest.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/meta"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/provider"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/transport"
-	"github.com/scaleway/terraform-provider-scaleway/v2/scaleway"
 	"github.com/stretchr/testify/require"
 )
 
@@ -48,7 +48,7 @@ func NewTestTools(t *testing.T) *TestTools {
 		Meta: m,
 		ProviderFactories: map[string]func() (*schema.Provider, error){
 			"scaleway": func() (*schema.Provider, error) {
-				return scaleway.Provider(&scaleway.ProviderConfig{Meta: m})(), nil
+				return provider.Provider(&provider.Config{Meta: m})(), nil
 			},
 		},
 		Cleanup: cleanup,

internal/provider/provider.go

@@ -0,0 +1,130 @@
+package provider_test
+
+import (
+	"context"
+	"fmt"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/scaleway/scaleway-sdk-go/scw"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/meta"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/provider"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/iam"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/instance"
+	"github.com/stretchr/testify/require"
+)
+
+func TestAccScalewayProvider_InstanceIPZones(t *testing.T) {
+	tt := acctest.NewTestTools(t)
+	defer tt.Cleanup()
+
+	ctx := context.Background()
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck: func() { acctest.PreCheck(t) },
+		ProviderFactories: func() map[string]func() (*schema.Provider, error) {
+			metaProd, err := meta.NewMeta(ctx, &meta.Config{
+				TerraformVersion: "terraform-tests",
+				ForceZone:        scw.ZoneFrPar2,
+				HTTPClient:       tt.Meta.HTTPClient(),
+			})
+			require.NoError(t, err)
+
+			metaDev, err := meta.NewMeta(ctx, &meta.Config{
+				TerraformVersion: "terraform-tests",
+				ForceZone:        scw.ZoneFrPar1,
+				HTTPClient:       tt.Meta.HTTPClient(),
+			})
+			require.NoError(t, err)
+
+			return map[string]func() (*schema.Provider, error){
+				"prod": func() (*schema.Provider, error) {
+					return provider.Provider(&provider.Config{Meta: metaProd})(), nil
+				},
+				"dev": func() (*schema.Provider, error) {
+					return provider.Provider(&provider.Config{Meta: metaDev})(), nil
+				},
+			}
+		}(),
+		CheckDestroy: iam.CheckSSHKeyDestroy(tt),
+		Steps: []resource.TestStep{
+			{
+				Config: `
+					resource scaleway_instance_ip dev {
+					  provider = "dev"
+					}
+
+					resource scaleway_instance_ip prod {
+					  provider = "prod"
+					}
+`,
+				Check: resource.ComposeTestCheckFunc(
+					instance.CheckIPExists(tt, "scaleway_instance_ip.prod"),
+					instance.CheckIPExists(tt, "scaleway_instance_ip.dev"),
+					resource.TestCheckResourceAttr("scaleway_instance_ip.prod", "zone", "fr-par-2"),
+					resource.TestCheckResourceAttr("scaleway_instance_ip.dev", "zone", "fr-par-1"),
+				),
+			},
+		},
+	})
+}
+
+func TestAccScalewayProvider_SSHKeys(t *testing.T) {
+	tt := acctest.NewTestTools(t)
+	defer tt.Cleanup()
+
+	SSHKeyName := "TestAccScalewayProvider_SSHKeys"
+	SSHKey := "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEEYrzDOZmhItdKaDAEqJQ4ORS2GyBMtBozYsK5kiXXX [email protected]"
+
+	ctx := context.Background()
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck: func() { acctest.PreCheck(t) },
+		ProviderFactories: func() map[string]func() (*schema.Provider, error) {
+			metaProd, err := meta.NewMeta(ctx, &meta.Config{
+				TerraformVersion: "terraform-tests",
+				HTTPClient:       tt.Meta.HTTPClient(),
+			})
+			require.NoError(t, err)
+
+			metaDev, err := meta.NewMeta(ctx, &meta.Config{
+				TerraformVersion: "terraform-tests",
+				HTTPClient:       tt.Meta.HTTPClient(),
+			})
+			require.NoError(t, err)
+
+			return map[string]func() (*schema.Provider, error){
+				"prod": func() (*schema.Provider, error) {
+					return provider.Provider(&provider.Config{Meta: metaProd})(), nil
+				},
+				"dev": func() (*schema.Provider, error) {
+					return provider.Provider(&provider.Config{Meta: metaDev})(), nil
+				},
+			}
+		}(),
+		CheckDestroy: iam.CheckSSHKeyDestroy(tt),
+		Steps: []resource.TestStep{
+			{
+				Config: fmt.Sprintf(`
+					resource "scaleway_account_ssh_key" "prod" {
+						provider   = "prod"
+						name 	   = "%[1]s"
+						public_key = "%[2]s"
+					}
+
+					resource "scaleway_account_ssh_key" "dev" {
+						provider   = "dev"
+						name 	   = "%[1]s"
+						public_key = "%[2]s"
+					}
+				`, SSHKeyName, SSHKey),
+				Check: resource.ComposeTestCheckFunc(
+					iam.CheckSSHKeyExists(tt, "scaleway_account_ssh_key.prod"),
+					iam.CheckSSHKeyExists(tt, "scaleway_account_ssh_key.dev"),
+				),
+			},
+		},
+	})
+}

internal/provider/provider_test.go

@@ -0,0 +1,60 @@
+package iam
+
+import (
+	"fmt"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
+	iamSDK "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
+	"github.com/scaleway/terraform-provider-scaleway/v2/scaleway"
+)
+
+func CheckSSHKeyDestroy(tt *acctest.TestTools) resource.TestCheckFunc {
+	return func(state *terraform.State) error {
+		for _, rs := range state.RootModule().Resources {
+			if rs.Type != "scaleway_iam_ssh_key" {
+				continue
+			}
+
+			iamAPI := scaleway.IamAPI(tt.Meta)
+
+			_, err := iamAPI.GetSSHKey(&iamSDK.GetSSHKeyRequest{
+				SSHKeyID: rs.Primary.ID,
+			})
+
+			// If no error resource still exist
+			if err == nil {
+				return fmt.Errorf("SSH key (%s) still exists", rs.Primary.ID)
+			}
+
+			// Unexpected api error we return it
+			if !httperrors.Is404(err) {
+				return err
+			}
+		}
+
+		return nil
+	}
+}
+
+func CheckSSHKeyExists(tt *acctest.TestTools, n string) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		rs, ok := s.RootModule().Resources[n]
+		if !ok {
+			return fmt.Errorf("resource not found: %s", n)
+		}
+
+		iamAPI := scaleway.IamAPI(tt.Meta)
+
+		_, err := iamAPI.GetSSHKey(&iamSDK.GetSSHKeyRequest{
+			SSHKeyID: rs.Primary.ID,
+		})
+		if err != nil {
+			return err
+		}
+
+		return nil
+	}
+}