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

cmd/ctr, service/containers: implement container filter

Browse Source 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
This commit is contained in:
Stephen J Day
2017-06-21 15:29:58 -07:00
parent 3332042ab6
commit 396d89e423
16 changed files with 409 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
services/containers/helpers.go
View File

@@ -35,15 +35,25 @@ func containerToProto(container *containers.Container) api.Container {
}
func containerFromProto(containerpb *api.Container) containers.Container {
return containers.Container{
ID: containerpb.ID,
Labels: containerpb.Labels,
Image: containerpb.Image,
Runtime: containers.RuntimeInfo{
var runtime containers.RuntimeInfo
if containerpb.Runtime != nil {
runtime = containers.RuntimeInfo{
Name: containerpb.Runtime.Name,
Options: containerpb.Runtime.Options,
},
Spec: containerpb.Spec.Value,
RootFS: containerpb.RootFS,
}
}
var spec []byte
if containerpb.Spec != nil {
spec = containerpb.Spec.Value
}
return containers.Container{
ID: containerpb.ID,
Labels: containerpb.Labels,
Image: containerpb.Image,
Runtime: runtime,
Spec: spec,
RootFS: containerpb.RootFS,
}
}

50
services/containers/service.go
View File

@@ -1,12 +1,15 @@
package containers
import (
"strings"
"github.com/boltdb/bolt"
api "github.com/containerd/containerd/api/services/containers/v1"
eventsapi "github.com/containerd/containerd/api/services/events/v1"
"github.com/containerd/containerd/containers"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/events"
"github.com/containerd/containerd/filters"
"github.com/containerd/containerd/metadata"
"github.com/containerd/containerd/plugin"
"github.com/golang/protobuf/ptypes/empty"
@@ -65,8 +68,18 @@ func (s *Service) Get(ctx context.Context, req *api.GetContainerRequest) (*api.G
func (s *Service) List(ctx context.Context, req *api.ListContainersRequest) (*api.ListContainersResponse, error) {
var resp api.ListContainersResponse
var fs []filters.Filter
for _, s := range req.Filters {
f, err := filters.Parse(s)
if err != nil {
return nil, grpc.Errorf(codes.InvalidArgument, err.Error())
}
fs = append(fs, f)
}
return &resp, errdefs.ToGRPC(s.withStoreView(ctx, func(ctx context.Context, store containers.Store) error {
containers, err := store.List(ctx, req.Filter)
containers, err := store.List(ctx, fs...)
if err != nil {
return err
}
@@ -108,18 +121,20 @@ func (s *Service) Create(ctx context.Context, req *api.CreateContainerRequest) (
}
func (s *Service) Update(ctx context.Context, req *api.UpdateContainerRequest) (*api.UpdateContainerResponse, error) {
var resp api.UpdateContainerResponse
var (
resp api.UpdateContainerResponse
incoming = containerFromProto(&req.Container)
)
if err := s.withStoreUpdate(ctx, func(ctx context.Context, store containers.Store) error {
container := containerFromProto(&req.Container)
current, err := store.Get(ctx, container.ID)
container, err := store.Get(ctx, incoming.ID)
if err != nil {
return err
}
if current.ID != container.ID {
return grpc.Errorf(codes.InvalidArgument, "container ids must match: %v != %v", current.ID, container.ID)
if container.ID != incoming.ID {
return grpc.Errorf(codes.InvalidArgument, "container ids must match: %v != %v", container.ID, incoming.ID)
}
// apply the field mask. If you update this code, you better follow the
@@ -127,34 +142,39 @@ func (s *Service) Update(ctx context.Context, req *api.UpdateContainerRequest) (
// is, do not update this code.
if req.UpdateMask != nil && len(req.UpdateMask.Paths) > 0 {
for _, path := range req.UpdateMask.Paths {
if strings.HasPrefix(path, "labels.") {
key := strings.TrimPrefix(path, "labels.")
container.Labels[key] = incoming.Labels[key]
continue
}
switch path {
case "labels":
current.Labels = container.Labels
container.Labels = incoming.Labels
case "image":
current.Image = container.Image
container.Image = incoming.Image
case "runtime":
// TODO(stevvooe): Should this actually be allowed?
current.Runtime = container.Runtime
container.Runtime = incoming.Runtime
case "spec":
current.Spec = container.Spec
container.Spec = incoming.Spec
case "rootfs":
current.RootFS = container.RootFS
container.RootFS = incoming.RootFS
default:
return grpc.Errorf(codes.InvalidArgument, "cannot update %q field", path)
}
}
} else {
// no field mask present, just replace everything
current = container
container = incoming
}
created, err := store.Update(ctx, container)
updated, err := store.Update(ctx, container)
if err != nil {
return err
}
resp.Container = containerToProto(&created)
resp.Container = containerToProto(&updated)
return nil
}); err != nil {
return &resp, errdefs.ToGRPC(err)