Merge pull request #29 from iLert/feature/alert-actions-v2

Feature/alert actions v2
iLert · Feb 1, 2024 · 85f07b7 · 85f07b7
2 parents eb4fc85 + ffbba3f
commit 85f07b7
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+# 01.02.2024, Version 3.6.0
+
+- apply alert actions v2 changes in [#29](https://github.com/iLert/ilert-go/pull/29)
+  - add alertSources and teams fields, deprecate alertSourceIds
+
 # 12.01.2024, Version 3.5.0
 
 - add Telegram as alert action type in [#35](https://github.com/iLert/ilert-go/pull/35)

diff --git a/alert_action.go b/alert_action.go
@@ -10,25 +10,28 @@ import (
 
 // AlertAction definition https://api.ilert.com/api-docs/#tag/Alert-Actions
 type AlertAction struct {
-	ID             string       `json:"id,omitempty"`
-	Name           string       `json:"name"`
-	AlertSourceIDs []int64      `json:"alertSourceIds"`
-	ConnectorID    string       `json:"connectorId"`
-	ConnectorType  string       `json:"connectorType"`
-	TriggerMode    string       `json:"triggerMode"`
-	DelaySec       int          `json:"delaySec,omitempty"` // between 0 and 7200, only allowed with triggerType 'alert-escalation-ended'
-	TriggerTypes   []string     `json:"triggerTypes,omitempty"`
-	CreatedAt      string       `json:"createdAt,omitempty"` // date time string in ISO 8601
-	UpdatedAt      string       `json:"updatedAt,omitempty"` // date time string in ISO 8601
-	Params         interface{}  `json:"params"`
-	AlertFilter    *AlertFilter `json:"alertFilter,omitempty"`
+	ID             string        `json:"id,omitempty"`
+	Name           string        `json:"name"`
+	AlertSourceIDs []int64       `json:"alertSourceIds,omitempty"` // @deprecated
+	AlertSources   []AlertSource `json:"alertSources,omitempty"`
+	ConnectorID    string        `json:"connectorId,omitempty"`
+	ConnectorType  string        `json:"connectorType"`
+	TriggerMode    string        `json:"triggerMode"`
+	DelaySec       int           `json:"delaySec,omitempty"` // between 0 and 7200, only allowed with triggerType 'alert-escalation-ended'
+	TriggerTypes   []string      `json:"triggerTypes,omitempty"`
+	CreatedAt      string        `json:"createdAt,omitempty"` // date time string in ISO 8601
+	UpdatedAt      string        `json:"updatedAt,omitempty"` // date time string in ISO 8601
+	Params         interface{}   `json:"params"`
+	AlertFilter    *AlertFilter  `json:"alertFilter,omitempty"`
+	Teams          []TeamShort   `json:"teams,omitempty"`
 }
 
 // AlertActionOutput definition https://api.ilert.com/api-docs/#tag/Alert-Actions
 type AlertActionOutput struct {
 	ID             string                   `json:"id"`
 	Name           string                   `json:"name"`
-	AlertSourceIDs []int64                  `json:"alertSourceIds"`
+	AlertSourceIDs []int64                  `json:"alertSourceIds,omitempty"` // @deprecated
+	AlertSources   []AlertSource            `json:"alertSources,omitempty"`
 	ConnectorID    string                   `json:"connectorId"`
 	ConnectorType  string                   `json:"connectorType"`
 	TriggerMode    string                   `json:"triggerMode"`
@@ -38,6 +41,7 @@ type AlertActionOutput struct {
 	UpdatedAt      string                   `json:"updatedAt"` // date time string in ISO 8601
 	Params         *AlertActionOutputParams `json:"params"`
 	AlertFilter    *AlertFilter             `json:"alertFilter,omitempty"`
+	Teams          []TeamShort              `json:"teams,omitempty"`
 }
 
 // AlertActionOutputParams definition

diff --git a/examples/alert_action/main.go b/examples/alert_action/main.go
@@ -53,12 +53,12 @@ func main() {
 
 	rcn, err := client.CreateAlertAction(&ilert.CreateAlertActionInput{
 		AlertAction: &ilert.AlertAction{
-			Name:           "Test GitHub AlertAction",
-			ConnectorType:  ilert.ConnectorTypes.Github,
-			ConnectorID:    rcr.Connector.ID,
-			TriggerMode:    ilert.AlertActionTriggerModes.Automatic,
-			TriggerTypes:   ilert.AlertActionTriggerTypesAll,
-			AlertSourceIDs: []int64{ras.AlertSource.ID},
+			Name:          "Test GitHub AlertAction",
+			ConnectorType: ilert.ConnectorTypes.Github,
+			ConnectorID:   rcr.Connector.ID,
+			TriggerMode:   ilert.AlertActionTriggerModes.Automatic,
+			TriggerTypes:  ilert.AlertActionTriggerTypesAll,
+			AlertSources:  []ilert.AlertSource{*ras.AlertSource},
 			Params: ilert.AlertActionParamsGithub{
 				Owner:      "my-org",
 				Repository: "my-repo",

diff --git a/version.go b/version.go
@@ -1,4 +1,4 @@
 package ilert
 
 // Version package version
-const Version = "v3.5.0"
+const Version = "v3.6.0"