Ember-cli upgrade from ~3.8 to ~3.20

.circleci/config/jobs/test-ui-browserstack.yml

@@ -1,5 +1,5 @@
 executor: node
-resource_class: medium+
+resource_class: xlarge
 steps:
   - checkout
   - restore_yarn_cache

.circleci/config/jobs/test-ui.yml

@@ -1,5 +1,5 @@
 executor: node
-resource_class: medium+
+resource_class: xlarge
 steps:
   - checkout
   - restore_yarn_cache

ui/.editorconfig

@@ -4,7 +4,6 @@
 
 root = true
 
-
 [*]
 end_of_line = lf
 charset = utf-8

ui/.eslintrc.js

@@ -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'],
@@ -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
@@ -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',
+      },
     },
   ],
 };

ui/MODULE_REPORT.md

@@ -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();
+  });
+```

ui/app/adapters/application.js

@@ -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(),
@@ -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;
     }
@@ -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
@@ -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);
         });
@@ -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);
     }

ui/app/adapters/auth-config/_base.js

@@ -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)}`;