From 3d72d7a04d34a21b205424f89e8c3ff13429a311 Mon Sep 17 00:00:00 2001 From: Julien Duchesne Date: Wed, 1 Nov 2023 15:06:04 -0400 Subject: [PATCH] Run tests in cloud instance --- docs/resources/contact_point.md | 2 +- .../grafana/resource_alerting_contact_point_notifiers.go | 2 +- .../resources/grafana/resource_alerting_contact_point_test.go | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/docs/resources/contact_point.md b/docs/resources/contact_point.md index 4db74802b..6a3f3defa 100644 --- a/docs/resources/contact_point.md +++ b/docs/resources/contact_point.md @@ -248,7 +248,7 @@ Optional: - `disable_resolve_message` (Boolean) Whether to disable sending resolve messages. Defaults to `false`. - `message` (String) The templated content of the message. - `override_priority` (Boolean) Whether to allow the alert priority to be configured via the value of the `og_priority` annotation on the alert. -- `responders` (Block List) Teams, users, escalations and schedules that the alert will be routed to send notifications. If the API Key belongs to a team integration, this field will be overwritten with the owner team. (see [below for nested schema](#nestedblock--opsgenie--responders)) +- `responders` (Block List) Teams, users, escalations and schedules that the alert will be routed to send notifications. If the API Key belongs to a team integration, this field will be overwritten with the owner team. This feature is available from Grafana 10.3+. (see [below for nested schema](#nestedblock--opsgenie--responders)) - `send_tags_as` (String) Whether to send annotations to OpsGenie as Tags, Details, or both. Supported values are `tags`, `details`, `both`, or empty to use the default behavior of Tags. - `settings` (Map of String, Sensitive) Additional custom properties to attach to the notifier. Defaults to `map[]`. - `url` (String) Allows customization of the OpsGenie API URL. diff --git a/internal/resources/grafana/resource_alerting_contact_point_notifiers.go b/internal/resources/grafana/resource_alerting_contact_point_notifiers.go index e3e57e279..cab0d1824 100644 --- a/internal/resources/grafana/resource_alerting_contact_point_notifiers.go +++ b/internal/resources/grafana/resource_alerting_contact_point_notifiers.go @@ -800,7 +800,7 @@ func (o opsGenieNotifier) schema() *schema.Resource { r.Schema["responders"] = &schema.Schema{ Type: schema.TypeList, Optional: true, - Description: "Teams, users, escalations and schedules that the alert will be routed to send notifications. If the API Key belongs to a team integration, this field will be overwritten with the owner team.", + Description: "Teams, users, escalations and schedules that the alert will be routed to send notifications. If the API Key belongs to a team integration, this field will be overwritten with the owner team. This feature is available from Grafana 10.3+.", Elem: &schema.Resource{ Description: "Defines a responder. Either id, name or username must be specified", Schema: map[string]*schema.Schema{ diff --git a/internal/resources/grafana/resource_alerting_contact_point_test.go b/internal/resources/grafana/resource_alerting_contact_point_test.go index da6046d08..45919717c 100644 --- a/internal/resources/grafana/resource_alerting_contact_point_test.go +++ b/internal/resources/grafana/resource_alerting_contact_point_test.go @@ -371,8 +371,7 @@ func TestAccContactPoint_notifiers10_2(t *testing.T) { } func TestAccContactPoint_notifiers10_3(t *testing.T) { - testutils.CheckOSSTestsEnabled(t) - testutils.CheckOSSTestsSemver(t, ">=10.3.0") + testutils.CheckCloudInstanceTestsEnabled(t) // TODO: Switch to `testutils.CheckOSSTestsEnabled(t, ">=10.3.0")` once 10.3 is released. var points []gapi.ContactPoint