Update some missed namespacing

These appear to have been missed in 966cd4c0d3a5 ("Change custom parameters
prefix from "docker" to reverse DNS "com.docker.app"").

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

Author: Ian Campbell

examples/cnab-simple/bundle.json

@@ -22,7 +22,7 @@
 		}
 	},
 	"parameters": {
-		"docker.kubernetes-namespace": {
+		"com.docker.app.kubernetes-namespace": {
 			"type": "string",
 			"defaultValue": "",
 			"required": false,
@@ -34,7 +34,7 @@
 				"env": "DOCKER_KUBERNETES_NAMESPACE"
 			}
 		},
-		"docker.orchestrator": {
+		"com.docker.app.orchestrator": {
 			"type": "string",
 			"defaultValue": "",
 			"allowedValues": [
@@ -88,4 +88,4 @@
 			"env": ""
 		}
 	}
-}
+}

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["docker.orchestrator"]; ok {
+	if rawOrchestrator, ok := c.Parameters[internal.Namespace+"orchestrator"]; ok {
 		specifiedOrchestrator = rawOrchestrator.(string)
 	}
 

internal/commands/parameters.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/deislabs/duffle/pkg/bundle"
+	"github.com/docker/app/internal"
 	"github.com/docker/app/types/parameters"
 	cliopts "github.com/docker/cli/opts"
 	"github.com/pkg/errors"
@@ -36,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["docker.orchestrator"]; ok {
-			params["docker.orchestrator"] = orchestrator
+		if _, ok := bndl.Parameters[internal.Namespace+"orchestrator"]; ok {
+			params[internal.Namespace+"orchestrator"] = orchestrator
 		}
-		if _, ok := bndl.Parameters["docker.kubernetes-namespace"]; ok {
-			params["docker.kubernetes-namespace"] = kubeNamespace
+		if _, ok := bndl.Parameters[internal.Namespace+"kubernetes-namespace"]; ok {
+			params[internal.Namespace+"kubernetes-namespace"] = kubeNamespace
 		}
 		return nil
 	}

internal/commands/parameters_test.go

@@ -4,6 +4,7 @@ import (
 	"testing"
 
 	"github.com/deislabs/duffle/pkg/bundle"
+	"github.com/docker/app/internal"
 	"gotest.tools/assert"
 	"gotest.tools/assert/cmp"
 	"gotest.tools/fs"
@@ -57,12 +58,12 @@ func TestWithOrchestratorParameters(t *testing.T) {
 		{
 			name: "Bundle with orchestrator params",
 			parameters: map[string]bundle.ParameterDefinition{
-				"docker.orchestrator":         {},
-				"docker.kubernetes-namespace": {},
+				internal.Namespace + "orchestrator":         {},
+				internal.Namespace + "kubernetes-namespace": {},
 			},
 			expected: map[string]string{
-				"docker.orchestrator":         "kubernetes",
-				"docker.kubernetes-namespace": "my-namespace",
+				internal.Namespace + "orchestrator":         "kubernetes",
+				internal.Namespace + "kubernetes-namespace": "my-namespace",
 			},
 		},
 		{