Remove gogoproto.stdtime

This commit removes gogoproto.stdtime, since it is not supported by
Google's official toolchain
(see https://github.com/containerd/containerd/issues/6564).

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
This commit is contained in:
Kazuyoshi Kato
2022-04-18 22:12:15 +00:00
parent 26a3ab446b
commit 80b825ca2c
71 changed files with 1803 additions and 1594 deletions

View File

@@ -26,6 +26,7 @@ import (
eventstypes "github.com/containerd/containerd/api/events"
"github.com/containerd/containerd/api/types/task"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/protobuf"
"github.com/containerd/containerd/runtime"
shim "github.com/containerd/containerd/runtime/v1/shim/v1"
"github.com/containerd/ttrpc"
@@ -150,7 +151,7 @@ func (p *Process) Wait(ctx context.Context) (*runtime.Exit, error) {
return nil, err
}
return &runtime.Exit{
Timestamp: r.ExitedAt,
Timestamp: protobuf.FromTimestamp(r.ExitedAt),
Status: r.ExitStatus,
}, nil
}
@@ -165,7 +166,7 @@ func (p *Process) Delete(ctx context.Context) (*runtime.Exit, error) {
}
return &runtime.Exit{
Status: r.ExitStatus,
Timestamp: r.ExitedAt,
Timestamp: protobuf.FromTimestamp(r.ExitedAt),
Pid: r.Pid,
}, nil
}

View File

@@ -463,7 +463,7 @@ func (r *Runtime) cleanupAfterDeadShim(ctx context.Context, bundle *bundle, ns,
ID: id,
Pid: uint32(pid),
ExitStatus: 128 + uint32(unix.SIGKILL),
ExitedAt: exitedAt,
ExitedAt: protobuf.ToTimestamp(exitedAt),
})
r.tasks.Delete(ctx, id)
@@ -479,7 +479,7 @@ func (r *Runtime) cleanupAfterDeadShim(ctx context.Context, bundle *bundle, ns,
ContainerID: id,
Pid: uint32(pid),
ExitStatus: 128 + uint32(unix.SIGKILL),
ExitedAt: exitedAt,
ExitedAt: protobuf.ToTimestamp(exitedAt),
})
return nil

View File

@@ -117,7 +117,7 @@ func (t *Task) Delete(ctx context.Context) (*runtime.Exit, error) {
})
return &runtime.Exit{
Status: rsp.ExitStatus,
Timestamp: rsp.ExitedAt,
Timestamp: protobuf.FromTimestamp(rsp.ExitedAt),
Pid: rsp.Pid,
}, nil
}
@@ -173,7 +173,7 @@ func (t *Task) State(ctx context.Context) (runtime.State, error) {
Stderr: response.Stderr,
Terminal: response.Terminal,
ExitStatus: response.ExitStatus,
ExitedAt: response.ExitedAt,
ExitedAt: protobuf.FromTimestamp(response.ExitedAt),
}, nil
}
@@ -348,7 +348,7 @@ func (t *Task) Wait(ctx context.Context) (*runtime.Exit, error) {
return nil, err
}
return &runtime.Exit{
Timestamp: r.ExitedAt,
Timestamp: protobuf.FromTimestamp(r.ExitedAt),
Status: r.ExitStatus,
}, nil
}