[U-1434] Add on_incident_reopened field to outgoing webhook resource (#177)

Author: CharliePapworth

Makefile

@@ -8,7 +8,7 @@ GOLANGCI_LINT := golangci-lint run --disable-all \
 	-E staticcheck \
 	-E typecheck \
 	-E unused
-VERSION := 0.20.5
+VERSION := 0.20.7
 .PHONY: test build
 
 help:

docs/resources/betteruptime_outgoing_webhook.md

@@ -25,6 +25,7 @@ https://betterstack.com/docs/uptime/api/outgoing-webhook-integrations/
 - `custom_webhook_template_attributes` (Block List, Max: 1) Custom webhook template configuration. (see [below for nested schema](#nestedblock--custom_webhook_template_attributes))
 - `name` (String) The name of the outgoing webhook.
 - `on_incident_acknowledged` (Boolean) Whether to trigger webhook when incident is acknowledged. Only when `trigger_type=incident_change`.
+- `on_incident_reopened` (Boolean) Whether to trigger webhook when incident is reopened. Only when `trigger_type=incident_change`.
 - `on_incident_resolved` (Boolean) Whether to trigger webhook when incident is resolved. Only when `trigger_type=incident_change`.
 - `on_incident_started` (Boolean) Whether to trigger webhook when incident starts. Only when `trigger_type=incident_change`.
 - `team_name` (String) Used to specify the team the resource should be created in when using global tokens.

examples/advanced/main.tf

@@ -481,6 +481,7 @@ resource "betteruptime_outgoing_webhook" "outgoing_webhook_1" {
   on_incident_started      = true
   on_incident_acknowledged = false
   on_incident_resolved     = false
+  on_incident_reopened     = false
 
   custom_webhook_template_attributes {
     http_method = "get"

examples/advanced/versions.tf

@@ -3,7 +3,7 @@ terraform {
   required_providers {
     betteruptime = {
       source  = "BetterStackHQ/better-uptime"
-      version = ">= 0.20.5"
+      version = ">= 0.20.7"
     }
   }
 }

internal/provider/resource_outgoing_webhook.go

@@ -65,6 +65,12 @@ var outgoingWebhookSchema = map[string]*schema.Schema{
 		Optional:    true,
 		Default:     false,
 	},
+	"on_incident_reopened": {
+		Description: "Whether to trigger webhook when incident is reopened. Only when `trigger_type=incident_change`.",
+		Type:        schema.TypeBool,
+		Optional:    true,
+		Default:     false,
+	},
 	"custom_webhook_template_attributes": {
 		Description: "Custom webhook template configuration.",
 		Type:        schema.TypeList,
@@ -143,6 +149,7 @@ type outgoingWebhook struct {
 	OnIncidentStarted               *bool                            `json:"on_incident_started,omitempty"`
 	OnIncidentAcknowledged          *bool                            `json:"on_incident_acknowledged,omitempty"`
 	OnIncidentResolved              *bool                            `json:"on_incident_resolved,omitempty"`
+	OnIncidentReopened              *bool                            `json:"on_incident_reopened,omitempty"`
 	CustomWebhookTemplateAttributes *customWebhookTemplateAttributes `json:"custom_webhook_template_attributes,omitempty"`
 	TeamName                        *string                          `json:"team_name,omitempty"`
 }
@@ -158,7 +165,7 @@ func validateOutgoingWebhook(ctx context.Context, d *schema.ResourceDiff, m inte
 	triggerType := d.Get("trigger_type").(string)
 
 	// Validate incident_change specific fields
-	incidentFields := []string{"on_incident_started", "on_incident_acknowledged", "on_incident_resolved"}
+	incidentFields := []string{"on_incident_started", "on_incident_acknowledged", "on_incident_resolved", "on_incident_reopened"}
 
 	for _, field := range incidentFields {
 		if value, ok := d.GetOk(field); ok && value.(bool) {
@@ -209,6 +216,7 @@ func outgoingWebhookRef(in *outgoingWebhook, triggerType string) []struct {
 			{k: "on_incident_started", v: &in.OnIncidentStarted},
 			{k: "on_incident_acknowledged", v: &in.OnIncidentAcknowledged},
 			{k: "on_incident_resolved", v: &in.OnIncidentResolved},
+			{k: "on_incident_reopened", v: &in.OnIncidentReopened},
 		}...)
 	}
 	return refs

internal/provider/resource_outgoing_webhook_test.go

@@ -37,6 +37,7 @@ func TestResourceOutgoingWebhookIntegration(t *testing.T) {
 					on_incident_started = true
 					on_incident_acknowledged = true
 					on_incident_resolved = true
+					on_incident_reopened = true
 				}
 				`, name, url),
 				Check: resource.ComposeTestCheckFunc(
@@ -47,6 +48,7 @@ func TestResourceOutgoingWebhookIntegration(t *testing.T) {
 					resource.TestCheckResourceAttr("betteruptime_outgoing_webhook.this", "on_incident_started", "true"),
 					resource.TestCheckResourceAttr("betteruptime_outgoing_webhook.this", "on_incident_acknowledged", "true"),
 					resource.TestCheckResourceAttr("betteruptime_outgoing_webhook.this", "on_incident_resolved", "true"),
+					resource.TestCheckResourceAttr("betteruptime_outgoing_webhook.this", "on_incident_reopened", "true"),
 				),
 			},
 			// Step 2 - update
@@ -63,6 +65,7 @@ func TestResourceOutgoingWebhookIntegration(t *testing.T) {
 					on_incident_started = false
 					on_incident_acknowledged = true
 					on_incident_resolved = true
+					on_incident_reopened = true
 				}
 				`, name, url),
 				Check: resource.ComposeTestCheckFunc(
@@ -86,6 +89,7 @@ func TestResourceOutgoingWebhookIntegration(t *testing.T) {
 					on_incident_started = false
 					on_incident_acknowledged = true
 					on_incident_resolved = true
+					on_incident_reopened = true
 				}
 				`, name, url),
 				PlanOnly: true,