Move network to cmd/nerdctl/network

apostasie · apostasie · commit d1bc54d92bc3 · 2024-09-02T08:38:42.000-07:00
Signed-off-by: apostasie &lt;spam_blackhole@farcloser.world&gt;
diff --git a/cmd/nerdctl/main.go b/cmd/nerdctl/main.go
@@ -34,6 +34,7 @@ import (
 
 	"github.com/containerd/nerdctl/v2/cmd/nerdctl/completion"
 	"github.com/containerd/nerdctl/v2/cmd/nerdctl/helpers"
+	"github.com/containerd/nerdctl/v2/cmd/nerdctl/network"
 	"github.com/containerd/nerdctl/v2/cmd/nerdctl/volume"
 	"github.com/containerd/nerdctl/v2/pkg/config"
 	ncdefaults "github.com/containerd/nerdctl/v2/pkg/defaults"
@@ -292,7 +293,7 @@ Config file ($NERDCTL_TOML): %s
 		// #region helpers.Management
 		newContainerCommand(),
 		newImageCommand(),
-		newNetworkCommand(),
+		network.NewNetworkCommand(),
 		volume.NewVolumeCommand(),
 		newSystemCommand(),
 		newNamespaceCommand(),
diff --git a/cmd/nerdctl/network/network.go b/cmd/nerdctl/network/network.go
@@ -14,15 +14,15 @@
    limitations under the License.
 */
 
-package main
+package network
 
 import (
 	"github.com/spf13/cobra"
 
 	"github.com/containerd/nerdctl/v2/cmd/nerdctl/helpers"
 )
 
-func newNetworkCommand() *cobra.Command {
+func NewNetworkCommand() *cobra.Command {
 	networkCommand := &cobra.Command{
 		Annotations:   map[string]string{helpers.Category: helpers.Management},
 		Use:           "network",
diff --git a/cmd/nerdctl/network/network_create.go b/cmd/nerdctl/network/network_create.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package main
+package network
 
 import (
 	"fmt"
diff --git a/cmd/nerdctl/network/network_create_linux_test.go b/cmd/nerdctl/network/network_create_linux_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package main
+package network
 
 import (
 	"fmt"
diff --git a/cmd/nerdctl/network/network_create_unix.go b/cmd/nerdctl/network/network_create_unix.go
@@ -16,6 +16,6 @@
    limitations under the License.
 */
 
-package main
+package network
 
 const DefaultNetworkDriver = "bridge"
diff --git a/cmd/nerdctl/network/network_create_windows.go b/cmd/nerdctl/network/network_create_windows.go
@@ -14,6 +14,6 @@
    limitations under the License.
 */
 
-package main
+package network
 
 const DefaultNetworkDriver = "nat"
diff --git a/cmd/nerdctl/network/network_inspect.go b/cmd/nerdctl/network/network_inspect.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package main
+package network
 
 import (
 	"github.com/spf13/cobra"
diff --git a/cmd/nerdctl/network/network_inspect_test.go b/cmd/nerdctl/network/network_inspect_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package main
+package network
 
 import (
 	"runtime"
diff --git a/cmd/nerdctl/network/network_list.go b/cmd/nerdctl/network/network_list.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package main
+package network
 
 import (
 	"github.com/spf13/cobra"
diff --git a/cmd/nerdctl/network/network_list_linux_test.go b/cmd/nerdctl/network/network_list_linux_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package main
+package network
 
 import (
 	"errors"
diff --git a/cmd/nerdctl/network/network_prune.go b/cmd/nerdctl/network/network_prune.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package main
+package network
 
 import (
 	"fmt"
@@ -28,7 +28,7 @@ import (
 	"github.com/containerd/nerdctl/v2/pkg/cmd/network"
 )
 
-var networkDriversToKeep = []string{"host", "none", DefaultNetworkDriver}
+var NetworkDriversToKeep = []string{"host", "none", DefaultNetworkDriver}
 
 func newNetworkPruneCommand() *cobra.Command {
 	networkPruneCommand := &cobra.Command{
@@ -67,7 +67,7 @@ func networkPruneAction(cmd *cobra.Command, _ []string) error {
 	}
 	options := types.NetworkPruneOptions{
 		GOptions:             globalOptions,
-		NetworkDriversToKeep: networkDriversToKeep,
+		NetworkDriversToKeep: NetworkDriversToKeep,
 		Stdout:               cmd.OutOrStdout(),
 	}
 
diff --git a/cmd/nerdctl/network/network_prune_linux_test.go b/cmd/nerdctl/network/network_prune_linux_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package main
+package network
 
 import (
 	"testing"
diff --git a/cmd/nerdctl/network/network_remove.go b/cmd/nerdctl/network/network_remove.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package main
+package network
 
 import (
 	"github.com/spf13/cobra"
diff --git a/cmd/nerdctl/network/network_remove_linux_test.go b/cmd/nerdctl/network/network_remove_linux_test.go
@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package main
+package network
 
 import (
 	"testing"
diff --git a/cmd/nerdctl/network/network_test.go b/cmd/nerdctl/network/network_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 network
+
+import (
+	"testing"
+
+	"github.com/containerd/nerdctl/v2/pkg/testutil"
+)
+
+func TestMain(m *testing.M) {
+	testutil.M(m)
+}
diff --git a/cmd/nerdctl/system_prune.go b/cmd/nerdctl/system_prune.go
@@ -25,6 +25,7 @@ import (
 	"github.com/containerd/log"
 
 	"github.com/containerd/nerdctl/v2/cmd/nerdctl/helpers"
+	"github.com/containerd/nerdctl/v2/cmd/nerdctl/network"
 	"github.com/containerd/nerdctl/v2/pkg/api/types"
 	"github.com/containerd/nerdctl/v2/pkg/clientutil"
 	"github.com/containerd/nerdctl/v2/pkg/cmd/system"
@@ -74,7 +75,7 @@ func processSystemPruneOptions(cmd *cobra.Command) (types.SystemPruneOptions, er
 		All:                  all,
 		Volumes:              vFlag,
 		BuildKitHost:         buildkitHost,
-		NetworkDriversToKeep: networkDriversToKeep,
+		NetworkDriversToKeep: network.NetworkDriversToKeep,
 	}, nil
 }
 
