Support for application/json in incoming webhook
#2093
Conversation
| details = validate.SanitizeText(details, alert.MaxDetailsLength) | ||
| contentType := r.Header.Get("Content-type") | ||
| if contentType == "application/json" { | ||
| requestBoday, _ := ioutil.ReadAll(r.Body) |
There was a problem hiding this comment.
Check for error and return bad request if not nil, and a bit of a nit but let's use data as the var to match conventions elsewhere
| requestBoday, _ := ioutil.ReadAll(r.Body) | ||
|
|
||
| var alertMessage AlertMessage | ||
| json.Unmarshal(requestBoday, &alertMessage) |
There was a problem hiding this comment.
Same, check error and return bad request if not nil
| contentType := r.Header.Get("Content-type") | ||
| if contentType == "application/json" { |
There was a problem hiding this comment.
Let's use the ParseMediaType helper to handle any variations/encoding info:
| contentType := r.Header.Get("Content-type") | |
| if contentType == "application/json" { | |
| ct, _, err = mime.ParseMediaType(r.Header.Get("Content-Type")) | |
| if err != nil { | |
| http.Error(w, err.Error(), http.StatusUnsupportedMediaType) | |
| return | |
| } | |
| if ct == "application/json" { |
| if contentType == "application/json" { | ||
| requestBoday, _ := ioutil.ReadAll(r.Body) | ||
|
|
||
| var alertMessage AlertMessage |
There was a problem hiding this comment.
For this, let's do an inline struct since we don't need it elsewhere. Also we can ignore the json tags since Go parses JSON ignoring case already. Lastly, let's make the fields pointers so we can fallback to query parameters for any missing fields (this follows the current behavior of FormValue)
| var alertMessage AlertMessage | |
| var b struct { | |
| Summary, Details, Action *string | |
| } |
| summary = alertMessage.Summary | ||
| details = alertMessage.Details | ||
| action = alertMessage.Action |
There was a problem hiding this comment.
Now for these we can do a nil-check and ignore any missing values
| summary = alertMessage.Summary | |
| details = alertMessage.Details | |
| action = alertMessage.Action | |
| if b.Summary != nil { | |
| summary = *b.Summary | |
| } | |
| if b.Details != nil { | |
| details = *b.Details | |
| } | |
| if b.Action != nil { | |
| action = *b.Action | |
| } |
| }, | ||
| "version": "0.0.0" |
There was a problem hiding this comment.
Unrelated editor change committed by mistake?
| }, | |
| "version": "0.0.0" | |
| } |
|
@pandey-adarsh147 is this something you still wanted to get in? I may be able to wrap it up for you too, but you'll need to allow edits from maintainers on your end for me to push changes. |
|
Closing, merged with #2161 |
make checkto catch common errors. Fixed any that came up.Description:
Incoming webhook will now accept
application/jsoncontent type{"summary":"", "details":"", "action":""}
Which issue(s) this PR fixes:
#2092
Usage:
Fixes #2092