Skip to content
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 1.8.2: UI Allow metrics view without config read (#12348) #12363

Merged
merged 6 commits into from Aug 20, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions changelog/12348.txt
@@ -0,0 +1,3 @@
```release-note: bug
ui: Fixes metrics page when read on counter config not allowed
```
2 changes: 1 addition & 1 deletion ui/app/templates/vault/cluster/metrics/index.hbs
Expand Up @@ -50,7 +50,7 @@
@queryEnd={{model.queryEnd}}
@resultStart={{model.activity.startTime}}
@resultEnd={{model.activity.endTime}}
@defaultSpan={{model.config.defaultReportMonths}}
@defaultSpan={{or model.config.defaultReportMonths 12}}
@retentionMonths={{model.config.retentionMonths}}
/>
{{#unless model.activity.total}}
Expand Down
35 changes: 35 additions & 0 deletions ui/tests/acceptance/usage-metrics-test.js
Expand Up @@ -2,9 +2,22 @@ import { module, test } from 'qunit';
import { visit, currentURL, findAll } from '@ember/test-helpers';
import { setupApplicationTest } from 'ember-qunit';
import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
import { create } from 'ember-cli-page-object';

import authPage from 'vault/tests/pages/auth';
import logout from 'vault/tests/pages/logout';
import consoleClass from 'vault/tests/pages/components/console/ui-panel';

const consoleComponent = create(consoleClass);

const tokenWithPolicy = async function(name, policy) {
await consoleComponent.runCommands([
`write sys/policies/acl/${name} policy=${btoa(policy)}`,
`write -field=client_token auth/token/create policies=${name}`,
]);

return consoleComponent.lastLogOutput;
};

module('Acceptance | usage metrics', function(hooks) {
setupApplicationTest(hooks);
Expand Down Expand Up @@ -65,6 +78,28 @@ module('Acceptance | usage metrics', function(hooks) {

assert.equal(currentURL(), '/vault/metrics');
assert.dom('[data-test-pricing-metrics-form]').exists('Pricing metrics date form exists');
assert.dom('[data-test-configuration-tab]').exists('Metrics config tab exists');
assert.dom('[data-test-tracking-disabled]').doesNotExist('Flash message does not exists');
assert.ok(findAll('.selectable-card').length === 3, 'renders the counts');
});

test('it shows metrics even if config endpoint not allowed', async function(assert) {
server.create('metrics/activity');
const deny_config_policy = `
path "sys/internal/counters/config" {
capabilities = ["deny"]
},
`;

const userToken = await tokenWithPolicy('no-metrics-config', deny_config_policy);
await logout.visit();
await authPage.login(userToken);

await visit('/vault/metrics');

assert.equal(currentURL(), '/vault/metrics');
assert.dom('[data-test-pricing-metrics-form]').exists('Pricing metrics date form exists');
assert.dom('[data-test-configuration-tab]').doesNotExist('Metrics config tab does not exist');
assert.dom('[data-test-tracking-disabled]').doesNotExist('Flash message does not exists');
assert.ok(findAll('.selectable-card').length === 3, 'renders the counts');
});
Expand Down