diff --git a/ui/packages/consul-ui/app/abilities/policy.js b/ui/packages/consul-ui/app/abilities/policy.js index 38c15963e..c4add1ce8 100644 --- a/ui/packages/consul-ui/app/abilities/policy.js +++ b/ui/packages/consul-ui/app/abilities/policy.js @@ -20,7 +20,8 @@ export default class PolicyAbility extends BaseAbility { get canWrite() { return ( this.env.var('CONSUL_ACLS_ENABLED') && - (typeof this.item === 'undefined' || typeOf([this.item]) !== 'policy-management') && + (typeof this.item === 'undefined' || + !['policy-management', 'read-only'].includes(typeOf([this.item]))) && super.canWrite ); } diff --git a/ui/packages/consul-ui/app/components/consul/policy/list/index.hbs b/ui/packages/consul-ui/app/components/consul/policy/list/index.hbs index f9869dae0..63acb559e 100644 --- a/ui/packages/consul-ui/app/components/consul/policy/list/index.hbs +++ b/ui/packages/consul-ui/app/components/consul/policy/list/index.hbs @@ -8,13 +8,19 @@ @items={{@items}} as |item|> -{{#if (eq (policy/typeof item) 'policy-management')}} +{{#if (or (eq (policy/typeof item) 'policy-management') (eq (policy/typeof item) 'read-only'))}}
Type
- - Global Management Policy - + {{#if (eq (policy/typeof item) 'policy-management')}} + + Global Management Policy + + {{else}} + + Global Read-only Policy + + {{/if}}
{{/if}} diff --git a/ui/packages/consul-ui/app/helpers/policy/typeof.js b/ui/packages/consul-ui/app/helpers/policy/typeof.js index 859e613e7..b8eec330d 100644 --- a/ui/packages/consul-ui/app/helpers/policy/typeof.js +++ b/ui/packages/consul-ui/app/helpers/policy/typeof.js @@ -6,6 +6,7 @@ import { helper } from '@ember/component/helper'; import { get } from '@ember/object'; const MANAGEMENT_ID = '00000000-0000-0000-0000-000000000001'; +const READ_ONLY_ID = '00000000-0000-0000-0000-000000000002'; export function typeOf(params, hash) { const item = params[0]; const template = get(item, 'template'); @@ -18,6 +19,8 @@ export function typeOf(params, hash) { return 'policy-node-identity'; case get(item, 'ID') === MANAGEMENT_ID: return 'policy-management'; + case get(item, 'ID') === READ_ONLY_ID: + return 'read-only'; default: return 'policy'; } diff --git a/ui/packages/consul-ui/app/templates/dc/acls/policies/edit.hbs b/ui/packages/consul-ui/app/templates/dc/acls/policies/edit.hbs index 208bcdcb7..6c4bece74 100644 --- a/ui/packages/consul-ui/app/templates/dc/acls/policies/edit.hbs +++ b/ui/packages/consul-ui/app/templates/dc/acls/policies/edit.hbs @@ -75,15 +75,26 @@ as |dc partition nspace id item create|}} {{/if}} - {{#if (eq (policy/typeof item) 'policy-management')}} - - Management - This global-management token is built into Consul's policy system. You can apply this special policy to tokens for full access. This policy is not editable or removeable, but can be ignored by not applying it to any tokens. - - + {{#if (or (eq (policy/typeof item) 'policy-management') (eq (policy/typeof item) 'read-only'))}} + {{#if (eq (policy/typeof item) 'policy-management')}} + + Management + This global-management token is built into Consul's policy system. You can apply this special policy to tokens for full access. This policy is not editable or removeable, but can be ignored by not applying it to any tokens. + + + {{else}} + + Built-in policy + This global-read-only policy is built into Consul's policy system. You can apply this special policy to tokens for read-only access to all Consul components. This policy is not editable or removable, but can be ignored by not applying it to any tokens. + + + {{/if}}
Name
diff --git a/ui/packages/consul-ui/mock-api/v1/acl/policies b/ui/packages/consul-ui/mock-api/v1/acl/policies index db1264b1f..2c1a1487c 100644 --- a/ui/packages/consul-ui/mock-api/v1/acl/policies +++ b/ui/packages/consul-ui/mock-api/v1/acl/policies @@ -29,6 +29,23 @@ ${typeof location.search.partition !== 'undefined' ? ` } ` } + if(i === 2) { + return ` + { + "ID": "00000000-0000-0000-0000-000000000002", + "Name": "global-read-only", +${typeof location.search.ns !== 'undefined' ? ` + "Namespace": "${location.search.ns}", +` : ``} +${typeof location.search.partition !== 'undefined' ? ` + "Partition": "${location.search.partition}", +` : ``} + "Description": "Built-In Read-only Policy", + "CreateIndex": 10, + "ModifyIndex": 10 + } + ` + } return ` { "ID": "${fake.random.uuid()}", diff --git a/ui/packages/consul-ui/mock-api/v1/acl/policy/_ b/ui/packages/consul-ui/mock-api/v1/acl/policy/_ index a442f70f1..810c6d164 100644 --- a/ui/packages/consul-ui/mock-api/v1/acl/policy/_ +++ b/ui/packages/consul-ui/mock-api/v1/acl/policy/_ @@ -11,6 +11,6 @@ ${ location.pathname.get(3) !== '00000000-0000-0000-0000-000000000001' ? ` policy = "write" }`)}, ` : "" } - "Name": "${location.pathname.get(3) === '00000000-0000-0000-0000-000000000001' ? 'global-management' : fake.hacker.noun() + '-policy'}" + "Name": "${location.pathname.get(3) === '00000000-0000-0000-0000-000000000001' ? 'global-management' : location.pathname.get(3) === '00000000-0000-0000-0000-000000000002' ? 'global-read-only': fake.hacker.noun() + '-policy'}" } diff --git a/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/view-read-only.feature b/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/view-read-only.feature new file mode 100644 index 000000000..8887815cb --- /dev/null +++ b/ui/packages/consul-ui/tests/acceptance/dc/acls/policies/view-read-only.feature @@ -0,0 +1,20 @@ +@setupApplicationTest +Feature: dc / acls / policies / view read-only policy: Readonly management policy + Background: + Given 1 datacenter model with the value "datacenter" + And 1 policy model from yaml + --- + ID: 00000000-0000-0000-0000-000000000002 + --- + Scenario: + When I visit the policy page for yaml + --- + dc: datacenter + policy: 00000000-0000-0000-0000-000000000002 + --- + Then the url should be /datacenter/acls/policies/00000000-0000-0000-0000-000000000002 + Then I see the text "View Policy" in "h1" + Then I don't see confirmDelete + Then I don't see cancel + And I see tokens + diff --git a/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/view-read-only-steps.js b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/view-read-only-steps.js new file mode 100644 index 000000000..dfa44050f --- /dev/null +++ b/ui/packages/consul-ui/tests/acceptance/steps/dc/acls/policies/view-read-only-steps.js @@ -0,0 +1,15 @@ +/** + * Copyright (c) HashiCorp, Inc. + * SPDX-License-Identifier: MPL-2.0 + */ + +import steps from '../../../steps'; + +// step definitions that are shared between features should be moved to the +// tests/acceptance/steps/steps.js file + +export default function (assert) { + return steps(assert).then('I should find a file', function () { + assert.ok(true, this.step); + }); +} diff --git a/ui/packages/consul-ui/tests/integration/helpers/policy/typeof-test.js b/ui/packages/consul-ui/tests/integration/helpers/policy/typeof-test.js index 44d2dec68..379c7089f 100644 --- a/ui/packages/consul-ui/tests/integration/helpers/policy/typeof-test.js +++ b/ui/packages/consul-ui/tests/integration/helpers/policy/typeof-test.js @@ -11,12 +11,14 @@ import hbs from 'htmlbars-inline-precompile'; module('Integration | Helper | policy/typeof', function (hooks) { setupRenderingTest(hooks); - // Replace this with your real tests. - test('it renders', async function (assert) { - this.set('inputValue', '1234'); + test('it renders read-only cluster', async function (assert) { + this.set('inputValue', { + ID: '00000000-0000-0000-0000-000000000002', + template: 'some-template', + }); await render(hbs`{{policy/typeof inputValue}}`); - assert.equal(this.element.textContent.trim(), 'role'); + assert.equal(this.element.textContent.trim(), 'read-only'); }); });