add docs update and minimal tweaks

PagerDuty · Jun 14, 2024 · 8fb9df8 · 8fb9df8
1 parent 00c149a
commit 8fb9df8
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 31 deletions.
diff --git a/pagerduty/resource_pagerduty_service.go b/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")
 		}
@@ -360,9 +363,6 @@ func customizePagerDutyServiceDiff(context context.Context, diff *schema.Resourc
 		if (timeWindowVal > 300) && (agpType != "" && hasChangeAgpType && (agpType != "intelligent" && agpType != "content_based")) {
 			return fmt.Errorf("Alert grouping parameters configuration attribute \"time_window\" is only supported by \"intelligent\" and \"content-based\" type Alert Grouping")
 		}
-		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")
-		}
 	}
 
 	return nil

diff --git a/pagerduty/resource_pagerduty_service_test.go b/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"]
             }
@@ -309,33 +338,6 @@ func TestAccPagerDutyService_FormatValidation(t *testing.T) {
 			{
 				Config: testAccCheckPagerDutyServiceCustomInputValidationConfig(username, email, escalationPolicy, service,
 					`
-          alert_grouping_parameters {
-            type = "content_based"
-            config {
-              time_window = 86400
-            }
-          }
-          `,
-				),
-				PlanOnly: true,
-			},
-			{
-				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 = "intelligent"
           }

diff --git a/website/docs/r/service.html.markdown b/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: