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

Remove gogoproto.stdtime

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

7
runtime/v2/process.go
View File

@@ -22,6 +22,7 @@ import (
tasktypes "github.com/containerd/containerd/api/types/task"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/protobuf"
"github.com/containerd/containerd/runtime"
"github.com/containerd/containerd/runtime/v2/task"
"github.com/containerd/ttrpc"
@@ -84,7 +85,7 @@ func (p *process) 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
}
@@ -137,7 +138,7 @@ func (p *process) Wait(ctx context.Context) (*runtime.Exit, error) {
return nil, errdefs.FromGRPC(err)
}
return &runtime.Exit{
Timestamp: response.ExitedAt,
Timestamp: protobuf.FromTimestamp(response.ExitedAt),
Status: response.ExitStatus,
}, nil
}
@@ -152,7 +153,7 @@ func (p *process) Delete(ctx context.Context) (*runtime.Exit, error) {
}
return &runtime.Exit{
Status: response.ExitStatus,
Timestamp: response.ExitedAt,
Timestamp: protobuf.FromTimestamp(response.ExitedAt),
Pid: response.Pid,
}, nil
}