Retrieve monitor IDs that match given friendly name

Avoid constructing Monitor struct for each and every monitor record.
Return IDs of monitor records that match the friendly name provided and
build the Monitor object for the single monitor found.

Author: evansmurithi

uptimerobot/api/monitor.go

@@ -78,7 +78,7 @@ type Monitor struct {
 	AlertContacts []MonitorAlertContact
 }
 
-func (client UptimeRobotApiClient) GetMonitors() (ms []Monitor, err error) {
+func (client UptimeRobotApiClient) GetMonitorIDs(friendlyName string) (ids []int, err error) {
 	data := url.Values{}
 	data.Add("custom_http_headers", fmt.Sprintf("%d", 1))
 	data.Add("alert_contacts", fmt.Sprintf("%d", 1))
@@ -109,76 +109,18 @@ func (client UptimeRobotApiClient) GetMonitors() (ms []Monitor, err error) {
 
 		for _, i := range monitors {
 			monitor := i.(map[string]interface{})
+			monitorID := int(monitor["id"].(float64))
+			monitorFriendlyName := monitor["friendly_name"].(string)
 
-			var m Monitor
-			m.ID = int(monitor["id"].(float64))
-			m.FriendlyName = monitor["friendly_name"].(string)
-			m.URL = monitor["url"].(string)
-			m.Type = intToString(monitorType, int(monitor["type"].(float64)))
-			m.Status = intToString(monitorStatus, int(monitor["status"].(float64)))
-			m.Interval = int(monitor["interval"].(float64))
-
-			switch m.Type {
-			case "port":
-				m.SubType = intToString(monitorSubType, int(monitor["sub_type"].(float64)))
-				if m.SubType != "custom" {
-					m.Port = 0
-				} else {
-					m.Port = int(monitor["port"].(float64))
-				}
-				break
-			case "keyword":
-				m.KeywordType = intToString(monitorKeywordType, int(monitor["keyword_type"].(float64)))
-				m.KeywordValue = monitor["keyword_value"].(string)
-
-				if val := monitor["http_auth_type"]; val != nil {
-					// PS: There seems to be a bug in the UR api as it never returns this value
-					m.HTTPAuthType = intToString(monitorHTTPAuthType, int(val.(float64)))
-				}
-				m.HTTPUsername = monitor["http_username"].(string)
-				m.HTTPPassword = monitor["http_password"].(string)
-				break
-			case "http":
-				if val := monitor["http_auth_type"]; val != nil {
-					// PS: There seems to be a bug in the UR api as it never returns this value
-					m.HTTPAuthType = intToString(monitorHTTPAuthType, int(val.(float64)))
-				}
-				m.HTTPUsername = monitor["http_username"].(string)
-				m.HTTPPassword = monitor["http_password"].(string)
-				break
+			if monitorFriendlyName == friendlyName {
+				ids = append(ids, monitorID)
 			}
-
-			customHTTPHeaders := make(map[string]string)
-			for k, v := range monitor["custom_http_headers"].(map[string]interface{}) {
-				customHTTPHeaders[k] = v.(string)
-			}
-			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)
-					// Recurrence and Threshold may be null
-					ac.Recurrence = 0
-					if recurrence := contact["recurrence"]; recurrence != nil {
-						ac.Recurrence = int(recurrence.(float64))
-					}
-					ac.Threshold = 0
-					if threshold := contact["threshold"]; threshold != nil {
-						ac.Threshold = int(threshold.(float64))
-					}
-					m.AlertContacts[k] = ac
-				}
-			}
-
-			ms = append(ms, m)
 		}
 
 		total = int(body["pagination"].(map[string]interface{})["total"].(float64))
 		offset += maxMonitorRecords
 		if offset < total {
+			// get monitors for next page
 			data.Set("offset", fmt.Sprintf("%d", offset))
 		} else {
 			break

uptimerobot/data_source_uptimerobot_monitor.go

@@ -2,7 +2,6 @@ package uptimerobot
 
 import (
 	"fmt"
-	"reflect"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	uptimerobotapi "github.com/louy/terraform-provider-uptimerobot/uptimerobot/api"
@@ -42,25 +41,25 @@ func dataSourceMonitor() *schema.Resource {
 }
 
 func dataSourceMonitorRead(d *schema.ResourceData, m interface{}) error {
-	monitors, err := m.(uptimerobotapi.UptimeRobotApiClient).GetMonitors()
+	friendlyName := d.Get("friendly_name").(string)
+
+	ids, err := m.(uptimerobotapi.UptimeRobotApiClient).GetMonitorIDs(friendlyName)
 	if err != nil {
 		return err
 	}
 
-	friendlyName := d.Get("friendly_name").(string)
-
-	var monitor uptimerobotapi.Monitor
-
-	for _, m := range monitors {
-		if friendlyName != "" && m.FriendlyName == friendlyName {
-			monitor = m
-			break
-		}
-	}
-	if reflect.DeepEqual(monitor, uptimerobotapi.Monitor{}) {
+	if len(ids) < 1 {
 		return fmt.Errorf("Failed to find monitor by name %s", friendlyName)
 	}
 
+	if len(ids) > 1 {
+		return fmt.Errorf("More than one monitor with name %s exists", friendlyName)
+	}
+
+	monitor, err := m.(uptimerobotapi.UptimeRobotApiClient).GetMonitor(ids[0])
+	if err != nil {
+		return err
+	}
 	d.SetId(fmt.Sprintf("%d", monitor.ID))
 	if err := updateMonitorResource(d, monitor); err != nil {
 		return err