Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Support the From header when snoozing an incident #541

Merged
merged 1 commit into from
Jan 6, 2025
Merged

fix: Support the From header when snoozing an incident #541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 20 additions & 9 deletions incident.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,21 +540,29 @@ func (c *Client) CreateIncidentNote(id string, note IncidentNote) error {
return err
}

type SnoozeIncidentOptions struct {
From string
Duration uint
}

// SnoozeIncidentWithResponse sets an incident to not alert for a specified
// period of time.
//
// Deprecated: Use SnoozeIncidentWithContext instead.
func (c *Client) SnoozeIncidentWithResponse(id string, duration uint) (*Incident, error) {
return c.SnoozeIncidentWithContext(context.Background(), id, duration)
func (c *Client) SnoozeIncidentWithResponse(id string, o SnoozeIncidentOptions) (*Incident, error) {
return c.SnoozeIncidentWithContext(context.Background(), id, o)
}

// SnoozeIncidentWithContext sets an incident to not alert for a specified period of time.
func (c *Client) SnoozeIncidentWithContext(ctx context.Context, id string, duration uint) (*Incident, error) {
d := map[string]uint{
"duration": duration,
func (c *Client) SnoozeIncidentWithContext(ctx context.Context, id string, o SnoozeIncidentOptions) (*Incident, error) {
headers := map[string]string{
"From": o.From,
}
body := map[string]uint{
"duration": o.Duration,
}

resp, err := c.post(ctx, "/incidents/"+id+"/snooze", d, nil)
resp, err := c.post(ctx, "/incidents/"+id+"/snooze", body, headers)
if err != nil {
return nil, err
}
Expand All @@ -570,10 +578,13 @@ func (c *Client) SnoozeIncidentWithContext(ctx context.Context, id string, durat
// SnoozeIncident sets an incident to not alert for a specified period of time.
//
// Deprecated: Use SnoozeIncidentWithContext instead.
func (c *Client) SnoozeIncident(id string, duration uint) error {
func (c *Client) SnoozeIncident(id string, o SnoozeIncidentOptions) error {
headers := make(map[string]string)
headers["From"] = o.From
data := make(map[string]uint)
data["duration"] = duration
_, err := c.post(context.Background(), "/incidents/"+id+"/snooze", data, nil)
data["duration"] = o.Duration

_, err := c.post(context.Background(), "/incidents/"+id+"/snooze", data, headers)
return err
}

Expand Down
14 changes: 12 additions & 2 deletions incident_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,13 +664,18 @@ func TestIncident_SnoozeIncident(t *testing.T) {

mux.HandleFunc("/incidents/1/snooze", func(w http.ResponseWriter, r *http.Request) {
testMethod(t, r, "POST")
testEqual(t, r.Header.Get("From"), "from")

_, _ = w.Write([]byte(`{"incident": {"id": "1", "pending_actions": [{"type": "unacknowledge", "at":"2019-12-31T16:58:35Z"}]}}`))
})
client := defaultTestClient(server.URL, "foo")
var duration uint = 3600
id := "1"

err := client.SnoozeIncident(id, duration)
adamdecaf marked this conversation as resolved.
Show resolved Hide resolved
err := client.SnoozeIncident(id, SnoozeIncidentOptions{
From: "from",
Duration: duration,
})
if err != nil {
t.Fatal(err)
}
Expand All @@ -683,13 +688,18 @@ func TestIncident_SnoozeIncidentWithResponse(t *testing.T) {

mux.HandleFunc("/incidents/1/snooze", func(w http.ResponseWriter, r *http.Request) {
testMethod(t, r, "POST")
testEqual(t, r.Header.Get("From"), "from")

_, _ = w.Write([]byte(`{"incident": {"id": "1", "pending_actions": [{"type": "unacknowledge", "at":"2019-12-31T16:58:35Z"}]}}`))
})
client := defaultTestClient(server.URL, "foo")
var duration uint = 3600
id := "1"

res, err := client.SnoozeIncidentWithResponse(id, duration)
res, err := client.SnoozeIncidentWithResponse(id, SnoozeIncidentOptions{
From: "from",
Duration: duration,
})

want := &Incident{
APIObject: APIObject{
Expand Down