chore: update golangci-lint

Author: remyleone

.golangci.yml

@@ -5,6 +5,11 @@ formatters:
     - gofmt # Gofmt checks whether code was gofmt-ed. By default this tool runs with -s option to check for code simplification [fast: true, auto-fix: true]
     - gofumpt # Gofumpt checks whether code was gofumpt-ed. [fast: true, auto-fix: true]
     - goimports # In addition to fixing imports, goimports also formats your code in the same style as gofmt. [fast: true, auto-fix: true]
+  settings:
+    gofmt:
+      rewrite-rules:
+        - pattern: interface{}
+          replacement: any
 
 issues:
   # List of regexps of issue texts to exclude, empty list by default.
@@ -68,6 +73,11 @@ linters:
         - name: package-comments
           disabled: true
 
+    wsl_v5:
+      allow-first-in-block: true
+      allow-whole-block: false
+      branch-max-lines: 2
+
   enable:
     - asasalint # check for pass []any as any in variadic func(...any) [fast: false, auto-fix: false]
     - asciicheck # Simple linter to check that your code does not contain non-ASCII identifiers [fast: true, auto-fix: false]
@@ -140,7 +150,7 @@ linters:
     - usetesting # Reports uses of functions with replacement inside the testing package. [auto-fix]
     - wastedassign # wastedassign finds wasted assignment statements. [fast: false, auto-fix: false]
     - whitespace # Tool for detection of leading and trailing whitespace [fast: true, auto-fix: true]
-    - wsl # Whitespace Linter - Forces you to use empty lines! [fast: true, auto-fix: false]
+    - wsl_v5 # Whitespace Linter - Forces you to use empty lines! [fast: true, auto-fix: false]
     - zerologlint # Detects the wrong usage of `zerolog` that a user forgets to dispatch with `Send` or `Msg` [fast: false, auto-fix: false]
 
   disable:

builder/scaleway/artifact.go

@@ -38,7 +38,7 @@ type Artifact struct {
 
 	// StateData should store data such as GeneratedData
 	// to be shared with post-processors
-	StateData map[string]interface{}
+	StateData map[string]any
 }
 
 func (*Artifact) BuilderId() string {
@@ -59,7 +59,7 @@ func (a *Artifact) String() string {
 		a.ImageName, a.ImageID, a.ZoneName, a.Snapshots)
 }
 
-func (a *Artifact) State(name string) interface{} {
+func (a *Artifact) State(name string) any {
 	if name == registryimage.ArtifactStateURI {
 		img, err := registryimage.FromArtifact(a,
 			registryimage.WithID(a.ImageID),

builder/scaleway/artifact_test.go

@@ -8,7 +8,7 @@ import (
 )
 
 func TestArtifact_Impl(t *testing.T) {
-	var raw interface{} //nolint:staticcheck
+	var raw any //nolint:staticcheck
 
 	raw = &scaleway.Artifact{}
 	if _, ok := raw.(packersdk.Artifact); !ok {
@@ -17,7 +17,7 @@ func TestArtifact_Impl(t *testing.T) {
 }
 
 func TestArtifactId(t *testing.T) {
-	generatedData := make(map[string]interface{})
+	generatedData := make(map[string]any)
 	a := &scaleway.Artifact{
 		"packer-foobar-image",
 		"cc586e45-5156-4f71-b223-cf406b10dd1d",
@@ -37,7 +37,7 @@ func TestArtifactId(t *testing.T) {
 }
 
 func TestArtifactString(t *testing.T) {
-	generatedData := make(map[string]interface{})
+	generatedData := make(map[string]any)
 	a := &scaleway.Artifact{
 		"packer-foobar-image",
 		"cc586e45-5156-4f71-b223-cf406b10dd1d",
@@ -65,7 +65,7 @@ func TestArtifactString(t *testing.T) {
 func TestArtifactState_StateData(t *testing.T) {
 	expectedData := "this is the data"
 	artifact := &scaleway.Artifact{
-		StateData: map[string]interface{}{"state_data": expectedData},
+		StateData: map[string]any{"state_data": expectedData},
 	}
 
 	// Valid state

builder/scaleway/builder.go

@@ -32,7 +32,7 @@ type Builder struct {
 
 func (b *Builder) ConfigSpec() hcldec.ObjectSpec { return b.Config.FlatMapstructure().HCL2Spec() }
 
-func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
+func (b *Builder) Prepare(raws ...any) ([]string, []string, error) {
 	warnings, errs := b.Config.Prepare(raws...)
 	if errs != nil {
 		return nil, warnings, errs
@@ -145,7 +145,7 @@ func (b *Builder) Run(ctx context.Context, ui packersdk.Ui, hook packersdk.Hook)
 		Snapshots: state.Get("snapshots").([]ArtifactSnapshot),
 		ZoneName:  b.Config.Zone,
 		Client:    client,
-		StateData: map[string]interface{}{"generated_data": state.Get("generated_data")},
+		StateData: map[string]any{"generated_data": state.Get("generated_data")},
 	}
 
 	return artifact, nil

builder/scaleway/builder_test.go

@@ -8,8 +8,8 @@ import (
 	"github.com/scaleway/packer-plugin-scaleway/builder/scaleway"
 )
 
-func testConfig() map[string]interface{} {
-	return map[string]interface{}{
+func testConfig() map[string]any {
+	return map[string]any{
 		"project_id":      "00000000-1111-2222-3333-444444444444",
 		"access_key":      "SCWABCXXXXXXXXXXXXXX",
 		"secret_key":      "00000000-1111-2222-3333-444444444444",
@@ -21,7 +21,7 @@ func testConfig() map[string]interface{} {
 }
 
 func TestBuilder_ImplementsBuilder(t *testing.T) {
-	var raw interface{} //nolint:staticcheck
+	var raw any //nolint:staticcheck
 
 	raw = &scaleway.Builder{}
 	if _, ok := raw.(packersdk.Builder); !ok {
@@ -31,7 +31,7 @@ func TestBuilder_ImplementsBuilder(t *testing.T) {
 
 func TestBuilder_Prepare_BadType(t *testing.T) {
 	b := &scaleway.Builder{}
-	c := map[string]interface{}{
+	c := map[string]any{
 		"api_token": []string{},
 	}
 

builder/scaleway/config.go

@@ -152,7 +152,7 @@ type Config struct {
 	Region string `mapstructure:"region" required:"false"`
 }
 
-func (c *Config) Prepare(raws ...interface{}) ([]string, error) { //nolint:gocyclo
+func (c *Config) Prepare(raws ...any) ([]string, error) { //nolint:gocyclo
 	var md mapstructure.Metadata
 
 	err := config.Decode(c, &config.DecodeOpts{

internal/tester/tester.go

@@ -70,6 +70,7 @@ type TestConfig struct {
 func Test(t *testing.T, config *TestConfig) {
 	httpClient, cleanup, err := vcr.GetHTTPRecorder(vcr.GetTestFilePath(t, "."), vcr.UpdateCassettes)
 	require.NoError(t, err)
+
 	defer cleanup()
 
 	ctx := t.Context()