From 22ff5717b31b9171d756ca33fa15f1367bf0c2c2 Mon Sep 17 00:00:00 2001
From: Oliver Nocon <33484802+OliverNocon@users.noreply.github.com>
Date: Mon, 3 Jun 2024 09:45:07 +0200
Subject: [PATCH] fix(vault): consider vault flags (#4486)

* fix(vault): consider vault flags

* fix problem introduced with merge conflict resolution

---------

Co-authored-by: Jk1484 <35270240+Jk1484@users.noreply.github.com>
---
 pkg/config/config.go | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkg/config/config.go b/pkg/config/config.go
index 65803ec296..e41873f898 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -236,7 +236,8 @@ func (c *Config) GetStepConfig(flagValues map[string]interface{}, paramJSON stri
 
 	// merge command line flags
 	if flagValues != nil {
-		stepConfig.mixIn(flagValues, filters.Parameters, metadata)
+		flagFilter := append(filters.Parameters, vaultFilter...)
+		stepConfig.mixIn(flagValues, flagFilter, metadata)
 	}
 
 	if verbose, ok := stepConfig.Config["verbose"].(bool); ok && verbose {
@@ -325,7 +326,6 @@ func GetStepConfigWithJSON(flagValues map[string]interface{}, stepConfigJSON str
 }
 
 func (c *Config) GetStageConfig(paramJSON string, configuration io.ReadCloser, defaults []io.ReadCloser, ignoreCustomDefaults bool, acceptedParams []string, stageName string) (StepConfig, error) {
-
 	filters := StepFilters{
 		General:    acceptedParams,
 		Steps:      []string{},
@@ -338,7 +338,6 @@ func (c *Config) GetStageConfig(paramJSON string, configuration io.ReadCloser, d
 
 // GetJSON returns JSON representation of an object
 func GetJSON(data interface{}) (string, error) {
-
 	result, err := json.Marshal(data)
 	if err != nil {
 		return "", errors.Wrapf(err, "error marshalling json: %v", err)
@@ -348,7 +347,6 @@ func GetJSON(data interface{}) (string, error) {
 
 // GetYAML returns YAML representation of an object
 func GetYAML(data interface{}) (string, error) {
-
 	result, err := yaml.Marshal(data)
 	if err != nil {
 		return "", errors.Wrapf(err, "error marshalling yaml: %v", err)
@@ -370,7 +368,6 @@ func OpenPiperFile(name string, accessTokens map[string]string) (io.ReadCloser,
 }
 
 func httpReadFile(name string, accessTokens map[string]string) (io.ReadCloser, error) {
-
 	u, err := url.Parse(name)
 	if err != nil {
 		return nil, fmt.Errorf("failed to read url: %w", err)
@@ -409,7 +406,6 @@ func envValues(filter []string) map[string]interface{} {
 }
 
 func (s *StepConfig) mixIn(mergeData map[string]interface{}, filter []string, metadata StepData) {
-
 	if s.Config == nil {
 		s.Config = map[string]interface{}{}
 	}
@@ -418,7 +414,6 @@ func (s *StepConfig) mixIn(mergeData map[string]interface{}, filter []string, me
 }
 
 func (s *StepConfig) mixInHookConfig(mergeData map[string]interface{}, metadata StepData) {
-
 	if s.HookConfig == nil {
 		s.HookConfig = map[string]interface{}{}
 	}
@@ -487,7 +482,6 @@ func filterMap(data map[string]interface{}, filter []string) map[string]interfac
 }
 
 func merge(base, overlay map[string]interface{}, metadata StepData) map[string]interface{} {
-
 	result := map[string]interface{}{}
 
 	if base == nil {