Ember-cli upgrade from ~3.8 to ~3.20 (#9972)
* Update ember-cli to ~3.20
* Remove bad optional-feature
* Remove ember-fetch dep
* re-install ember-fetch
* update model fragments pr
* update ember model fragments correct package name
* update ember composable helpers to solve array helper error
* update ember-concurrency
* add back engine dependencies, automatically removed during ember-cli-upgrade
* make author-form-options component js file otherwise error
* for now comment out withTestWaiter
* add eslint-node and fix if not with unless in templates
* fix linting for tab index of false is now -1 and add type button to all buttons without types
* fix href errors for linting, likely have to come back and fix
* using eslint fix flag to fix all this.gets
* ember modules codemode removed files that had module twice, will fix in next commit
* finish codemode ember-data-codemod needed to rename const model
* more this.get removal codemode did not work
* cont. removal of this.get
* stop mixin rules until figure out how to reconfig them all
* smaller eslint ignores
* get codemode
* testing app small fixes to bring it back after all the changes
* small changes to eslint
* test removal of getProperties
* fix issue with baseKey because value could be unknown needed to add a question mark in nested get
* smaller linting fixes
* get nested fixes
* small linting error fixes
* small linting changes
* working through more small linting changes
* another round of linting modifications
* liniting fixes
* ember module codemod
* quinit dom codemod
* angle bracket codemod
* discovered that components must have js files
* ran all codemods this is all that's left
* small changes to fix get needs two object, should not have been using get.
* fix issue with one input in form field
* fun times with set and onChange from oninput
* fix issue with model not being passed through on secret-edit-display
* fix issue with yarn run test not working, revert without npm run all
* linting and small fix when loading without a selectAuthBackend
* fix failing test with ui-wizard issue
* fix test failure due to model not being asked for correctly with new changes, probably run into this more.
* fix issue with component helper and at props specific to wizard
* rename log to clilog due to conflict with new eslint rule
* small changes for test failures
* component helper at fixes
* Revert to old component style something with new one broke this and can't figure it out for now
* small fishy smelling test fixes will revisit
* small test changes
* more small test changes, appears upgrade treats spaces differently
* comment out code and test that no longer seems relevant but confirm
* clean run on component test though still some potential timing issues on ui-console test
* fixing one auth test issue and timing issue on enable-test
* small mods
* fix this conditional check from upgrade
* linting fixes after master merge
* package updates using yarn upgrade-interactive
* update libraries that did not effect any of the test failures.
* update ember truth helpers library
* settling tests
* Fix ui-panel control group output
* fix features selection test failures
* Fix auth tests (x-vault-token)
* fix shared test
* fix issue with data null on backend
* Revert "Fix auth tests (x-vault-token)"
This reverts commit 89cb174b2f1998efa56d9604d14131415ae65d6f.
* Fix auth tests (x-vault-token) without updating this.set
* Update redirect-to tests
* fix wrapped token test
* skip some flaky test
* fix issue with href and a tags vs buttons
* fix linting
* updates to get tests running (#10409)
* yarn isntall
* increasing resource_class
* whoops
* trying large
* back to xlarge
* Fix param issue on transform item routes
* test fixes
* settle on policies (old) test
* fix browserstack test warning and skips of test confirmed worked
* Fix redirect-to test
* skips
* fix transformation test and skip some kmip
* Skip tests
* Add meep marker to remaining failing tests
* Skip test with failing component
* rever skip on secret-create test
* Skip piece of test that fails due to navigation-input
* fix settings test where can and skip in others after confirming
* fix circle ci test failures
* ssh role settle
* Fix navigate-input and add settled to test
* Remove extra import
* secret cubbyhole and alicloud
* Add settled to gcpkms test
* settles on redirect to test
* Bump browserstack test resource to large
* Update browserstack resource size to xlarge
* update todos
* add back in withTestWaiter
* try and fix credentials conditional action added comment instead
* Update volatile computed properies to get functions
* this step was never reached and we never defined secretType anywhere so I removed
* add settled to policy old test
* Fix navigate-input on policies and leases
* replace ssh test with no var hoping that helps and add settled to other failing tests, unskip console tests
* kmip, transit, role test remove a skip and add in settled
* fix hover copy button, had to remove some testing functionality
* Remove private router service
* remove skip on control ssh and ui panel, fix search select by restructuring how to read the error
* final bit of working through skipped test
* Replace clearNonGlobalModels by linking directly to namespace with href-to
* Remove unused var
* Fix role-ssh id bug by updating form-field-from-model to form-field-group-loop
* Fix transit create id would not update
* Update option toggle selector for ssh-role
* Fix ssh selector
* cleanup pt1
* small clean up
* cleanup part2
* Fix computed on pricing-metrics-form
* small cleanup based on chelseas comments.
Co-authored-by: Chelsea Shaw <chelshaw.dev@gmail.com>
Co-authored-by: Sarah Thompson <sthompson@hashicorp.com>
2020-12-03 23:00:22 +00:00
|
|
|
import AdapterError from '@ember-data/adapter/error';
|
|
|
|
import RESTAdapter from '@ember-data/adapter/rest';
|
2018-09-25 16:28:26 +00:00
|
|
|
import { inject as service } from '@ember/service';
|
|
|
|
import { assign } from '@ember/polyfills';
|
|
|
|
import { set } from '@ember/object';
|
|
|
|
import RSVP from 'rsvp';
|
2018-08-16 17:48:24 +00:00
|
|
|
import config from '../config/environment';
|
2021-11-17 17:30:59 +00:00
|
|
|
import fetch from 'fetch';
|
2018-04-03 14:16:57 +00:00
|
|
|
|
2018-08-16 17:48:24 +00:00
|
|
|
const { APP } = config;
|
|
|
|
const { POLLING_URLS, NAMESPACE_ROOT_URLS } = APP;
|
2018-04-03 14:16:57 +00:00
|
|
|
|
Ember-cli upgrade from ~3.8 to ~3.20 (#9972)
* Update ember-cli to ~3.20
* Remove bad optional-feature
* Remove ember-fetch dep
* re-install ember-fetch
* update model fragments pr
* update ember model fragments correct package name
* update ember composable helpers to solve array helper error
* update ember-concurrency
* add back engine dependencies, automatically removed during ember-cli-upgrade
* make author-form-options component js file otherwise error
* for now comment out withTestWaiter
* add eslint-node and fix if not with unless in templates
* fix linting for tab index of false is now -1 and add type button to all buttons without types
* fix href errors for linting, likely have to come back and fix
* using eslint fix flag to fix all this.gets
* ember modules codemode removed files that had module twice, will fix in next commit
* finish codemode ember-data-codemod needed to rename const model
* more this.get removal codemode did not work
* cont. removal of this.get
* stop mixin rules until figure out how to reconfig them all
* smaller eslint ignores
* get codemode
* testing app small fixes to bring it back after all the changes
* small changes to eslint
* test removal of getProperties
* fix issue with baseKey because value could be unknown needed to add a question mark in nested get
* smaller linting fixes
* get nested fixes
* small linting error fixes
* small linting changes
* working through more small linting changes
* another round of linting modifications
* liniting fixes
* ember module codemod
* quinit dom codemod
* angle bracket codemod
* discovered that components must have js files
* ran all codemods this is all that's left
* small changes to fix get needs two object, should not have been using get.
* fix issue with one input in form field
* fun times with set and onChange from oninput
* fix issue with model not being passed through on secret-edit-display
* fix issue with yarn run test not working, revert without npm run all
* linting and small fix when loading without a selectAuthBackend
* fix failing test with ui-wizard issue
* fix test failure due to model not being asked for correctly with new changes, probably run into this more.
* fix issue with component helper and at props specific to wizard
* rename log to clilog due to conflict with new eslint rule
* small changes for test failures
* component helper at fixes
* Revert to old component style something with new one broke this and can't figure it out for now
* small fishy smelling test fixes will revisit
* small test changes
* more small test changes, appears upgrade treats spaces differently
* comment out code and test that no longer seems relevant but confirm
* clean run on component test though still some potential timing issues on ui-console test
* fixing one auth test issue and timing issue on enable-test
* small mods
* fix this conditional check from upgrade
* linting fixes after master merge
* package updates using yarn upgrade-interactive
* update libraries that did not effect any of the test failures.
* update ember truth helpers library
* settling tests
* Fix ui-panel control group output
* fix features selection test failures
* Fix auth tests (x-vault-token)
* fix shared test
* fix issue with data null on backend
* Revert "Fix auth tests (x-vault-token)"
This reverts commit 89cb174b2f1998efa56d9604d14131415ae65d6f.
* Fix auth tests (x-vault-token) without updating this.set
* Update redirect-to tests
* fix wrapped token test
* skip some flaky test
* fix issue with href and a tags vs buttons
* fix linting
* updates to get tests running (#10409)
* yarn isntall
* increasing resource_class
* whoops
* trying large
* back to xlarge
* Fix param issue on transform item routes
* test fixes
* settle on policies (old) test
* fix browserstack test warning and skips of test confirmed worked
* Fix redirect-to test
* skips
* fix transformation test and skip some kmip
* Skip tests
* Add meep marker to remaining failing tests
* Skip test with failing component
* rever skip on secret-create test
* Skip piece of test that fails due to navigation-input
* fix settings test where can and skip in others after confirming
* fix circle ci test failures
* ssh role settle
* Fix navigate-input and add settled to test
* Remove extra import
* secret cubbyhole and alicloud
* Add settled to gcpkms test
* settles on redirect to test
* Bump browserstack test resource to large
* Update browserstack resource size to xlarge
* update todos
* add back in withTestWaiter
* try and fix credentials conditional action added comment instead
* Update volatile computed properies to get functions
* this step was never reached and we never defined secretType anywhere so I removed
* add settled to policy old test
* Fix navigate-input on policies and leases
* replace ssh test with no var hoping that helps and add settled to other failing tests, unskip console tests
* kmip, transit, role test remove a skip and add in settled
* fix hover copy button, had to remove some testing functionality
* Remove private router service
* remove skip on control ssh and ui panel, fix search select by restructuring how to read the error
* final bit of working through skipped test
* Replace clearNonGlobalModels by linking directly to namespace with href-to
* Remove unused var
* Fix role-ssh id bug by updating form-field-from-model to form-field-group-loop
* Fix transit create id would not update
* Update option toggle selector for ssh-role
* Fix ssh selector
* cleanup pt1
* small clean up
* cleanup part2
* Fix computed on pricing-metrics-form
* small cleanup based on chelseas comments.
Co-authored-by: Chelsea Shaw <chelshaw.dev@gmail.com>
Co-authored-by: Sarah Thompson <sthompson@hashicorp.com>
2020-12-03 23:00:22 +00:00
|
|
|
export default RESTAdapter.extend({
|
2018-09-25 16:28:26 +00:00
|
|
|
auth: service(),
|
|
|
|
namespaceService: service('namespace'),
|
|
|
|
controlGroup: service(),
|
2018-04-03 14:16:57 +00:00
|
|
|
|
2018-09-25 16:28:26 +00:00
|
|
|
flashMessages: service(),
|
2018-04-03 14:16:57 +00:00
|
|
|
|
|
|
|
namespace: 'v1/sys',
|
|
|
|
|
|
|
|
shouldReloadAll() {
|
|
|
|
return true;
|
|
|
|
},
|
|
|
|
|
|
|
|
shouldReloadRecord() {
|
|
|
|
return true;
|
|
|
|
},
|
|
|
|
|
|
|
|
shouldBackgroundReloadRecord() {
|
|
|
|
return false;
|
|
|
|
},
|
|
|
|
|
2018-08-16 17:48:24 +00:00
|
|
|
addHeaders(url, options) {
|
2022-11-09 23:15:31 +00:00
|
|
|
const token = options.clientToken || this.auth.currentToken;
|
|
|
|
const headers = {};
|
2018-04-03 14:16:57 +00:00
|
|
|
if (token && !options.unauthenticated) {
|
2018-08-16 17:48:24 +00:00
|
|
|
headers['X-Vault-Token'] = token;
|
2019-02-14 15:39:19 +00:00
|
|
|
}
|
|
|
|
if (options.wrapTTL) {
|
|
|
|
headers['X-Vault-Wrap-TTL'] = options.wrapTTL;
|
2018-04-03 14:16:57 +00:00
|
|
|
}
|
2022-11-09 23:15:31 +00:00
|
|
|
const namespace =
|
|
|
|
typeof options.namespace === 'undefined' ? this.namespaceService.path : options.namespace;
|
2021-12-17 03:44:29 +00:00
|
|
|
if (namespace && !NAMESPACE_ROOT_URLS.some((str) => url.includes(str))) {
|
2018-08-16 17:48:24 +00:00
|
|
|
headers['X-Vault-Namespace'] = namespace;
|
|
|
|
}
|
|
|
|
options.headers = assign(options.headers || {}, headers);
|
|
|
|
},
|
|
|
|
|
|
|
|
_preRequest(url, options) {
|
|
|
|
this.addHeaders(url, options);
|
2021-12-17 03:44:29 +00:00
|
|
|
const isPolling = POLLING_URLS.some((str) => url.includes(str));
|
2018-04-03 14:16:57 +00:00
|
|
|
if (!isPolling) {
|
2018-11-05 16:56:59 +00:00
|
|
|
this.auth.setLastFetch(Date.now());
|
2018-04-03 14:16:57 +00:00
|
|
|
}
|
|
|
|
options.timeout = 60000;
|
|
|
|
return options;
|
|
|
|
},
|
|
|
|
|
2018-07-19 01:59:04 +00:00
|
|
|
ajax(intendedUrl, method, passedOptions = {}) {
|
|
|
|
let url = intendedUrl;
|
|
|
|
let type = method;
|
|
|
|
let options = passedOptions;
|
2022-11-09 23:15:31 +00:00
|
|
|
const controlGroup = this.controlGroup;
|
|
|
|
const controlGroupToken = controlGroup.tokenForUrl(url);
|
2019-03-29 23:40:12 +00:00
|
|
|
// if we have a Control Group token that matches the intendedUrl,
|
2018-07-19 01:59:04 +00:00
|
|
|
// then we want to unwrap it and return the unwrapped response as
|
|
|
|
// if it were the initial request
|
|
|
|
// To do this, we rewrite the function args
|
|
|
|
if (controlGroupToken) {
|
|
|
|
url = '/v1/sys/wrapping/unwrap';
|
|
|
|
type = 'POST';
|
|
|
|
options = {
|
|
|
|
clientToken: controlGroupToken.token,
|
|
|
|
data: {
|
|
|
|
token: controlGroupToken.token,
|
|
|
|
},
|
|
|
|
};
|
|
|
|
}
|
2022-11-09 23:15:31 +00:00
|
|
|
const opts = this._preRequest(url, options);
|
2018-04-03 14:16:57 +00:00
|
|
|
|
|
|
|
return this._super(url, type, opts).then((...args) => {
|
2018-07-19 01:59:04 +00:00
|
|
|
if (controlGroupToken) {
|
|
|
|
controlGroup.deleteControlGroupToken(controlGroupToken.accessor);
|
|
|
|
}
|
2018-04-03 14:16:57 +00:00
|
|
|
const [resp] = args;
|
|
|
|
if (resp && resp.warnings) {
|
2022-11-09 23:15:31 +00:00
|
|
|
const flash = this.flashMessages;
|
2021-12-17 03:44:29 +00:00
|
|
|
resp.warnings.forEach((message) => {
|
2018-04-03 14:16:57 +00:00
|
|
|
flash.info(message);
|
|
|
|
});
|
|
|
|
}
|
2018-07-19 01:59:04 +00:00
|
|
|
return controlGroup.checkForControlGroup(args, resp, options.wrapTTL);
|
2018-04-03 14:16:57 +00:00
|
|
|
});
|
|
|
|
},
|
|
|
|
|
|
|
|
// for use on endpoints that don't return JSON responses
|
|
|
|
rawRequest(url, type, options = {}) {
|
2022-11-09 23:15:31 +00:00
|
|
|
const opts = this._preRequest(url, options);
|
2018-04-03 14:16:57 +00:00
|
|
|
return fetch(url, {
|
2018-08-16 17:48:24 +00:00
|
|
|
method: type || 'GET',
|
|
|
|
headers: opts.headers || {},
|
2019-10-14 18:23:29 +00:00
|
|
|
body: opts.body,
|
|
|
|
signal: opts.signal,
|
2021-12-17 03:44:29 +00:00
|
|
|
}).then((response) => {
|
2018-04-03 14:16:57 +00:00
|
|
|
if (response.status >= 200 && response.status < 300) {
|
2018-07-19 01:59:04 +00:00
|
|
|
return RSVP.resolve(response);
|
2018-04-03 14:16:57 +00:00
|
|
|
} else {
|
2019-10-14 18:23:29 +00:00
|
|
|
return RSVP.reject(response);
|
2018-04-03 14:16:57 +00:00
|
|
|
}
|
|
|
|
});
|
|
|
|
},
|
|
|
|
|
|
|
|
handleResponse(status, headers, payload, requestData) {
|
|
|
|
const returnVal = this._super(...arguments);
|
|
|
|
// ember data errors don't have the status code, so we add it here
|
Ember-cli upgrade from ~3.8 to ~3.20 (#9972)
* Update ember-cli to ~3.20
* Remove bad optional-feature
* Remove ember-fetch dep
* re-install ember-fetch
* update model fragments pr
* update ember model fragments correct package name
* update ember composable helpers to solve array helper error
* update ember-concurrency
* add back engine dependencies, automatically removed during ember-cli-upgrade
* make author-form-options component js file otherwise error
* for now comment out withTestWaiter
* add eslint-node and fix if not with unless in templates
* fix linting for tab index of false is now -1 and add type button to all buttons without types
* fix href errors for linting, likely have to come back and fix
* using eslint fix flag to fix all this.gets
* ember modules codemode removed files that had module twice, will fix in next commit
* finish codemode ember-data-codemod needed to rename const model
* more this.get removal codemode did not work
* cont. removal of this.get
* stop mixin rules until figure out how to reconfig them all
* smaller eslint ignores
* get codemode
* testing app small fixes to bring it back after all the changes
* small changes to eslint
* test removal of getProperties
* fix issue with baseKey because value could be unknown needed to add a question mark in nested get
* smaller linting fixes
* get nested fixes
* small linting error fixes
* small linting changes
* working through more small linting changes
* another round of linting modifications
* liniting fixes
* ember module codemod
* quinit dom codemod
* angle bracket codemod
* discovered that components must have js files
* ran all codemods this is all that's left
* small changes to fix get needs two object, should not have been using get.
* fix issue with one input in form field
* fun times with set and onChange from oninput
* fix issue with model not being passed through on secret-edit-display
* fix issue with yarn run test not working, revert without npm run all
* linting and small fix when loading without a selectAuthBackend
* fix failing test with ui-wizard issue
* fix test failure due to model not being asked for correctly with new changes, probably run into this more.
* fix issue with component helper and at props specific to wizard
* rename log to clilog due to conflict with new eslint rule
* small changes for test failures
* component helper at fixes
* Revert to old component style something with new one broke this and can't figure it out for now
* small fishy smelling test fixes will revisit
* small test changes
* more small test changes, appears upgrade treats spaces differently
* comment out code and test that no longer seems relevant but confirm
* clean run on component test though still some potential timing issues on ui-console test
* fixing one auth test issue and timing issue on enable-test
* small mods
* fix this conditional check from upgrade
* linting fixes after master merge
* package updates using yarn upgrade-interactive
* update libraries that did not effect any of the test failures.
* update ember truth helpers library
* settling tests
* Fix ui-panel control group output
* fix features selection test failures
* Fix auth tests (x-vault-token)
* fix shared test
* fix issue with data null on backend
* Revert "Fix auth tests (x-vault-token)"
This reverts commit 89cb174b2f1998efa56d9604d14131415ae65d6f.
* Fix auth tests (x-vault-token) without updating this.set
* Update redirect-to tests
* fix wrapped token test
* skip some flaky test
* fix issue with href and a tags vs buttons
* fix linting
* updates to get tests running (#10409)
* yarn isntall
* increasing resource_class
* whoops
* trying large
* back to xlarge
* Fix param issue on transform item routes
* test fixes
* settle on policies (old) test
* fix browserstack test warning and skips of test confirmed worked
* Fix redirect-to test
* skips
* fix transformation test and skip some kmip
* Skip tests
* Add meep marker to remaining failing tests
* Skip test with failing component
* rever skip on secret-create test
* Skip piece of test that fails due to navigation-input
* fix settings test where can and skip in others after confirming
* fix circle ci test failures
* ssh role settle
* Fix navigate-input and add settled to test
* Remove extra import
* secret cubbyhole and alicloud
* Add settled to gcpkms test
* settles on redirect to test
* Bump browserstack test resource to large
* Update browserstack resource size to xlarge
* update todos
* add back in withTestWaiter
* try and fix credentials conditional action added comment instead
* Update volatile computed properies to get functions
* this step was never reached and we never defined secretType anywhere so I removed
* add settled to policy old test
* Fix navigate-input on policies and leases
* replace ssh test with no var hoping that helps and add settled to other failing tests, unskip console tests
* kmip, transit, role test remove a skip and add in settled
* fix hover copy button, had to remove some testing functionality
* Remove private router service
* remove skip on control ssh and ui panel, fix search select by restructuring how to read the error
* final bit of working through skipped test
* Replace clearNonGlobalModels by linking directly to namespace with href-to
* Remove unused var
* Fix role-ssh id bug by updating form-field-from-model to form-field-group-loop
* Fix transit create id would not update
* Update option toggle selector for ssh-role
* Fix ssh selector
* cleanup pt1
* small clean up
* cleanup part2
* Fix computed on pricing-metrics-form
* small cleanup based on chelseas comments.
Co-authored-by: Chelsea Shaw <chelshaw.dev@gmail.com>
Co-authored-by: Sarah Thompson <sthompson@hashicorp.com>
2020-12-03 23:00:22 +00:00
|
|
|
if (returnVal instanceof AdapterError) {
|
2018-07-19 01:59:04 +00:00
|
|
|
set(returnVal, 'httpStatus', status);
|
|
|
|
set(returnVal, 'path', requestData.url);
|
2018-04-03 14:16:57 +00:00
|
|
|
}
|
|
|
|
return returnVal;
|
|
|
|
},
|
|
|
|
});
|