Skip to content

[Test Only]Update errdefs v0.2.0 #2265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
pacoxu wants to merge 2 commits into from
Closed

[Test Only]Update errdefs v0.2.0 #2265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e0f12d
update errdefs v0.2.0
yankay Sep 12, 2024
bea7719
update containerd to v1.7.22
pacoxu Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- name: Run golangci-lint
uses: golangci/golangci-lint-action@v6
with:
version: v1.54
version: v1.60
args: >-
--verbose
--max-issues-per-linter=0
Expand Down
44 changes: 22 additions & 22 deletions cmd/containerd-shim-runhcs-v1/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"time"

task "github.com/containerd/containerd/api/runtime/task/v2"
"github.com/containerd/errdefs"
"github.com/containerd/errdefs/errgrpc"
"go.opencensus.io/trace"
"google.golang.org/protobuf/types/known/emptypb"

Expand Down Expand Up @@ -120,7 +120,7 @@ func (s *service) State(ctx context.Context, req *task.StateRequest) (resp *task
}

r, e := s.stateInternal(ctx, req)
return r, errdefs.ToGRPC(e)
return r, errgrpc.ToGRPC(e)
}

func (s *service) Create(ctx context.Context, req *task.CreateTaskRequest) (resp *task.CreateTaskResponse, err error) {
Expand Down Expand Up @@ -150,7 +150,7 @@ func (s *service) Create(ctx context.Context, req *task.CreateTaskRequest) (resp
}

r, e := s.createInternal(ctx, req)
return r, errdefs.ToGRPC(e)
return r, errgrpc.ToGRPC(e)
}

func (s *service) Start(ctx context.Context, req *task.StartRequest) (resp *task.StartResponse, err error) {
Expand All @@ -172,7 +172,7 @@ func (s *service) Start(ctx context.Context, req *task.StartRequest) (resp *task
}

r, e := s.startInternal(ctx, req)
return r, errdefs.ToGRPC(e)
return r, errgrpc.ToGRPC(e)
}

func (s *service) Delete(ctx context.Context, req *task.DeleteRequest) (resp *task.DeleteResponse, err error) {
Expand All @@ -197,7 +197,7 @@ func (s *service) Delete(ctx context.Context, req *task.DeleteRequest) (resp *ta
}

r, e := s.deleteInternal(ctx, req)
return r, errdefs.ToGRPC(e)
return r, errgrpc.ToGRPC(e)
}

func (s *service) Pids(ctx context.Context, req *task.PidsRequest) (_ *task.PidsResponse, err error) {
Expand All @@ -212,7 +212,7 @@ func (s *service) Pids(ctx context.Context, req *task.PidsRequest) (_ *task.Pids
}

r, e := s.pidsInternal(ctx, req)
return r, errdefs.ToGRPC(e)
return r, errgrpc.ToGRPC(e)
}

func (s *service) Pause(ctx context.Context, req *task.PauseRequest) (_ *emptypb.Empty, err error) {
Expand All @@ -227,7 +227,7 @@ func (s *service) Pause(ctx context.Context, req *task.PauseRequest) (_ *emptypb
}

r, e := s.pauseInternal(ctx, req)
return r, errdefs.ToGRPC(e)
return r, errgrpc.ToGRPC(e)
}

func (s *service) Resume(ctx context.Context, req *task.ResumeRequest) (_ *emptypb.Empty, err error) {
Expand All @@ -242,7 +242,7 @@ func (s *service) Resume(ctx context.Context, req *task.ResumeRequest) (_ *empty
}

r, e := s.resumeInternal(ctx, req)
return r, errdefs.ToGRPC(e)
return r, errgrpc.ToGRPC(e)
}

func (s *service) Checkpoint(ctx context.Context, req *task.CheckpointTaskRequest) (_ *emptypb.Empty, err error) {
Expand All @@ -259,7 +259,7 @@ func (s *service) Checkpoint(ctx context.Context, req *task.CheckpointTaskReques
}

r, e := s.checkpointInternal(ctx, req)
return r, errdefs.ToGRPC(e)
return r, errgrpc.ToGRPC(e)
}

func (s *service) Kill(ctx context.Context, req *task.KillRequest) (_ *emptypb.Empty, err error) {
Expand All @@ -278,7 +278,7 @@ func (s *service) Kill(ctx context.Context, req *task.KillRequest) (_ *emptypb.E
}

r, e := s.killInternal(ctx, req)
return r, errdefs.ToGRPC(e)
return r, errgrpc.ToGRPC(e)
}

func (s *service) Exec(ctx context.Context, req *task.ExecProcessRequest) (_ *emptypb.Empty, err error) {
Expand All @@ -299,7 +299,7 @@ func (s *service) Exec(ctx context.Context, req *task.ExecProcessRequest) (_ *em
}

r, e := s.execInternal(ctx, req)
return r, errdefs.ToGRPC(e)
return r, errgrpc.ToGRPC(e)
}

func (s *service) DiagExecInHost(ctx context.Context, req *shimdiag.ExecProcessRequest) (_ *shimdiag.ExecProcessResponse, err error) {
Expand All @@ -320,7 +320,7 @@ func (s *service) DiagExecInHost(ctx context.Context, req *shimdiag.ExecProcessR
}

r, e := s.diagExecInHostInternal(ctx, req)
return r, errdefs.ToGRPC(e)
return r, errgrpc.ToGRPC(e)
}

func (s *service) DiagShare(ctx context.Context, req *shimdiag.ShareRequest) (_ *shimdiag.ShareResponse, err error) {
Expand All @@ -338,7 +338,7 @@ func (s *service) DiagShare(ctx context.Context, req *shimdiag.ShareRequest) (_
}

r, e := s.diagShareInternal(ctx, req)
return r, errdefs.ToGRPC(e)
return r, errgrpc.ToGRPC(e)
}

func (s *service) DiagTasks(ctx context.Context, req *shimdiag.TasksRequest) (_ *shimdiag.TasksResponse, err error) {
Expand All @@ -354,7 +354,7 @@ func (s *service) DiagTasks(ctx context.Context, req *shimdiag.TasksRequest) (_
}

r, e := s.diagTasksInternal(ctx, req)
return r, errdefs.ToGRPC(e)
return r, errgrpc.ToGRPC(e)
}

func (s *service) ResizePty(ctx context.Context, req *task.ResizePtyRequest) (_ *emptypb.Empty, err error) {
Expand All @@ -373,7 +373,7 @@ func (s *service) ResizePty(ctx context.Context, req *task.ResizePtyRequest) (_
}

r, e := s.resizePtyInternal(ctx, req)
return r, errdefs.ToGRPC(e)
return r, errgrpc.ToGRPC(e)
}

func (s *service) CloseIO(ctx context.Context, req *task.CloseIORequest) (_ *emptypb.Empty, err error) {
Expand All @@ -391,7 +391,7 @@ func (s *service) CloseIO(ctx context.Context, req *task.CloseIORequest) (_ *emp
}

r, e := s.closeIOInternal(ctx, req)
return r, errdefs.ToGRPC(e)
return r, errgrpc.ToGRPC(e)
}

func (s *service) Update(ctx context.Context, req *task.UpdateTaskRequest) (_ *emptypb.Empty, err error) {
Expand All @@ -406,7 +406,7 @@ func (s *service) Update(ctx context.Context, req *task.UpdateTaskRequest) (_ *e
}

r, e := s.updateInternal(ctx, req)
return r, errdefs.ToGRPC(e)
return r, errgrpc.ToGRPC(e)
}

func (s *service) Wait(ctx context.Context, req *task.WaitRequest) (resp *task.WaitResponse, err error) {
Expand All @@ -430,7 +430,7 @@ func (s *service) Wait(ctx context.Context, req *task.WaitRequest) (resp *task.W
}

r, e := s.waitInternal(ctx, req)
return r, errdefs.ToGRPC(e)
return r, errgrpc.ToGRPC(e)
}

func (s *service) Stats(ctx context.Context, req *task.StatsRequest) (_ *task.StatsResponse, err error) {
Expand All @@ -445,7 +445,7 @@ func (s *service) Stats(ctx context.Context, req *task.StatsRequest) (_ *task.St
}

r, e := s.statsInternal(ctx, req)
return r, errdefs.ToGRPC(e)
return r, errgrpc.ToGRPC(e)
}

func (s *service) Connect(ctx context.Context, req *task.ConnectRequest) (resp *task.ConnectResponse, err error) {
Expand All @@ -468,7 +468,7 @@ func (s *service) Connect(ctx context.Context, req *task.ConnectRequest) (resp *
}

r, e := s.connectInternal(ctx, req)
return r, errdefs.ToGRPC(e)
return r, errgrpc.ToGRPC(e)
}

func (s *service) Shutdown(ctx context.Context, req *task.ShutdownRequest) (_ *emptypb.Empty, err error) {
Expand All @@ -483,7 +483,7 @@ func (s *service) Shutdown(ctx context.Context, req *task.ShutdownRequest) (_ *e
}

r, e := s.shutdownInternal(ctx, req)
return r, errdefs.ToGRPC(e)
return r, errgrpc.ToGRPC(e)
}

func (s *service) DiagStacks(ctx context.Context, req *shimdiag.StacksRequest) (*shimdiag.StacksResponse, error) {
Expand Down Expand Up @@ -539,7 +539,7 @@ func (s *service) ComputeProcessorInfo(ctx context.Context, req *extendedtask.Co
span.AddAttributes(trace.StringAttribute("tid", s.tid))

r, e := s.computeProcessorInfoInternal(ctx, req)
return r, errdefs.ToGRPC(e)
return r, errgrpc.ToGRPC(e)
}

func (s *service) Done() <-chan struct{} {
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ require (
github.com/cenkalti/backoff/v4 v4.3.0
github.com/containerd/cgroups/v3 v3.0.3
github.com/containerd/console v1.0.4
github.com/containerd/containerd v1.7.21
github.com/containerd/containerd v1.7.22
github.com/containerd/containerd/api v1.7.19
github.com/containerd/errdefs v0.1.0
github.com/containerd/errdefs v0.2.0
github.com/containerd/go-runc v1.0.0
github.com/containerd/protobuild v0.3.0
github.com/containerd/ttrpc v1.2.5
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ github.com/containerd/cgroups/v3 v3.0.3/go.mod h1:8HBe7V3aWGLFPd/k03swSIsGjZhHI2
github.com/containerd/console v1.0.1/go.mod h1:XUsP6YE/mKtz6bxc+I8UiKKTP04qjQL4qcS3XoQ5xkw=
github.com/containerd/console v1.0.4 h1:F2g4+oChYvBTsASRTz8NP6iIAi97J3TtSAsLbIFn4ro=
github.com/containerd/console v1.0.4/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk=
github.com/containerd/containerd v1.7.21 h1:USGXRK1eOC/SX0L195YgxTHb0a00anxajOzgfN0qrCA=
github.com/containerd/containerd v1.7.21/go.mod h1:e3Jz1rYRUZ2Lt51YrH9Rz0zPyJBOlSvB3ghr2jbVD8g=
github.com/containerd/containerd v1.7.22 h1:nZuNnNRA6T6jB975rx2RRNqqH2k6ELYKDZfqTHqwyy0=
github.com/containerd/containerd v1.7.22/go.mod h1:e3Jz1rYRUZ2Lt51YrH9Rz0zPyJBOlSvB3ghr2jbVD8g=
github.com/containerd/containerd/api v1.7.19 h1:VWbJL+8Ap4Ju2mx9c9qS1uFSB1OVYr5JJrW2yT5vFoA=
github.com/containerd/containerd/api v1.7.19/go.mod h1:fwGavl3LNwAV5ilJ0sbrABL44AQxmNjDRcwheXDb6Ig=
github.com/containerd/continuity v0.4.2 h1:v3y/4Yz5jwnvqPKJJ+7Wf93fyWoCB3F5EclWG023MDM=
github.com/containerd/continuity v0.4.2/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ=
github.com/containerd/errdefs v0.1.0 h1:m0wCRBiu1WJT/Fr+iOoQHMQS/eP5myQ8lCv4Dz5ZURM=
github.com/containerd/errdefs v0.1.0/go.mod h1:YgWiiHtLmSeBrvpw+UfPijzbLaB77mEG1WwJTDETIV0=
github.com/containerd/errdefs v0.2.0 h1:XllDESRfJtVrMwMmR2mCabxyvBK4UlbyyiWI3MvRw0o=
github.com/containerd/errdefs v0.2.0/go.mod h1:C28ixlj3dKhQS9hsQ13b+HIb4X7+s2G4FYhbSPcRDLM=
github.com/containerd/fifo v1.1.0 h1:4I2mbh5stb1u6ycIABlBw9zgtlK8viPI9QkQNRQEEmY=
github.com/containerd/fifo v1.1.0/go.mod h1:bmC4NWMbXlt2EZ0Hc7Fx7QzTFxgPID13eH0Qu+MAb2o=
github.com/containerd/go-runc v1.0.0 h1:oU+lLv1ULm5taqgV/CJivypVODI4SUz1znWjv3nNYS0=
Expand Down
4 changes: 2 additions & 2 deletions internal/oc/errors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"net"
"os"

"github.com/containerd/errdefs"
"github.com/containerd/errdefs/errgrpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
)
Expand All @@ -18,7 +18,7 @@ func toStatusCode(err error) codes.Code {
// checks if err implements GRPCStatus() *"google.golang.org/grpc/status".Status,
// wraps an error defined in "github.com/containerd/errdefs", or is a
// context timeout or cancelled error
if s, ok := status.FromError(errdefs.ToGRPC(err)); ok {
if s, ok := status.FromError(errgrpc.ToGRPC(err)); ok {
return s.Code()
}

Expand Down
4 changes: 2 additions & 2 deletions test/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ require (
github.com/Microsoft/go-winio v0.6.2
github.com/Microsoft/hcsshim v0.12.2
github.com/containerd/cgroups/v3 v3.0.3
github.com/containerd/containerd v1.7.21
github.com/containerd/containerd v1.7.22
github.com/containerd/containerd/api v1.7.19
github.com/containerd/errdefs v0.1.0
github.com/containerd/errdefs v0.2.0
github.com/containerd/go-runc v1.1.0
github.com/containerd/platforms v0.2.1
github.com/containerd/ttrpc v1.2.5
Expand Down
8 changes: 4 additions & 4 deletions test/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@ github.com/containerd/cgroups/v3 v3.0.3 h1:S5ByHZ/h9PMe5IOQoN7E+nMc2UcLEM/V48DGD
github.com/containerd/cgroups/v3 v3.0.3/go.mod h1:8HBe7V3aWGLFPd/k03swSIsGjZhHI2WzJmticMgVuz0=
github.com/containerd/console v1.0.4 h1:F2g4+oChYvBTsASRTz8NP6iIAi97J3TtSAsLbIFn4ro=
github.com/containerd/console v1.0.4/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk=
github.com/containerd/containerd v1.7.21 h1:USGXRK1eOC/SX0L195YgxTHb0a00anxajOzgfN0qrCA=
github.com/containerd/containerd v1.7.21/go.mod h1:e3Jz1rYRUZ2Lt51YrH9Rz0zPyJBOlSvB3ghr2jbVD8g=
github.com/containerd/containerd v1.7.22 h1:nZuNnNRA6T6jB975rx2RRNqqH2k6ELYKDZfqTHqwyy0=
github.com/containerd/containerd v1.7.22/go.mod h1:e3Jz1rYRUZ2Lt51YrH9Rz0zPyJBOlSvB3ghr2jbVD8g=
github.com/containerd/containerd/api v1.7.19 h1:VWbJL+8Ap4Ju2mx9c9qS1uFSB1OVYr5JJrW2yT5vFoA=
github.com/containerd/containerd/api v1.7.19/go.mod h1:fwGavl3LNwAV5ilJ0sbrABL44AQxmNjDRcwheXDb6Ig=
github.com/containerd/continuity v0.4.3 h1:6HVkalIp+2u1ZLH1J/pYX2oBVXlJZvh1X1A7bEZ9Su8=
github.com/containerd/continuity v0.4.3/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ=
github.com/containerd/errdefs v0.1.0 h1:m0wCRBiu1WJT/Fr+iOoQHMQS/eP5myQ8lCv4Dz5ZURM=
github.com/containerd/errdefs v0.1.0/go.mod h1:YgWiiHtLmSeBrvpw+UfPijzbLaB77mEG1WwJTDETIV0=
github.com/containerd/errdefs v0.2.0 h1:XllDESRfJtVrMwMmR2mCabxyvBK4UlbyyiWI3MvRw0o=
github.com/containerd/errdefs v0.2.0/go.mod h1:C28ixlj3dKhQS9hsQ13b+HIb4X7+s2G4FYhbSPcRDLM=
github.com/containerd/fifo v1.1.0 h1:4I2mbh5stb1u6ycIABlBw9zgtlK8viPI9QkQNRQEEmY=
github.com/containerd/fifo v1.1.0/go.mod h1:bmC4NWMbXlt2EZ0Hc7Fx7QzTFxgPID13eH0Qu+MAb2o=
github.com/containerd/go-runc v1.1.0 h1:OX4f+/i2y5sUT7LhmcJH7GYrjjhHa1QI4e8yO0gGleA=
Expand Down
Loading