Add support for retriggering notifications in AlertPolicy (#7895) (#14563)

Signed-off-by: Modular Magician <[email protected]>
Co-authored-by: James Edouard <[email protected]>

Author: modular-magician

.changelog/7895.txt

@@ -0,0 +1,3 @@
+```release-note:REPLACEME
+
+```

google/resource_monitoring_alert_policy.go

@@ -745,6 +745,32 @@ name is limited to 512 Unicode characters.`,
 							Optional:    true,
 							Description: `If an alert policy that was active has no data for this long, any open incidents will close.`,
 						},
+						"notification_channel_strategy": {
+							Type:     schema.TypeList,
+							Optional: true,
+							Description: `Control over how the notification channels in 'notification_channels'
+are notified when this alert fires, on a per-channel basis.`,
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"notification_channel_names": {
+										Type:     schema.TypeList,
+										Optional: true,
+										Description: `The notification channels that these settings apply to. Each of these
+correspond to the name field in one of the NotificationChannel objects
+referenced in the notification_channels field of this AlertPolicy. The format is
+'projects/[PROJECT_ID_OR_NUMBER]/notificationChannels/[CHANNEL_ID]'`,
+										Elem: &schema.Schema{
+											Type: schema.TypeString,
+										},
+									},
+									"renotify_interval": {
+										Type:        schema.TypeString,
+										Optional:    true,
+										Description: `The frequency at which to send reminder notifications for open incidents.`,
+									},
+								},
+							},
+						},
 						"notification_rate_limit": {
 							Type:     schema.TypeList,
 							Optional: true,
@@ -1682,6 +1708,8 @@ func flattenMonitoringAlertPolicyAlertStrategy(v interface{}, d *schema.Resource
 		flattenMonitoringAlertPolicyAlertStrategyNotificationRateLimit(original["notificationRateLimit"], d, config)
 	transformed["auto_close"] =
 		flattenMonitoringAlertPolicyAlertStrategyAutoClose(original["autoClose"], d, config)
+	transformed["notification_channel_strategy"] =
+		flattenMonitoringAlertPolicyAlertStrategyNotificationChannelStrategy(original["notificationChannelStrategy"], d, config)
 	return []interface{}{transformed}
 }
 func flattenMonitoringAlertPolicyAlertStrategyNotificationRateLimit(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
@@ -1705,6 +1733,33 @@ func flattenMonitoringAlertPolicyAlertStrategyAutoClose(v interface{}, d *schema
 	return v
 }
 
+func flattenMonitoringAlertPolicyAlertStrategyNotificationChannelStrategy(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	if v == nil {
+		return v
+	}
+	l := v.([]interface{})
+	transformed := make([]interface{}, 0, len(l))
+	for _, raw := range l {
+		original := raw.(map[string]interface{})
+		if len(original) < 1 {
+			// Do not include empty json objects coming back from the api
+			continue
+		}
+		transformed = append(transformed, map[string]interface{}{
+			"notification_channel_names": flattenMonitoringAlertPolicyAlertStrategyNotificationChannelStrategyNotificationChannelNames(original["notificationChannelNames"], d, config),
+			"renotify_interval":          flattenMonitoringAlertPolicyAlertStrategyNotificationChannelStrategyRenotifyInterval(original["renotifyInterval"], d, config),
+		})
+	}
+	return transformed
+}
+func flattenMonitoringAlertPolicyAlertStrategyNotificationChannelStrategyNotificationChannelNames(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
+func flattenMonitoringAlertPolicyAlertStrategyNotificationChannelStrategyRenotifyInterval(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
 func flattenMonitoringAlertPolicyUserLabels(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	return v
 }
@@ -2355,6 +2410,13 @@ func expandMonitoringAlertPolicyAlertStrategy(v interface{}, d tpgresource.Terra
 		transformed["autoClose"] = transformedAutoClose
 	}
 
+	transformedNotificationChannelStrategy, err := expandMonitoringAlertPolicyAlertStrategyNotificationChannelStrategy(original["notification_channel_strategy"], d, config)
+	if err != nil {
+		return nil, err
+	} else if val := reflect.ValueOf(transformedNotificationChannelStrategy); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+		transformed["notificationChannelStrategy"] = transformedNotificationChannelStrategy
+	}
+
 	return transformed, nil
 }
 
@@ -2385,6 +2447,43 @@ func expandMonitoringAlertPolicyAlertStrategyAutoClose(v interface{}, d tpgresou
 	return v, nil
 }
 
+func expandMonitoringAlertPolicyAlertStrategyNotificationChannelStrategy(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	l := v.([]interface{})
+	req := make([]interface{}, 0, len(l))
+	for _, raw := range l {
+		if raw == nil {
+			continue
+		}
+		original := raw.(map[string]interface{})
+		transformed := make(map[string]interface{})
+
+		transformedNotificationChannelNames, err := expandMonitoringAlertPolicyAlertStrategyNotificationChannelStrategyNotificationChannelNames(original["notification_channel_names"], d, config)
+		if err != nil {
+			return nil, err
+		} else if val := reflect.ValueOf(transformedNotificationChannelNames); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+			transformed["notificationChannelNames"] = transformedNotificationChannelNames
+		}
+
+		transformedRenotifyInterval, err := expandMonitoringAlertPolicyAlertStrategyNotificationChannelStrategyRenotifyInterval(original["renotify_interval"], d, config)
+		if err != nil {
+			return nil, err
+		} else if val := reflect.ValueOf(transformedRenotifyInterval); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+			transformed["renotifyInterval"] = transformedRenotifyInterval
+		}
+
+		req = append(req, transformed)
+	}
+	return req, nil
+}
+
+func expandMonitoringAlertPolicyAlertStrategyNotificationChannelStrategyNotificationChannelNames(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
+func expandMonitoringAlertPolicyAlertStrategyNotificationChannelStrategyRenotifyInterval(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
 func expandMonitoringAlertPolicyUserLabels(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (map[string]string, error) {
 	if v == nil {
 		return map[string]string{}, nil

website/docs/r/monitoring_alert_policy.html.markdown

@@ -754,13 +754,32 @@ The following arguments are supported:
   (Optional)
   If an alert policy that was active has no data for this long, any open incidents will close.
 
+* `notification_channel_strategy` -
+  (Optional)
+  Control over how the notification channels in `notification_channels`
+  are notified when this alert fires, on a per-channel basis.
+  Structure is [documented below](#nested_notification_channel_strategy).
+
 
 <a name="nested_notification_rate_limit"></a>The `notification_rate_limit` block supports:
 
 * `period` -
   (Optional)
   Not more than one notification per period.
 
+<a name="nested_notification_channel_strategy"></a>The `notification_channel_strategy` block supports:
+
+* `notification_channel_names` -
+  (Optional)
+  The notification channels that these settings apply to. Each of these
+  correspond to the name field in one of the NotificationChannel objects
+  referenced in the notification_channels field of this AlertPolicy. The format is
+  `projects/[PROJECT_ID_OR_NUMBER]/notificationChannels/[CHANNEL_ID]`
+
+* `renotify_interval` -
+  (Optional)
+  The frequency at which to send reminder notifications for open incidents.
+
 <a name="nested_documentation"></a>The `documentation` block supports:
 
 * `content` -