fix: Properly merge chart specs together

jsbroks · jsbroks · commit 37c41bcb18fe · 2023-10-18T14:22:24.000-04:00
diff --git a/pkg/wandb/spec/spec.go b/pkg/wandb/spec/spec.go
@@ -98,16 +98,19 @@ func (s *Spec) mergeConfig(values Values) (err error) {
 	return nil
 }
 
+// Merge merges the given spec into the current spec. The currently spec will
+// take precedence. This means, if the current spec has a value for a key, the
+// new spec will not override it. Likewise, charts & metadata cannot be merged,
+// so if a chart/metadata value is set, the one passed in will be ignored.
 func (s *Spec) Merge(spec *Spec) {
 	if spec == nil {
 		return
 	}
 
-	if spec.Metadata != nil {
+	if s.Metadata == nil {
 		s.Metadata = spec.Metadata
 	}
-
-	if spec.Chart != nil {
+	if s.Chart == nil {
 		s.Chart = spec.Chart
 	}
 	if spec.Values != nil {

Original file line number	Diff line number	Diff line change
`@@ -98,16 +98,19 @@ func (s *Spec) mergeConfig(values Values) (err error) {`
`98`	`98`	`return nil`
`99`	`99`	`}`
`100`	`100`
	`101`	`+// Merge merges the given spec into the current spec. The currently spec will`
	`102`	`+// take precedence. This means, if the current spec has a value for a key, the`
	`103`	`+// new spec will not override it. Likewise, charts & metadata cannot be merged,`
	`104`	`+// so if a chart/metadata value is set, the one passed in will be ignored.`
`101`	`105`	`func (s Spec) Merge(spec Spec) {`
`102`	`106`	`if spec == nil {`
`103`	`107`	`return`
`104`	`108`	`}`
`105`	`109`
`106`		`- if spec.Metadata != nil {`
	`110`	`+ if s.Metadata == nil {`
`107`	`111`	`s.Metadata = spec.Metadata`
`108`	`112`	`}`
`109`		`-`
`110`		`- if spec.Chart != nil {`
	`113`	`+ if s.Chart == nil {`
`111`	`114`	`s.Chart = spec.Chart`
`112`	`115`	`}`
`113`	`116`	`if spec.Values != nil {`