fix lint

floreks · floreks · commit 3dd576db3661 · 2023-12-05T15:00:17.000+01:00
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.21
 
 require (
 	github.com/Yamashou/gqlgenc v0.14.0
-	github.com/golangci/golangci-lint v1.55.2
+	github.com/golangci/golangci-lint v1.55.1
 	github.com/hashicorp/terraform-plugin-docs v0.16.0
 	github.com/hashicorp/terraform-plugin-framework v1.4.2
 	github.com/hashicorp/terraform-plugin-framework-validators v0.12.0
diff --git a/go.sum b/go.sum
@@ -428,8 +428,8 @@ github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe h1:6RGUuS7EGotKx6
 github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe/go.mod h1:gjqyPShc/m8pEMpk0a3SeagVb0kaqvhscv+i9jI5ZhQ=
 github.com/golangci/gofmt v0.0.0-20231018234816-f50ced29576e h1:ULcKCDV1LOZPFxGZaA6TlQbiM3J2GCPnkx/bGF6sX/g=
 github.com/golangci/gofmt v0.0.0-20231018234816-f50ced29576e/go.mod h1:Pm5KhLPA8gSnQwrQ6ukebRcapGb/BG9iUkdaiCcGHJM=
-github.com/golangci/golangci-lint v1.55.2 h1:yllEIsSJ7MtlDBwDJ9IMBkyEUz2fYE0b5B8IUgO1oP8=
-github.com/golangci/golangci-lint v1.55.2/go.mod h1:H60CZ0fuqoTwlTvnbyjhpZPWp7KmsjwV2yupIMiMXbM=
+github.com/golangci/golangci-lint v1.55.1 h1:DL2j9Eeapg1N3WEkKnQFX5L40SYtjZZJjGVdyEgNrDc=
+github.com/golangci/golangci-lint v1.55.1/go.mod h1:z00biPRqjo5MISKV1+RWgONf2KvrPDmfqxHpHKB6bI4=
 github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 h1:MfyDlzVjl1hoaPzPD4Gpb/QgoRfSBR0jdhwGyAWwMSA=
 github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0/go.mod h1:66R6K6P6VWk9I95jvqGxkqJxVWGFy9XlDwLwVz1RCFg=
 github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca h1:kNY3/svz5T29MYHubXix4aDDuE3RWHkPvopM/EDv/MA=
diff --git a/internal/datasource/cluster.go b/internal/datasource/cluster.go
@@ -202,7 +202,7 @@ func (d *clusterDataSource) Read(ctx context.Context, req datasource.ReadRequest
 	}
 
 	if cluster == nil {
-		resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to read cluster, see warnings for more information"))
+		resp.Diagnostics.AddError("Client Error", "Unable to read cluster, see warnings for more information")
 		return
 	}
 
diff --git a/internal/datasource/git_repository.go b/internal/datasource/git_repository.go
@@ -83,7 +83,7 @@ func (r *GitRepositoryDataSource) Read(ctx context.Context, req datasource.ReadR
 	}
 
 	if response == nil || response.GitRepository == nil {
-		resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to find GitRepository"))
+		resp.Diagnostics.AddError("Client Error", "Unable to find GitRepository")
 		return
 	}
 
diff --git a/internal/datasource/provider.go b/internal/datasource/provider.go
@@ -113,7 +113,7 @@ func (p *providerDataSource) Read(ctx context.Context, req datasource.ReadReques
 		return
 	}
 	if result == nil && result.ClusterProvider == nil {
-		resp.Diagnostics.AddError("Not Found", fmt.Sprintf("Unable to find provider"))
+		resp.Diagnostics.AddError("Not Found", "Unable to find provider")
 		return
 	}
 
diff --git a/internal/defaults/env.go b/internal/defaults/env.go
@@ -2,7 +2,6 @@ package defaults
 
 import (
 	"context"
-	"fmt"
 	"os"
 
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/defaults"
@@ -31,11 +30,11 @@ type envDefaultValue[T defaultable] struct {
 }
 
 func (d envDefaultValue[_]) Description(_ context.Context) string {
-	return fmt.Sprintf("If value is not configured, defaults to a representation of the provided env variable")
+	return "If value is not configured, defaults to a representation of the provided env variable"
 }
 
 func (d envDefaultValue[_]) MarkdownDescription(_ context.Context) string {
-	return fmt.Sprintf("If value is not configured, defaults to a representation of the provided env variable")
+	return "If value is not configured, defaults to a representation of the provided env variable"
 }
 
 func (d envDefaultValue[T]) DefaultString(_ context.Context, _ defaults.StringRequest, resp *defaults.StringResponse) {
@@ -44,7 +43,8 @@ func (d envDefaultValue[T]) DefaultString(_ context.Context, _ defaults.StringRe
 		value = v
 	}
 
-	resp.PlanValue = types.StringValue(value.(string))
+	stringValue, _ := value.(string)
+	resp.PlanValue = types.StringValue(stringValue)
 }
 
 func (d envDefaultValue[T]) DefaultBool(_ context.Context, _ defaults.BoolRequest, resp *defaults.BoolResponse) {
@@ -53,5 +53,6 @@ func (d envDefaultValue[T]) DefaultBool(_ context.Context, _ defaults.BoolReques
 		value = v == "true"
 	}
 
-	resp.PlanValue = types.BoolValue(value.(bool))
+	boolValue, _ := value.(bool)
+	resp.PlanValue = types.BoolValue(boolValue)
 }
diff --git a/internal/resource/cluster/cluster.go b/internal/resource/cluster/cluster.go
@@ -32,9 +32,8 @@ func NewClusterResource() resource.Resource {
 
 // ClusterResource defines the cluster resource implementation.
 type clusterResource struct {
-	client          *client.Client
-	consoleUrl      string
-	operatorHandler *OperatorHandler
+	client     *client.Client
+	consoleUrl string
 }
 
 func (r *clusterResource) Metadata(_ context.Context, req resource.MetadataRequest, resp *resource.MetadataResponse) {
@@ -308,7 +307,7 @@ func (r *clusterResource) Create(ctx context.Context, req resource.CreateRequest
 
 	if common.IsCloud(data.Cloud.ValueString(), common.CloudBYOK) {
 		if result.CreateCluster.DeployToken == nil {
-			resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to fetch cluster deploy token"))
+			resp.Diagnostics.AddError("Client Error", "Unable to fetch cluster deploy token")
 			return
 		}
 
@@ -342,7 +341,7 @@ func (r *clusterResource) Read(ctx context.Context, req resource.ReadRequest, re
 		return
 	}
 	if result == nil || result.Cluster == nil {
-		resp.Diagnostics.AddError("Not Found", fmt.Sprintf("Unable to find cluster, it looks like it was deleted manually"))
+		resp.Diagnostics.AddError("Not Found", "Unable to find cluster, it looks like it was deleted manually")
 		return
 	}
 
diff --git a/internal/resource/git_repository.go b/internal/resource/git_repository.go
@@ -167,7 +167,7 @@ func (r *GitRepositoryResource) Read(ctx context.Context, req resource.ReadReque
 	}
 
 	if response == nil || response.GitRepository == nil {
-		resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to find GitRepository"))
+		resp.Diagnostics.AddError("Client Error", "Unable to find GitRepository")
 		return
 	}
 
diff --git a/internal/resource/provider.go b/internal/resource/provider.go
@@ -213,7 +213,7 @@ func (r *providerResource) Read(ctx context.Context, req resource.ReadRequest, r
 		return
 	}
 	if result == nil || result.ClusterProvider == nil {
-		resp.Diagnostics.AddError("Not Found", fmt.Sprintf("Unable to find provider, it looks like it was deleted manually"))
+		resp.Diagnostics.AddError("Not Found", "Unable to find provider, it looks like it was deleted manually")
 		return
 	}
 
diff --git a/internal/validator/also_requires_if.go b/internal/validator/also_requires_if.go
@@ -117,7 +117,7 @@ func (a alsoRequiresIfValidator) ValidateString(ctx context.Context, req validat
 	resp.Diagnostics.Append(validateResp.Diagnostics...)
 }
 
-// AlsoRequiresIf todo
+// AlsoRequiresIf todo.
 func AlsoRequiresIf(f RequiresIf, expressions ...path.Expression) validator.String {
 	return &alsoRequiresIfValidator{
 		PathExpressions: expressions,

Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ func (d *clusterDataSource) Read(ctx context.Context, req datasource.ReadRequest`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`if cluster == nil {`
`205`		`- resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to read cluster, see warnings for more information"))`
	`205`	`+ resp.Diagnostics.AddError("Client Error", "Unable to read cluster, see warnings for more information")`
`206`	`206`	`return`
`207`	`207`	`}`
`208`	`208`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ func (r *GitRepositoryDataSource) Read(ctx context.Context, req datasource.ReadR`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`if response == nil \|\| response.GitRepository == nil {`
`86`		`- resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to find GitRepository"))`
	`86`	`+ resp.Diagnostics.AddError("Client Error", "Unable to find GitRepository")`
`87`	`87`	`return`
`88`	`88`	`}`
`89`	`89`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ func (p *providerDataSource) Read(ctx context.Context, req datasource.ReadReques`
`113`	`113`	`return`
`114`	`114`	`}`
`115`	`115`	`if result == nil && result.ClusterProvider == nil {`
`116`		`- resp.Diagnostics.AddError("Not Found", fmt.Sprintf("Unable to find provider"))`
	`116`	`+ resp.Diagnostics.AddError("Not Found", "Unable to find provider")`
`117`	`117`	`return`
`118`	`118`	`}`
`119`	`119`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@ package defaults`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"context"`
`5`		`- "fmt"`
`6`	`5`	`"os"`
`7`	`6`
`8`	`7`	`"github.com/hashicorp/terraform-plugin-framework/resource/schema/defaults"`
`@@ -31,11 +30,11 @@ type envDefaultValue[T defaultable] struct {`
`31`	`30`	`}`
`32`	`31`
`33`	`32`	`func (d envDefaultValue[_]) Description(_ context.Context) string {`
`34`		`- return fmt.Sprintf("If value is not configured, defaults to a representation of the provided env variable")`
	`33`	`+ return "If value is not configured, defaults to a representation of the provided env variable"`
`35`	`34`	`}`
`36`	`35`
`37`	`36`	`func (d envDefaultValue[_]) MarkdownDescription(_ context.Context) string {`
`38`		`- return fmt.Sprintf("If value is not configured, defaults to a representation of the provided env variable")`
	`37`	`+ return "If value is not configured, defaults to a representation of the provided env variable"`
`39`	`38`	`}`
`40`	`39`
`41`	`40`	`func (d envDefaultValue[T]) DefaultString(_ context.Context, _ defaults.StringRequest, resp *defaults.StringResponse) {`
`@@ -44,7 +43,8 @@ func (d envDefaultValue[T]) DefaultString(_ context.Context, _ defaults.StringRe`
`44`	`43`	`value = v`
`45`	`44`	`}`
`46`	`45`
`47`		`- resp.PlanValue = types.StringValue(value.(string))`
	`46`	`+ stringValue, _ := value.(string)`
	`47`	`+ resp.PlanValue = types.StringValue(stringValue)`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`func (d envDefaultValue[T]) DefaultBool(_ context.Context, _ defaults.BoolRequest, resp *defaults.BoolResponse) {`
`@@ -53,5 +53,6 @@ func (d envDefaultValue[T]) DefaultBool(_ context.Context, _ defaults.BoolReques`
`53`	`53`	`value = v == "true"`
`54`	`54`	`}`
`55`	`55`
`56`		`- resp.PlanValue = types.BoolValue(value.(bool))`
	`56`	`+ boolValue, _ := value.(bool)`
	`57`	`+ resp.PlanValue = types.BoolValue(boolValue)`
`57`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,8 @@ func NewClusterResource() resource.Resource {`
`32`	`32`
`33`	`33`	`// ClusterResource defines the cluster resource implementation.`
`34`	`34`	`type clusterResource struct {`
`35`		`- client *client.Client`
`36`		`- consoleUrl string`
`37`		`- operatorHandler *OperatorHandler`
	`35`	`+ client *client.Client`
	`36`	`+ consoleUrl string`
`38`	`37`	`}`
`39`	`38`
`40`	`39`	`func (r clusterResource) Metadata(_ context.Context, req resource.MetadataRequest, resp resource.MetadataResponse) {`
`@@ -308,7 +307,7 @@ func (r *clusterResource) Create(ctx context.Context, req resource.CreateRequest`
`308`	`307`
`309`	`308`	`if common.IsCloud(data.Cloud.ValueString(), common.CloudBYOK) {`
`310`	`309`	`if result.CreateCluster.DeployToken == nil {`
`311`		`- resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to fetch cluster deploy token"))`
	`310`	`+ resp.Diagnostics.AddError("Client Error", "Unable to fetch cluster deploy token")`
`312`	`311`	`return`
`313`	`312`	`}`
`314`	`313`
`@@ -342,7 +341,7 @@ func (r *clusterResource) Read(ctx context.Context, req resource.ReadRequest, re`
`342`	`341`	`return`
`343`	`342`	`}`
`344`	`343`	`if result == nil \|\| result.Cluster == nil {`
`345`		`- resp.Diagnostics.AddError("Not Found", fmt.Sprintf("Unable to find cluster, it looks like it was deleted manually"))`
	`344`	`+ resp.Diagnostics.AddError("Not Found", "Unable to find cluster, it looks like it was deleted manually")`
`346`	`345`	`return`
`347`	`346`	`}`
`348`	`347`
Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ func (r *GitRepositoryResource) Read(ctx context.Context, req resource.ReadReque`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`if response == nil \|\| response.GitRepository == nil {`
`170`		`- resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to find GitRepository"))`
	`170`	`+ resp.Diagnostics.AddError("Client Error", "Unable to find GitRepository")`
`171`	`171`	`return`
`172`	`172`	`}`
`173`	`173`
Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ func (r *providerResource) Read(ctx context.Context, req resource.ReadRequest, r`
`213`	`213`	`return`
`214`	`214`	`}`
`215`	`215`	`if result == nil \|\| result.ClusterProvider == nil {`
`216`		`- resp.Diagnostics.AddError("Not Found", fmt.Sprintf("Unable to find provider, it looks like it was deleted manually"))`
	`216`	`+ resp.Diagnostics.AddError("Not Found", "Unable to find provider, it looks like it was deleted manually")`
`217`	`217`	`return`
`218`	`218`	`}`
`219`	`219`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ func (a alsoRequiresIfValidator) ValidateString(ctx context.Context, req validat`
`117`	`117`	`resp.Diagnostics.Append(validateResp.Diagnostics...)`
`118`	`118`	`}`
`119`	`119`
`120`		`-// AlsoRequiresIf todo`
	`120`	`+// AlsoRequiresIf todo.`
`121`	`121`	`func AlsoRequiresIf(f RequiresIf, expressions ...path.Expression) validator.String {`
`122`	`122`	`return &alsoRequiresIfValidator{`
`123`	`123`	`PathExpressions: expressions,`