Skip to content

Commit

Permalink
Ember-cli upgrade from ~3.8 to ~3.20 (hashicorp#9972)
Browse files Browse the repository at this point in the history
* 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 89cb174.

* 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 (hashicorp#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 <[email protected]>
Co-authored-by: Sarah Thompson <[email protected]>
  • Loading branch information
3 people authored Dec 3, 2020
1 parent 0e82a4f commit 403b94e
Show file tree
Hide file tree
Showing 584 changed files with 6,271 additions and 5,111 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .circleci/config/jobs/test-ui-browserstack.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
executor: node
resource_class: medium+
resource_class: xlarge
steps:
- checkout
- restore_yarn_cache
Expand Down
2 changes: 1 addition & 1 deletion .circleci/config/jobs/test-ui.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
executor: node
resource_class: medium+
resource_class: xlarge
steps:
- checkout
- restore_yarn_cache
Expand Down
1 change: 0 additions & 1 deletion ui/.editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

root = true


[*]
end_of_line = lf
charset = utf-8
Expand Down
25 changes: 17 additions & 8 deletions ui/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
// env: node
/* eslint-disable no-undef */

'use strict';

module.exports = {
parser: 'babel-eslint',
root: true,
parserOptions: {
ecmaVersion: 2018,
sourceType: 'module',
ecmaFeatures: {
legacyDecorators: true,
},
},
plugins: ['ember', 'prettier'],
extends: ['eslint:recommended', 'plugin:ember/recommended', 'prettier'],
Expand All @@ -13,13 +19,9 @@ module.exports = {
es6: true,
},
rules: {
'no-unused-vars': ['error', { ignoreRestSiblings: true }],
'prettier/prettier': 'error',
'ember/no-jquery': 'error',
},
globals: {
TextEncoderLite: true,
TextDecoderLite: true,
// TODO revisit once figure out how to replace, added during upgrade to 3.20
'ember/no-new-mixins': 'off',
'ember/no-mixins': 'off',
},
overrides: [
// node files
Expand All @@ -41,6 +43,13 @@ module.exports = {
browser: false,
node: true,
},
plugins: ['node'],
extends: ['plugin:node/recommended'],
rules: {
// this can be removed once the following is fixed
// https://github.com/mysticatea/eslint-plugin-node/issues/77
'node/no-unpublished-require': 'off',
},
},
],
};
224 changes: 224 additions & 0 deletions ui/MODULE_REPORT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,224 @@
## Module Report
### Unknown Global

**Global**: `Ember.testing`

**Location**: `app/components/auth-jwt.js` at line 9

```js

/* eslint-disable ember/no-ember-testing-in-module-scope */
const WAIT_TIME = Ember.testing ? 0 : 500;
const ERROR_WINDOW_CLOSED =
'The provider window was closed before authentication was complete. Please click Sign In to try again.';
```

### Unknown Global

**Global**: `Ember.testing`

**Location**: `app/components/auth-jwt.js` at line 117

```js
exchangeOIDC: task(function*(event, oidcWindow) {
// in non-incognito mode we need to use a timeout because it takes time before oidcState is written to local storage.
let oidcState = Ember.testing
? event.storageArea.getItem('oidcState')
: (yield timeout(1000).then(() => event.storageArea.getItem('oidcState')));
```
### Unknown Global
**Global**: `Ember.testing`
**Location**: `app/routes/vault.js` at line 7
```js
import Ember from 'ember';
/* eslint-disable ember/no-ember-testing-in-module-scope */
const SPLASH_DELAY = Ember.testing ? 0 : 300;

export default Route.extend({
```
### Unknown Global
**Global**: `Ember.testing`
**Location**: `app/services/auth.js` at line 267
```js
checkShouldRenew: task(function*() {
while (true) {
if (Ember.testing) {
return;
}
```
### Unknown Global
**Global**: `Ember.testing`
**Location**: `lib/core/addon/components/ttl-form.js` at line 82
```js
this.set('time', parsedTime);
this.handleChange();
if (Ember.testing) {
return;
}
```
### Unknown Global
**Global**: `Ember.testing`
**Location**: `app/routes/vault/cluster.js` at line 78
```js
// when testing, the polling loop causes promises to never settle so acceptance tests hang
// to get around that, we just disable the poll in tests
if (Ember.testing) {
return;
}
```
### Unknown Global
**Global**: `Ember.onerror`
**Location**: `tests/helpers/wait-for-error.js` at line 5
```js

export default function waitForError(opts) {
const orig = Ember.onerror;

let error = null;
```
### Unknown Global
**Global**: `Ember.onerror`
**Location**: `tests/helpers/wait-for-error.js` at line 5
```js

export default function waitForError(opts) {
const orig = Ember.onerror;

let error = null;
```
### Unknown Global
**Global**: `Ember.onerror`
**Location**: `tests/helpers/wait-for-error.js` at line 8
```js

let error = null;
Ember.onerror = err => {
error = err;
};
```
### Unknown Global
**Global**: `Ember.onerror`
**Location**: `tests/helpers/wait-for-error.js` at line 13
```js

return waitUntil(() => error, opts).finally(() => {
Ember.onerror = orig;
});
}
```
### Unknown Global
**Global**: `Ember.Logger`
**Location**: `tests/acceptance/not-found-test.js` at line 15
```js

hooks.beforeEach(function() {
loggerError = Ember.Logger.error;
adapterException = Ember.Test.adapter.exception;
Ember.Test.adapter.exception = () => {};
```
### Unknown Global
**Global**: `Ember.Test`
**Location**: `tests/acceptance/not-found-test.js` at line 16
```js
hooks.beforeEach(function() {
loggerError = Ember.Logger.error;
adapterException = Ember.Test.adapter.exception;
Ember.Test.adapter.exception = () => {};
Ember.Logger.error = () => {};
```
### Unknown Global
**Global**: `Ember.Test`
**Location**: `tests/acceptance/not-found-test.js` at line 17
```js
loggerError = Ember.Logger.error;
adapterException = Ember.Test.adapter.exception;
Ember.Test.adapter.exception = () => {};
Ember.Logger.error = () => {};
return authPage.login();
```
### Unknown Global
**Global**: `Ember.Logger`
**Location**: `tests/acceptance/not-found-test.js` at line 18
```js
adapterException = Ember.Test.adapter.exception;
Ember.Test.adapter.exception = () => {};
Ember.Logger.error = () => {};
return authPage.login();
});
```
### Unknown Global
**Global**: `Ember.Test`
**Location**: `tests/acceptance/not-found-test.js` at line 23
```js

hooks.afterEach(function() {
Ember.Test.adapter.exception = adapterException;
Ember.Logger.error = loggerError;
return logout.visit();
```
### Unknown Global
**Global**: `Ember.Logger`
**Location**: `tests/acceptance/not-found-test.js` at line 24
```js
hooks.afterEach(function() {
Ember.Test.adapter.exception = adapterException;
Ember.Logger.error = loggerError;
return logout.visit();
});
```
18 changes: 8 additions & 10 deletions ui/app/adapters/application.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
import AdapterError from '@ember-data/adapter/error';
import RESTAdapter from '@ember-data/adapter/rest';
import { inject as service } from '@ember/service';
import { assign } from '@ember/polyfills';
import { set } from '@ember/object';
import RSVP from 'rsvp';
import DS from 'ember-data';
import AdapterFetch from 'ember-fetch/mixins/adapter-fetch';
import fetch from 'fetch';
import config from '../config/environment';

const { APP } = config;
const { POLLING_URLS, NAMESPACE_ROOT_URLS } = APP;

export default DS.RESTAdapter.extend(AdapterFetch, {
export default RESTAdapter.extend({
auth: service(),
namespaceService: service('namespace'),
controlGroup: service(),
Expand All @@ -32,16 +31,15 @@ export default DS.RESTAdapter.extend(AdapterFetch, {
},

addHeaders(url, options) {
let token = options.clientToken || this.get('auth.currentToken');
let token = options.clientToken || this.auth.currentToken;
let headers = {};
if (token && !options.unauthenticated) {
headers['X-Vault-Token'] = token;
}
if (options.wrapTTL) {
headers['X-Vault-Wrap-TTL'] = options.wrapTTL;
}
let namespace =
typeof options.namespace === 'undefined' ? this.get('namespaceService.path') : options.namespace;
let namespace = typeof options.namespace === 'undefined' ? this.namespaceService.path : options.namespace;
if (namespace && !NAMESPACE_ROOT_URLS.some(str => url.includes(str))) {
headers['X-Vault-Namespace'] = namespace;
}
Expand All @@ -62,7 +60,7 @@ export default DS.RESTAdapter.extend(AdapterFetch, {
let url = intendedUrl;
let type = method;
let options = passedOptions;
let controlGroup = this.get('controlGroup');
let controlGroup = this.controlGroup;
let controlGroupToken = controlGroup.tokenForUrl(url);
// if we have a Control Group token that matches the intendedUrl,
// then we want to unwrap it and return the unwrapped response as
Expand All @@ -86,7 +84,7 @@ export default DS.RESTAdapter.extend(AdapterFetch, {
}
const [resp] = args;
if (resp && resp.warnings) {
let flash = this.get('flashMessages');
let flash = this.flashMessages;
resp.warnings.forEach(message => {
flash.info(message);
});
Expand Down Expand Up @@ -115,7 +113,7 @@ export default DS.RESTAdapter.extend(AdapterFetch, {
handleResponse(status, headers, payload, requestData) {
const returnVal = this._super(...arguments);
// ember data errors don't have the status code, so we add it here
if (returnVal instanceof DS.AdapterError) {
if (returnVal instanceof AdapterError) {
set(returnVal, 'httpStatus', status);
set(returnVal, 'path', requestData.url);
}
Expand Down
2 changes: 1 addition & 1 deletion ui/app/adapters/auth-config/_base.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default ApplicationAdapter.extend({

buildURL(modelName, id, snapshot) {
const backendId = id ? id : snapshot.belongsTo('backend').id;
let url = `${this.get('namespace')}/${backendId}/config`;
let url = `${this.namespace}/${backendId}/config`;
// aws has a lot more config endpoints
if (modelName.includes('aws')) {
url = `${url}/${this.pathForType(modelName)}`;
Expand Down
Loading

0 comments on commit 403b94e

Please sign in to comment.