From ecd4c1e514780be0e577349dcb9024731b7577fc Mon Sep 17 00:00:00 2001 From: Chelsea Shaw <82459713+hashishaw@users.noreply.github.com> Date: Wed, 16 Mar 2022 11:00:08 -0500 Subject: [PATCH] UI/fix kv data cache (#14489) * KV fetches recent version on every page, no longer disallow new version without metadata access * Don't flash no read permissions warning * Send noMetadataVersion on destroy if version is undefined * test coverage * add changelog, fix tests * Fix failing test --- changelog/14489.txt | 3 +++ ui/app/adapters/secret-v2-version.js | 1 + .../cluster/secrets/backend/secret-edit.js | 15 +---------- .../components/secret-create-or-update.hbs | 4 +-- .../components/secret-edit-toolbar.hbs | 9 ++++--- .../access/identity/_shared-alias-tests.js | 3 +-- .../secrets/backend/kv/secret-test.js | 26 ++++++++++++++----- .../pages/components/identity/edit-form.js | 7 +++++ 8 files changed, 40 insertions(+), 28 deletions(-) create mode 100644 changelog/14489.txt diff --git a/changelog/14489.txt b/changelog/14489.txt new file mode 100644 index 000000000..014d0a50f --- /dev/null +++ b/changelog/14489.txt @@ -0,0 +1,3 @@ +```release-note:bug +ui: Fixes caching issue on kv new version create +``` diff --git a/ui/app/adapters/secret-v2-version.js b/ui/app/adapters/secret-v2-version.js index 1d51a41bc..319501400 100644 --- a/ui/app/adapters/secret-v2-version.js +++ b/ui/app/adapters/secret-v2-version.js @@ -149,6 +149,7 @@ export default ApplicationAdapter.extend({ } else if (deleteType === 'soft-delete') { return this.softDelete(backend, path, version); } else { + version = version || currentVersionForNoReadMetadata; return this.deleteByDeleteType(backend, path, deleteType, version); } }, diff --git a/ui/app/routes/vault/cluster/secrets/backend/secret-edit.js b/ui/app/routes/vault/cluster/secrets/backend/secret-edit.js index fb697b944..98d015b23 100644 --- a/ui/app/routes/vault/cluster/secrets/backend/secret-edit.js +++ b/ui/app/routes/vault/cluster/secrets/backend/secret-edit.js @@ -248,20 +248,7 @@ export default Route.extend(UnloadModelRoute, { if (modelType === 'secret-v2') { // after the the base model fetch, kv-v2 has a second associated // version model that contains the secret data - - // if no read access to metadata, return current Version from secret data. - if (!secretModel.currentVersion) { - let adapter = this.store.adapterFor('secret-v2-version'); - try { - secretModel.currentVersion = await adapter.getSecretDataVersion(backend, secret); - } catch { - // will get error if you have deleted the secret - // if this is the case do nothing - } - secretModel = await this.fetchV2Models(capabilities, secretModel, params); - } else { - secretModel = await this.fetchV2Models(capabilities, secretModel, params); - } + secretModel = await this.fetchV2Models(capabilities, secretModel, params); } return { secret: secretModel, diff --git a/ui/app/templates/components/secret-create-or-update.hbs b/ui/app/templates/components/secret-create-or-update.hbs index 4d27a2410..cb72e8ada 100644 --- a/ui/app/templates/components/secret-create-or-update.hbs +++ b/ui/app/templates/components/secret-create-or-update.hbs @@ -152,13 +152,13 @@
- {{#unless @canReadSecretData}} + {{#if (eq @canReadSecretData false)}} - {{/unless}} + {{/if}} {{#if this.isCreateNewVersionFromOldVersion}}
diff --git a/ui/app/templates/components/secret-edit-toolbar.hbs b/ui/app/templates/components/secret-edit-toolbar.hbs index ecb0f5db8..59a1ba780 100644 --- a/ui/app/templates/components/secret-edit-toolbar.hbs +++ b/ui/app/templates/components/secret-edit-toolbar.hbs @@ -92,12 +92,15 @@ {{#let (concat "vault.cluster.secrets.backend." (if (eq @mode "show") "edit" "show")) as |targetRoute|}} {{#if @isV2}} Create new version diff --git a/ui/tests/acceptance/access/identity/_shared-alias-tests.js b/ui/tests/acceptance/access/identity/_shared-alias-tests.js index f75ba586e..f54e5def8 100644 --- a/ui/tests/acceptance/access/identity/_shared-alias-tests.js +++ b/ui/tests/acceptance/access/identity/_shared-alias-tests.js @@ -86,14 +86,13 @@ export const testAliasDeleteFromForm = async function (name, itemType, assert) { `${itemType}: navigates to edit on create` ); await page.editForm.delete(); - await settled(); + await page.editForm.waitForConfirm(); await page.editForm.confirmDelete(); await settled(); assert.ok( aliasIndexPage.flashMessage.latestMessage.startsWith('Successfully deleted'), `${itemType}: shows flash message` ); - assert.equal( currentRouteName(), 'vault.cluster.access.identity.aliases.index', diff --git a/ui/tests/acceptance/secrets/backend/kv/secret-test.js b/ui/tests/acceptance/secrets/backend/kv/secret-test.js index 65b0e0c25..14f06f775 100644 --- a/ui/tests/acceptance/secrets/backend/kv/secret-test.js +++ b/ui/tests/acceptance/secrets/backend/kv/secret-test.js @@ -607,11 +607,22 @@ module('Acceptance | secrets/secret/create', function (hooks) { await assert .dom('[data-test-value-div="secret-key"]') .exists('secret view page and info table row with secret-key value'); - // create new version should be disabled with no metadata read access - assert.dom('[data-test-secret-edit]').hasClass('disabled', 'Create new version action is disabled'); - assert - .dom('[data-test-popup-menu-trigger="version"]') - .doesNotExist('the version drop down menu does not show'); + + // Create new version + assert.dom('[data-test-secret-edit]').doesNotHaveClass('disabled', 'Create new version is not disabled'); + await click('[data-test-secret-edit]'); + + // create new version should not include version in the URL + assert.equal( + currentURL(), + `/vault/secrets/${enginePath}/edit/${secretPath}`, + 'edit route does not include version query param' + ); + // Update key + await editPage.secretKey('newKey'); + await editPage.secretValue('some-value'); + await editPage.save(); + assert.dom('[data-test-value-div="newKey"]').exists('Info row table exists at newKey'); // check metadata tab await click('[data-test-secret-metadata-tab]'); @@ -683,8 +694,9 @@ module('Acceptance | secrets/secret/create', function (hooks) { await settled(); // eslint-disable-line await click('[data-test-secret-tab]'); await settled(); // eslint-disable-line - let text = document.querySelector('[data-test-empty-state-title]').innerText.trim(); - assert.equal(text, 'Version 1 of this secret has been permanently destroyed'); + assert + .dom('[data-test-empty-state-title]') + .includesText('Version 1 of this secret has been permanently destroyed'); }); test('version 2 with policy with only delete option does not show modal and undelete is an option', async function (assert) { diff --git a/ui/tests/pages/components/identity/edit-form.js b/ui/tests/pages/components/identity/edit-form.js index db34da0c2..90fd8d2a9 100644 --- a/ui/tests/pages/components/identity/edit-form.js +++ b/ui/tests/pages/components/identity/edit-form.js @@ -1,4 +1,5 @@ import { clickable, fillable, attribute } from 'ember-cli-page-object'; +import { waitFor } from '@ember/test-helpers'; import fields from '../form-field'; export default { @@ -13,4 +14,10 @@ export default { submit: clickable('[data-test-identity-submit]'), delete: clickable('[data-test-confirm-action-trigger]'), confirmDelete: clickable('[data-test-confirm-button]'), + waitForConfirm() { + return waitFor('[data-test-confirm-button]'); + }, + waitForFlash() { + return waitFor('[data-test-flash-message-body]'); + }, };