X Tutup
Skip to content

Commit 296f75b

Browse files
author
Kazuyoshi Kato
committed
Do not use weak import
According to protocolbuffers/protobuf#9184 > Weak fields are an old and deprecated internal-only feature that we never > open sourced. This blocks us to upgrade protoc. Fixes containerd#6232. Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
1 parent d128c37 commit 296f75b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+936
-940
lines changed

‎api/events/container.pb.go‎

Lines changed: 29 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/events/container.proto‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ syntax = "proto3";
1919
package containerd.events;
2020

2121
import "google/protobuf/any.proto";
22-
import weak "gogoproto/gogo.proto";
23-
import weak "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
22+
import "gogoproto/gogo.proto";
23+
import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
2424

2525
option go_package = "github.com/containerd/containerd/api/events;events";
2626
option (containerd.plugin.fieldpath_all) = true;

‎api/events/content.pb.go‎

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/events/content.proto‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ syntax = "proto3";
1818

1919
package containerd.events;
2020

21-
import weak "gogoproto/gogo.proto";
22-
import weak "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
21+
import "gogoproto/gogo.proto";
22+
import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
2323

2424
option go_package = "github.com/containerd/containerd/api/events;events";
2525
option (containerd.plugin.fieldpath_all) = true;

‎api/events/image.pb.go‎

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/events/image.proto‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ syntax = "proto3";
1818

1919
package containerd.services.images.v1;
2020

21-
import weak "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
21+
import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
2222

2323
option go_package = "github.com/containerd/containerd/api/events;events";
2424
option (containerd.plugin.fieldpath_all) = true;

‎api/events/namespace.pb.go‎

Lines changed: 5 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/events/namespace.proto‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ syntax = "proto3";
1818

1919
package containerd.events;
2020

21-
import weak "gogoproto/gogo.proto";
22-
import weak "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
21+
import "gogoproto/gogo.proto";
22+
import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
2323

2424
option go_package = "github.com/containerd/containerd/api/events;events";
2525
option (containerd.plugin.fieldpath_all) = true;

‎api/events/snapshot.pb.go‎

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/events/snapshot.proto‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ syntax = "proto3";
1818

1919
package containerd.events;
2020

21-
import weak "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
21+
import "github.com/containerd/containerd/protobuf/plugin/fieldpath.proto";
2222

2323
option go_package = "github.com/containerd/containerd/api/events;events";
2424
option (containerd.plugin.fieldpath_all) = true;

0 commit comments

Comments
 (0)
X Tutup