Merge pull request containerd#1769 from stevvooe/split-events-types

api/events: split event types from events service
zhuangqh · Nov 17, 2017 · 5c6e789 · 5c6e789
2 parents fc149f0 + 09b5ca1
commit 5c6e789
Show file tree

Hide file tree

Showing 31 changed files with 1,459 additions and 1,441 deletions.
diff --git a/Protobuild.toml b/Protobuild.toml
@@ -31,6 +31,11 @@ plugins = ["grpc", "fieldpath"]
   "google/protobuf/duration.proto" = "github.com/gogo/protobuf/types"
   "google/rpc/status.proto" = "github.com/containerd/containerd/protobuf/google/rpc"
 
+[[overrides]]
+
+prefixes = ["github.com/containerd/containerd/api/events"]
+plugins = ["fieldpath"]
+
 # Aggregrate the API descriptors to lock down API changes.
 [[descriptors]]
 prefix = "github.com/containerd/containerd/api"

diff --git a/api/services/events/v1/container.pb.go → api/events/container.pb.go b/api/services/events/v1/container.pb.go → api/events/container.pb.go
diff --git a/api/services/events/v1/container.proto → api/events/container.proto b/api/services/events/v1/container.proto → api/events/container.proto
@@ -1,12 +1,12 @@
 syntax = "proto3";
 
-package containerd.services.events.v1;
+package containerd.events;
 
 import "gogoproto/gogo.proto";
 import "google/protobuf/any.proto";
 import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
 
-option go_package = "github.com/containerd/containerd/api/services/events/v1;events";
+option go_package = "github.com/containerd/containerd/api/events;events";
 option (containerd.plugin.fieldpath_all) = true;
 
 message ContainerCreate {

diff --git a/api/services/events/v1/content.pb.go → api/events/content.pb.go b/api/services/events/v1/content.pb.go → api/events/content.pb.go
diff --git a/api/services/events/v1/content.proto → api/events/content.proto b/api/services/events/v1/content.proto → api/events/content.proto
@@ -1,11 +1,11 @@
 syntax = "proto3";
 
-package containerd.services.events.v1;
+package containerd.events;
 
 import "gogoproto/gogo.proto";
 import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
 
-option go_package = "github.com/containerd/containerd/api/services/events/v1;events";
+option go_package = "github.com/containerd/containerd/api/events;events";
 option (containerd.plugin.fieldpath_all) = true;
 
 message ContentDelete {

diff --git a/api/events/doc.go b/api/events/doc.go
@@ -0,0 +1,3 @@
+// Package events has protobuf types for various events that are used in
+// containerd.
+package events
diff --git a/api/services/events/v1/image.pb.go → api/events/image.pb.go b/api/services/events/v1/image.pb.go → api/events/image.pb.go
diff --git a/api/services/events/v1/image.proto → api/events/image.proto b/api/services/events/v1/image.proto → api/events/image.proto
@@ -4,7 +4,7 @@ package containerd.services.images.v1;
 
 import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
 
-option go_package = "github.com/containerd/containerd/api/services/events/v1;events";
+option go_package = "github.com/containerd/containerd/api/events;events";
 option (containerd.plugin.fieldpath_all) = true;
 
 message ImageCreate {