Merge pull request #21 from redpanda-data/jb/go-tidy

go mod tidy

Author: birdayz

.github/workflows/test.yml

@@ -100,8 +100,8 @@ jobs:
 
     - name: Check golden files are up to date
       run: |
-        # Generate fresh files
-        go test ./pkg/generator -update-golden
+        # Generate fresh files using task (includes gofumpt formatting)
+        ./taskw generate-golden
         
         # Check if any files changed
         if ! git diff --quiet; then

Taskfile.yml

@@ -25,6 +25,7 @@ tasks:
       - echo "Updating golden test files..."
       - go test ./pkg/generator -update-golden -v
       - task: fmt
+      - go run mvdan.cc/gofumpt@latest -l -w ./pkg/testdata/gen/go-golden/
       - echo "Golden files updated successfully!"
 
 
@@ -34,7 +35,7 @@ tasks:
     cmds:
       - buf generate buf.build/googleapis/googleapis
       - buf generate --include-imports
-      - gofumpt -l -w .
+      - go run mvdan.cc/gofumpt@latest -l -w .
 
   integrationtest:
     desc: Run integration tests (requires OPENAI_API_KEY)

go.mod

@@ -7,8 +7,10 @@ require (
 	github.com/mark3labs/mcp-go v0.20.0
 	github.com/onsi/gomega v1.37.0
 	github.com/openai/openai-go v1.5.0
+	github.com/redpanda-data/common-go/api v0.0.0-20250801174835-9eea07f1ea06
 	github.com/santhosh-tekuri/jsonschema/v5 v5.3.1
 	google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250212204824-5a70512c5d8b
 	google.golang.org/grpc v1.67.1
 	google.golang.org/protobuf v1.36.6
 )
@@ -17,7 +19,6 @@ require (
 	buf.build/gen/go/redpandadata/common/protocolbuffers/go v1.34.2-20240917150400-3f349e63f44a.2 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/redpanda-data/common-go/api v0.0.0-20250801174835-9eea07f1ea06 // indirect
 	github.com/tidwall/gjson v1.14.4 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.1 // indirect
@@ -26,6 +27,5 @@ require (
 	golang.org/x/net v0.37.0 // indirect
 	golang.org/x/sys v0.31.0 // indirect
 	golang.org/x/text v0.23.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250212204824-5a70512c5d8b // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

pkg/generator/generator_test.go

@@ -327,7 +327,14 @@ func TestFullGeneration(t *testing.T) {
 	cmd = exec.Command("../../taskw", "fmt")
 	output, err = cmd.CombinedOutput()
 	if err != nil {
-		t.Fatalf("Failed to generate current files: %v\nOutput: %s", err, output)
+		t.Fatalf("Failed to format non-generated files: %v\nOutput: %s", err, output)
+	}
+
+	// Format generated files like the generate task does
+	cmd = exec.Command("go", "run", "mvdan.cc/gofumpt@latest", "-l", "-w", ".")
+	output, err = cmd.CombinedOutput()
+	if err != nil {
+		t.Fatalf("Failed to format generated files: %v\nOutput: %s", err, output)
 	}
 
 	// Find all .pb.mcp.go files in gen/go and compare with golden/