fix: Improve Monitor Alert condition regexp (#86)

tembleking · web-flow · commit 72c6723ae2b8 · 2021-02-03T11:35:26.000+01:00
* build: Bump required Go version to 1.14

* fix: Improve Monitor Alert condition regexp
diff --git a/sysdig/resource_sysdig_monitor_alert_event.go b/sysdig/resource_sysdig_monitor_alert_event.go
@@ -171,7 +171,7 @@ func eventAlertFromResourceData(data *schema.ResourceData) (alert *monitor.Alert
 }
 
 // https://regex101.com/r/mmpz0D/1
-var alertConditionRegex = regexp.MustCompile(`count\(customEvent\)\s?(?P<rel>[^\w])\s?(?P<count>\d+)`)
+var alertConditionRegex = regexp.MustCompile(`count\(customEvent\)\s*(?P<rel>[^\w\s]+)\s*(?P<count>\d+)`)
 
 func eventAlertToResourceData(alert *monitor.Alert, data *schema.ResourceData) (err error) {
 	err = alertToResourceData(alert, data)

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ func eventAlertFromResourceData(data schema.ResourceData) (alert monitor.Alert`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`// https://regex101.com/r/mmpz0D/1`
`174`		-var alertConditionRegex = regexp.MustCompile(`count\(customEvent\)\s?(?P<rel>[^\w])\s?(?P<count>\d+)`)
	`174`	+var alertConditionRegex = regexp.MustCompile(`count\(customEvent\)\s(?P<rel>[^\w\s]+)\s(?P<count>\d+)`)
`175`	`175`
`176`	`176`	`func eventAlertToResourceData(alert monitor.Alert, data schema.ResourceData) (err error) {`
`177`	`177`	`err = alertToResourceData(alert, data)`