Do not resolve parameters defined in parameter sets if they are overriden

pkg/porter/parameters.go

@@ -357,7 +357,7 @@ func validateParameterName(args []string) error {
 }
 
 // loadParameterSets loads parameter values per their parameter set strategies
-func (p *Porter) loadParameterSets(ctx context.Context, bun cnab.ExtendedBundle, namespace string, params []string) (secrets.Set, error) {
+func (p *Porter) loadParameterSets(ctx context.Context, bun cnab.ExtendedBundle, namespace string, params []string, overridenParameters secrets.StrategyList) (secrets.Set, error) {
 	resolvedParameters := secrets.Set{}
 
 	for _, name := range params {
@@ -380,6 +380,13 @@ func (p *Porter) loadParameterSets(ctx context.Context, bun cnab.ExtendedBundle,
 			return nil, err
 		}
 
+		var skipParams []string
+		for _, param := range pset.Parameters {
+			if overridenParameters.Contains(param.Name) {
+				skipParams = append(skipParams, param.Name)
+			}
+		}
+
 		// A parameter may correspond to a Porter-specific parameter type of 'file'
 		// If so, add value (filepath) directly to map and remove from pset
 		for paramName, paramDef := range bun.Parameters {
@@ -402,7 +409,7 @@ func (p *Porter) loadParameterSets(ctx context.Context, bun cnab.ExtendedBundle,
 			}
 		}
 
-		rc, err := p.Parameters.ResolveAll(ctx, pset)
+		rc, err := p.Parameters.ResolveAll(ctx, pset, skipParams...)
 		if err != nil {
 			return nil, err
 		}
@@ -884,7 +891,7 @@ func (p *Porter) applyActionOptionsToInstallation(ctx context.Context, ba Bundle
 	//
 	// 3. Resolve named parameter sets
 	//
-	resolvedParams, err := p.loadParameterSets(ctx, bun, o.Namespace, inst.ParameterSets)
+	resolvedParams, err := p.loadParameterSets(ctx, bun, o.Namespace, inst.ParameterSets, inst.Parameters.Parameters)
 	if err != nil {
 		return fmt.Errorf("unable to process provided parameter sets: %w", err)
 	}

pkg/secrets/strategy.go

@@ -128,3 +128,12 @@ func (l StrategyList) Swap(i, j int) {
 func (l StrategyList) Len() int {
 	return len(l)
 }
+
+func (l StrategyList) Contains(name string) bool {
+	for _, param := range l {
+		if param.Name == name {
+			return true
+		}
+	}
+	return false
+}

pkg/storage/parameter_store.go

@@ -3,6 +3,7 @@ package storage
 import (
 	"context"
 	"fmt"
+	"slices"
 	"strings"
 
 	"get.porter.sh/porter/pkg/secrets"
@@ -54,11 +55,15 @@ func (s ParameterStore) GetDataStore() Store {
 	return s.Documents
 }
 
-func (s ParameterStore) ResolveAll(ctx context.Context, params ParameterSet) (secrets.Set, error) {
+func (s ParameterStore) ResolveAll(ctx context.Context, params ParameterSet, skipParams ...string) (secrets.Set, error) {
 	resolvedParams := make(secrets.Set)
 	var resolveErrors error
 
 	for _, param := range params.Parameters {
+		if slices.Contains(skipParams, param.Name) {
+			continue
+		}
+
 		var value string
 		var err error
 		if isHandledByHostPlugin(param.Source.Strategy) {

pkg/storage/parameterset_provider.go

@@ -11,7 +11,7 @@ type ParameterSetProvider interface {
 	GetDataStore() Store
 
 	// ResolveAll parameter values in the parameter set.
-	ResolveAll(ctx context.Context, params ParameterSet) (secrets.Set, error)
+	ResolveAll(ctx context.Context, params ParameterSet, skipParams ...string) (secrets.Set, error)
 
 	// Validate the parameter set is defined properly.
 	Validate(ctx context.Context, params ParameterSet) error

tests/integration/install_test.go

@@ -128,6 +128,36 @@ func TestInstall_stringParam(t *testing.T) {
 	require.Contains(t, output, "Hello, Demo Time", "expected action output to contain provided file contents")
 }
 
+func TestInstall_overrideParamIncludedInParamSet(t *testing.T) {
+
+	p := porter.NewTestPorter(t)
+	defer p.Close()
+	ctx := p.SetupIntegrationTest()
+
+	p.AddTestBundleDir("testdata/bundles/bundle-with-string-params", false)
+
+	installOpts := porter.NewInstallOptions()
+	installOpts.Params = []string{"name=Demo Time"}
+	installOpts.ParameterSets = []string{"myparam"}
+	testParamSets := storage.NewParameterSet("", "myparam", secrets.SourceMap{
+		Name: "name",
+		Source: secrets.Source{
+			Strategy: host.SourceEnv,
+			Hint:     "DEMO_TIME",
+		},
+	})
+	p.TestParameters.InsertParameterSet(ctx, testParamSets)
+
+	err := installOpts.Validate(ctx, []string{}, p.Porter)
+	require.NoError(t, err)
+
+	err = p.InstallBundle(ctx, installOpts)
+	require.NoError(t, err)
+
+	output := p.TestConfig.TestContext.GetOutput()
+	require.Contains(t, output, "Hello, Demo Time", "expected action output to contain provided file contents")
+}
+
 func TestInstall_SensitiveValuesAreNotLogged(t *testing.T) {
 	p := porter.NewTestPorter(t)
 	defer p.Close()