mirror of
https://github.com/optim-enterprises-bv/vault.git
synced 2025-10-30 18:17:55 +00:00
Ember Upgrade to 4.4 (#17086)
* runs ember-cli-update to 4.4.0 * updates yarn.lock * updates dependencies causing runtime errors (#17135) * Inject Store Service When Accessed Implicitly (#17345) * adds codemod for injecting store service * adds custom babylon parser with decorators-legacy plugin for jscodeshift transforms * updates inject-store-service codemod to only look for .extend object expressions and adds recast options * runs inject-store-service codemod on js files * replace query-params helper with hash (#17404) * Updates/removes dependencies throwing errors in Ember 4.4 (#17396) * updates ember-responsive to latest * updates ember-composable-helpers to latest and uses includes helper since contains was removed * updates ember-concurrency to latest * updates ember-cli-clipboard to latest * temporary workaround for toolbar-link component throwing errors for using params arg with LinkTo * adds missing store injection to auth configure route * fixes issue with string-list component throwing error for accessing prop in same computation * fixes non-iterable query params issue in mfa methods controller * refactors field-to-attrs to handle belongsTo rather than fragments * converts mount-config fragment to belongsTo on auth-method model * removes ember-api-actions and adds tune method to auth-method adapter * converts cluster replication attributes from fragment to relationship * updates ember-data, removes ember-data-fragments and updates yarn to latest * removes fragments from secret-engine model * removes fragment from test-form-model * removes commented out code * minor change to inject-store-service codemod and runs again on js files * Remove LinkTo positional params (#17421) * updates ember-cli-page-object to latest version * update toolbar-link to support link-to args and not positional params * adds replace arg to toolbar-link component * Clean up js lint errors (#17426) * replaces assert.equal to assert.strictEqual * update eslint no-console to error and disables invididual intended uses of console * cleans up hbs lint warnings (#17432) * Upgrade bug and test fixes (#17500) * updates inject-service codemod to take arg for service name and runs for flashMessages service * fixes hbs lint error after merging main * fixes flash messages * updates more deps * bug fixes * test fixes * updates ember-cli-content-security-policy and prevents default form submission throwing errors * more bug and test fixes * removes commented out code * fixes issue with code-mirror modifier sending change event on setup causing same computation error * Upgrade Clean Up (#17543) * updates deprecation workflow and filter * cleans up build errors, removes unused ivy-codemirror and sass and updates ember-cli-sass and node-sass to latest * fixes control groups test that was skipped after upgrade * updates control group service tests * addresses review feedback * updates control group service handleError method to use router.currentURL rather that transition.intent.url * adds changelog entry
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
import Model, { attr } from '@ember-data/model';
|
||||
import Model, { attr, belongsTo } from '@ember-data/model';
|
||||
import { computed } from '@ember/object'; // eslint-disable-line
|
||||
import { equal } from '@ember/object/computed'; // eslint-disable-line
|
||||
import { fragment } from 'ember-data-model-fragments/attributes';
|
||||
import fieldToAttrs, { expandAttributeMeta } from 'vault/utils/field-to-attrs';
|
||||
import { withModelValidations } from 'vault/decorators/model-validations';
|
||||
|
||||
@@ -29,8 +28,16 @@ export default SecretEngineModel.extend({
|
||||
description: attr('string', {
|
||||
editType: 'textarea',
|
||||
}),
|
||||
config: fragment('mount-config', { defaultValue: {} }),
|
||||
options: fragment('mount-options', { defaultValue: {} }),
|
||||
// will only have value for kv type
|
||||
version: attr('number', {
|
||||
label: 'Version',
|
||||
helpText:
|
||||
'The KV Secrets Engine can operate in different modes. Version 1 is the original generic Secrets Engine the allows for storing of static key/value pairs. Version 2 added more features including data versioning, TTLs, and check and set.',
|
||||
possibleValues: [2, 1],
|
||||
// This shouldn't be defaultValue because if no version comes back from API we should assume it's v1
|
||||
defaultFormValue: 2, // Set the form to 2 by default
|
||||
}),
|
||||
config: belongsTo('mount-config', { async: false, inverse: null }),
|
||||
local: attr('boolean', {
|
||||
helpText:
|
||||
'When Replication is enabled, a local mount will not be replicated across clusters. This can only be specified at mount time.',
|
||||
@@ -60,11 +67,10 @@ export default SecretEngineModel.extend({
|
||||
helperTextEnabled: 'Delete all new versions of this secret after',
|
||||
}),
|
||||
|
||||
modelTypeForKV: computed('engineType', 'options.version', function () {
|
||||
modelTypeForKV: computed('engineType', 'version', function () {
|
||||
let type = this.engineType;
|
||||
let version = this.options?.version;
|
||||
let modelType = 'secret';
|
||||
if ((type === 'kv' || type === 'generic') && version === 2) {
|
||||
if ((type === 'kv' || type === 'generic') && this.version === 2) {
|
||||
modelType = 'secret-v2';
|
||||
}
|
||||
return modelType;
|
||||
@@ -72,18 +78,17 @@ export default SecretEngineModel.extend({
|
||||
|
||||
isV2KV: equal('modelTypeForKV', 'secret-v2'),
|
||||
|
||||
formFields: computed('engineType', 'options.version', function () {
|
||||
formFields: computed('engineType', 'version', function () {
|
||||
let type = this.engineType;
|
||||
let version = this.options?.version;
|
||||
let fields = ['type', 'path', 'description', 'accessor', 'local', 'sealWrap'];
|
||||
// no ttl options for keymgmt
|
||||
const ttl = type !== 'keymgmt' ? 'defaultLeaseTtl,maxLeaseTtl,' : '';
|
||||
fields.push(`config.{${ttl}auditNonHmacRequestKeys,auditNonHmacResponseKeys,passthroughRequestHeaders}`);
|
||||
if (type === 'kv' || type === 'generic') {
|
||||
fields.push('options.{version}');
|
||||
fields.push('version');
|
||||
}
|
||||
// version comes in as number not string
|
||||
if (type === 'kv' && version === 2) {
|
||||
if (type === 'kv' && this.version === 2) {
|
||||
fields.push('casRequired', 'deleteVersionAfter', 'maxVersions');
|
||||
}
|
||||
return fields;
|
||||
@@ -108,7 +113,7 @@ export default SecretEngineModel.extend({
|
||||
);
|
||||
|
||||
if (type === 'kv' || type === 'generic') {
|
||||
optionsGroup['Method Options'].unshift('options.{version}');
|
||||
optionsGroup['Method Options'].unshift('version');
|
||||
}
|
||||
if (type === 'database') {
|
||||
// For the Database Secret Engine we want to highlight the defaultLeaseTtl and maxLeaseTtl, removing them from the options object
|
||||
|
||||
Reference in New Issue
Block a user