Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions changelog/27019.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
ui: Fix link to v2 generic secrets engine from secrets list page.
```
4 changes: 4 additions & 0 deletions ui/app/models/secret-engine.js
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,10 @@ export default class SecretEngineModel extends Model {
const { engineRoute } = allEngines().find((engine) => engine.type === this.engineType);
return `vault.cluster.secrets.backend.${engineRoute}`;
}
if (this.isV2KV) {
// if it's KV v2 but not registered as an addon, it's type generic
return 'vault.cluster.secrets.backend.kv.list';
}
return `vault.cluster.secrets.backend.list-root`;
}

Expand Down
3 changes: 3 additions & 0 deletions ui/app/routes/vault/cluster/secrets/backend/list.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,9 @@ export default Route.extend({
return this.router.transitionTo('vault.cluster.secrets.backend.kv.list-directory', backend, secret);
}
return this.router.transitionTo(`vault.cluster.secrets.backend.${engineRoute}`, backend);
} else if (secretEngine.isV2KV) {
// if it's KV v2 but not registered as an addon, it's type generic
return this.router.transitionTo('vault.cluster.secrets.backend.kv.list', backend);
}
const modelType = this.getModelType(backend, tab);
return this.pathHelp.getNewModel(modelType, backend).then(() => {
Expand Down
20 changes: 18 additions & 2 deletions ui/tests/acceptance/secrets/backend/generic/secret-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
* SPDX-License-Identifier: BUSL-1.1
*/

import { currentRouteName, visit } from '@ember/test-helpers';
import { click, currentRouteName, settled, visit } from '@ember/test-helpers';
import { selectChoose } from 'ember-power-select/test-support';
import { module, test } from 'qunit';
import { setupApplicationTest } from 'ember-qunit';
import { v4 as uuidv4 } from 'uuid';
Expand Down Expand Up @@ -63,7 +64,15 @@ module('Acceptance | secrets/generic/create', function (hooks) {
// upgrade to version 2 generic mount
`write sys/mounts/${path}/tune options=version=2`,
]);
await visit(`/vault/secrets/${path}/kv/list`);
await visit('/vault/secrets');
await selectChoose('[data-test-component="search-select"]#filter-by-engine-name', path);
await settled();
await click(`[data-test-secrets-backend-link="${path}"]`);
assert.strictEqual(
currentRouteName(),
'vault.cluster.secrets.backend.kv.list',
'navigates to the KV engine list page'
);

assert
.dom(PAGE.list.item('foo'))
Expand All @@ -77,6 +86,13 @@ module('Acceptance | secrets/generic/create', function (hooks) {
});
assert.dom(PAGE.list.item()).exists({ count: 2 }, 'lists only the two secrets');

await visit(`/vault/secrets/${path}/list`);
assert.strictEqual(
currentRouteName(),
'vault.cluster.secrets.backend.kv.list',
'redirects to the KV engine list page from generic list'
);

// Clean up
await runCmd(deleteEngineCmd(path));
});
Expand Down