From 867c695646915c49e556530dcd4a0d2feab1d13d Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Fri, 26 Aug 2022 23:41:51 +0200 Subject: [PATCH] Alerting: add missing yaml tag to mute time struct (#54287) (#54355) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 49b1182f342bf48fe5d86f1761a83e949d070d70) Co-authored-by: Jean-Philippe Quéméner --- .../api/tooling/definitions/provisioning_mute_timings.go | 4 ++-- pkg/services/provisioning/alerting/config_reader_test.go | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/services/ngalert/api/tooling/definitions/provisioning_mute_timings.go b/pkg/services/ngalert/api/tooling/definitions/provisioning_mute_timings.go index b1466d8991e..9331d72b484 100644 --- a/pkg/services/ngalert/api/tooling/definitions/provisioning_mute_timings.go +++ b/pkg/services/ngalert/api/tooling/definitions/provisioning_mute_timings.go @@ -69,8 +69,8 @@ type MuteTimingPayload struct { // swagger:model type MuteTimeInterval struct { - config.MuteTimeInterval - Provenance models.Provenance `json:"provenance,omitempty"` + config.MuteTimeInterval `json:",inline" yaml:",inline"` + Provenance models.Provenance `json:"provenance,omitempty"` } func (mt *MuteTimeInterval) ResourceType() string { diff --git a/pkg/services/provisioning/alerting/config_reader_test.go b/pkg/services/provisioning/alerting/config_reader_test.go index 49456cb2112..f17cc3a8b61 100644 --- a/pkg/services/provisioning/alerting/config_reader_test.go +++ b/pkg/services/provisioning/alerting/config_reader_test.go @@ -126,8 +126,9 @@ func TestConfigReader(t *testing.T) { require.Len(t, file[0].Policies, 2) }) t.Run("a mute times file with correct properties and specific org should not error", func(t *testing.T) { - _, err := configReader.readConfig(ctx, testFileCorrectProperties_mt) + file, err := configReader.readConfig(ctx, testFileCorrectProperties_mt) require.NoError(t, err) + require.Equal(t, "test", file[0].MuteTimes[0].MuteTime.Name) }) t.Run("a mute times file with correct properties and specific org should not error", func(t *testing.T) { file, err := configReader.readConfig(ctx, testFileCorrectPropertiesWithOrg_mt)