Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 2 additions & 25 deletions cmd/nerdctl/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (

"github.com/containerd/nerdctl/pkg/config"
ncdefaults "github.com/containerd/nerdctl/pkg/defaults"
"github.com/containerd/nerdctl/pkg/errutil"
"github.com/containerd/nerdctl/pkg/logging"
"github.com/containerd/nerdctl/pkg/rootlessutil"
"github.com/containerd/nerdctl/pkg/version"
Expand Down Expand Up @@ -113,7 +114,7 @@ func usage(c *cobra.Command) error {

func main() {
if err := xmain(); err != nil {
HandleExitCoder(err)
errutil.HandleExitCoder(err)
logrus.Fatal(err)
}
}
Expand Down Expand Up @@ -341,30 +342,6 @@ func globalFlags(cmd *cobra.Command) (string, []string) {
return args0, args
}

type ExitCoder interface {
error
ExitCode() int
}

type ExitCodeError struct {
error
exitCode int
}

func (e ExitCodeError) ExitCode() int {
return e.exitCode
}

func HandleExitCoder(err error) {
if err == nil {
return
}

if exitErr, ok := err.(ExitCoder); ok {
os.Exit(exitErr.ExitCode())
}
}

// unknownSubcommandAction is needed to let `nerdctl system non-existent-command` fail
// https://github.com/containerd/nerdctl/issues/487
//
Expand Down
5 changes: 2 additions & 3 deletions cmd/nerdctl/network_rm.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"fmt"

"github.com/containerd/nerdctl/pkg/clientutil"
"github.com/containerd/nerdctl/pkg/errutil"
"github.com/containerd/nerdctl/pkg/idutil/netwalker"
"github.com/containerd/nerdctl/pkg/netutil"
"github.com/sirupsen/logrus"
Expand Down Expand Up @@ -110,9 +111,7 @@ func networkRmAction(cmd *cobra.Command, args []string) error {
// compatible with docker
// ExitCodeError is to allow the program to exit with status code 1 without outputting an error message.
if code != 0 {
return ExitCodeError{
exitCode: code,
}
return errutil.NewExitCoderErr(code)
}
return nil
}
Expand Down
5 changes: 2 additions & 3 deletions cmd/nerdctl/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ import (
"github.com/containerd/nerdctl/pkg/api/types"
"github.com/containerd/nerdctl/pkg/clientutil"
"github.com/containerd/nerdctl/pkg/defaults"
"github.com/containerd/nerdctl/pkg/errutil"
"github.com/containerd/nerdctl/pkg/idgen"
"github.com/containerd/nerdctl/pkg/imgutil"
"github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat"
Expand Down Expand Up @@ -398,9 +399,7 @@ func runAction(cmd *cobra.Command, args []string) error {
return err
}
if code != 0 {
return ExitCodeError{
exitCode: int(code),
}
return errutil.NewExitCoderErr(int(code))
}
return nil
}
Expand Down
5 changes: 2 additions & 3 deletions cmd/nerdctl/start.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import (
"github.com/containerd/containerd/cmd/ctr/commands/tasks"
"github.com/containerd/containerd/oci"
"github.com/containerd/nerdctl/pkg/clientutil"
"github.com/containerd/nerdctl/pkg/errutil"
"github.com/containerd/nerdctl/pkg/formatter"
"github.com/containerd/nerdctl/pkg/idutil/containerwalker"
"github.com/containerd/nerdctl/pkg/labels"
Expand Down Expand Up @@ -184,9 +185,7 @@ func startContainer(ctx context.Context, container containerd.Container, flagA b
return err
}
if code != 0 {
return ExitCodeError{
exitCode: int(code),
}
return errutil.NewExitCoderErr(int(code))
}
return nil
}
Expand Down
50 changes: 50 additions & 0 deletions pkg/errutil/exit_coder.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
/*
Copyright The containerd Authors.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package errutil

import "os"

type ExitCoder interface {
error
ExitCode() int
}

// ExitCodeError is to allow the program to exit with status code without outputting an error message.
type ExitCodeError struct {
error
exitCode int
}

func NewExitCoderErr(exitCode int) ExitCodeError {
return ExitCodeError{
exitCode: exitCode,
}
}

func (e ExitCodeError) ExitCode() int {
return e.exitCode
}

func HandleExitCoder(err error) {
if err == nil {
return
}

if exitErr, ok := err.(ExitCoder); ok {
os.Exit(exitErr.ExitCode())
}
}