Merge pull request #1035 from PagerDuty/cjavier/allow-delete-24h-content-based

Allow deleting alert_grouping_parameters with a time_window equal to 86400

Author: cjgajard

pagerduty/resource_pagerduty_service.go

@@ -352,7 +352,7 @@ 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" {
+		if timeWindowVal == 86400 && agpType != "" && 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") {
@@ -590,20 +590,25 @@ func flattenService(d *schema.ResourceData, service *pagerduty.Service) error {
 	d.Set("created_at", service.CreatedAt)
 	d.Set("escalation_policy", service.EscalationPolicy.ID)
 	d.Set("description", service.Description)
+	d.Set("alert_creation", service.AlertCreation)
+	d.Set("last_incident_timestamp", service.LastIncidentTimestamp)
+
 	if service.AutoResolveTimeout == nil {
 		d.Set("auto_resolve_timeout", "null")
 	} else {
 		d.Set("auto_resolve_timeout", strconv.Itoa(*service.AutoResolveTimeout))
 	}
-	d.Set("last_incident_timestamp", service.LastIncidentTimestamp)
+
 	if service.AcknowledgementTimeout == nil {
 		d.Set("acknowledgement_timeout", "null")
 	} else {
 		d.Set("acknowledgement_timeout", strconv.Itoa(*service.AcknowledgementTimeout))
 	}
-	d.Set("alert_creation", service.AlertCreation)
-	if service.AlertGrouping != nil && *service.AlertGrouping != nil && **service.AlertGrouping != "" {
-		d.Set("alert_grouping", **service.AlertGrouping)
+
+	if service.AlertGrouping != nil && *service.AlertGrouping != nil {
+		if ag := **service.AlertGrouping; ag != "" && ag != "rules" {
+			d.Set("alert_grouping", ag)
+		}
 	}
 	if service.AlertGroupingTimeout == nil {
 		d.Set("alert_grouping_timeout", "null")

pagerduty/resource_pagerduty_service_test.go

@@ -684,6 +684,38 @@ func TestAccPagerDutyService_AlertContentGroupingIntelligentTimeWindow(t *testin
 	})
 }
 
+func TestAccPagerDutyService_Delete24HAlertGrouping(t *testing.T) {
+	group := fmt.Sprintf("tf-%s", acctest.RandString(5))
+	email := fmt.Sprintf("%[email protected]", group)
+	service := fmt.Sprintf("tf-%s", acctest.RandString(5))
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckPagerDutyServiceDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccCheckPagerDutyServiceConfigWithAlertContentGrouping24H(group, email, group, service),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckPagerDutyServiceExists("pagerduty_service.foo"),
+					resource.TestCheckResourceAttr("pagerduty_service.foo", "name", service),
+					resource.TestCheckResourceAttr("pagerduty_service.foo", "alert_grouping_parameters.0.type", "content_based"),
+					resource.TestCheckResourceAttr("pagerduty_service.foo", "alert_grouping_parameters.0.config.0.time_window", "86400"),
+				),
+			},
+			{
+				Config: testAccCheckPagerDutyServiceConfigWithAlertContentGrouping24HUpdated(group, email, group, service),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckPagerDutyServiceExists("pagerduty_service.foo"),
+					resource.TestCheckResourceAttr("pagerduty_service.foo", "name", service),
+					resource.TestCheckNoResourceAttr("pagerduty_service.foo", "alert_grouping_parameters.0.type"),
+					resource.TestCheckNoResourceAttr("pagerduty_service.foo", "alert_grouping_parameters.0.config.0.time_window"),
+				),
+			},
+		},
+	})
+}
+
 func TestAccPagerDutyService_AutoPauseNotificationsParameters(t *testing.T) {
 	username := fmt.Sprintf("tf-%s", acctest.RandString(5))
 	email := fmt.Sprintf("%[email protected]", username)
@@ -1444,6 +1476,67 @@ resource "pagerduty_service" "foo" {
 `, username, email, escalationPolicy, service)
 }
 
+func testAccCheckPagerDutyServiceConfigWithAlertContentGrouping24H(username, email, escalationPolicy, service string) string {
+	return fmt.Sprintf(`
+resource "pagerduty_user" "foo" {
+	name        = "%s"
+	email       = "%s"
+}
+
+resource "pagerduty_escalation_policy" "foo" {
+	name        = "%s"
+	num_loops   = 2
+	rule {
+		escalation_delay_in_minutes = 10
+		target {
+			type = "user_reference"
+			id   = pagerduty_user.foo.id
+		}
+	}
+}
+
+resource "pagerduty_service" "foo" {
+	name                    = "%s"
+	escalation_policy       = pagerduty_escalation_policy.foo.id
+	alert_grouping_parameters {
+		type = "content_based"
+		config {
+			time_window = 86400
+			aggregate = "all"
+			fields = ["custom_details.field1"]
+		}
+	}
+}`, username, email, escalationPolicy, service)
+}
+
+func testAccCheckPagerDutyServiceConfigWithAlertContentGrouping24HUpdated(username, email, escalationPolicy, service string) string {
+	return fmt.Sprintf(`
+resource "pagerduty_user" "foo" {
+	name        = "%s"
+	email       = "%s"
+}
+
+resource "pagerduty_escalation_policy" "foo" {
+	name        = "%s"
+	num_loops   = 2
+	rule {
+		escalation_delay_in_minutes = 10
+		target {
+			type = "user_reference"
+			id   = pagerduty_user.foo.id
+		}
+	}
+}
+
+resource "pagerduty_service" "foo" {
+	name                    = "%s"
+	escalation_policy       = pagerduty_escalation_policy.foo.id
+	alert_grouping_parameters {
+		type = null
+	}
+}`, username, email, escalationPolicy, service)
+}
+
 func testAccCheckPagerDutyServiceConfigWithAlertContentGroupingIntelligentTimeWindow(username, email, escalationPolicy, service string) string {
 	return fmt.Sprintf(`
 resource "pagerduty_user" "foo" {