Backport of [CC-5719] Add support for builtin global-read-only policy into release/1.14.x #18343
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
|
|
hc-github-team-consul-core
force-pushed
the
backport/jer/read-only-policy/evenly-happy-doe
branch
2 times, most recently
from
954839f
to
e71f8a5
Compare
github-team-consul-core-pr-approver
approved these changes
Aug 1, 2023
lornasong
force-pushed
the
backport/jer/read-only-policy/evenly-happy-doe
branch
from
ef6783f
to
a4c1acb
Compare
|
Resolved this by: Commit cherry-picked: 6424ef6 Files that required resolving: The conflicts seemed to be centered around that in 1.14:
|
lornasong
reviewed
Aug 1, 2023
| Name: ACLPolicyGlobalManagementName, | ||
| Description: ACLPolicyGlobalManagementDesc, | ||
| Rules: ACLPolicyGlobalManagementRules, | ||
| Syntax: acl.SyntaxCurrent, |
There was a problem hiding this comment.
A notable change is that I added Syntax: acl.SyntaxCurrent here. It is not in the original PR
lornasong
reviewed
Aug 1, 2023
| Name: "global-management", | ||
| Description: "Builtin Policy that grants unlimited access", | ||
| Rules: structs.ACLPolicyGlobalManagement, | ||
| Syntax: acl.SyntaxCurrent, |
There was a problem hiding this comment.
This Syntax is extra in 1.14. I didn't add it to writeBuiltinACLPolicy() because it's set here instead
* [CC-5719] Add support for builtin global-read-only policy * Add changelog * Add read-only to docs * Fix some minor issues. * Change from ReplaceAll to Sprintf * Change IsValidPolicy name to return an error instead of bool * Fix PolicyList test * Fix other tests * Apply suggestions from code review Co-authored-by: Paul Glass <pglass@hashicorp.com> * Fix state store test for policy list. * Fix naming issues * Update acl/validation.go Co-authored-by: Chris Thain <32781396+cthain@users.noreply.github.com> * Update agent/consul/acl_endpoint.go --------- Co-authored-by: Paul Glass <pglass@hashicorp.com> Co-authored-by: Chris Thain <32781396+cthain@users.noreply.github.com>
lornasong
force-pushed
the
backport/jer/read-only-policy/evenly-happy-doe
branch
from
a4c1acb
to
fe84ccf
Compare
jjacobson93
approved these changes
Aug 1, 2023
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.
Backport
This PR is auto-generated from #18319 to be assessed for backporting due to the inclusion of the label backport/1.14.
🚨
The person who merged in the original PR is:
@jjacobson93
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.
The below text is copied from the body of the original PR.
Description
This adds a new builtin policy that provides global read-only access, in contrast to the global read-write access that the builtin
global-managementpolicy provides. Other changes were made to process builtin policies more generically, since there are several places where checks or validations are done before processing or altering a policy.Links
Ticket
RFC
PR Checklist
Overview of commits