Merge branch 'master' into alert-autofix-15

Author: jremy42

.github/workflows/documentation.yml

@@ -65,3 +65,4 @@ jobs:
           go-version: ${{ env.GO_VERSION }}
       - uses: hashicorp/setup-terraform@v3
       - run: go tool tfplugindocs validate
+      - run: go tool tfplugindocs generate

.github/workflows/tfproviderlint.yml

@@ -21,6 +21,8 @@ jobs:
         run: go install github.com/bflad/tfproviderlint/cmd/tfproviderlint
       - name: Run tfproviderlint
         run: make tfproviderlint
+      - name: Run tfproviderlintx
+        run: make tfproviderlintx
   tfproviderdocs:
     runs-on: ubuntu-latest
     steps:

.golangci.yml

@@ -112,6 +112,18 @@ linters:
     - varnamelen # checks that the length of a variable's name matches its scope [fast: false, auto-fix: false]
 
   settings:
+    depguard:
+      rules:
+        testing:
+          files:
+            - "**/*_test.go"
+          deny:
+            - pkg: "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
+              desc: use github.com/hashicorp/terraform-plugin-testing/helper/acctest
+            - pkg: "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+              desc: use github.com/hashicorp/terraform-plugin-testing/helper/resource
+            - pkg: "github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
+              desc: use github.com/hashicorp/terraform-plugin-testing/terraform
     govet:
       disable-all: true
       enable:

GNUmakefile

@@ -60,3 +60,6 @@ tfproviderlint:
 
 tfproviderdocs:
 	go tool tfproviderdocs check -provider-name scaleway -enable-contents-check
+
+tfproviderlintx:
+	go tool tfproviderlintx -XR001=false -XS002=false ./...

cmd/tftemplate/datasource_test.go.tmpl

@@ -4,7 +4,7 @@ package {{.API}}_test
 import (
 	"testing"
 
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 )
 
 func TestAccDataSource{{.Resource}}_Basic(t *testing.T) {

cmd/tftemplate/resource_test.go.tmpl

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
+	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/terraform"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 

cmd/tftemplate/sweep.go.tmpl

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
+	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/terraform"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 

cmd/tftemplate/sweep_test.go.tmpl

@@ -4,7 +4,7 @@ package {{.API}}_test
 import (
 	"fmt"
 
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 )
 
 func init() {

docs/resources/instance_server.md

@@ -295,8 +295,13 @@ In addition to all arguments above, the following attributes are exported:
 - `private_ip` - The Scaleway internal IP address of the server (Deprecated use [ipam_ip datasource](../data-sources/ipam_ip.md#instance-private-network-ip) instead).
 - `public_ip` -  The public IP address of the server (Deprecated use `public_ips` instead).
 - `public_ips` - The list of public IPs of the server.
-    - `id` - The ID of the IP
-    - `address` - The address of the IP
+    - `id` - The ID of the IP.
+    - `address` - The address of the IP.
+    - `gateway` - The IP of the Gateway associated with the IP.
+    - `netmask` - The CIDR netmask of the IP.
+    - `family` - The IP address' family.
+    - `dynamic` - Whether the IP is dynamic.
+    - `provisioning_mode` - The provisioning mode of the IP
 - `ipv6_address` - The default ipv6 address routed to the server. ( Only set when enable_ipv6 is set to true )
   Deprecated: Please use a scaleway_instance_ip with a `routed_ipv6` type.
 - `ipv6_gateway` - The ipv6 gateway address. ( Only set when enable_ipv6 is set to true )

docs/resources/instance_snapshot.md

@@ -40,7 +40,6 @@ resource "scaleway_instance_server" "main" {
 
 resource "scaleway_instance_snapshot" "main" {
   volume_id  = scaleway_instance_volume.main.id
-  type       = "unified"
   depends_on = [scaleway_instance_server.main]
 }
 ```
@@ -59,7 +58,6 @@ resource "scaleway_object" "qcow" {
 }
 
 resource "scaleway_instance_snapshot" "snapshot" {
-  type = "unified"
   import {
     bucket = scaleway_object.qcow.bucket
     key    = scaleway_object.qcow.key
@@ -72,11 +70,12 @@ resource "scaleway_instance_snapshot" "snapshot" {
 The following arguments are supported:
 
 - `volume_id` - (Optional) The ID of the volume to take a snapshot from.
-- `type` - (Optional) The snapshot's volume type.  The possible values are: `l_ssd` (Local SSD) and `unified`.
+- `type` - (Default to `l_ssd`) The snapshot's volume type.  The possible values are: `l_ssd` (Local SSD).
 Updates to this field will recreate a new resource.
 
 ~> **Important:** Snapshots of volumes with type `b_ssd` (Block SSD) are deprecated and cannot be managed using the `scaleway_instance_snapshot` resource anymore. Please use the `scaleway_block_snapshot` resource instead.
 If you want to migrate existing snapshots, you can visit [this page](https://www.scaleway.com/en/docs/instances/how-to/migrate-volumes-snapshots-to-sbs/) for more information.
+~> **Important:** Snapshots of volumes with type `unified` (can be used with both Block and Local SSD) are deprecated since the migration to SBS.
 
 - `name` - (Optional) The name of the snapshot. If not provided it will be randomly generated.
 - `zone` - (Defaults to [provider](../index.md#zone) `zone`) The [zone](../guides/regions_and_zones.md#zones) in which
@@ -88,8 +87,6 @@ If you want to migrate existing snapshots, you can visit [this page](https://www
     - `bucket` - Bucket name containing [qcow2](https://en.wikipedia.org/wiki/Qcow) to import
     - `key` - Key of the object to import
 
--> **Note:** The type `unified` could be instantiated on both `l_ssd` and `b_ssd` volumes.
-
 ## Attributes Reference
 
 In addition to all arguments above, the following attributes are exported: