fix: resolve golangci-lint issues for RDB engine upgrade implementation

Author: jremy42

internal/services/rdb/instance.go

@@ -708,6 +708,7 @@ func ResourceRdbInstanceRead(ctx context.Context, d *schema.ResourceData, m any)
 			"minor_version": version.MinorVersion,
 		}
 	}
+
 	_ = d.Set("upgradable_versions", upgradableVersions)
 
 	// set user and password
@@ -955,11 +956,13 @@ func ResourceRdbInstanceUpdate(ctx context.Context, d *schema.ResourceData, m an
 		newEngineStr := newEngine.(string)
 
 		targetVersionID := ""
+
 		var availableVersions []string
 		for _, version := range rdbInstance.UpgradableVersion {
 			availableVersions = append(availableVersions, version.Name)
 			if version.ID == newEngineStr || version.Version == newEngineStr || version.Name == newEngineStr {
 				targetVersionID = version.ID
+
 				break
 			}
 		}
@@ -968,6 +971,7 @@ func ResourceRdbInstanceUpdate(ctx context.Context, d *schema.ResourceData, m an
 			return diag.FromErr(fmt.Errorf("engine version %s is not available for upgrade from %s. Available versions: %v",
 				newEngineStr, oldEngine.(string), availableVersions))
 		}
+
 		upgradeInstanceRequests = append(upgradeInstanceRequests,
 			rdb.UpgradeInstanceRequest{
 				Region:     region,

internal/services/rdb/instance_test.go

@@ -1,6 +1,7 @@
 package rdb_test
 
 import (
+	"errors"
 	"fmt"
 	"regexp"
 	"testing"
@@ -1588,14 +1589,15 @@ func TestAccInstance_EngineUpgrade(t *testing.T) {
 					func(s *terraform.State) error {
 						rs, ok := s.RootModule().Resources["scaleway_rdb_instance.main"]
 						if !ok {
-							return fmt.Errorf("resource not found: scaleway_rdb_instance.main")
+							return errors.New("resource not found: scaleway_rdb_instance.main")
 						}
 
 						// Capture the old instance ID
 						_, _, ID, err := rdb.NewAPIWithRegionAndID(tt.Meta, rs.Primary.ID)
 						if err != nil {
 							return err
 						}
+
 						oldInstanceID = ID
 
 						// Verify upgradable_versions is populated
@@ -1610,16 +1612,19 @@ func TestAccInstance_EngineUpgrade(t *testing.T) {
 							if _, ok := rs.Primary.Attributes[idKey]; !ok {
 								break
 							}
+
 							nameKey := fmt.Sprintf("upgradable_versions.%d.name", i)
 							versionKey := fmt.Sprintf("upgradable_versions.%d.version", i)
 							minorKey := fmt.Sprintf("upgradable_versions.%d.minor_version", i)
 
 							if rs.Primary.Attributes[nameKey] == "" {
 								return fmt.Errorf("upgradable_versions[%d].name is empty", i)
 							}
+
 							if rs.Primary.Attributes[versionKey] == "" {
 								return fmt.Errorf("upgradable_versions[%d].version is empty", i)
 							}
+
 							if rs.Primary.Attributes[minorKey] == "" {
 								return fmt.Errorf("upgradable_versions[%d].minor_version is empty", i)
 							}
@@ -1673,7 +1678,7 @@ func TestAccInstance_EngineUpgrade(t *testing.T) {
 					func(s *terraform.State) error {
 						rs, ok := s.RootModule().Resources["scaleway_rdb_instance.main"]
 						if !ok {
-							return fmt.Errorf("resource not found: scaleway_rdb_instance.main")
+							return errors.New("resource not found: scaleway_rdb_instance.main")
 						}
 
 						rdbAPI, region, newInstanceID, err := rdb.NewAPIWithRegionAndID(tt.Meta, rs.Primary.ID)
@@ -1697,7 +1702,7 @@ func TestAccInstance_EngineUpgrade(t *testing.T) {
 
 						// Check that the error is a 404
 						if !httperrors.Is404(err) {
-							return fmt.Errorf("expected 404 error for old instance %s, got: %v", oldInstanceID, err)
+							return fmt.Errorf("expected 404 error for old instance %s, got: %w", oldInstanceID, err)
 						}
 
 						return nil

internal/services/rdb/testfuncs/checks.go

@@ -85,6 +85,7 @@ func GetEngineVersionsForUpgrade(tt *acctest.TestTools, engineName string) (stri
 	for _, engine := range engines.Engines {
 		if engine.Name == engineName {
 			var availableVersions []string
+
 			for _, version := range engine.Versions {
 				if !version.Disabled {
 					availableVersions = append(availableVersions, version.Name)
@@ -98,5 +99,6 @@ func GetEngineVersionsForUpgrade(tt *acctest.TestTools, engineName string) (stri
 	}
 
 	tt.T.Fatalf("Could not find two different versions for engine %s", engineName)
+
 	return "", ""
 }