Skip to content

Commit 8a6b441

Browse files
Merge pull request #606 from SumoLogic/DET-374-fix-rule-import-for-severity
DET-374: Fix rule import for severity.
2 parents baabd1d + 6bc493a commit 8a6b441

11 files changed

+44
-7
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
## 2.28.1 (Unreleased)
22

3+
BUG FIXES:
4+
* Minor fixes enabling proper resource import for CSE Rules (`severity`, `severity_mapping`, `aggregation_functions`). (GH-606)
5+
36
## 2.28.0 (November 23, 2023)
47
FEATURES:
58
* resource/sumologic_monitor: Added support for setting `time_zone` at Monitor level for notifications content (GH-586)

sumologic/resource_sumologic_cse_aggregation_rule_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,11 @@ func TestAccSumologicCSEAggregationRule_createAndUpdate(t *testing.T) {
7373
resource.TestCheckResourceAttrSet(resourceName, "id"),
7474
),
7575
},
76+
{
77+
ResourceName: resourceName,
78+
ImportState: true,
79+
ImportStateVerify: true,
80+
},
7681
},
7782
})
7883
}

sumologic/resource_sumologic_cse_chain_rule.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ func resourceSumologicCSEChainRuleRead(d *schema.ResourceData, meta interface{})
112112
d.Set("is_prototype", CSEChainRuleGet.IsPrototype)
113113
d.Set("ordered", CSEChainRuleGet.Ordered)
114114
d.Set("name", CSEChainRuleGet.Name)
115+
d.Set("severity", CSEChainRuleGet.Severity)
115116
d.Set("summary_expression", CSEChainRuleGet.SummaryExpression)
116117
d.Set("tags", CSEChainRuleGet.Tags)
117118
d.Set("window_size", CSEChainRuleGet.WindowSizeName)

sumologic/resource_sumologic_cse_chain_rule_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,11 @@ func TestAccSumologicCSEChainRule_createAndUpdate(t *testing.T) {
6666
resource.TestCheckResourceAttrSet(resourceName, "id"),
6767
),
6868
},
69+
{
70+
ResourceName: resourceName,
71+
ImportState: true,
72+
ImportStateVerify: true,
73+
},
6974
},
7075
})
7176
}

sumologic/resource_sumologic_cse_first_seen_rule_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,11 @@ func TestAccSumologicCSEFirstSeenRule_createAndUpdate(t *testing.T) {
5959
testCheckFirstSeenRuleValues(t, &updatedPayload, &result),
6060
),
6161
},
62+
{
63+
ResourceName: resourceName,
64+
ImportState: true,
65+
ImportStateVerify: true,
66+
},
6267
},
6368
})
6469
}

sumologic/resource_sumologic_cse_match_rule_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,11 @@ func TestAccSumologicCSEMatchRule_createAndUpdate(t *testing.T) {
6262
resource.TestCheckResourceAttrSet(resourceName, "id"),
6363
),
6464
},
65+
{
66+
ResourceName: resourceName,
67+
ImportState: true,
68+
ImportStateVerify: true,
69+
},
6570
},
6671
})
6772
}

sumologic/resource_sumologic_cse_outlier_rule.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ func resourceSumologicCSEOutlierRuleRead(d *schema.ResourceData, meta interface{
132132
return nil
133133
}
134134

135-
d.Set("aggregate_function", aggregationFunctionsArrayToResource(CSEOutlierRuleGet.AggregationFunctions))
135+
d.Set("aggregation_functions", aggregationFunctionsArrayToResource(CSEOutlierRuleGet.AggregationFunctions))
136136
d.Set("baseline_window_size", CSEOutlierRuleGet.BaselineWindowSize)
137137
d.Set("description_expression", CSEOutlierRuleGet.DescriptionExpression)
138138
d.Set("deviation_threshold", CSEOutlierRuleGet.DeviationThreshold)

sumologic/resource_sumologic_cse_outlier_rule_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,11 @@ func TestAccSumologicCSEOutlierRule_createAndUpdate(t *testing.T) {
6363
testCheckOutlierRuleValues(t, &updatedPayload, &result),
6464
),
6565
},
66+
{
67+
ResourceName: resourceName,
68+
ImportState: true,
69+
ImportStateVerify: true,
70+
},
6671
},
6772
})
6873
}

sumologic/resource_sumologic_cse_threshold_rule.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ func resourceSumologicCSEThresholdRuleRead(d *schema.ResourceData, meta interfac
110110
d.Set("is_prototype", CSEThresholdRuleGet.IsPrototype)
111111
d.Set("limit", CSEThresholdRuleGet.Limit)
112112
d.Set("name", CSEThresholdRuleGet.Name)
113+
d.Set("severity", CSEThresholdRuleGet.Severity)
113114
d.Set("summary_expression", CSEThresholdRuleGet.SummaryExpression)
114115
d.Set("tags", CSEThresholdRuleGet.Tags)
115116
d.Set("window_size", CSEThresholdRuleGet.WindowSizeName)

sumologic/resource_sumologic_cse_threshold_rule_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,11 @@ func TestAccSumologicCSEThresholdRule_createAndUpdate(t *testing.T) {
6464
resource.TestCheckResourceAttrSet(resourceName, "id"),
6565
),
6666
},
67+
{
68+
ResourceName: resourceName,
69+
ImportState: true,
70+
ImportStateVerify: true,
71+
},
6772
},
6873
})
6974
}

0 commit comments

Comments
 (0)