chore: migrate from interface{} to any (#3162)

* chore: migrate from interface{} to any

* Fix

* Fix

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

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 {

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)
 	}
 

internal/locality/ids.go

@@ -1,7 +1,7 @@
 package locality
 
 // ExpandID returns the id whether it is a localizedID or a raw ID.
-func ExpandID(id interface{}) string {
+func ExpandID(id any) string {
 	_, ID, err := ParseLocalizedID(id.(string))
 	if err != nil {
 		return id.(string)
@@ -10,10 +10,10 @@ func ExpandID(id interface{}) string {
 	return ID
 }
 
-func ExpandIDs(data interface{}) []string {
-	expandedIDs := make([]string, 0, len(data.([]interface{})))
+func ExpandIDs(data any) []string {
+	expandedIDs := make([]string, 0, len(data.([]any)))
 
-	for _, s := range data.([]interface{}) {
+	for _, s := range data.([]any) {
 		if s == nil {
 			s = ""
 		}

internal/locality/regional/ids.go

@@ -25,7 +25,7 @@ func (z ID) String() string {
 	return fmt.Sprintf("%s/%s", z.Region, z.ID)
 }
 
-func ExpandID(id interface{}) ID {
+func ExpandID(id any) ID {
 	regionalID := ID{}
 	tab := strings.Split(id.(string), "/")
 

internal/locality/validation.go

@@ -9,7 +9,7 @@ import (
 
 // ValidateStringInSliceWithWarning helps to only returns warnings in case we got a non-public locality passed
 func ValidateStringInSliceWithWarning(correctValues []string, field string) schema.SchemaValidateDiagFunc {
-	return func(i interface{}, path cty.Path) diag.Diagnostics {
+	return func(i any, path cty.Path) diag.Diagnostics {
 		_, rawErr := validation.StringInSlice(correctValues, true)(i, field)
 
 		var res diag.Diagnostics

internal/locality/zonal/ids.go

@@ -25,7 +25,7 @@ func (z ID) String() string {
 	return fmt.Sprintf("%s/%s", z.Zone, z.ID)
 }
 
-func ExpandID(id interface{}) ID {
+func ExpandID(id any) ID {
 	zonedID := ID{}
 	tab := strings.Split(id.(string), "/")
 

internal/logging/logger.go

@@ -20,27 +20,27 @@ type Logger struct{}
 var L = Logger{}
 
 // Debugf logs to the DEBUG log. Arguments are handled in the manner of fmt.Printf.
-func (l Logger) Debugf(format string, args ...interface{}) {
+func (l Logger) Debugf(format string, args ...any) {
 	log.Printf("[DEBUG] "+format, args...)
 }
 
 // Infof logs to the INFO log. Arguments are handled in the manner of fmt.Printf.
-func (l Logger) Infof(format string, args ...interface{}) {
+func (l Logger) Infof(format string, args ...any) {
 	log.Printf("[INFO] "+format, args...)
 }
 
 // Warningf logs to the WARNING log. Arguments are handled in the manner of fmt.Printf.
-func (l Logger) Warningf(format string, args ...interface{}) {
+func (l Logger) Warningf(format string, args ...any) {
 	log.Printf("[WARN] "+format, args...)
 }
 
 // Errorf logs to the ERROR log. Arguments are handled in the manner of fmt.Printf.
-func (l Logger) Errorf(format string, args ...interface{}) {
+func (l Logger) Errorf(format string, args ...any) {
 	log.Printf("[ERROR] "+format, args...)
 }
 
 // Printf logs to the DEBUG log. Arguments are handled in the manner of fmt.Printf.
-func (l Logger) Printf(format string, args ...interface{}) {
+func (l Logger) Printf(format string, args ...any) {
 	l.Debugf(format, args...)
 }
 

internal/meta/extractors.go

@@ -15,15 +15,15 @@ import (
 // terraformResourceData is an interface for *schema.ResourceData. (used for mock)
 type terraformResourceData interface {
 	HasChange(string) bool
-	GetOk(string) (interface{}, bool)
-	Get(string) interface{}
+	GetOk(string) (any, bool)
+	Get(string) any
 	Id() string
 }
 
 // ExtractZone will try to guess the zone from the following:
 //   - zone field of the resource data
 //   - default zone from config
-func ExtractZone(d terraformResourceData, m interface{}) (scw.Zone, error) {
+func ExtractZone(d terraformResourceData, m any) (scw.Zone, error) {
 	rawZone, exist := d.GetOk("zone")
 	if exist {
 		return scw.ParseZone(rawZone.(string))
@@ -40,7 +40,7 @@ func ExtractZone(d terraformResourceData, m interface{}) (scw.Zone, error) {
 // ExtractRegion will try to guess the region from the following:
 //   - region field of the resource data
 //   - default region from config
-func ExtractRegion(d terraformResourceData, m interface{}) (scw.Region, error) {
+func ExtractRegion(d terraformResourceData, m any) (scw.Region, error) {
 	rawRegion, exist := d.GetOk("region")
 	if exist {
 		return scw.ParseRegion(rawRegion.(string))
@@ -58,7 +58,7 @@ func ExtractRegion(d terraformResourceData, m interface{}) (scw.Region, error) {
 //   - region field of the resource data
 //   - default region given in argument
 //   - default region from config
-func ExtractRegionWithDefault(d terraformResourceData, m interface{}, defaultRegion scw.Region) (scw.Region, error) {
+func ExtractRegionWithDefault(d terraformResourceData, m any, defaultRegion scw.Region) (scw.Region, error) {
 	rawRegion, exist := d.GetOk("region")
 	if exist {
 		return scw.ParseRegion(rawRegion.(string))
@@ -79,7 +79,7 @@ func ExtractRegionWithDefault(d terraformResourceData, m interface{}, defaultReg
 // ExtractProjectID will try to guess the project id from the following:
 //   - project_id field of the resource data
 //   - default project id from config
-func ExtractProjectID(d terraformResourceData, m interface{}) (projectID string, isDefault bool, err error) {
+func ExtractProjectID(d terraformResourceData, m any) (projectID string, isDefault bool, err error) {
 	rawProjectID, exist := d.GetOk("project_id")
 	if exist {
 		return rawProjectID.(string), false, nil
@@ -93,15 +93,15 @@ func ExtractProjectID(d terraformResourceData, m interface{}) (projectID string,
 	return "", false, ErrProjectIDNotFound
 }
 
-func ExtractScwClient(m interface{}) *scw.Client {
+func ExtractScwClient(m any) *scw.Client {
 	return m.(*Meta).ScwClient()
 }
 
-func ExtractHTTPClient(m interface{}) *http.Client {
+func ExtractHTTPClient(m any) *http.Client {
 	return m.(*Meta).HTTPClient()
 }
 
-func getKeyInRawConfigMap(rawConfig map[string]cty.Value, key string, ty cty.Type) (interface{}, bool) {
+func getKeyInRawConfigMap(rawConfig map[string]cty.Value, key string, ty cty.Type) (any, bool) {
 	if key == "" {
 		return rawConfig, false
 	}
@@ -159,7 +159,7 @@ func getKeyInRawConfigMap(rawConfig map[string]cty.Value, key string, ty cty.Typ
 
 // GetRawConfigForKey returns the value for a specific key in the user's raw configuration, which can be useful on resources' update
 // The value for the key to look for must be a primitive type (bool, string, number) and the expected type of the value should be passed as the ty parameter
-func GetRawConfigForKey(d *schema.ResourceData, key string, ty cty.Type) (interface{}, bool) {
+func GetRawConfigForKey(d *schema.ResourceData, key string, ty cty.Type) (any, bool) {
 	rawConfig := d.GetRawConfig()
 	if rawConfig.IsNull() {
 		return nil, false

internal/provider/provider.go

@@ -341,7 +341,7 @@ func Provider(config *Config) plugin.ProviderFunc {
 
 		addBetaResources(p)
 
-		p.ConfigureContextFunc = func(ctx context.Context, data *schema.ResourceData) (interface{}, diag.Diagnostics) {
+		p.ConfigureContextFunc = func(ctx context.Context, data *schema.ResourceData) (any, diag.Diagnostics) {
 			terraformVersion := p.TerraformVersion
 
 			// If we provide meta in config use it. This is useful for tests

internal/services/account/helpers.go

@@ -10,11 +10,11 @@ import (
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/types"
 )
 
-func NewProjectAPI(m interface{}) *accountSDK.ProjectAPI {
+func NewProjectAPI(m any) *accountSDK.ProjectAPI {
 	return accountSDK.NewProjectAPI(meta.ExtractScwClient(m))
 }
 
-func GetOrganizationID(m interface{}, d *schema.ResourceData) *string {
+func GetOrganizationID(m any, d *schema.ResourceData) *string {
 	orgID, orgIDExist := d.GetOk("organization_id")
 
 	if orgIDExist {

internal/services/account/project.go

@@ -57,7 +57,7 @@ func ResourceProject() *schema.Resource {
 	}
 }
 
-func resourceAccountProjectCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+func resourceAccountProjectCreate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics {
 	accountAPI := NewProjectAPI(m)
 
 	request := &accountSDK.ProjectAPICreateProjectRequest{
@@ -79,7 +79,7 @@ func resourceAccountProjectCreate(ctx context.Context, d *schema.ResourceData, m
 	return resourceAccountProjectRead(ctx, d, m)
 }
 
-func resourceAccountProjectRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+func resourceAccountProjectRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics {
 	accountAPI := NewProjectAPI(m)
 
 	res, err := accountAPI.GetProject(&accountSDK.ProjectAPIGetProjectRequest{
@@ -104,7 +104,7 @@ func resourceAccountProjectRead(ctx context.Context, d *schema.ResourceData, m i
 	return nil
 }
 
-func resourceAccountProjectUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+func resourceAccountProjectUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics {
 	accountAPI := NewProjectAPI(m)
 
 	req := &accountSDK.ProjectAPIUpdateProjectRequest{
@@ -133,7 +133,7 @@ func resourceAccountProjectUpdate(ctx context.Context, d *schema.ResourceData, m
 	return resourceAccountProjectRead(ctx, d, m)
 }
 
-func resourceAccountProjectDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+func resourceAccountProjectDelete(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics {
 	accountAPI := NewProjectAPI(m)
 
 	err := retry.RetryContext(ctx, d.Timeout(schema.TimeoutDelete), func() *retry.RetryError {