Merge branch 'master' into fix/rdb-ghost-instance-bug

Author: jremy42

.github/workflows/codeql-analysis.yml

@@ -7,6 +7,8 @@ name: "CodeQL"
 
 permissions:
   contents: read
+  security-events: write
+  actions: read
 
 on:
   push:

.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/release.yml

@@ -10,6 +10,8 @@
 # in `goreleaser` to indicate this is being used in a non-interactive mode.
 #
 name: release
+permissions:
+  contents: write
 on:
   push:
     tags:

.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() {