|
@@ -680,13 +680,14 @@ func (s *Server) CreateService(ctx context.Context, request *api.CreateServiceRe
|
|
|
|
|
|
return store.CreateService(tx, service)
|
|
return store.CreateService(tx, service)
|
|
})
|
|
})
|
|
- if err != nil {
|
|
|
|
|
|
+ switch err {
|
|
|
|
+ case store.ErrNameConflict:
|
|
|
|
+ return nil, status.Errorf(codes.AlreadyExists, "service %s already exists", request.Spec.Annotations.Name)
|
|
|
|
+ case nil:
|
|
|
|
+ return &api.CreateServiceResponse{Service: service}, nil
|
|
|
|
+ default:
|
|
return nil, err
|
|
return nil, err
|
|
}
|
|
}
|
|
-
|
|
|
|
- return &api.CreateServiceResponse{
|
|
|
|
- Service: service,
|
|
|
|
- }, nil
|
|
|
|
}
|
|
}
|
|
|
|
|
|
// GetService returns a Service given a ServiceID.
|
|
// GetService returns a Service given a ServiceID.
|
|
@@ -896,7 +897,12 @@ func (s *Server) ListServices(ctx context.Context, request *api.ListServicesRequ
|
|
}
|
|
}
|
|
})
|
|
})
|
|
if err != nil {
|
|
if err != nil {
|
|
- return nil, err
|
|
|
|
|
|
+ switch err {
|
|
|
|
+ case store.ErrInvalidFindBy:
|
|
|
|
+ return nil, status.Errorf(codes.InvalidArgument, err.Error())
|
|
|
|
+ default:
|
|
|
|
+ return nil, err
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
if request.Filters != nil {
|
|
if request.Filters != nil {
|