Allow cancelling startup when performing auto-config #8157
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
…I command Previously we were holding onto a raw chan and passing it into AutoEncrypt functions during startup. This is been modified so that the Agent.Start takes a context which can be cancelled to stop both auto encrypt and auto-config.
mkeeler
force-pushed
the
feature/auto-config/cli-intro-token
branch
from
68cf769 to
4e630d7
Compare
dnephin
approved these changes
Jun 19, 2020
There was a problem hiding this comment.
Nice! This makes sense to me. I had started to make a very similar change in #7609 but never got that into a state that could be merged. I'll probably close that PR now.
Changes look good, a few minor suggestions, nothing blocking.
Co-authored-by: Daniel Nephin <[email protected]>
…icorp/consul into feature/auto-config/cli-intro-token
mkeeler
changed the title
|
🍒✅ Cherry pick of commit d6e0548 onto |
hashicorp-ci
pushed a commit
that referenced
this pull request
Jun 19, 2020
Co-authored-by: Daniel Nephin <[email protected]>
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 PR also has a second commit to allow specifying the intro token via an environment variable.