Allow disabling service incident timeouts (take 2)

pagerduty/resource_pagerduty_service.go

@@ -2,6 +2,7 @@ package pagerduty
 
 import (
 	"log"
+	"strconv"
 
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/heimweh/go-pagerduty/pagerduty"
@@ -36,8 +37,9 @@ func resourcePagerDutyService() *schema.Resource {
 				}),
 			},
 			"auto_resolve_timeout": {
-				Type:     schema.TypeInt,
+				Type:     schema.TypeString,
 				Optional: true,
+				Default:  "14400",
 			},
 			"last_incident_timestamp": {
 				Type:     schema.TypeString,
@@ -52,8 +54,9 @@ func resourcePagerDutyService() *schema.Resource {
 				Computed: true,
 			},
 			"acknowledgement_timeout": {
-				Type:     schema.TypeInt,
+				Type:     schema.TypeString,
 				Optional: true,
+				Default:  "1800",
 			},
 			"escalation_policy": {
 				Type:     schema.TypeString,
@@ -182,7 +185,7 @@ func resourcePagerDutyService() *schema.Resource {
 	}
 }
 
-func buildServiceStruct(d *schema.ResourceData) *pagerduty.Service {
+func buildServiceStruct(d *schema.ResourceData) (*pagerduty.Service, error) {
 	service := pagerduty.Service{
 		Name:   d.Get("name").(string),
 		Status: d.Get("status").(string),
@@ -193,11 +196,23 @@ func buildServiceStruct(d *schema.ResourceData) *pagerduty.Service {
 	}
 
 	if attr, ok := d.GetOk("auto_resolve_timeout"); ok {
-		service.AutoResolveTimeout = attr.(int)
+		if attr.(string) != "null" {
+			if val, err := strconv.Atoi(attr.(string)); err == nil {
+				service.AutoResolveTimeout = &val
+			} else {
+				return nil, err
+			}
+		}
 	}
 
 	if attr, ok := d.GetOk("acknowledgement_timeout"); ok {
-		service.AcknowledgementTimeout = attr.(int)
+		if attr.(string) != "null" {
+			if val, err := strconv.Atoi(attr.(string)); err == nil {
+				service.AcknowledgementTimeout = &val
+			} else {
+				return nil, err
+			}
+		}
 	}
 
 	if attr, ok := d.GetOk("alert_creation"); ok {
@@ -223,17 +238,20 @@ func buildServiceStruct(d *schema.ResourceData) *pagerduty.Service {
 		service.ScheduledActions = expandScheduledActions(attr)
 	}
 
-	return &service
+	return &service, nil
 }
 
 func resourcePagerDutyServiceCreate(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*pagerduty.Client)
 
-	service := buildServiceStruct(d)
+	service, err := buildServiceStruct(d)
+	if err != nil {
+		return err
+	}
 
 	log.Printf("[INFO] Creating PagerDuty service %s", service.Name)
 
-	service, _, err := client.Services.Create(service)
+	service, _, err = client.Services.Create(service)
 	if err != nil {
 		return err
 	}
@@ -258,9 +276,17 @@ func resourcePagerDutyServiceRead(d *schema.ResourceData, meta interface{}) erro
 	d.Set("created_at", service.CreatedAt)
 	d.Set("escalation_policy", service.EscalationPolicy.ID)
 	d.Set("description", service.Description)
-	d.Set("auto_resolve_timeout", service.AutoResolveTimeout)
+	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)
-	d.Set("acknowledgement_timeout", service.AcknowledgementTimeout)
+	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.IncidentUrgencyRule != nil {
@@ -287,7 +313,10 @@ func resourcePagerDutyServiceRead(d *schema.ResourceData, meta interface{}) erro
 func resourcePagerDutyServiceUpdate(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*pagerduty.Client)
 
-	service := buildServiceStruct(d)
+	service, err := buildServiceStruct(d)
+	if err != nil {
+		return err
+	}
 
 	log.Printf("[INFO] Updating PagerDuty service %s", d.Id())
 

pagerduty/resource_pagerduty_service_test.go

@@ -116,9 +116,9 @@ func TestAccPagerDutyService_Basic(t *testing.T) {
 					resource.TestCheckResourceAttr(
 						"pagerduty_service.foo", "description", "bar"),
 					resource.TestCheckResourceAttr(
-						"pagerduty_service.foo", "auto_resolve_timeout", "0"),
+						"pagerduty_service.foo", "auto_resolve_timeout", "null"),
 					resource.TestCheckResourceAttr(
-						"pagerduty_service.foo", "acknowledgement_timeout", "0"),
+						"pagerduty_service.foo", "acknowledgement_timeout", "null"),
 				),
 			},
 		},
@@ -518,8 +518,8 @@ resource "pagerduty_escalation_policy" "foo" {
 resource "pagerduty_service" "foo" {
 	name                    = "%s"
 	description             = "bar"
-	auto_resolve_timeout    = 0
-	acknowledgement_timeout = 0
+	auto_resolve_timeout    = "null"
+	acknowledgement_timeout = "null"
 
 	escalation_policy       = "${pagerduty_escalation_policy.foo.id}"
 	incident_urgency_rule {

vendor/vendor.json

@@ -522,10 +522,10 @@
 			"revisionTime": "2016-07-20T23:31:40Z"
 		},
 		{
-			"checksumSHA1": "XFSyecgEgORKyxI8bfX8esMIBlE=",
+			"checksumSHA1": "ZQ0pchJreisfmNgJq387N9kqA+w=",
 			"path": "github.com/heimweh/go-pagerduty/pagerduty",
-			"revision": "4e8f8a6e375122d5ac801cd08bb0425ab2899549",
-			"revisionTime": "2017-10-20T17:28:17Z"
+			"revision": "64f5bd2f9c706f1b708fa7cc4e511611bc307890",
+			"revisionTime": "2017-11-24T16:45:11Z"
 		},
 		{
 			"checksumSHA1": "0ZrwvB6KoGPj2PoDNSEJwxQ6Mog=",

website/docs/r/service.html.markdown

@@ -50,8 +50,8 @@ The following arguments are supported:
   * `name` - (Required) The name of the service.
   * `description` - (Optional) A human-friendly description of the escalation policy.
     If not set, a placeholder of "Managed by Terraform" will be set.
-  * `auto_resolve_timeout` - (Optional) Time in seconds that an incident is automatically resolved if left open for that long. Disabled if not set.
-  * `acknowledgement_timeout` - (Optional) Time in seconds that an incident changes to the Triggered State after being Acknowledged. Disabled if not set.
+  * `auto_resolve_timeout` - (Optional) Time in seconds that an incident is automatically resolved if left open for that long. Disabled if set to the `"null"` string.
+  * `acknowledgement_timeout` - (Optional) Time in seconds that an incident changes to the Triggered State after being Acknowledged. Disabled if set to the `"null"` string.
   * `escalation_policy` - (Required) The escalation policy used by this service.
   * `alert_creation` - (Optional) Must be one of two values. PagerDuty receives events from your monitoring systems and can then create incidents in different ways. Value "create_incidents" is default: events will create an incident that cannot be merged. Value "create_alerts_and_incidents" is the alternative: events will create an alert and then add it to a new incident, these incidents can be merged.