Remove all gogoproto extensions

This commit removes the following gogoproto extensions;

- gogoproto.nullable
- gogoproto.customename
- gogoproto.unmarshaller_all
- gogoproto.stringer_all
- gogoproto.sizer_all
- gogoproto.marshaler_all
- gogoproto.goproto_unregonized_all
- gogoproto.goproto_stringer_all
- gogoproto.goproto_getters_all

None of them are supported by Google's toolchain (see #6564).

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
This commit is contained in:
Kazuyoshi Kato
2022-04-20 03:30:52 +00:00
parent 9b33526ef6
commit 237ef0de9b
48 changed files with 1301 additions and 1246 deletions

View File

@@ -24,8 +24,8 @@ import (
"github.com/containerd/typeurl"
)
func containersToProto(containers []containers.Container) []api.Container {
var containerspb []api.Container
func containersToProto(containers []containers.Container) []*api.Container {
var containerspb []*api.Container
for _, image := range containers {
image := image
@@ -35,12 +35,12 @@ func containersToProto(containers []containers.Container) []api.Container {
return containerspb
}
func containerToProto(container *containers.Container) api.Container {
extensions := make(map[string]types.Any)
func containerToProto(container *containers.Container) *api.Container {
extensions := make(map[string]*types.Any)
for k, v := range container.Extensions {
extensions[k] = *protobuf.FromAny(v)
extensions[k] = protobuf.FromAny(v)
}
return api.Container{
return &api.Container{
ID: container.ID,
Labels: container.Labels,
Image: container.Image,
@@ -69,7 +69,7 @@ func containerFromProto(containerpb *api.Container) containers.Container {
extensions := make(map[string]typeurl.Any)
for k, v := range containerpb.Extensions {
v := v
extensions[k] = &v
extensions[k] = v
}
return containers.Container{
ID: containerpb.ID,