Skip to content

Remove Vault LDAP feature flag #3045

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.

Sign up for GitHub

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

Merged
priya-patel04 merged 2 commits into from
Nov 5, 2025
Merged

Remove Vault LDAP feature flag #3045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06a1055
refactor: 💡 removed vault_ldap_feature flag
priya-patel04 Nov 3, 2025
3c6eaf3
Merge branch 'main' of https://github.com/hashicorp/boundary-ui into …
priya-patel04 Nov 5, 2025
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
19 changes: 5 additions & 14 deletions ui/admin/app/components/form/credential-library/radio/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand All @@ -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,
);
}
}
67 changes: 30 additions & 37 deletions .../templates/scopes/scope/credential-stores/credential-store/credential-libraries/index.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,45 +40,38 @@
@valign='middle'
>
<:body as |B|>
{{#if
(or
(not-eq B.data.type 'vault-ldap')
(feature-flag 'vault-ldap-credential')
)
}}
<B.Tr>
<B.Td>
{{#if (can 'read credential-library' B.data)}}
<LinkTo
@route='scopes.scope.credential-stores.credential-store.credential-libraries.credential-library'
@model={{B.data.id}}
>
{{B.data.displayName}}
</LinkTo>
{{else}}
<Hds::Text::Body @tag='p'>
{{B.data.displayName}}
</Hds::Text::Body>
{{/if}}
<B.Tr>
<B.Td>
{{#if (can 'read credential-library' B.data)}}
<LinkTo
@route='scopes.scope.credential-stores.credential-store.credential-libraries.credential-library'
@model={{B.data.id}}
>
{{B.data.displayName}}
</LinkTo>
{{else}}
<Hds::Text::Body @tag='p'>
{{B.data.description}}
{{B.data.displayName}}
</Hds::Text::Body>
</B.Td>
<B.Td>
<Hds::Badge
@text={{t
(concat 'resources.credential-library.types.' B.data.type)
}}
/>
</B.Td>
<B.Td>
<Hds::Copy::Snippet
@textToCopy={{B.data.id}}
@color='secondary'
/>
</B.Td>
</B.Tr>
{{/if}}
{{/if}}
<Hds::Text::Body @tag='p'>
{{B.data.description}}
</Hds::Text::Body>
</B.Td>
<B.Td>
<Hds::Badge
@text={{t
(concat 'resources.credential-library.types.' B.data.type)
}}
/>
</B.Td>
<B.Td>
<Hds::Copy::Snippet
@textToCopy={{B.data.id}}
@color='secondary'
/>
</B.Td>
</B.Tr>
</:body>
</Hds::Table>
{{else}}
Expand Down
2 changes: 0 additions & 2 deletions ui/admin/config/features.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {};
Expand Down
20 changes: 0 additions & 20 deletions ui/admin/tests/acceptance/credential-library/create-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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: {
Expand All @@ -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();
Expand Down
20 changes: 0 additions & 20 deletions ui/admin/tests/acceptance/credential-library/list-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ module('Acceptance | credential-libraries | list', function (hooks) {
setupApplicationTest(hooks);
setupSqlite(hooks);

let featuresService;
const instances = {
scopes: {
org: null,
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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();
});
});
Loading