Add support for missing attributes for PagerDuty service resource (hashicorp#11856)

* Add urgencies for PagerDuty services

* Improve naming, comments, handle unexpected urgency rules

* Document urgency rules for PagerDuty service

Author: jtsaito

builtin/providers/pagerduty/import_pagerduty_service_test.go

@@ -26,3 +26,24 @@ func TestAccPagerDutyService_import(t *testing.T) {
 		},
 	})
 }
+
+func TestAccPagerDutyServiceWithIncidentUrgency_import(t *testing.T) {
+	resourceName := "pagerduty_service.foo"
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckPagerDutyServiceDestroy,
+		Steps: []resource.TestStep{
+			resource.TestStep{
+				Config: testAccCheckPagerDutyServiceWithIncidentUrgencyRulesConfig,
+			},
+
+			resource.TestStep{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}

builtin/providers/pagerduty/resource_pagerduty_service.go

@@ -50,6 +50,124 @@ func resourcePagerDutyService() *schema.Resource {
 				Type:     schema.TypeString,
 				Required: true,
 			},
+			"incident_urgency_rule": &schema.Schema{
+				Type:     schema.TypeList,
+				Required: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"type": {
+							Type:     schema.TypeString,
+							Required: true,
+						},
+						"urgency": {
+							Type:     schema.TypeString,
+							Optional: true,
+						},
+						"during_support_hours": {
+							Type:     schema.TypeList,
+							MaxItems: 1,
+							MinItems: 1,
+							Optional: true,
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"type": {
+										Type:     schema.TypeString,
+										Optional: true,
+									},
+									"urgency": {
+										Type:     schema.TypeString,
+										Optional: true,
+									},
+								},
+							},
+						},
+						"outside_support_hours": {
+							Type:     schema.TypeList,
+							MaxItems: 1,
+							MinItems: 1,
+							Optional: true,
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"type": {
+										Type:     schema.TypeString,
+										Optional: true,
+									},
+									"urgency": {
+										Type:     schema.TypeString,
+										Optional: true,
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+			"support_hours": &schema.Schema{
+				Type:     schema.TypeList,
+				Optional: true,
+				MaxItems: 1,
+				MinItems: 1,
+				ForceNew: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"type": {
+							Type:     schema.TypeString,
+							Optional: true,
+						},
+						"time_zone": {
+							Type:     schema.TypeString,
+							Optional: true,
+						},
+						"start_time": {
+							Type:     schema.TypeString,
+							Optional: true,
+						},
+						"end_time": {
+							Type:     schema.TypeString,
+							Optional: true,
+						},
+						"days_of_week": {
+							Type:     schema.TypeList,
+							Optional: true,
+							MaxItems: 7,
+							Elem:     &schema.Schema{Type: schema.TypeInt},
+						},
+					},
+				},
+			},
+			"scheduled_actions": &schema.Schema{
+				Type:     schema.TypeList,
+				Optional: true,
+				ForceNew: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"type": {
+							Type:     schema.TypeString,
+							Optional: true,
+						},
+						"to_urgency": {
+							Type:     schema.TypeString,
+							Optional: true,
+						},
+						"at": &schema.Schema{
+							Type:     schema.TypeList,
+							Optional: true,
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"type": {
+										Type:     schema.TypeString,
+										Optional: true,
+									},
+									"name": {
+										Type:     schema.TypeString,
+										Optional: true,
+									},
+								},
+							},
+						},
+					},
+				},
+			},
 		},
 	}
 }
@@ -86,6 +204,18 @@ func buildServiceStruct(d *schema.ResourceData) *pagerduty.Service {
 
 	service.EscalationPolicy = *escalationPolicy
 
+	if attr, ok := d.GetOk("incident_urgency_rule"); ok {
+		if iur, ok := expandIncidentUrgencyRule(attr); ok {
+			service.IncidentUrgencyRule = iur
+		}
+	}
+	if attr, ok := d.GetOk("support_hours"); ok {
+		service.SupportHours = expandSupportHours(attr)
+	}
+	if attr, ok := d.GetOk("scheduled_actions"); ok {
+		service.ScheduledActions = expandScheduledActions(attr)
+	}
+
 	return &service
 }
 
@@ -133,6 +263,16 @@ func resourcePagerDutyServiceRead(d *schema.ResourceData, meta interface{}) erro
 	d.Set("last_incident_timestamp", service.LastIncidentTimestamp)
 	d.Set("acknowledgement_timeout", service.AcknowledgementTimeout)
 
+	if incidentUrgencyRule, ok := flattenIncidentUrgencyRule(service); ok {
+		d.Set("incident_urgency_rule", incidentUrgencyRule)
+	}
+
+	supportHours := flattenSupportHours(service)
+	d.Set("support_hours", supportHours)
+
+	scheduledActions := flattenScheduledActions(service)
+	d.Set("scheduled_actions", scheduledActions)
+
 	return nil
 }
 
@@ -168,5 +308,6 @@ func resourcePagerDutyServiceImport(d *schema.ResourceData, meta interface{}) ([
 	if err := resourcePagerDutyServiceRead(d, meta); err != nil {
 		return nil, err
 	}
+
 	return []*schema.ResourceData{d}, nil
 }

builtin/providers/pagerduty/resource_pagerduty_service_integration_test.go

@@ -117,6 +117,11 @@ resource "pagerduty_service" "foo" {
   auto_resolve_timeout    = 1800
   acknowledgement_timeout = 1800
   escalation_policy       = "${pagerduty_escalation_policy.foo.id}"
+
+  incident_urgency_rule {
+    type = "constant"
+    urgency = "high"
+  }
 }
 
 data "pagerduty_vendor" "datadog" {
@@ -162,6 +167,11 @@ resource "pagerduty_service" "foo" {
   auto_resolve_timeout    = 3600
   acknowledgement_timeout = 3600
   escalation_policy       = "${pagerduty_escalation_policy.foo.id}"
+
+  incident_urgency_rule {
+    type    = "constant"
+    urgency = "high"
+  }
 }
 
 data "pagerduty_vendor" "datadog" {