Fix various linting issues + golang-lint upgrade (juanfont#1245)

juanfont · web-flow · commit 54f5c249f11d · 2023-03-03T18:22:47.000+01:00
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -30,7 +30,7 @@ jobs:
         if: steps.changed-files.outputs.any_changed == 'true'
         uses: golangci/golangci-lint-action@v2
         with:
-          version: v1.49.0
+          version: v1.51.2
 
           # Only block PRs on new problems.
           # If this is not enabled, we will end up having PRs
diff --git a/cmd/headscale/cli/configtest.go b/cmd/headscale/cli/configtest.go
@@ -1,8 +1,8 @@
 package cli
 
 import (
-	"github.com/spf13/cobra"
 	"github.com/rs/zerolog/log"
+	"github.com/spf13/cobra"
 )
 
 func init() {
diff --git a/integration/hsic/hsic.go b/integration/hsic/hsic.go
@@ -108,7 +108,7 @@ func WithPort(port int) Option {
 	}
 }
 
-// WithTestName sets a a name for the test, this will be reflected
+// WithTestName sets a name for the test, this will be reflected
 // in the Docker container name.
 func WithTestName(testName string) Option {
 	return func(hsic *HeadscaleInContainer) {

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ func WithPort(port int) Option {`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`
`111`		`-// WithTestName sets a a name for the test, this will be reflected`
	`111`	`+// WithTestName sets a name for the test, this will be reflected`
`112`	`112`	`// in the Docker container name.`
`113`	`113`	`func WithTestName(testName string) Option {`
`114`	`114`	`return func(hsic *HeadscaleInContainer) {`