refactor: re-enable linters, use presets

.golangci.yml

@@ -1,86 +1,40 @@
----
+linters:
+  presets:
+    - bugs
+    - error
+    - import
+    - metalinter
+    - module
+    - unused
+
+  enable:
+    - testifylint
+
+  disable:
+    # preset error
+    - err113 # Very annoying to define static errors everywhere
+    - wrapcheck # Very annoying to wrap errors everywhere
+    # preset import
+    - depguard
+
 linters-settings:
   gci:
     sections:
       - standard
       - default
       - prefix(github.com/hetznercloud)
+
+  gosec:
+    excludes:
+      # As of golangci-lint v1.60.3, this rule is still enabled by default, which causes problems.
+      # We disable it manually for now until a new golangci-lint version is released which fixes this.
+      # See https://github.com/securego/gosec/issues/1185
+      - G115
+
   exhaustive:
+    # Switch cases with a default case should be exhaustive.
     default-signifies-exhaustive: true
-  gomodguard:
-    blocked:
-      modules:
-        - github.com/tj/assert:
-            recommendations:
-              - github.com/stretchr/testify/assert
-            reason: |
-              One assertion library is enough and we use testify/assert
-              everywhere.
-        - gotest.tools/assert:
-            recommendations:
-              - github.com/stretchr/testify/assert
-            reason: |
-              One assertion library is enough and we use testify/assert
-              everywhere.
-        - github.com/magiconair/properties:
-            recommendations:
-              - github.com/stretchr/testify/assert
-            reason: >
-              We do not currently need to parse properties files. At the same
-              time this module has an assert package which tends to get
-              imported by accident. It is therefore blocked.
-        - github.com/gogo/protobuf:
-            recommendations:
-              - google.golang.org/protobuf
-            reason: >
-              This is not the protobuf module that we want to import.
-        - github.com/golang/protobuf:
-            recommendations:
-              - google.golang.org/protobuf
-            reason: >
-              This is the legacy import location of Google's protobuf module.
-              Use the new one instead.
-  misspell:
-    locale: "US"
-  revive:
-    exported: true
-    import-shadowing: true
-    indent-error-flow: true
-
-linters:
-  disable-all: true
-  # Some of these are temporarily disabled until we fix the numerous issues we have.
-  enable:
-    - bodyclose
-    # - dupl
-    - errcheck
-    - exhaustive
-    - gocritic
-    # - golint
-    - gci
-    - gomodguard
-    - gosec
-    - gosimple
-    - govet
-    - ineffassign
-    - misspell
-    - revive
-    - rowserrcheck
-    # - scopelint
-    # - staticcheck
-    - typecheck
-    - unparam
-    - unused
-    - whitespace
 
-issues:
-  include:
-    - EXC0002  # disable excluding of issues about comments from golint
-  exclude-rules:
-    - path: _test\.go
-      linters:
-        - dupl
-        - gosec
-    - linters:
-        - gosec
-      text: "G204:"
+  gosmopolitan:
+    # We want to allow the use of time.Local()
+    allow-time-local: true

internal/cmd/all/list_test.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
 	"github.com/hetznercloud/cli/internal/cmd/all"
 	"github.com/hetznercloud/cli/internal/testutil"
@@ -237,7 +238,7 @@ ID    NAME   FINGERPRINT   AGE
 
 `
 
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Empty(t, errOut)
 	assert.Equal(t, expOut, out)
 }
@@ -286,7 +287,7 @@ func TestListAllPaidJSON(t *testing.T) {
 
 	jsonOut, errOut, err := fx.Run(cmd, []string{"--paid", "-o=json"})
 
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Empty(t, errOut)
 	assert.JSONEq(t, allListResponseJSON, jsonOut)
 }

internal/cmd/base/update.go

@@ -66,7 +66,7 @@ func (uc *UpdateCmd) Run(s state.State, cmd *cobra.Command, args []string) error
 	})
 
 	if err := uc.Update(s, cmd, resource, flags); err != nil {
-		return fmt.Errorf("updating %s %s failed: %s", uc.ResourceNameSingular, idOrName, err)
+		return fmt.Errorf("updating %s %s failed: %w", uc.ResourceNameSingular, idOrName, err)
 	}
 
 	cmd.Printf("%s %v updated\n", uc.ResourceNameSingular, idOrName)

internal/cmd/certificate/create_test.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
 	"github.com/hetznercloud/cli/internal/cmd/certificate"
 	"github.com/hetznercloud/cli/internal/testutil"
@@ -56,7 +57,7 @@ func TestCreateManaged(t *testing.T) {
 
 	expOut := "Certificate 123 created\n"
 
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Empty(t, errOut)
 	assert.Equal(t, expOut, out)
 }
@@ -124,7 +125,7 @@ func TestCreateManagedJSON(t *testing.T) {
 
 	expOut := "Certificate 123 created\n"
 
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, expOut, out)
 
 	assert.JSONEq(t, managedCreateResponseJSON, jsonOut)
@@ -154,7 +155,7 @@ func TestCreateUploaded(t *testing.T) {
 
 	expOut := "Certificate 123 created\n"
 
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Empty(t, errOut)
 	assert.Equal(t, expOut, out)
 }
@@ -192,7 +193,7 @@ func TestCreateUploadedJSON(t *testing.T) {
 
 	expOut := "Certificate 123 created\n"
 
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Equal(t, expOut, out)
 	assert.JSONEq(t, uploadedCreateResponseJSON, jsonOut)
 }

internal/cmd/certificate/delete_test.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
 	"github.com/hetznercloud/cli/internal/cmd/certificate"
 	"github.com/hetznercloud/cli/internal/testutil"
@@ -34,7 +35,7 @@ func TestDelete(t *testing.T) {
 
 	expOut := "certificate test deleted\n"
 
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Empty(t, errOut)
 	assert.Equal(t, expOut, out)
 }
@@ -74,7 +75,7 @@ func TestDeleteMultiple(t *testing.T) {
 
 	out, errOut, err := fx.Run(cmd, names)
 
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Empty(t, errOut)
 	assert.Equal(t, "certificates test1, test2, test3 deleted\n", out)
 }

internal/cmd/certificate/describe_test.go

@@ -8,6 +8,7 @@ import (
 	"github.com/dustin/go-humanize"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
 	"github.com/hetznercloud/cli/internal/cmd/certificate"
 	"github.com/hetznercloud/cli/internal/cmd/util"
@@ -79,7 +80,7 @@ Used By:
 		util.Datetime(cert.NotValidBefore), humanize.Time(cert.NotValidBefore),
 		util.Datetime(cert.NotValidAfter), humanize.Time(cert.NotValidAfter))
 
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Empty(t, errOut)
 	assert.Equal(t, expOut, out)
 }

internal/cmd/certificate/labels_test.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
 	"github.com/hetznercloud/cli/internal/cmd/certificate"
 	"github.com/hetznercloud/cli/internal/testutil"
@@ -32,7 +33,7 @@ func TestLabelAdd(t *testing.T) {
 
 	expOut := "Label(s) key added to certificate 123\n"
 
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Empty(t, errOut)
 	assert.Equal(t, expOut, out)
 }
@@ -61,7 +62,7 @@ func TestLabelRemove(t *testing.T) {
 
 	expOut := "Label(s) key removed from certificate 123\n"
 
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Empty(t, errOut)
 	assert.Equal(t, expOut, out)
 }

internal/cmd/certificate/list_test.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
 	"github.com/hetznercloud/cli/internal/cmd/certificate"
 	"github.com/hetznercloud/cli/internal/testutil"
@@ -46,7 +47,7 @@ func TestList(t *testing.T) {
 123   test   managed   example.com    Wed Aug 20 12:00:00 UTC 2036   20m
 `
 
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Empty(t, errOut)
 	assert.Equal(t, expOut, out)
 }

internal/cmd/certificate/retry_test.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
 	"github.com/hetznercloud/cli/internal/cmd/certificate"
 	"github.com/hetznercloud/cli/internal/testutil"
@@ -38,7 +39,7 @@ func TestRetry(t *testing.T) {
 
 	out, errOut, err := fx.Run(cmd, []string{"123"})
 
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Empty(t, errOut)
 	assert.Equal(t, "Retried issuance of certificate my-test-cert\n", out)
 }

internal/cmd/certificate/update_test.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
 	"github.com/hetznercloud/cli/internal/cmd/certificate"
 	"github.com/hetznercloud/cli/internal/testutil"
@@ -30,7 +31,7 @@ func TestUpdateName(t *testing.T) {
 
 	expOut := "certificate 123 updated\n"
 
-	assert.NoError(t, err)
+	require.NoError(t, err)
 	assert.Empty(t, errOut)
 	assert.Equal(t, expOut, out)
 }

internal/cmd/config/add_test.go

@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
 	configCmd "github.com/hetznercloud/cli/internal/cmd/config"
 	"github.com/hetznercloud/cli/internal/state/config"
@@ -234,7 +235,7 @@ active_context = "test_context"
 
 			out, errOut, err := fx.Run(cmd, tt.args)
 
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			assert.Equal(t, tt.expErr, errOut)
 			assert.Equal(t, tt.expOut, out)
 		})

internal/cmd/config/get_test.go

@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
 	configCmd "github.com/hetznercloud/cli/internal/cmd/config"
 	"github.com/hetznercloud/cli/internal/state/config"
@@ -104,9 +105,9 @@ func TestGet(t *testing.T) {
 			out, errOut, err := fx.Run(cmd, append(tt.args, tt.key))
 
 			if tt.err == "" {
-				assert.NoError(t, err)
+				require.NoError(t, err)
 			} else {
-				assert.EqualError(t, err, tt.err)
+				require.EqualError(t, err, tt.err)
 			}
 			assert.Equal(t, tt.expErr, errOut)
 			assert.Equal(t, tt.expOut, out)

internal/cmd/config/list_test.go

@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
 	configCmd "github.com/hetznercloud/cli/internal/cmd/config"
 	"github.com/hetznercloud/cli/internal/state/config"
@@ -154,7 +155,7 @@ token                  super secret token
 			setTestValues(fx.Config)
 			out, errOut, err := fx.Run(cmd, tt.args)
 
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			assert.Equal(t, tt.expErr, errOut)
 			assert.Equal(t, tt.expOut, out)
 		})

internal/cmd/config/remove_test.go

@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
 	configCmd "github.com/hetznercloud/cli/internal/cmd/config"
 	"github.com/hetznercloud/cli/internal/state/config"
@@ -209,9 +210,9 @@ active_context = "test_context"
 			out, errOut, err := fx.Run(cmd, tt.args)
 
 			if tt.err == "" {
-				assert.NoError(t, err)
+				require.NoError(t, err)
 			} else {
-				assert.EqualError(t, err, tt.err)
+				require.EqualError(t, err, tt.err)
 			}
 			assert.Equal(t, tt.expErr, errOut)
 			assert.Equal(t, tt.expOut, out)