Merge pull request #6558 from kzys/no-weak-import

Do not use weak import
containerd · Mar 1, 2022 · 82bce32 · 82bce32
2 parents f57d1cf 296f75b
commit 82bce32
Show file tree

Hide file tree

Showing 57 changed files with 936 additions and 940 deletions.
diff --git a/api/events/container.pb.go b/api/events/container.pb.go
diff --git a/api/events/container.proto b/api/events/container.proto
@@ -19,8  19,8 @@ syntax = "proto3";
 package containerd.events;
 
 import "google/protobuf/any.proto";
-import weak "gogoproto/gogo.proto";
-import weak "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
 import "gogoproto/gogo.proto";
 import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
 
 option go_package = "github.com/containerd/containerd/api/events;events";
 option (containerd.plugin.fieldpath_all) = true;

diff --git a/api/events/content.pb.go b/api/events/content.pb.go
diff --git a/api/events/content.proto b/api/events/content.proto
@@ -18,8  18,8 @@ syntax = "proto3";
 
 package containerd.events;
 
-import weak "gogoproto/gogo.proto";
-import weak "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
 import "gogoproto/gogo.proto";
 import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
 
 option go_package = "github.com/containerd/containerd/api/events;events";
 option (containerd.plugin.fieldpath_all) = true;

diff --git a/api/events/image.pb.go b/api/events/image.pb.go
diff --git a/api/events/image.proto b/api/events/image.proto
@@ -18,7  18,7 @@ syntax = "proto3";
 
 package containerd.services.images.v1;
 
-import weak "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
 import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
 
 option go_package = "github.com/containerd/containerd/api/events;events";
 option (containerd.plugin.fieldpath_all) = true;

diff --git a/api/events/namespace.pb.go b/api/events/namespace.pb.go
diff --git a/api/events/namespace.proto b/api/events/namespace.proto
@@ -18,8  18,8 @@ syntax = "proto3";
 
 package containerd.events;
 
-import weak "gogoproto/gogo.proto";
-import weak "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
 import "gogoproto/gogo.proto";
 import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
 
 option go_package = "github.com/containerd/containerd/api/events;events";
 option (containerd.plugin.fieldpath_all) = true;

diff --git a/api/events/snapshot.pb.go b/api/events/snapshot.pb.go
diff --git a/api/events/snapshot.proto b/api/events/snapshot.proto
@@ -18,7  18,7 @@ syntax = "proto3";
 
 package containerd.events;
 
-import weak "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
 import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
 
 option go_package = "github.com/containerd/containerd/api/events;events";
 option (containerd.plugin.fieldpath_all) = true;