-
Notifications
You must be signed in to change notification settings - Fork 4.4k
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.
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
Backport of [CC-5719] Add support for builtin global-read-only policy into release/1.14.x #18343
Backport of [CC-5719] Add support for builtin global-read-only policy into release/1.14.x #18343
Conversation
954839f
to
e71f8a5
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Auto approved Consul Bot automated PR
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:
|
Name: ACLPolicyGlobalManagementName, | ||
Description: ACLPolicyGlobalManagementDesc, | ||
Rules: ACLPolicyGlobalManagementRules, | ||
Syntax: acl.SyntaxCurrent, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A notable change is that I added Syntax: acl.SyntaxCurrent
here. It is not in the original PR
Name: "global-management", | ||
Description: "Builtin Policy that grants unlimited access", | ||
Rules: structs.ACLPolicyGlobalManagement, | ||
Syntax: acl.SyntaxCurrent, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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>
a4c1acb
to
fe84ccf
Compare
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-management
policy 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