Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Return empty WorkflowContextList from GetWorkflowContextList #575

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 9 additions & 12 deletions grpc-server/tinkerbell.go
Expand Up @@ -55,20 +55,17 @@ func (s *server) GetWorkflowContextList(ctx context.Context, req *pb.WorkflowCon
return nil, err
}

if wfs != nil {
wfContexts := []*pb.WorkflowContext{}
for _, wf := range wfs {
wfContext, err := s.db.GetWorkflowContexts(ctx, wf)
if err != nil {
return nil, status.Errorf(codes.Aborted, err.Error())
}
wfContexts = append(wfContexts, wfContext)
wfContexts := []*pb.WorkflowContext{}
for _, wf := range wfs {
wfContext, err := s.db.GetWorkflowContexts(ctx, wf)
if err != nil {
return nil, status.Errorf(codes.Aborted, err.Error())
}
return &pb.WorkflowContextList{
WorkflowContexts: wfContexts,
}, nil
wfContexts = append(wfContexts, wfContext)
}
return nil, nil
return &pb.WorkflowContextList{
WorkflowContexts: wfContexts,
}, nil
}

// GetWorkflowActions implements tinkerbell.GetWorkflowActions.
Expand Down
8 changes: 3 additions & 5 deletions grpc-server/tinkerbell_test.go
Expand Up @@ -135,13 +135,11 @@ func TestGetWorkflowContextList(t *testing.T) {
assert.True(t, tc.want.expectedError)
return
}
if err == nil && res == nil {
assert.False(t, tc.want.expectedError)
return
}
assert.NoError(t, err)
assert.NotNil(t, res)
assert.Len(t, res.WorkflowContexts, 1)
assert.False(t, tc.want.expectedError)
assert.IsType(t, &pb.WorkflowContextList{}, res)
assert.IsType(t, []*pb.WorkflowContext{}, res.WorkflowContexts)
})
}
}
Expand Down