Skip to content

Commit 77b0edc

Browse files
committed
Lint: revive import-alias-naming
Signed-off-by: apostasie <[email protected]>
1 parent 702a977 commit 77b0edc

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

.golangci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,6 @@ linters:
8888
disabled: true
8989
- name: nested-structs
9090
disabled: true
91-
- name: import-alias-naming
92-
disabled: true
9391
- name: use-any
9492
disabled: true
9593
# FIXME: we should enable these below

cmd/nerdctl/container/container_update.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import (
3838
"github.com/containerd/nerdctl/v2/cmd/nerdctl/helpers"
3939
"github.com/containerd/nerdctl/v2/pkg/api/types"
4040
"github.com/containerd/nerdctl/v2/pkg/clientutil"
41-
nerdctlContainer "github.com/containerd/nerdctl/v2/pkg/cmd/container"
41+
nerdctlcontainer "github.com/containerd/nerdctl/v2/pkg/cmd/container"
4242
"github.com/containerd/nerdctl/v2/pkg/formatter"
4343
"github.com/containerd/nerdctl/v2/pkg/idutil/containerwalker"
4444
"github.com/containerd/nerdctl/v2/pkg/infoutil"
@@ -358,7 +358,7 @@ func updateContainer(ctx context.Context, client *containerd.Client, id string,
358358
return err
359359
}
360360
if cmd.Flags().Changed("restart") && restart != "" {
361-
if err := nerdctlContainer.UpdateContainerRestartPolicyLabel(ctx, client, container, restart); err != nil {
361+
if err := nerdctlcontainer.UpdateContainerRestartPolicyLabel(ctx, client, container, restart); err != nil {
362362
return err
363363
}
364364
}

cmd/nerdctl/inspect/inspect.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ import (
2323
"github.com/spf13/cobra"
2424

2525
"github.com/containerd/nerdctl/v2/cmd/nerdctl/completion"
26-
containerCmd "github.com/containerd/nerdctl/v2/cmd/nerdctl/container"
26+
containercmd "github.com/containerd/nerdctl/v2/cmd/nerdctl/container"
2727
"github.com/containerd/nerdctl/v2/cmd/nerdctl/helpers"
28-
imageCmd "github.com/containerd/nerdctl/v2/cmd/nerdctl/image"
28+
imagecmd "github.com/containerd/nerdctl/v2/cmd/nerdctl/image"
2929
"github.com/containerd/nerdctl/v2/pkg/api/types"
3030
"github.com/containerd/nerdctl/v2/pkg/clientutil"
3131
"github.com/containerd/nerdctl/v2/pkg/cmd/container"
@@ -117,13 +117,13 @@ func inspectAction(cmd *cobra.Command, args []string) error {
117117
var containerInspectOptions types.ContainerInspectOptions
118118
if inspectImage {
119119
platform := ""
120-
imageInspectOptions, err = imageCmd.InspectOptions(cmd, &platform)
120+
imageInspectOptions, err = imagecmd.InspectOptions(cmd, &platform)
121121
if err != nil {
122122
return err
123123
}
124124
}
125125
if inspectContainer {
126-
containerInspectOptions, err = containerCmd.InspectOptions(cmd)
126+
containerInspectOptions, err = containercmd.InspectOptions(cmd)
127127
if err != nil {
128128
return err
129129
}

0 commit comments

Comments
 (0)