refactor: update and improve linter configuration (#242)

* chore: update wsl linter configuration to version 5

Signed-off-by: Kim Oliver Drechsel <[email protected]>

* refactor: streamline linting commands in Makefile

Signed-off-by: Kim Oliver Drechsel <[email protected]>

* refactor: clean up whitespace in test and function files

Signed-off-by: Kim Oliver Drechsel <[email protected]>

---------

Signed-off-by: Kim Oliver Drechsel <[email protected]>

Author: kimdre

.golangci.yml

@@ -41,7 +41,7 @@ linters:
     - unused
     - wastedassign
     - wrapcheck
-    - wsl
+    - wsl_v5
   settings:
     lll:
       line-length: 160
@@ -52,6 +52,10 @@ linters:
           json: snake
           tfsdk: snake
         use-field-name: true
+    wsl_v5:
+      allow-first-in-block: true
+      allow-whole-block: false
+      branch-max-lines: 2
   exclusions:
     generated: lax
     presets:

Makefile

@@ -14,21 +14,13 @@ testacc:
 test:
 	go test -v ./... -timeout 30m
 
-lint:
-	golangci-lint run ./...
-	go run github.com/bflad/tfproviderlint/cmd/tfproviderlintx@latest ./...
+lint fmt:
+	${GO_BIN}/golangci-lint run --fix ./...
+	go tool tfproviderlintx -fix ./...
 
 generate docs:
 	go generate ./...
 
-fmt:
-	go fmt ./...
-	-go tool gofumpt -l -w .
-	-go tool goimports -l -w .
-	-go tool wsl -strict-append -test=true -fix ./...
-	-go tool perfsprint -fix ./...
-	-go tool tfproviderlintx -fix ./...
-
 download:
 	@echo Download go.mod dependencies
 	@go mod download

internal/api/client_test.go

@@ -48,6 +48,7 @@ func TestClientCreateZoneInvalidTLD(t *testing.T) {
 	t.Parallel()
 
 	var irrelevantConfig RequestConfig
+
 	client := createTestClient(t, irrelevantConfig)
 	opts := CreateZoneOpts{Name: "thisisinvalid", TTL: 3600}
 	_, err := client.CreateZone(context.Background(), opts)

internal/provider/idna_function.go

@@ -48,7 +48,6 @@ func (r idnaFunction) Run(ctx context.Context, req function.RunRequest, resp *fu
 	)
 
 	resp.Error = function.ConcatFuncErrors(req.Arguments.Get(ctx, &domain))
-
 	if resp.Error != nil {
 		return
 	}