Playground: Plugin Library

cmd/porter/aliases.go

@@ -3,6 +3,7 @@ package main
 import (
 	"strings"
 
+	"get.porter.sh/porter/pkg/cli"
 	"get.porter.sh/porter/pkg/porter"
 	"github.com/spf13/cobra"
 )
@@ -30,126 +31,110 @@ func buildAliasCommands(p *porter.Porter) []*cobra.Command {
 func buildCreateAlias(p *porter.Porter) *cobra.Command {
 	cmd := buildBundleCreateCommand(p)
 	cmd.Example = strings.Replace(cmd.Example, "porter bundle create", "porter create", -1)
-	cmd.Annotations = map[string]string{
-		"group": "alias",
-	}
+	cli.SetCommandGroup(cmd, "alias")
 	return cmd
 }
 
 func buildBuildAlias(p *porter.Porter) *cobra.Command {
 	cmd := buildBundleBuildCommand(p)
 	cmd.Example = strings.Replace(cmd.Example, "porter bundle build", "porter build", -1)
-	cmd.Annotations = map[string]string{
-		"group": "alias",
-	}
+	cli.SetCommandGroup(cmd, "alias")
 	return cmd
 }
 
 func buildLintAlias(p *porter.Porter) *cobra.Command {
 	cmd := buildBundleLintCommand(p)
 	cmd.Example = strings.Replace(cmd.Example, "porter bundle lint", "porter lint", -1)
-	cmd.Annotations = map[string]string{
-		"group": "alias",
-	}
+	cli.SetCommandGroup(cmd, "alias")
+
 	return cmd
 }
 
 func buildInstallAlias(p *porter.Porter) *cobra.Command {
 	cmd := buildBundleInstallCommand(p)
 	cmd.Example = strings.Replace(cmd.Example, "porter bundle install", "porter install", -1)
-	cmd.Annotations = map[string]string{
-		"group": "alias",
-	}
+	cli.SetCommandGroup(cmd, "alias")
+
 	return cmd
 }
 
 func buildUpgradeAlias(p *porter.Porter) *cobra.Command {
 	cmd := buildBundleUpgradeCommand(p)
 	cmd.Example = strings.Replace(cmd.Example, "porter bundle upgrade", "porter upgrade", -1)
-	cmd.Annotations = map[string]string{
-		"group": "alias",
-	}
+	cli.SetCommandGroup(cmd, "alias")
+
 	return cmd
 }
 
 func buildInvokeAlias(p *porter.Porter) *cobra.Command {
 	cmd := buildBundleInvokeCommand(p)
 	cmd.Example = strings.Replace(cmd.Example, "porter bundle invoke", "porter invoke", -1)
-	cmd.Annotations = map[string]string{
-		"group": "alias",
-	}
+	cli.SetCommandGroup(cmd, "alias")
+
 	return cmd
 }
 
 func buildUninstallAlias(p *porter.Porter) *cobra.Command {
 	cmd := buildBundleUninstallCommand(p)
 	cmd.Example = strings.Replace(cmd.Example, "porter bundle uninstall", "porter uninstall", -1)
-	cmd.Annotations = map[string]string{
-		"group": "alias",
-	}
+	cli.SetCommandGroup(cmd, "alias")
+
 	return cmd
 }
 
 func buildPublishAlias(p *porter.Porter) *cobra.Command {
 	cmd := buildBundlePublishCommand(p)
 	cmd.Example = strings.Replace(cmd.Example, "porter bundle publish", "porter publish", -1)
-	cmd.Annotations = map[string]string{
-		"group": "alias",
-	}
+	cli.SetCommandGroup(cmd, "alias")
+
 	return cmd
 }
 
 func buildShowAlias(p *porter.Porter) *cobra.Command {
 	cmd := buildInstallationShowCommand(p)
 	cmd.Example = strings.Replace(cmd.Example, "porter installation show", "porter show", -1)
-	cmd.Annotations = map[string]string{
-		"group": "alias",
-	}
+	cli.SetCommandGroup(cmd, "alias")
+
 	return cmd
 }
 
 func buildListAlias(p *porter.Porter) *cobra.Command {
 	cmd := buildInstallationsListCommand(p)
 	cmd.Example = strings.Replace(cmd.Example, "porter installations list", "porter list", -1)
-	cmd.Annotations = map[string]string{
-		"group": "alias",
-	}
+	cli.SetCommandGroup(cmd, "alias")
+
 	return cmd
 }
 
 func buildArchiveAlias(p *porter.Porter) *cobra.Command {
 	cmd := buildBundleArchiveCommand(p)
 	cmd.Example = strings.Replace(cmd.Example, "porter bundle archive", "porter archive", -1)
-	cmd.Annotations = map[string]string{
-		"group": "alias",
-	}
+	cli.SetCommandGroup(cmd, "alias")
+
 	return cmd
 }
 
 func buildExplainAlias(p *porter.Porter) *cobra.Command {
 	cmd := buildBundleExplainCommand(p)
 	cmd.Example = strings.Replace(cmd.Example, "porter bundle explain", "porter explain", -1)
-	cmd.Annotations = map[string]string{
-		"group": "alias",
-	}
+	cli.SetCommandGroup(cmd, "alias")
+
 	return cmd
 }
 
 func buildCopyAlias(p *porter.Porter) *cobra.Command {
 	cmd := buildBundleCopyCommand(p)
 	cmd.Example = strings.Replace(cmd.Example, "porter bundle copy", "porter copy", -1)
-	cmd.Annotations = map[string]string{
-		"group": "alias",
-	}
+	cli.SetCommandGroup(cmd, "alias")
+
 	return cmd
 }
 
 func buildInspectAlias(p *porter.Porter) *cobra.Command {
 	cmd := buildBundleInspectCommand(p)
 	cmd.Example = strings.Replace(cmd.Example, "porter bundle inspect", "porter inspect", -1)
-	cmd.Annotations = map[string]string{
-		"group": "alias",
-	}
+	cli.SetCommandGroup(cmd, "alias")
+
 	return cmd
 }
 
@@ -158,8 +143,7 @@ func buildLogsAlias(p *porter.Porter) *cobra.Command {
 	cmd.Use = "logs"
 	cmd.Aliases = []string{"log"}
 	cmd.Example = strings.Replace(cmd.Example, "porter installation logs show", "porter logs", -1)
-	cmd.Annotations = map[string]string{
-		"group": "alias",
-	}
+	cli.SetCommandGroup(cmd, "alias")
+
 	return cmd
 }

cmd/porter/bundle.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"strings"
 
+	"get.porter.sh/porter/pkg/cli"
 	"get.porter.sh/porter/pkg/porter"
 	"github.com/spf13/cobra"
 )
@@ -15,9 +16,7 @@ func buildBundleCommands(p *porter.Porter) *cobra.Command {
 		Short:   "Bundle commands",
 		Long:    "Commands for working with bundles. These all have shortcuts so that you can call these commands without the bundle resource prefix. For example, porter bundle install is available as porter install as well.",
 	}
-	cmd.Annotations = map[string]string{
-		"group": "resource",
-	}
+	cli.SetCommandGroup(cmd, "resource")
 
 	cmd.AddCommand(buildBundleCreateCommand(p))
 	cmd.AddCommand(buildBundleBuildCommand(p))

cmd/porter/completion.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"get.porter.sh/porter/pkg/cli"
 	"get.porter.sh/porter/pkg/porter"
 	"github.com/spf13/cobra"
 )
@@ -29,9 +30,8 @@ For additional details see: https://porter.sh/install#command-completion`,
 			}
 		},
 	}
-	cmd.Annotations = map[string]string{
-		"group":    "meta",
-		skipConfig: "",
-	}
+	cli.SetCommandGroup(cmd, "meta")
+	cli.SkipConfigForCommand(cmd)
+
 	return cmd
 }

cmd/porter/completion_test.go

@@ -5,6 +5,7 @@ import (
 	"os"
 	"testing"
 
+	"get.porter.sh/porter/pkg/cli"
 	"get.porter.sh/porter/pkg/porter"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -29,6 +30,6 @@ func TestCompletion(t *testing.T) {
 func TestCompletion_SkipConfig(t *testing.T) {
 	p := porter.NewTestPorter(t)
 	cmd := buildCompletionCommand(p.Porter)
-	shouldSkip := shouldSkipConfig(cmd)
+	shouldSkip := cli.ShouldSkipConfig(cmd)
 	require.True(t, shouldSkip, "expected that we skip loading configuration for the completion command")
 }

cmd/porter/credentials.go

@@ -1,17 +1,18 @@
 package main
 
 import (
+	"get.porter.sh/porter/pkg/cli"
 	"get.porter.sh/porter/pkg/porter"
 	"github.com/spf13/cobra"
 )
 
 func buildCredentialsCommands(p *porter.Porter) *cobra.Command {
 	cmd := &cobra.Command{
-		Use:         "credentials",
-		Aliases:     []string{"credential", "cred", "creds"},
-		Annotations: map[string]string{"group": "resource"},
-		Short:       "Credentials commands",
+		Use:     "credentials",
+		Aliases: []string{"credential", "cred", "creds"},
+		Short:   "Credentials commands",
 	}
+	cli.SetCommandGroup(cmd, "resource")
 
 	cmd.AddCommand(buildCredentialsApplyCommand(p))
 	cmd.AddCommand(buildCredentialsEditCommand(p))

cmd/porter/docs.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"get.porter.sh/porter/pkg/cli"
 	"get.porter.sh/porter/pkg/docs"
 	"get.porter.sh/porter/pkg/porter"
 	"github.com/spf13/cobra"
@@ -23,10 +24,8 @@ func buildDocsCommand(p *porter.Porter) *cobra.Command {
 		},
 	}
 
-	cmd.Annotations = map[string]string{
-		"group":    "meta",
-		skipConfig: "",
-	}
+	cli.SkipConfigForCommand(cmd)
+	cli.SetCommandGroup(cmd, "meta")
 
 	flags := cmd.Flags()
 	flags.StringVarP(&opts.Destination, "dest", "d", docs.DefaultDestination,

cmd/porter/installations.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"get.porter.sh/porter/pkg/cli"
 	"get.porter.sh/porter/pkg/porter"
 	"github.com/spf13/cobra"
 )
@@ -12,9 +13,7 @@ func buildInstallationCommands(p *porter.Porter) *cobra.Command {
 		Short:   "Installation commands",
 		Long:    "Commands for working with installations of a bundle",
 	}
-	cmd.Annotations = map[string]string{
-		"group": "resource",
-	}
+	cli.SetCommandGroup(cmd, "resource")
 
 	cmd.AddCommand(buildInstallationsListCommand(p))
 	cmd.AddCommand(buildInstallationShowCommand(p))

cmd/porter/logs.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"get.porter.sh/porter/pkg/cli"
 	"get.porter.sh/porter/pkg/porter"
 	"github.com/spf13/cobra"
 )
@@ -12,9 +13,7 @@ func buildInstallationLogCommands(p *porter.Porter) *cobra.Command {
 		Short:   "Installation Logs commands",
 		Long:    "Commands for working with installation logs",
 	}
-	cmd.Annotations = map[string]string{
-		"group": "resource",
-	}
+	cli.SetCommandGroup(cmd, "resource")
 
 	cmd.AddCommand(buildInstallationLogShowCommand(p))