Define constants for all custom actions

There is one small semantic change here which is that the `prepareCustomAction`
helper now takes the full qualified/namespaced name and not just the suffix.

This is no longer valid to be used as the argument to `claim.New(...)` however
as far as I can tell that string is completely arbitrary and is never used (we
never store this claim) so it might as well be some hardcoded string.

Signed-off-by: Ian Campbell <ijc@docker.com>

Author: Ian Campbell

cmd/cnab-run/main.go

@@ -12,12 +12,12 @@ type cnabAction func(string) error
 
 var (
 	cnabActions = map[string]cnabAction{
-		"install":                      installAction,
-		"upgrade":                      installAction,
-		"uninstall":                    uninstallAction,
-		internal.Namespace + "status":  statusAction,
-		internal.Namespace + "inspect": inspectAction,
-		internal.Namespace + "render":  renderAction,
+		"install":                  installAction,
+		"upgrade":                  installAction,
+		"uninstall":                uninstallAction,
+		internal.ActionStatusName:  statusAction,
+		internal.ActionInspectName: inspectAction,
+		internal.ActionRenderName:  renderAction,
 	}
 )
 

internal/commands/cnab.go

@@ -253,7 +253,7 @@ func isDockerHostLocal(host string) bool {
 func prepareCustomAction(actionName string, dockerCli command.Cli, appname string, stdout io.Writer,
 	registryOpts registryOptions, pullOpts pullOptions, paramsOpts parametersOptions) (*action.RunCustom, *claim.Claim, *bytes.Buffer, error) {
 
-	c, err := claim.New(actionName)
+	c, err := claim.New("custom-action")
 	if err != nil {
 		return nil, nil, nil, err
 	}
@@ -277,7 +277,7 @@ func prepareCustomAction(actionName string, dockerCli command.Cli, appname strin
 	c.Parameters = parameters
 
 	a := &action.RunCustom{
-		Action: internal.Namespace + actionName,
+		Action: actionName,
 		Driver: driverImpl,
 	}
 	return a, c, errBuf, nil

internal/commands/inspect.go

@@ -3,6 +3,7 @@ package commands
 import (
 	"fmt"
 
+	"github.com/docker/app/internal"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/spf13/cobra"
@@ -32,7 +33,7 @@ func inspectCmd(dockerCli command.Cli) *cobra.Command {
 
 func runInspect(dockerCli command.Cli, appname string, opts inspectOptions) error {
 	defer muteDockerCli(dockerCli)()
-	a, c, errBuf, err := prepareCustomAction("inspect", dockerCli, appname, nil, opts.registryOptions, opts.pullOptions, opts.parametersOptions)
+	a, c, errBuf, err := prepareCustomAction(internal.ActionInspectName, dockerCli, appname, nil, opts.registryOptions, opts.pullOptions, opts.parametersOptions)
 	if err != nil {
 		return err
 	}

internal/commands/render.go

@@ -53,7 +53,7 @@ func runRender(dockerCli command.Cli, appname string, opts renderOptions) error
 		w = f
 	}
 
-	a, c, errBuf, err := prepareCustomAction("render", dockerCli, appname, w, opts.registryOptions, opts.pullOptions, opts.parametersOptions)
+	a, c, errBuf, err := prepareCustomAction(internal.ActionRenderName, dockerCli, appname, w, opts.registryOptions, opts.pullOptions, opts.parametersOptions)
 	if err != nil {
 		return err
 	}

internal/commands/status.go

@@ -55,7 +55,7 @@ func runStatus(dockerCli command.Cli, claimName string, opts credentialOptions)
 		return err
 	}
 	status := &action.RunCustom{
-		Action: internal.Namespace + "status",
+		Action: internal.ActionStatusName,
 		Driver: driverImpl,
 	}
 	if err := status.Run(&c, creds, dockerCli.Out()); err != nil {

internal/names.go

@@ -25,6 +25,13 @@ const (
 	// Namespace is the reverse DNS namespace used with labels and CNAB custom actions.
 	Namespace = "com.docker.app."
 
+	// ActionStatusName is the name of the custom "status" action
+	ActionStatusName = Namespace + "status"
+	// ActionInspectName is the name of the custom "inspect" action
+	ActionInspectName = Namespace + "inspect"
+	// ActionRenderName is the name of the custom "render" action
+	ActionRenderName = Namespace + "render"
+
 	// DockerStackOrchestratorEnvVar is the environment variable set by the CNAB runtime to select
 	// the stack orchestrator.
 	DockerStackOrchestratorEnvVar = "DOCKER_STACK_ORCHESTRATOR"

internal/packager/cnab.go

@@ -30,7 +30,7 @@ func ToCNAB(app *types.App, invocationImageName string) (*bundle.Bundle, error)
 				"install",
 				"upgrade",
 				"uninstall",
-				internal.Namespace + "status",
+				internal.ActionStatusName,
 			},
 		},
 		internal.Namespace + "kubernetes-namespace": {
@@ -46,7 +46,7 @@ func ToCNAB(app *types.App, invocationImageName string) (*bundle.Bundle, error)
 				"install",
 				"upgrade",
 				"uninstall",
-				internal.Namespace + "status",
+				internal.ActionStatusName,
 			},
 		},
 		internal.Namespace + "render-format": {
@@ -63,7 +63,7 @@ func ToCNAB(app *types.App, invocationImageName string) (*bundle.Bundle, error)
 				Description: "Output format for the render command",
 			},
 			ApplyTo: []string{
-				internal.Namespace + "render",
+				internal.ActionRenderName,
 			},
 		},
 	}
@@ -109,15 +109,15 @@ func ToCNAB(app *types.App, invocationImageName string) (*bundle.Bundle, error)
 		Version:     app.Metadata().Version,
 		Parameters:  parameters,
 		Actions: map[string]bundle.Action{
-			internal.Namespace + "inspect": {
+			internal.ActionInspectName: {
 				Modifies:  false,
 				Stateless: true,
 			},
-			internal.Namespace + "render": {
+			internal.ActionRenderName: {
 				Modifies:  false,
 				Stateless: true,
 			},
-			internal.Namespace + "status": {
+			internal.ActionStatusName: {
 				Modifies: false,
 			},
 		},