Skip to content
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

Remove unsupported fields for DB roles show page #15573

Merged
merged 5 commits into from
May 25, 2022
Merged

Remove unsupported fields for DB roles show page #15573

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ea2ebbc
Fixed unsupported revocation statements field display for DB roles
linda9379 May 24, 2022
0090c10
Fixed linting
linda9379 May 24, 2022
1612337
Added changelog
linda9379 May 24, 2022
03bb99f
Fixed conditional to filter for only elasticsearch database and chang…
linda9379 May 24, 2022
eaf9998
Fixed conditional and added comment for bug fix
linda9379 May 24, 2022
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
3 changes: 3 additions & 0 deletions changelog/15573.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
ui: Fixed unsupported revocation statements field for DB roles
```
7 changes: 5 additions & 2 deletions ui/app/models/database/role.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { computed } from '@ember/object';
import { alias } from '@ember/object/computed';
import lazyCapabilities, { apiPath } from 'vault/macros/lazy-capabilities';
import { expandAttributeMeta } from 'vault/utils/field-to-attrs';
import { getRoleFields } from '../../utils/database-helpers';
import { getRoleFields } from 'vault/utils/database-helpers';

export default Model.extend({
idPrefix: 'role/',
Expand Down Expand Up @@ -91,7 +91,10 @@ export default Model.extend({

get showFields() {
let fields = ['name', 'database', 'type'];
fields = fields.concat(getRoleFields(this.type)).concat(['creation_statements', 'revocation_statements']);
fields = fields.concat(getRoleFields(this.type)).concat(['creation_statements']);
if (this.database != 'elasticsearch') {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Although this works, it's best practice to use a strict equals (=== or !==). I also think this would be a great place for a comment so when someone returns to this part of the code, they quickly understand why elasticsearch was excluded.

Suggested change
if (this.database != 'elasticsearch') {
// elasticsearch does not support revocation statements: https://www.vaultproject.io/api-docs/secret/databases/elasticdb#parameters-1
if (this.database[0] !== 'elasticsearch') {

fields = fields.concat(['revocation_statements']);
}
return expandAttributeMeta(this, fields);
},

Expand Down