all: run modernize happy (google#281)

$ go run golang.org/x/tools/gopls/internal/analysis/modernize/cmd/modernize@latest -fix -test ./...

Signed-off-by: Koichi Shiraishi <zchee.io@gmail.com>

Author: zchee

agent/llmagent/llmagent_saveoutput_test.go

@@ -44,7 +44,7 @@ func createTestEvent(author, contentText string, isFinal bool) *session.Event {
 		InvocationID: "test_invocation",
 		Author:       author,
 		LLMResponse:  model.LLMResponse{Content: content, Partial: !isFinal},
-		Actions:      session.EventActions{StateDelta: make(map[string]interface{})},
+		Actions:      session.EventActions{StateDelta: make(map[string]any)},
 	}
 }
 
@@ -54,38 +54,38 @@ func TestLlmAgent_MaybeSaveOutputToState(t *testing.T) {
 		name             string
 		agentConfig      Config
 		event            *session.Event
-		wantStateDelta   map[string]interface{}
+		wantStateDelta   map[string]any
 		customEventParts []*genai.Part // For multi-part test
 	}{
 		{
 			name:           "skips when event author differs from agentConfig name",
 			agentConfig:    Config{Name: "agent_a", OutputKey: "result"},
 			event:          createTestEvent("agent_b", "Response from B", true),
-			wantStateDelta: map[string]interface{}{},
+			wantStateDelta: map[string]any{},
 		},
 		{
 			name:           "saves when event author matches agentConfig name",
 			agentConfig:    Config{Name: "test_agent", OutputKey: "result"},
 			event:          createTestEvent("test_agent", "Test response", true),
-			wantStateDelta: map[string]interface{}{"result": "Test response"},
+			wantStateDelta: map[string]any{"result": "Test response"},
 		},
 		{
 			name:           "skips when output_key is not set",
 			agentConfig:    Config{Name: "test_agent"}, // No OutputKey
 			event:          createTestEvent("test_agent", "Test response", true),
-			wantStateDelta: map[string]interface{}{},
+			wantStateDelta: map[string]any{},
 		},
 		{
 			name:           "skips for non-final responses",
 			agentConfig:    Config{Name: "test_agent", OutputKey: "result"},
 			event:          createTestEvent("test_agent", "*genai.Partial response", false),
-			wantStateDelta: map[string]interface{}{},
+			wantStateDelta: map[string]any{},
 		},
 		{
 			name:           "skips when event has no content text",
 			agentConfig:    Config{Name: "test_agent", OutputKey: "result"},
 			event:          createTestEvent("test_agent", "", true),
-			wantStateDelta: map[string]interface{}{},
+			wantStateDelta: map[string]any{},
 		},
 		{
 			name:        "concatenates multiple text parts",
@@ -96,13 +96,13 @@ func TestLlmAgent_MaybeSaveOutputToState(t *testing.T) {
 				{Text: "world"},
 				{Text: "!"},
 			},
-			wantStateDelta: map[string]interface{}{"result": "Hello world!"},
+			wantStateDelta: map[string]any{"result": "Hello world!"},
 		},
 		{
 			name:           "skips on case-sensitive name mismatch",
 			agentConfig:    Config{Name: "TestAgent", OutputKey: "result"},
 			event:          createTestEvent("testagent", "Test response", true),
-			wantStateDelta: map[string]interface{}{},
+			wantStateDelta: map[string]any{},
 		},
 		//TODO tests with OutputSchema
 	}

agent/llmagent/state_agent_test.go

@@ -18,6 +18,7 @@ import (
 	"context"
 	"fmt"
 	"iter"
+	"maps"
 	"math"
 	"math/rand"
 	"strings"
@@ -429,9 +430,7 @@ func afterToolEnhancementCallback(ctx tool.Context, t tool.Tool, args map[string
 	}
 	fmt.Printf("✨ ENHANCE: Adding metadata to response from '%s'\n", t.Name())
 	enhancedResponse := make(map[string]any)
-	for k, v := range result {
-		enhancedResponse[k] = v
-	}
+	maps.Copy(enhancedResponse, result)
 	enhancedResponse["enhanced"] = true
 	enhancedResponse["enhancement_timestamp"] = time.Now()
 	enhancedResponse["tool_name"] = t.Name()
@@ -445,9 +444,7 @@ func afterToolAsyncCallback(ctx tool.Context, t tool.Tool, args map[string]any,
 	}
 	fmt.Printf("🔄 ASYNC AFTER: Post-processing response from '%s'\n", t.Name())
 	processedResponse := make(map[string]any)
-	for k, v := range result {
-		processedResponse[k] = v
-	}
+	maps.Copy(processedResponse, result)
 	processedResponse["async_processed"] = true
 	processedResponse["processor"] = "async_after_callback"
 	return processedResponse, nil

agent/workflowagents/sequentialagent/agent_test.go

@@ -229,7 +229,7 @@ func TestNewSequentialAgent(t *testing.T) {
 
 			// run twice, the second time it will need to determine which agent to use, and we want to get the same result
 			gotEvents = make([]*session.Event, 0)
-			for i := 0; i < 2; i++ {
+			for range 2 {
 				for event, err := range agentRunner.Run(ctx, "user_id", "session_id", genai.NewContentFromText("user input", genai.RoleUser), agent.RunConfig{}) {
 					if err != nil {
 						t.Errorf("got unexpected error: %v", err)

examples/workflowagents/parallel/main.go

@@ -80,7 +80,7 @@ type myAgent struct {
 
 func (a myAgent) Run(ctx agent.InvocationContext) iter.Seq2[*session.Event, error] {
 	return func(yield func(*session.Event, error) bool) {
-		for i := 0; i < 3; i++ {
+		for range 3 {
 			if !yield(&session.Event{
 				LLMResponse: model.LLMResponse{
 					Content: &genai.Content{

internal/llminternal/instruction_processor.go

@@ -17,6 +17,7 @@ package llminternal
 import (
 	"fmt"
 	"regexp"
+	"slices"
 	"strings"
 	"unicode"
 
@@ -122,8 +123,8 @@ func replaceMatch(ctx agent.InvocationContext, match string) (string, error) {
 		varName = strings.TrimSuffix(varName, "?")
 	}
 
-	if strings.HasPrefix(varName, "artifact.") {
-		fileName := strings.TrimPrefix(varName, "artifact.")
+	if after, ok := strings.CutPrefix(varName, "artifact."); ok {
+		fileName := after
 		if ctx.Artifacts() == nil {
 			return "", fmt.Errorf("artifact service is not initialized")
 		}
@@ -188,10 +189,8 @@ func isValidStateName(varName string) bool {
 	if len(parts) == 2 {
 		prefix := parts[0] + ":"
 		validPrefixes := []string{appPrefix, userPrefix, tempPrefix}
-		for _, p := range validPrefixes {
-			if prefix == p {
-				return isIdentifier(parts[1])
-			}
+		if slices.Contains(validPrefixes, prefix) {
+			return isIdentifier(parts[1])
 		}
 	}
 	return false

internal/llminternal/instruction_processor_test.go

@@ -33,7 +33,7 @@ func TestInjectSessionState(t *testing.T) {
 	testCases := []struct {
 		name             string                 // Name of the sub-test
 		template         string                 // Input template string
-		state            map[string]interface{} // Initial session state
+		state            map[string]any         // Initial session state
 		artifacts        map[string]*genai.Part // Artifacts for the mock service
 		expectNilService bool                   // Flag to test with a nil artifact service
 		want             string                 // Expected successful output
@@ -44,7 +44,7 @@ func TestInjectSessionState(t *testing.T) {
 		{
 			name:     "successful state injection",
 			template: "Hello {user_name}, you are in {app_state} state.",
-			state:    map[string]interface{}{"user_name": "Foo", "app_state": "active"},
+			state:    map[string]any{"user_name": "Foo", "app_state": "active"},
 			want:     "Hello Foo, you are in active state.",
 		},
 		// Corresponds to: test_inject_session_state_with_artifact
@@ -61,14 +61,14 @@ func TestInjectSessionState(t *testing.T) {
 		{
 			name:     "optional missing state variable",
 			template: "Optional value: {optional_value?}",
-			state:    map[string]interface{}{},
+			state:    map[string]any{},
 			want:     "Optional value: ",
 		},
 		// Corresponds to: test_inject_session_state_with_missing_state_raises_key_error
 		{
 			name:       "missing required state variable",
 			template:   "Hello {missing_key}!",
-			state:      map[string]interface{}{"user_name": "Foo"},
+			state:      map[string]any{"user_name": "Foo"},
 			wantErr:    true,
 			wantErrMsg: "failed to get key \"missing_key\" from state: state key does not exist",
 		},
@@ -86,28 +86,28 @@ func TestInjectSessionState(t *testing.T) {
 		{
 			name:     "invalid state name is not replaced",
 			template: "Hello {invalid-key}!",
-			state:    map[string]interface{}{"user_name": "Foo"},
+			state:    map[string]any{"user_name": "Foo"},
 			want:     "Hello {invalid-key}!",
 		},
 		// Corresponds to: test_inject_session_state_with_invalid_prefix_state_name_returns_original
 		{
 			name:     "invalid prefix state name is not replaced",
 			template: "Hello {invalid:key}!",
-			state:    map[string]interface{}{"user_name": "Foo"},
+			state:    map[string]any{"user_name": "Foo"},
 			want:     "Hello {invalid:key}!",
 		},
 		// Corresponds to: test_inject_session_state_with_valid_prefix_state
 		{
 			name:     "valid prefixed state variable",
 			template: "Hello {app:user_name}!",
-			state:    map[string]interface{}{"app:user_name": "Foo"},
+			state:    map[string]any{"app:user_name": "Foo"},
 			want:     "Hello Foo!",
 		},
 		// Corresponds to: test_inject_session_state_with_none_state_value_returns_empty
 		{
 			name:     "state value is nil",
 			template: "Value: {test_key}",
-			state:    map[string]interface{}{"test_key": nil},
+			state:    map[string]any{"test_key": nil},
 			want:     "Value: ",
 		},
 		// Corresponds to: test_inject_session_state_with_optional_missing_artifact_returns_empty
@@ -145,7 +145,7 @@ Your favorite color is {favorite_color}.
 The artifact says: {artifact.my_file}
 And another optional artifact: {artifact.other_file?}
 `,
-			state: map[string]interface{}{
+			state: map[string]any{
 				"user_name":      "Foo",
 				"user_age":       30,
 				"favorite_color": "blue",

internal/sessioninternal/mutablesession_test.go

@@ -17,6 +17,7 @@ package sessioninternal_test
 import (
 	"context"
 	"fmt"
+	"maps"
 	"reflect"
 	"testing"
 
@@ -105,10 +106,7 @@ func TestMutableSession_All(t *testing.T) {
 			sessionID := fmt.Sprintf("testAll-%d", i)
 			ms, _ := createMutableSession(ctx, t, sessionID, tc.initial)
 
-			gotMap := make(map[string]any)
-			for k, v := range ms.All() {
-				gotMap[k] = v
-			}
+			gotMap := maps.Collect(ms.All())
 
 			wantMap := tc.initial
 			if wantMap == nil {

server/adka2a/metadata.go

@@ -15,6 +15,8 @@
 package adka2a
 
 import (
+	"maps"
+
 	"github.com/a2aproject/a2a-go/a2asrv"
 	"google.golang.org/adk/internal/converters"
 	"google.golang.org/adk/session"
@@ -46,9 +48,7 @@ func toInvocationMeta(config ExecutorConfig, reqCtx *a2asrv.RequestContext) invo
 
 func toEventMeta(meta invocationMeta, event *session.Event) (map[string]any, error) {
 	result := make(map[string]any)
-	for k, v := range meta.eventMeta {
-		result[k] = v
-	}
+	maps.Copy(result, meta.eventMeta)
 
 	for k, v := range map[string]string{
 		"invocation_id": event.InvocationID,