reduce ptypes.Empty creation by defining it in as a var
Signed-off-by: Jin Dong <djdongjin95@gmail.com>
This commit is contained in:
parent
dacde84372
commit
9c34005724
@ -38,6 +38,8 @@ import (
|
|||||||
"google.golang.org/grpc/status"
|
"google.golang.org/grpc/status"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
var empty = &ptypes.Empty{}
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
registry.Register(&plugin.Registration{
|
registry.Register(&plugin.Registration{
|
||||||
Type: plugins.ServicePlugin,
|
Type: plugins.ServicePlugin,
|
||||||
@ -188,16 +190,16 @@ func (l *local) Delete(ctx context.Context, req *api.DeleteContainerRequest, _ .
|
|||||||
if err := l.withStoreUpdate(ctx, func(ctx context.Context) error {
|
if err := l.withStoreUpdate(ctx, func(ctx context.Context) error {
|
||||||
return l.Store.Delete(ctx, req.ID)
|
return l.Store.Delete(ctx, req.ID)
|
||||||
}); err != nil {
|
}); err != nil {
|
||||||
return &ptypes.Empty{}, errdefs.ToGRPC(err)
|
return empty, errdefs.ToGRPC(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := l.publisher.Publish(ctx, "/containers/delete", &eventstypes.ContainerDelete{
|
if err := l.publisher.Publish(ctx, "/containers/delete", &eventstypes.ContainerDelete{
|
||||||
ID: req.ID,
|
ID: req.ID,
|
||||||
}); err != nil {
|
}); err != nil {
|
||||||
return &ptypes.Empty{}, err
|
return empty, err
|
||||||
}
|
}
|
||||||
|
|
||||||
return &ptypes.Empty{}, nil
|
return empty, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (l *local) withStore(ctx context.Context, fn func(ctx context.Context) error) func(tx *bolt.Tx) error {
|
func (l *local) withStore(ctx context.Context, fn func(ctx context.Context) error) func(tx *bolt.Tx) error {
|
||||||
|
@ -36,6 +36,8 @@ import (
|
|||||||
"google.golang.org/grpc"
|
"google.golang.org/grpc"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
var empty = &ptypes.Empty{}
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
registry.Register(&plugin.Registration{
|
registry.Register(&plugin.Registration{
|
||||||
Type: plugins.GRPCPlugin,
|
Type: plugins.GRPCPlugin,
|
||||||
@ -84,7 +86,7 @@ func (s *service) Publish(ctx context.Context, r *api.PublishRequest) (*ptypes.E
|
|||||||
return nil, errdefs.ToGRPC(err)
|
return nil, errdefs.ToGRPC(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
return &ptypes.Empty{}, nil
|
return empty, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *service) Forward(ctx context.Context, r *api.ForwardRequest) (*ptypes.Empty, error) {
|
func (s *service) Forward(ctx context.Context, r *api.ForwardRequest) (*ptypes.Empty, error) {
|
||||||
@ -92,7 +94,7 @@ func (s *service) Forward(ctx context.Context, r *api.ForwardRequest) (*ptypes.E
|
|||||||
return nil, errdefs.ToGRPC(err)
|
return nil, errdefs.ToGRPC(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
return &ptypes.Empty{}, nil
|
return empty, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *service) Subscribe(req *api.SubscribeRequest, srv api.Events_SubscribeServer) error {
|
func (s *service) Subscribe(req *api.SubscribeRequest, srv api.Events_SubscribeServer) error {
|
||||||
|
@ -37,7 +37,7 @@ func (s *ttrpcService) Forward(ctx context.Context, r *api.ForwardRequest) (*pty
|
|||||||
return nil, errdefs.ToGRPC(err)
|
return nil, errdefs.ToGRPC(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
return &ptypes.Empty{}, nil
|
return empty, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func fromTProto(env *types.Envelope) *events.Envelope {
|
func fromTProto(env *types.Envelope) *events.Envelope {
|
||||||
|
@ -39,6 +39,8 @@ import (
|
|||||||
"github.com/containerd/plugin/registry"
|
"github.com/containerd/plugin/registry"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
var empty = &ptypes.Empty{}
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
registry.Register(&plugin.Registration{
|
registry.Register(&plugin.Registration{
|
||||||
Type: plugins.ServicePlugin,
|
Type: plugins.ServicePlugin,
|
||||||
@ -183,7 +185,7 @@ func (l *local) Delete(ctx context.Context, req *imagesapi.DeleteImageRequest, _
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return &ptypes.Empty{}, nil
|
return empty, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (l *local) emitSchema1DeprecationWarning(ctx context.Context, image *images.Image) {
|
func (l *local) emitSchema1DeprecationWarning(ctx context.Context, image *images.Image) {
|
||||||
|
@ -30,6 +30,8 @@ import (
|
|||||||
"google.golang.org/grpc"
|
"google.golang.org/grpc"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
var empty = &ptypes.Empty{}
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
registry.Register(&plugin.Registration{
|
registry.Register(&plugin.Registration{
|
||||||
Type: plugins.GRPCPlugin,
|
Type: plugins.GRPCPlugin,
|
||||||
@ -87,7 +89,7 @@ func (s *service) Delete(ctx context.Context, r *api.DeleteRequest) (*ptypes.Emp
|
|||||||
}, opts...); err != nil {
|
}, opts...); err != nil {
|
||||||
return nil, errdefs.ToGRPC(err)
|
return nil, errdefs.ToGRPC(err)
|
||||||
}
|
}
|
||||||
return &ptypes.Empty{}, nil
|
return empty, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *service) List(ctx context.Context, r *api.ListRequest) (*api.ListResponse, error) {
|
func (s *service) List(ctx context.Context, r *api.ListRequest) (*api.ListResponse, error) {
|
||||||
@ -117,7 +119,7 @@ func (s *service) AddResource(ctx context.Context, r *api.AddResourceRequest) (*
|
|||||||
}); err != nil {
|
}); err != nil {
|
||||||
return nil, errdefs.ToGRPC(err)
|
return nil, errdefs.ToGRPC(err)
|
||||||
}
|
}
|
||||||
return &ptypes.Empty{}, nil
|
return empty, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *service) DeleteResource(ctx context.Context, r *api.DeleteResourceRequest) (*ptypes.Empty, error) {
|
func (s *service) DeleteResource(ctx context.Context, r *api.DeleteResourceRequest) (*ptypes.Empty, error) {
|
||||||
@ -131,7 +133,7 @@ func (s *service) DeleteResource(ctx context.Context, r *api.DeleteResourceReque
|
|||||||
}); err != nil {
|
}); err != nil {
|
||||||
return nil, errdefs.ToGRPC(err)
|
return nil, errdefs.ToGRPC(err)
|
||||||
}
|
}
|
||||||
return &ptypes.Empty{}, nil
|
return empty, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *service) ListResources(ctx context.Context, r *api.ListResourcesRequest) (*api.ListResourcesResponse, error) {
|
func (s *service) ListResources(ctx context.Context, r *api.ListResourcesRequest) (*api.ListResourcesResponse, error) {
|
||||||
|
@ -37,6 +37,8 @@ import (
|
|||||||
"google.golang.org/grpc/status"
|
"google.golang.org/grpc/status"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
var empty = &ptypes.Empty{}
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
registry.Register(&plugin.Registration{
|
registry.Register(&plugin.Registration{
|
||||||
Type: plugins.ServicePlugin,
|
Type: plugins.ServicePlugin,
|
||||||
@ -206,17 +208,17 @@ func (l *local) Delete(ctx context.Context, req *api.DeleteNamespaceRequest, _ .
|
|||||||
if err := l.withStoreUpdate(ctx, func(ctx context.Context, store namespaces.Store) error {
|
if err := l.withStoreUpdate(ctx, func(ctx context.Context, store namespaces.Store) error {
|
||||||
return errdefs.ToGRPC(store.Delete(ctx, req.Name))
|
return errdefs.ToGRPC(store.Delete(ctx, req.Name))
|
||||||
}); err != nil {
|
}); err != nil {
|
||||||
return &ptypes.Empty{}, err
|
return empty, err
|
||||||
}
|
}
|
||||||
// set the namespace in the context before publishing the event
|
// set the namespace in the context before publishing the event
|
||||||
ctx = namespaces.WithNamespace(ctx, req.Name)
|
ctx = namespaces.WithNamespace(ctx, req.Name)
|
||||||
if err := l.publisher.Publish(ctx, "/namespaces/delete", &eventstypes.NamespaceDelete{
|
if err := l.publisher.Publish(ctx, "/namespaces/delete", &eventstypes.NamespaceDelete{
|
||||||
Name: req.Name,
|
Name: req.Name,
|
||||||
}); err != nil {
|
}); err != nil {
|
||||||
return &ptypes.Empty{}, err
|
return empty, err
|
||||||
}
|
}
|
||||||
|
|
||||||
return &ptypes.Empty{}, nil
|
return empty, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (l *local) withStore(ctx context.Context, fn func(ctx context.Context, store namespaces.Store) error) func(tx *bolt.Tx) error {
|
func (l *local) withStore(ctx context.Context, fn func(ctx context.Context, store namespaces.Store) error) func(tx *bolt.Tx) error {
|
||||||
|
@ -39,6 +39,8 @@ import (
|
|||||||
"google.golang.org/protobuf/types/known/emptypb"
|
"google.golang.org/protobuf/types/known/emptypb"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
var empty = &ptypes.Empty{}
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
registry.Register(&plugin.Registration{
|
registry.Register(&plugin.Registration{
|
||||||
Type: plugins.GRPCPlugin,
|
Type: plugins.GRPCPlugin,
|
||||||
@ -130,7 +132,7 @@ func (s *service) Transfer(ctx context.Context, req *transferapi.TransferRequest
|
|||||||
|
|
||||||
for _, t := range s.transferrers {
|
for _, t := range s.transferrers {
|
||||||
if err := t.Transfer(ctx, src, dst, transferOpts...); err == nil {
|
if err := t.Transfer(ctx, src, dst, transferOpts...); err == nil {
|
||||||
return &ptypes.Empty{}, nil
|
return empty, nil
|
||||||
} else if !errdefs.IsNotImplemented(err) {
|
} else if !errdefs.IsNotImplemented(err) {
|
||||||
return nil, errdefs.ToGRPC(err)
|
return nil, errdefs.ToGRPC(err)
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user