Skip to content

Commit d7b846b

Browse files
committed
SUMO-169842: added regex for validation and handle no delay in request body
1 parent 5476766 commit d7b846b

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

sumologic/resource_sumologic_monitors_library_monitor.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package sumologic
22

33
import (
44
"log"
5+
"regexp"
56
"strings"
67

78
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
@@ -268,8 +269,10 @@ func resourceSumologicMonitorsLibraryMonitor() *schema.Resource {
268269
},
269270

270271
"evaluation_delay": {
271-
Type: schema.TypeString,
272-
Optional: true,
272+
Type: schema.TypeString,
273+
Optional: true,
274+
Computed: true,
275+
ValidateFunc: validation.StringMatch(regexp.MustCompile(`((\d)+[smh])+`), "this value is bad"),
273276
},
274277

275278
"is_locked": {
@@ -509,6 +512,7 @@ func resourceSumologicMonitorsLibraryMonitorRead(d *schema.ResourceData, meta in
509512
d.Set("created_by", monitor.CreatedBy)
510513
d.Set("created_at", monitor.CreatedAt)
511514
d.Set("monitor_type", monitor.MonitorType)
515+
log.Printf("[WARN] value of delay: %v", monitor.EvaluationDelay)
512516
d.Set("evaluation_delay", monitor.EvaluationDelay)
513517
d.Set("modified_by", monitor.ModifiedBy)
514518
d.Set("is_mutable", monitor.IsMutable)
@@ -586,6 +590,7 @@ func resourceSumologicMonitorsLibraryMonitorRead(d *schema.ResourceData, meta in
586590
if !has_trigger_conditions {
587591
triggers := make([]interface{}, len(monitor.Triggers))
588592
for i, t := range monitor.Triggers {
593+
log.Printf("[WARN] value of timerange: %v", t.PositiveTimeRange())
589594
triggers[i] = map[string]interface{}{
590595
"time_range": t.PositiveTimeRange(),
591596
"trigger_type": t.TriggerType,

sumologic/sumologic_monitors_library_monitor.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ type MonitorsLibraryMonitor struct {
126126
Notifications []MonitorNotification `json:"notifications,omitempty"`
127127
CreatedBy string `json:"createdBy"`
128128
MonitorType string `json:"monitorType"`
129-
EvaluationDelay string `json:"evaluationDelay"`
129+
EvaluationDelay string `json:"evaluationDelay,omitempty"`
130130
IsLocked bool `json:"isLocked"`
131131
Description string `json:"description"`
132132
CreatedAt string `json:"createdAt"`

0 commit comments

Comments
 (0)