Extract cnab-run environment variables as constants.

Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>

Author: silvin-lubecki

cmd/cnab-run/env.go

@@ -12,7 +12,6 @@ import (
 )
 
 const (
-	envVarOchestrator = "DOCKER_STACK_ORCHESTRATOR"
 	fileDockerContext = "/cnab/app/context.dockercontext"
 )
 

cmd/cnab-run/install.go

@@ -6,6 +6,7 @@ import (
 	"os"
 
 	"github.com/deislabs/duffle/pkg/bundle"
+	"github.com/docker/app/internal"
 	"github.com/docker/app/internal/packager"
 	"github.com/docker/app/render"
 	"github.com/docker/cli/cli/command"
@@ -34,7 +35,7 @@ func installAction(instanceName string) error {
 	}
 	defer app.Cleanup()
 
-	orchestratorRaw := os.Getenv(envVarOchestrator)
+	orchestratorRaw := os.Getenv(internal.DockerStackOrchestratorEnvVar)
 	orchestrator, err := cli.StackOrchestrator(orchestratorRaw)
 	if err != nil {
 		return err
@@ -62,7 +63,7 @@ func installAction(instanceName string) error {
 func getFlagset(orchestrator command.Orchestrator) *pflag.FlagSet {
 	result := pflag.NewFlagSet("", pflag.ContinueOnError)
 	if orchestrator == command.OrchestratorKubernetes {
-		result.String("namespace", os.Getenv("DOCKER_KUBERNETES_NAMESPACE"), "")
+		result.String("namespace", os.Getenv(internal.DockerKubernetesNamespaceEnvVar), "")
 	}
 	return result
 }

cmd/cnab-run/status.go

@@ -3,6 +3,7 @@ package main
 import (
 	"os"
 
+	"github.com/docker/app/internal"
 	"github.com/docker/cli/cli/command/stack"
 	"github.com/docker/cli/cli/command/stack/options"
 	"github.com/docker/cli/opts"
@@ -14,7 +15,7 @@ func statusAction(instanceName string) error {
 	if err != nil {
 		return errors.Wrap(err, "unable to restore docker context")
 	}
-	orchestratorRaw := os.Getenv(envVarOchestrator)
+	orchestratorRaw := os.Getenv(internal.DockerStackOrchestratorEnvVar)
 	orchestrator, err := cli.StackOrchestrator(orchestratorRaw)
 	if err != nil {
 		return err

cmd/cnab-run/uninstall.go

@@ -3,6 +3,7 @@ package main
 import (
 	"os"
 
+	"github.com/docker/app/internal"
 	"github.com/docker/cli/cli/command/stack"
 	"github.com/docker/cli/cli/command/stack/options"
 	"github.com/pkg/errors"
@@ -13,7 +14,7 @@ func uninstallAction(instanceName string) error {
 	if err != nil {
 		return errors.Wrap(err, "unable to restore docker context")
 	}
-	orchestratorRaw := os.Getenv(envVarOchestrator)
+	orchestratorRaw := os.Getenv(internal.DockerStackOrchestratorEnvVar)
 	orchestrator, err := cli.StackOrchestrator(orchestratorRaw)
 	if err != nil {
 		return err

internal/names.go

@@ -24,6 +24,13 @@ const (
 
 	// Namespace is the reverse DNS namespace used with labels and CNAB custom actions.
 	Namespace = "com.docker.app."
+
+	// DockerStackOrchestratorEnvVar is the environment variable set by the CNAB runtime to select
+	// the stack orchestrator.
+	DockerStackOrchestratorEnvVar = "DOCKER_STACK_ORCHESTRATOR"
+	// DockerKubernetesNamespaceEnvVar is the environment variable set by the CNAB runtime to select
+	// the kubernetes namespace.
+	DockerKubernetesNamespaceEnvVar = "DOCKER_KUBERNETES_NAMESPACE"
 )
 
 var (

internal/packager/cnab.go

@@ -21,7 +21,7 @@ func ToCNAB(app *types.App, invocationImageName string) (*bundle.Bundle, error)
 			},
 			DefaultValue: "",
 			Destination: &bundle.Location{
-				EnvironmentVariable: "DOCKER_STACK_ORCHESTRATOR",
+				EnvironmentVariable: internal.DockerStackOrchestratorEnvVar,
 			},
 			Metadata: &bundle.ParameterMetadata{
 				Description: "Orchestrator on which to deploy",
@@ -30,7 +30,7 @@ func ToCNAB(app *types.App, invocationImageName string) (*bundle.Bundle, error)
 		"docker.kubernetes-namespace": {
 			DataType: "string",
 			Destination: &bundle.Location{
-				EnvironmentVariable: "DOCKER_KUBERNETES_NAMESPACE",
+				EnvironmentVariable: internal.DockerKubernetesNamespaceEnvVar,
 			},
 			Metadata: &bundle.ParameterMetadata{
 				Description: "Namespace in which to deploy",