Skip to content

Commit 00be3c8

Browse files
jhrotkondeloof
authored andcommitted
Fix merge between two numbers
Signed-off-by: jhrotko <[email protected]>
1 parent 32d5bda commit 00be3c8

File tree

2 files changed

+20
-1
lines changed

2 files changed

+20
-1
lines changed

override/merge.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ func convertIntoSequence(value any) []any {
122122
if v == nil {
123123
seq[i] = k
124124
} else {
125-
seq[i] = fmt.Sprintf("%s=%s", k, v)
125+
seq[i] = fmt.Sprintf("%s=%v", k, v)
126126
}
127127
i++
128128
}

override/merge_environment_test.go

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,3 +93,22 @@ services:
9393
- QIX=ZOT
9494
`)
9595
}
96+
97+
func Test_mergeYamlEnvironmentNumber(t *testing.T) {
98+
assertMergeYaml(t, `
99+
services:
100+
test:
101+
environment:
102+
FOO: 1
103+
`, `
104+
services:
105+
test:
106+
environment:
107+
FOO: 3
108+
`, `
109+
services:
110+
test:
111+
environment:
112+
- FOO=3
113+
`)
114+
}

0 commit comments

Comments
 (0)