Fixes

Author: Josh Williams

sumologic/resource_sumologic_cse_match_rule.go

@@ -65,24 +65,24 @@ func resourceSumologicCSEMatchRuleRead(d *schema.ResourceData, meta interface{})
 
 	CSEMatchRuleGet, err := c.GetCSEMatchRule(id)
 	if err != nil {
-		log.Printf("[WARN] CSE Insights Status not found when looking by id: %s, err: %v", id, err)
+		log.Printf("[WARN] CSE Match Rule not found when looking by id: %s, err: %v", id, err)
 
 	}
 
 	if CSEMatchRuleGet == nil {
-		log.Printf("[WARN] CSE Insights Status not found, removing from state: %v - %v", id, err)
+		log.Printf("[WARN] CSE Match Rule not found, removing from state: %v - %v", id, err)
 		d.SetId("")
 		return nil
 	}
 
 	d.Set("description_expression", CSEMatchRuleGet.DescriptionExpression)
 	d.Set("enabled", CSEMatchRuleGet.Enabled)
-	d.Set("entity_selectors", CSEMatchRuleGet.EntitySelectors)
+	d.Set("entity_selectors", entitySelectorArrayToResource(CSEMatchRuleGet.EntitySelectors))
 	d.Set("expression", CSEMatchRuleGet.Expression)
 	d.Set("is_prototype", CSEMatchRuleGet.IsPrototype)
 	d.Set("name", CSEMatchRuleGet.Name)
 	d.Set("name_expression", CSEMatchRuleGet.NameExpression)
-	d.Set("severity_mapping", CSEMatchRuleGet.SeverityMapping)
+	d.Set("severity_mapping", severityMappingToResource(CSEMatchRuleGet.SeverityMapping))
 	d.Set("summary_expression", CSEMatchRuleGet.SummaryExpression)
 	d.Set("tags", CSEMatchRuleGet.Tags)
 
@@ -117,7 +117,6 @@ func resourceSumologicCSEMatchRuleCreate(d *schema.ResourceData, meta interface{
 		if err != nil {
 			return err
 		}
-		log.Printf("[INFO] got id: %s", id)
 		d.SetId(id)
 	}
 

sumologic/resource_sumologic_cse_threshold_rule.go

@@ -88,11 +88,11 @@ func resourceSumologicCSEThresholdRuleRead(d *schema.ResourceData, meta interfac
 
 	CSEThresholdRuleGet, err := c.GetCSEThresholdRule(id)
 	if err != nil {
-		log.Printf("[WARN] CSE Insights Status not found when looking by id: %s, err: %v", id, err)
+		log.Printf("[WARN] CSE Threshold Rule not found when looking by id: %s, err: %v", id, err)
 	}
 
 	if CSEThresholdRuleGet == nil {
-		log.Printf("[WARN] CSE Insights Status not found, removing from state: %v - %v", id, err)
+		log.Printf("[WARN] CSE Threshold Rule not found, removing from state: %v - %v", id, err)
 		d.SetId("")
 		return nil
 	}
@@ -101,7 +101,7 @@ func resourceSumologicCSEThresholdRuleRead(d *schema.ResourceData, meta interfac
 	d.Set("count_field", CSEThresholdRuleGet.CountField)
 	d.Set("description", CSEThresholdRuleGet.Description)
 	d.Set("enabled", CSEThresholdRuleGet.Enabled)
-	d.Set("entity_selectors", CSEThresholdRuleGet.EntitySelectors)
+	d.Set("entity_selectors", entitySelectorArrayToResource(CSEThresholdRuleGet.EntitySelectors))
 	d.Set("expression", CSEThresholdRuleGet.Expression)
 	d.Set("group_by_fields", CSEThresholdRuleGet.GroupByFields)
 	d.Set("is_prototype", CSEThresholdRuleGet.IsPrototype)
@@ -147,7 +147,6 @@ func resourceSumologicCSEThresholdRuleCreate(d *schema.ResourceData, meta interf
 		if err != nil {
 			return err
 		}
-		log.Printf("[INFO] got id: %s", id)
 		d.SetId(id)
 	}
 

sumologic/sumologic_cse_rule_common.go

@@ -90,6 +90,19 @@ func resourceToEntitySelectorArray(resourceEntitySelectors []interface{}) []Enti
 	return result
 }
 
+func entitySelectorArrayToResource(entitySelectors []EntitySelector) []map[string]interface{} {
+	result := make([]map[string]interface{}, len(entitySelectors))
+
+	for i, entitySelector := range entitySelectors {
+		result[i] = map[string]interface{}{
+			"entity_type": entitySelector.EntityType,
+			"expression":  entitySelector.Expression,
+		}
+	}
+
+	return result
+}
+
 func resourceToSeverityMappingValueMappingArray(resourceSeverityMappingValueMappings []interface{}) []SeverityMappingValueMapping {
 	result := make([]SeverityMappingValueMapping, len(resourceSeverityMappingValueMappings))
 
@@ -115,6 +128,29 @@ func resourceToSeverityMapping(resourceSeverityMapping interface{}) SeverityMapp
 	}
 }
 
+func severityMappingValueMappingArrayToResource(severityMappingValueMappings []SeverityMappingValueMapping) []map[string]interface{} {
+	result := make([]map[string]interface{}, len(severityMappingValueMappings))
+
+	for i, severityMappingValueMapping := range severityMappingValueMappings {
+		result[i] = map[string]interface{}{
+			"type": severityMappingValueMapping.Type,
+			"from": severityMappingValueMapping.From,
+			"to":   severityMappingValueMapping.To,
+		}
+	}
+
+	return result
+}
+
+func severityMappingToResource(severityMapping SeverityMapping) map[string]interface{} {
+	return map[string]interface{}{
+		"type":    severityMapping.Type,
+		"default": severityMapping.Default,
+		"field":   severityMapping.Field,
+		"mapping": severityMappingValueMappingArrayToResource(severityMapping.Mapping),
+	}
+}
+
 type EntitySelector struct {
 	Expression string `json:"expression"`
 	EntityType string `json:"entityType"`

sumologic/sumologic_cse_threshold_rule.go

@@ -55,8 +55,6 @@ func (s *Client) UpdateCSEThresholdRule(CSEThresholdRule CSEThresholdRule) error
 	url := fmt.Sprintf("sec/v1/rules/threshold/%s", CSEThresholdRule.ID)
 
 	CSEThresholdRule.ID = ""
-	fmt.Printf("Window Size: %s\n", CSEThresholdRule.WindowSize)
-	fmt.Printf("Window Size Name: %s\n", CSEThresholdRule.WindowSizeName)
 	request := CSEThresholdRuleRequest{
 		CSEThresholdRule: CSEThresholdRule,
 	}