Merge pull request #79 from SumoLogic/rohit-SUMO-147334-fix-monitor-state-refresh

SUMO-147334: fix monitor state refresh

Author: rsanbhad

sumologic/resource_sumologic_monitors_library_monitor.go

@@ -1,6 +1,7 @@
 package sumologic
 
 import (
+	"fmt"
 	"log"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
@@ -88,7 +89,7 @@ func resourceSumologicMonitorsLibraryMonitor() *schema.Resource {
 					Schema: map[string]*schema.Schema{
 						"trigger_type": {
 							Type:     schema.TypeString,
-							Required: true,
+							Optional: true,
 						},
 						"threshold": {
 							Type:     schema.TypeFloat,
@@ -100,15 +101,15 @@ func resourceSumologicMonitorsLibraryMonitor() *schema.Resource {
 						},
 						"time_range": {
 							Type:     schema.TypeString,
-							Required: true,
+							Optional: true,
 						},
 						"trigger_source": {
 							Type:     schema.TypeString,
-							Required: true,
+							Optional: true,
 						},
 						"occurrence_type": {
 							Type:     schema.TypeString,
-							Required: true,
+							Optional: true,
 						},
 						"detection_method": {
 							Type:     schema.TypeString,
@@ -133,7 +134,11 @@ func resourceSumologicMonitorsLibraryMonitor() *schema.Resource {
 								Schema: map[string]*schema.Schema{
 									"action_type": {
 										Type:     schema.TypeString,
-										Required: true,
+										Optional: true,
+									},
+									"connection_type": {
+										Type:     schema.TypeString,
+										Optional: true,
 									},
 									"subject": {
 										Type:     schema.TypeString,
@@ -195,6 +200,7 @@ func resourceSumologicMonitorsLibraryMonitor() *schema.Resource {
 			"is_locked": {
 				Type:     schema.TypeBool,
 				Optional: true,
+				Computed: true,
 			},
 			"status": {
 				Type:     schema.TypeList,
@@ -291,6 +297,69 @@ func resourceSumologicMonitorsLibraryMonitorRead(d *schema.ResourceData, meta in
 	d.Set("is_disabled", monitor.IsDisabled)
 	d.Set("status", monitor.Status)
 	d.Set("group_notifications", monitor.GroupNotifications)
+	// set notifications
+	notifications := make([]interface{}, len(monitor.Notifications))
+	for i, n := range monitor.Notifications {
+		schemaNotification := make(map[string]interface{})
+		// notification in schema should be a list of length exactly 1
+		schemaInternalNotification := make([]interface{}, 1)
+		internalNotification := make(map[string]interface{})
+		internalNotificationDict := n.Notification.(map[string]interface{})
+		if internalNotificationDict["connectionType"] != nil {
+			internalNotification["connection_type"] = internalNotificationDict["connectionType"].(string)
+		}
+		internalNotification["action_type"] = internalNotificationDict["actionType"].(string)
+		if internalNotification["action_type"].(string) == "EmailAction" ||
+			internalNotification["action_type"].(string) == "Email" ||
+			internalNotification["connection_type"].(string) == "EmailAction" ||
+			internalNotification["connection_type"].(string) == "Email" {
+			internalNotification["subject"] = internalNotificationDict["subject"].(string)
+			internalNotification["recipients"] = internalNotificationDict["recipients"].([]interface{})
+			internalNotification["message_body"] = internalNotificationDict["messageBody"].(string)
+			internalNotification["time_zone"] = internalNotificationDict["timeZone"].(string)
+		} else {
+			internalNotification["connection_id"] = internalNotificationDict["connectionId"].(string)
+			if internalNotificationDict["payloadOverride"] != nil {
+				internalNotification["payload_override"] = internalNotificationDict["payloadOverride"].(string)
+			}
+		}
+		schemaInternalNotification[0] = internalNotification
+
+		schemaNotification["notification"] = schemaInternalNotification
+		schemaNotification["run_for_trigger_types"] = n.RunForTriggerTypes
+		notifications[i] = schemaNotification
+	}
+	if err := d.Set("notifications", notifications); err != nil {
+		return err
+	}
+	// set triggers
+	triggers := make([]interface{}, len(monitor.Triggers))
+	for i, t := range monitor.Triggers {
+		schemaTrigger := make(map[string]interface{})
+		schemaTrigger["trigger_type"] = t.TriggerType
+		schemaTrigger["threshold"] = t.Threshold
+		schemaTrigger["threshold_type"] = t.ThresholdType
+		// we don't read the TimeRange because it overwrites our local timerange and leads to errors
+		schemaTrigger["time_range"] = d.Get(fmt.Sprintf("triggers.%d.time_range", i))
+		schemaTrigger["occurrence_type"] = t.OccurrenceType
+		schemaTrigger["trigger_source"] = t.TriggerSource
+		schemaTrigger["detection_method"] = t.DetectionMethod
+		triggers[i] = schemaTrigger
+	}
+	if err := d.Set("triggers", triggers); err != nil {
+		return err
+	}
+	// set queries
+	queries := make([]interface{}, len(monitor.Queries))
+	for i, q := range monitor.Queries {
+		schemaQuery := make(map[string]interface{})
+		schemaQuery["row_id"] = q.RowID
+		schemaQuery["query"] = q.Query
+		queries[i] = schemaQuery
+	}
+	if err := d.Set("queries", queries); err != nil {
+		return err
+	}
 
 	return nil
 }
@@ -316,25 +385,26 @@ func resourceSumologicMonitorsLibraryMonitorDelete(d *schema.ResourceData, meta
 	return nil
 }
 
-func resourceToMonitorsLibraryMonitor(d *schema.ResourceData) MonitorsLibraryMonitor {
-	// handle notifications
+func getNotifications(d *schema.ResourceData) []MonitorNotification {
 	rawNotifications := d.Get("notifications").([]interface{})
 	notifications := make([]MonitorNotification, len(rawNotifications))
 	for i := range rawNotifications {
 		notificationDict := rawNotifications[i].(map[string]interface{})
 		n := MonitorNotification{}
 		rawNotificationAction := notificationDict["notification"].([]interface{})
 		notificationActionDict := rawNotificationAction[0].(map[string]interface{})
-		if notificationActionDict["action_type"].(string) == "EmailAction" {
+		if notificationActionDict["action_type"].(string) == "EmailAction" ||
+			notificationActionDict["action_type"].(string) == "Email" ||
+			notificationActionDict["connection_type"].(string) == "EmailAction" ||
+			notificationActionDict["connection_type"].(string) == "Email" {
 			notificationAction := EmailNotification{}
 			notificationAction.ActionType = notificationActionDict["action_type"].(string)
 			notificationAction.Subject = notificationActionDict["subject"].(string)
 			notificationAction.Recipients = notificationActionDict["recipients"].([]interface{})
 			notificationAction.MessageBody = notificationActionDict["message_body"].(string)
 			notificationAction.TimeZone = notificationActionDict["time_zone"].(string)
 			n.Notification = notificationAction
-		}
-		if notificationActionDict["action_type"].(string) == "NamedConnectionAction" {
+		} else {
 			notificationAction := WebhookNotificiation{}
 			notificationAction.ActionType = notificationActionDict["action_type"].(string)
 			notificationAction.ConnectionID = notificationActionDict["connection_id"].(string)
@@ -344,7 +414,10 @@ func resourceToMonitorsLibraryMonitor(d *schema.ResourceData) MonitorsLibraryMon
 		n.RunForTriggerTypes = notificationDict["run_for_trigger_types"].([]interface{})
 		notifications[i] = n
 	}
-	// handle triggers
+	return notifications
+}
+
+func getTriggers(d *schema.ResourceData) []TriggerCondition {
 	rawTriggers := d.Get("triggers").([]interface{})
 	triggers := make([]TriggerCondition, len(rawTriggers))
 	for i := range rawTriggers {
@@ -359,7 +432,10 @@ func resourceToMonitorsLibraryMonitor(d *schema.ResourceData) MonitorsLibraryMon
 		t.DetectionMethod = triggerDict["detection_method"].(string)
 		triggers[i] = t
 	}
-	// handle queries
+	return triggers
+}
+
+func getQueries(d *schema.ResourceData) []MonitorQuery {
 	rawQueries := d.Get("queries").([]interface{})
 	queries := make([]MonitorQuery, len(rawQueries))
 	for i := range rawQueries {
@@ -369,6 +445,13 @@ func resourceToMonitorsLibraryMonitor(d *schema.ResourceData) MonitorsLibraryMon
 		q.RowID = queryDict["row_id"].(string)
 		queries[i] = q
 	}
+	return queries
+}
+
+func resourceToMonitorsLibraryMonitor(d *schema.ResourceData) MonitorsLibraryMonitor {
+	notifications := getNotifications(d)
+	triggers := getTriggers(d)
+	queries := getQueries(d)
 	rawStatus := d.Get("status").([]interface{})
 	status := make([]string, len(rawStatus))
 	for i := range rawStatus {

sumologic/resource_sumologic_monitors_library_monitor_test.go

@@ -59,6 +59,15 @@ func TestAccMonitorsLibraryMonitor_create(t *testing.T) {
 			TriggerType:     "Critical",
 			DetectionMethod: "StaticCondition",
 		},
+		{
+			ThresholdType:   "LessThanOrEqual",
+			Threshold:       40.0,
+			TimeRange:       "15m",
+			OccurrenceType:  "ResultCount",
+			TriggerSource:   "AllResults",
+			TriggerType:     "ResolvedCritical",
+			DetectionMethod: "StaticCondition",
+		},
 	}
 	recipients := []string{"[email protected]"}
 	testRecipients := make([]interface{}, len(recipients))
@@ -135,6 +144,15 @@ func TestAccMonitorsLibraryMonitor_update(t *testing.T) {
 			TriggerType:     "Critical",
 			DetectionMethod: "StaticCondition",
 		},
+		{
+			ThresholdType:   "LessThanOrEqual",
+			Threshold:       40.0,
+			TimeRange:       "15m",
+			OccurrenceType:  "ResultCount",
+			TriggerSource:   "AllResults",
+			TriggerType:     "ResolvedCritical",
+			DetectionMethod: "StaticCondition",
+		},
 	}
 	recipients := []string{"[email protected]"}
 	testRecipients := make([]interface{}, len(recipients))
@@ -183,6 +201,15 @@ func TestAccMonitorsLibraryMonitor_update(t *testing.T) {
 			TriggerType:     "Critical",
 			DetectionMethod: "StaticCondition",
 		},
+		{
+			ThresholdType:   "LessThanOrEqual",
+			Threshold:       40.0,
+			TimeRange:       "15m",
+			OccurrenceType:  "ResultCount",
+			TriggerSource:   "AllResults",
+			TriggerType:     "ResolvedCritical",
+			DetectionMethod: "StaticCondition",
+		},
 	}
 	updatedRecipients := []string{"[email protected]"}
 	testUpdatedRecipients := make([]interface{}, len(updatedRecipients))
@@ -333,6 +360,15 @@ resource "sumologic_monitor" "test" {
 		trigger_type = "Critical"
 		detection_method = "StaticCondition"
 	  }
+	triggers  {
+		threshold_type = "LessThanOrEqual"
+		threshold = 40.0
+		time_range = "15m"
+		occurrence_type = "ResultCount"
+		trigger_source = "AllResults"
+		trigger_type = "ResolvedCritical"
+		detection_method = "StaticCondition"
+	  }
 	notifications {
 		notification {
 			action_type = "EmailAction"
@@ -368,6 +404,15 @@ resource "sumologic_monitor" "test" {
 		trigger_type = "Critical"
 		detection_method = "StaticCondition"
 	  }
+	  triggers  {
+		threshold_type = "LessThanOrEqual"
+		threshold = 40.0
+		time_range = "15m"
+		occurrence_type = "ResultCount"
+		trigger_source = "AllResults"
+		trigger_type = "ResolvedCritical"
+		detection_method = "StaticCondition"
+	  }
 	notifications {
 		notification {
 			action_type = "EmailAction"

sumologic/sumologic_monitors_library_monitor.go

@@ -129,8 +129,8 @@ type MonitorQuery struct {
 type TriggerCondition struct {
 	TimeRange       string  `json:"timeRange"`
 	TriggerType     string  `json:"triggerType"`
-	Threshold       float64 `json:"threshold"`
-	ThresholdType   string  `json:"thresholdType"`
+	Threshold       float64 `json:"threshold,omitempty"`
+	ThresholdType   string  `json:"thresholdType,omitempty"`
 	OccurrenceType  string  `json:"occurrenceType"`
 	TriggerSource   string  `json:"triggerSource"`
 	DetectionMethod string  `json:"detectionMethod"`
@@ -142,17 +142,19 @@ type MonitorNotification struct {
 }
 
 type EmailNotification struct {
-	ActionType  string        `json:"actionType"`
-	Subject     string        `json:"subject"`
-	Recipients  []interface{} `json:"recipients"`
-	MessageBody string        `json:"messageBody"`
-	TimeZone    string        `json:"timeZone"`
+	ActionType     string        `json:"actionType,omitempty"`
+	ConnectionType string        `json:"connectionType,omitempty"`
+	Subject        string        `json:"subject"`
+	Recipients     []interface{} `json:"recipients"`
+	MessageBody    string        `json:"messageBody"`
+	TimeZone       string        `json:"timeZone"`
 }
 
 type WebhookNotificiation struct {
-	ActionType      string `json:"actionType"`
+	ActionType      string `json:"actionType,omitempty"`
+	ConnectionType  string `json:"connectionType,omitempty"`
 	ConnectionID    string `json:"connectionId"`
-	PayloadOverride string `json:"payloadOverride"`
+	PayloadOverride string `json:"payloadOverride,omitempty"`
 }
 
 // ---------- END ----------