fix: Use correct error codes (#514)

yevgenypats · web-flow · commit 8b53d76ca155 · 2022-12-18T07:58:41.000Z
This is uses correct error codes for gRPC in most places. We use Internal and this is the intedded error code for server errors. This is also used by the grpc server as well but it doesn't mean it is only for the gRPC code. See documentation: https://pkg.go.dev/google.golang.org/grpc/codes#Code https://cloud.google.com/apis/design/errors The right codes for internal error are `Unknown` (The default one) and `Internal`
diff --git a/internal/servers/destinations.go b/internal/servers/destinations.go
@@ -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()
@@ -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 {
diff --git a/internal/servers/source.go b/internal/servers/source.go
@@ -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{
@@ -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)
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -70,11 +70,11 @@ func (s *DestinationServer) Write2(msg pb.Destination_Write2Server) error {`
`70`	`70`	`if err == io.EOF {`
`71`	`71`	`return msg.SendAndClose(&pb.Write2_Response{})`
`72`	`72`	`}`
`73`		`- return fmt.Errorf("write: failed to receive msg: %w", err)`
	`73`	`+ return status.Errorf(codes.Internal, "failed to receive msg: %v", err)`
`74`	`74`	`}`
`75`	`75`	`var tables schema.Tables`
`76`	`76`	`if err := json.Unmarshal(r.Tables, &tables); err != nil {`
`77`		`- return fmt.Errorf("write: failed to unmarshal tables: %w", err)`
	`77`	`+ return status.Errorf(codes.InvalidArgument, "failed to unmarshal tables: %v", err)`
`78`	`78`	`}`
`79`	`79`	`sourceName := r.Source`
`80`	`80`	`syncTime := r.Timestamp.AsTime()`
`@@ -90,15 +90,15 @@ func (s *DestinationServer) Write2(msg pb.Destination_Write2Server) error {`
`90`	`90`	`if err == io.EOF {`
`91`	`91`	`close(resources)`
`92`	`92`	`if err := eg.Wait(); err != nil {`
`93`		`- return fmt.Errorf("got EOF. failed to wait for plugin: %w", err)`
	`93`	`+ return status.Errorf(codes.Internal, "failed to wait for plugin: %v", err)`
`94`	`94`	`}`
`95`	`95`	`return msg.SendAndClose(&pb.Write2_Response{})`
`96`	`96`	`}`
`97`	`97`	`close(resources)`
`98`	`98`	`if err := eg.Wait(); err != nil {`
`99`	`99`	`s.Logger.Error().Err(err).Msg("got error. failed to wait for plugin")`
`100`	`100`	`}`
`101`		`- return fmt.Errorf("failed to receive msg: %w", err)`
	`101`	`+ return status.Errorf(codes.Internal, "failed to receive msg: %v", err)`
`102`	`102`	`}`
`103`	`103`	`var resource schema.DestinationResource`
`104`	`104`	`if err := json.Unmarshal(r.Resource, &resource); err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ func (s SourceServer) Sync2(req pb.Sync2_Request, stream pb.Source_Sync2Server`
`114`	`114`	`destResource := resource.ToDestinationResource()`
`115`	`115`	`b, err := json.Marshal(destResource)`
`116`	`116`	`if err != nil {`
`117`		`- return status.Errorf(codes.InvalidArgument, "failed to marshal resource: %v", err)`
	`117`	`+ return status.Errorf(codes.Internal, "failed to marshal resource: %v", err)`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`msg := &pb.Sync2_Response{`
`@@ -128,7 +128,7 @@ func (s SourceServer) Sync2(req pb.Sync2_Request, stream pb.Source_Sync2Server`
`128`	`128`	`continue`
`129`	`129`	`}`
`130`	`130`	`if err := stream.Send(msg); err != nil {`
`131`		`- return fmt.Errorf("failed to send resource: %v", err)`
	`131`	`+ return status.Errorf(codes.Internal, "failed to send resource: %v", err)`
`132`	`132`	`}`
`133`	`133`	`}`
`134`	`134`