Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

acl: rename ResolveTokenToIdentityAndAuthorizer to ResolveToken #12167

Merged
merged 1 commit into from
Feb 1, 2022
Merged

acl: rename ResolveTokenToIdentityAndAuthorizer to ResolveToken #12167

merged 1 commit into from
Feb 1, 2022

Conversation

dnephin
Copy link
Contributor

@dnephin dnephin commented Jan 23, 2022

Branched from #12166, continues the work described in #11690

This change allows us to remove one of the last remaining duplicate resolve token methods (Server.ResolveToken).

With this change we are down to only 2, where the second one also handles setting the default EnterpriseMeta from the token.

@dnephin dnephin added the pr/no-changelog PR does not need a corresponding .changelog entry label Jan 23, 2022
@vercel vercel bot temporarily deployed to Preview – consul-ui-staging January 23, 2022 17:50 Inactive
@vercel vercel bot temporarily deployed to Preview – consul January 23, 2022 17:50 Inactive
@dnephin dnephin mentioned this pull request Jan 23, 2022
Closed
1 task
@dnephin dnephin added theme/acls ACL and token generation theme/internal-cleanup Used to identify tech debt, testing improvements, code refactoring, and non-impactful optimization labels Jan 23, 2022
@dnephin dnephin mentioned this pull request Jan 23, 2022
Merged
dnephin
dnephin commented Jan 23, 2022
View reviewed changes
agent/acl_test.go Outdated Show resolved Hide resolved
@dnephin dnephin requested a review from a team January 23, 2022 18:31
freddygv
freddygv reviewed Jan 26, 2022
View reviewed changes
Copy link
Contributor

@freddygv freddygv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to comb through the tests a bit closer, but the code changes look good. Should help cut down on confusion around when to use which method. 👍🏽

@vercel vercel bot temporarily deployed to Preview – consul January 26, 2022 22:42 Inactive
@vercel vercel bot temporarily deployed to Preview – consul-ui-staging January 26, 2022 22:42 Inactive
@dnephin dnephin mentioned this pull request Jan 26, 2022
Closed
@markan markan self-assigned this Jan 28, 2022
@vercel vercel bot temporarily deployed to Preview – consul-ui-staging January 31, 2022 19:25 Inactive
@vercel vercel bot temporarily deployed to Preview – consul January 31, 2022 19:25 Inactive
@dnephin dnephin requested a review from a team as a code owner January 31, 2022 22:54
@dnephin
acl: rename ResolveTokenToIdentityAndAuthorizer to ResolveToken
343b6de 
This change allows us to remove one of the last remaining duplicate
resolve token methods (Server.ResolveToken).

With this change we are down to only 2, where the second one also
handles setting the default EnterpriseMeta from the token.
@vercel vercel bot temporarily deployed to Preview – consul January 31, 2022 23:04 Inactive
@vercel vercel bot temporarily deployed to Preview – consul-ui-staging January 31, 2022 23:04 Inactive
Base automatically changed from dnephin/acl-resolve-token-2 to main February 1, 2022 00:19
@dnephin
Copy link
Contributor Author

dnephin commented Feb 1, 2022

Test failure is a known flake in go-test-race

@dnephin dnephin merged commit 9d80c18 into main Feb 1, 2022
@dnephin dnephin deleted the dnephin/acl-resolve-token-3 branch February 1, 2022 00:21
@hc-github-team-consul-core
Copy link
Contributor

🍒 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/571813.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@freddygv freddygv freddygv left review comments

@markan markan markan approved these changes

@kisunji kisunji kisunji approved these changes

Assignees

@markan markan

Labels
pr/no-changelog PR does not need a corresponding .changelog entry theme/acls ACL and token generation theme/internal-cleanup Used to identify tech debt, testing improvements, code refactoring, and non-impactful optimization
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@dnephin @hc-github-team-consul-core @markan @freddygv @kisunji