Move cmd/image & cmd/builder to subpackages

Signed-off-by: apostasie <[email protected]>

Author: apostasie

cmd/nerdctl/builder.go renamed to cmd/nerdctl/builder/builder.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package main
+package builder
 
 import (
 	"fmt"
@@ -30,7 +30,7 @@ import (
 	"github.com/containerd/nerdctl/v2/pkg/cmd/builder"
 )
 
-func newBuilderCommand() *cobra.Command {
+func NewBuilderCommand() *cobra.Command {
 	var builderCommand = &cobra.Command{
 		Annotations:   map[string]string{helpers.Category: helpers.Management},
 		Use:           "builder",
@@ -40,7 +40,7 @@ func newBuilderCommand() *cobra.Command {
 		SilenceErrors: true,
 	}
 	builderCommand.AddCommand(
-		newBuildCommand(),
+		NewBuildCommand(),
 		newBuilderPruneCommand(),
 		newBuilderDebugCommand(),
 	)
@@ -107,7 +107,7 @@ func processBuilderPruneOptions(cmd *cobra.Command) (types.BuilderPruneOptions,
 		return types.BuilderPruneOptions{}, err
 	}
 
-	buildkitHost, err := getBuildkitHost(cmd, globalOptions.Namespace)
+	buildkitHost, err := GetBuildkitHost(cmd, globalOptions.Namespace)
 	if err != nil {
 		return types.BuilderPruneOptions{}, err
 	}

cmd/nerdctl/builder_build.go renamed to cmd/nerdctl/builder/builder_build.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package main
+package builder
 
 import (
 	"errors"
@@ -34,7 +34,7 @@ import (
 	"github.com/containerd/nerdctl/v2/pkg/strutil"
 )
 
-func newBuildCommand() *cobra.Command {
+func NewBuildCommand() *cobra.Command {
 	var buildCommand = &cobra.Command{
 		Use:   "build [flags] PATH",
 		Short: "Build an image from a Dockerfile. Needs buildkitd to be running.",
@@ -88,7 +88,7 @@ func processBuildCommandFlag(cmd *cobra.Command, args []string) (types.BuilderBu
 	if err != nil {
 		return types.BuilderBuildOptions{}, err
 	}
-	buildKitHost, err := getBuildkitHost(cmd, globalOptions.Namespace)
+	buildKitHost, err := GetBuildkitHost(cmd, globalOptions.Namespace)
 	if err != nil {
 		return types.BuilderBuildOptions{}, err
 	}
@@ -235,7 +235,7 @@ func processBuildCommandFlag(cmd *cobra.Command, args []string) (types.BuilderBu
 	}, nil
 }
 
-func getBuildkitHost(cmd *cobra.Command, namespace string) (string, error) {
+func GetBuildkitHost(cmd *cobra.Command, namespace string) (string, error) {
 	if cmd.Flags().Changed("buildkit-host") || os.Getenv("BUILDKIT_HOST") != "" {
 		// If address is explicitly specified, use it.
 		buildkitHost, err := cmd.Flags().GetString("buildkit-host")

cmd/nerdctl/builder_build_linux_test.go renamed to cmd/nerdctl/builder/builder_build_linux_test.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package main
+package builder
 
 import (
 	"fmt"
@@ -62,7 +62,7 @@ CMD ["echo", "test-nerdctl-build-context-oci-layout-parent"]`, testutil.CommonIm
 
 	// Unpack OCI archive into OCI layout directory.
 	ociLayoutDir := t.TempDir()
-	err := extractTarFile(ociLayoutDir, tarPath)
+	err := helpers.ExtractTarFile(ociLayoutDir, tarPath)
 	assert.NilError(t, err)
 
 	dockerfile = fmt.Sprintf(`FROM %s

cmd/nerdctl/builder_build_test.go renamed to cmd/nerdctl/builder/builder_build_test.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package main
+package builder
 
 import (
 	"fmt"

cmd/nerdctl/builder_linux_test.go renamed to cmd/nerdctl/builder/builder_linux_test.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package main
+package builder
 
 import (
 	"bytes"

cmd/nerdctl/builder/builder_test.go

@@ -0,0 +1,27 @@
+/*
+   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 builder
+
+import (
+	"testing"
+
+	"github.com/containerd/nerdctl/v2/pkg/testutil"
+)
+
+func TestMain(m *testing.M) {
+	testutil.M(m)
+}

cmd/nerdctl/compose_run_linux_test.go

@@ -27,6 +27,7 @@ import (
 
 	"github.com/containerd/log"
 
+	"github.com/containerd/nerdctl/v2/cmd/nerdctl/helpers"
 	"github.com/containerd/nerdctl/v2/pkg/testutil"
 	"github.com/containerd/nerdctl/v2/pkg/testutil/nettestutil"
 	"github.com/containerd/nerdctl/v2/pkg/testutil/testregistry"
@@ -432,10 +433,10 @@ func TestComposePushAndPullWithCosignVerify(t *testing.T) {
 	base := testutil.NewBase(t)
 	base.Env = append(base.Env, "COSIGN_PASSWORD=1")
 
-	keyPair := newCosignKeyPair(t, "cosign-key-pair", "1")
+	keyPair := helpers.NewCosignKeyPair(t, "cosign-key-pair", "1")
 	reg := testregistry.NewWithNoAuth(base, 0, false)
 	t.Cleanup(func() {
-		keyPair.cleanup()
+		keyPair.Cleanup()
 		reg.Cleanup(nil)
 	})
 
@@ -475,8 +476,8 @@ services:
     x-nerdctl-sign: none
     entrypoint:
       - stty
-`, imageSvc0, keyPair.publicKey, keyPair.privateKey,
-		imageSvc1, keyPair.privateKey, imageSvc2)
+`, imageSvc0, keyPair.PublicKey, keyPair.PrivateKey,
+		imageSvc1, keyPair.PrivateKey, imageSvc2)
 
 	dockerfile := fmt.Sprintf(`FROM %s`, testutil.AlpineImage)
 

cmd/nerdctl/container_run_linux_test.go

@@ -35,6 +35,7 @@ import (
 	"gotest.tools/v3/assert"
 	"gotest.tools/v3/icmd"
 
+	"github.com/containerd/nerdctl/v2/cmd/nerdctl/helpers"
 	"github.com/containerd/nerdctl/v2/pkg/rootlessutil"
 	"github.com/containerd/nerdctl/v2/pkg/strutil"
 	"github.com/containerd/nerdctl/v2/pkg/testutil"
@@ -70,7 +71,7 @@ func prepareCustomRootfs(base *testutil.Base, imageName string) string {
 	base.Cmd("save", "-o", archiveTarPath, imageName).AssertOK()
 	rootfs, err := os.MkdirTemp(base.T.TempDir(), "rootfs")
 	assert.NilError(base.T, err)
-	err = extractDockerArchive(archiveTarPath, rootfs)
+	err = helpers.ExtractDockerArchive(archiveTarPath, rootfs)
 	assert.NilError(base.T, err)
 	return rootfs
 }

cmd/nerdctl/container_run_soci_linux_test.go

@@ -21,6 +21,7 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/containerd/nerdctl/v2/cmd/nerdctl/helpers"
 	"github.com/containerd/nerdctl/v2/pkg/testutil"
 )
 
@@ -41,7 +42,7 @@ func TestRunSoci(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			base := testutil.NewBase(t)
-			requiresSoci(base)
+			helpers.RequiresSoci(base)
 
 			//counting initial snapshot mounts
 			initialMounts, err := exec.Command("mount").Output()
@@ -73,13 +74,3 @@ func TestRunSoci(t *testing.T) {
 		})
 	}
 }
-
-func requiresSoci(base *testutil.Base) {
-	info := base.Info()
-	for _, p := range info.Plugins.Storage {
-		if p == "soci" {
-			return
-		}
-	}
-	base.T.Skip("test requires soci")
-}

cmd/nerdctl/container_run_verify_linux_test.go

@@ -35,10 +35,10 @@ func TestRunVerifyCosign(t *testing.T) {
 	base := testutil.NewBase(t)
 	base.Env = append(base.Env, "COSIGN_PASSWORD=1")
 
-	keyPair := newCosignKeyPair(t, "cosign-key-pair", "1")
+	keyPair := helpers.NewCosignKeyPair(t, "cosign-key-pair", "1")
 	reg := testregistry.NewWithNoAuth(base, 0, false)
 	t.Cleanup(func() {
-		keyPair.cleanup()
+		keyPair.Cleanup()
 		reg.Cleanup(nil)
 	})
 
@@ -51,7 +51,7 @@ CMD ["echo", "nerdctl-build-test-string"]
 	buildCtx := helpers.CreateBuildContext(t, dockerfile)
 
 	base.Cmd("build", "-t", testImageRef, buildCtx).AssertOK()
-	base.Cmd("push", testImageRef, "--sign=cosign", "--cosign-key="+keyPair.privateKey).AssertOK()
-	base.Cmd("run", "--rm", "--verify=cosign", "--cosign-key="+keyPair.publicKey, testImageRef).AssertOK()
+	base.Cmd("push", testImageRef, "--sign=cosign", "--cosign-key="+keyPair.PrivateKey).AssertOK()
+	base.Cmd("run", "--rm", "--verify=cosign", "--cosign-key="+keyPair.PublicKey, testImageRef).AssertOK()
 	base.Cmd("run", "--rm", "--verify=cosign", "--cosign-key=dummy", testImageRef).AssertFail()
 }