[CC-6039] Update builtin policy descriptions

hashicorp · Sep 7, 2023 · aa8dee9 · aa8dee9
1 parent 3c70e14
commit aa8dee9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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"