agent/local: do not persist the agent or user token #10188
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
mkeeler
approved these changes
May 5, 2021
dnephin
force-pushed
the
dnephin/dont-persist-agent-tokens
branch
from
50b1787 to
98e5540
Compare
Only default to the user token and agent token for the sync. Change the exported methods to only return the stored tokens associated with a specific check or service.
dnephin
force-pushed
the
dnephin/dont-persist-agent-tokens
branch
from
98e5540 to
33d1a55
Compare
|
Hmm, two test failures are real. I'll need to figure out why. |
Fallback to the default user token for synching registrations.
dnephin
force-pushed
the
dnephin/dont-persist-agent-tokens
branch
from
8e98e53 to
df5e18c
Compare
|
🍒 If backport labels were added before merging, cherry-picking will start automatically. To retroactively trigger a backport after merging, add backport labels and re-run https://circleci.com/gh/hashicorp/consul/367034. |
|
🍒✅ Cherry pick of commit b823cd3 onto |
hc-github-team-consul-core
pushed a commit
that referenced
this pull request
May 10, 2021
…okens agent/local: do not persist the agent or user token
This was referenced Aug 10, 2021
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.
Follow up to #9683
@mkeeler pointed out that the unexported functions are actually called by exported versions, which are used to persist the token.
This PR changes the behaviour so that we only default to the user token and agent token for the sync. Change the exported methods to only return the stored tokens associated with a specific check or service.
I renamed the unexported functions so that it is clear that these two functions are not at all related. They should have different behaviour. Using different names helps make that clear.