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

events: move types into service package

Browse Source 
When using events, it was found to be fairly unwieldy with a number of
extra packages. For the most part, when interacting with the events
service, we want types of the same version of the service. This has been
accomplished by moving all events types into the events package.

In addition, several fixes to the way events are marshaled have been
included. Specifically, we defer to the protobuf type registration
system to assemble events and type urls, with a little bit sheen on top
of add a containerd.io oriented namespace.

This has resulted in much cleaner event consumption and has removed the
reliance on error prone type urls, in favor of concrete types.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
This commit is contained in:
Stephen J Day
2017-06-22 19:12:25 -07:00
parent c4da4ed393
commit c05be46348
32 changed files with 642 additions and 900 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/containers/service.go
View File

@@ -3,7 +3,7 @@ package containers
import (
"github.com/boltdb/bolt"
api "github.com/containerd/containerd/api/services/containers/v1"
"github.com/containerd/containerd/api/types/event"
eventsapi "github.com/containerd/containerd/api/services/events/v1"
"github.com/containerd/containerd/containers"
"github.com/containerd/containerd/events"
"github.com/containerd/containerd/metadata"
@@ -93,10 +93,10 @@ func (s *Service) Create(ctx context.Context, req *api.CreateContainerRequest) (
}); err != nil {
return &resp, err
}
if err := s.emit(ctx, "/containers/create", event.ContainerCreate{
if err := s.emit(ctx, "/containers/create", &eventsapi.ContainerCreate{
ContainerID: resp.Container.ID,
Image: resp.Container.Image,
Runtime: &event.ContainerCreate_Runtime{
Runtime: &eventsapi.ContainerCreate_Runtime{
Name: resp.Container.Runtime.Name,
Options: resp.Container.Runtime.Options,
},
@@ -160,7 +160,7 @@ func (s *Service) Update(ctx context.Context, req *api.UpdateContainerRequest) (
return &resp, err
}
if err := s.emit(ctx, "/containers/update", event.ContainerUpdate{
if err := s.emit(ctx, "/containers/update", &eventsapi.ContainerUpdate{
ContainerID: resp.Container.ID,
Image: resp.Container.Image,
Labels: resp.Container.Labels,
@@ -179,7 +179,7 @@ func (s *Service) Delete(ctx context.Context, req *api.DeleteContainerRequest) (
return &empty.Empty{}, mapGRPCError(err, req.ID)
}
if err := s.emit(ctx, "/containers/delete", event.ContainerDelete{
if err := s.emit(ctx, "/containers/delete", &eventsapi.ContainerDelete{
ContainerID: req.ID,
}); err != nil {
return &empty.Empty{}, err

4
services/content/service.go
View File

@@ -6,7 +6,7 @@ import (
"github.com/Sirupsen/logrus"
api "github.com/containerd/containerd/api/services/content/v1"
"github.com/containerd/containerd/api/types/event"
eventsapi "github.com/containerd/containerd/api/services/events/v1"
"github.com/containerd/containerd/content"
"github.com/containerd/containerd/events"
"github.com/containerd/containerd/log"
@@ -128,7 +128,7 @@ func (s *Service) Delete(ctx context.Context, req *api.DeleteContentRequest) (*e
return nil, serverErrorToGRPC(err, req.Digest.String())
}
if err := s.emit(ctx, "/content/delete", event.ContentDelete{
if err := s.emit(ctx, "/content/delete", &eventsapi.ContentDelete{
Digest: req.Digest,
}); err != nil {
return nil, err

6
services/images/service.go
View File

@@ -2,8 +2,8 @@ package images
import (
"github.com/boltdb/bolt"
eventsapi "github.com/containerd/containerd/api/services/events/v1"
imagesapi "github.com/containerd/containerd/api/services/images/v1"
"github.com/containerd/containerd/api/types/event"
"github.com/containerd/containerd/events"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/metadata"
@@ -69,7 +69,7 @@ func (s *Service) Update(ctx context.Context, req *imagesapi.UpdateImageRequest)
return nil, err
}
if err := s.emit(ctx, "/images/update", event.ImageUpdate{
if err := s.emit(ctx, "/images/update", &eventsapi.ImageUpdate{
Name: req.Image.Name,
Labels: req.Image.Labels,
}); err != nil {
@@ -103,7 +103,7 @@ func (s *Service) Delete(ctx context.Context, req *imagesapi.DeleteImageRequest)
return nil, err
}
if err := s.emit(ctx, "/images/delete", event.ImageDelete{
if err := s.emit(ctx, "/images/delete", &eventsapi.ImageDelete{
Name: req.Name,
}); err != nil {
return nil, err

8
services/namespaces/service.go
View File

@@ -4,8 +4,8 @@ import (
"strings"
"github.com/boltdb/bolt"
eventsapi "github.com/containerd/containerd/api/services/events/v1"
api "github.com/containerd/containerd/api/services/namespaces/v1"
"github.com/containerd/containerd/api/types/event"
"github.com/containerd/containerd/events"
"github.com/containerd/containerd/metadata"
"github.com/containerd/containerd/namespaces"
@@ -118,7 +118,7 @@ func (s *Service) Create(ctx context.Context, req *api.CreateNamespaceRequest) (
return &resp, err
}
if err := s.emit(ctx, "/namespaces/create", event.NamespaceCreate{
if err := s.emit(ctx, "/namespaces/create", &eventsapi.NamespaceCreate{
Name: req.Namespace.Name,
Labels: req.Namespace.Labels,
}); err != nil {
@@ -171,7 +171,7 @@ func (s *Service) Update(ctx context.Context, req *api.UpdateNamespaceRequest) (
return &resp, err
}
if err := s.emit(ctx, "/namespaces/update", event.NamespaceUpdate{
if err := s.emit(ctx, "/namespaces/update", &eventsapi.NamespaceUpdate{
Name: req.Namespace.Name,
Labels: req.Namespace.Labels,
}); err != nil {
@@ -188,7 +188,7 @@ func (s *Service) Delete(ctx context.Context, req *api.DeleteNamespaceRequest) (
return &empty.Empty{}, err
}
if err := s.emit(ctx, "/namespaces/delete", event.NamespaceDelete{
if err := s.emit(ctx, "/namespaces/delete", &eventsapi.NamespaceDelete{
Name: req.Name,
}); err != nil {
return &empty.Empty{}, err

8
services/snapshot/service.go
View File

@@ -3,8 +3,8 @@ package snapshot
import (
gocontext "context"
eventsapi "github.com/containerd/containerd/api/services/events/v1"
snapshotapi "github.com/containerd/containerd/api/services/snapshot/v1"
"github.com/containerd/containerd/api/types/event"
mounttypes "github.com/containerd/containerd/api/types/mount"
"github.com/containerd/containerd/events"
"github.com/containerd/containerd/log"
@@ -63,7 +63,7 @@ func (s *service) Prepare(ctx context.Context, pr *snapshotapi.PrepareSnapshotRe
return nil, grpcError(err)
}
if err := s.emit(ctx, "/snapshot/prepare", event.SnapshotPrepare{
if err := s.emit(ctx, "/snapshot/prepare", &eventsapi.SnapshotPrepare{
Key: pr.Key,
Parent: pr.Parent,
}); err != nil {
@@ -108,7 +108,7 @@ func (s *service) Commit(ctx context.Context, cr *snapshotapi.CommitSnapshotRequ
return nil, grpcError(err)
}
if err := s.emit(ctx, "/snapshot/commit", event.SnapshotCommit{
if err := s.emit(ctx, "/snapshot/commit", &eventsapi.SnapshotCommit{
Key: cr.Key,
Name: cr.Name,
}); err != nil {
@@ -125,7 +125,7 @@ func (s *service) Remove(ctx context.Context, rr *snapshotapi.RemoveSnapshotRequ
return nil, grpcError(err)
}
if err := s.emit(ctx, "/snapshot/remove", event.SnapshotRemove{
if err := s.emit(ctx, "/snapshot/remove", &eventsapi.SnapshotRemove{
Key: rr.Key,
}); err != nil {
return nil, err

8
services/tasks/service.go
View File

@@ -9,9 +9,9 @@ import (
"path/filepath"
"github.com/boltdb/bolt"
eventsapi "github.com/containerd/containerd/api/services/events/v1"
api "github.com/containerd/containerd/api/services/tasks/v1"
"github.com/containerd/containerd/api/types/descriptor"
"github.com/containerd/containerd/api/types/event"
"github.com/containerd/containerd/api/types/task"
"github.com/containerd/containerd/archive"
"github.com/containerd/containerd/containers"
@@ -154,7 +154,7 @@ func (s *Service) Create(ctx context.Context, r *api.CreateTaskRequest) (*api.Cr
log.G(ctx).Error(err)
}
if err := s.emit(ctx, "/tasks/create", event.TaskCreate{
if err := s.emit(ctx, "/tasks/create", &eventsapi.TaskCreate{
ContainerID: r.ContainerID,
}); err != nil {
return nil, err
@@ -175,7 +175,7 @@ func (s *Service) Start(ctx context.Context, r *api.StartTaskRequest) (*google_p
return nil, err
}
if err := s.emit(ctx, "/tasks/start", event.TaskStart{
if err := s.emit(ctx, "/tasks/start", &eventsapi.TaskStart{
ContainerID: r.ContainerID,
}); err != nil {
return nil, err
@@ -197,7 +197,7 @@ func (s *Service) Delete(ctx context.Context, r *api.DeleteTaskRequest) (*api.De
if err != nil {
return nil, err
}
if err := s.emit(ctx, "/tasks/delete", event.TaskDelete{
if err := s.emit(ctx, "/tasks/delete", &eventsapi.TaskDelete{
ContainerID: r.ContainerID,
Pid: exit.Pid,
ExitStatus: exit.Status,