refactor: fix golangci-lint v1.52 checks (#1851)

* refactor: fix golangci-lint v1.52 checks

* refactor: really fix the issues

Author: quantumsheep

scaleway/data_source_instance_servers.go

@@ -181,9 +181,9 @@ func dataSourceScalewayInstanceServersRead(ctx context.Context, d *schema.Resour
 			if err != nil {
 				diags = append(diags, diag.FromErr(fmt.Errorf("failed to read ipv6 netmask: %w", err))...)
 				continue
-			} else {
-				rawServer["ipv6_prefix_length"] = prefixLength
 			}
+
+			rawServer["ipv6_prefix_length"] = prefixLength
 		}
 
 		servers = append(servers, rawServer)

scaleway/helpers.go

@@ -684,7 +684,7 @@ func flattenMapStringStringPtr(m map[string]*string) interface{} {
 	return flattenedMap
 }
 
-func diffSuppressFuncDuration(k, oldValue, newValue string, d *schema.ResourceData) bool {
+func diffSuppressFuncDuration(_, oldValue, newValue string, _ *schema.ResourceData) bool {
 	if oldValue == newValue {
 		return true
 	}
@@ -696,7 +696,7 @@ func diffSuppressFuncDuration(k, oldValue, newValue string, d *schema.ResourceDa
 	return d1 == d2
 }
 
-func diffSuppressFuncTimeRFC3339(k, oldValue, newValue string, d *schema.ResourceData) bool {
+func diffSuppressFuncTimeRFC3339(_, oldValue, newValue string, _ *schema.ResourceData) bool {
 	if oldValue == newValue {
 		return true
 	}
@@ -708,17 +708,17 @@ func diffSuppressFuncTimeRFC3339(k, oldValue, newValue string, d *schema.Resourc
 	return t1.Equal(t2)
 }
 
-func diffSuppressFuncIgnoreCase(k, oldValue, newValue string, d *schema.ResourceData) bool {
+func diffSuppressFuncIgnoreCase(_, oldValue, newValue string, _ *schema.ResourceData) bool {
 	return strings.EqualFold(oldValue, newValue)
 }
 
-func diffSuppressFuncIgnoreCaseAndHyphen(k, oldValue, newValue string, d *schema.ResourceData) bool {
+func diffSuppressFuncIgnoreCaseAndHyphen(_, oldValue, newValue string, _ *schema.ResourceData) bool {
 	return strings.ReplaceAll(strings.ToLower(oldValue), "-", "_") == strings.ReplaceAll(strings.ToLower(newValue), "-", "_")
 }
 
 // diffSuppressFuncLocality is a SuppressDiffFunc to remove the locality from an ID when checking diff.
 // e.g. 2c1a1716-5570-4668-a50a-860c90beabf6 == fr-par-1/2c1a1716-5570-4668-a50a-860c90beabf6
-func diffSuppressFuncLocality(k, oldValue, newValue string, d *schema.ResourceData) bool {
+func diffSuppressFuncLocality(_, oldValue, newValue string, _ *schema.ResourceData) bool {
 	return expandID(oldValue) == expandID(newValue)
 }
 

scaleway/helpers_instance.go

@@ -244,7 +244,7 @@ func validateLocalVolumeSizes(volumes map[string]*instance.VolumeServerTemplate,
 // On the api side, there are two possibles validation schemas for volumes and the validator will be chosen dynamically depending on the passed JSON request
 // - With an image (in that case the root volume can be skipped because it is taken from the image)
 // - Without an image (in that case, the root volume must be defined)
-func sanitizeVolumeMap(serverName string, volumes map[string]*instance.VolumeServerTemplate) map[string]*instance.VolumeServerTemplate {
+func sanitizeVolumeMap(volumes map[string]*instance.VolumeServerTemplate) map[string]*instance.VolumeServerTemplate {
 	m := make(map[string]*instance.VolumeServerTemplate)
 
 	for index, v := range volumes {
@@ -315,7 +315,7 @@ type privateNICsHandler struct {
 	zone           scw.Zone
 }
 
-func newPrivateNICHandler(ctx context.Context, api *instance.API, server string, zone scw.Zone) (*privateNICsHandler, error) {
+func newPrivateNICHandler(api *instance.API, server string, zone scw.Zone) (*privateNICsHandler, error) {
 	handler := &privateNICsHandler{
 		instanceAPI: api,
 		serverID:    server,

scaleway/helpers_lb.go

@@ -391,7 +391,7 @@ func lbUpgradeV1SchemaType() cty.Type {
 }
 
 // lbUpgradeV1UpgradeFunc allow upgrade the from regional to a zoned resource.
-func lbUpgradeV1SchemaUpgradeFunc(ctx context.Context, rawState map[string]interface{}, meta interface{}) (map[string]interface{}, error) {
+func lbUpgradeV1SchemaUpgradeFunc(_ context.Context, rawState map[string]interface{}, _ interface{}) (map[string]interface{}, error) {
 	var err error
 	// element id: upgrade
 	ID, exist := rawState["id"]

scaleway/helpers_object.go

@@ -496,7 +496,7 @@ func TransitionSCWStorageClassValues() []string {
 	}
 }
 
-func SuppressEquivalentPolicyDiffs(k, old, newP string, d *schema.ResourceData) bool {
+func SuppressEquivalentPolicyDiffs(k, old, newP string, _ *schema.ResourceData) bool {
 	tflog.Debug(context.Background(),
 		fmt.Sprintf("[DEBUG] suppress policy on key: %s, old: %s new: %s", k, old, newP))
 	if strings.TrimSpace(old) == "" && strings.TrimSpace(newP) == "" {

scaleway/helpers_rdb.go

@@ -327,7 +327,7 @@ func flattenReadReplicaEndpoints(endpoints []*rdb.Endpoint) (directAccess, priva
 }
 
 // rdbPrivilegeV1SchemaUpgradeFunc allow upgrade the privilege ID on schema V1
-func rdbPrivilegeV1SchemaUpgradeFunc(ctx context.Context, rawState map[string]interface{}, m interface{}) (map[string]interface{}, error) {
+func rdbPrivilegeV1SchemaUpgradeFunc(_ context.Context, rawState map[string]interface{}, m interface{}) (map[string]interface{}, error) {
 	idRaw, exist := rawState["id"]
 	if !exist {
 		return nil, fmt.Errorf("upgrade: id not exist")

scaleway/helpers_registry.go

@@ -2,6 +2,7 @@ package scaleway
 
 import (
 	"context"
+	"fmt"
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -72,6 +73,7 @@ func waitForRegistryNamespaceDelete(ctx context.Context, api *registry.API, regi
 		registry.NamespaceStatusDeleting: {},
 	}
 
+	start := time.Now()
 	for {
 		ns, err := api.GetNamespace(&registry.GetNamespaceRequest{
 			Region:      region,
@@ -85,6 +87,10 @@ func waitForRegistryNamespaceDelete(ctx context.Context, api *registry.API, regi
 			return ns, nil
 		}
 
+		if time.Since(start) > timeout {
+			return nil, fmt.Errorf("timeout while waiting for namespace %s to be deleted", id)
+		}
+
 		select {
 		case <-ctx.Done():
 			return nil, ctx.Err()

scaleway/logger.go

@@ -41,6 +41,6 @@ func (l logger) Printf(format string, args ...interface{}) {
 }
 
 // ShouldLog allow the SDK to log only in DEBUG or TRACE levels.
-func (l logger) ShouldLog(level sdkLogger.LogLevel) bool {
+func (l logger) ShouldLog(_ sdkLogger.LogLevel) bool {
 	return logging.IsDebugOrHigher()
 }

scaleway/resource_instance_server.go

@@ -410,7 +410,7 @@ func resourceScalewayInstanceServerCreate(ctx context.Context, d *schema.Resourc
 	}
 
 	// Sanitize the volume map to respect API schemas
-	req.Volumes = sanitizeVolumeMap(req.Name, req.Volumes)
+	req.Volumes = sanitizeVolumeMap(req.Volumes)
 
 	res, err := instanceAPI.CreateServer(req, scw.WithContext(ctx))
 	if err != nil {
@@ -646,7 +646,7 @@ func resourceScalewayInstanceServerRead(ctx context.Context, d *schema.ResourceD
 		////
 		// Read server private networks
 		////
-		ph, err := newPrivateNICHandler(ctx, instanceAPI, id, zone)
+		ph, err := newPrivateNICHandler(instanceAPI, id, zone)
 		if err != nil {
 			return diag.FromErr(err)
 		}
@@ -870,7 +870,7 @@ func resourceScalewayInstanceServerUpdate(ctx context.Context, d *schema.Resourc
 	// Update server private network
 	////
 	if d.HasChanges("private_network") {
-		ph, err := newPrivateNICHandler(ctx, instanceAPI, id, zone)
+		ph, err := newPrivateNICHandler(instanceAPI, id, zone)
 		if err != nil {
 			diag.FromErr(err)
 		}

scaleway/resource_instance_server_test.go

@@ -983,7 +983,7 @@ func testAccCheckScalewayInstanceServerDestroy(tt *TestTools) resource.TestCheck
 
 // testAccCheckScalewayInstanceServerHasNewVolume tests if volume name is generated by terraform
 // It is useful as volume should not be set in request when creating an instance from an image
-func testAccCheckScalewayInstanceServerHasNewVolume(tt *TestTools, n string) resource.TestCheckFunc {
+func testAccCheckScalewayInstanceServerHasNewVolume(_ *TestTools, n string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[n]
 		if !ok {