Merge pull request #306 from dgageot/better-formatter

Better formatter

Author: dgageot

.golangci.yml

@@ -87,13 +87,19 @@ issues:
   max-same-issues: 3
 formatters:
   enable:
+    - gci
     - gofmt
     - gofumpt
-    - goimports
-  exclusions:
-    generated: lax
-    paths:
-      - .*_test\.go$
-      - third_party$
-      - builtin$
-      - examples$
+  settings:
+    gci:
+      custom-order: true
+      sections:
+        - standard
+        - default
+        - prefix(github.com/docker/cagent)
+    gofmt:
+      rewrite-rules:
+        - pattern: 'interface{}'
+          replacement: 'any'
+    gofumpt:
+      extra-rules: true

Taskfile.yml

@@ -38,18 +38,17 @@ tasks:
 
   lint:
     desc: Run golangci-lint
-    cmd: golangci-lint run ./...
+    cmd: golangci-lint run
     sources:
       - "{{.GO_SOURCES}}"
       - ".golangci.yml"
 
   format:
     desc: Format code
-    cmds:
-      - go install mvdan.cc/gofumpt@latest
-      - gofumpt -w .
+    cmd: golangci-lint fmt
     sources:
       - "{{.GO_SOURCES}}"
+      - ".golangci.yml"
 
   test:
     desc: Run tests

cmd/root/catalog.go

@@ -10,8 +10,9 @@ import (
 	"text/tabwriter"
 	"time"
 
-	"github.com/docker/cagent/pkg/telemetry"
 	"github.com/spf13/cobra"
+
+	"github.com/docker/cagent/pkg/telemetry"
 )
 
 // NewCatalogCmd creates the catalog command with its subcommands

cmd/root/debug.go

@@ -3,8 +3,9 @@ package root
 import (
 	"log/slog"
 
-	"github.com/docker/cagent/pkg/teamloader"
 	"github.com/spf13/cobra"
+
+	"github.com/docker/cagent/pkg/teamloader"
 )
 
 // NewDebugCmd creates a command that prints the debug information about cagent.

cmd/root/feedback.go

@@ -3,8 +3,9 @@ package root
 import (
 	"fmt"
 
-	"github.com/docker/cagent/pkg/telemetry"
 	"github.com/spf13/cobra"
+
+	"github.com/docker/cagent/pkg/telemetry"
 )
 
 var FeedbackLink = "https://docker.qualtrics.com/jfe/form/SV_cNsCIg92nQemlfw"

cmd/root/gateway_test.go

@@ -3,10 +3,11 @@ package root
 import (
 	"testing"
 
-	"github.com/docker/cagent/pkg/config"
 	"github.com/spf13/cobra"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/docker/cagent/pkg/config"
 )
 
 func TestGatewayLogic(t *testing.T) {

cmd/root/pull.go

@@ -7,10 +7,11 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/docker/cagent/pkg/remote"
-	"github.com/docker/cagent/pkg/telemetry"
 	"github.com/google/go-containerregistry/pkg/crane"
 	"github.com/spf13/cobra"
+
+	"github.com/docker/cagent/pkg/remote"
+	"github.com/docker/cagent/pkg/telemetry"
 )
 
 func NewPullCmd() *cobra.Command {

cmd/root/push.go

@@ -4,12 +4,13 @@ import (
 	"fmt"
 	"log/slog"
 
+	"github.com/google/go-containerregistry/pkg/crane"
+	"github.com/spf13/cobra"
+
 	"github.com/docker/cagent/pkg/content"
 	"github.com/docker/cagent/pkg/oci"
 	"github.com/docker/cagent/pkg/remote"
 	"github.com/docker/cagent/pkg/telemetry"
-	"github.com/google/go-containerregistry/pkg/crane"
-	"github.com/spf13/cobra"
 )
 
 func NewPushCmd() *cobra.Command {

cmd/root/readme.go

@@ -4,9 +4,10 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/spf13/cobra"
+
 	"github.com/docker/cagent/pkg/config"
 	"github.com/docker/cagent/pkg/telemetry"
-	"github.com/spf13/cobra"
 )
 
 // NewReadmeCmd creates a command that prints the README of an agent.

cmd/root/root.go

@@ -9,11 +9,12 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/spf13/cobra"
+
 	"github.com/docker/cagent/pkg/environment"
 	"github.com/docker/cagent/pkg/paths"
 	"github.com/docker/cagent/pkg/telemetry"
 	"github.com/docker/cagent/pkg/version"
-	"github.com/spf13/cobra"
 )
 
 var (