Add reload capability for Vault listener certs #1196
Merged
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
manual) yet, and no documentation yet.
then layers reloading tests on top.
jefferai
force-pushed
the
reload-listener-tls
branch
from
63f9ea8
to
9e49463
Compare
| if err := core.Shutdown(); err != nil { | ||
| c.Ui.Error(fmt.Sprintf("Error with core shutdown: %s", err)) | ||
| shutdownTriggered := false | ||
| for { |
There was a problem hiding this comment.
May as well do for !shutdownTriggered { and remove the if block
There was a problem hiding this comment.
Hah, I've gotten so used to the infinite-loop-using-for-to-keep-selecting paradigm that it didn't even cross my mind.
| } | ||
| tlsConf.ClientAuth = tls.RequestClientCert | ||
|
|
||
| ln = tls.NewListener(ln, tlsConf) | ||
| props["tls"] = "enabled" | ||
| return ln, props, nil | ||
| return ln, props, func() (string, ReloadFunc) { |
There was a problem hiding this comment.
I wouldn't inline the function like this, its kind of weird to read
| @@ -530,6 +549,46 @@ func (c *ServerCommand) setupTelementry(config *server.Config) error { | |||
| return nil | |||
| } | |||
|
|
|||
| func (c *ServerCommand) Reload(configPath []string) error { | |||
There was a problem hiding this comment.
Do we need to expose this method?
Also, is it possible to use this method to load the configuration the first time as well?
…l need to sane against what's in the config
| var reloadErrors *multierror.Error | ||
| // Call reload on the listeners. This will call each listener with each | ||
| // config block, but they verify the ID. | ||
| for _, lnConfig := range config.Listeners { |
There was a problem hiding this comment.
Do we need to range over the listeners? It seems like we have one reloadFunc per anyways, seems like we can just loop over those
|
Minor comment, but LGTM |
jefferai
added a commit
that referenced
this pull request
Mar 15, 2016
Add reload capability for Vault listener certs
This was referenced Sep 19, 2017
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.
This can be performed at any time, but must be performed by an administrator, and as an added safety check, it currently will only re-read the same files initially given in the config at startup time. We can consider changing this later if we want (and the mechanism for how this would happen is already plumbed through).
This also generally adds a mechanism for triggering a reload; the core can call the provided reload functions with the data passed in via the API. It's up to the reload functions to do the right thing, but I don't anticipate that most of them will be very complicated. Most things will still require restart Vault.
Still to do: