Skip to content
This repository was archived by the owner on Jul 18, 2025. It is now read-only.

Commit 15c4595

Browse files
committed
Cleanup unused function
Signed-off-by: Djordje Lukic <[email protected]>
1 parent 6f5f315 commit 15c4595

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

internal/commands/parameters.go

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -108,21 +108,13 @@ func mergeBundleParameters(installation *store.Installation, ops ...mergeBundleO
108108
return err
109109
}
110110

111-
func getParameterFromBundle(name string, bndl *bundle.Bundle) (bundle.Parameter, bool) {
112-
if bndl.Parameters == nil {
113-
return bundle.Parameter{}, false
114-
}
115-
param, found := bndl.Parameters[name]
116-
return param, found
117-
}
118-
119111
func matchAndMergeParametersDefinition(currentValues map[string]interface{}, cfg *mergeBundleConfig) (map[string]interface{}, error) {
120112
mergedValues := make(map[string]interface{})
121113
for k, v := range currentValues {
122114
mergedValues[k] = v
123115
}
124116
for k, v := range cfg.params {
125-
param, ok := getParameterFromBundle(k, cfg.bundle)
117+
param, ok := cfg.bundle.Parameters[k]
126118
if !ok {
127119
if cfg.strictMode {
128120
return nil, fmt.Errorf("parameter %q is not defined in the bundle", k)

internal/commands/parameters_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func TestWithCommandLineParameters(t *testing.T) {
6565
type bundleOperator func(*bundle.Bundle)
6666

6767
func prepareBundleWithParameters(b *bundle.Bundle) {
68-
if b.Parameters != nil && len(b.Parameters) > 0 {
68+
if b.Parameters != nil {
6969
return
7070
}
7171
b.Parameters = map[string]bundle.Parameter{}

0 commit comments

Comments
 (0)