From 876c662e36e10bb69bf96e8bccbe9ad0df8cb2c2 Mon Sep 17 00:00:00 2001 From: Jeremy Jacobson Date: Fri, 8 Sep 2023 09:16:22 -0700 Subject: [PATCH] [CC-6039] Update builtin policy descriptions (#18705) --- agent/consul/fsm/snapshot_test.go | 2 +- agent/consul/state/acl_test.go | 2 +- agent/structs/acl.go | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/agent/consul/fsm/snapshot_test.go b/agent/consul/fsm/snapshot_test.go index ff975aaf9f..22d6f5e956 100644 --- a/agent/consul/fsm/snapshot_test.go +++ b/agent/consul/fsm/snapshot_test.go @@ -107,7 +107,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) diff --git a/agent/consul/state/acl_test.go b/agent/consul/state/acl_test.go index 7614991c41..f72f961114 100644 --- a/agent/consul/state/acl_test.go +++ b/agent/consul/state/acl_test.go @@ -1582,7 +1582,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) diff --git a/agent/structs/acl.go b/agent/structs/acl.go index fe1cdac82c..fd60624b53 100644 --- a/agent/structs/acl.go +++ b/agent/structs/acl.go @@ -47,11 +47,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"