{{#if @disabled }}
{{yield (hash content=(component 'linkable-item/content'))}}
diff --git a/ui/tests/acceptance/secrets/backend/database/secret-test.js b/ui/tests/acceptance/secrets/backend/database/secret-test.js
index 2123bb802..e1aca5bc1 100644
--- a/ui/tests/acceptance/secrets/backend/database/secret-test.js
+++ b/ui/tests/acceptance/secrets/backend/database/secret-test.js
@@ -34,7 +34,7 @@ const newConnection = async (backend, plugin = 'mongodb-database-plugin') => {
await connectionPage.visitCreate({ backend });
await connectionPage.dbPlugin(plugin);
await connectionPage.name(name);
- await connectionPage.url(`mongodb://127.0.0.1:4321/${name}`);
+ await connectionPage.connectionUrl(`mongodb://127.0.0.1:4321/${name}`);
await connectionPage.toggleVerify();
await connectionPage.save();
await connectionPage.enable();
@@ -42,6 +42,26 @@ const newConnection = async (backend, plugin = 'mongodb-database-plugin') => {
};
const connectionTests = [
+ {
+ name: 'elasticsearch-connection',
+ plugin: 'elasticsearch-database-plugin',
+ elasticUser: 'username',
+ elasticPassword: 'password',
+ url: 'http://127.0.0.1:9200',
+ requiredFields: async (assert, name) => {
+ assert.dom('[data-test-input="username"]').exists(`Username field exists for ${name}`);
+ assert.dom('[data-test-input="password"]').exists(`Password field exists for ${name}`);
+ assert.dom('[data-test-input="ca_cert"]').exists(`CA certificate field exists for ${name}`);
+ assert.dom('[data-test-input="ca_path"]').exists(`CA path field exists for ${name}`);
+ assert.dom('[data-test-input="client_cert"]').exists(`Client certificate field exists for ${name}`);
+ assert.dom('[data-test-input="client_key"]').exists(`Client key field exists for ${name}`);
+ assert.dom('[data-test-input="tls_server_name"]').exists(`TLS server name field exists for ${name}`);
+ assert.dom('[data-test-input="insecure"]').exists(`Insecure checkbox exists for ${name}`);
+ assert
+ .dom('[data-test-toggle-input="show-username_template"]')
+ .exists(`Username template toggle exists for ${name}`);
+ },
+ },
{
name: 'mongodb-connection',
plugin: 'mongodb-database-plugin',
@@ -208,7 +228,13 @@ module('Acceptance | secrets/database/*', function(hooks) {
await connectionPage.dbPlugin(testCase.plugin);
assert.dom('[data-test-empty-state]').doesNotExist('Empty state goes away after plugin selected');
await connectionPage.name(testCase.name);
- await connectionPage.url(testCase.url);
+ if (testCase.plugin === 'elasticsearch-database-plugin') {
+ await connectionPage.url(testCase.url);
+ await connectionPage.username(testCase.elasticUser);
+ await connectionPage.password(testCase.elasticPassword);
+ } else {
+ await connectionPage.connectionUrl(testCase.url);
+ }
testCase.requiredFields(assert, testCase.name);
await connectionPage.toggleVerify();
await connectionPage.save();
@@ -253,8 +279,8 @@ module('Acceptance | secrets/database/*', function(hooks) {
plugin: 'mongodb-database-plugin',
id: 'horses-db',
fields: [
- { label: 'Connection Name', name: 'name', value: 'horses-db' },
- { label: 'Connection url', name: 'connection_url', value: 'mongodb://127.0.0.1:235/horses' },
+ { label: 'Connection name', name: 'name', value: 'horses-db' },
+ { label: 'Connection URL', name: 'connection_url', value: 'mongodb://127.0.0.1:235/horses' },
{ label: 'Username', name: 'username', value: 'user', hideOnShow: true },
{ label: 'Password', name: 'password', password: 'so-secure', hideOnShow: true },
{ label: 'Write concern', name: 'write_concern' },
diff --git a/ui/tests/integration/components/database-role-setting-form-test.js b/ui/tests/integration/components/database-role-setting-form-test.js
index c73411951..f0b153bde 100644
--- a/ui/tests/integration/components/database-role-setting-form-test.js
+++ b/ui/tests/integration/components/database-role-setting-form-test.js
@@ -19,6 +19,11 @@ const testCases = [
'renew_statements',
],
},
+ {
+ pluginType: 'elasticsearch-database-plugin',
+ staticRoleFields: ['username', 'rotation_period'],
+ dynamicRoleFields: ['creation_statement', 'ttl', 'max_ttl'],
+ },
{
pluginType: 'mongodb-database-plugin',
staticRoleFields: ['username', 'rotation_period'],
diff --git a/ui/tests/pages/secrets/backend/database/connection.js b/ui/tests/pages/secrets/backend/database/connection.js
index 9324da5f1..75073f860 100644
--- a/ui/tests/pages/secrets/backend/database/connection.js
+++ b/ui/tests/pages/secrets/backend/database/connection.js
@@ -10,7 +10,10 @@ export default create({
dbPlugin: selectable('[data-test-input="plugin_name"]'),
name: fillable('[data-test-input="name"]'),
toggleVerify: clickable('[data-test-input="verify_connection"]'),
- url: fillable('[data-test-input="connection_url"'),
+ connectionUrl: fillable('[data-test-input="connection_url"]'),
+ url: fillable('[data-test-input="url"]'),
+ username: fillable('[data-test-input="username"]'),
+ password: fillable('[data-test-input="password"]'),
save: clickable('[data-test-secret-save=""]'),
addRole: clickable('[data-test-secret-create="true"]'), // only from connection show
enable: clickable('[data-test-enable-connection=""]'),