Define constants for all parameter names

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

Author: Ian Campbell

internal/commands/cnab.go

@@ -199,7 +199,7 @@ func resolveBundle(dockerCli command.Cli, name string, pullRef bool, insecureReg
 
 func requiredClaimBindMount(c claim.Claim, targetContextName string, dockerCli command.Cli) (bindMount, error) {
 	var specifiedOrchestrator string
-	if rawOrchestrator, ok := c.Parameters[internal.Namespace+"orchestrator"]; ok {
+	if rawOrchestrator, ok := c.Parameters[internal.ParameterOrchestratorName]; ok {
 		specifiedOrchestrator = rawOrchestrator.(string)
 	}
 

internal/commands/parameters.go

@@ -37,11 +37,11 @@ func withCommandLineParameters(overrides []string) parameterOperation {
 
 func withOrchestratorParameters(orchestrator string, kubeNamespace string) parameterOperation {
 	return func(bndl *bundle.Bundle, params map[string]string) error {
-		if _, ok := bndl.Parameters[internal.Namespace+"orchestrator"]; ok {
-			params[internal.Namespace+"orchestrator"] = orchestrator
+		if _, ok := bndl.Parameters[internal.ParameterOrchestratorName]; ok {
+			params[internal.ParameterOrchestratorName] = orchestrator
 		}
-		if _, ok := bndl.Parameters[internal.Namespace+"kubernetes-namespace"]; ok {
-			params[internal.Namespace+"kubernetes-namespace"] = kubeNamespace
+		if _, ok := bndl.Parameters[internal.ParameterKubernetesNamespaceName]; ok {
+			params[internal.ParameterKubernetesNamespaceName] = kubeNamespace
 		}
 		return nil
 	}

internal/commands/parameters_test.go

@@ -58,12 +58,12 @@ func TestWithOrchestratorParameters(t *testing.T) {
 		{
 			name: "Bundle with orchestrator params",
 			parameters: map[string]bundle.ParameterDefinition{
-				internal.Namespace + "orchestrator":         {},
-				internal.Namespace + "kubernetes-namespace": {},
+				internal.ParameterOrchestratorName:        {},
+				internal.ParameterKubernetesNamespaceName: {},
 			},
 			expected: map[string]string{
-				internal.Namespace + "orchestrator":         "kubernetes",
-				internal.Namespace + "kubernetes-namespace": "my-namespace",
+				internal.ParameterOrchestratorName:        "kubernetes",
+				internal.ParameterKubernetesNamespaceName: "my-namespace",
 			},
 		},
 		{

internal/commands/render.go

@@ -57,7 +57,7 @@ func runRender(dockerCli command.Cli, appname string, opts renderOptions) error
 	if err != nil {
 		return err
 	}
-	c.Parameters[internal.Namespace+"render-format"] = opts.formatDriver
+	c.Parameters[internal.ParameterRenderFormatName] = opts.formatDriver
 
 	if err := a.Run(c, nil, nil); err != nil {
 		return fmt.Errorf("render failed: %s", errBuf)

internal/names.go

@@ -37,6 +37,13 @@ const (
 	// CredentialDockerContextPath is the path to the credential containing a Docker context
 	CredentialDockerContextPath = "/cnab/app/context.dockercontext"
 
+	// ParameterOrchestratorName is the name of the parameter containing the orchestrator
+	ParameterOrchestratorName = Namespace + "orchestrator"
+	// ParameterKubernetesNamespaceName is the name of the parameter containing the kubernetes namespace
+	ParameterKubernetesNamespaceName = Namespace + "kubernetes-namespace"
+	// ParameterRenderFormatName is the name of the parameter containing the kubernetes namespace
+	ParameterRenderFormatName = Namespace + "render-format"
+
 	// DockerStackOrchestratorEnvVar is the environment variable set by the CNAB runtime to select
 	// the stack orchestrator.
 	DockerStackOrchestratorEnvVar = "DOCKER_STACK_ORCHESTRATOR"

internal/packager/cnab.go

@@ -12,7 +12,7 @@ func ToCNAB(app *types.App, invocationImageName string) (*bundle.Bundle, error)
 	mapping := ExtractCNABParameterMapping(app.Parameters())
 	flatParameters := app.Parameters().Flatten()
 	parameters := map[string]bundle.ParameterDefinition{
-		internal.Namespace + "orchestrator": {
+		internal.ParameterOrchestratorName: {
 			DataType: "string",
 			AllowedValues: []interface{}{
 				"",
@@ -33,7 +33,7 @@ func ToCNAB(app *types.App, invocationImageName string) (*bundle.Bundle, error)
 				internal.ActionStatusName,
 			},
 		},
-		internal.Namespace + "kubernetes-namespace": {
+		internal.ParameterKubernetesNamespaceName: {
 			DataType:     "string",
 			DefaultValue: "",
 			Destination: &bundle.Location{
@@ -49,7 +49,7 @@ func ToCNAB(app *types.App, invocationImageName string) (*bundle.Bundle, error)
 				internal.ActionStatusName,
 			},
 		},
-		internal.Namespace + "render-format": {
+		internal.ParameterRenderFormatName: {
 			DataType: "string",
 			AllowedValues: []interface{}{
 				"yaml",