Skip to content

Commit 0158913

Browse files
authored
Merge pull request #76 from opsgenie/int-action-imp-ignore
add ignore to integration actions
2 parents 4951c0d + dd5eb32 commit 0158913

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

integration/integration_test.go

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -206,14 +206,14 @@ func TestResponders_Validate(t *testing.T) {
206206
{Type: "Cem"},
207207
}
208208
err = validateResponders(responders)
209-
assert.Equal(t, err.Error(), errors.New("Responder type should be one of these: " +
209+
assert.Equal(t, err.Error(), errors.New("Responder type should be one of these: "+
210210
"'User', 'Team', 'Schedule', 'Escalation'").Error())
211211

212212
responders = []Responder{
213213
{Type: User},
214214
}
215215
err = validateResponders(responders)
216-
assert.Equal(t, err.Error(), errors.New("For responder type user either" +
216+
assert.Equal(t, err.Error(), errors.New("For responder type user either"+
217217
" username or id must be provided.").Error())
218218

219219
responders = []Responder{
@@ -230,7 +230,7 @@ func TestResponders_Validate(t *testing.T) {
230230
Type: Team},
231231
}
232232
err = validateResponders(responders)
233-
assert.Equal(t, err.Error(), errors.New("For responder type team either team" +
233+
assert.Equal(t, err.Error(), errors.New("For responder type team either team"+
234234
" name or id must be provided.").Error())
235235

236236
responders = []Responder{
@@ -248,7 +248,7 @@ func TestResponders_Validate(t *testing.T) {
248248
},
249249
}
250250
err = validateResponders(responders)
251-
assert.Equal(t, err.Error(), errors.New("For responder type schedule either schedule" +
251+
assert.Equal(t, err.Error(), errors.New("For responder type schedule either schedule"+
252252
" name or id must be provided.").Error())
253253

254254
responders = []Responder{
@@ -266,7 +266,7 @@ func TestResponders_Validate(t *testing.T) {
266266
},
267267
}
268268
err = validateResponders(responders)
269-
assert.Equal(t, err.Error(), errors.New("For responder type escalation either escalation" +
269+
assert.Equal(t, err.Error(), errors.New("For responder type escalation either escalation"+
270270
" name or id must be provided.").Error())
271271

272272
responders = []Responder{
@@ -282,7 +282,7 @@ func TestResponders_Validate(t *testing.T) {
282282
func TestActionType_Validate(t *testing.T) {
283283
err := validateActionType("cem")
284284
assert.Equal(t, err.Error(), errors.New("Action type should be one of these: "+
285-
"'Create','Close','Acknowledge','AddNote'").Error())
285+
"'Create','Close','Acknowledge','AddNote','Ignore'").Error())
286286

287287
err = validateActionType(Create)
288288
assert.Nil(t, err)
@@ -295,6 +295,9 @@ func TestActionType_Validate(t *testing.T) {
295295

296296
err = validateActionType(AddNote)
297297
assert.Nil(t, err)
298+
299+
err = validateActionType(Ignore)
300+
assert.Nil(t, err)
298301
}
299302

300303
func TestConditionMatchType_Validate(t *testing.T) {

integration/request.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,7 @@ type UpdateAllIntegrationActionsRequest struct {
370370
Close []IntegrationAction `json:"close"`
371371
Acknowledge []IntegrationAction `json:"acknowledge"`
372372
AddNote []IntegrationAction `json:"addNote"`
373+
Ignore []IntegrationAction `json:"ignore"`
373374
}
374375

375376
type IntegrationAction struct {
@@ -474,11 +475,11 @@ func validateResponders(responders []Responder) error {
474475

475476
func validateActionType(actionType ActionType) error {
476477
switch actionType {
477-
case Create, Close, Acknowledge, AddNote:
478+
case Create, Close, Acknowledge, AddNote, Ignore:
478479
return nil
479480
}
480481
return errors.New("Action type should be one of these: " +
481-
"'Create','Close','Acknowledge','AddNote'")
482+
"'Create','Close','Acknowledge','AddNote','Ignore'")
482483
}
483484

484485
func validateConditionMatchType(matchType og.ConditionMatchType) error {

integration/result.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ const (
162162
Close ActionType = "close"
163163
Acknowledge ActionType = "acknowledge"
164164
AddNote ActionType = "AddNote"
165+
Ignore ActionType = "ignore"
165166
)
166167

167168
type Responder struct {

0 commit comments

Comments
 (0)