Move cmd/system to subpackage

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

Author: apostasie

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

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

cmd/nerdctl/main.go

@@ -43,6 +43,7 @@ import (
 	"github.com/containerd/nerdctl/v2/cmd/nerdctl/login"
 	"github.com/containerd/nerdctl/v2/cmd/nerdctl/namespace"
 	"github.com/containerd/nerdctl/v2/cmd/nerdctl/network"
+	"github.com/containerd/nerdctl/v2/cmd/nerdctl/system"
 	"github.com/containerd/nerdctl/v2/cmd/nerdctl/volume"
 	"github.com/containerd/nerdctl/v2/pkg/config"
 	ncdefaults "github.com/containerd/nerdctl/v2/pkg/defaults"
@@ -286,8 +287,8 @@ Config file ($NERDCTL_TOML): %s
 		// #endregion
 
 		// #region System
-		newEventsCommand(),
-		newInfoCommand(),
+		system.NewEventsCommand(),
+		system.NewInfoCommand(),
 		newVersionCommand(),
 		// #endregion
 
@@ -303,7 +304,7 @@ Config file ($NERDCTL_TOML): %s
 		image.NewImageCommand(),
 		network.NewNetworkCommand(),
 		volume.NewVolumeCommand(),
-		newSystemCommand(),
+		system.NewSystemCommand(),
 		namespace.NewNamespaceCommand(),
 		builder.NewBuilderCommand(),
 		// #endregion

cmd/nerdctl/system.go renamed to cmd/nerdctl/system/system.go

@@ -14,15 +14,15 @@
    limitations under the License.
 */
 
-package main
+package system
 
 import (
 	"github.com/spf13/cobra"
 
 	"github.com/containerd/nerdctl/v2/cmd/nerdctl/helpers"
 )
 
-func newSystemCommand() *cobra.Command {
+func NewSystemCommand() *cobra.Command {
 	var systemCommand = &cobra.Command{
 		Annotations:   map[string]string{helpers.Category: helpers.Management},
 		Use:           "system",
@@ -33,8 +33,8 @@ func newSystemCommand() *cobra.Command {
 	}
 	// versionCommand is not here
 	systemCommand.AddCommand(
-		newEventsCommand(),
-		newInfoCommand(),
+		NewEventsCommand(),
+		NewInfoCommand(),
 		newSystemPruneCommand(),
 	)
 	return systemCommand

cmd/nerdctl/system_events.go renamed to cmd/nerdctl/system/system_events.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package main
+package system
 
 import (
 	"github.com/spf13/cobra"
@@ -25,7 +25,7 @@ import (
 	"github.com/containerd/nerdctl/v2/pkg/cmd/system"
 )
 
-func newEventsCommand() *cobra.Command {
+func NewEventsCommand() *cobra.Command {
 	shortHelp := `Get real time events from the server`
 	longHelp := shortHelp + "\nNOTE: The output format is not compatible with Docker."
 	var eventsCommand = &cobra.Command{

cmd/nerdctl/system_events_linux_test.go renamed to cmd/nerdctl/system/system_events_linux_test.go

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

cmd/nerdctl/system_info.go renamed to cmd/nerdctl/system/system_info.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package main
+package system
 
 import (
 	"github.com/spf13/cobra"
@@ -25,7 +25,7 @@ import (
 	"github.com/containerd/nerdctl/v2/pkg/cmd/system"
 )
 
-func newInfoCommand() *cobra.Command {
+func NewInfoCommand() *cobra.Command {
 	var infoCommand = &cobra.Command{
 		Use:           "info",
 		Args:          cobra.NoArgs,

cmd/nerdctl/system_info_test.go renamed to cmd/nerdctl/system/system_info_test.go

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package main
+package system
 
 import (
 	"encoding/json"

cmd/nerdctl/system_prune.go renamed to cmd/nerdctl/system/system_prune.go

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

cmd/nerdctl/system_prune_linux_test.go renamed to cmd/nerdctl/system/system_prune_linux_test.go

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

cmd/nerdctl/system/system_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 system
+
+import (
+	"testing"
+
+	"github.com/containerd/nerdctl/v2/pkg/testutil"
+)
+
+func TestMain(m *testing.M) {
+	testutil.M(m)
+}