agent: support custom header and method for http checks (#3106) #3107
Conversation
magiconair
force-pushed
the
issue-3106-custom-header-and-method
branch
from
fdbe311 to
fcb8621
Compare
| Timeout string `json:",omitempty"` | ||
| TTL string `json:",omitempty"` | ||
| HTTP string `json:",omitempty"` | ||
| Header map[string][]string `json:",omitempty"` |
There was a problem hiding this comment.
I used https://golang.org/pkg/net/http/#Header as an example. But we also have header configuration in the config file which is Headers and allows only a single value per header name. :( (https://github.com/hashicorp/consul/blob/master/command/agent/config.go#L704-L705)
Generally, I prefer to use what the stdlib is using (Header with map[string][]string) since then there is no necessity for type conversion and the names are the same. I'd also try/deprecate the other value but I'm open for suggestions.
There was a problem hiding this comment.
Ok - better to match the std lib for new things.
command/agent/config.go
Outdated
| @@ -1437,6 +1437,20 @@ func FixupCheckType(raw interface{}) error { | |||
| case "service_id": | |||
| rawMap["serviceid"] = v | |||
| delete(rawMap, k) | |||
| case "header": | |||
| vm, ok := v.(map[string]interface{}) | |||
There was a problem hiding this comment.
This seems like it should be returning errors if things aren't what we expect, otherwise we could silently skip these.
There was a problem hiding this comment.
I'll add that but I want to have a closer look at this method in general since it looks like mangling map[string]interface{} is the wrong approach to this. But that could be fixed with the decoupling of user and runtime config where user config represents exactly what the user is providing and then we just parse the JSON and interpret it afterwards instead of mangling it.
magiconair
force-pushed
the
issue-3106-custom-header-and-method
branch
from
fcb8621 to
bde7c4a
Compare
magiconair
force-pushed
the
issue-3106-custom-header-and-method
branch
from
bde7c4a to
0767510
Compare
magiconair
force-pushed
the
issue-3106-custom-header-and-method
branch
3 times, most recently
from
de8d239 to
f51bc0e
Compare
magiconair
changed the title
magiconair
force-pushed
the
issue-3106-custom-header-and-method
branch
from
f51bc0e to
3df4999
Compare
There was a problem hiding this comment.
LGTM - just needs a mention in the docs https://github.com/hashicorp/consul/blob/master/website/source/docs/agent/checks.html.md
|
🤦♂️ forgot the docs. Will add. |
|
@magiconair thank you! 👍 |
Still need to write a test