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

Remove all gogoproto extensions

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

14
services/containers/helpers.go
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,

8
services/containers/local.go
View File

@@ -117,7 +117,7 @@ func (l *local) Create(ctx context.Context, req *api.CreateContainerRequest, _ .
var resp api.CreateContainerResponse
if err := l.withStoreUpdate(ctx, func(ctx context.Context) error {
container := containerFromProto(&req.Container)
container := containerFromProto(req.Container)
created, err := l.Store.Create(ctx, container)
if err != nil {
@@ -150,7 +150,7 @@ func (l *local) Update(ctx context.Context, req *api.UpdateContainerRequest, _ .
}
var (
resp api.UpdateContainerResponse
container = containerFromProto(&req.Container)
container = containerFromProto(req.Container)
)
if err := l.withStoreUpdate(ctx, func(ctx context.Context) error {
@@ -214,7 +214,7 @@ func (l *local) withStoreUpdate(ctx context.Context, fn func(ctx context.Context
type localStream struct {
ctx context.Context
containers []api.Container
containers []*api.Container
i int
}
@@ -225,7 +225,7 @@ func (s *localStream) Recv() (*api.ListContainerMessage, error) {
c := s.containers[s.i]
s.i++
return &api.ListContainerMessage{
Container: &c,
Container: c,
}, nil
}