added AlertChannel flag settings (#49)

Author: kjda

checkly/resource_alert_channel.go

@@ -32,6 +32,11 @@ const (
 	AcFieldOpsgenieAPIKey     = "api_key"
 	AcFieldOpsgenieRegion     = "region"
 	AcFieldOpsgeniePriority   = "priority"
+	AcFieldSendRecovery       = "send_recovery"
+	AcFieldSendFailure        = "send_failure"
+	AcFieldSendDegraded       = "send_degraded"
+	AcFieldSSLExpiry          = "ssl_expiry"
+	AcFieldSSLExpiryThreshold = "ssl_expiry_threshold"
 )
 
 func resourceAlertChannel() *schema.Resource {
@@ -161,14 +166,34 @@ func resourceAlertChannel() *schema.Resource {
 					},
 				},
 			},
+			AcFieldSendRecovery: {
+				Type:     schema.TypeBool,
+				Optional: true,
+			},
+			AcFieldSendFailure: {
+				Type:     schema.TypeBool,
+				Optional: true,
+			},
+			AcFieldSendDegraded: {
+				Type:     schema.TypeBool,
+				Optional: true,
+			},
+			AcFieldSSLExpiry: {
+				Type:     schema.TypeBool,
+				Optional: true,
+			},
+			AcFieldSSLExpiryThreshold: {
+				Type:     schema.TypeInt,
+				Optional: true,
+			},
 		},
 	}
 }
 
 func resourceAlertChannelCreate(d *schema.ResourceData, client interface{}) error {
 	ac, err := alertChannelFromResourceData(d)
 	if err != nil {
-		return makeError("resourceAlertChannelCreate.1", &ErrorLog{"err": err})
+		return makeError("resourceAlertChannelCreate.1", &ErrorLog{"err": err.Error()})
 	}
 	resp, err := client.(*checkly.Client).CreateAlertChannel(ac)
 	if err != nil {
@@ -186,7 +211,7 @@ func resourceAlertChannelCreate(d *schema.ResourceData, client interface{}) erro
 func resourceAlertChannelRead(d *schema.ResourceData, client interface{}) error {
 	ID, err := resourceIDToInt(d.Id())
 	if err != nil {
-		return makeError("resourceAlertChannelRead.1", &ErrorLog{"err": err})
+		return makeError("resourceAlertChannelRead.1", &ErrorLog{"err": err.Error()})
 	}
 	ac, err := client.(*checkly.Client).GetAlertChannel(ID)
 	if err != nil {
@@ -196,19 +221,19 @@ func resourceAlertChannelRead(d *schema.ResourceData, client interface{}) error
 			d.SetId("")
 			return nil
 		}
-		return makeError("resourceAlertChannelRead.2", &ErrorLog{"err": err})
+		return makeError("resourceAlertChannelRead.2", &ErrorLog{"err": err.Error()})
 	}
 	return resourceDataFromAlertChannel(ac, d)
 }
 
 func resourceAlertChannelUpdate(d *schema.ResourceData, client interface{}) error {
 	ac, err := alertChannelFromResourceData(d)
 	if err != nil {
-		return makeError("resourceAlertChannelUpdate.1", &ErrorLog{"err": err})
+		return makeError("resourceAlertChannelUpdate.1", &ErrorLog{"err": err.Error()})
 	}
 	_, err = client.(*checkly.Client).UpdateAlertChannel(ac.ID, ac)
 	if err != nil {
-		return makeError("resourceAlertChannelUpdate.2", &ErrorLog{"err": err})
+		return makeError("resourceAlertChannelUpdate.2", &ErrorLog{"err": err.Error()})
 	}
 	d.SetId(fmt.Sprintf("%d", ac.ID))
 	return resourceAlertChannelRead(d, client)
@@ -217,10 +242,10 @@ func resourceAlertChannelUpdate(d *schema.ResourceData, client interface{}) erro
 func resourceAlertChannelDelete(d *schema.ResourceData, client interface{}) error {
 	ID, err := resourceIDToInt(d.Id())
 	if err != nil {
-		return makeError("resourceAlertChannelDelete.1", &ErrorLog{"err": err})
+		return makeError("resourceAlertChannelDelete.1", &ErrorLog{"err": err.Error()})
 	}
 	if err := client.(*checkly.Client).DeleteAlertChannel(ID); err != nil {
-		return makeError("resourceAlertChannelDelete.2", &ErrorLog{"err": err})
+		return makeError("resourceAlertChannelDelete.2", &ErrorLog{"err": err.Error()})
 	}
 	return nil
 }
@@ -231,19 +256,48 @@ func resourceDataFromAlertChannel(it *checkly.AlertChannel, d *schema.ResourceDa
 	d.Set(AcFieldSlack, setFromSlack(it.Slack))
 	d.Set(AcFieldWebhook, setFromWebhook(it.Webhook))
 	d.Set(AcFieldOpsgenie, setFromOpsgenie(it.Opsgenie))
+	if it.SendRecovery != nil {
+		d.Set(AcFieldSendRecovery, *it.SendRecovery)
+	}
+	if it.SendFailure != nil {
+		d.Set(AcFieldSendFailure, *it.SendFailure)
+	}
+	if it.SendDegraded != nil {
+		d.Set(AcFieldSendDegraded, *it.SendDegraded)
+	}
+	if it.SSLExpiry != nil {
+		d.Set(AcFieldSSLExpiry, *it.SSLExpiry)
+	}
+	if it.SSLExpiryThreshold != nil {
+		d.Set(AcFieldSSLExpiryThreshold, *it.SSLExpiryThreshold)
+	}
 	return nil
 }
 
 func alertChannelFromResourceData(d *schema.ResourceData) (checkly.AlertChannel, error) {
 	ac := checkly.AlertChannel{}
 	ID, err := resourceIDToInt(d.Id())
 	if err != nil {
-		return ac, makeError("alertChannelFromResourceData.1", &ErrorLog{"err": err})
+		return ac, makeError("alertChannelFromResourceData.1", &ErrorLog{"err": err.Error()})
 	}
 	if err == nil {
 		ac.ID = ID
 	}
 
+	sr := d.Get(AcFieldSendRecovery).(bool)
+	ac.SendRecovery = &sr
+	sf := d.Get(AcFieldSendFailure).(bool)
+	ac.SendFailure = &sf
+	sd := d.Get(AcFieldSendDegraded).(bool)
+	ac.SendDegraded = &sd
+	expiry := d.Get(AcFieldSSLExpiry).(bool)
+	ac.SSLExpiry = &expiry
+	if ac.SSLExpiry != nil {
+		et := d.Get(AcFieldSSLExpiryThreshold).(int)
+		if et > 0 {
+			ac.SSLExpiryThreshold = &et
+		}
+	}
 	fields := []string{AcFieldEmail, AcFieldSMS, AcFieldSlack, AcFieldWebhook, AcFieldOpsgenie}
 	setCount := 0
 	for _, field := range fields {
@@ -252,7 +306,7 @@ func alertChannelFromResourceData(d *schema.ResourceData) (checkly.AlertChannel,
 			ac.Type = strings.ToUpper(field)
 			c, err := alertChannelConfigFromSet(ac.Type, cfgSet)
 			if err != nil {
-				return ac, makeError("alertChannelFromResourceData.2", &ErrorLog{"err": err})
+				return ac, makeError("alertChannelFromResourceData.2", &ErrorLog{"err": err.Error()})
 			}
 			ac.SetConfig(c)
 			setCount++

docs/resources/alert-channel.md

@@ -10,6 +10,11 @@ resource "checkly_alert_channel" "ac1" {
   email {
     address = "[email protected]"
   }
+  send_recovery = true 
+  send_failure = false
+  send_degraded = true 
+  ssl_expiry = true 
+  ssl_expiry_threshold = 22
 }
 ```  
 
@@ -20,6 +25,8 @@ resource "checkly_alert_channel" "ac1" {
     name = "john"
     number = "0123456789"
   }
+  send_recovery = true 
+  send_failure = true
 }
 ```  
 
@@ -98,8 +105,13 @@ resource "checkly_check_group" "test-group1" {
 ```
 
 ## Argument Reference
-    a `checkly_alert_channel` should contain configuration for a single alerting channel, 
-    which can be one of the following: `email`, `sms`, `slack`, `opsgenie`, `webhook`.
+* a `checkly_alert_channel` should contain a single configuration for alerting channel type, which can be one of the following: `email`, `sms`, `slack`, `opsgenie`, `webhook`.
+* `send_recovery` (Optional) . Possible values: `true` | `false`.
+* `send_failure`  (Optional) . Possible values: `true` | `false`.
+* `send_degraded` (Optional) . Possible values: `true` | `false`.
+* `ssl_expiry` (Optional) . Possible values: `true` | `false`.
+* `ssl_expiry_threshold` (Optional) . Possible values between 1 and 30. Default is `30`.
+
 ### Argument Reference for Email Alert Channel
 * `email` (Optional): 
     * `address` (Required) the email address of this email alert channel.

go.mod

@@ -5,7 +5,7 @@ go 1.14
 require (
 	github.com/agext/levenshtein v1.2.3 // indirect
 	github.com/aws/aws-sdk-go v1.31.11 // indirect
-	github.com/checkly/checkly-go-sdk v0.5.0
+	github.com/checkly/checkly-go-sdk v0.5.2
 	github.com/fatih/color v1.9.0 // indirect
 	github.com/google/go-cmp v0.5.0
 	github.com/gruntwork-io/terratest v0.18.3
@@ -24,3 +24,4 @@ require (
 	github.com/zclconf/go-cty v1.4.2 // indirect
 	golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980 // indirect
 )
+

go.sum

@@ -67,6 +67,8 @@ github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/checkly/checkly-go-sdk v0.5.0 h1:1WwBUrG6nGfhRhFApn18Zh0USb5ZEO8K1eyWItNQAtE=
 github.com/checkly/checkly-go-sdk v0.5.0/go.mod h1:wkAoXD2cVCNQEXi9lHZqy/zONIAZc5D9frih6Gas3Rs=
+github.com/checkly/checkly-go-sdk v0.5.1 h1:rBFP0FokEzwySq+DHpaRKmb/Dbm6d60Z5VE4Bo8M5dY=
+github.com/checkly/checkly-go-sdk v0.5.1/go.mod h1:wkAoXD2cVCNQEXi9lHZqy/zONIAZc5D9frih6Gas3Rs=
 github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
@@ -188,8 +190,10 @@ github.com/hashicorp/terraform-exec v0.3.0 h1:5WLBsnv9BoEUGlHJZETROZZxw+qO3/TFQE
 github.com/hashicorp/terraform-exec v0.3.0/go.mod h1:yKWvMPtkTaHpeAmllw+1qdHZ7E5u+pAZ+x8e2jQF6gM=
 github.com/hashicorp/terraform-json v0.5.0 h1:7TV3/F3y7QVSuN4r9BEXqnWqrAyeOtON8f0wvREtyzs=
 github.com/hashicorp/terraform-json v0.5.0/go.mod h1:eAbqb4w0pSlRmdvl8fOyHAi/+8jnkVYN28gJkSJrLhU=
+github.com/hashicorp/terraform-plugin-sdk v1.16.0 h1:NrkXMRjHErUPPTHQkZ6JIn6bByiJzGnlJzH1rVdNEuE=
 github.com/hashicorp/terraform-plugin-sdk/v2 v2.0.1 h1:qG6EdnW2UrftQI4mBdIsWP4YWqYJXynZtl0shQYuU78=
 github.com/hashicorp/terraform-plugin-sdk/v2 v2.0.1/go.mod h1:BRz6UtYmksQJU0eMfahQR8fcJf8tIe77gn7YVm6rGD4=
+github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.0 h1:2c+vG46celrDCsfYEIzaXxvBaAXCqlVG77LwtFz8cfs=
 github.com/hashicorp/terraform-plugin-test/v2 v2.0.0 h1:fYGV3nZvs8KFGKuY2NPAJDMNfVSDHo+U2FGFl3bPv1s=
 github.com/hashicorp/terraform-plugin-test/v2 v2.0.0/go.mod h1:C6VALgUlvaif+PnHyRGKWPTdQkMJK4NQ20VJolxZLI0=
 github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=

test.tf

@@ -423,13 +423,22 @@ resource "checkly_alert_channel" "email_ac" {
   email {
     address = "[email protected]"
   }
+  send_recovery = true
+  send_failure  = false
+  send_degraded = true
+  ssl_expiry    = false
 }
 
 resource "checkly_alert_channel" "slack_ac" {
   slack {
     channel = "checkly_alerts"
     url     = "https://slack.com/webhookurl"
   }
+  send_recovery        = false
+  send_failure         = true
+  send_degraded        = false
+  ssl_expiry           = true
+  ssl_expiry_threshold = 11
 }
 
 resource "checkly_alert_channel" "sms_ac" {