lint ok

Mia-Cross · Mia-Cross · commit 071515d08f59 · 2025-10-23T18:40:15.000+02:00
diff --git a/internal/locality/regional/ids.go b/internal/locality/regional/ids.go
@@ -62,22 +62,22 @@ func NewIDString(region scw.Region, id string) string {
 func ParseNestedID(regionalNestedID string) (region scw.Region, outerID, innerID string, err error) {
 	loc, innerID, outerID, err := locality.ParseLocalizedNestedID(regionalNestedID)
 	if err != nil {
-		return
+		return region, outerID, innerID, err
 	}
 
 	region, err = scw.ParseRegion(loc)
 
-	return
+	return region, outerID, innerID, err
 }
 
 // ParseID parses a regionalID and extracts the resource region and id.
 func ParseID(regionalID string) (region scw.Region, id string, err error) {
 	loc, id, err := locality.ParseLocalizedID(regionalID)
 	if err != nil {
-		return
+		return region, id, err
 	}
 
 	region, err = scw.ParseRegion(loc)
 
-	return
+	return region, id, err
 }
diff --git a/internal/locality/zonal/ids.go b/internal/locality/zonal/ids.go
@@ -73,17 +73,17 @@ func ParseID(zonedID string) (zone scw.Zone, id string, err error) {
 
 	zone, err = scw.ParseZone(rawZone)
 
-	return
+	return zone, id, err
 }
 
 // ParseNestedID parses a zonedNestedID and extracts the resource zone ,inner and outer ID.
 func ParseNestedID(zonedNestedID string) (zone scw.Zone, outerID, innerID string, err error) {
 	rawZone, innerID, outerID, err := locality.ParseLocalizedNestedID(zonedNestedID)
 	if err != nil {
-		return
+		return zone, outerID, innerID, err
 	}
 
 	zone, err = scw.ParseZone(rawZone)
 
-	return
+	return zone, outerID, innerID, err
 }
diff --git a/internal/services/iam/group_membership.go b/internal/services/iam/group_membership.go
@@ -178,7 +178,7 @@ func ExpandGroupMembershipID(id string) (groupID string, userID string, applicat
 		applicationID = elems[2]
 	}
 
-	return
+	return groupID, userID, applicationID, err
 }
 
 func MakeGroupRequest(ctx context.Context, api *iam.API, request any) (*iam.Group, error) {
diff --git a/internal/services/iam/user.go b/internal/services/iam/user.go
@@ -188,7 +188,7 @@ func resourceIamUserRead(ctx context.Context, d *schema.ResourceData, m any) dia
 	_ = d.Set("deletable", user.Deletable)
 	_ = d.Set("last_login_at", types.FlattenTime(user.LastLoginAt))
 	_ = d.Set("type", user.Type)
-	_ = d.Set("status", user.Status.String()) // lintignore: SA1019
+	_ = d.Set("status", user.Status.String()) //nolint:staticcheck
 	_ = d.Set("mfa", user.Mfa)
 	_ = d.Set("account_root_user_id", user.AccountRootUserID)
 	_ = d.Set("locked", user.Locked)
diff --git a/internal/services/instance/instancehelpers/block.go b/internal/services/instance/instancehelpers/block.go
@@ -215,6 +215,7 @@ func (api *BlockAndInstanceAPI) DeleteUnknownVolume(req *DeleteUnknownVolumeRequ
 
 	if unknownVolume.IsBlockVolume() {
 		targetStatus := block.VolumeStatusAvailable
+
 		_, err = api.BlockAPI.WaitForVolume(&block.WaitForVolumeRequest{
 			Zone:           req.Zone,
 			VolumeID:       req.VolumeID,
diff --git a/internal/services/instance/server_test.go b/internal/services/instance/server_test.go
@@ -2023,6 +2023,7 @@ func TestAccServer_PrivateNetworkMissingPNIC(t *testing.T) {
 				ImportState:  true,
 				ImportStateIdFunc: func(state *terraform.State) (string, error) {
 					serverID := state.RootModule().Resources["scaleway_instance_server.main"].Primary.ID
+
 					pnicID, exists := state.RootModule().Resources["scaleway_instance_server.main"].Primary.Attributes["private_network.0.pnic_id"]
 					if !exists {
 						return "", errors.New("private_network.0.pnic_id not found")
@@ -2066,7 +2067,9 @@ func TestAccServer_PrivateNetworkMissingPNIC(t *testing.T) {
 						if !exists {
 							return errors.New("private_network.0.pnic_id not found")
 						}
+
 						localizedPNICID := state.RootModule().Resources["scaleway_instance_private_nic.pnic"].Primary.ID
+
 						_, pnicID, _, err := zonal.ParseNestedID(localizedPNICID)
 						if err != nil {
 							return err
diff --git a/internal/services/k8s/cluster.go b/internal/services/k8s/cluster.go
@@ -233,6 +233,7 @@ func ResourceCluster() *schema.Resource {
 				if okAutoUpgradeEnable && autoUpgradeEnable.(bool) && !versionIsOnlyMinor {
 					return errors.New("only minor version x.y can be used with auto upgrade enabled")
 				}
+
 				if versionIsOnlyMinor && !autoUpgradeEnable.(bool) {
 					return errors.New("minor version x.y must only be used with auto upgrade enabled")
 				}
@@ -257,11 +258,13 @@ func ResourceCluster() *schema.Resource {
 							// If no private network has been set yet, migrate the cluster in the Update function
 							return nil
 						}
+
 						if planned != "" {
 							_, plannedPNID, err := locality.ParseLocalizedID(planned.(string))
 							if err != nil {
 								return err
 							}
+
 							if plannedPNID == actual {
 								// If the private network ID is the same, do nothing
 								return nil
@@ -283,6 +286,7 @@ func ResourceCluster() *schema.Resource {
 					if err != nil {
 						return err
 					}
+
 					possibleTypes, err := k8sAPI.ListClusterAvailableTypes(&k8s.ListClusterAvailableTypesRequest{
 						Region:    region,
 						ClusterID: clusterID,
@@ -297,6 +301,7 @@ func ResourceCluster() *schema.Resource {
 							return nil
 						}
 					}
+
 					err = diff.ForceNew("type")
 					if err != nil {
 						return err
diff --git a/internal/services/lb/backends_data_source.go b/internal/services/lb/backends_data_source.go
@@ -62,6 +62,7 @@ func DataSourceBackends() *schema.Resource {
 							Computed: true,
 							Description: func() string {
 								var t lb.ForwardPortAlgorithm
+
 								values := t.Values()
 
 								return fmt.Sprintf("Load balancing algorithm to be used when determining which backend server to forward new traffic to. Possible values are: %s", values)
diff --git a/internal/services/lb/lb_test.go b/internal/services/lb/lb_test.go
@@ -281,6 +281,7 @@ func TestAccLB_Migrate(t *testing.T) {
 						if !ok {
 							return fmt.Errorf("resource not found: %s", "scaleway_lb.main")
 						}
+
 						lbID = rs.Primary.ID
 
 						return nil
@@ -310,6 +311,7 @@ func TestAccLB_Migrate(t *testing.T) {
 						if !ok {
 							return fmt.Errorf("resource not found: %s", "scaleway_lb.main")
 						}
+
 						if rs.Primary.ID != lbID {
 							return errors.New("LB id has changed")
 						}
diff --git a/internal/services/lb/lbs_data_source.go b/internal/services/lb/lbs_data_source.go
@@ -165,6 +165,7 @@ func DataSourceLbs() *schema.Resource {
 							Computed: true,
 							Description: func() string {
 								var t lb.SSLCompatibilityLevel
+
 								values := t.Values()
 
 								return fmt.Sprintf("SSL compatibility level possible values are %s", values)
diff --git a/internal/services/mnq/sns_topic_test.go b/internal/services/mnq/sns_topic_test.go
@@ -124,6 +124,7 @@ func TestAccSNSTopic_Basic(t *testing.T) {
 						if !exists {
 							return errors.New("failed to find resource")
 						}
+
 						name, exists := topic.Primary.Attributes["name"]
 						if !exists {
 							return errors.New("failed to find atttribute")
diff --git a/internal/services/mongodb/instance.go b/internal/services/mongodb/instance.go
@@ -264,6 +264,7 @@ func ResourceInstance() *schema.Resource {
 			func(ctx context.Context, d *schema.ResourceDiff, meta any) error {
 				if d.HasChange("version") {
 					v := d.Get("version").(string)
+
 					parts := strings.Split(v, ".")
 					if len(parts) > 2 {
 						majorMinor := parts[0] + "." + parts[1]
diff --git a/internal/services/mongodb/user.go b/internal/services/mongodb/user.go
@@ -96,6 +96,7 @@ func ResourceUser() *schema.Resource {
 						if databaseName != "" && anyDatabase {
 							return errors.New("database_name and any_database are mutually exclusive")
 						}
+
 						if databaseName == "" && !anyDatabase {
 							return errors.New("either database_name or any_database must be specified")
 						}
diff --git a/internal/services/scwconfig/scw_config_data_source_test.go b/internal/services/scwconfig/scw_config_data_source_test.go
@@ -29,7 +29,9 @@ func TestAccDataSourceConfig_ActiveProfile(t *testing.T) {
 		PreCheck: func() { acctest.PreCheck(t) },
 		ProviderFactories: func() map[string]func() (*schema.Provider, error) {
 			_ = os.Unsetenv("SCW_PROFILE")
+
 			t.Setenv("SCW_CONFIG_PATH", "./testfixture/test_config.yaml")
+
 			metaDefault, err := meta.NewMeta(ctx, &meta.Config{
 				TerraformVersion: "terraform-tests",
 				HTTPClient:       tt.Meta.HTTPClient(),
@@ -81,8 +83,10 @@ func TestAccDataSourceConfig_OtherProfile(t *testing.T) {
 		PreCheck: func() { acctest.PreCheck(t) },
 		ProviderFactories: func() map[string]func() (*schema.Provider, error) {
 			_ = os.Unsetenv("SCW_PROFILE")
+
 			t.Setenv("SCW_CONFIG_PATH", "./testfixture/test_config.yaml")
 			t.Setenv("SCW_PROFILE", "other")
+
 			metaOther, err := meta.NewMeta(ctx, &meta.Config{
 				TerraformVersion: "terraform-tests",
 				HTTPClient:       tt.Meta.HTTPClient(),
@@ -134,9 +138,11 @@ func TestAccDataSourceConfig_MixedProfile(t *testing.T) {
 		PreCheck: func() { acctest.PreCheck(t) },
 		ProviderFactories: func() map[string]func() (*schema.Provider, error) {
 			_ = os.Unsetenv("SCW_PROFILE")
+
 			t.Setenv("SCW_CONFIG_PATH", "./testfixture/test_config.yaml")
 			t.Setenv("SCW_PROFILE", "incomplete")
 			t.Setenv("SCW_DEFAULT_PROJECT_ID", "77777777-7777-7777-7777-777777777777")
+
 			metaMixed, err := meta.NewMeta(ctx, &meta.Config{
 				TerraformVersion: "terraform-tests",
 				HTTPClient:       tt.Meta.HTTPClient(),
diff --git a/internal/services/secret/secret.go b/internal/services/secret/secret.go
@@ -84,6 +84,7 @@ func ResourceSecret() *schema.Resource {
 				Type:     schema.TypeString,
 				Description: func() string {
 					var t secret.SecretType
+
 					secretTypes := t.Values()
 
 					return fmt.Sprintf("Type of the secret could be any value among: %s", secretTypes)
diff --git a/internal/services/vpc/types.go b/internal/services/vpc/types.go
@@ -39,7 +39,7 @@ func expandSubnets(d *schema.ResourceData) (ipv4Subnets []scw.IPNet, ipv6Subnets
 		}
 	}
 
-	return
+	return ipv4Subnets, ipv6Subnets, err
 }
 
 func FlattenAndSortSubnets(sub any) (any, any) {
diff --git a/internal/services/webhosting/webhosting.go b/internal/services/webhosting/webhosting.go
@@ -303,7 +303,7 @@ func resourceWebhostingRead(ctx context.Context, d *schema.ResourceData, m any)
 	}
 
 	dnsRecordsResponse, err := dnsAPI.GetDomainDNSRecords(&webhosting.DNSAPIGetDomainDNSRecordsRequest{
-		Domain: *webhostingResponse.Domain,
+		Domain: *webhostingResponse.Domain, //nolint:staticcheck
 	}, scw.WithContext(ctx))
 	if err != nil {
 		return diag.FromErr(err)
@@ -314,7 +314,7 @@ func resourceWebhostingRead(ctx context.Context, d *schema.ResourceData, m any)
 
 	_ = d.Set("tags", webhostingResponse.Tags)
 	_ = d.Set("offer_id", regional.NewIDString(region, webhostingResponse.Offer.ID))
-	_ = d.Set("domain", webhostingResponse.Domain)
+	_ = d.Set("domain", webhostingResponse.Domain) //nolint:staticcheck
 	_ = d.Set("created_at", types.FlattenTime(webhostingResponse.CreatedAt))
 	_ = d.Set("updated_at", types.FlattenTime(webhostingResponse.UpdatedAt))
 	_ = d.Set("status", webhostingResponse.Status.String())
diff --git a/internal/services/webhosting/webhosting_data_source.go b/internal/services/webhosting/webhosting_data_source.go
@@ -64,7 +64,7 @@ func DataSourceWebhostingRead(ctx context.Context, d *schema.ResourceData, m any
 
 		foundDomain, err := datasource.FindExact(
 			res.Hostings,
-			func(s *webhosting.HostingSummary) bool { return *s.Domain == hostingDomain },
+			func(s *webhosting.HostingSummary) bool { return *s.Domain == hostingDomain }, //nolint:staticcheck
 			hostingDomain,
 		)
 		if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -62,22 +62,22 @@ func NewIDString(region scw.Region, id string) string {`
`62`	`62`	`func ParseNestedID(regionalNestedID string) (region scw.Region, outerID, innerID string, err error) {`
`63`	`63`	`loc, innerID, outerID, err := locality.ParseLocalizedNestedID(regionalNestedID)`
`64`	`64`	`if err != nil {`
`65`		`- return`
	`65`	`+ return region, outerID, innerID, err`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`region, err = scw.ParseRegion(loc)`
`69`	`69`
`70`		`- return`
	`70`	`+ return region, outerID, innerID, err`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`// ParseID parses a regionalID and extracts the resource region and id.`
`74`	`74`	`func ParseID(regionalID string) (region scw.Region, id string, err error) {`
`75`	`75`	`loc, id, err := locality.ParseLocalizedID(regionalID)`
`76`	`76`	`if err != nil {`
`77`		`- return`
	`77`	`+ return region, id, err`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`region, err = scw.ParseRegion(loc)`
`81`	`81`
`82`		`- return`
	`82`	`+ return region, id, err`
`83`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,17 +73,17 @@ func ParseID(zonedID string) (zone scw.Zone, id string, err error) {`
`73`	`73`
`74`	`74`	`zone, err = scw.ParseZone(rawZone)`
`75`	`75`
`76`		`- return`
	`76`	`+ return zone, id, err`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`// ParseNestedID parses a zonedNestedID and extracts the resource zone ,inner and outer ID.`
`80`	`80`	`func ParseNestedID(zonedNestedID string) (zone scw.Zone, outerID, innerID string, err error) {`
`81`	`81`	`rawZone, innerID, outerID, err := locality.ParseLocalizedNestedID(zonedNestedID)`
`82`	`82`	`if err != nil {`
`83`		`- return`
	`83`	`+ return zone, outerID, innerID, err`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`zone, err = scw.ParseZone(rawZone)`
`87`	`87`
`88`		`- return`
	`88`	`+ return zone, outerID, innerID, err`
`89`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ func ExpandGroupMembershipID(id string) (groupID string, userID string, applicat`
`178`	`178`	`applicationID = elems[2]`
`179`	`179`	`}`
`180`	`180`
`181`		`- return`
	`181`	`+ return groupID, userID, applicationID, err`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`func MakeGroupRequest(ctx context.Context, api iam.API, request any) (iam.Group, error) {`
Original file line number	Diff line number	Diff line change
`@@ -233,6 +233,7 @@ func ResourceCluster() *schema.Resource {`
`233`	`233`	`if okAutoUpgradeEnable && autoUpgradeEnable.(bool) && !versionIsOnlyMinor {`
`234`	`234`	`return errors.New("only minor version x.y can be used with auto upgrade enabled")`
`235`	`235`	`}`
	`236`	`+`
`236`	`237`	`if versionIsOnlyMinor && !autoUpgradeEnable.(bool) {`
`237`	`238`	`return errors.New("minor version x.y must only be used with auto upgrade enabled")`
`238`	`239`	`}`
`@@ -257,11 +258,13 @@ func ResourceCluster() *schema.Resource {`
`257`	`258`	`// If no private network has been set yet, migrate the cluster in the Update function`
`258`	`259`	`return nil`
`259`	`260`	`}`
	`261`	`+`
`260`	`262`	`if planned != "" {`
`261`	`263`	`_, plannedPNID, err := locality.ParseLocalizedID(planned.(string))`
`262`	`264`	`if err != nil {`
`263`	`265`	`return err`
`264`	`266`	`}`
	`267`	`+`
`265`	`268`	`if plannedPNID == actual {`
`266`	`269`	`// If the private network ID is the same, do nothing`
`267`	`270`	`return nil`
`@@ -283,6 +286,7 @@ func ResourceCluster() *schema.Resource {`
`283`	`286`	`if err != nil {`
`284`	`287`	`return err`
`285`	`288`	`}`
	`289`	`+`
`286`	`290`	`possibleTypes, err := k8sAPI.ListClusterAvailableTypes(&k8s.ListClusterAvailableTypesRequest{`
`287`	`291`	`Region: region,`
`288`	`292`	`ClusterID: clusterID,`
`@@ -297,6 +301,7 @@ func ResourceCluster() *schema.Resource {`
`297`	`301`	`return nil`
`298`	`302`	`}`
`299`	`303`	`}`
	`304`	`+`
`300`	`305`	`err = diff.ForceNew("type")`
`301`	`306`	`if err != nil {`
`302`	`307`	`return err`
Original file line number	Diff line number	Diff line change
`@@ -281,6 +281,7 @@ func TestAccLB_Migrate(t *testing.T) {`
`281`	`281`	`if !ok {`
`282`	`282`	`return fmt.Errorf("resource not found: %s", "scaleway_lb.main")`
`283`	`283`	`}`
	`284`	`+`
`284`	`285`	`lbID = rs.Primary.ID`
`285`	`286`
`286`	`287`	`return nil`
`@@ -310,6 +311,7 @@ func TestAccLB_Migrate(t *testing.T) {`
`310`	`311`	`if !ok {`
`311`	`312`	`return fmt.Errorf("resource not found: %s", "scaleway_lb.main")`
`312`	`313`	`}`
	`314`	`+`
`313`	`315`	`if rs.Primary.ID != lbID {`
`314`	`316`	`return errors.New("LB id has changed")`
`315`	`317`	`}`