Merge pull request #77 from louy/feat/alert-contact-import

Fix alert_contact import in monitor resource
louy · Sep 6, 2020 · 0ed7568 · 0ed7568
2 parents 05bb1fd + 8540f15
commit 0ed7568
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 16 deletions.
diff --git a/uptimerobot/api/monitor.go b/uptimerobot/api/monitor.go
@@ -47,6 +47,12 @@ var monitorHTTPAuthType = map[string]int{
 }
 var MonitorHTTPAuthType = mapKeys(monitorHTTPAuthType)
 
+type MonitorAlertContact struct {
+	ID         string `json:"id"`
+	Recurrence int    `json:"recurrence"`
+	Threshold  int    `json:"threshold"`
+}
+
 type Monitor struct {
 	ID           int    `json:"id"`
 	FriendlyName string `json:"friendly_name"`
@@ -66,12 +72,15 @@ type Monitor struct {
 	HTTPAuthType string `json:"http_auth_type"`
 
 	CustomHTTPHeaders map[string]string
+
+	AlertContacts []MonitorAlertContact
 }
 
 func (client UptimeRobotApiClient) GetMonitor(id int) (m Monitor, err error) {
 	data := url.Values{}
 	data.Add("monitors", fmt.Sprintf("%d", id))
 	data.Add("custom_http_headers", fmt.Sprintf("%d", 1))
+	data.Add("alert_contacts", fmt.Sprintf("%d", 1))
 
 	body, err := client.MakeCall(
 		"getMonitors",
@@ -139,6 +148,18 @@ func (client UptimeRobotApiClient) GetMonitor(id int) (m Monitor, err error) {
 	}
 	m.CustomHTTPHeaders = customHTTPHeaders
 
+	if contacts := monitor["alert_contacts"].([]interface{}); contacts != nil {
+		m.AlertContacts = make([]MonitorAlertContact, len(contacts))
+		for k, v := range contacts {
+			contact := v.(map[string]interface{})
+			var ac MonitorAlertContact
+			ac.ID = contact["id"].(string)
+			ac.Recurrence = int(contact["recurrence"].(float64))
+			ac.Threshold = int(contact["threshold"].(float64))
+			m.AlertContacts[k] = ac
+		}
+	}
+
 	return
 }
 

diff --git a/uptimerobot/resource_uptimerobot_monitor.go b/uptimerobot/resource_uptimerobot_monitor.go
@@ -161,7 +161,9 @@ func resourceMonitorCreate(d *schema.ResourceData, m interface{}) error {
 		return err
 	}
 	d.SetId(fmt.Sprintf("%d", monitor.ID))
-	updateMonitorResource(d, monitor)
+	if err := updateMonitorResource(d, monitor); err != nil {
+		return err
+	}
 	return nil
 }
 
@@ -175,9 +177,9 @@ func resourceMonitorRead(d *schema.ResourceData, m interface{}) error {
 	if err != nil {
 		return err
 	}
-
-	updateMonitorResource(d, monitor)
-
+	if err := updateMonitorResource(d, monitor); err != nil {
+		return err
+	}
 	return nil
 }
 
@@ -237,8 +239,9 @@ func resourceMonitorUpdate(d *schema.ResourceData, m interface{}) error {
 	if err != nil {
 		return err
 	}
-
-	updateMonitorResource(d, monitor)
+	if err := updateMonitorResource(d, monitor); err != nil {
+		return err
+	}
 	return nil
 }
 
@@ -255,7 +258,7 @@ func resourceMonitorDelete(d *schema.ResourceData, m interface{}) error {
 	return nil
 }
 
-func updateMonitorResource(d *schema.ResourceData, m uptimerobotapi.Monitor) {
+func updateMonitorResource(d *schema.ResourceData, m uptimerobotapi.Monitor) error {
 	d.Set("friendly_name", m.FriendlyName)
 	d.Set("url", m.URL)
 	d.Set("type", m.Type)
@@ -273,5 +276,21 @@ func updateMonitorResource(d *schema.ResourceData, m uptimerobotapi.Monitor) {
 	// PS: There seems to be a bug in the UR api as it never returns this value
 	// d.Set("http_auth_type", m.HTTPAuthType)
 
-	d.Set("custom_http_headers", m.CustomHTTPHeaders)
+	if err := d.Set("custom_http_headers", m.CustomHTTPHeaders); err != nil {
+		return fmt.Errorf("error setting custom_http_headers for resource %s: %s", d.Id(), err)
+	}
+
+	rawContacts := make([]map[string]interface{}, len(m.AlertContacts))
+	for k, v := range m.AlertContacts {
+		rawContacts[k] = map[string]interface{}{
+			"id":         v.ID,
+			"recurrence": v.Recurrence,
+			"threshold":  v.Threshold,
+		}
+	}
+	if err := d.Set("alert_contact", rawContacts); err != nil {
+		return fmt.Errorf("error setting alert_contact for resource %s: %s", d.Id(), err)
+	}
+
+	return nil
 }
diff --git a/uptimerobot/resource_uptimerobot_monitor_test.go b/uptimerobot/resource_uptimerobot_monitor_test.go
@@ -249,10 +249,9 @@ func TestUptimeRobotDataResourceMonitor_custom_alert_contact_threshold_and_recur
 				),
 			},
 			resource.TestStep{
-				ResourceName: "uptimerobot_monitor.test",
-				ImportState:  true,
-				// uptimerobot doesn't support pulling alert_contact
-				// ImportStateVerify: true,
+				ResourceName:      "uptimerobot_monitor.test",
+				ImportState:       true,
+				ImportStateVerify: true,
 			},
 		},
 	})
@@ -417,8 +416,8 @@ func TestUptimeRobotDataResourceMonitor_http_auth_monitor(t *testing.T) {
 				),
 			},
 			resource.TestStep{
-				ResourceName:      "uptimerobot_monitor.test",
-				ImportState:       true,
+				ResourceName: "uptimerobot_monitor.test",
+				ImportState:  true,
 				// NB: Disabled due to http_auth_type issue
 				// ImportStateVerify: true,
 			},
@@ -443,8 +442,8 @@ func TestUptimeRobotDataResourceMonitor_http_auth_monitor(t *testing.T) {
 				),
 			},
 			resource.TestStep{
-				ResourceName:      "uptimerobot_monitor.test",
-				ImportState:       true,
+				ResourceName: "uptimerobot_monitor.test",
+				ImportState:  true,
 				// NB: Disabled due to http_auth_type issue
 				// ImportStateVerify: true,
 			},