deps: update dependency golangci/golangci-lint (#974)

Author: renovate[bot]

.github/workflows/lint.yml

@@ -16,7 +16,7 @@ jobs:
 
       - uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.59.1 # renovate: datasource=github-releases depName=golangci/golangci-lint
+          version: v1.60.1 # renovate: datasource=github-releases depName=golangci/golangci-lint
 
           # In general linting is quite fast with warm caches, but a fresh run might
           # take some time.

.gitlab-ci.yml

@@ -29,7 +29,7 @@ build:
 
 test:lint:
   stage: test
-  image: golangci/golangci-lint:v1.59
+  image: golangci/golangci-lint:v1.60
   script:
     - golangci-lint run -v
 

internal/certificate/resource.go

@@ -84,7 +84,7 @@ func UploadedResource() *schema.Resource {
 				Elem:     schema.TypeString,
 				ValidateDiagFunc: func(i interface{}, path cty.Path) diag.Diagnostics { // nolint:revive
 					if ok, err := hcloud.ValidateResourceLabels(i.(map[string]interface{})); !ok {
-						return diag.Errorf(err.Error())
+						return diag.FromErr(err)
 					}
 					return nil
 				},

internal/firewall/resource.go

@@ -41,7 +41,7 @@ func Resource() *schema.Resource {
 				Computed: true,
 				ValidateDiagFunc: func(i interface{}, path cty.Path) diag.Diagnostics { // nolint:revive
 					if ok, err := hcloud.ValidateResourceLabels(i.(map[string]interface{})); !ok {
-						return diag.Errorf(err.Error())
+						return diag.FromErr(err)
 					}
 					return nil
 				},

internal/floatingip/resource.go

@@ -65,7 +65,7 @@ func Resource() *schema.Resource {
 				Optional: true,
 				ValidateDiagFunc: func(i interface{}, path cty.Path) diag.Diagnostics { // nolint:revive
 					if ok, err := hcloud.ValidateResourceLabels(i.(map[string]interface{})); !ok {
-						return diag.Errorf(err.Error())
+						return diag.FromErr(err)
 					}
 					return nil
 				},

internal/loadbalancer/resource.go

@@ -90,7 +90,7 @@ func Resource() *schema.Resource {
 				Computed: true,
 				ValidateDiagFunc: func(i interface{}, path cty.Path) diag.Diagnostics { // nolint:revive
 					if ok, err := hcloud.ValidateResourceLabels(i.(map[string]interface{})); !ok {
-						return diag.Errorf(err.Error())
+						return diag.FromErr(err)
 					}
 					return nil
 				},

internal/network/resource.go

@@ -45,7 +45,7 @@ func Resource() *schema.Resource {
 				Optional: true,
 				ValidateDiagFunc: func(i interface{}, path cty.Path) diag.Diagnostics { // nolint:revive
 					if ok, err := hcloud.ValidateResourceLabels(i.(map[string]interface{})); !ok {
-						return diag.Errorf(err.Error())
+						return diag.FromErr(err)
 					}
 					return nil
 				},

internal/placementgroup/resource.go

@@ -34,7 +34,7 @@ func Resource() *schema.Resource {
 				Optional: true,
 				ValidateDiagFunc: func(i interface{}, path cty.Path) diag.Diagnostics { // nolint:revive
 					if ok, err := hcloud.ValidateResourceLabels(i.(map[string]interface{})); !ok {
-						return diag.Errorf(err.Error())
+						return diag.FromErr(err)
 					}
 					return nil
 				},

internal/primaryip/resource.go

@@ -72,7 +72,7 @@ func Resource() *schema.Resource {
 				Optional: true,
 				ValidateDiagFunc: func(i interface{}, path cty.Path) diag.Diagnostics { // nolint:revive
 					if ok, err := hcloud.ValidateResourceLabels(i.(map[string]interface{})); !ok {
-						return diag.Errorf(err.Error())
+						return diag.FromErr(err)
 					}
 					return nil
 				},

internal/primaryip/resource_test.go

@@ -191,13 +191,16 @@ func TestPrimaryIPResource_with_server(t *testing.T) {
 							primaryIPv4One.AssigneeID != srv.ID {
 							return nil
 						}
-						return fmt.Errorf("State is not as expected: \n" +
-							fmt.Sprintf("primary IP v2 two has assignee id %d which not equals target server id %d",
-								primaryIPv4Two.AssigneeID, srv.ID) + "\n" +
-							fmt.Sprintf("primary IP v1 one has assignee id %d and should shouldnt be assigned to server id %d",
-								primaryIPv4One.AssigneeID, srv.ID) + "\n" +
-							fmt.Sprintf("primary IP v6 one has assignee id %d and should shouldnt be assigned to server id %d",
-								primaryIPv6One.AssigneeID, srv.ID))
+						// nolint:revive
+						return fmt.Errorf(`state is not as expected:
+primary IP v4 two has assignee id %d which not equals target server id %d
+primary IP v4 one has assignee id %d and should shouldnt be assigned to server id %d
+primary IP v6 one has assignee id %d and should shouldnt be assigned to server id %d
+`,
+							primaryIPv4Two.AssigneeID, srv.ID,
+							primaryIPv4One.AssigneeID, srv.ID,
+							primaryIPv6One.AssigneeID, srv.ID,
+						)
 					}),
 			},
 		},

internal/server/resource.go

@@ -152,7 +152,7 @@ func Resource() *schema.Resource {
 				Optional: true,
 				ValidateDiagFunc: func(i interface{}, path cty.Path) diag.Diagnostics { // nolint:revive
 					if ok, err := hcloud.ValidateResourceLabels(i.(map[string]interface{})); !ok {
-						return diag.Errorf(err.Error())
+						return diag.FromErr(err)
 					}
 					return nil
 				},

internal/volume/resource.go

@@ -55,7 +55,7 @@ func Resource() *schema.Resource {
 				Optional: true,
 				ValidateDiagFunc: func(i interface{}, path cty.Path) diag.Diagnostics { // nolint:revive
 					if ok, err := hcloud.ValidateResourceLabels(i.(map[string]interface{})); !ok {
-						return diag.Errorf(err.Error())
+						return diag.FromErr(err)
 					}
 					return nil
 				},