fix(cmd): respect empty SummaryTrendStats value

Resolves: grafana@b91229a#r35621359 This changes current behavior on `master`, but as discussed above, it makes sense to respect whatever the user specifies, so this can be considered a fix.
srguglielmo · Nov 3, 2019 · 0a4d24f · 0a4d24f
1 parent 7f63373
commit 0a4d24f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cmd/config.go b/cmd/config.go
@@ -330,7 +330,7 @@ func applyDefault(conf Config) Config {
 	if conf.Options.SystemTags == nil {
 		conf = conf.Apply(Config{Options: lib.Options{SystemTags: &stats.DefaultSystemTagSet}})
 	}
-	if len(conf.Options.SummaryTrendStats) == 0 {
+	if conf.Options.SummaryTrendStats == nil {
 		conf = conf.Apply(Config{Options: lib.Options{SummaryTrendStats: lib.DefaultSummaryTrendStats}})
 	}
 	return conf

diff --git a/cmd/config_consolidation_test.go b/cmd/config_consolidation_test.go
@@ -417,7 +417,7 @@ func getConfigConsolidationTestCases() []configConsolidationTestCase {
 			assert.Equal(t, lib.DefaultSummaryTrendStats, c.Options.SummaryTrendStats)
 		}},
 		{opts{cli: []string{"--summary-trend-stats", `""`}}, exp{}, func(t *testing.T, c Config) {
-			assert.Equal(t, lib.DefaultSummaryTrendStats, c.Options.SummaryTrendStats)
+			assert.Equal(t, []string{}, c.Options.SummaryTrendStats)
 		}},
 		{
 			opts{runner: &lib.Options{SummaryTrendStats: []string{"avg", "p(90)", "count"}}},