fix: 🐛 Update vault-ldap cred library (#3000)
* fix: 🐛 remove UPD cred type from vault-ldap * fix: 🐛 failing tests * fix: 🐛 remove log
This commit is contained in:
1 parent
396bf0a43f
commit
b4f3741979
9 files changed
+27
-149
No files matched your search
@@ -479,10 +479,6 @@ module('Acceptance | credential-libraries | create', function (hooks) {
|
||||
credentialLibrary.attributes.path,
|
||||
selectors.FIELD_VAULT_PATH_VALUE,
|
||||
);
|
||||
assert.strictEqual(
|
||||
credentialLibrary.credentialType,
|
||||
selectors.FIELD_CRED_TYPE_UPD_VALUE,
|
||||
);
|
||||
});
|
||||
|
||||
test('cannot select vault ldap when feature is disabled', async function (assert) {
|
||||
@@ -501,60 +497,6 @@ module('Acceptance | credential-libraries | create', function (hooks) {
|
||||
assert.dom(selectors.TYPE_VAULT_LDAP).doesNotExist();
|
||||
});
|
||||
|
||||
test('can create a new credential library with username, password and domain type for vault ldap', async function (assert) {
|
||||
setRunOptions({
|
||||
rules: {
|
||||
'color-contrast': {
|
||||
// [ember-a11y-ignore]: axe rule "color-contrast" automatically ignored on 2025-08-26
|
||||
enabled: false,
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
featuresService.enable('vault-ldap-credential');
|
||||
|
||||
const credentialLibraryCount = getCredentialLibraryCount();
|
||||
const usernamePasswordDomainCredentialLibraryCount =
|
||||
getUsernamePasswordDomainCredentialLibraryCount();
|
||||
await visit(urls.newCredentialLibrary);
|
||||
|
||||
await click(selectors.TYPE_VAULT_LDAP);
|
||||
|
||||
await fillIn(selectors.FIELD_VAULT_PATH, selectors.FIELD_VAULT_PATH_VALUE);
|
||||
await fillIn(commonSelectors.FIELD_NAME, commonSelectors.FIELD_NAME_VALUE);
|
||||
|
||||
await select(
|
||||
selectors.FIELD_CRED_MAP_OVERRIDES_SELECT,
|
||||
selectors.FIELD_CRED_MAP_OVERRIDES_SELECT_DOMAIN_VALUE,
|
||||
);
|
||||
await fillIn(selectors.FIELD_CRED_MAP_OVERRIDES_INPUT, 'domain');
|
||||
|
||||
await click(selectors.FIELD_CRED_MAP_OVERRIDES_BTN);
|
||||
await click(commonSelectors.SAVE_BTN);
|
||||
|
||||
assert.strictEqual(getCredentialLibraryCount(), credentialLibraryCount + 1);
|
||||
assert.strictEqual(
|
||||
getUsernamePasswordDomainCredentialLibraryCount(),
|
||||
usernamePasswordDomainCredentialLibraryCount + 1,
|
||||
);
|
||||
|
||||
const credentialLibrary = this.server.schema.credentialLibraries.findBy({
|
||||
type: TYPE_CREDENTIAL_LIBRARY_VAULT_LDAP,
|
||||
});
|
||||
|
||||
assert.strictEqual(
|
||||
credentialLibrary.name,
|
||||
commonSelectors.FIELD_NAME_VALUE,
|
||||
);
|
||||
assert.strictEqual(
|
||||
credentialLibrary.credentialType,
|
||||
selectors.FIELD_CRED_TYPE_UPD_VALUE,
|
||||
);
|
||||
assert.deepEqual(credentialLibrary.credentialMappingOverrides, {
|
||||
domain_attribute: 'domain',
|
||||
});
|
||||
});
|
||||
|
||||
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: {
|
||||
|
||||
@@ -489,14 +489,6 @@ module('Acceptance | credential-libraries | update', function (hooks) {
|
||||
|
||||
await fillIn(selectors.FIELD_VAULT_PATH, selectors.FIELD_VAULT_PATH_VALUE);
|
||||
|
||||
await select(
|
||||
selectors.FIELD_CRED_MAP_OVERRIDES_SELECT,
|
||||
selectors.FIELD_CRED_MAP_OVERRIDES_SELECT_DOMAIN_VALUE,
|
||||
);
|
||||
|
||||
await fillIn(selectors.FIELD_CRED_MAP_OVERRIDES_INPUT, 'domain');
|
||||
await click(selectors.FIELD_CRED_MAP_OVERRIDES_BTN);
|
||||
|
||||
await click(commonSelectors.SAVE_BTN);
|
||||
|
||||
const credentialLibrary = this.server.schema.credentialLibraries.findBy({
|
||||
@@ -515,8 +507,5 @@ module('Acceptance | credential-libraries | update', function (hooks) {
|
||||
credentialLibrary.attributes.path,
|
||||
selectors.FIELD_VAULT_PATH_VALUE,
|
||||
);
|
||||
assert.deepEqual(credentialLibrary.credentialMappingOverrides, {
|
||||
domain_attribute: 'domain',
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -132,8 +132,12 @@ module(
|
||||
|
||||
filteredCredentialLibraries = selectItems(
|
||||
this.server.schema.credentialLibraries,
|
||||
(cred) =>
|
||||
cred.credential_type !== TYPE_CREDENTIAL_USERNAME_PASSWORD_DOMAIN,
|
||||
(cred) => {
|
||||
return (
|
||||
cred.credential_type !== TYPE_CREDENTIAL_USERNAME_PASSWORD_DOMAIN &&
|
||||
cred.type !== TYPE_CREDENTIAL_LIBRARY_VAULT_LDAP
|
||||
);
|
||||
},
|
||||
);
|
||||
|
||||
// credentials for RDP
|
||||
@@ -143,7 +147,8 @@ module(
|
||||
[
|
||||
TYPE_CREDENTIAL_USERNAME_PASSWORD_DOMAIN,
|
||||
TYPE_CREDENTIAL_USERNAME_PASSWORD,
|
||||
].includes(cred.credential_type),
|
||||
].includes(cred.credential_type) ||
|
||||
cred.type === TYPE_CREDENTIAL_LIBRARY_VAULT_LDAP,
|
||||
);
|
||||
filteredCredentialsForRDP = selectItems(
|
||||
this.server.schema.credentials,
|
||||
@@ -188,9 +193,13 @@ module(
|
||||
|
||||
// SSH specific credential sources
|
||||
getCredentialLibraryCount = () =>
|
||||
this.server.schema.credentialLibraries.where(
|
||||
(c) => c.credential_type !== TYPE_CREDENTIAL_USERNAME_PASSWORD_DOMAIN,
|
||||
).models.length;
|
||||
this.server.schema.credentialLibraries.where((c) => {
|
||||
return (
|
||||
c.credential_type !== TYPE_CREDENTIAL_USERNAME_PASSWORD_DOMAIN &&
|
||||
c.type !== TYPE_CREDENTIAL_LIBRARY_VAULT_LDAP
|
||||
);
|
||||
}).models.length;
|
||||
|
||||
getCredentialCount = () =>
|
||||
this.server.schema.credentials.where(
|
||||
(cred) =>
|
||||
@@ -209,11 +218,13 @@ module(
|
||||
].includes(cred.type),
|
||||
).models.length;
|
||||
getCredentialLibraryForRDPCount = () =>
|
||||
this.server.schema.credentialLibraries.where((cred) =>
|
||||
[
|
||||
TYPE_CREDENTIAL_USERNAME_PASSWORD_DOMAIN,
|
||||
TYPE_CREDENTIAL_USERNAME_PASSWORD,
|
||||
].includes(cred.credential_type),
|
||||
this.server.schema.credentialLibraries.where(
|
||||
(cred) =>
|
||||
[
|
||||
TYPE_CREDENTIAL_USERNAME_PASSWORD_DOMAIN,
|
||||
TYPE_CREDENTIAL_USERNAME_PASSWORD,
|
||||
].includes(cred.credential_type) ||
|
||||
cred.type === TYPE_CREDENTIAL_LIBRARY_VAULT_LDAP,
|
||||
).models.length;
|
||||
|
||||
credentialSourceCount =
|
||||
|
||||
Reference in new issue
Block a user