Move constants Categroy/Management to helpers

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

Author: apostasie

cmd/nerdctl/apparmor_linux.go

@@ -18,11 +18,13 @@ package main
 
 import (
 	"github.com/spf13/cobra"
+
+	"github.com/containerd/nerdctl/v2/cmd/nerdctl/helpers"
 )
 
 func newApparmorCommand() *cobra.Command {
 	cmd := &cobra.Command{
-		Annotations:   map[string]string{Category: Management},
+		Annotations:   map[string]string{helpers.Category: helpers.Management},
 		Use:           "apparmor",
 		Short:         "Manage AppArmor profiles",
 		RunE:          unknownSubcommandAction,

cmd/nerdctl/builder.go

@@ -32,7 +32,7 @@ import (
 
 func newBuilderCommand() *cobra.Command {
 	var builderCommand = &cobra.Command{
-		Annotations:   map[string]string{Category: Management},
+		Annotations:   map[string]string{helpers.Category: helpers.Management},
 		Use:           "builder",
 		Short:         "Manage builds",
 		RunE:          unknownSubcommandAction,

cmd/nerdctl/container.go

@@ -18,11 +18,13 @@ package main
 
 import (
 	"github.com/spf13/cobra"
+
+	"github.com/containerd/nerdctl/v2/cmd/nerdctl/helpers"
 )
 
 func newContainerCommand() *cobra.Command {
 	containerCommand := &cobra.Command{
-		Annotations:   map[string]string{Category: Management},
+		Annotations:   map[string]string{helpers.Category: helpers.Management},
 		Use:           "container",
 		Short:         "Manage containers",
 		RunE:          unknownSubcommandAction,

cmd/nerdctl/helpers/consts.go

@@ -0,0 +1,22 @@
+/*
+   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 helpers
+
+const (
+	Category   = "category"
+	Management = "management"
+)

cmd/nerdctl/image.go

@@ -18,11 +18,13 @@ package main
 
 import (
 	"github.com/spf13/cobra"
+
+	"github.com/containerd/nerdctl/v2/cmd/nerdctl/helpers"
 )
 
 func newImageCommand() *cobra.Command {
 	cmd := &cobra.Command{
-		Annotations:   map[string]string{Category: Management},
+		Annotations:   map[string]string{helpers.Category: helpers.Management},
 		Use:           "image",
 		Short:         "Manage images",
 		RunE:          unknownSubcommandAction,

cmd/nerdctl/ipfs.go

@@ -18,11 +18,13 @@ package main
 
 import (
 	"github.com/spf13/cobra"
+
+	"github.com/containerd/nerdctl/v2/cmd/nerdctl/helpers"
 )
 
 func newIPFSCommand() *cobra.Command {
 	cmd := &cobra.Command{
-		Annotations:   map[string]string{Category: Management},
+		Annotations:   map[string]string{helpers.Category: helpers.Management},
 		Use:           "ipfs",
 		Short:         "Distributing images on IPFS",
 		RunE:          unknownSubcommandAction,

cmd/nerdctl/ipfs_registry.go

@@ -18,11 +18,13 @@ package main
 
 import (
 	"github.com/spf13/cobra"
+
+	"github.com/containerd/nerdctl/v2/cmd/nerdctl/helpers"
 )
 
 func newIPFSRegistryCommand() *cobra.Command {
 	cmd := &cobra.Command{
-		Annotations:   map[string]string{Category: Management},
+		Annotations:   map[string]string{helpers.Category: helpers.Management},
 		Use:           "registry",
 		Short:         "Manage read-only registry backed by IPFS",
 		PreRunE:       checkExperimental("ipfs"),

cmd/nerdctl/main.go

@@ -42,11 +42,6 @@ import (
 	"github.com/containerd/nerdctl/v2/pkg/version"
 )
 
-const (
-	Category   = "category"
-	Management = "management"
-)
-
 var (
 	// To print Bold Text
 	Bold = color.New(color.Bold).SprintfFunc()
@@ -75,7 +70,7 @@ func usage(c *cobra.Command) error {
 		if f.Hidden {
 			continue
 		}
-		if f.Annotations[Category] == Management {
+		if f.Annotations[helpers.Category] == helpers.Management {
 			managementCommands = append(managementCommands, f)
 		} else {
 			nonManagementCommands = append(nonManagementCommands, f)
@@ -103,7 +98,7 @@ func usage(c *cobra.Command) error {
 		t += "\n"
 		return t
 	}
-	s += printCommands("Management commands", managementCommands)
+	s += printCommands("helpers.Management commands", managementCommands)
 	s += printCommands("Commands", nonManagementCommands)
 
 	s += Bold("Flags") + ":\n"
@@ -293,7 +288,7 @@ Config file ($NERDCTL_TOML): %s
 		newTopCommand(),
 		newStatsCommand(),
 
-		// #region Management
+		// #region helpers.Management
 		newContainerCommand(),
 		newImageCommand(),
 		newNetworkCommand(),

cmd/nerdctl/namespace.go

@@ -35,7 +35,7 @@ import (
 
 func newNamespaceCommand() *cobra.Command {
 	namespaceCommand := &cobra.Command{
-		Annotations:   map[string]string{Category: Management},
+		Annotations:   map[string]string{helpers.Category: helpers.Management},
 		Use:           "namespace",
 		Aliases:       []string{"ns"},
 		Short:         "Manage containerd namespaces",

cmd/nerdctl/network.go

@@ -18,11 +18,13 @@ package main
 
 import (
 	"github.com/spf13/cobra"
+
+	"github.com/containerd/nerdctl/v2/cmd/nerdctl/helpers"
 )
 
 func newNetworkCommand() *cobra.Command {
 	networkCommand := &cobra.Command{
-		Annotations:   map[string]string{Category: Management},
+		Annotations:   map[string]string{helpers.Category: helpers.Management},
 		Use:           "network",
 		Short:         "Manage networks",
 		RunE:          unknownSubcommandAction,