Add PORTER_INSTALLATION_NAME* env for runtime

Signed-off-by: Jeremy Goss <jeremy.goss@hpe.com>

Author: jemgoss

pkg/cnab/provider/action.go

@@ -52,6 +52,7 @@ func (r *Runtime) ApplyConfig(args ActionArguments) action.OperationConfigs {
 	return action.OperationConfigs{
 		r.SetOutput(),
 		r.AddFiles(args),
+		r.AddEnvironment(args),
 		r.AddRelocation(args),
 	}
 }
@@ -84,6 +85,14 @@ func (r *Runtime) AddFiles(args ActionArguments) action.OperationConfigFunc {
 	}
 }
 
+func (r *Runtime) AddEnvironment(args ActionArguments) action.OperationConfigFunc {
+	return func(op *driver.Operation) error {
+		op.Environment[config.EnvPorterInstallationNamespace] = args.Installation.Namespace
+		op.Environment[config.EnvPorterInstallationName] = args.Installation.Name
+		return nil
+	}
+}
+
 // AddRelocation operates on an ActionArguments and adds any provided relocation mapping
 // to the operation's files.
 func (r *Runtime) AddRelocation(args ActionArguments) action.OperationConfigFunc {

pkg/config/config.go

@@ -35,7 +35,7 @@ const (
 	// EnvDEBUG is a custom porter parameter that signals that --debug flag has been passed through from the client to the runtime.
 	EnvDEBUG = "PORTER_DEBUG"
 
-	// EnvCORRELATION_ID is the name of the environment variable containing the
+	// EnvCorrelationID is the name of the environment variable containing the
 	// id to correlate logs with a workflow.
 	EnvCorrelationID = "PORTER_CORRELATION_ID"
 
@@ -49,6 +49,14 @@ const (
 
 	// ClaimFilepath is the filepath to the claim.json inside of an invocation image
 	ClaimFilepath = "/cnab/claim.json"
+
+	// EnvPorterInstallationNamespace is the name of the environment variable which is injected into the
+	// invocation image, containing the namespace of the installation.
+	EnvPorterInstallationNamespace = "PORTER_INSTALLATION_NAMESPACE"
+
+	// EnvPorterInstallationName is the name of the environment variable which is injected into the
+	// invocation image, containing the name of the installation.
+	EnvPorterInstallationName = "PORTER_INSTALLATION_NAME"
 )
 
 // These are functions that afero doesn't support, so this lets us stub them out for tests to set the

pkg/runtime/runtime-manifest.go

@@ -89,19 +89,11 @@ func (m *RuntimeManifest) loadBundle() error {
 }
 
 func (m *RuntimeManifest) GetInstallationNamespace() string {
-	before, _, found := strings.Cut(m.Getenv(config.EnvInstallationName), "/")
-	if found {
-		return before
-	}
-	return ""
+	return m.Getenv(config.EnvPorterInstallationNamespace)
 }
 
 func (m *RuntimeManifest) GetInstallationName() string {
-	before, after, found := strings.Cut(m.Getenv(config.EnvInstallationName), "/")
-	if found {
-		return after
-	}
-	return before
+	return m.Getenv(config.EnvPorterInstallationName)
 }
 
 func (m *RuntimeManifest) loadDependencyDefinitions() error {

pkg/runtime/runtime-manifest_test.go

@@ -993,48 +993,29 @@ func TestResolveStepEncoding(t *testing.T) {
 	assert.Equal(t, flags["c"], wantValue)
 }
 
-func TestResolveInstallationName(t *testing.T) {
+func TestResolveInstallation(t *testing.T) {
 	cxt := portercontext.NewTestContext(t)
-	cxt.Setenv(config.EnvInstallationName, "mybun")
+	cxt.Setenv(config.EnvPorterInstallationNamespace, "mynamespace")
+	cxt.Setenv(config.EnvPorterInstallationName, "mybun")
 
 	m := &manifest.Manifest{}
 	rm := NewRuntimeManifest(cxt.Context, cnab.ActionInstall, m)
 
 	s := &manifest.Step{
 		Data: map[string]interface{}{
 			"description": "Do a helm release",
+			"ns":          "{{ installation.namespace }}",
 			"release":     "{{ installation.name }}",
 		},
 	}
 
 	err := rm.ResolveStep(s)
 	require.NoError(t, err, "ResolveStep failed")
 
+	assert.Equal(t, "mynamespace", s.Data["ns"], "installation.namespace was not rendered")
 	assert.Equal(t, "mybun", s.Data["release"], "installation.name was not rendered")
 }
 
-func TestResolveInstallationNamespace(t *testing.T) {
-	cxt := portercontext.NewTestContext(t)
-	cxt.Setenv(config.EnvInstallationName, "mynamespace/mybun")
-
-	m := &manifest.Manifest{}
-	rm := NewRuntimeManifest(cxt.Context, cnab.ActionInstall, m)
-
-	s := &manifest.Step{
-		Data: map[string]interface{}{
-			"description":       "K8s step",
-			"resourcenamespace": "{{ installation.namespace }}",
-			"resourcename":      "{{ installation.name }}",
-		},
-	}
-
-	err := rm.ResolveStep(s)
-	require.NoError(t, err, "ResolveStep failed")
-
-	assert.Equal(t, "mynamespace", s.Data["resourcenamespace"], "installation.namespace was not rendered")
-	assert.Equal(t, "mybun", s.Data["resourcename"], "installation.name was not rendered")
-}
-
 func TestResolveCustomMetadata(t *testing.T) {
 	cxt := portercontext.NewTestContext(t)
 	m := &manifest.Manifest{