Fix linter errors
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
This commit is contained in:
parent
2b521e25a7
commit
ef7f46eb7b
@ -19,7 +19,7 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/containerd/containerd/runtime/v2/runc/v1"
|
v1 "github.com/containerd/containerd/runtime/v2/runc/v1"
|
||||||
"github.com/containerd/containerd/runtime/v2/shim"
|
"github.com/containerd/containerd/runtime/v2/shim"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/containerd/containerd/runtime/v2/runc/v2"
|
v2 "github.com/containerd/containerd/runtime/v2/runc/v2"
|
||||||
"github.com/containerd/containerd/runtime/v2/shim"
|
"github.com/containerd/containerd/runtime/v2/shim"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -47,7 +47,7 @@ var Command = cli.Command{
|
|||||||
var e *events.Envelope
|
var e *events.Envelope
|
||||||
select {
|
select {
|
||||||
case e = <-eventsCh:
|
case e = <-eventsCh:
|
||||||
case err, open = <-errCh:
|
case err = <-errCh:
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if e != nil {
|
if e != nil {
|
||||||
|
@ -27,7 +27,7 @@ import (
|
|||||||
"github.com/containerd/containerd/api/types"
|
"github.com/containerd/containerd/api/types"
|
||||||
"github.com/containerd/containerd/cmd/ctr/commands"
|
"github.com/containerd/containerd/cmd/ctr/commands"
|
||||||
"github.com/containerd/containerd/platforms"
|
"github.com/containerd/containerd/platforms"
|
||||||
"github.com/opencontainers/image-spec/specs-go/v1"
|
v1 "github.com/opencontainers/image-spec/specs-go/v1"
|
||||||
"github.com/urfave/cli"
|
"github.com/urfave/cli"
|
||||||
"google.golang.org/grpc/codes"
|
"google.golang.org/grpc/codes"
|
||||||
)
|
)
|
||||||
|
@ -91,7 +91,7 @@ func familiarizeReference(ref string) (string, error) {
|
|||||||
func ociReferenceName(name string) string {
|
func ociReferenceName(name string) string {
|
||||||
// OCI defines the reference name as only a tag excluding the
|
// OCI defines the reference name as only a tag excluding the
|
||||||
// repository. The containerd annotation contains the full image name
|
// repository. The containerd annotation contains the full image name
|
||||||
// since the tag is insufficent for correctly naming and referring to an
|
// since the tag is insufficient for correctly naming and referring to an
|
||||||
// image
|
// image
|
||||||
var ociRef string
|
var ociRef string
|
||||||
if spec, err := reference.Parse(name); err == nil {
|
if spec, err := reference.Parse(name); err == nil {
|
||||||
|
@ -19,6 +19,6 @@ package progress
|
|||||||
const (
|
const (
|
||||||
escape = "\x1b"
|
escape = "\x1b"
|
||||||
reset = escape + "[0m"
|
reset = escape + "[0m"
|
||||||
red = escape + "[31m" // nolint: staticcheck, varcheck
|
red = escape + "[31m" // nolint: deadcode, varcheck, unused
|
||||||
green = escape + "[32m"
|
green = escape + "[32m"
|
||||||
)
|
)
|
||||||
|
@ -87,7 +87,7 @@ func (b *binary) Start(ctx context.Context, opts *types.Any, onClose func()) (_
|
|||||||
defer f.Close()
|
defer f.Close()
|
||||||
if _, err := io.Copy(os.Stderr, f); err != nil {
|
if _, err := io.Copy(os.Stderr, f); err != nil {
|
||||||
// When using a multi-container shim the 2nd to Nth container in the
|
// When using a multi-container shim the 2nd to Nth container in the
|
||||||
// shim will not have a seperate log pipe. Ignore the failure log
|
// shim will not have a separate log pipe. Ignore the failure log
|
||||||
// message here when the shim connect times out.
|
// message here when the shim connect times out.
|
||||||
if !os.IsNotExist(errors.Cause(err)) {
|
if !os.IsNotExist(errors.Cause(err)) {
|
||||||
log.G(ctx).WithError(err).Error("copy shim log")
|
log.G(ctx).WithError(err).Error("copy shim log")
|
||||||
|
@ -261,7 +261,7 @@ func (c *Container) Process(id string) (process.Process, error) {
|
|||||||
// ReserveProcess checks for the existence of an id and atomically
|
// ReserveProcess checks for the existence of an id and atomically
|
||||||
// reserves the process id if it does not already exist
|
// reserves the process id if it does not already exist
|
||||||
//
|
//
|
||||||
// Returns true if the process id was sucessfully reserved and a
|
// Returns true if the process id was successfully reserved and a
|
||||||
// cancel func to release the reservation
|
// cancel func to release the reservation
|
||||||
func (c *Container) ReserveProcess(id string) (bool, func()) {
|
func (c *Container) ReserveProcess(id string) (bool, func()) {
|
||||||
c.mu.Lock()
|
c.mu.Lock()
|
||||||
|
@ -79,7 +79,7 @@ func loadShim(ctx context.Context, bundle *Bundle, events *exchange.Exchange, rt
|
|||||||
defer f.Close()
|
defer f.Close()
|
||||||
if _, err := io.Copy(os.Stderr, f); err != nil {
|
if _, err := io.Copy(os.Stderr, f); err != nil {
|
||||||
// When using a multi-container shim the 2nd to Nth container in the
|
// When using a multi-container shim the 2nd to Nth container in the
|
||||||
// shim will not have a seperate log pipe. Ignore the failure log
|
// shim will not have a separate log pipe. Ignore the failure log
|
||||||
// message here when the shim connect times out.
|
// message here when the shim connect times out.
|
||||||
if !os.IsNotExist(errors.Cause(err)) {
|
if !os.IsNotExist(errors.Cause(err)) {
|
||||||
log.G(ctx).WithError(err).Error("copy shim log")
|
log.G(ctx).WithError(err).Error("copy shim log")
|
||||||
|
@ -43,7 +43,7 @@ import (
|
|||||||
"github.com/containerd/containerd/plugin"
|
"github.com/containerd/containerd/plugin"
|
||||||
"github.com/containerd/containerd/runtime"
|
"github.com/containerd/containerd/runtime"
|
||||||
"github.com/containerd/containerd/runtime/linux/runctypes"
|
"github.com/containerd/containerd/runtime/linux/runctypes"
|
||||||
"github.com/containerd/containerd/runtime/v2"
|
v2 "github.com/containerd/containerd/runtime/v2"
|
||||||
"github.com/containerd/containerd/runtime/v2/runc/options"
|
"github.com/containerd/containerd/runtime/v2/runc/options"
|
||||||
"github.com/containerd/containerd/services"
|
"github.com/containerd/containerd/services"
|
||||||
"github.com/containerd/typeurl"
|
"github.com/containerd/typeurl"
|
||||||
|
@ -283,7 +283,7 @@ func (t *task) Update(ctx context.Context, resources *types.Any) error {
|
|||||||
|
|
||||||
func (t *task) Process(ctx context.Context, id string) (p runtime.Process, err error) {
|
func (t *task) Process(ctx context.Context, id string) (p runtime.Process, err error) {
|
||||||
p = t.getProcess(id)
|
p = t.getProcess(id)
|
||||||
if p == nil {
|
if p == nil { // nolint: govet
|
||||||
err = errors.Wrapf(errdefs.ErrNotFound, "no such process %s", id)
|
err = errors.Wrapf(errdefs.ErrNotFound, "no such process %s", id)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user