From 7fb56bfe67fdd309e8db3a1fa30c70a810815fb0 Mon Sep 17 00:00:00 2001 From: duwenxin Date: Mon, 2 Feb 2026 18:40:53 -0500 Subject: [PATCH] update alloydb agent errors --- .../alloydbcreatecluster/alloydbcreatecluster.go | 10 +++++----- .../alloydb/alloydbcreateuser/alloydbcreateuser.go | 12 ++++++------ .../alloydb/alloydbgetcluster/alloydbgetcluster.go | 6 +++--- .../alloydb/alloydbgetinstance/alloydbgetinstance.go | 8 ++++---- .../tools/alloydb/alloydbgetuser/alloydbgetuser.go | 8 ++++---- .../alloydblistclusters/alloydblistclusters.go | 4 ++-- .../alloydblistinstances/alloydblistinstances.go | 6 +++--- .../alloydb/alloydblistusers/alloydblistusers.go | 6 +++--- .../alloydbwaitforoperation.go | 8 ++++---- 9 files changed, 34 insertions(+), 34 deletions(-) diff --git a/internal/tools/alloydb/alloydbcreatecluster/alloydbcreatecluster.go b/internal/tools/alloydb/alloydbcreatecluster/alloydbcreatecluster.go index d0b249581a..a313c7487f 100644 --- a/internal/tools/alloydb/alloydbcreatecluster/alloydbcreatecluster.go +++ b/internal/tools/alloydb/alloydbcreatecluster/alloydbcreatecluster.go @@ -132,27 +132,27 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para paramsMap := params.AsMap() project, ok := paramsMap["project"].(string) if !ok || project == "" { - return nil, util.NewAgentError("invalid or missing 'project' parameter; expected a non-empty string") + return nil, util.NewAgentError("invalid or missing 'project' parameter; expected a non-empty string", nil) } location, ok := paramsMap["location"].(string) if !ok { - return nil, util.NewAgentError("invalid 'location' parameter; expected a string") + return nil, util.NewAgentError("invalid 'location' parameter; expected a string", nil) } clusterID, ok := paramsMap["cluster"].(string) if !ok || clusterID == "" { - return nil, util.NewAgentError("invalid or missing 'cluster' parameter; expected a non-empty string") + return nil, util.NewAgentError("invalid or missing 'cluster' parameter; expected a non-empty string", nil) } password, ok := paramsMap["password"].(string) if !ok || password == "" { - return nil, util.NewAgentError("invalid or missing 'password' parameter; expected a non-empty string") + return nil, util.NewAgentError("invalid or missing 'password' parameter; expected a non-empty string", nil) } network, ok := paramsMap["network"].(string) if !ok { - return nil, util.NewAgentError("invalid 'network' parameter; expected a string") + return nil, util.NewAgentError("invalid 'network' parameter; expected a string", nil) } user, ok := paramsMap["user"].(string) diff --git a/internal/tools/alloydb/alloydbcreateuser/alloydbcreateuser.go b/internal/tools/alloydb/alloydbcreateuser/alloydbcreateuser.go index 45a9afc77f..617e0b2132 100644 --- a/internal/tools/alloydb/alloydbcreateuser/alloydbcreateuser.go +++ b/internal/tools/alloydb/alloydbcreateuser/alloydbcreateuser.go @@ -132,34 +132,34 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para paramsMap := params.AsMap() project, ok := paramsMap["project"].(string) if !ok || project == "" { - return nil, util.NewAgentError("invalid or missing 'project' parameter; expected a non-empty string") + return nil, util.NewAgentError("invalid or missing 'project' parameter; expected a non-empty string", nil) } location, ok := paramsMap["location"].(string) if !ok || location == "" { - return nil, util.NewAgentError("invalid or missing'location' parameter; expected a non-empty string") + return nil, util.NewAgentError("invalid or missing'location' parameter; expected a non-empty string", nil) } cluster, ok := paramsMap["cluster"].(string) if !ok || cluster == "" { - return nil, util.NewAgentError("invalid or missing 'cluster' parameter; expected a non-empty string") + return nil, util.NewAgentError("invalid or missing 'cluster' parameter; expected a non-empty string", nil) } userID, ok := paramsMap["user"].(string) if !ok || userID == "" { - return nil, util.NewAgentError("invalid or missing 'user' parameter; expected a non-empty string") + return nil, util.NewAgentError("invalid or missing 'user' parameter; expected a non-empty string", nil) } userType, ok := paramsMap["userType"].(string) if !ok || (userType != "ALLOYDB_BUILT_IN" && userType != "ALLOYDB_IAM_USER") { - return nil, util.NewAgentError("invalid or missing 'userType' parameter; expected 'ALLOYDB_BUILT_IN' or 'ALLOYDB_IAM_USER'") + return nil, util.NewAgentError("invalid or missing 'userType' parameter; expected 'ALLOYDB_BUILT_IN' or 'ALLOYDB_IAM_USER'", nil) } var password string if userType == "ALLOYDB_BUILT_IN" { password, ok = paramsMap["password"].(string) if !ok || password == "" { - return nil, util.NewAgentError("password is required when userType is ALLOYDB_BUILT_IN") + return nil, util.NewAgentError("password is required when userType is ALLOYDB_BUILT_IN", nil) } } diff --git a/internal/tools/alloydb/alloydbgetcluster/alloydbgetcluster.go b/internal/tools/alloydb/alloydbgetcluster/alloydbgetcluster.go index 66273f2363..ad1f0b706b 100644 --- a/internal/tools/alloydb/alloydbgetcluster/alloydbgetcluster.go +++ b/internal/tools/alloydb/alloydbgetcluster/alloydbgetcluster.go @@ -131,15 +131,15 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para project, ok := paramsMap["project"].(string) if !ok || project == "" { - return nil, util.NewAgentError("invalid or missing 'project' parameter; expected a string") + return nil, util.NewAgentError("invalid or missing 'project' parameter; expected a string", nil) } location, ok := paramsMap["location"].(string) if !ok || location == "" { - return nil, util.NewAgentError("invalid or missing 'location' parameter; expected a string") + return nil, util.NewAgentError("invalid or missing 'location' parameter; expected a string", nil) } cluster, ok := paramsMap["cluster"].(string) if !ok || cluster == "" { - return nil, util.NewAgentError("invalid or missing 'cluster' parameter; expected a string") + return nil, util.NewAgentError("invalid or missing 'cluster' parameter; expected a string", nil) } resp, err := source.GetCluster(ctx, project, location, cluster, string(accessToken)) diff --git a/internal/tools/alloydb/alloydbgetinstance/alloydbgetinstance.go b/internal/tools/alloydb/alloydbgetinstance/alloydbgetinstance.go index a1ce55df29..4cfa45dabc 100644 --- a/internal/tools/alloydb/alloydbgetinstance/alloydbgetinstance.go +++ b/internal/tools/alloydb/alloydbgetinstance/alloydbgetinstance.go @@ -131,19 +131,19 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para project, ok := paramsMap["project"].(string) if !ok || project == "" { - return nil, util.NewAgentError("invalid or missing 'project' parameter; expected a string") + return nil, util.NewAgentError("invalid or missing 'project' parameter; expected a string", nil) } location, ok := paramsMap["location"].(string) if !ok || location == "" { - return nil, util.NewAgentError("invalid or missing 'location' parameter; expected a string") + return nil, util.NewAgentError("invalid or missing 'location' parameter; expected a string", nil) } cluster, ok := paramsMap["cluster"].(string) if !ok || cluster == "" { - return nil, util.NewAgentError("invalid or missing 'cluster' parameter; expected a string") + return nil, util.NewAgentError("invalid or missing 'cluster' parameter; expected a string", nil) } instance, ok := paramsMap["instance"].(string) if !ok || instance == "" { - return nil, util.NewAgentError("invalid or missing 'instance' parameter; expected a string") + return nil, util.NewAgentError("invalid or missing 'instance' parameter; expected a string", nil) } resp, err := source.GetInstance(ctx, project, location, cluster, instance, string(accessToken)) diff --git a/internal/tools/alloydb/alloydbgetuser/alloydbgetuser.go b/internal/tools/alloydb/alloydbgetuser/alloydbgetuser.go index 8142e74deb..a1cc7c106b 100644 --- a/internal/tools/alloydb/alloydbgetuser/alloydbgetuser.go +++ b/internal/tools/alloydb/alloydbgetuser/alloydbgetuser.go @@ -131,19 +131,19 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para project, ok := paramsMap["project"].(string) if !ok || project == "" { - return nil, util.NewAgentError("invalid or missing 'project' parameter; expected a string") + return nil, util.NewAgentError("invalid or missing 'project' parameter; expected a string", nil) } location, ok := paramsMap["location"].(string) if !ok || location == "" { - return nil, util.NewAgentError("invalid or missing 'location' parameter; expected a string") + return nil, util.NewAgentError("invalid or missing 'location' parameter; expected a string", nil) } cluster, ok := paramsMap["cluster"].(string) if !ok || cluster == "" { - return nil, util.NewAgentError("invalid or missing 'cluster' parameter; expected a string") + return nil, util.NewAgentError("invalid or missing 'cluster' parameter; expected a string", nil) } user, ok := paramsMap["user"].(string) if !ok || user == "" { - return nil, util.NewAgentError("invalid or missing 'user' parameter; expected a string") + return nil, util.NewAgentError("invalid or missing 'user' parameter; expected a string", nil) } resp, err := source.GetUsers(ctx, project, location, cluster, user, string(accessToken)) diff --git a/internal/tools/alloydb/alloydblistclusters/alloydblistclusters.go b/internal/tools/alloydb/alloydblistclusters/alloydblistclusters.go index c7cb6223e5..03cfd66c3c 100644 --- a/internal/tools/alloydb/alloydblistclusters/alloydblistclusters.go +++ b/internal/tools/alloydb/alloydblistclusters/alloydblistclusters.go @@ -129,11 +129,11 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para project, ok := paramsMap["project"].(string) if !ok || project == "" { - return nil, util.NewAgentError("invalid or missing 'project' parameter; expected a string") + return nil, util.NewAgentError("invalid or missing 'project' parameter; expected a string", nil) } location, ok := paramsMap["location"].(string) if !ok { - return nil, util.NewAgentError("invalid 'location' parameter; expected a string") + return nil, util.NewAgentError("invalid 'location' parameter; expected a string", nil) } resp, err := source.ListCluster(ctx, project, location, string(accessToken)) diff --git a/internal/tools/alloydb/alloydblistinstances/alloydblistinstances.go b/internal/tools/alloydb/alloydblistinstances/alloydblistinstances.go index c0fc524bf0..1d9863af52 100644 --- a/internal/tools/alloydb/alloydblistinstances/alloydblistinstances.go +++ b/internal/tools/alloydb/alloydblistinstances/alloydblistinstances.go @@ -130,15 +130,15 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para project, ok := paramsMap["project"].(string) if !ok || project == "" { - return nil, util.NewAgentError("invalid or missing 'project' parameter; expected a string") + return nil, util.NewAgentError("invalid or missing 'project' parameter; expected a string", nil) } location, ok := paramsMap["location"].(string) if !ok { - return nil, util.NewAgentError("invalid 'location' parameter; expected a string") + return nil, util.NewAgentError("invalid 'location' parameter; expected a string", nil) } cluster, ok := paramsMap["cluster"].(string) if !ok { - return nil, util.NewAgentError("invalid 'cluster' parameter; expected a string") + return nil, util.NewAgentError("invalid 'cluster' parameter; expected a string", nil) } resp, err := source.ListInstance(ctx, project, location, cluster, string(accessToken)) diff --git a/internal/tools/alloydb/alloydblistusers/alloydblistusers.go b/internal/tools/alloydb/alloydblistusers/alloydblistusers.go index d891d9a16d..e31d0ce5b9 100644 --- a/internal/tools/alloydb/alloydblistusers/alloydblistusers.go +++ b/internal/tools/alloydb/alloydblistusers/alloydblistusers.go @@ -130,15 +130,15 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para project, ok := paramsMap["project"].(string) if !ok || project == "" { - return nil, util.NewAgentError("invalid or missing 'project' parameter; expected a string") + return nil, util.NewAgentError("invalid or missing 'project' parameter; expected a string", nil) } location, ok := paramsMap["location"].(string) if !ok || location == "" { - return nil, util.NewAgentError("invalid or missing 'location' parameter; expected a string") + return nil, util.NewAgentError("invalid or missing 'location' parameter; expected a string", nil) } cluster, ok := paramsMap["cluster"].(string) if !ok || cluster == "" { - return nil, util.NewAgentError("invalid or missing 'cluster' parameter; expected a string") + return nil, util.NewAgentError("invalid or missing 'cluster' parameter; expected a string", nil) } resp, err := source.ListUsers(ctx, project, location, cluster, string(accessToken)) diff --git a/internal/tools/alloydb/alloydbwaitforoperation/alloydbwaitforoperation.go b/internal/tools/alloydb/alloydbwaitforoperation/alloydbwaitforoperation.go index a4fe4f84e2..aafbb314c1 100644 --- a/internal/tools/alloydb/alloydbwaitforoperation/alloydbwaitforoperation.go +++ b/internal/tools/alloydb/alloydbwaitforoperation/alloydbwaitforoperation.go @@ -224,15 +224,15 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para project, ok := paramsMap["project"].(string) if !ok { - return nil, util.NewAgentError("missing 'project' parameter") + return nil, util.NewAgentError("missing 'project' parameter", nil) } location, ok := paramsMap["location"].(string) if !ok { - return nil, util.NewAgentError("missing 'location' parameter") + return nil, util.NewAgentError("missing 'location' parameter", nil) } operation, ok := paramsMap["operation"].(string) if !ok { - return nil, util.NewAgentError("missing 'operation' parameter") + return nil, util.NewAgentError("missing 'operation' parameter", nil) } ctx, cancel := context.WithTimeout(ctx, 30*time.Minute) @@ -266,7 +266,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para } retries++ } - return nil, util.NewAgentError("exceeded max retries waiting for operation") + return nil, util.NewAgentError("exceeded max retries waiting for operation", nil) } func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {