From d8744e81bccd59157fb9094951fa78a5c9a17b4f Mon Sep 17 00:00:00 2001 From: Priya Patel Date: Wed, 5 Nov 2025 15:03:09 -0500 Subject: [PATCH] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20removed=20vault=5Fld?= =?UTF-8?q?ap=5Ffeature=20flag=20(#3045)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/credential-library/radio/index.js | 19 ++---- .../credential-libraries/index.hbs | 67 +++++++++---------- ui/admin/config/features.js | 2 - .../credential-library/create-test.js | 20 ------ .../credential-library/list-test.js | 20 ------ 5 files changed, 35 insertions(+), 93 deletions(-) diff --git a/ui/admin/app/components/form/credential-library/radio/index.js b/ui/admin/app/components/form/credential-library/radio/index.js index 4f86e7bd5..476fb6c75 100644 --- a/ui/admin/app/components/form/credential-library/radio/index.js +++ b/ui/admin/app/components/form/credential-library/radio/index.js @@ -7,7 +7,6 @@ import Component from '@glimmer/component'; import { TYPES_CREDENTIAL_LIBRARY, TYPE_CREDENTIAL_LIBRARY_VAULT_SSH_CERTIFICATE, - TYPE_CREDENTIAL_LIBRARY_VAULT_LDAP, } from 'api/models/credential-library'; import { service } from '@ember/service'; @@ -22,18 +21,10 @@ export default class FormCredentialLibraryRadioComponent extends Component { get credentialTypes() { let types = [...TYPES_CREDENTIAL_LIBRARY]; - if (!this.features.isEnabled('ssh-target')) { - types = types.filter( - (type) => type !== TYPE_CREDENTIAL_LIBRARY_VAULT_SSH_CERTIFICATE, - ); - } - - if (!this.features.isEnabled('vault-ldap-credential')) { - types = types.filter( - (type) => type !== TYPE_CREDENTIAL_LIBRARY_VAULT_LDAP, - ); - } - - return types; + return this.features.isEnabled('ssh-target') + ? types + : types.filter( + (type) => type !== TYPE_CREDENTIAL_LIBRARY_VAULT_SSH_CERTIFICATE, + ); } } diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/index.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/index.hbs index 2f78c8269..ff891cf4e 100644 --- a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/index.hbs +++ b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/index.hbs @@ -40,45 +40,38 @@ @valign='middle' > <:body as |B|> - {{#if - (or - (not-eq B.data.type 'vault-ldap') - (feature-flag 'vault-ldap-credential') - ) - }} - - - {{#if (can 'read credential-library' B.data)}} - - {{B.data.displayName}} - - {{else}} - - {{B.data.displayName}} - - {{/if}} + + + {{#if (can 'read credential-library' B.data)}} + + {{B.data.displayName}} + + {{else}} - {{B.data.description}} + {{B.data.displayName}} - - - - - - - - - {{/if}} + {{/if}} + + {{B.data.description}} + + + + + + + + + {{else}} diff --git a/ui/admin/config/features.js b/ui/admin/config/features.js index a3649e342..247e7947e 100644 --- a/ui/admin/config/features.js +++ b/ui/admin/config/features.js @@ -28,8 +28,6 @@ const baseEdition = { 'ldap-auth-methods': false, 'worker-filter': false, 'worker-filter-hcp': false, - // TODO: Remove this flag when Vault-ldap credential library is supported - 'vault-ldap-credential': false, }; // Editions maps edition keys to their associated featuresets. const featureEditions = {}; diff --git a/ui/admin/tests/acceptance/credential-library/create-test.js b/ui/admin/tests/acceptance/credential-library/create-test.js index 5bb56fa55..4e28c56cc 100644 --- a/ui/admin/tests/acceptance/credential-library/create-test.js +++ b/ui/admin/tests/acceptance/credential-library/create-test.js @@ -444,8 +444,6 @@ module('Acceptance | credential-libraries | create', function (hooks) { }, }); - featuresService.enable('vault-ldap-credential'); - await visit(urls.newCredentialLibrary); await click(selectors.TYPE_VAULT_LDAP); @@ -475,22 +473,6 @@ module('Acceptance | credential-libraries | create', function (hooks) { ); }); - test('cannot select vault ldap when feature is disabled', async function (assert) { - setRunOptions({ - rules: { - 'color-contrast': { - // [ember-a11y-ignore]: axe rule "color-contrast" automatically ignored on 2025-09-04 - enabled: false, - }, - }, - }); - - await visit(urls.newCredentialLibrary); - - assert.false(featuresService.isEnabled('vault-ldap-credential')); - assert.dom(selectors.TYPE_VAULT_LDAP).doesNotExist(); - }); - test('default `vault-generic` credential library is selected when `ssh-target` feature is not enabled and user manually sets `type` in the query params', async function (assert) { setRunOptions({ rules: { @@ -501,8 +483,6 @@ module('Acceptance | credential-libraries | create', function (hooks) { }, }); - featuresService.enable('vault-ldap-credential'); - await visit(`${urls.newCredentialLibrary}?type=vault-ssh-certificate`); assert.dom(selectors.TYPE_VAULT_SSH_CERT).isNotVisible(); diff --git a/ui/admin/tests/acceptance/credential-library/list-test.js b/ui/admin/tests/acceptance/credential-library/list-test.js index 127333bf7..bcf59a257 100644 --- a/ui/admin/tests/acceptance/credential-library/list-test.js +++ b/ui/admin/tests/acceptance/credential-library/list-test.js @@ -15,7 +15,6 @@ module('Acceptance | credential-libraries | list', function (hooks) { setupApplicationTest(hooks); setupSqlite(hooks); - let featuresService; const instances = { scopes: { org: null, @@ -59,7 +58,6 @@ module('Acceptance | credential-libraries | list', function (hooks) { urls.credentialStore = `${urls.credentialStores}/${instances.credentialStore.id}`; urls.credentialLibraries = `${urls.credentialStore}/credential-libraries`; urls.vaultLDAPCredentialLibrary = `${urls.credentialLibraries}/${instances.vaultLDAPCredentialLibrary.id}`; - featuresService = this.owner.lookup('service:features'); }); test('Users can navigate to credential libraries with proper authorization', async function (assert) { @@ -108,28 +106,10 @@ module('Acceptance | credential-libraries | list', function (hooks) { }, }); - featuresService.enable('vault-ldap-credential'); await visit(urls.credentialLibraries); assert .dom(commonSelectors.TABLE_RESOURCE_LINK(urls.vaultLDAPCredentialLibrary)) .isVisible(); }); - - test('User cannot navigate to vault ldap credential library details when feature is not enabled', async function (assert) { - setRunOptions({ - rules: { - 'color-contrast': { - // [ember-a11y-ignore]: axe rule "color-contrast" automatically ignored on 2025-09-04 - enabled: false, - }, - }, - }); - - await visit(urls.credentialLibraries); - - assert - .dom(commonSelectors.TABLE_RESOURCE_LINK(urls.vaultLDAPCredentialLibrary)) - .doesNotExist(); - }); });