feat: add ci job for verifying mocks (#514)

* stick to format and add job

* cleaner

Author: ShubyM

.github/workflows/ci-presubmit.yaml

@@ -89,6 +89,19 @@ jobs:
           ./dev/ci/presubmits/verify-gomod.sh
 
 
+  verify-mocks:
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version-file: 'go.mod'
+      - name: "Run dev/ci/presubmits/verify-mocks.sh"
+        run: |
+          ./dev/ci/presubmits/verify-mocks.sh
+
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
   cancel-in-progress: true

dev/ci/presubmits/verify-mocks.sh

@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+REPO_ROOT="$(git rev-parse --show-toplevel)"
+cd ${REPO_ROOT}
+
+if ! command -v mockgen &> /dev/null; then
+  echo "mockgen not found, installing..."
+  go install go.uber.org/mock/mockgen@latest
+fi
+
+# We run generate to see if it creates any diffs.
+go generate ./internal/mocks
+
+if ! git diff --quiet --exit-code -- internal/mocks; then
+  echo "Mocks are stale. Commit the changes to the generated files."
+  exit 1
+fi
+
+echo "Mocks are up to date."

gollm/bedrock.go

@@ -349,7 +349,7 @@ func (c *bedrockChat) SendStreaming(ctx context.Context, contents ...any) (ChatR
 				if partial, exists := partialTools[idx]; exists {
 					// Parse the JSON to extract arguments for function call
 					inputJSON := partial.input.String()
-					
+
 					var args map[string]any
 					if inputJSON != "" {
 						if err := json.Unmarshal([]byte(inputJSON), &args); err != nil {
@@ -358,7 +358,7 @@ func (c *bedrockChat) SendStreaming(ctx context.Context, contents ...any) (ChatR
 					} else {
 						args = make(map[string]any)
 					}
-					
+
 					// Create ToolUseBlock for conversation history
 					// Use the accumulated JSON string to create proper Input document
 					toolUse := types.ToolUseBlock{
@@ -367,7 +367,7 @@ func (c *bedrockChat) SendStreaming(ctx context.Context, contents ...any) (ChatR
 						Input:     document.NewLazyDocument(args),
 					}
 					completedTools = append(completedTools, toolUse)
-					
+
 					// Yield tool immediately with parsed arguments
 					response := &bedrockStreamResponse{
 						content:       "",
@@ -379,7 +379,7 @@ func (c *bedrockChat) SendStreaming(ctx context.Context, contents ...any) (ChatR
 					if !yield(response, nil) {
 						return
 					}
-					
+
 					delete(partialTools, idx)
 				}
 
@@ -402,13 +402,13 @@ func (c *bedrockChat) SendStreaming(ctx context.Context, contents ...any) (ChatR
 			assistantMessage.Content = append(assistantMessage.Content,
 				&types.ContentBlockMemberText{Value: fullContent.String()})
 		}
-		
+
 		// Include completed tools in conversation history
 		for _, tool := range completedTools {
 			assistantMessage.Content = append(assistantMessage.Content,
 				&types.ContentBlockMemberToolUse{Value: tool})
 		}
-		
+
 		// Only add to history if there's content or tools
 		if len(assistantMessage.Content) > 0 {
 			c.messages = append(c.messages, assistantMessage)
@@ -425,7 +425,7 @@ func (c *bedrockChat) SendStreaming(ctx context.Context, contents ...any) (ChatR
 // following AWS Bedrock Converse API patterns
 func (c *bedrockChat) addContentsToHistory(contents []any) error {
 	var contentBlocks []types.ContentBlock
-	
+
 	for _, content := range contents {
 		switch c := content.(type) {
 		case string:
@@ -443,13 +443,13 @@ func (c *bedrockChat) addContentsToHistory(contents []any) error {
 				}
 				// Check for status field
 				if statusVal, hasStatus := c.Result["status"]; hasStatus {
-					if statusStr, isString := statusVal.(string); isString && 
-					   (statusStr == "failed" || statusStr == "error") {
+					if statusStr, isString := statusVal.(string); isString &&
+						(statusStr == "failed" || statusStr == "error") {
 						status = types.ToolResultStatusError
 					}
 				}
 			}
-			
+
 			// Convert to AWS Bedrock ToolResultBlock format per official docs
 			toolResult := types.ToolResultBlock{
 				ToolUseId: aws.String(c.ID),
@@ -465,15 +465,15 @@ func (c *bedrockChat) addContentsToHistory(contents []any) error {
 			return fmt.Errorf("unhandled content type: %T", content)
 		}
 	}
-	
+
 	if len(contentBlocks) > 0 {
 		// Add user message with all content blocks to conversation history
 		c.messages = append(c.messages, types.Message{
 			Role:    types.ConversationRoleUser,
 			Content: contentBlocks,
 		})
 	}
-	
+
 	return nil
 }
 
@@ -643,12 +643,12 @@ func (c *bedrockStreamCandidate) String() string {
 // Parts returns the parts of the streaming candidate
 func (c *bedrockStreamCandidate) Parts() []Part {
 	var parts []Part
-	
+
 	// Handle text content
 	if c.content != "" {
 		parts = append(parts, &bedrockTextPart{text: c.content})
 	}
-	
+
 	// Handle tool calls with streaming args
 	for i, toolUse := range c.toolUses {
 		var args map[string]any
@@ -660,7 +660,7 @@ func (c *bedrockStreamCandidate) Parts() []Part {
 			args:    args,
 		})
 	}
-	
+
 	return parts
 }
 

makefile

@@ -92,10 +92,8 @@ generate:
 	go generate ./internal/mocks
 
 verify-mocks:
-	# Re-generate and fail if it produces diffs
-	go generate ./internal/mocks
-	git diff --quiet --exit-code -- internal/mocks || \
-	  (echo "Mocks are stale. Run 'make generate' and commit changes." && exit 1)
+	@echo "λ Verifying mocks..."
+	./dev/ci/presubmits/verify-mocks.sh
 # --- Generation Tasks ---
 generate-actions: ## Generate GitHub Actions workflows
 	@echo "λ Generating GitHub Actions workflows..."

pkg/mcp/client.go

@@ -393,7 +393,7 @@ func processToolResponse(result any) (string, error) {
 		if isError {
 			// Extract error message
 			errorMsg := fmt.Sprintf("%+v", result)
-			
+
 			// Try to get message from Content field
 			contentField := rv.FieldByName("Content")
 			if contentField.IsValid() && contentField.Len() > 0 {
@@ -403,7 +403,7 @@ func processToolResponse(result any) (string, error) {
 					}
 				}
 			}
-			
+
 			// Return JSON error data instead of Go error
 			return fmt.Sprintf(`{"error": true, "message": %q, "status": "failed"}`, errorMsg), nil
 		}