Return Unimplemented when services or methods are not implemented

Kazuyoshi Kato · Kazuyoshi Kato · commit fede9db17c44 · 2021-05-21T15:51:33.000-07:00
gRPC has UNIMPLEMENTED status code that indicates a requested method is not implemented. However ttrpc was returning codes.NotFound which could be returned when a request entity was not there. This fix changes the status code from codes.NotFound to codes.Unimplemented to disambiguate and be more compatible with gRPC. Fixes #80. Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
diff --git a/server_test.go b/server_test.go
@@ -136,7 +136,7 @@ func TestServer(t *testing.T) {
 	}
 }
 
-func TestServerNotFound(t *testing.T) {
+func TestServerUnimplemented(t *testing.T) {
 	var (
 		ctx             = context.Background()
 		server          = mustServer(t)(NewServer())
@@ -155,7 +155,7 @@ func TestServerNotFound(t *testing.T) {
 		t.Fatalf("expected error from non-existent service call")
 	} else if status, ok := status.FromError(err); !ok {
 		t.Fatalf("expected status present in error: %v", err)
-	} else if status.Code() != codes.NotFound {
+	} else if status.Code() != codes.Unimplemented {
 		t.Fatalf("expected not found for method")
 	}
 
diff --git a/services.go b/services.go
@@ -116,12 +116,12 @@ func (s *serviceSet) dispatch(ctx context.Context, serviceName, methodName strin
 func (s *serviceSet) resolve(service, method string) (Method, error) {
 	srv, ok := s.services[service]
 	if !ok {
-		return nil, status.Errorf(codes.NotFound, "service %v", service)
+		return nil, status.Errorf(codes.Unimplemented, "service %v", service)
 	}
 
 	mthd, ok := srv.Methods[method]
 	if !ok {
-		return nil, status.Errorf(codes.NotFound, "method %v", method)
+		return nil, status.Errorf(codes.Unimplemented, "method %v", method)
 	}
 
 	return mthd, nil

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ func TestServer(t *testing.T) {`
`136`	`136`	`}`
`137`	`137`	`}`
`138`	`138`
`139`		`-func TestServerNotFound(t *testing.T) {`
	`139`	`+func TestServerUnimplemented(t *testing.T) {`
`140`	`140`	`var (`
`141`	`141`	`ctx = context.Background()`
`142`	`142`	`server = mustServer(t)(NewServer())`
`@@ -155,7 +155,7 @@ func TestServerNotFound(t *testing.T) {`
`155`	`155`	`t.Fatalf("expected error from non-existent service call")`
`156`	`156`	`} else if status, ok := status.FromError(err); !ok {`
`157`	`157`	`t.Fatalf("expected status present in error: %v", err)`
`158`		`- } else if status.Code() != codes.NotFound {`
	`158`	`+ } else if status.Code() != codes.Unimplemented {`
`159`	`159`	`t.Fatalf("expected not found for method")`
`160`	`160`	`}`
`161`	`161`
Original file line number	Diff line number	Diff line change
`@@ -116,12 +116,12 @@ func (s *serviceSet) dispatch(ctx context.Context, serviceName, methodName strin`
`116`	`116`	`func (s *serviceSet) resolve(service, method string) (Method, error) {`
`117`	`117`	`srv, ok := s.services[service]`
`118`	`118`	`if !ok {`
`119`		`- return nil, status.Errorf(codes.NotFound, "service %v", service)`
	`119`	`+ return nil, status.Errorf(codes.Unimplemented, "service %v", service)`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`mthd, ok := srv.Methods[method]`
`123`	`123`	`if !ok {`
`124`		`- return nil, status.Errorf(codes.NotFound, "method %v", method)`
	`124`	`+ return nil, status.Errorf(codes.Unimplemented, "method %v", method)`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`return mthd, nil`