Fix #4076 - Agent configured Watches now work with HTTPS only agents #4184
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…API client This allows watches from consul agent config (rather than consul watch command) to be able to utilize HTTPs
kyhavlov
approved these changes
May 31, 2018
watch/plan.go
Outdated
| @@ -20,10 +20,12 @@ const ( | |||
| ) | |||
|
|
|||
| // Run is used to run a watch plan | |||
| func (p *Plan) Run(address string) error { | |||
| func (p *Plan) Run(address string, conf *consulapi.Config) error { | |||
There was a problem hiding this comment.
It might be worth keeping this signature the same and moving to a RunWithConfig method so we don't break tools that import this package. It is pretty small, though - what do you think?
There was a problem hiding this comment.
Thats probably best. Nothing in our code does but I guess the api can be imported by other tools.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Basically just needed to push the TLS setup into the Watch Plan Run method so when it generates the API Client it tries to use TLS.
Fixes #4076