Move cmd/container to subpackage

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

Author: apostasie

cmd/nerdctl/compose.go

@@ -70,7 +70,7 @@ func newComposeCommand() *cobra.Command {
 }
 
 func getComposeOptions(cmd *cobra.Command, debugFull, experimental bool) (composer.Options, error) {
-	nerdctlCmd, nerdctlArgs := globalFlags(cmd)
+	nerdctlCmd, nerdctlArgs := helpers.GlobalFlags(cmd)
 	projectDirectory, err := cmd.Flags().GetString("project-directory")
 	if err != nil {
 		return composer.Options{}, err

cmd/nerdctl/container.go renamed to cmd/nerdctl/container/container.go

@@ -14,15 +14,15 @@
    limitations under the License.
 */
 
-package main
+package container
 
 import (
 	"github.com/spf13/cobra"
 
 	"github.com/containerd/nerdctl/v2/cmd/nerdctl/helpers"
 )
 
-func newContainerCommand() *cobra.Command {
+func NewContainerCommand() *cobra.Command {
 	containerCommand := &cobra.Command{
 		Annotations:   map[string]string{helpers.Category: helpers.Management},
 		Use:           "container",
@@ -32,35 +32,35 @@ func newContainerCommand() *cobra.Command {
 		SilenceErrors: true,
 	}
 	containerCommand.AddCommand(
-		newCreateCommand(),
-		newRunCommand(),
-		newUpdateCommand(),
-		newExecCommand(),
+		NewCreateCommand(),
+		NewRunCommand(),
+		NewUpdateCommand(),
+		NewExecCommand(),
 		containerLsCommand(),
 		newContainerInspectCommand(),
-		newLogsCommand(),
-		newPortCommand(),
-		newRmCommand(),
-		newStopCommand(),
-		newStartCommand(),
-		newRestartCommand(),
-		newKillCommand(),
-		newPauseCommand(),
-		newDiffCommand(),
-		newWaitCommand(),
-		newUnpauseCommand(),
-		newCommitCommand(),
-		newRenameCommand(),
+		NewLogsCommand(),
+		NewPortCommand(),
+		NewRmCommand(),
+		NewStopCommand(),
+		NewStartCommand(),
+		NewRestartCommand(),
+		NewKillCommand(),
+		NewPauseCommand(),
+		NewDiffCommand(),
+		NewWaitCommand(),
+		NewUnpauseCommand(),
+		NewCommitCommand(),
+		NewRenameCommand(),
 		newContainerPruneCommand(),
-		newStatsCommand(),
-		newAttachCommand(),
+		NewStatsCommand(),
+		NewAttachCommand(),
 	)
-	addCpCommand(containerCommand)
+	AddCpCommand(containerCommand)
 	return containerCommand
 }
 
 func containerLsCommand() *cobra.Command {
-	x := newPsCommand()
+	x := NewPsCommand()
 	x.Use = "ls"
 	x.Aliases = []string{"list"}
 	return x

cmd/nerdctl/container_attach.go renamed to cmd/nerdctl/container/container_attach.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package main
+package container
 
 import (
 	"github.com/spf13/cobra"
@@ -29,7 +29,7 @@ import (
 	"github.com/containerd/nerdctl/v2/pkg/consoleutil"
 )
 
-func newAttachCommand() *cobra.Command {
+func NewAttachCommand() *cobra.Command {
 	const shortHelp = "Attach stdin, stdout, and stderr to a running container."
 	const longHelp = `Attach stdin, stdout, and stderr to a running container. For example:
 

cmd/nerdctl/container_attach_linux_test.go renamed to cmd/nerdctl/container/container_attach_linux_test.go

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

cmd/nerdctl/container_commit.go renamed to cmd/nerdctl/container/container_commit.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package main
+package container
 
 import (
 	"github.com/spf13/cobra"
@@ -26,7 +26,7 @@ import (
 	"github.com/containerd/nerdctl/v2/pkg/cmd/container"
 )
 
-func newCommitCommand() *cobra.Command {
+func NewCommitCommand() *cobra.Command {
 	var commitCommand = &cobra.Command{
 		Use:               "commit [flags] CONTAINER REPOSITORY[:TAG]",
 		Short:             "Create a new image from a container's changes",

cmd/nerdctl/container_commit_linux_test.go renamed to cmd/nerdctl/container/container_commit_linux_test.go

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

cmd/nerdctl/container_commit_test.go renamed to cmd/nerdctl/container/container_commit_test.go

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

cmd/nerdctl/container_cp.go renamed to cmd/nerdctl/container/container_cp.go

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

cmd/nerdctl/container/container_cp_freebsd.go

@@ -0,0 +1,23 @@
+/*
+   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 container
+
+import "github.com/spf13/cobra"
+
+func AddCpCommand(rootCmd *cobra.Command) {
+	// NOP
+}

cmd/nerdctl/container_cp_linux.go renamed to cmd/nerdctl/container/container_cp_linux.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package main
+package container
 
 import (
 	"fmt"
@@ -127,3 +127,7 @@ func processCpOptions(cmd *cobra.Command, args []string) (types.ContainerCpOptio
 		FollowSymLink:  flagL,
 	}, nil
 }
+
+func AddCpCommand(rootCmd *cobra.Command) {
+	rootCmd.AddCommand(newCpCommand())
+}