diff --git a/ui/app/controllers/vault/cluster/settings/mount-secret-backend.js b/ui/app/controllers/vault/cluster/settings/mount-secret-backend.js deleted file mode 100644 index 9e97ee479b..0000000000 --- a/ui/app/controllers/vault/cluster/settings/mount-secret-backend.js +++ /dev/null @@ -1,37 +0,0 @@ -/** - * Copyright (c) HashiCorp, Inc. - * SPDX-License-Identifier: BUSL-1.1 - */ - -import { service } from '@ember/service'; -import Controller from '@ember/controller'; -import { action } from '@ember/object'; -import { supportedSecretBackends } from 'vault/helpers/supported-secret-backends'; -import engineDisplayData from 'vault/helpers/engines-display-data'; - -const SUPPORTED_BACKENDS = supportedSecretBackends(); - -export default class MountSecretBackendController extends Controller { - @service router; - - @action - onMountSuccess(type, path, useEngineRoute = false) { - let transition; - if (SUPPORTED_BACKENDS.includes(type)) { - const engineInfo = engineDisplayData(type); - if (useEngineRoute) { - transition = this.router.transitionTo( - `vault.cluster.secrets.backend.${engineInfo.engineRoute}`, - path - ); - } else { - // For keymgmt, we need to land on provider tab by default using query params - const queryParams = engineInfo.type === 'keymgmt' ? { tab: 'provider' } : {}; - transition = this.router.transitionTo('vault.cluster.secrets.backend.index', path, { queryParams }); - } - } else { - transition = this.router.transitionTo('vault.cluster.secrets.backends'); - } - return transition.followRedirects(); - } -} diff --git a/ui/app/router.js b/ui/app/router.js index 43d456e49c..ce5c39d512 100644 --- a/ui/app/router.js +++ b/ui/app/router.js @@ -60,7 +60,6 @@ Router.map(function () { this.route('section', { path: '/:section_name' }); }); }); - this.route('mount-secret-backend'); }); this.route('unseal'); this.route('tools', function () { diff --git a/ui/app/routes/vault/cluster/secrets/mounts/index.ts b/ui/app/routes/vault/cluster/secrets/mounts/index.ts index b3c83ff835..b64b491960 100644 --- a/ui/app/routes/vault/cluster/secrets/mounts/index.ts +++ b/ui/app/routes/vault/cluster/secrets/mounts/index.ts @@ -5,8 +5,10 @@ import Route from '@ember/routing/route'; import { service } from '@ember/service'; +import { hash } from 'rsvp'; import SecretsEngineForm from 'vault/forms/secrets/engine'; import Router from 'vault/router'; +import type PluginCatalogService from 'vault/services/plugin-catalog'; import type { ModelFrom } from 'vault/vault/route'; @@ -14,8 +16,9 @@ export type MountSecretBackendModel = ModelFrom; - -export default class VaultClusterSettingsMountSecretBackendRoute extends Route { - @service declare readonly auth: AuthService; - @service declare readonly namespace: NamespaceService; - @service('plugin-catalog') declare readonly pluginCatalog: PluginCatalogService; - - async model() { - const defaults = { - config: { listing_visibility: false }, - kv_config: { - max_versions: 0, - cas_required: false, - delete_version_after: undefined, - }, - options: { version: 2 }, - }; - - const secretEngineForm = new SecretsEngineForm(defaults, { isNew: true }); - - // Fetch plugin catalog data to enhance the secret engines list - const pluginCatalogResponse = await this.pluginCatalog.fetchPluginCatalog(); - - return hash({ - form: secretEngineForm, - pluginCatalogData: pluginCatalogResponse.data, - pluginCatalogError: pluginCatalogResponse.error, - }); - } -} diff --git a/ui/app/templates/vault/cluster/settings/mount-secret-backend.hbs b/ui/app/templates/vault/cluster/settings/mount-secret-backend.hbs deleted file mode 100644 index 078fed4000..0000000000 --- a/ui/app/templates/vault/cluster/settings/mount-secret-backend.hbs +++ /dev/null @@ -1,6 +0,0 @@ -{{! - Copyright (c) HashiCorp, Inc. - SPDX-License-Identifier: BUSL-1.1 -}} - - \ No newline at end of file diff --git a/ui/tests/acceptance/settings/mount-secret-backend-test.js b/ui/tests/acceptance/secrets/mounts-test.js similarity index 99% rename from ui/tests/acceptance/settings/mount-secret-backend-test.js rename to ui/tests/acceptance/secrets/mounts-test.js index aed4576841..871eb9c55b 100644 --- a/ui/tests/acceptance/settings/mount-secret-backend-test.js +++ b/ui/tests/acceptance/secrets/mounts-test.js @@ -39,7 +39,7 @@ const consoleComponent = create(consoleClass); // enterprise backends are tested separately const BACKENDS_WITH_ENGINES = ['kv', 'pki', 'ldap', 'kubernetes']; -module('Acceptance | settings/mount-secret-backend', function (hooks) { +module('Acceptance | secrets/mounts', function (hooks) { setupApplicationTest(hooks); hooks.beforeEach(function () {