From 52afc6f930969b66c588ac4039e4f24fc55edfff Mon Sep 17 00:00:00 2001 From: Liam Beckman Date: Tue, 24 Sep 2024 17:00:58 -0700 Subject: [PATCH] Fix `golangci-lint` issues --- database/boltdb/scheduler.go | 2 +- database/elastic/scheduler.go | 2 +- database/mongodb/scheduler.go | 4 ++-- server/tes.go | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/database/boltdb/scheduler.go b/database/boltdb/scheduler.go index bbdf6715e..dfdac5d0f 100644 --- a/database/boltdb/scheduler.go +++ b/database/boltdb/scheduler.go @@ -89,7 +89,7 @@ func (taskBolt *BoltDB) GetNode(ctx context.Context, req *scheduler.GetNodeReque }) if err == errNotFound { - return nil, status.Errorf(codes.NotFound, "foo") + return nil, status.Errorf(codes.NotFound, "%v: nodeID: %s", err.Error(), req.Id) } if err != nil { diff --git a/database/elastic/scheduler.go b/database/elastic/scheduler.go index 95f879a74..06d22c453 100644 --- a/database/elastic/scheduler.go +++ b/database/elastic/scheduler.go @@ -54,7 +54,7 @@ func (es *Elastic) GetNode(ctx context.Context, req *scheduler.GetNodeRequest) ( Do(ctx) if elastic.IsNotFound(err) { - return nil, status.Errorf(codes.NotFound, "foo") + return nil, status.Errorf(codes.NotFound, "%v: nodeID: %s", err.Error(), req.Id) } if err != nil { return nil, err diff --git a/database/mongodb/scheduler.go b/database/mongodb/scheduler.go index a9452e599..daaba66fc 100644 --- a/database/mongodb/scheduler.go +++ b/database/mongodb/scheduler.go @@ -66,7 +66,7 @@ func (db *MongoDB) GetNode(ctx context.Context, req *scheduler.GetNodeRequest) ( var node scheduler.Node err := db.nodes(db.client).FindOne(context.TODO(), bson.M{"id": req.Id}).Decode(&node) if err == mongo.ErrNoDocuments { - return nil, status.Errorf(codes.NotFound, "foo") + return nil, status.Errorf(codes.NotFound, "%v: nodeID: %s", err, req.Id) } return &node, nil @@ -78,7 +78,7 @@ func (db *MongoDB) DeleteNode(ctx context.Context, req *scheduler.Node) (*schedu _, err := db.nodes(db.client).DeleteOne(context.TODO(), bson.M{"id": req.Id}) fmt.Println("DeleteNode", req.Id, err) if err == mongo.ErrNoDocuments { - return nil, status.Errorf(codes.NotFound, "foo") + return nil, status.Errorf(codes.NotFound, "%v: nodeID: %s", err, req.Id) } return nil, err } diff --git a/server/tes.go b/server/tes.go index c9d335e92..af38a2fff 100644 --- a/server/tes.go +++ b/server/tes.go @@ -36,7 +36,7 @@ type TaskService struct { func (ts *TaskService) CreateTask(ctx context.Context, task *tes.Task) (*tes.CreateTaskResponse, error) { if err := tes.InitTask(task, true); err != nil { - return nil, status.Errorf(codes.InvalidArgument, "foo") + return nil, status.Errorf(codes.InvalidArgument, "%v", err.Error()) } err := ts.Compute.CheckBackendParameterSupport(task) @@ -64,7 +64,7 @@ func (ts *TaskService) CreateTask(ctx context.Context, task *tes.Task) (*tes.Cre func (ts *TaskService) GetTask(ctx context.Context, req *tes.GetTaskRequest) (*tes.Task, error) { task, err := ts.Read.GetTask(ctx, req) if err == tes.ErrNotFound { - err = status.Errorf(codes.NotFound, "foo") + err = status.Errorf(codes.NotFound, "%v: taskID: %s", err.Error(), req.Id) } return task, err } @@ -85,7 +85,7 @@ func (ts *TaskService) CancelTask(ctx context.Context, req *tes.CancelTaskReques // updated database and other event streams err = ts.Event.WriteEvent(ctx, events.NewState(req.Id, tes.Canceled)) if err == tes.ErrNotFound { - err = status.Errorf(codes.NotFound, "foo") + err = status.Errorf(codes.NotFound, "%v: taskID: %s", err.Error(), req.Id) } return &tes.CancelTaskResponse{}, err }