Merge pull request #3294 from apostasie/dev-import-order

Import ordering

Author: AkihiroSuda

.github/workflows/test.yml

@@ -34,6 +34,10 @@ jobs:
         run: make lint-yaml
       - name: shellcheck
         run: make lint-shell
+      - name: go imports ordering
+        run: |
+          go install -v github.com/incu6us/goimports-reviser/v3@latest
+          make lint-imports
 
   test-unit:
     runs-on: ubuntu-24.04

Makefile

@@ -70,7 +70,13 @@ clean:
 lint: lint-go lint-yaml lint-shell
 
 lint-go:
-	cd $(MAKEFILE_DIR) && golangci-lint run $(VERBOSE_FLAG_LONG)
+	cd $(MAKEFILE_DIR) && golangci-lint run $(VERBOSE_FLAG_LONG) ./...
+
+lint-imports:
+	cd $(MAKEFILE_DIR) && goimports-reviser -list-diff -company-prefixes "github.com/containerd" ./...
+
+lint-fix-imports:
+	cd $(MAKEFILE_DIR) && goimports-reviser -company-prefixes "github.com/containerd" ./...
 
 lint-yaml:
 	cd $(MAKEFILE_DIR) && yamllint .

cmd/nerdctl/builder.go

@@ -25,6 +25,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/containerd/log"
+
 	"github.com/containerd/nerdctl/v2/pkg/buildkitutil"
 )
 

cmd/nerdctl/builder_build_test.go

@@ -23,9 +23,11 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/containerd/nerdctl/v2/pkg/testutil"
-	"github.com/containerd/platforms"
 	"gotest.tools/v3/assert"
+
+	"github.com/containerd/platforms"
+
+	"github.com/containerd/nerdctl/v2/pkg/testutil"
 )
 
 func TestBuild(t *testing.T) {

cmd/nerdctl/builder_linux_test.go

@@ -24,9 +24,10 @@ import (
 	"path/filepath"
 	"testing"
 
+	"gotest.tools/v3/assert"
+
 	"github.com/containerd/nerdctl/v2/pkg/rootlessutil"
 	"github.com/containerd/nerdctl/v2/pkg/testutil"
-	"gotest.tools/v3/assert"
 )
 
 func TestBuilderDebug(t *testing.T) {

cmd/nerdctl/completion.go

@@ -23,6 +23,7 @@ import (
 	"github.com/spf13/cobra"
 
 	containerd "github.com/containerd/containerd/v2/client"
+
 	"github.com/containerd/nerdctl/v2/pkg/clientutil"
 	"github.com/containerd/nerdctl/v2/pkg/labels"
 	"github.com/containerd/nerdctl/v2/pkg/netutil"

cmd/nerdctl/compose_config_test.go

@@ -22,8 +22,9 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/containerd/nerdctl/v2/pkg/testutil"
 	"gotest.tools/v3/assert"
+
+	"github.com/containerd/nerdctl/v2/pkg/testutil"
 )
 
 func TestComposeConfig(t *testing.T) {

cmd/nerdctl/compose_cp.go

@@ -19,11 +19,12 @@ package main
 import (
 	"errors"
 
+	"github.com/spf13/cobra"
+
 	"github.com/containerd/nerdctl/v2/pkg/clientutil"
 	"github.com/containerd/nerdctl/v2/pkg/cmd/compose"
 	"github.com/containerd/nerdctl/v2/pkg/composer"
 	"github.com/containerd/nerdctl/v2/pkg/rootlessutil"
-	"github.com/spf13/cobra"
 )
 
 func newComposeCopyCommand() *cobra.Command {

cmd/nerdctl/compose_cp_linux_test.go

@@ -22,8 +22,9 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/containerd/nerdctl/v2/pkg/testutil"
 	"gotest.tools/v3/assert"
+
+	"github.com/containerd/nerdctl/v2/pkg/testutil"
 )
 
 func TestComposeCopy(t *testing.T) {

cmd/nerdctl/compose_exec_linux_test.go

@@ -24,8 +24,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/containerd/nerdctl/v2/pkg/testutil"
 	"gotest.tools/v3/assert"
+
+	"github.com/containerd/nerdctl/v2/pkg/testutil"
 )
 
 func TestComposeExec(t *testing.T) {

cmd/nerdctl/compose_images.go

@@ -28,6 +28,7 @@ import (
 	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/core/snapshots"
 	"github.com/containerd/containerd/v2/pkg/progress"
+
 	"github.com/containerd/nerdctl/v2/pkg/clientutil"
 	"github.com/containerd/nerdctl/v2/pkg/cmd/compose"
 	"github.com/containerd/nerdctl/v2/pkg/formatter"

cmd/nerdctl/compose_ps.go

@@ -31,6 +31,7 @@ import (
 	"github.com/containerd/errdefs"
 	gocni "github.com/containerd/go-cni"
 	"github.com/containerd/log"
+
 	"github.com/containerd/nerdctl/v2/pkg/clientutil"
 	"github.com/containerd/nerdctl/v2/pkg/cmd/compose"
 	"github.com/containerd/nerdctl/v2/pkg/containerutil"

cmd/nerdctl/compose_ps_linux_test.go

@@ -23,9 +23,10 @@ import (
 	"testing"
 	"time"
 
+	"gotest.tools/v3/assert"
+
 	"github.com/containerd/nerdctl/v2/pkg/tabutil"
 	"github.com/containerd/nerdctl/v2/pkg/testutil"
-	"gotest.tools/v3/assert"
 )
 
 func TestComposePs(t *testing.T) {

cmd/nerdctl/compose_push.go

@@ -17,10 +17,11 @@
 package main
 
 import (
+	"github.com/spf13/cobra"
+
 	"github.com/containerd/nerdctl/v2/pkg/clientutil"
 	"github.com/containerd/nerdctl/v2/pkg/cmd/compose"
 	"github.com/containerd/nerdctl/v2/pkg/composer"
-	"github.com/spf13/cobra"
 )
 
 func newComposePushCommand() *cobra.Command {

cmd/nerdctl/compose_rm.go

@@ -20,10 +20,11 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/spf13/cobra"
+
 	"github.com/containerd/nerdctl/v2/pkg/clientutil"
 	"github.com/containerd/nerdctl/v2/pkg/cmd/compose"
 	"github.com/containerd/nerdctl/v2/pkg/composer"
-	"github.com/spf13/cobra"
 )
 
 func newComposeRemoveCommand() *cobra.Command {

cmd/nerdctl/compose_run_linux_test.go

@@ -23,11 +23,13 @@ import (
 	"testing"
 	"time"
 
+	"gotest.tools/v3/assert"
+
 	"github.com/containerd/log"
+
 	"github.com/containerd/nerdctl/v2/pkg/testutil"
 	"github.com/containerd/nerdctl/v2/pkg/testutil/nettestutil"
 	"github.com/containerd/nerdctl/v2/pkg/testutil/testregistry"
-	"gotest.tools/v3/assert"
 )
 
 func TestComposeRun(t *testing.T) {

cmd/nerdctl/compose_start.go

@@ -26,6 +26,7 @@ import (
 
 	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/errdefs"
+
 	"github.com/containerd/nerdctl/v2/pkg/clientutil"
 	"github.com/containerd/nerdctl/v2/pkg/cmd/compose"
 	"github.com/containerd/nerdctl/v2/pkg/containerutil"

cmd/nerdctl/compose_top.go

@@ -22,6 +22,7 @@ import (
 	"github.com/spf13/cobra"
 
 	containerd "github.com/containerd/containerd/v2/client"
+
 	"github.com/containerd/nerdctl/v2/pkg/api/types"
 	"github.com/containerd/nerdctl/v2/pkg/clientutil"
 	"github.com/containerd/nerdctl/v2/pkg/cmd/compose"

cmd/nerdctl/compose_up.go

@@ -22,10 +22,11 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/spf13/cobra"
+
 	"github.com/containerd/nerdctl/v2/pkg/clientutil"
 	"github.com/containerd/nerdctl/v2/pkg/cmd/compose"
 	"github.com/containerd/nerdctl/v2/pkg/composer"
-	"github.com/spf13/cobra"
 )
 
 func newComposeUpCommand() *cobra.Command {

cmd/nerdctl/compose_up_linux_test.go

@@ -28,6 +28,7 @@ import (
 	"gotest.tools/v3/icmd"
 
 	"github.com/containerd/log"
+
 	"github.com/containerd/nerdctl/v2/pkg/composer/serviceparser"
 	"github.com/containerd/nerdctl/v2/pkg/rootlessutil"
 	"github.com/containerd/nerdctl/v2/pkg/testutil"

cmd/nerdctl/compose_up_test.go

@@ -23,9 +23,10 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/containerd/nerdctl/v2/pkg/testutil"
 	"gotest.tools/v3/assert"
 	"gotest.tools/v3/icmd"
+
+	"github.com/containerd/nerdctl/v2/pkg/testutil"
 )
 
 // https://github.com/containerd/nerdctl/issues/1942

cmd/nerdctl/compose_version.go

@@ -20,8 +20,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/containerd/nerdctl/v2/pkg/version"
 	"github.com/spf13/cobra"
+
+	"github.com/containerd/nerdctl/v2/pkg/version"
 )
 
 func newComposeVersionCommand() *cobra.Command {

cmd/nerdctl/container_attach.go

@@ -17,12 +17,14 @@
 package main
 
 import (
+	"github.com/spf13/cobra"
+
 	containerd "github.com/containerd/containerd/v2/client"
+
 	"github.com/containerd/nerdctl/v2/pkg/api/types"
 	"github.com/containerd/nerdctl/v2/pkg/clientutil"
 	"github.com/containerd/nerdctl/v2/pkg/cmd/container"
 	"github.com/containerd/nerdctl/v2/pkg/consoleutil"
-	"github.com/spf13/cobra"
 )
 
 func newAttachCommand() *cobra.Command {

cmd/nerdctl/container_attach_linux_test.go

@@ -21,8 +21,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/containerd/nerdctl/v2/pkg/testutil"
 	"gotest.tools/v3/assert"
+
+	"github.com/containerd/nerdctl/v2/pkg/testutil"
 )
 
 // skipAttachForDocker should be called by attach-related tests that assert 'read detach keys' in stdout.

cmd/nerdctl/container_cp_linux_test.go

@@ -24,9 +24,10 @@ import (
 	"syscall"
 	"testing"
 
+	"gotest.tools/v3/assert"
+
 	"github.com/containerd/nerdctl/v2/pkg/rootlessutil"
 	"github.com/containerd/nerdctl/v2/pkg/testutil"
-	"gotest.tools/v3/assert"
 )
 
 func TestCopyToContainer(t *testing.T) {

cmd/nerdctl/container_create.go

@@ -20,11 +20,12 @@ import (
 	"fmt"
 	"runtime"
 
+	"github.com/spf13/cobra"
+
 	"github.com/containerd/nerdctl/v2/pkg/api/types"
 	"github.com/containerd/nerdctl/v2/pkg/clientutil"
 	"github.com/containerd/nerdctl/v2/pkg/cmd/container"
 	"github.com/containerd/nerdctl/v2/pkg/containerutil"
-	"github.com/spf13/cobra"
 )
 
 func newCreateCommand() *cobra.Command {

cmd/nerdctl/container_create_linux_test.go

@@ -22,9 +22,10 @@ import (
 	"strings"
 	"testing"
 
+	"gotest.tools/v3/assert"
+
 	"github.com/containerd/nerdctl/v2/pkg/testutil"
 	"github.com/containerd/nerdctl/v2/pkg/testutil/nettestutil"
-	"gotest.tools/v3/assert"
 )
 
 func TestCreate(t *testing.T) {

cmd/nerdctl/container_diff.go

@@ -31,13 +31,14 @@ import (
 	"github.com/containerd/containerd/v2/core/mount"
 	"github.com/containerd/continuity/fs"
 	"github.com/containerd/log"
+	"github.com/containerd/platforms"
+
 	"github.com/containerd/nerdctl/v2/pkg/api/types"
 	"github.com/containerd/nerdctl/v2/pkg/clientutil"
 	"github.com/containerd/nerdctl/v2/pkg/idgen"
 	"github.com/containerd/nerdctl/v2/pkg/idutil/containerwalker"
 	"github.com/containerd/nerdctl/v2/pkg/imgutil"
 	"github.com/containerd/nerdctl/v2/pkg/labels"
-	"github.com/containerd/platforms"
 )
 
 func newDiffCommand() *cobra.Command {

cmd/nerdctl/container_exec.go

@@ -22,6 +22,7 @@ import (
 	"github.com/spf13/cobra"
 
 	containerd "github.com/containerd/containerd/v2/client"
+
 	"github.com/containerd/nerdctl/v2/pkg/api/types"
 	"github.com/containerd/nerdctl/v2/pkg/clientutil"
 	"github.com/containerd/nerdctl/v2/pkg/cmd/container"

cmd/nerdctl/container_inspect_windows_test.go

@@ -19,8 +19,9 @@ package main
 import (
 	"testing"
 
-	"github.com/containerd/nerdctl/v2/pkg/testutil"
 	"gotest.tools/v3/assert"
+
+	"github.com/containerd/nerdctl/v2/pkg/testutil"
 )
 
 func TestInspectProcessContainerContainsLabel(t *testing.T) {

cmd/nerdctl/container_kill.go

@@ -17,11 +17,13 @@
 package main
 
 import (
+	"github.com/spf13/cobra"
+
 	containerd "github.com/containerd/containerd/v2/client"
+
 	"github.com/containerd/nerdctl/v2/pkg/api/types"
 	"github.com/containerd/nerdctl/v2/pkg/clientutil"
 	"github.com/containerd/nerdctl/v2/pkg/cmd/container"
-	"github.com/spf13/cobra"
 )
 
 func newKillCommand() *cobra.Command {

cmd/nerdctl/container_kill_linux_test.go

@@ -21,11 +21,12 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/coreos/go-iptables/iptables"
+	"gotest.tools/v3/assert"
+
 	"github.com/containerd/nerdctl/v2/pkg/rootlessutil"
 	"github.com/containerd/nerdctl/v2/pkg/testutil"
 	iptablesutil "github.com/containerd/nerdctl/v2/pkg/testutil/iptables"
-	"github.com/coreos/go-iptables/iptables"
-	"gotest.tools/v3/assert"
 )
 
 // TestKillCleanupForwards runs a container that exposes a port and then kill it.

cmd/nerdctl/container_list_linux_test.go

@@ -24,11 +24,12 @@ import (
 	"strings"
 	"testing"
 
+	"gotest.tools/v3/assert"
+
 	"github.com/containerd/nerdctl/v2/pkg/formatter"
 	"github.com/containerd/nerdctl/v2/pkg/strutil"
 	"github.com/containerd/nerdctl/v2/pkg/tabutil"
 	"github.com/containerd/nerdctl/v2/pkg/testutil"
-	"gotest.tools/v3/assert"
 )
 
 type psTestContainer struct {