Merge branch 'master' into rerecord

Author: remyleone

.golangci.yml

@@ -5,6 +5,11 @@ formatters:
     - gofmt # Gofmt checks whether code was gofmt-ed. By default this tool runs with -s option to check for code simplification [fast: true, auto-fix: true]
     - gofumpt # Gofumpt checks whether code was gofumpt-ed. [fast: true, auto-fix: true]
     - goimports # In addition to fixing imports, goimports also formats your code in the same style as gofmt. [fast: true, auto-fix: true]
+  settings:
+    gofmt:
+      rewrite-rules:
+        - pattern: interface{}
+          replacement: any
 
 linters:
   # Run golangci-lint linters to see the list of all linters
@@ -29,6 +34,7 @@ linters:
     - exptostd # Detects functions from golang.org/x/exp/ that can be replaced by std functions. [auto-fix]
     - fatcontext # Detects nested contexts in loops and function literals. [auto-fix]
     - forbidigo # Forbids identifiers [fast: true, auto-fix: false]
+    - funcorder # Checks the order of functions, methods, and constructors. [fast]
     - gocheckcompilerdirectives # Checks that go compiler directive comments (//go:) are valid. [fast: true, auto-fix: false]
     - gochecksumtype # Run exhaustiveness checks on Go "sum types" [fast: false, auto-fix: false]
     - goconst # Finds repeated strings that could be replaced by a constant [fast: true, auto-fix: false]

cmd/vcr-compressor/main.go

@@ -68,7 +68,7 @@ func main() {
 			continue
 		}
 
-		var m map[string]interface{}
+		var m map[string]any
 
 		err := json.Unmarshal([]byte(responseBody), &m)
 		if err != nil {

cmd/vcr-viewer/main.go

@@ -37,7 +37,7 @@ func main() {
 		log.Printf("    Status: %s\n", interaction.Response.Status)
 		log.Printf("    Body: %s\n", interaction.Response.Body)
 
-		var m map[string]interface{}
+		var m map[string]any
 
 		err := json.Unmarshal([]byte(interaction.Response.Body), &m)
 		if err != nil {

docs/guides/migration_guide_v2.md

@@ -103,7 +103,7 @@ Hence it is named: `scaleway_object_bucket`.
 ### Migration guide for renamed resources
 
 Because the resources changed their name, we cannot use automatic state migration.
-We will first get the identifier of the resource, then remove the resource from the terraform state and then use [`terraform import`](https://www.terraform.io/docs/import/usage.html) to import existing resources to a renamed resource.
+We will first get the identifier of the resource, then remove the resource from the terraform state and then use [`terraform import`](https://www.terraform.io/terraform/cli/import) to import existing resources to a renamed resource.
 
 For instance, let's suppose that you have resource in `fr-par-1` such as:
 

internal/acctest/acctest.go

@@ -131,7 +131,7 @@ func compareJSONFieldsStrings(expected, actual string) bool {
 
 // compareJSONBodies compare two given maps that represent json bodies
 // returns true if both json are equivalent
-func compareJSONBodies(expected, actual map[string]interface{}) bool {
+func compareJSONBodies(expected, actual map[string]any) bool {
 	// Check for each key in actual requests
 	// Compare its value to cassette content if marshal-able to string
 	for key := range actual {

internal/acctest/vcr.go

@@ -28,7 +28,7 @@ var UpdateCassettes = flag.Bool("cassettes", os.Getenv("TF_UPDATE_CASSETTES") ==
 
 // SensitiveFields is a map with keys listing fields that should be anonymized
 // value will be set in place of its old value
-var SensitiveFields = map[string]interface{}{
+var SensitiveFields = map[string]any{
 	"secret_key": "00000000-0000-0000-0000-000000000000",
 }
 
@@ -65,7 +65,7 @@ func getTestFilePath(t *testing.T, pkgFolder string, suffix string) string {
 	return filepath.Join(pkgFolder, "testdata", fileName)
 }
 
-func compareJSONFields(expected, actualI interface{}) bool {
+func compareJSONFields(expected, actualI any) bool {
 	switch actual := actualI.(type) {
 	case string:
 		if _, isString := expected.(string); !isString {
@@ -138,10 +138,10 @@ func cassetteBodyMatcher(actualRequest *http.Request, cassetteRequest cassette.R
 		return true
 	}
 
-	actualJSON := make(map[string]interface{})
-	cassetteJSON := make(map[string]interface{})
+	actualJSON := make(map[string]any)
+	cassetteJSON := make(map[string]any)
 
-	err = xml.Unmarshal(actualRawBody, new(interface{}))
+	err = xml.Unmarshal(actualRawBody, new(any))
 	if err == nil {
 		// match if content is xml
 		return true
@@ -236,7 +236,7 @@ func cassetteMatcher(actual *http.Request, expected cassette.Request) bool {
 }
 
 func cassetteSensitiveFieldsAnonymizer(i *cassette.Interaction) error {
-	var jsonBody map[string]interface{}
+	var jsonBody map[string]any
 
 	err := json.Unmarshal([]byte(i.Response.Body), &jsonBody)
 	if err != nil {

internal/cdf/locality.go

@@ -45,7 +45,7 @@ func expandListKeys(key string, diff *schema.ResourceDiff) []string {
 // getLocality find the locality of a resource
 // Will try to get the zone if available then use region
 // Will also use default zone or region if available
-func getLocality(diff *schema.ResourceDiff, m interface{}) string {
+func getLocality(diff *schema.ResourceDiff, m any) string {
 	var loc string
 
 	rawStateType := diff.GetRawState().Type()
@@ -67,7 +67,7 @@ func getLocality(diff *schema.ResourceDiff, m interface{}) string {
 // Should not be used on computed keys, if a computed key is going to change on zone/region change
 // this function will still block the terraform plan
 func LocalityCheck(keys ...string) schema.CustomizeDiffFunc {
-	return func(_ context.Context, diff *schema.ResourceDiff, m interface{}) error {
+	return func(_ context.Context, diff *schema.ResourceDiff, m any) error {
 		l := getLocality(diff, m)
 
 		if l == "" {

internal/datasource/schemas.go

@@ -7,7 +7,7 @@ import (
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal"
 )
 
-func NewZonedID(idI interface{}, fallBackZone scw.Zone) string {
+func NewZonedID(idI any, fallBackZone scw.Zone) string {
 	zone, id, err := zonal.ParseID(idI.(string))
 	if err != nil {
 		id = idI.(string)
@@ -17,7 +17,7 @@ func NewZonedID(idI interface{}, fallBackZone scw.Zone) string {
 	return zonal.NewIDString(zone, id)
 }
 
-func NewRegionalID(idI interface{}, fallBackRegion scw.Region) string {
+func NewRegionalID(idI any, fallBackRegion scw.Region) string {
 	region, id, err := regional.ParseID(idI.(string))
 	if err != nil {
 		id = idI.(string)

internal/datasource/search.go

@@ -60,7 +60,7 @@ func notFound(err error) bool {
 }
 
 type TooManyResultsError struct {
-	LastRequest interface{}
+	LastRequest any
 	Count       int
 }
 
@@ -74,7 +74,7 @@ func (e *TooManyResultsError) Is(err error) bool {
 	return ok
 }
 
-func (e *TooManyResultsError) As(target interface{}) bool {
+func (e *TooManyResultsError) As(target any) bool {
 	t, ok := target.(**retry.NotFoundError)
 	if !ok {
 		return false

internal/dsf/list.go

@@ -29,14 +29,14 @@ func ExtractBaseKey(k string) string {
 func GetStringListsFromState(key string, d *schema.ResourceData) ([]string, []string) {
 	oldList, newList := d.GetChange(key)
 
-	oldListStr := make([]string, len(oldList.([]interface{})))
-	newListStr := make([]string, len(newList.([]interface{})))
+	oldListStr := make([]string, len(oldList.([]any)))
+	newListStr := make([]string, len(newList.([]any)))
 
-	for i, v := range oldList.([]interface{}) {
+	for i, v := range oldList.([]any) {
 		oldListStr[i] = fmt.Sprint(v)
 	}
 
-	for i, v := range newList.([]interface{}) {
+	for i, v := range newList.([]any) {
 		newListStr[i] = fmt.Sprint(v)
 	}