Merge pull request #876 from boneff/improve-time-window-validation

feat: improve PD service time window validation to accept 86400 as a valid value

pagerduty/resource_pagerduty_service.go

@@ -351,6 +351,9 @@ func customizePagerDutyServiceDiff(context context.Context, diff *schema.Resourc
  if agpType == "content_based" && (aggregateVal == "" || len(fieldsVal) == 0) {
  return fmt.Errorf("When using Alert grouping parameters configuration of type \"content_based\" is in use, attributes \"aggregate\" and \"fields\" are required")
  }
+ if timeWindowVal == 86400 && agpType != "content_based" {
+ return fmt.Errorf("Alert grouping parameters configuration attribute \"time_window\" with a value of 86400 is only supported by \"content-based\" type Alert Grouping")
+ }
  if (aggregateVal != "" || len(fieldsVal) > 0) && (agpType != "" && hasChangeAgpType && agpType != "content_based") {
  return fmt.Errorf("Alert grouping parameters configuration attributes \"aggregate\" and \"fields\" are only supported by \"content_based\" type Alert Grouping")
  }
@@ -369,10 +372,10 @@ func validateTimeWindow(v interface{}, p cty.Path) diag.Diagnostics {
  var diags diag.Diagnostics
 
  tw := v.(int)
- if tw < 300 || tw > 3600 {
+ if (tw < 300 || tw > 3600) && tw != 86400 {
  diags = append(diags, diag.Diagnostic{
  Severity: diag.Error,
- Summary: fmt.Sprintf("Alert grouping time window value must be between 300 and 3600, current setting is %d", tw),
+ Summary: fmt.Sprintf("Alert grouping time window value must be between 300 and 3600 or exactly 86400(86400 is supported only for content-based alert grouping), current setting is %d", tw),
  AttributePath: p,
  })
  }

pagerduty/resource_pagerduty_service_test.go

@@ -176,6 +176,34 @@ func TestAccPagerDutyService_FormatValidation(t *testing.T) {
  {
  Config: testAccCheckPagerDutyServiceCustomInputValidationConfig(username, email, escalationPolicy, service,
  `
+ alert_grouping_parameters {
+ type = "intelligent"
+ config {
+ time_window = 86400
+ }
+ }
+ `,
+ ),
+ PlanOnly: true,
+ ExpectError: regexp.MustCompile("Alert grouping parameters configuration attribute \"time_window\" with a value of 86400 is only supported by \"content-based\" type Alert Grouping"),
+ },
+ {
+ Config: testAccCheckPagerDutyServiceCustomInputValidationConfig(username, email, escalationPolicy, service,
+ `
+ alert_grouping_parameters {
+ type = "content_based"
+ config {
+ time_window = 86400
+ aggregate = "all"
+ fields = ["custom_details.source_id"]
+ }
+ }
+ `,
+ ),
+ },
+ {
+ Config: testAccCheckPagerDutyServiceCustomInputValidationConfig(username, email, escalationPolicy, service,
+ `
  alert_grouping_parameters {
  type = "content_based"
  config {}
@@ -191,6 +219,7 @@ func TestAccPagerDutyService_FormatValidation(t *testing.T) {
  alert_grouping_parameters {
  type = "content_based"
  config {
+ time_window = 300
  aggregate = "all"
  fields = ["custom_details.source_id"]
  }

website/docs/r/service.html.markdown

@@ -71,7 +71,7 @@ The `alert_grouping_parameters` block contains the following arguments:
  * `timeout` - (Optional) The duration in minutes within which to automatically group incoming alerts. This setting applies only when `type` is set to `time`. To continue grouping alerts until the incident is resolved, set this value to `0`.
  * `aggregate` - (Optional) One of `any` or `all`. This setting applies only when `type` is set to `content_based`. Group alerts based on one or all of `fields` value(s).
  * `fields` - (Optional) Alerts will be grouped together if the content of these fields match. This setting applies only when `type` is set to `content_based`.
- * `time_window` - (Optional) The maximum amount of time allowed between Alerts. This setting applies only when `type` is set to `intelligent` or `content_based`. Value must be between `300` and `3600`. Any Alerts arriving greater than `time_window` seconds apart will not be grouped together. This is a rolling time window and is counted from the most recently grouped alert. The window is extended every time a new alert is added to the group, up to 24 hours.
+ * `time_window` - (Optional) The maximum amount of time allowed between Alerts. This setting applies only when `type` is set to `intelligent` or `content_based`. Value must be between `300` and `3600` or exactly `86400` (86400 is supported only for `content_based` alert grouping). Any Alerts arriving greater than `time_window` seconds apart will not be grouped together. This is a rolling time window and is counted from the most recently grouped alert. The window is extended every time a new alert is added to the group, up to 24 hours.
 
 The `auto_pause_notifications_parameters` block contains the following arguments: