fix: fix parsing subscriptions settings

argoproj-labs · Mar 20, 2020 · 5958e6c · 5958e6c
1 parent 4123bd0
commit 5958e6c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/shared/settings/settings.go b/shared/settings/settings.go
@@ -153,5 +153,8 @@ func (cfg *Config) Merge(other *Config) *Config {
 		res.Templates = append(res.Templates, templatesMap[k])
 	}
 	res.Context = contextValues
+	if other.Subscriptions != nil {
+		res.Subscriptions = other.Subscriptions
+	}
 	return res
 }
diff --git a/shared/settings/settings_test.go b/shared/settings/settings_test.go
@@ -240,6 +240,27 @@ func TestMergeConfigTriggers(t *testing.T) {
 	}})
 }
 
+func TestMergeSubscriptions(t *testing.T) {
+	cfg := Config{
+		Subscriptions: []Subscription{{
+			Recipients: []string{"foo"},
+			Triggers:   []string{"far"},
+		}},
+	}
+
+	merged := cfg.Merge(&Config{
+		Subscriptions: []Subscription{{
+			Recipients: []string{"replacedFoo"},
+			Triggers:   []string{"replacedFoo"},
+		}},
+	})
+
+	assert.ElementsMatch(t, merged.Subscriptions, []Subscription{{
+		Recipients: []string{"replacedFoo"},
+		Triggers:   []string{"replacedFoo"},
+	}})
+}
+
 func TestDefaultSubscriptions_GetRecipients(t *testing.T) {
 	selector, err := labels.Parse("test=true")
 	assert.NoError(t, err)