Skip to content

fix: Use correct error codes #514

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.

Sign up for GitHub

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

Merged
kodiakhq merged 2 commits into from
Dec 18, 2022
Merged

fix: Use correct error codes #514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1051fcb
fix: Use correct error codes
yevgenypats Dec 17, 2022
3ec343a
Merge branch 'main' into fix/error_codes
kodiakhq[bot] Dec 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions internal/servers/destinations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ func (s *DestinationServer) Write2(msg pb.Destination_Write2Server) error {
if err == io.EOF {
return msg.SendAndClose(&pb.Write2_Response{})
}
return fmt.Errorf("write: failed to receive msg: %w", err)
return status.Errorf(codes.Internal, "failed to receive msg: %v", err)
}
var tables schema.Tables
if err := json.Unmarshal(r.Tables, &tables); err != nil {
return fmt.Errorf("write: failed to unmarshal tables: %w", err)
return status.Errorf(codes.InvalidArgument, "failed to unmarshal tables: %v", err)
}
sourceName := r.Source
syncTime := r.Timestamp.AsTime()
Expand All @@ -90,15 +90,15 @@ func (s *DestinationServer) Write2(msg pb.Destination_Write2Server) error {
if err == io.EOF {
close(resources)
if err := eg.Wait(); err != nil {
return fmt.Errorf("got EOF. failed to wait for plugin: %w", err)
return status.Errorf(codes.Internal, "failed to wait for plugin: %v", err)
}
return msg.SendAndClose(&pb.Write2_Response{})
}
close(resources)
if err := eg.Wait(); err != nil {
s.Logger.Error().Err(err).Msg("got error. failed to wait for plugin")
}
return fmt.Errorf("failed to receive msg: %w", err)
return status.Errorf(codes.Internal, "failed to receive msg: %v", err)
}
var resource schema.DestinationResource
if err := json.Unmarshal(r.Resource, &resource); err != nil {
Expand Down
4 changes: 2 additions & 2 deletions internal/servers/source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ func (s *SourceServer) Sync2(req *pb.Sync2_Request, stream pb.Source_Sync2Server
destResource := resource.ToDestinationResource()
b, err := json.Marshal(destResource)
if err != nil {
return status.Errorf(codes.InvalidArgument, "failed to marshal resource: %v", err)
return status.Errorf(codes.Internal, "failed to marshal resource: %v", err)
}

msg := &pb.Sync2_Response{
Expand All @@ -128,7 +128,7 @@ func (s *SourceServer) Sync2(req *pb.Sync2_Request, stream pb.Source_Sync2Server
continue
}
if err := stream.Send(msg); err != nil {
return fmt.Errorf("failed to send resource: %v", err)
return status.Errorf(codes.Internal, "failed to send resource: %v", err)
}
}

Expand Down