fix lint, self review comments, etc

supreme-gg-gg · supreme-gg-gg · commit 4aae01951416 · 2026-05-26T11:44:20.000-04:00
Signed-off-by: Jet Chiang &lt;pokyuen.jetchiang-ext@solo.io&gt;
diff --git a/go/adk/examples/byo/main.go b/go/adk/examples/byo/main.go
@@ -50,7 +50,7 @@ import (
 	"google.golang.org/adk/agent/llmagent"
 	"google.golang.org/adk/agent/workflowagents/parallelagent"
 	"google.golang.org/adk/runner"
-	"google.golang.org/adk/server/adka2a"
+	"google.golang.org/adk/server/adka2a" //nolint:staticcheck // TODO(0.11.0): migrate Go ADK runtime to adka2a/v2.
 	adksession "google.golang.org/adk/session"
 )
 
diff --git a/go/adk/pkg/a2a/agentcard.go b/go/adk/pkg/a2a/agentcard.go
@@ -3,7 +3,7 @@ package a2a
 import (
 	a2atype "github.com/a2aproject/a2a-go/a2a"
 	adkagent "google.golang.org/adk/agent"
-	"google.golang.org/adk/server/adka2a"
+	"google.golang.org/adk/server/adka2a" //nolint:staticcheck // TODO(0.11.0): migrate Go ADK runtime to adka2a/v2.
 )
 
 // EnrichAgentCard populates the agent card with skills derived from the ADK
diff --git a/go/adk/pkg/a2a/consts.go b/go/adk/pkg/a2a/consts.go
@@ -1,6 +1,6 @@
 package a2a
 
-import "google.golang.org/adk/server/adka2a"
+import "google.golang.org/adk/server/adka2a" //nolint:staticcheck // TODO(0.11.0): migrate Go ADK runtime to adka2a/v2.
 
 const (
 	StateKeySessionName = "session_name"
diff --git a/go/adk/pkg/a2a/converter.go b/go/adk/pkg/a2a/converter.go
@@ -6,7 +6,7 @@ import (
 	"maps"
 
 	a2atype "github.com/a2aproject/a2a-go/a2a"
-	"google.golang.org/adk/server/adka2a"
+	"google.golang.org/adk/server/adka2a" //nolint:staticcheck // TODO(0.11.0): migrate Go ADK runtime to adka2a/v2.
 	adksession "google.golang.org/adk/session"
 	"google.golang.org/genai"
 )
diff --git a/go/adk/pkg/a2a/converter_test.go b/go/adk/pkg/a2a/converter_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	a2atype "github.com/a2aproject/a2a-go/a2a"
-	"google.golang.org/adk/server/adka2a"
+	"google.golang.org/adk/server/adka2a" //nolint:staticcheck // TODO(0.11.0): migrate Go ADK runtime to adka2a/v2.
 	"google.golang.org/genai"
 )
 
diff --git a/go/adk/pkg/a2a/executor.go b/go/adk/pkg/a2a/executor.go
@@ -19,7 +19,7 @@ import (
 	"go.opentelemetry.io/otel/attribute"
 	adkagent "google.golang.org/adk/agent"
 	"google.golang.org/adk/runner"
-	"google.golang.org/adk/server/adka2a"
+	"google.golang.org/adk/server/adka2a" //nolint:staticcheck // TODO(0.11.0): migrate Go ADK runtime to adka2a/v2.
 )
 
 const (
diff --git a/go/core/internal/a2a/a2a_handler_mux.go b/go/core/internal/a2a/a2a_handler_mux.go
@@ -3,6 +3,7 @@ package a2a
 import (
 	"fmt"
 	"net/http"
+	"slices"
 	"strings"
 	"sync"
 
@@ -59,7 +60,7 @@ func (a *handlerMux) SetAgentHandler(
 	card a2atype.AgentCard,
 	tracing middleware,
 ) error {
-	// TODO: Remove this in release 0.11.0 when all agents are migrated to v1
+	// TODO(cleanup): Replace this protocol mux with the standard v1 handler stack once legacy clients/runtimes are unsupported.
 	requestHandler := NewPassthroughRequestHandler(client, &card)
 	legacyJSONRPCHandler := a2av0.NewJSONRPCHandler(requestHandler)
 	v1JSONRPCHandler := a2asrv.NewJSONRPCHandler(requestHandler)
@@ -89,8 +90,8 @@ func (a *handlerMux) SetAgentHandler(
 	if tracing != nil {
 		middlewares = append(middlewares, tracing)
 	}
-	for i := len(middlewares) - 1; i >= 0; i-- {
-		handler = middlewares[i].Wrap(handler)
+	for _, middleware := range slices.Backward(middlewares) {
+		handler = middleware.Wrap(handler)
 	}
 
 	a.lock.Lock()
diff --git a/go/core/internal/a2a/a2a_registrar.go b/go/core/internal/a2a/a2a_registrar.go
@@ -159,13 +159,15 @@ func (a *A2ARegistrar) upsertAgentHandler(ctx context.Context, agent v1alpha2.Ag
 	httpClient := debugHTTPClient()
 	client, err := a2aclient.NewFromEndpoints(
 		ctx,
-		// TODO: Switch this to 1.0 in release 0.11.0 when all agents are migrated to v1
+		// TODO(0.11.0): Prefer A2A 1.0 interfaces by default once managed runtimes are v1-capable.
+		// Keep legacy fallback during rollout so old agent pods continue to serve traffic.
 		filterInterfacesByVersion(card.SupportedInterfaces, a2atype.ProtocolVersion("0.3")),
 		a2aclient.WithJSONRPCTransport(httpClient),
-		// TODO: Remove this in release 0.11.0 when all agents are migrated to v1
+		// TODO(cleanup): Remove the compat transport after legacy runtimes are unsupported.
 		a2aclient.WithCompatTransport(
 			a2atype.ProtocolVersion("0.3"),
 			a2atype.TransportProtocolJSONRPC,
+			// This creates a legacy JSON-RPC transport that is used to forward traffic to agents that are still on the legacy A2A wire.
 			a2aclient.TransportFactoryFn(func(_ context.Context, _ *a2atype.AgentCard, iface *a2atype.AgentInterface) (a2aclient.Transport, error) {
 				return a2av0.NewJSONRPCTransport(a2av0.JSONRPCTransportConfig{
 					URL:    iface.URL,
@@ -224,6 +226,7 @@ func a2aRoutePath(agent v1alpha2.AgentObject) string {
 	return routeKey(agent.GetWorkloadMode() == v1alpha2.WorkloadModeSandbox, agentRef.Namespace, agentRef.Name)
 }
 
+// cloneInterfacesWithURL clones the interfaces and sets the URL to the given value.
 func cloneInterfacesWithURL(interfaces []*a2atype.AgentInterface, url string) []*a2atype.AgentInterface {
 	if len(interfaces) == 0 {
 		return []*a2atype.AgentInterface{
@@ -249,6 +252,8 @@ func cloneInterfacesWithURL(interfaces []*a2atype.AgentInterface, url string) []
 	return result
 }
 
+// filterInterfacesByVersion filters the interfaces to only include the ones that match the given version.
+// Currently, this is used to select the A2A 0.3 interface for managed agents.
 func filterInterfacesByVersion(interfaces []*a2atype.AgentInterface, version a2atype.ProtocolVersion) []*a2atype.AgentInterface {
 	filtered := make([]*a2atype.AgentInterface, 0, len(interfaces))
 	for _, i := range interfaces {
diff --git a/go/core/internal/a2a/passthrough_handler.go b/go/core/internal/a2a/passthrough_handler.go
@@ -9,6 +9,8 @@ import (
 	"github.com/a2aproject/a2a-go/v2/a2asrv"
 )
 
+// TODO(cleanup): once legacy traffic is unsupported, use the standard v1 handler
+// stack directly.
 type PassthroughRequestHandler struct {
 	client *a2aclient.Client
 	card   *a2atype.AgentCard
@@ -21,8 +23,6 @@ var _ a2asrv.RequestHandler = (*PassthroughRequestHandler)(nil)
 // agent client and intentionally bypasses a2asrv.NewHandler, which would create
 // local task state and apply v1 task-processing invariants to legacy streams.
 // Keep this while the controller bridges mixed 0.3 and 1.0 clients/runtimes;
-// once all supported traffic is native v1, the controller can use the standard
-// v1 handler stack directly.
 func NewPassthroughRequestHandler(client *a2aclient.Client, card *a2atype.AgentCard) *PassthroughRequestHandler {
 	return &PassthroughRequestHandler{
 		client: client,
diff --git a/go/core/internal/controller/translator/agent/manifest_builder.go b/go/core/internal/controller/translator/agent/manifest_builder.go
@@ -149,7 +149,7 @@ func (a *adkApiTranslator) buildConfigSecret(
 		cfgJSON = string(bCfg)
 	}
 	if card != nil {
-		// TODO: replace this with the v1 agent card producer in release 0.11.0
+		// TODO(0.11.0): use the v1 agent card producer once managed runtimes no longer need legacy top-level fields.
 		producer := a2av0.NewStaticAgentCardProducer(card)
 		jsonProducer, ok := producer.(a2asrv.AgentCardJSONProducer)
 		if !ok {
diff --git a/go/core/internal/database/client_postgres.go b/go/core/internal/database/client_postgres.go
@@ -199,6 +199,8 @@ func (c *postgresClient) ListEventsForSession(ctx context.Context, sessionID, us
 
 // ── Tasks ─────────────────────────────────────────────────────────────────────
 
+// TODO(0.11.0): Switch task writes to v1 storage format and remove legacy conversion from this write path.
+// NOTE: We will still need to keep the read compatibility for legacy rows in 0.11.0
 func (c *postgresClient) StoreTask(ctx context.Context, task *a2a.Task) error {
 	legacyTask, err := trpcv0.ToLegacyTask(task)
 	if err != nil {
@@ -246,6 +248,8 @@ func (c *postgresClient) DeleteTask(ctx context.Context, taskID string) error {
 
 // ── Push Notifications ────────────────────────────────────────────────────────
 
+// TODO(0.11.0): Switch push notification writes to v1 storage format and remove legacy conversion from this write path.
+// NOTE: We will still need to keep the read compatibility for legacy rows in 0.11.0.
 func (c *postgresClient) StorePushNotification(ctx context.Context, config *a2a.PushConfig) error {
 	legacyConfig := trpcv0.ToLegacyPushConfig(config)
 	data, err := json.Marshal(legacyConfig)
@@ -742,6 +746,7 @@ func toEvent(r dbgen.Event) *dbpkg.Event {
 	}
 }
 
+//nolint:unused // Kept for parity with other row mappers and future raw task DB APIs.
 func toTask(r dbgen.Task) *dbpkg.Task {
 	return &dbpkg.Task{
 		ID:              r.ID,
@@ -872,6 +877,7 @@ func strPtrIfNotEmpty(s string) *string {
 	return &s
 }
 
+// parseVersionedTask parses a task from a string and a version, handles conversion from legacy to v1 format.
 func parseVersionedTask(data string, version *string) (*a2a.Task, error) {
 	switch {
 	case version == nil || *version == "":
@@ -895,6 +901,7 @@ func parseVersionedTask(data string, version *string) (*a2a.Task, error) {
 	}
 }
 
+// parseVersionedPushConfig parses a push notification config from a string and a version, handles conversion from legacy to v1 format.
 func parseVersionedPushConfig(data string, version *string) (*a2a.PushConfig, error) {
 	switch {
 	case version == nil || *version == "":
diff --git a/go/core/internal/httpserver/handlers/sessions.go b/go/core/internal/httpserver/handlers/sessions.go
@@ -354,6 +354,8 @@ func (h *SessionsHandler) HandleListTasksForSession(w ErrorResponseWriter, r *ht
 	}
 
 	log.Info("Successfully retrieved session tasks", "count", len(tasks))
+
+	// TODO(cleanup): Remove legacy API conversion after legacy wire support is no longer supported.
 	switch wireVersion {
 	case utils.A2AWireVersionLegacy:
 		legacyTasks := make([]any, 0, len(tasks))
diff --git a/go/core/internal/httpserver/handlers/tasks.go b/go/core/internal/httpserver/handlers/tasks.go
@@ -45,6 +45,8 @@ func (h *TasksHandler) HandleGetTask(w ErrorResponseWriter, r *http.Request) {
 	}
 
 	log.Info("Successfully retrieved task")
+	// TODO(cleanup): Remove legacy API conversion after legacy wire support is no longer supported.
+	// Currently this will return either legacy or v1 task depending on the wire version
 	var data any
 	switch wireVersion {
 	case utils.A2AWireVersionLegacy:
@@ -74,6 +76,7 @@ func (h *TasksHandler) HandleCreateTask(w ErrorResponseWriter, r *http.Request)
 	}
 
 	task := a2a.Task{}
+	// TODO(cleanup): Remove legacy API conversion after legacy wire support is no longer supported.
 	switch wireVersion {
 	case utils.A2AWireVersionLegacy:
 		legacyTask := protocol.Task{}
diff --git a/go/core/internal/utils/a2a_version.go b/go/core/internal/utils/a2a_version.go
@@ -17,6 +17,7 @@ const (
 
 // NegotiateA2AWireVersion returns the A2A wire version requested by the client.
 // Missing or explicit 0.3 headers use the legacy/current kagent A2A wire shape.
+// TODO(cleanup): Revisit missing-header behavior once legacy wire clients are unsupported.
 func NegotiateA2AWireVersion(r *http.Request) (A2AWireVersion, error) {
 	version := r.Header.Get(a2atype.SvcParamVersion)
 	switch version {
diff --git a/go/core/pkg/a2acompat/trpcv0/convert.go b/go/core/pkg/a2acompat/trpcv0/convert.go
@@ -175,13 +175,13 @@ func toLegacyMessage(message *a2av1.Message) (*trpc.Message, error) {
 	result := &trpc.Message{
 		Kind:             trpc.KindMessage,
 		MessageID:        message.ID,
-		ContextID:        strPtr(contextID),
+		ContextID:        new(contextID),
 		Extensions:       message.Extensions,
 		Metadata:         message.Metadata,
 		Parts:            parts,
 		ReferenceTaskIDs: toLegacyTaskIDs(message.ReferenceTasks),
 		Role:             toLegacyMessageRole(message.Role),
-		TaskID:           strPtr(taskID),
+		TaskID:           new(taskID),
 	}
 	return result, nil
 }
@@ -200,8 +200,8 @@ func toLegacyArtifact(artifact *a2av1.Artifact) (*trpc.Artifact, error) {
 
 	return &trpc.Artifact{
 		ArtifactID:  id,
-		Name:        strPtr(name),
-		Description: strPtr(description),
+		Name:        new(name),
+		Description: new(description),
 		Metadata:    artifact.Metadata,
 		Extensions:  artifact.Extensions,
 		Parts:       parts,
@@ -248,8 +248,8 @@ func toLegacyPart(part *a2av1.Part) (trpc.Part, error) {
 		return trpc.FilePart{
 			Kind: trpc.KindFile,
 			File: &trpc.FileWithURI{
-				Name:     strPtr(fileName),
-				MimeType: strPtr(mimeType),
+				Name:     new(fileName),
+				MimeType: new(mimeType),
 				URI:      urlString,
 			},
 			Metadata: part.Metadata,
@@ -262,8 +262,8 @@ func toLegacyPart(part *a2av1.Part) (trpc.Part, error) {
 		return trpc.FilePart{
 			Kind: trpc.KindFile,
 			File: &trpc.FileWithBytes{
-				Name:     strPtr(fileName),
-				MimeType: strPtr(mimeType),
+				Name:     new(fileName),
+				MimeType: new(mimeType),
 				Bytes:    string(raw),
 			},
 			Metadata: part.Metadata,
@@ -328,10 +328,6 @@ func formatTimestamp(timestamp *time.Time) string {
 	return timestamp.UTC().Format(time.RFC3339Nano)
 }
 
-func strPtr(s string) *string {
-	return &s
-}
-
 func ToOfficialV0TaskStatus(status trpc.TaskStatus) (legacya2a.TaskStatus, error) {
 	var msg *legacya2a.Message
 	var err error

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ import (`
`50`	`50`	`"google.golang.org/adk/agent/llmagent"`
`51`	`51`	`"google.golang.org/adk/agent/workflowagents/parallelagent"`
`52`	`52`	`"google.golang.org/adk/runner"`
`53`		`- "google.golang.org/adk/server/adka2a"`
	`53`	`+ "google.golang.org/adk/server/adka2a" //nolint:staticcheck // TODO(0.11.0): migrate Go ADK runtime to adka2a/v2.`
`54`	`54`	`adksession "google.golang.org/adk/session"`
`55`	`55`	`)`
`56`	`56`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package a2a`
`3`	`3`	`import (`
`4`	`4`	`a2atype "github.com/a2aproject/a2a-go/a2a"`
`5`	`5`	`adkagent "google.golang.org/adk/agent"`
`6`		`- "google.golang.org/adk/server/adka2a"`
	`6`	`+ "google.golang.org/adk/server/adka2a" //nolint:staticcheck // TODO(0.11.0): migrate Go ADK runtime to adka2a/v2.`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`// EnrichAgentCard populates the agent card with skills derived from the ADK`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"maps"`
`7`	`7`
`8`	`8`	`a2atype "github.com/a2aproject/a2a-go/a2a"`
`9`		`- "google.golang.org/adk/server/adka2a"`
	`9`	`+ "google.golang.org/adk/server/adka2a" //nolint:staticcheck // TODO(0.11.0): migrate Go ADK runtime to adka2a/v2.`
`10`	`10`	`adksession "google.golang.org/adk/session"`
`11`	`11`	`"google.golang.org/genai"`
`12`	`12`	`)`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"testing"`
`6`	`6`
`7`	`7`	`a2atype "github.com/a2aproject/a2a-go/a2a"`
`8`		`- "google.golang.org/adk/server/adka2a"`
	`8`	`+ "google.golang.org/adk/server/adka2a" //nolint:staticcheck // TODO(0.11.0): migrate Go ADK runtime to adka2a/v2.`
`9`	`9`	`"google.golang.org/genai"`
`10`	`10`	`)`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ import (`
`19`	`19`	`"go.opentelemetry.io/otel/attribute"`
`20`	`20`	`adkagent "google.golang.org/adk/agent"`
`21`	`21`	`"google.golang.org/adk/runner"`
`22`		`- "google.golang.org/adk/server/adka2a"`
	`22`	`+ "google.golang.org/adk/server/adka2a" //nolint:staticcheck // TODO(0.11.0): migrate Go ADK runtime to adka2a/v2.`
`23`	`23`	`)`
`24`	`24`
`25`	`25`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ func (a *adkApiTranslator) buildConfigSecret(`
`149`	`149`	`cfgJSON = string(bCfg)`
`150`	`150`	`}`
`151`	`151`	`if card != nil {`
`152`		`- // TODO: replace this with the v1 agent card producer in release 0.11.0`
	`152`	`+ // TODO(0.11.0): use the v1 agent card producer once managed runtimes no longer need legacy top-level fields.`
`153`	`153`	`producer := a2av0.NewStaticAgentCardProducer(card)`
`154`	`154`	`jsonProducer, ok := producer.(a2asrv.AgentCardJSONProducer)`
`155`	`155`	`if !ok {`