Skip to content

Commit b58bc6c

Browse files
Fix alerting resources' error messages (#1292)
Currently, the API error messages aren't being propagated to the TF user because the field is wrong: grafana/grafana-openapi-client-go#65
1 parent cb6b44f commit b58bc6c

File tree

3 files changed

+22
-3
lines changed

3 files changed

+22
-3
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/go-openapi/strfmt v0.22.0
1111
github.com/grafana/amixr-api-go-client v0.0.11
1212
github.com/grafana/grafana-api-golang-client v0.27.0
13-
github.com/grafana/grafana-openapi-client-go v0.0.0-20240112155719-7845a7890289
13+
github.com/grafana/grafana-openapi-client-go v0.0.0-20240118162741-b884e1a072bf
1414
github.com/grafana/machine-learning-go-client v0.5.0
1515
github.com/grafana/slo-openapi-client/go v0.0.0-20240112175006-de02e75b9d73
1616
github.com/grafana/synthetic-monitoring-agent v0.19.3

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ github.com/grafana/amixr-api-go-client v0.0.11 h1:jlE+5t0tRuCtjbpM81j70Dr2J4eCyS
102102
github.com/grafana/amixr-api-go-client v0.0.11/go.mod h1:N6x26XUrM5zGtK5zL5vNJnAn2JFMxLFPPLTw/6pDkFE=
103103
github.com/grafana/grafana-api-golang-client v0.27.0 h1:zIwMXcbCB4n588i3O2N6HfNcQogCNTd/vPkEXTr7zX8=
104104
github.com/grafana/grafana-api-golang-client v0.27.0/go.mod h1:uNLZEmgKtTjHBtCQMwNn3qsx2mpMb8zU+7T4Xv3NR9Y=
105-
github.com/grafana/grafana-openapi-client-go v0.0.0-20240112155719-7845a7890289 h1:HGaFaEpOKc/6pRTSiCgnfh2Px1WywHUQ/p9srfS1zvA=
106-
github.com/grafana/grafana-openapi-client-go v0.0.0-20240112155719-7845a7890289/go.mod h1:af7rlJw/VtbvAfI5VWzYO4p/pT58FXrN6XqZBnkwBxo=
105+
github.com/grafana/grafana-openapi-client-go v0.0.0-20240118162741-b884e1a072bf h1:bi08tzZ4QEEe4KBDXfJlcO9QwUdvM/ndzrmV3mozzkU=
106+
github.com/grafana/grafana-openapi-client-go v0.0.0-20240118162741-b884e1a072bf/go.mod h1:af7rlJw/VtbvAfI5VWzYO4p/pT58FXrN6XqZBnkwBxo=
107107
github.com/grafana/machine-learning-go-client v0.5.0 h1:Q1K+MPSy8vfMm2jsk3WQ7O77cGr2fM5hxwtPSoPc5NU=
108108
github.com/grafana/machine-learning-go-client v0.5.0/go.mod h1:QFfZz8NkqVF8++skjkKQXJEZfpCYd8S0yTWJUpsLLTA=
109109
github.com/grafana/slo-openapi-client/go v0.0.0-20240112175006-de02e75b9d73 h1:E5vAeB5q1H3BVeNhtd1dI8RubucJdPwpx/ElNtKD3ls=

internal/resources/grafana/resource_alerting_notification_policy_test.go

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package grafana_test
22

33
import (
44
"fmt"
5+
"regexp"
56
"testing"
67

78
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
@@ -139,6 +140,24 @@ func TestAccNotificationPolicy_disableProvenance(t *testing.T) {
139140
})
140141
}
141142

143+
func TestAccNotificationPolicy_error(t *testing.T) {
144+
testutils.CheckOSSTestsEnabled(t, ">=9.1.0")
145+
146+
resource.Test(t, resource.TestCase{
147+
ProviderFactories: testutils.ProviderFactories,
148+
Steps: []resource.TestStep{
149+
{
150+
Config: `resource "grafana_notification_policy" "test" {
151+
group_by = ["..."]
152+
contact_point = "invalid"
153+
}`,
154+
// This tests that the API error message is propagated to the user.
155+
ExpectError: regexp.MustCompile("400.+invalid object specification: receiver 'invalid' does not exist"),
156+
},
157+
},
158+
})
159+
}
160+
142161
func testAccNotificationPolicyDisableProvenance(disableProvenance bool) string {
143162
return fmt.Sprintf(`
144163
resource "grafana_contact_point" "a_contact_point" {

0 commit comments

Comments
 (0)