chore: migrate services to their own packages (#2466)

* chore: migrate provider to its own package

* FIx

* Fix IAM

* fix iot

* Fix

* Fix

* Fix block

* Fix redis

* Fix rdb

* Fix mnq

* Fix instance

* fix tem

* Fix

* fix az

* cleanup

* Fix registry and tem

* Fix

* Fix webhosting

* fix rdb

* fix documentdb

* fix cassettes validation

* Fix instance

* FIx

* Fix

* Fix

* Fix wrong indentation

* Fix cassette format

* go mod tidy

* fix

* fix nightly tests

Author: remyleone

.github/contributing/acceptance_test.md

@@ -98,13 +98,13 @@ This keeps the tests readable, and allows reuse of assertion functions across di
 The definition of a complete test looks like this:
 
 ```go
-func TestAccScalewayInstanceServerImport(t *testing.T) {
+func TestAccServerImport(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
 		ProviderFactories: tt.ProviderFactories,
-		CheckDestroy: testAccCheckScalewayInstanceServerDestroy(tt),
+		CheckDestroy: instancechecks.CheckServerDestroy(tt),
 		Steps: []resource.TestStep{
 			{
 				Config: `
@@ -145,14 +145,14 @@ When executing the test, the following steps are taken for each `TestStep`:
    For example, to verify that the `scaleway_instance_server` described above was created successfully, a test function like this is used:
 
     ```go
-    func testAccCheckScalewayInstanceServerExists(tt *TestTools, n string) resource.TestCheckFunc {
+    func testAccCheckInstanceServerExists(tt *TestTools, n string) resource.TestCheckFunc {
     	return func(state *terraform.State) error {
     		rs, ok := state.RootModule().Resources[n]
     		if !ok {
     			return fmt.Errorf("resource not found: %s", n)
     		}
     
-    		instanceAPI, zone, ID, err := scaleway.InstanceAPIWithZoneAndID(tt.Meta, rs.Primary.ID)
+    		instanceAPI, zone, ID, err := InstanceAPIWithZoneAndID(tt.Meta, rs.Primary.ID)
     		if err != nil {
     			return err
     		}
@@ -183,14 +183,14 @@ When executing the test, the following steps are taken for each `TestStep`:
    The code to ensure that the `scaleway_instance_server` shown above has been destroyed looks like this:
 
     ```go
-    func testAccCheckScalewayInstanceServerDestroy(tt *TestTools) resource.TestCheckFunc {
+    func instancechecks.CheckServerDestroy(tt *TestTools) resource.TestCheckFunc {
        return func(state *terraform.State) error {
             for _, rs := range s.RootModule().Resources {
                 if rs.Type != "scaleway_instance_server" {
                     continue
                 }
         
-                instanceAPI, zone, ID, err := scaleway.InstanceAPIWithZoneAndID(tt.Meta, rs.Primary.ID)
+                instanceAPI, zone, ID, err := InstanceAPIWithZoneAndID(tt.Meta, rs.Primary.ID)
                 if err != nil {
                     return err
                 }

.github/contributing/common_reviews_items.md

@@ -56,9 +56,9 @@ Below are style-based items that _may_ be noted during review and are recommende
 
 Below are required items that will be noted during submission review and prevent immediate merging:
 
-- [ ] __Implements CheckDestroy__: Resource testing should include a `CheckDestroy` function (typically named `testAccCheckScaleway{SERVICE}{RESOURCE}Destroy`) that calls the API to verify that the Terraform resource has been deleted or disassociated as appropriate.
+- [ ] __Implements CheckDestroy__: Resource testing should include a `CheckDestroy` function (typically named `testAccCheck{SERVICE}{RESOURCE}Destroy`) that calls the API to verify that the Terraform resource has been deleted or disassociated as appropriate.
   More information about `CheckDestroy` functions can be found in the [Extending Terraform TestCase documentation](https://www.terraform.io/docs/extend/testing/acceptance-tests/testcase.html#checkdestroy).
-- [ ] __Implements Exists Check Function__: Resource testing should include a `TestCheckFunc` function (typically named `testAccCheckScaleway{SERVICE}{RESOURCE}Exists`) that calls the API to verify that the Terraform resource has been created or associated as appropriate.
+- [ ] __Implements Exists Check Function__: Resource testing should include a `TestCheckFunc` function (typically named `testAccCheck{SERVICE}{RESOURCE}Exists`) that calls the API to verify that the Terraform resource has been created or associated as appropriate.
   Preferably, this function will also accept a pointer to an API object representing the Terraform resource from the API response that can be set for potential usage in later `TestCheckFunc`.
   More information about these functions can be found in the [Extending Terraform Custom Check Functions documentation](https://www.terraform.io/docs/extend/testing/acceptance-tests/testcase.html#checkdestroy).
 - [ ] __Excludes Provider Declarations__: Test configurations should not include `provider "scaleway" {...}` declarations.

.github/workflows/acceptance-tests.yaml

@@ -10,33 +10,37 @@ jobs:
       fail-fast: false
       matrix:
         products:
-          - Account
-          - AppleSilicon
-          - Baremetal
-          - Billing
-          - Block
-          - Cockpit
-          - Container
-          - Domain
-          - DocumentDB
-          - Function
-          - Iam
-          - Instance
-          - Iot
-          - IPAM
-          - Job
-          - K8S
-          - Lb
-          - Marketplace
-          - MNQ
-          - Object
-          - Rdb
-          - Redis
-          - Registry
-          - Secret
-          - ServerlessSQLDB
-          - Tem
-          - VPC
+          - account
+          - applesilicon
+          - az
+          - baremetal
+          - billing
+          - block
+          - cockpit
+          - container
+          - documentdb
+          - domain
+          - flexibleip
+          - function
+          - iam
+          - instance
+          - iot
+          - ipam
+          - jobs
+          - k8s
+          - lb
+          - marketplace
+          - mnq
+          - object
+          - rdb
+          - redis
+          - registry
+          - sdb
+          - secret
+          - tem
+          - vpc
+          - vpcgw
+          - webhosting
     runs-on: ubuntu-latest
     steps:
       - name: Install Go
@@ -46,7 +50,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Run Acceptance Tests
-        run: go test -v ./... -timeout=2h -run "TestAccScaleway(DataSource)?${{ matrix.products }}.*"
+        run: go test -v ./internal/services/${{ matrix.products }} -timeout=2h
         env:
           TF_LOG: DEBUG
           TF_ACC: 1

.github/workflows/nightly.yml

@@ -11,33 +11,37 @@ jobs:
       fail-fast: false
       matrix:
         products:
-          - Account
-          - AppleSilicon
-          - Baremetal
-          - Billing
-          - Block
-          - Cockpit
-          - Domain
-          - DocumentDB
-          - Function
-          - Container
-          - Iam
-          - Instance
-          - Iot
-          - IPAM
-          - Job
-          - K8S
-          - Lb
-          - Marketplace
-          - MNQ
-          - Object
-          - Rdb
-          - Redis
-          - Registry
-          - Secret
-          - ServerlessSQLDB
-          - Tem
-          - VPC
+          - account
+          - applesilicon
+          - az
+          - baremetal
+          - billing
+          - block
+          - cockpit
+          - container
+          - documentdb
+          - domain
+          - flexibleip
+          - function
+          - iam
+          - instance
+          - iot
+          - ipam
+          - jobs
+          - k8s
+          - lb
+          - marketplace
+          - mnq
+          - object
+          - rdb
+          - redis
+          - registry
+          - sdb
+          - secret
+          - tem
+          - vpc
+          - vpcgw
+          - webhosting
     runs-on: ubuntu-latest
     steps:
       - name: Install Go
@@ -47,7 +51,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Run Acceptance Tests
-        run: go test -v ./... -timeout=4h -run "TestAccScaleway(DataSource)?${{ matrix.products }}.*"
+        run: go test -v ./internal/services/${{ matrix.products }} -timeout=4h
         env:
           TF_LOG: DEBUG
           # https://www.terraform.io/docs/extend/testing/acceptance-tests/index.html#running-acceptance-tests
@@ -71,7 +75,7 @@ jobs:
                 "type": "section",
                 "text": {
                     "type": "mrkdwn",
-                    "text": "'"Nightly workflow failed: <https://github.com/scaleway/terraform-provider-scaleway/actions/runs/${GITHUB_RUN_ID}|${FAILED_PRODUCT}>"'"
+                    "text": "'"Terraform Nightly workflow failed: <https://github.com/scaleway/terraform-provider-scaleway/actions/runs/${GITHUB_RUN_ID}|${FAILED_PRODUCT}>"'"
                   }
               }
             ]

.github/workflows/tfproviderlint.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Install tfproviderlint
         run: go install github.com/bflad/tfproviderlint/cmd/tfproviderlint@latest
       - name: Run tfproviderlint
-        run: tfproviderlint -R014=false ./...
+        run: tfproviderlint -R014=false -AT001.ignored-filename-suffixes=_data_source_test.go ./...
   tfproviderdocs:
     runs-on: ubuntu-latest
     steps:

cmd/tftemplate/datasource.go.tmpl

@@ -8,9 +8,9 @@ import (
     "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
-func DataSourceScaleway{{.Resource}}() *schema.Resource {
+func DataSource{{.Resource}}() *schema.Resource {
     // Generate datasource schema from resource
-    dsSchema := datasourceSchemaFromResourceSchema(resourceScaleway{{.Resource}}().Schema)
+    dsSchema := datasourceSchemaFromResourceSchema(Resource{{.Resource}}().Schema)
 
     addOptionalFieldsToSchema(dsSchema, "name", "{{.Locality}}")
 
@@ -24,12 +24,12 @@ func DataSourceScaleway{{.Resource}}() *schema.Resource {
     dsSchema["project_id"].Optional = true
 
     return &schema.Resource{
-        ReadContext: dataSourceScaleway{{.Resource}}Read,
+        ReadContext: DataSource{{.Resource}}Read,
         Schema:      dsSchema,
     }
 }
 
-func dataSourceScaleway{{.Resource}}Read(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+func DataSource{{.Resource}}Read(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
     api, {{.Locality}}, err := {{.API}}APIWith{{.LocalityUpper}}(d, m)
     if err != nil {
         return diag.FromErr(err)
@@ -65,7 +65,7 @@ func dataSourceScaleway{{.Resource}}Read(ctx context.Context, d *schema.Resource
         return diag.FromErr(err)
     }
 
-    diags := resourceScaleway{{.Resource}}Read(ctx, d, m)
+    diags := Resource{{.Resource}}Read(ctx, d, m)
     if diags != nil {
         return append(diags, diag.Errorf("failed to read {{.ResourceCleanLow}} state")...)
     }

cmd/tftemplate/datasource_test.go.tmpl

@@ -7,14 +7,14 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )
 
-func TestAccScalewayDataSource{{.Resource}}_Basic(t *testing.T) {
+func TestAccDataSource{{.Resource}}_Basic(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:          func() { testAccPreCheck(t) },
 		ProviderFactories: tt.ProviderFactories,
 		CheckDestroy: resource.ComposeTestCheckFunc(
-			testAccCheckScaleway{{.Resource}}Destroy(tt),
+			testAccCheck{{.Resource}}Destroy(tt),
 		),
 		Steps: []resource.TestStep{
 			{
@@ -32,7 +32,7 @@ func TestAccScalewayDataSource{{.Resource}}_Basic(t *testing.T) {
 					}
 				`,
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckScaleway{{.Resource}}Exists(tt, "scaleway_{{.ResourceHCL}}.main"),
+					testAccCheck{{.Resource}}Exists(tt, "scaleway_{{.ResourceHCL}}.main"),
 
 					resource.TestCheckResourceAttrPair("scaleway_{{.ResourceHCL}}.main", "name", "data.scaleway_{{.ResourceHCL}}.find_by_name", "name"),
 					resource.TestCheckResourceAttrPair("scaleway_{{.ResourceHCL}}.main", "name", "data.scaleway_{{.ResourceHCL}}.find_by_id", "name"),

cmd/tftemplate/resource.go.tmpl

@@ -9,12 +9,12 @@ import (
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
-func ResourceScaleway{{ .Resource }}() *schema.Resource {
+func Resource{{ .Resource }}() *schema.Resource {
 	return &schema.Resource{
-		CreateContext: resourceScaleway{{ .Resource }}Create,
-		ReadContext:   resourceScaleway{{ .Resource }}Read,
-		UpdateContext: resourceScaleway{{ .Resource }}Update,
-		DeleteContext: resourceScaleway{{ .Resource }}Delete,
+		CreateContext: Resource{{ .Resource }}Create,
+		ReadContext:   Resource{{ .Resource }}Read,
+		UpdateContext: Resource{{ .Resource }}Update,
+		DeleteContext: Resource{{ .Resource }}Delete,
 		Importer: &schema.ResourceImporter{
 			StateContext: schema.ImportStatePassthroughContext,
 		},
@@ -28,12 +28,12 @@ func ResourceScaleway{{ .Resource }}() *schema.Resource {
 				Description: "The {{ .ResourceCleanLow }} name",
 			},
 			"{{ .Locality }}":          {{ .Locality }}Schema(),
-			"project_id":      projectIDSchema(),
+			"project_id":      account.ProjectIDSchema(),
 		},
 	}
 }
 
-func resourceScaleway{{ .Resource }}Create(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+func Resource{{ .Resource }}Create(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	api, {{ .Locality }}, err := {{ .API }}APIWith{{ .LocalityUpper }}(d, m)
 	if err != nil {
 		return diag.FromErr(err)
@@ -57,10 +57,10 @@ func resourceScaleway{{ .Resource }}Create(ctx context.Context, d *schema.Resour
 	}
 {{end}}
 
-	return resourceScaleway{{ .Resource }}Read(ctx, d, m)
+	return Resource{{ .Resource }}Read(ctx, d, m)
 }
 
-func resourceScaleway{{ .Resource }}Read(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+func Resource{{ .Resource }}Read(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	api, {{ .Locality }}, id, err := {{ .API }}APIWith{{ .LocalityUpper }}AndID(m, d.Id())
 	if err != nil {
 		return diag.FromErr(err)
@@ -88,7 +88,7 @@ func resourceScaleway{{ .Resource }}Read(ctx context.Context, d *schema.Resource
 	return nil
 }
 
-func resourceScaleway{{ .Resource }}Update(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+func Resource{{ .Resource }}Update(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	api, {{ .Locality }}, id, err := {{ .API }}APIWith{{ .LocalityUpper }}AndID(m, d.Id())
 	if err != nil {
 		return diag.FromErr(err)
@@ -116,10 +116,10 @@ func resourceScaleway{{ .Resource }}Update(ctx context.Context, d *schema.Resour
 		return diag.FromErr(err)
 	}
 
-	return resourceScaleway{{ .Resource }}Read(ctx, d, m)
+	return Resource{{ .Resource }}Read(ctx, d, m)
 }
 
-func resourceScaleway{{ .Resource }}Delete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+func Resource{{ .Resource }}Delete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	api, {{ .Locality }}, id, err := {{ .API }}APIWith{{ .LocalityUpper }}AndID(m, d.Id())
 	if err != nil {
 		return diag.FromErr(err)