Skip to content

Backport of [CC-6039] Update builtin policy descriptions into release/1.15.x #18746

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

Merged
hc-github-team-consul-core merged 1 commit into from
Sep 11, 2023
Merged

Backport of [CC-6039] Update builtin policy descriptions into release/1.15.x #18746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion agent/consul/fsm/snapshot_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ func TestFSM_SnapshotRestore_CE(t *testing.T) {
policy := &structs.ACLPolicy{
ID: structs.ACLPolicyGlobalManagementID,
Name: "global-management",
Description: "Builtin Policy that grants unlimited access",
Description: structs.ACLPolicyGlobalManagementDesc,
Rules: structs.ACLPolicyGlobalManagementRules,
}
policy.SetHash(true)
Expand Down
2 changes: 1 addition & 1 deletion agent/consul/state/acl_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1579,7 +1579,7 @@ func TestStateStore_ACLPolicy_SetGet(t *testing.T) {
require.NoError(t, err)
require.NotNil(t, rpolicy)
require.Equal(t, "global-management", rpolicy.Name)
require.Equal(t, "Builtin Policy that grants unlimited access", rpolicy.Description)
require.Equal(t, structs.ACLPolicyGlobalManagementDesc, rpolicy.Description)
require.Equal(t, structs.ACLPolicyGlobalManagementRules, rpolicy.Rules)
require.Len(t, rpolicy.Datacenters, 0)
require.Equal(t, uint64(1), rpolicy.CreateIndex)
Expand Down
4 changes: 2 additions & 2 deletions agent/structs/acl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ const (
// may rename if desired but cannot delete or modify the rules.
ACLPolicyGlobalManagementID = "00000000-0000-0000-0000-000000000001"
ACLPolicyGlobalManagementName = "global-management"
ACLPolicyGlobalManagementDesc = "Builtin Policy that grants unlimited access"
ACLPolicyGlobalManagementDesc = "A built-in policy that grants read and write access to all Consul features"

ACLPolicyGlobalReadOnlyID = "00000000-0000-0000-0000-000000000002"
ACLPolicyGlobalReadOnlyName = "builtin/global-read-only"
ACLPolicyGlobalReadOnlyDesc = "Builtin Policy that grants unlimited read-only access to all components"
ACLPolicyGlobalReadOnlyDesc = "A built-in policy that grants read-only access to all Consul features"

ACLReservedIDPrefix = "00000000-0000-0000-0000-0000000000"

Expand Down