github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Update lease service errors

Browse Source 
Ensure delete returns a typed error on not found

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
This commit is contained in:
Derek McGowan
2018-07-24 14:49:23 -07:00
parent 94e132fd07
commit b760cee65a
4 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
leases/proxy/manager.go
View File

@@ -20,6 +20,7 @@ import (
"context"
leasesapi "github.com/containerd/containerd/api/services/leases/v1"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/leases"
)
@@ -47,7 +48,7 @@ func (pm *proxyManager) Create(ctx context.Context, opts ...leases.Opt) (leases.
Labels: l.Labels,
})
if err != nil {
return leases.Lease{}, err
return leases.Lease{}, errdefs.FromGRPC(err)
}
return leases.Lease{
@@ -69,7 +70,7 @@ func (pm *proxyManager) Delete(ctx context.Context, l leases.Lease, opts ...leas
ID: l.ID,
Sync: do.Synchronous,
})
return err
return errdefs.FromGRPC(err)
}
func (pm *proxyManager) List(ctx context.Context, filters ...string) ([]leases.Lease, error) {
@@ -77,7 +78,7 @@ func (pm *proxyManager) List(ctx context.Context, filters ...string) ([]leases.L
Filters: filters,
})
if err != nil {
return nil, err
return nil, errdefs.FromGRPC(err)
}
l := make([]leases.Lease, len(resp.Leases))
for i := range resp.Leases {