chore: bump up release version and Update change log (#1141)

* chore: 🤖 update to changelog and release version

.github/CODEOWNERS

@@ -0,0 +1,2 @@
+# Anyone attached to this rule will always been assigned to a pull request
+* @hashicorp/boundary-ui

.github/pull_request_template.md

@@ -0,0 +1,17 @@
+:tickets: [Jira ticket](https://hashicorp.atlassian.net/browse/JIRA_TICKET_NUMBER)
+
+## Description
+
+<!--
+Replace PATH_TO_FEATURE with Vercel link
+-->
+
+:technologist: [Admin preview](PATH_TO_FEATURE)
+
+:rose: [Rose preview](PATH_TO_FEATURE)
+
+:desktop_computer: [Desktop preview](PATH_TO_FEATURE)
+
+<!-- Add a brief description of changes here. Include any other necessary relevant links -->
+
+### Screenshots (if appropriate):

.github/workflows/build-admin-ui.yaml

@@ -0,0 +1,76 @@
+name: Build Admin UI
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  dependencies:
+    name: Install dependencies
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/cache@v3
+        id: node-modules-cache
+        with:
+          path: '**/node_modules'
+          key: node-modules-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            node-modules-
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '16.x'
+      - run: yarn install
+  build-admin-ui-oss:
+    name: Build Admin UI OSS
+    needs: [dependencies]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/cache@v3
+        id: node-modules-cache
+        with:
+          path: '**/node_modules'
+          key: node-modules-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            node-modules-
+      - name: Build
+        uses: actions/setup-node@v3
+        with:
+          node-version: '16.x'
+        if: steps.node-modules-cache.outputs.cache-hit != 'true'
+      - run: yarn run build:ui:admin:oss
+      - name: Upload artifact admin-ui
+        uses: actions/upload-artifact@v3
+        with:
+          name: admin-ui
+          path: ./ui/admin/dist/
+      - name: Upload artifact Admin UI OSS
+        uses: actions/upload-artifact@v3
+        with:
+          name: admin-ui-oss
+          path: ./ui/admin/dist/
+  build-admin-ui-enterprise:
+    name: Build Admin UI Enterprise
+    needs: [dependencies]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/cache@v3
+        id: node-modules-cache
+        with:
+          path: '**/node_modules'
+          key: node-modules-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            node-modules-
+      - name: Build
+        uses: actions/setup-node@v3
+        with:
+          node-version: '16.x'
+        if: steps.node-modules-cache.outputs.cache-hit != 'true'
+      - run: yarn run build:ui:admin:enterprise
+      - name: Upload artifact Admin UI Enterprise
+        uses: actions/upload-artifact@v3
+        with:
+          name: admin-ui-ent
+          path: ./ui/admin/dist/

.github/workflows/monorepo-validate.yaml

@@ -2,55 +2,76 @@ name: Validate Monorepo
 on: pull_request
 jobs:
 
-  compliance:
-    name: License Compliance
+  dependencies:
+    name: Install dependencies
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
-        id: cache
+      - uses: actions/checkout@v3
+      - uses: actions/cache@v3
+        id: node-modules-cache
         with:
           path: '**/node_modules'
-          key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
-      - uses: actions/setup-node@v1
+          key: node-modules-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            node-modules-
+      - uses: actions/setup-node@v3
         with:
-          node-version: '12.x'
+          node-version: '16.x'
       - run: yarn install
-        if: steps.cache.outputs.cache-hit != 'true'
+
+  compliance:
+    name: License Compliance
+    needs: [dependencies]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/cache@v3
+        id: node-modules-cache
+        with:
+          path: '**/node_modules'
+          key: node-modules-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            node-modules-
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '16.x'
+        if: steps.node-modules-cache.outputs.cache-hit != 'true'
       - run: yarn run compliance:licenses
 
   lint:
     name: Lint
+    needs: [dependencies, compliance]
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
-        id: cache
+      - uses: actions/checkout@v3
+      - uses: actions/cache@v3
+        id: node-modules-cache
         with:
           path: '**/node_modules'
-          key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
-      - uses: actions/setup-node@v1
+          key: node-modules-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            node-modules-
+      - uses: actions/setup-node@v3
         with:
-          node-version: '12.x'
-      - run: yarn install
-        if: steps.cache.outputs.cache-hit != 'true'
+          node-version: '16.x'
+        if: steps.node-modules-cache.outputs.cache-hit != 'true'
       - run: yarn lint
 
   test:
     name: Test
+    needs: [lint]
     runs-on: ubuntu-latest
     timeout-minutes: 15
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
-        id: cache
+      - uses: actions/checkout@v3
+      - uses: actions/cache@v3
+        id: node-modules-cache
         with:
           path: '**/node_modules'
-          key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
-      - uses: actions/setup-node@v1
+          key: node-modules-${{ hashFiles('**/yarn.lock') }}
+      - uses: actions/setup-node@v3
         with:
-          node-version: '12.x'
-      - run: yarn install
-        if: steps.cache.outputs.cache-hit != 'true'
+          node-version: '16.x'
+        if: steps.node-modules-cache.outputs.cache-hit != 'true'
       - run: yarn test

.gitignore

@@ -23,8 +23,3 @@ yarn-error.log
 storybook-static
 **/.storybook/*.html
 .watchman-cookie*
-
-# ember-try
-.node_modules.ember-try
-bower.json.ember-try
-package.json.ember-try

.release/release-metadata.hcl

@@ -0,0 +1,3 @@
+url_license = "https://github.com/hashicorp/boundary-ui/blob/main/LICENSE"
+url_project_website = "https://learn.hashicorp.com/tutorials/boundary/getting-started-desktop-app"
+url_source_repository = "https://github.com/hashicorp/boundary-ui"

README.md

@@ -38,9 +38,9 @@ You will need the following things properly installed on your computer.
 
 * [Git][git]
 * [Node.js][node]
-  * v10–v15
+  * Supported versions:`v12`, `v14` and `v16`.
   * **Apple Silicon Users**:  if you experience problems building or running
-    Boundary UIs, try Node v15.
+    Boundary UIs, try Node v14.
 * [Yarn][yarn] installed globally
 * [Google Chrome][chrome]
 * [Firefox][firefox]

addons/api/.eslintignore

@@ -15,7 +15,3 @@
 !.*
 .eslintcache
 
-# ember-try
-/.node_modules.ember-try/
-/bower.json.ember-try
-/package.json.ember-try

addons/api/.eslintrc.js

@@ -2,13 +2,16 @@
 
 module.exports = {
   root: true,
-  parser: 'babel-eslint',
+  parser: '@babel/eslint-parser',
   parserOptions: {
     ecmaVersion: 2018,
     sourceType: 'module',
-    ecmaFeatures: {
-      legacyDecorators: true,
+    // This is specific babel-config. If grows consider creating a babel config file
+    requireConfigFile: false,
+    babelOptions: {
+      plugins: [['@babel/plugin-proposal-decorators', { legacy: true }]],
     },
+    // end of babel-config
   },
   plugins: ['ember'],
   extends: [

addons/api/.npmignore

@@ -19,15 +19,9 @@
 /.travis.yml
 /.watchmanconfig
 /bower.json
-/config/ember-try.js
 /CONTRIBUTING.md
 /ember-cli-build.js
 /testem.js
 /tests/
 /yarn.lock
 .gitkeep
-
-# ember-try
-/.node_modules.ember-try/
-/bower.json.ember-try
-/package.json.ember-try

addons/api/.prettierignore

@@ -14,8 +14,3 @@
 /coverage/
 !.*
 .eslintcache
-
-# ember-try
-/.node_modules.ember-try/
-/bower.json.ember-try
-/package.json.ember-try

addons/api/README.md

@@ -47,21 +47,28 @@ List of available project commands.  `yarn run <command-name>`
 | build:development | Builds the dummy app in development mode. |
 | build | Builds the dummy app for production. |
 | lint | Runs all lint commands. |
+| lint:fix | Runs automatic lint fixes for all type of file. |
+| lint:hbs | Runs lint for `hbs` template files. |
+| lint:hbs:fix | Runs automatic lint fixes for `hbs` template files. |
 | lint:js | Lints `js` files. |
+| lint:js:fix | Runs automatic lint fixes for `js` files. |
 | format | Runs all auto-formatters. |
 | format:js | Auto-formats `js` files using Prettier. |
 | start | Runs the dummy app local server. |
 | test | Runs all tests. |
-| test:all | Runs tests across multiple Ember versions with ember-try. |
+| test:ember-compatibility | Runs tests across multiple Ember versions with ember-try. |
+| precommit | Runs all lint and format. |
 | doc:toc | Automatically generates a table of contents for this README file. |
 
 Additional commands in the monorepo package may affect this projects.
 
 ## Linting
 
+* `yarn lint:fix`
 * `yarn lint:hbs`
+* `yarn lint:hbs:fix`
 * `yarn lint:js`
-* `yarn lint:js --fix`
+* `yarn lint:js:fix`
 
 ## Formatting
 

addons/api/addon/abilities/collection.js

@@ -1,37 +0,0 @@
-import { Ability } from 'ember-can';
-
-/**
- * Generic ability provides abilities common to all models in the API.
- */
-export default class CollectionAbility extends Ability {
-  // =permissions
-
-  /**
-   * @type {boolean}
-   */
-  get canList() {
-    return this.hasAuthorizedCollectionAction('list');
-  }
-
-  /**
-   * @type {boolean}
-   */
-  get canCreate() {
-    return this.hasAuthorizedCollectionAction('create');
-  }
-
-  // =methods
-
-  /**
-   * Returns true if the given action is contained in the ability model's
-   * `authorized_collection_actions` array.
-   * @param {string} action
-   * @return {boolean}
-   */
-  hasAuthorizedCollectionAction(action) {
-    const authorized_collection_actions =
-      (this.model || {}).authorized_collection_actions || {};
-    const collection = this.collection || {};
-    return authorized_collection_actions[collection]?.includes(action);
-  }
-}

addons/api/addon/abilities/credential-store.js

@@ -0,0 +1,16 @@
+import ModelAbility from './model';
+
+/**
+ * Provides abilities for credential store.
+ */
+export default class CredentialStoreAbility extends ModelAbility {
+  // =permissions
+
+  /**
+   * Only "known" credential store types may be read.
+   * @type {boolean}
+   */
+  get canRead() {
+    return !this.model.isStatic && this.hasAuthorizedAction('read');
+  }
+}

addons/api/addon/abilities/host-catalog.js

@@ -0,0 +1,16 @@
+import ModelAbility from './model';
+
+/**
+ * Provides abilities for host catalogs.
+ */
+export default class HostCatalogAbility extends ModelAbility {
+  // =permissions
+
+  /**
+   * Only "known" host catalog types may be read.
+   * @type {boolean}
+   */
+  get canRead() {
+    return !this.model.isUnknown && this.hasAuthorizedAction('read');
+  }
+}

addons/api/addon/abilities/model.js

@@ -45,6 +45,20 @@ export default class ModelAbility extends Ability {
     return false;
   }
 
+  /**
+   * @type {boolean}
+   */
+  get canList() {
+    return this.hasAuthorizedCollectionAction('list');
+  }
+
+  /**
+   * @type {boolean}
+   */
+  get canCreate() {
+    return this.hasAuthorizedCollectionAction('create');
+  }
+
   // =methods
 
   /**
@@ -56,4 +70,17 @@ export default class ModelAbility extends Ability {
   hasAuthorizedAction(action) {
     return this.model.authorized_actions?.includes(action);
   }
+
+  /**
+   * Returns true if the given action is contained in the ability model's
+   * `authorized_collection_actions` array.
+   * @param {string} action
+   * @return {boolean}
+   */
+  hasAuthorizedCollectionAction(action) {
+    const authorized_collection_actions =
+      (this.model || {}).authorized_collection_actions || {};
+    const collection = this.collection || {};
+    return authorized_collection_actions[collection]?.includes(action);
+  }
 }

addons/api/addon/adapters/application.js

@@ -263,14 +263,36 @@ export default class ApplicationAdapter extends RESTAdapter.extend(
       source: { pointer: '/data' },
     };
     // Normalize field-specific errors, if any.
-    const errors = fieldErrors.map((error) => ({
-      detail: error.description,
-      // Ember Data cannot handle errors on nested attributes, so these are
-      // flattened (e.g. `attributes.foobar` becomes `attributes_foobar`).
-      // To capture these errors, add read-only fields on the model
-      // corresponding to the underscored field name.
-      source: { pointer: `/data/attributes/${error.name.replace('.', '_')}` },
-    }));
+    const errors = fieldErrors.flatMap((error) => {
+      const newValue = [
+        {
+          detail: error.description,
+          // Ember Data cannot handle errors on nested attributes, so these are
+          // flattened (e.g. `attributes.foobar` becomes `attributes_foobar`).
+          // To capture these errors, add read-only fields on the model
+          // corresponding to the underscored field name.
+          source: {
+            pointer: `/data/attributes/${error.name.replace('.', '_')}`,
+          },
+        },
+      ];
+      if (error.name.includes('attributes.')) {
+        newValue.push({
+          detail: error.description,
+          // Going forward, nested attributes will be hoisted.  Thus "attributes."
+          // must be stripped from the error name key.  Until all models are
+          // transitioned away from model fragments, however, both this and the
+          // prior error key mappings are necessary.
+          source: {
+            pointer: `/data/attributes/${error.name.replace(
+              'attributes.',
+              ''
+            )}`,
+          },
+        });
+      }
+      return newValue;
+    });
     // Return a list of JSON API errors rooted under the `errors` key.
     return {
       errors: [baseError, ...errors],

addons/api/addon/adapters/host-catalog.js

@@ -0,0 +1,23 @@
+import ApplicationAdapter from './application';
+
+export default class HostCatalogAdapter extends ApplicationAdapter {
+  /**
+   * Overrides the default `buildURL` such that on _create_, URLs for records of
+   * type `plugin` get an extra query parameter `?plugin_name`.  All other
+   * request types behave as normal.
+   *
+   * @override
+   * @param {string} modelName
+   * @param {string} id
+   * @return {string} url
+   * @return {string} requestType
+   */
+  buildURL(modelName, id, snapshot, requestType) {
+    let url = super.buildURL(...arguments);
+    if (requestType === 'createRecord') {
+      const pluginName = snapshot.attr('plugin')?.name;
+      if (pluginName) url = `${url}?plugin_name=${pluginName}`;
+    }
+    return url;
+  }
+}

addons/api/addon/generated/models/host-catalog.js

@@ -39,13 +39,74 @@ export default class GeneratedHostCatalogModel extends BaseModel {
   })
   disabled;
 
-  @attr({
-    description: 'Attributes specific to the catalog type',
-  })
-  attributes;
-
   @attr('number', {
     description: 'Current version number of this resource.',
   })
   version;
+
+  @attr({
+    description: 'Plugin information for this resource.',
+    readOnly: true,
+  })
+  plugin;
+
+  // AWS & Azure
+
+  @attr('boolean', {
+    isNestedAttribute: true,
+    description: '',
+  })
+  disable_credential_rotation;
+
+  // AWS specific
+
+  @attr('string', {
+    isNestedAttribute: true,
+    description: '',
+  })
+  region;
+
+  @attr('string', {
+    isNestedSecret: true,
+    description: '',
+  })
+  access_key_id;
+
+  @attr('string', {
+    isNestedSecret: true,
+    description: '',
+  })
+  secret_access_key;
+
+  // Azure specific
+
+  @attr('string', {
+    isNestedAttribute: true,
+    description: '',
+  })
+  tenant_id;
+
+  @attr('string', {
+    isNestedAttribute: true,
+    description: '',
+  })
+  client_id;
+
+  @attr('string', {
+    isNestedAttribute: true,
+    description: '',
+  })
+  subscription_id;
+
+  @attr('string', {
+    isNestedSecret: true,
+    description: '',
+  })
+  secret_id;
+
+  @attr('string', {
+    isNestedSecret: true,
+    description: '',
+  })
+  secret_value;
 }

addons/api/addon/generated/models/host-set.js

@@ -50,4 +50,23 @@ export default class GeneratedHostSetModel extends BaseModel {
     readOnly: true,
   })
   size;
+
+  @attr({
+    description: 'Plugin information for this resource',
+    readOnly: true,
+  })
+  plugin;
+
+  @attr('number', {
+    description:
+      "The number of seconds between the time boundary syncs the hosts in this set using this host set's plugin. If not provided a system determined default is used",
+  })
+  sync_interval_seconds;
+
+  // Azure specific
+  @attr('string', {
+    description: '',
+    isNestedAttribute: true,
+  })
+  filter;
 }

addons/api/addon/generated/models/host.js

@@ -43,4 +43,10 @@ export default class GeneratedHostModel extends BaseModel {
     description: 'Current version number of this resource.',
   })
   version;
+
+  @attr({
+    description: 'Plugin information for this resource.',
+    readOnly: true,
+  })
+  plugin;
 }

addons/api/addon/generated/models/target.js

@@ -34,6 +34,12 @@ export default class GeneratedTargetModel extends BaseModel {
   })
   session_connection_limit;
 
+  @attr('string', {
+    description:
+      'Optional boolean expression to filter the workers that are allowed to satisfy this request.',
+  })
+  worker_filter;
+
   @attr('date', {
     description: 'The time this resource was created\nOutput only.',
     readOnly: true,

addons/api/addon/models/auth-method.js

@@ -61,6 +61,8 @@ export default class AuthMethodModel extends GeneratedAuthMethodModel {
    */
   @equal('is_primary', true) isPrimary;
 
+  options = options;
+
   /**
    * @type {boolean}
    */

addons/api/addon/models/credential-store.js

@@ -31,4 +31,9 @@ export default class CredentialStoreModel extends GeneratedCredentialStoreModel
    * @type {boolean}
    */
   @equal('type', 'vault') isVault;
+
+  /**
+   * @type {boolean}
+   */
+  @equal('type', 'static') isStatic;
 }

addons/api/addon/models/fragment-host-attributes.js

@@ -1,9 +0,0 @@
-import Fragment from 'ember-data-model-fragments/fragment';
-import { attr } from '@ember-data/model';
-
-export default class FragmentHostAttributesModel extends Fragment {
-  @attr('string', {
-    description: 'The address (DNS or IP name) used to reach the host',
-  })
-  address;
-}

addons/api/addon/models/fragment-target-attributes.js

@@ -1,9 +0,0 @@
-import Fragment from 'ember-data-model-fragments/fragment';
-import { attr } from '@ember-data/model';
-
-export default class FragmentTargetAttributesModel extends Fragment {
-  @attr('number', {
-    description: 'The  default port a target should use if present.',
-  })
-  default_port;
-}

addons/api/addon/models/host-catalog.js

@@ -1,10 +1,71 @@
 import GeneratedHostCatalogModel from '../generated/models/host-catalog';
 
+export const types = ['aws', 'azure'];
+
 export default class HostCatalogModel extends GeneratedHostCatalogModel {
+  // =attributes
+
   /**
+   * True if the host catalog is static.
    * @type {boolean}
    */
   get isStatic() {
     return this.type === 'static';
   }
+
+  /**
+   * True if the host catalog is a plugin.
+   * @type {boolean}
+   */
+  get isPlugin() {
+    return this.type === 'plugin';
+  }
+
+  /**
+   * True if the host catalog is an unknown type.
+   * @type {boolean}
+   */
+  get isUnknown() {
+    return this.isPlugin && !types.includes(this.plugin?.name);
+  }
+
+  /**
+   * True if host catalog plugin type is AWS.
+   * @type {boolean}
+   */
+  get isAWS() {
+    return this.compositeType === 'aws';
+  }
+
+  /**
+   * True if host catalog plugin type is Azure.
+   * @type {boolean}
+   */
+  get isAzure() {
+    return this.compositeType === 'azure';
+  }
+
+  /**
+   * If host catalog is a plugin return `plugin.name`,
+   * otherwise return the host catalog type.
+   * @type {string}
+   */
+  get compositeType() {
+    if (this.isUnknown) return 'unknown';
+    if (this.isPlugin) return this.plugin.name;
+    return 'static';
+  }
+
+  /**
+   * Sets `type`.  If type is different than `static`, sets `type` to `plugin`
+   * and `plugin.name` to the specified type.
+   */
+  set compositeType(type) {
+    if (type === 'static') {
+      this.type = 'static';
+    } else {
+      this.type = 'plugin';
+      this.plugin = { name: type };
+    }
+  }
 }

addons/api/addon/models/host-set.js

@@ -1,9 +1,72 @@
 import GeneratedHostSetModel from '../generated/models/host-set';
 import { fragmentArray } from 'ember-data-model-fragments/attributes';
+import { types } from './host-catalog';
 
 export default class HostSetModel extends GeneratedHostSetModel {
   // =attributes
 
+  /**
+   * Returns if the host-set is static or not.
+   * @type {boolean}
+   */
+  get isStatic() {
+    return this.type === 'static';
+  }
+
+  /**
+   * Returns if the host-set is plugin or not.
+   * @type {boolean}
+   */
+  get isPlugin() {
+    return this.type === 'plugin';
+  }
+
+  /**
+   * True if the host set is an unknown type.
+   * @type {boolean}
+   */
+  get isUnknown() {
+    return this.isPlugin && !types.includes(this.plugin?.name);
+  }
+
+  /**
+   * Returns if a host-set plugin is AWS or not
+   * @type {boolean}
+   */
+  get isAWS() {
+    return this.compositeType === 'aws';
+  }
+
+  /**
+   * Return if a host-set plugin is Azure or not.
+   */
+  get isAzure() {
+    return this.compositeType === 'azure';
+  }
+
+  /**
+   * If a host-set is a plugin return its name,
+   * otherwise returns the host-set type
+   * @type {string}
+   */
+  get compositeType() {
+    if (this.isUnknown) return 'unknown';
+    if (this.isPlugin) return this.plugin.name;
+    return 'static';
+  }
+
+  /**
+   * Sets type, if type is different than static, set plugin name to type
+   */
+  set compositeType(type) {
+    if (type === 'static') {
+      this.type = 'static';
+    } else {
+      this.type = 'plugin';
+      this.plugin = { name: type };
+    }
+  }
+
   /**
    * Host IDs are read-only under normal circumstances.  But these can
    * be persisted via a dedicated call to `addHosts()`.
@@ -14,6 +77,18 @@ export default class HostSetModel extends GeneratedHostSetModel {
   })
   host_ids;
 
+  @fragmentArray('fragment-string', {
+    emptyArrayIfMissing: true,
+  })
+  preferred_endpoints;
+
+  // AWS specific
+  @fragmentArray('fragment-string', {
+    emptyArrayIfMissing: true,
+    isNestedAttribute: true,
+  })
+  filters;
+
   // =methods
 
   /**

addons/api/addon/models/host.js

@@ -1,10 +1,87 @@
 import GeneratedHostModel from '../generated/models/host';
-import { fragment } from 'ember-data-model-fragments/attributes';
+import { attr } from '@ember-data/model';
 
 export default class HostModel extends GeneratedHostModel {
+  // =attributes
+
+  // Static specific fields
+  @attr('string', {
+    description: 'The address (DNS or IP name) used to reach the host',
+    isNestedAttribute: true,
+  })
+  address;
+
+  // Plugin specific fields
+  @attr({
+    readOnly: true,
+    emptyArrayIfMissing: true,
+  })
+  ip_addresses;
+
+  @attr('string', {
+    description: '',
+    readOnly: true,
+  })
+  external_id;
+
+  // Aws specific
+  @attr({
+    readOnly: true,
+    emptyArrayIfMissing: true,
+  })
+  dns_names;
+
   /**
-   * Attributes of this resource, if any, represented as a JSON fragment.
-   * @type {FragmentHostAttributesModel}
+   * True if the host is static.
+   * @type {boolean}
    */
-  @fragment('fragment-host-attributes', { defaultValue: {} }) attributes;
+  get isStatic() {
+    return this.type === 'static';
+  }
+
+  /**
+   * True if the host is plugin.
+   * @type {boolean}
+   */
+  get isPlugin() {
+    return this.type === 'plugin';
+  }
+
+  /**
+   * True if the host plugin type is AWS.
+   * @type {boolean}
+   */
+  get isAWS() {
+    return this.compositeType === 'aws';
+  }
+
+  /**
+   * True if the host plugin type is Azure.
+   * @type {boolean}
+   */
+  get isAzure() {
+    return this.compositeType === 'azure';
+  }
+
+  /**
+   * If host is a plugin return `plugin.name`,
+   * otherwise return the host type.
+   * @type {string}
+   */
+  get compositeType() {
+    return this.isPlugin ? this.plugin.name : this.type;
+  }
+
+  /**
+   * Sets `type`. If type is different than `static`, sets `type` to `plugin`
+   * and `plugin.name` to the specified type.
+   */
+  set compositeType(type) {
+    if (type === 'static') {
+      this.type = 'static';
+    } else {
+      this.type = 'plugin';
+      this.plugin = { name: type };
+    }
+  }
 }

addons/api/addon/models/role.js

@@ -23,6 +23,13 @@ export default class RoleModel extends GeneratedRoleModel {
    */
   @array('string', { readOnly: true }) grant_strings;
 
+  /**
+   * Convenience for looking up the grant scope, if loaded.
+   */
+  get grantScope() {
+    return this.store.peekRecord('scope', this.grant_scope_id);
+  }
+
   // =methods
 
   /**

addons/api/addon/models/session.js

@@ -13,7 +13,7 @@ class SessionCredential {
   /**
    *
    */
-  static Library = class Library {
+  static Source = class Source {
     id;
     name;
     description;
@@ -42,7 +42,7 @@ class SessionCredential {
 
   // =attributes
   rawCredential;
-  library;
+  source;
   #payloadSecret;
 
   /**
@@ -72,8 +72,8 @@ class SessionCredential {
   // =methods
 
   constructor(cred) {
-    const { id, name, description, type } = cred.credential_library;
-    this.library = new SessionCredential.Library(id, name, description, type);
+    const { id, name, description, type } = cred.credential_source;
+    this.source = new SessionCredential.Source(id, name, description, type);
     this.#payloadSecret = cred.secret;
     this.rawCredential = cred;
   }

addons/api/addon/models/target.js

@@ -1,15 +1,16 @@
 import GeneratedTargetModel from '../generated/models/target';
-import { fragment, fragmentArray } from 'ember-data-model-fragments/attributes';
+import { attr } from '@ember-data/model';
+import { fragmentArray } from 'ember-data-model-fragments/attributes';
 import { computed } from '@ember/object';
 
 export default class TargetModel extends GeneratedTargetModel {
   // =attributes
 
-  /**
-   * Attributes of this resource, if any, represented as a JSON fragment.
-   * @type {FragmentTargetAttributesModel}
-   */
-  @fragment('fragment-target-attributes', { defaultValue: {} }) attributes;
+  @attr('number', {
+    isNestedAttribute: true,
+    description: 'The  default port a target should use if present.',
+  })
+  default_port;
 
   /**
    * @type {[FragmentHostSourceModel]}
@@ -206,4 +207,20 @@ export default class TargetModel extends GeneratedTargetModel {
   removeCredentialSource(credentialLibraryID, options) {
     return this.removeCredentialSources([credentialLibraryID], options);
   }
+
+  /**
+   * True if the target type is tcp.
+   * @type {boolean}
+   */
+  get isTCP() {
+    return this.type === 'tcp';
+  }
+
+  /**
+   * True if the target type is ssh.
+   * @type {boolean}
+   */
+  get isSSH() {
+    return this.type === 'ssh';
+  }
 }

addons/api/addon/models/user.js

@@ -40,7 +40,7 @@ export default class UserModel extends GeneratedUserModel {
    * There are many options, so we fallback in order of precedence.
    * @type {string}
    */
-  @computed('email,full_name,login_name,displayName')
+  @computed('email', 'full_name', 'login_name')
   get accountName() {
     const { email, full_name, login_name } = this;
     return email || full_name || login_name;

addons/api/addon/serializers/account.js

@@ -33,7 +33,7 @@ export default class AccountSerializer extends ApplicationSerializer {
    * `attributes` entirely on update.
    */
   serializeOIDC(snapshot) {
-    const { isNew } = snapshot?.record;
+    const { isNew } = snapshot?.record || {};
     let serialized = super.serialize(...arguments);
     delete serialized.attributes;
     if (isNew) {
@@ -70,7 +70,7 @@ export default class AccountSerializer extends ApplicationSerializer {
     }
     // Change password custom method
     if (snapshot?.adapterOptions?.method === 'change-password') {
-      const { currentPassword, newPassword } = snapshot?.adapterOptions;
+      const { currentPassword, newPassword } = snapshot?.adapterOptions || {};
       serialized = this.serializeForChangePassword(
         snapshot,
         currentPassword,

addons/api/addon/serializers/application.js

@@ -50,6 +50,20 @@ export default class ApplicationSerializer extends RESTSerializer {
     // Do not serialize `disabled` fields.
     // TODO:  disabled is temporarily disabled
     if (key === 'disabled') delete json[key];
+    // Push nested attributes down into the attributes key
+    if (options.isNestedAttribute && json[key] !== undefined) {
+      if (!json.attributes) json.attributes = {};
+      json.attributes[key] = json[key];
+      delete json[key];
+    }
+    // Push nested secrets down into the secrets key
+    if (options.isNestedSecret) {
+      if (json[key]) {
+        if (!json.secrets) json.secrets = {};
+        json.secrets[key] = json[key];
+      }
+      delete json[key];
+    }
     return value;
   }
 
@@ -123,7 +137,7 @@ export default class ApplicationSerializer extends RESTSerializer {
   }
 
   /**
-   * In our API, singluar resources are _unrooted_, whereas Ember Data expects
+   * In our API, singular resources are _unrooted_, whereas Ember Data expects
    * them to be rooted under their model name, e.g. `{modelName: {…}}`.
    * This method makes this transformation to accommodate Ember Data.
    *
@@ -195,9 +209,107 @@ export default class ApplicationSerializer extends RESTSerializer {
    * @return {Object}
    */
   normalize(typeClass, hash) {
-    const normalizedHash = copy(hash, true);
+    let normalizedHash = copy(hash, true);
     const scopeID = get(normalizedHash, 'scope.id');
     if (scopeID) normalizedHash.scope.scope_id = scopeID;
+    normalizedHash = this.normalizeNestedAttributes(typeClass, normalizedHash);
+    normalizedHash = this.normalizeNestedSecrets(typeClass, normalizedHash);
     return super.normalize(typeClass, normalizedHash);
   }
+
+  /**
+   * Certain typed resources in the API have type-specific fields nested under
+   * an `attributes` key in the payload
+   * (e.g. `attributes: { fieldName: '123' }`).  Since Ember Data lacks
+   * first-class support for nested attributes, these fields must be hoisted up
+   * into the main body of the payload.
+   *
+   * In order to annotate a field as being a nested attribute, add the key name
+   * to the `nestedAttributes` field on the serializer:
+   *   `@attr('string', { isNestedAttribute: true }) fieldName;`
+   *
+   * @param {Model} typeClass
+   * @param {Object} hash
+   * @return {Object}
+   */
+  normalizeNestedAttributes(typeClass, hash) {
+    typeClass.attributes.forEach((attribute) => {
+      const {
+        name,
+        options: { isNestedAttribute },
+      } = attribute;
+      const value = hash.attributes?.[name];
+      const isUndefined = value === undefined;
+      if (isNestedAttribute && !isUndefined) hash[name] = value;
+    });
+    return hash;
+  }
+
+  /**
+   * If an attribute is declared with the `isNestedSecret` option, it will
+   * be explicitly unset in the incoming payload to `null`.  This helps ensure
+   * secret values do not linger in the UI.
+   *
+   * For example:
+   *   `@attr('string', { isNestedSecret: true }) superSecretShhh;`
+   *
+   * @param {Model} typeClass
+   * @param {Object} hash
+   * @return {Object}
+   */
+  normalizeNestedSecrets(typeClass, hash) {
+    typeClass.attributes.forEach((attribute) => {
+      const {
+        name,
+        options: { isNestedSecret },
+      } = attribute;
+      const value = hash.secrets?.[name];
+      if (isNestedSecret) hash[name] = value || null;
+    });
+    return hash;
+  }
+
+  /**
+   * If the API returns an updated response with removed fields, we need to
+   * explicitly set any read only field that is on the model but wasn't
+   * returned in the response to `null`.
+   * This will let ember data know the field was removed, otherwise
+   * it won't touch the removed field and will use the old value.
+   *
+   * @override
+   * @param {object} store
+   * @param {object} primaryModelClass
+   * @param {object} payload
+   * @param {?string} id
+   * @param {string} requestType
+   * @return {object}
+   */
+  normalizeUpdateRecordResponse(
+    store,
+    primaryModelClass,
+    payload,
+    id,
+    requestType
+  ) {
+    const newPayload = copy(payload, true);
+
+    primaryModelClass.attributes.forEach((attribute) => {
+      const {
+        name,
+        options: { readOnly },
+      } = attribute;
+
+      if (readOnly && !Object.prototype.hasOwnProperty.call(newPayload, name)) {
+        newPayload[name] = null;
+      }
+    });
+
+    return super.normalizeUpdateRecordResponse(
+      store,
+      primaryModelClass,
+      newPayload,
+      id,
+      requestType
+    );
+  }
 }

addons/api/addon/serializers/host-catalog.js

@@ -0,0 +1,59 @@
+import ApplicationSerializer from './application';
+
+const fieldsByType = {
+  aws: [
+    'disable_credential_rotation',
+    'region',
+    'access_key_id',
+    'secret_access_key',
+  ],
+  azure: [
+    'disable_credential_rotation',
+    'tenant_id',
+    'client_id',
+    'subscription_id',
+    'secret_id',
+    'secret_value',
+  ],
+};
+
+export default class HostCatalogSerializer extends ApplicationSerializer {
+  // =methods
+  serialize(snapshot) {
+    const serialized = super.serialize(...arguments);
+    switch (snapshot.record.compositeType) {
+      case 'static':
+        return this.serializeStatic(...arguments);
+      default:
+        return serialized;
+    }
+  }
+
+  serializeAttribute(snapshot, json, key, attribute) {
+    const value = super.serializeAttribute(...arguments);
+    const { isPlugin, compositeType } = snapshot.record;
+    const { options } = attribute;
+    // Nested conditionals for readability
+    // This deletes any fields that don't belong to the record type
+    if (isPlugin && options.isNestedAttribute && json.attributes) {
+      // The key must be included in the fieldsByType list above
+      if (!fieldsByType[compositeType].includes(key))
+        delete json.attributes[key];
+    }
+    // This deletes any fields that don't belong to the record type
+    if (isPlugin && options.isNestedSecret && json.secrets) {
+      if (!fieldsByType[compositeType].includes(key)) delete json.secrets[key];
+    }
+
+    // new one for isNestedSecret
+    return value;
+  }
+
+  serializeStatic() {
+    const serialized = super.serialize(...arguments);
+    // Delete unnecessary fields for static host-catalog
+    delete serialized.attributes;
+    delete serialized.secrets;
+    return serialized;
+  }
+}

addons/api/addon/serializers/host-set.js

@@ -1,5 +1,10 @@
 import ApplicationSerializer from './application';
+import { copy } from 'ember-copy';
 
+const fieldByType = {
+  aws: ['preferred_endpoints', 'filters', 'sync_interval_seconds'],
+  azure: ['preferred_endpoints', 'filter', 'sync_interval_seconds'],
+};
 export default class HostSetSerializer extends ApplicationSerializer {
   // =properties
 
@@ -19,10 +24,17 @@ export default class HostSetSerializer extends ApplicationSerializer {
    * @return {object}
    */
   serialize(snapshot) {
-    let serialized = super.serialize(...arguments);
     const hostIDs = snapshot?.adapterOptions?.hostIDs;
-    if (hostIDs) serialized = this.serializeWithHostIDs(snapshot, hostIDs);
-    return serialized;
+    if (hostIDs) {
+      return this.serializeWithHostIDs(snapshot, hostIDs);
+    } else {
+      switch (snapshot.record.compositeType) {
+        case 'static':
+          return this.serializeStatic(...arguments);
+        default:
+          return super.serialize(...arguments);
+      }
+    }
   }
 
   /**
@@ -37,4 +49,41 @@ export default class HostSetSerializer extends ApplicationSerializer {
       host_ids: hostIDs,
     };
   }
+
+  serializeStatic() {
+    let serialized = super.serialize(...arguments);
+    // Delete unnecessary fields for static type
+    delete serialized.attributes;
+    delete serialized.preferred_endpoints;
+    delete serialized.sync_interval_seconds;
+    return serialized;
+  }
+
+  serializeAttribute(snapshot, json, key, attribute) {
+    const value = super.serializeAttribute(...arguments);
+    const { isPlugin, compositeType } = snapshot.record;
+    const { options } = attribute;
+
+    if (isPlugin && options.isNestedAttribute) {
+      if (!fieldByType[compositeType].includes(key)) {
+        delete json.attributes[key];
+      }
+    }
+    return value;
+  }
+
+  /**
+   * Temporarily converts `filters` to an array if it is a string.  This is a
+   * quirk of the API.
+   *
+   * TODO:  remove once API consistently returns arrays.
+   */
+  normalize(typeClass, hash, ...rest) {
+    const normalizedHash = copy(hash, true);
+    if (typeof normalizedHash?.filters === 'string') {
+      normalizedHash.filters = [normalizedHash.filters];
+    }
+    const normalized = super.normalize(typeClass, normalizedHash, ...rest);
+    return normalized;
+  }
 }

addons/api/app/abilities/collection.js

@@ -1 +0,0 @@
-export { default } from 'api/abilities/collection';

addons/api/app/abilities/credential-store.js

@@ -0,0 +1 @@
+export { default } from 'api/abilities/credential-store';

addons/api/app/abilities/host-catalog.js

@@ -0,0 +1 @@
+export { default } from 'api/abilities/host-catalog';

addons/api/app/adapters/host-catalog.js

@@ -0,0 +1 @@
+export { default } from 'api/adapters/host-catalog';

addons/api/app/models/fragment-host-attributes.js

@@ -1 +0,0 @@
-export { default } from 'api/models/fragment-host-attributes';

addons/api/app/models/fragment-target-attributes.js

@@ -1 +0,0 @@
-export { default } from 'api/models/fragment-target-attributes';

addons/api/app/serializers/host-catalog.js

@@ -0,0 +1 @@
+export { default } from 'api/serializers/host-catalog';

addons/api/config/ember-try.js

@@ -1,86 +0,0 @@
-'use strict';
-
-const getChannelURL = require('ember-source-channel-url');
-
-module.exports = async function () {
-  return {
-    scenarios: [
-      {
-        name: 'ember-lts-3.12',
-        npm: {
-          devDependencies: {
-            'ember-source': '~3.12.0',
-          },
-        },
-      },
-      {
-        name: 'ember-lts-3.16',
-        npm: {
-          devDependencies: {
-            'ember-source': '~3.16.0',
-          },
-        },
-      },
-      {
-        name: 'ember-lts-3.20',
-        npm: {
-          devDependencies: {
-            'ember-source': '~3.20.5',
-          },
-        },
-      },
-      {
-        name: 'ember-release',
-        npm: {
-          devDependencies: {
-            'ember-source': await getChannelURL('release'),
-          },
-        },
-      },
-      {
-        name: 'ember-beta',
-        npm: {
-          devDependencies: {
-            'ember-source': await getChannelURL('beta'),
-          },
-        },
-      },
-      {
-        name: 'ember-canary',
-        npm: {
-          devDependencies: {
-            'ember-source': await getChannelURL('canary'),
-          },
-        },
-      },
-      {
-        name: 'ember-default-with-jquery',
-        env: {
-          EMBER_OPTIONAL_FEATURES: JSON.stringify({
-            'jquery-integration': true,
-          }),
-        },
-        npm: {
-          devDependencies: {
-            '@ember/jquery': '^1.1.0',
-          },
-        },
-      },
-      {
-        name: 'ember-classic',
-        env: {
-          EMBER_OPTIONAL_FEATURES: JSON.stringify({
-            'application-template-wrapper': true,
-            'default-async-observers': false,
-            'template-only-glimmer-components': false,
-          }),
-        },
-        npm: {
-          ember: {
-            edition: 'classic',
-          },
-        },
-      },
-    ],
-  };
-};

addons/api/mirage/config.js

@@ -270,7 +270,19 @@ export default function () {
       return hostCatalogs.where({ scopeId });
     }
   );
-  this.post('/host-catalogs');
+  this.post(
+    '/host-catalogs',
+    function ({ hostCatalogs }, { queryParams: { plugin_name } }) {
+      const attrs = this.normalizedRequestAttrs();
+      if (plugin_name) {
+        attrs.type = 'plugin';
+        attrs.plugin = {
+          name: plugin_name,
+        };
+      }
+      return hostCatalogs.create(attrs);
+    }
+  );
   this.get('/host-catalogs/:id');
   this.patch('/host-catalogs/:id');
   this.del('/host-catalogs/:id');
@@ -536,9 +548,10 @@ export default function () {
       return managedGroups.where({ authMethodId });
     }
   );
-  this.get('/managed-groups/:id');
-  this.del('/managed-groups/:id');
   this.post('/managed-groups');
+  this.get('/managed-groups/:id');
+  this.patch('/managed-groups/:id');
+  this.del('/managed-groups/:id');
 
   /* Uncomment the following line and the Response import above
    * Then change the response code to simulate error responses.

addons/api/mirage/factories/account.js

@@ -1,6 +1,7 @@
 import factory from '../generated/factories/account';
 import { random, internet } from 'faker';
 import permissions from '../helpers/permissions';
+import generateId from '../helpers/id';
 
 export default factory.extend({
   authorized_actions: () =>
@@ -11,6 +12,9 @@ export default factory.extend({
       'delete',
       'set-password',
     ],
+
+  id: () => generateId('acct_'),
+
   attributes() {
     switch (this.type) {
       case 'password':

addons/api/mirage/factories/auth-method.js

@@ -1,6 +1,7 @@
 import factory from '../generated/factories/auth-method';
 import { trait } from 'ember-cli-mirage';
 import permissions from '../helpers/permissions';
+import generateId from '../helpers/id';
 
 const types = ['password', 'oidc'];
 
@@ -18,7 +19,8 @@ export default factory.extend({
       'managed-groups': ['create', 'list'],
     };
   },
-  id: (i) => `auth-method-id-${i}`,
+
+  id: () => generateId('am_'),
 
   // Cycle through available types
   type: (i) => types[i % types.length],

addons/api/mirage/factories/credential-library.js

@@ -1,11 +1,12 @@
 import factory from '../generated/factories/credential-library';
 import { random, system } from 'faker';
 import permissions from '../helpers/permissions';
+import generateId from '../helpers/id';
 
 const types = ['vault'];
 
 export default factory.extend({
-  id: (i) => `credential-library-id-${i}`,
+  id: () => generateId('cl_'),
   type: (i) => types[i % types.length],
 
   authorized_actions: () =>

addons/api/mirage/factories/credential-store.js

@@ -2,8 +2,9 @@ import factory from '../generated/factories/credential-store';
 import { random, internet, datatype } from 'faker';
 import { trait } from 'ember-cli-mirage';
 import permissions from '../helpers/permissions';
+import generateId from '../helpers/id';
 
-const types = ['vault'];
+const types = ['vault', 'static'];
 
 export default factory.extend({
   authorized_actions: () =>
@@ -18,7 +19,7 @@ export default factory.extend({
       'credential-libraries': ['create', 'list'],
     };
   },
-  id: (i) => `credential-store-id-${i}`,
+  id: () => generateId('cs_'),
   type: (i) => types[i % types.length],
 
   attributes() {

addons/api/mirage/factories/group.js

@@ -1,6 +1,7 @@
 import factory from '../generated/factories/group';
 import { trait } from 'ember-cli-mirage';
 import permissions from '../helpers/permissions';
+import generateId from '../helpers/id';
 
 export default factory.extend({
   authorized_actions: () =>
@@ -12,7 +13,8 @@ export default factory.extend({
       'add-members',
       'remove-members',
     ],
-  id: (i) => `group-${i}`,
+
+  id: () => generateId('g_'),
 
   /**
    * Generates some users for the same scope and assigns them to the group

addons/api/mirage/factories/host-catalog.js

@@ -1,8 +1,22 @@
 import factory from '../generated/factories/host-catalog';
 import { trait } from 'ember-cli-mirage';
 import permissions from '../helpers/permissions';
+import { datatype, address, random } from 'faker';
+import generateId from '../helpers/id';
+
+const types = ['static', 'plugin'];
+// Represents known plugin types, except "foobar" which models the possibility
+// of receiving an _unknown_ type, which the UI must handle gracefully.
+const pluginTypes = ['aws', 'azure', 'foobar'];
+
+let pluginTypeCounter = 1;
 
 export default factory.extend({
+  id: () => generateId('hc_'),
+
+  // Cycle through available types
+  type: (i) => types[i % types.length],
+
   authorized_actions: () =>
     permissions.authorizedActionsFor('host-catalog') || [
       'no-op',
@@ -10,12 +24,56 @@ export default factory.extend({
       'update',
       'delete',
     ],
-  authorized_collection_actions: () => {
+  authorized_collection_actions: function () {
+    const isStatic = this.type === 'static';
     return {
-      hosts: ['create', 'list'],
+      // only static catalogs allow host create at this time
+      hosts: isStatic ? ['create', 'list'] : ['list'],
       'host-sets': ['create', 'list'],
     };
   },
+
+  plugin: function (i) {
+    if (this.type === 'plugin') {
+      return {
+        id: `plugin-id-${i}`,
+        name: pluginTypes[pluginTypeCounter++ % pluginTypes.length],
+        description: random.words(),
+      };
+    }
+  },
+
+  attributes() {
+    switch (this.plugin?.name) {
+      case 'aws':
+        return {
+          disable_credential_rotation: datatype.boolean(),
+          region: address.state(),
+        };
+      case 'azure':
+        return {
+          disable_credential_rotation: datatype.boolean(),
+          tenant_id: datatype.hexaDecimal(6),
+          client_id: datatype.hexaDecimal(6),
+          subscription_id: datatype.hexaDecimal(8),
+        };
+    }
+  },
+
+  secrets() {
+    switch (this.plugin?.name) {
+      case 'aws':
+        return {
+          access_key_id: datatype.hexaDecimal(8),
+          secret_access_key: datatype.string(12),
+        };
+      case 'azure':
+        return {
+          secret_id: datatype.hexaDecimal(6),
+          secret_value: datatype.string(12),
+        };
+    }
+  },
   withChildren: trait({
     afterCreate(hostCatalog, server) {
       const { scope, type } = hostCatalog;

addons/api/mirage/factories/host-set.js

@@ -1,15 +1,55 @@
 import factory from '../generated/factories/host-set';
 import permissions from '../helpers/permissions';
+import { datatype, internet, database } from 'faker';
+import generateId from '../helpers/id';
 
 export default factory.extend({
-  authorized_actions: () =>
-    permissions.authorizedActionsFor('host-set') || [
-      'no-op',
-      'read',
-      'update',
-      'delete',
-      'add-hosts',
-      'remove-hosts',
-    ],
-  id: (i) => `host-set-id-${i}`,
+  id: () => generateId('hs_'),
+  type() {
+    return this.hostCatalog?.type || factory.attrs.type;
+  },
+  authorized_actions: function () {
+    const isStatic = this.type === 'static';
+    const defaults = ['no-op', 'read', 'update', 'delete'];
+    // Only static allows host management at this time.
+    if (isStatic) defaults.push('add-hosts', 'remove-hosts');
+    return permissions.authorizedActionsFor('host-set') || defaults;
+  },
+  plugin() {
+    if (this.type === 'plugin') {
+      return this.hostCatalog.plugin;
+    }
+  },
+  preferred_endpoints() {
+    if (this.type === 'plugin') {
+      const enpointsAmount = datatype.number({ min: 1, max: 5 });
+      let result = [];
+      for (let i = 0; i < enpointsAmount; ++i) {
+        result.push(internet.ip());
+      }
+      return result;
+    }
+  },
+  sync_interval_seconds() {
+    if (this.type === 'plugin') {
+      return datatype.number();
+    }
+  },
+  // AWS specific
+  filters() {
+    if (this.plugin?.name === 'aws') {
+      const filtersAmount = datatype.number({ min: 1, max: 5 });
+      let result = [];
+      for (let i = 0; i < filtersAmount; ++i) {
+        result.push(`${datatype.string(3)}=${datatype.string(8)}`);
+      }
+      return result;
+    }
+  },
+  // Azure specific
+  filter() {
+    if (this.plugin?.name === 'azure') {
+      return `${database.column()}=${database.collation()}`;
+    }
+  },
 });

addons/api/mirage/factories/host.js

@@ -1,13 +1,46 @@
 import factory from '../generated/factories/host';
 import permissions from '../helpers/permissions';
+import { internet, datatype } from 'faker';
+import generateId from '../helpers/id';
 
 export default factory.extend({
-  authorized_actions: () =>
-    permissions.authorizedActionsFor('host') || [
-      'no-op',
-      'read',
-      'update',
-      'delete',
-    ],
-  id: (i) => `host-id-${i}`,
+  id: () => generateId('h_'),
+
+  type() {
+    return this.hostCatalog?.type || factory.attrs.type;
+  },
+  authorized_actions: function () {
+    const isStatic = this.type === 'static';
+    const defaults = ['no-op', 'read'];
+    // Only static allows update/delete at this time.
+    if (isStatic) defaults.push('update', 'delete');
+    return permissions.authorizedActionsFor('host') || defaults;
+  },
+  plugin() {
+    if (this.type === 'plugin') {
+      return this.hostCatalog.plugin;
+    }
+  },
+  ip_addresses() {
+    const addressesAmount = Math.floor(Math.random() * 6) + 1;
+    let result = [];
+    for (let i = 0; i < addressesAmount; ++i) {
+      result.push(internet.ip());
+    }
+    return result;
+  },
+  external_id() {
+    return datatype.uuid();
+  },
+  // Only aws plugins have dns_names
+  dns_names() {
+    if (this.plugin?.name === 'aws') {
+      const dnsNamesAmount = Math.floor(Math.random() * 6) + 1;
+      let result = [];
+      for (let i = 0; i < dnsNamesAmount; i++) {
+        result.push(internet.domainName());
+      }
+      return result;
+    }
+  },
 });

addons/api/mirage/factories/managed-group.js

@@ -1,11 +1,11 @@
 import factory from '../generated/factories/managed-group';
 import { random } from 'faker';
 import permissions from '../helpers/permissions';
+import generateId from '../helpers/id';
 
 const types = ['oidc'];
 
 export default factory.extend({
-  id: (i) => `managed-groups-id-${i}`,
   type: (i) => types[i % types.length],
 
   authorized_actions: () =>
@@ -16,6 +16,8 @@ export default factory.extend({
       'delete',
     ],
 
+  id: () => generateId('mg_'),
+
   attributes() {
     switch (this.type) {
       case 'oidc':

addons/api/mirage/factories/role.js

@@ -1,6 +1,7 @@
 import factory from '../generated/factories/role';
 import { trait } from 'ember-cli-mirage';
 import permissions from '../helpers/permissions';
+import generateId from '../helpers/id';
 
 export default factory.extend({
   authorized_actions: () =>
@@ -19,6 +20,8 @@ export default factory.extend({
     'id=*;type=host-catalog;actions=create,read',
   ],
 
+  id: () => generateId('r_'),
+
   /**
    * Adds principals to the role.
    */

addons/api/mirage/factories/scope.js

@@ -1,6 +1,7 @@
 import factory from '../generated/factories/scope';
 import { trait } from 'ember-cli-mirage';
 import permissions from '../helpers/permissions';
+import generateId from '../helpers/id';
 
 export default factory.extend({
   type: 'global',
@@ -27,15 +28,7 @@ export default factory.extend({
     };
   },
 
-  /**
-   * Generates realistic-ish IDs while still being deterministic.
-   */
-  id(i) {
-    let id = 'tv6fv3yz8p';
-    if (i % 3) id = 'xk1i4dk50v';
-    if (i % 2) id = 's9n819zgko';
-    return `s_${id}${i}`;
-  },
+  id: () => generateId('s_'),
 
   withChildren: trait({
     afterCreate(record, server) {

addons/api/mirage/factories/session.js

@@ -1,13 +1,15 @@
 import factory from '../generated/factories/session';
 import { trait } from 'ember-cli-mirage';
 import { random } from 'faker';
+import generateId from '../helpers/id';
 
 const statusStrings = ['pending', 'active', 'canceling', 'terminated'];
 
 export const pickRandomStatusString = () => random.arrayElement(statusStrings);
 
 export default factory.extend({
-  id: (i) => `session-id-${i}`,
+  id: () => generateId('ss_'),
+
   status: pickRandomStatusString,
 
   /**

addons/api/mirage/factories/target.js

@@ -2,9 +2,11 @@ import factory from '../generated/factories/target';
 import { trait } from 'ember-cli-mirage';
 import { random, datatype } from 'faker';
 import permissions from '../helpers/permissions';
+import generateId from '../helpers/id';
 
 const randomBoolean = (chance = 0.5) => Math.random() < chance;
 const hostSetChance = 0.3;
+const types = ['tcp', 'ssh'];
 
 export default factory.extend({
   authorized_actions: () =>
@@ -20,16 +22,19 @@ export default factory.extend({
       'remove-credential-sources',
     ],
 
+  id: () => generateId('t_'),
+
   /**
    * -1 means "unlimited" and we want to generate these on occasion.
    */
   session_connection_limit: () => random.arrayElement([-1, datatype.number()]),
-
+  worker_filter: (i) => (i % 2 === 0 ? random.words() : null),
+  type: (i) => types[i % types.length],
   /**
    * Generates attributes fields by type.
    */
   afterCreate(target) {
-    if (target.type === 'tcp') {
+    if (target.type === 'tcp' || target.type === 'ssh') {
       target.update({
         attributes: {
           default_port: datatype.number(),

addons/api/mirage/factories/user.js

@@ -1,5 +1,6 @@
 import factory from '../generated/factories/user';
 import permissions from '../helpers/permissions';
+import generateId from '../helpers/id';
 
 export default factory.extend({
   authorized_actions: () =>
@@ -11,5 +12,5 @@ export default factory.extend({
       'add-accounts',
       'remove-accounts',
     ],
-  id: (i) => `user-${i}`,
+  id: () => generateId('u_'),
 });

addons/api/mirage/generated/factories/host-catalog.js

@@ -5,7 +5,7 @@ import { random, date, datatype } from 'faker';
  * GeneratedHostCatalogModelFactory
  */
 export default Factory.extend({
-  type: () => random.arrayElement(['static', 'plugin']),
+  type: 'static',
   name: () => random.words(),
   description: () => random.words(),
   created_time: () => date.recent(),

addons/api/mirage/generated/factories/host.js

@@ -1,5 +1,5 @@
 import { Factory } from 'ember-cli-mirage';
-import { random, date, internet, datatype } from 'faker';
+import { random, date, datatype, internet } from 'faker';
 
 /**
  * GeneratedHostModelFactory

addons/api/mirage/generated/factories/target.js

@@ -9,6 +9,7 @@ export default Factory.extend({
   name: () => random.words(),
   session_max_seconds: () => datatype.number(),
   session_connection_limit: () => datatype.number(),
+  worker_filter: () => random.words(),
   description: () => random.words(),
   created_time: () => date.recent(),
   updated_time: () => date.recent(),

addons/api/mirage/helpers/id.js

@@ -0,0 +1,41 @@
+const characters = 'abcdefghijklmnopqrstuvwxyz0123456789';
+
+/**
+ * The Mulberry32 PRNG, JavaScript implementation.  This is a seedable PRNG,
+ * which we need in order to deterministically generate IDs which are stable
+ * across reloads.  Unfortunately, the built-in `Math.random` function
+ * is not seedable.
+ *
+ * Source:
+ * https://github.com/bryc/code/blob/master/jshash/PRNGs.md#mulberry32
+ *
+ * @param {number} a
+ * @return {number}
+ */
+function mulberry32(a = 0) {
+  return function () {
+    a += 0x6d2b79f5 | 0;
+    var t = Math.imul(a ^ (a >>> 15), 1 | a);
+    t = (t + Math.imul(t ^ (t >>> 7), 61 | t)) ^ t;
+    return ((t ^ (t >>> 14)) >>> 0) / 4294967296;
+  };
+}
+
+const random = mulberry32();
+
+/**
+ * Generates a random ID string at least 10 characters long with the
+ * specified prefix.
+ *
+ * @param {string} prefix
+ * @return {string}
+ */
+export default function (prefix = '') {
+  let result = '';
+  for (let i = 0; i < 10; i++) {
+    result = result.concat(
+      characters[Math.floor(random() * characters.length)]
+    );
+  }
+  return prefix.concat(result);
+}

addons/api/mirage/models/account.js

@@ -1,4 +1,5 @@
-import { Model, belongsTo } from 'ember-cli-mirage';
+import { belongsTo } from 'ember-cli-mirage';
+import Model from './base';
 
 export default Model.extend({
   scope: belongsTo(),

addons/api/mirage/models/auth-method.js

@@ -1,4 +1,5 @@
-import { Model, belongsTo } from 'ember-cli-mirage';
+import { belongsTo } from 'ember-cli-mirage';
+import Model from './base';
 
 export default Model.extend({
   scope: belongsTo(),

addons/api/mirage/models/base.js

@@ -0,0 +1,20 @@
+import { Model } from 'ember-cli-mirage';
+
+export default Model.extend({
+  assignDefaults(defaultAttrs, attrs) {
+    Object.entries(defaultAttrs).map(([key, value]) => {
+      if (!attrs[key]) {
+        attrs[key] = value;
+      }
+    });
+  },
+  defaultAttrs: () => ({
+    version: 1,
+    authorized_actions: ['no-op', 'read', 'update', 'delete'],
+    created_time: new Date(),
+  }),
+  save() {
+    this.assignDefaults(this.defaultAttrs(), this.attrs);
+    return Model.prototype.save.apply(this, arguments);
+  },
+});

addons/api/mirage/models/credential-library.js

@@ -1,4 +1,5 @@
-import { Model, belongsTo } from 'ember-cli-mirage';
+import { belongsTo } from 'ember-cli-mirage';
+import Model from './base';
 
 export default Model.extend({
   scope: belongsTo(),

addons/api/mirage/models/credential-store.js

@@ -1,4 +1,5 @@
-import { Model, belongsTo } from 'ember-cli-mirage';
+import { belongsTo } from 'ember-cli-mirage';
+import Model from './base';
 
 export default Model.extend({
   scope: belongsTo(),

addons/api/mirage/models/group.js

@@ -1,4 +1,5 @@
-import { Model, belongsTo, hasMany } from 'ember-cli-mirage';
+import { belongsTo, hasMany } from 'ember-cli-mirage';
+import Model from './base';
 
 export default Model.extend({
   scope: belongsTo(),

addons/api/mirage/models/host-catalog.js

@@ -1,4 +1,5 @@
-import { Model, belongsTo, hasMany } from 'ember-cli-mirage';
+import { belongsTo, hasMany } from 'ember-cli-mirage';
+import Model from './base';
 
 export default Model.extend({
   scope: belongsTo(),

addons/api/mirage/models/host-set.js

@@ -1,4 +1,5 @@
-import { Model, belongsTo, hasMany } from 'ember-cli-mirage';
+import { belongsTo, hasMany } from 'ember-cli-mirage';
+import Model from './base';
 
 export default Model.extend({
   scope: belongsTo(),

addons/api/mirage/models/host.js

@@ -1,4 +1,5 @@
-import { Model, belongsTo } from 'ember-cli-mirage';
+import { belongsTo } from 'ember-cli-mirage';
+import Model from './base';
 
 export default Model.extend({
   scope: belongsTo(),

addons/api/mirage/models/managed-group.js

@@ -1,4 +1,5 @@
-import { Model, belongsTo } from 'ember-cli-mirage';
+import { belongsTo } from 'ember-cli-mirage';
+import Model from './base';
 
 export default Model.extend({
   scope: belongsTo(),

addons/api/mirage/models/role.js

@@ -1,4 +1,5 @@
-import { Model, belongsTo, hasMany } from 'ember-cli-mirage';
+import { belongsTo, hasMany } from 'ember-cli-mirage';
+import Model from './base';
 
 export default Model.extend({
   scope: belongsTo(),

addons/api/mirage/models/session.js

@@ -1,4 +1,5 @@
-import { Model, belongsTo } from 'ember-cli-mirage';
+import { belongsTo } from 'ember-cli-mirage';
+import Model from './base';
 
 export default Model.extend({
   scope: belongsTo(),

addons/api/mirage/models/target.js

@@ -1,4 +1,5 @@
-import { Model, belongsTo, hasMany } from 'ember-cli-mirage';
+import Model from './base';
+import { belongsTo, hasMany } from 'ember-cli-mirage';
 
 export default Model.extend({
   scope: belongsTo(),

addons/api/mirage/models/user.js

@@ -1,4 +1,5 @@
-import { Model, belongsTo, hasMany } from 'ember-cli-mirage';
+import { belongsTo, hasMany } from 'ember-cli-mirage';
+import Model from './base';
 
 export default Model.extend({
   scope: belongsTo(),

addons/api/mirage/scenarios/default.js

@@ -46,7 +46,7 @@ export default function (server) {
 
   // Other resources
   server.schema.scopes.where({ type: 'project' }).models.forEach((scope) => {
-    server.createList('host-catalog', 2, { scope }, 'withChildren');
+    server.createList('host-catalog', 8, { scope }, 'withChildren');
     server.createList('credential-store', 3, { scope }, 'withAssociations');
     server.createList('target', 2, { scope }, 'withAssociations');
     // Sessions have target data. Create it after targets.

addons/api/mirage/scenarios/ipc.js

@@ -66,10 +66,10 @@ export default function initializeMockIPC(server, config) {
         session_id: newSession.id,
         credentials: [
           {
-            credential_library: {
+            credential_source: {
               id: 'clvlt_4cvscMTl0N',
-              name: 'Library Name',
-              description: 'Library Description',
+              name: 'Source Name',
+              description: 'Source Description',
               credential_store_id: 'csvlt_Q1HFGt7Jpm',
               type: 'vault',
             },
@@ -78,10 +78,10 @@ export default function initializeMockIPC(server, config) {
             },
           },
           {
-            credential_library: {
+            credential_source: {
               id: 'clvlt_4cvscMTl0N',
-              name: 'Library Name',
-              description: 'Library Description',
+              name: 'Source Name',
+              description: 'Source Description',
               credential_store_id: 'csvlt_Q1HFGt7Jpm',
               type: 'vault',
             },
@@ -91,10 +91,10 @@ export default function initializeMockIPC(server, config) {
             },
           },
           {
-            credential_library: {
+            credential_source: {
               id: 'clvlt_9KWscxpcY7',
-              name: 'Library Name',
-              description: 'Library Description',
+              name: 'Source Name',
+              description: 'Source Description',
               credential_store_id: 'csvlt_Q1HFGt7Jpm',
               type: 'vault',
             },
@@ -103,10 +103,10 @@ export default function initializeMockIPC(server, config) {
             },
           },
           {
-            credential_library: {
+            credential_source: {
               id: 'clvlt_9KWscxpcY7',
-              name: 'Library Name',
-              description: 'Library Description',
+              name: 'Source Name',
+              description: 'Source Description',
               credential_store_id: 'csvlt_Q1HFGt7Jpm',
               type: 'vault',
             },

addons/api/package.json

@@ -16,16 +16,17 @@
     "lint:hbs:fix": "ember-template-lint . --fix",
     "lint:js": "eslint .",
     "lint:js:fix": "eslint . --fix",
-    "format": "npm run format:js",
+    "format": "yarn run format:js",
     "format:js": "prettier --write '{addon,app,config,stories,tests,mirage}/**/*.js' *.js",
     "start": "ember serve",
     "test": "ember test",
     "test:ember-compatibility": "ember try:each",
+    "precommit": "yarn lint && yarn format && yarn test",
     "doc:toc": "doctoc README.md"
   },
   "dependencies": {
     "ember-can": "^3.1.0",
-    "ember-cli-babel": "^7.26.6",
+    "ember-cli-babel": "^7.26.8",
     "ember-cli-htmlbars": "^5.7.1",
     "ember-cli-mirage": "^2.2.0",
     "ember-data": "^3.20.0",
@@ -33,17 +34,17 @@
     "ember-fetch": "^8.1.1"
   },
   "devDependencies": {
-    "js-bexpr": "hashicorp/js-bexpr#9b4a4b54d85eba67fdfc0990133d1518d890b1e1",
-    "@babel/core": "^7.15.8",
+    "@babel/core": "^7.16.5",
+    "@babel/eslint-parser": "^7.17.0",
+    "@babel/plugin-proposal-decorators": "^7.17.8",
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^2.4.2",
+    "@ember/test-helpers": "^2.6.0",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
-    "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
-    "doctoc": "^2.0.1",
+    "doctoc": "^2.1.0",
     "ember-auto-import": "^1.12.0",
-    "ember-cli": "~3.28.3",
+    "ember-cli": "~4.1.0",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
@@ -53,19 +54,18 @@
     "ember-export-application-global": "^2.0.1",
     "ember-load-initializers": "^2.1.2",
     "ember-maybe-import-regenerator": "^1.0.0",
-    "ember-page-title": "^6.2.2",
+    "ember-page-title": "^7.0.0",
     "ember-qunit": "^5.1.4",
     "ember-resolver": "^8.0.3",
     "ember-source": "~3.28.4",
-    "ember-source-channel-url": "^3.0.0",
     "ember-template-lint": "^3.7.0",
-    "ember-try": "^1.4.0",
-    "eslint": "^7.32.0",
+    "eslint": "^8.12.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-ember": "^10.5.4",
+    "eslint-plugin-ember": "^10.5.9",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-qunit": "^6.2.0",
+    "js-bexpr": "hashicorp/js-bexpr#9b4a4b54d85eba67fdfc0990133d1518d890b1e1",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.4.0",
@@ -73,7 +73,7 @@
     "qunit-dom": "^2.0.0"
   },
   "engines": {
-    "node": ">=12 <=17"
+    "node": "12.* || 14.* || 16.*"
   },
   "ember": {
     "edition": "octane"

addons/api/tests/unit/abilities/collection-test.js

@@ -1,38 +0,0 @@
-import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
-
-module('Unit | Abilities | Collection', function (hooks) {
-  setupTest(hooks);
-
-  test('it reflects when a resource may be listed based on authorized_collection_actions', function (assert) {
-    assert.expect(2);
-    const service = this.owner.lookup('service:can');
-    const model = {
-      authorized_collection_actions: {
-        foobars: ['list'],
-      },
-    };
-    assert.ok(service.can('list collection', model, { collection: 'foobars' }));
-    model.authorized_collection_actions.foobars = [];
-    assert.notOk(
-      service.can('list collection', model, { collection: 'foobars' })
-    );
-  });
-
-  test('it reflects when a resource may be created based on authorized_collection_actions', function (assert) {
-    assert.expect(2);
-    const service = this.owner.lookup('service:can');
-    const model = {
-      authorized_collection_actions: {
-        foobars: ['create'],
-      },
-    };
-    assert.ok(
-      service.can('create collection', model, { collection: 'foobars' })
-    );
-    model.authorized_collection_actions.foobars = [];
-    assert.notOk(
-      service.can('create collection', model, { collection: 'foobars' })
-    );
-  });
-});

addons/api/tests/unit/abilities/model-test.js

@@ -65,4 +65,32 @@ module('Unit | Abilities | Model', function (hooks) {
     model.authorized_actions = [];
     assert.notOk(service.can('delete model', model));
   });
+
+  // =collections
+
+  test('it reflects when a resource may be listed based on authorized_collection_actions', function (assert) {
+    assert.expect(2);
+    const service = this.owner.lookup('service:can');
+    const model = {
+      authorized_collection_actions: {
+        foobars: ['list'],
+      },
+    };
+    assert.ok(service.can('list model', model, { collection: 'foobars' }));
+    model.authorized_collection_actions.foobars = [];
+    assert.notOk(service.can('list model', model, { collection: 'foobars' }));
+  });
+
+  test('it reflects when a resource may be created based on authorized_collection_actions', function (assert) {
+    assert.expect(2);
+    const service = this.owner.lookup('service:can');
+    const model = {
+      authorized_collection_actions: {
+        foobars: ['create'],
+      },
+    };
+    assert.ok(service.can('create model', model, { collection: 'foobars' }));
+    model.authorized_collection_actions.foobars = [];
+    assert.notOk(service.can('create model', model, { collection: 'foobars' }));
+  });
 });

addons/api/tests/unit/adapters/host-catalog-test.js

@@ -0,0 +1,48 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Adapter | host catalog', function (hooks) {
+  setupTest(hooks);
+
+  test('it generates correct createRecord URLs for static host catalogs', function (assert) {
+    assert.expect(1);
+    const scopeID = 'o_1';
+    const mockSnapshot = {
+      adapterOptions: {
+        scopeID,
+      },
+      attr() {
+        return null;
+      },
+    };
+    const adapter = this.owner.lookup('adapter:host-catalog');
+    const createRecordURL = adapter.buildURL(
+      'host-catalog',
+      null,
+      mockSnapshot,
+      'createRecord'
+    );
+    assert.equal(createRecordURL, '/v1/host-catalogs');
+  });
+
+  test('it generates correct createRecord URLs for dynamic host catalogs with extra query parameter ?plugin_name', function (assert) {
+    assert.expect(1);
+    const scopeID = 'o_1';
+    const mockSnapshot = {
+      adapterOptions: {
+        scopeID,
+      },
+      attr() {
+        return { name: 'aws' };
+      },
+    };
+    const adapter = this.owner.lookup('adapter:host-catalog');
+    const createRecordURL = adapter.buildURL(
+      'host-catalog',
+      null,
+      mockSnapshot,
+      'createRecord'
+    );
+    assert.equal(createRecordURL, '/v1/host-catalogs?plugin_name=aws');
+  });
+});

addons/api/tests/unit/models/host-catalog-test.js

@@ -10,13 +10,107 @@ module('Unit | Model | host catalog', function (hooks) {
     assert.ok(model);
   });
 
-  test('it has isStatic function and returns the expected values', async function (assert) {
+  test('it has isStatic property and returns the expected values', async function (assert) {
     assert.expect(3);
     const store = this.owner.lookup('service:store');
-    const modelA = store.createRecord('host-catalog', { type: 'static' });
-    const modelB = store.createRecord('host-catalog', { type: 'plugin' });
-    assert.equal(typeof modelA.isStatic, 'boolean');
-    assert.true(modelA.isStatic);
+    const modelA = store.createRecord('host-catalog', { compositeType: 'aws' });
+    const modelB = store.createRecord('host-catalog', {
+      compositeType: 'foobar',
+    });
+    const modelC = store.createRecord('host-catalog', {
+      compositeType: 'static',
+    });
+    assert.false(modelA.isStatic);
     assert.false(modelB.isStatic);
+    assert.true(modelC.isStatic);
+  });
+
+  test('it has isPlugin property and returns the expected values', async function (assert) {
+    assert.expect(2);
+    const store = this.owner.lookup('service:store');
+    const modelPlugin = store.createRecord('host-catalog', {
+      compositeType: 'aws',
+    });
+    const modelStatic = store.createRecord('host-catalog', {
+      compositeType: 'static',
+    });
+    assert.true(modelPlugin.isPlugin);
+    assert.false(modelStatic.isPlugin);
+  });
+
+  test('it has isUnknown property and returns the expected values', async function (assert) {
+    assert.expect(3);
+    const store = this.owner.lookup('service:store');
+    const modelA = store.createRecord('host-catalog', {
+      compositeType: 'static',
+    });
+    const modelB = store.createRecord('host-catalog', { compositeType: 'aws' });
+    const modelC = store.createRecord('host-catalog', {
+      compositeType: 'no-such-type',
+    });
+    assert.false(modelA.isUnknown);
+    assert.false(modelB.isUnknown);
+    assert.true(modelC.isUnknown);
+  });
+
+  test('it has isAWS property and returns the expected values', async function (assert) {
+    assert.expect(2);
+    const store = this.owner.lookup('service:store');
+    const modelAws = store.createRecord('host-catalog', {
+      type: 'plugin',
+      plugin: { name: 'aws' },
+    });
+    const modelRandom = store.createRecord('host-catalog', {
+      plugin: { name: 'random' },
+    });
+    assert.true(modelAws.isAWS);
+    assert.false(modelRandom.isAWS);
+  });
+
+  test('it has isAzure property and return the expected values', async function (assert) {
+    assert.expect(2);
+    const store = this.owner.lookup('service:store');
+    const modelAzure = store.createRecord('host-catalog', {
+      type: 'plugin',
+      plugin: { name: 'azure' },
+    });
+    const modelRandom = store.createRecord('host-catalog', {
+      plugin: { name: 'random' },
+    });
+    assert.true(modelAzure.isAzure);
+    assert.false(modelRandom.isAzure);
+  });
+
+  test('get compositeType returns expected values', async function (assert) {
+    assert.expect(3);
+    const store = this.owner.lookup('service:store');
+    const modelA = store.createRecord('host-catalog', {
+      type: 'static',
+    });
+    const modelB = store.createRecord('host-catalog', {
+      type: 'plugin',
+      plugin: { name: 'aws' },
+    });
+    const modelC = store.createRecord('host-catalog', {
+      type: 'plugin',
+      plugin: { name: 'no-such-type' },
+    });
+    assert.equal(modelA.compositeType, 'static');
+    assert.equal(modelB.compositeType, 'aws');
+    assert.equal(modelC.compositeType, 'unknown');
+  });
+
+  test('set compositeType sets expected values', async function (assert) {
+    assert.expect(3);
+    const store = this.owner.lookup('service:store');
+    const modelPlugin = store.createRecord('host-catalog', {
+      compositeType: 'aws',
+    });
+    const modelStatic = store.createRecord('host-catalog', {
+      compositeType: 'static',
+    });
+    assert.equal(modelPlugin.type, 'plugin');
+    assert.equal(modelPlugin.plugin.name, 'aws');
+    assert.equal(modelStatic.type, 'static');
   });
 });

addons/api/tests/unit/models/host-set-test.js

@@ -129,4 +129,88 @@ module('Unit | Model | host set', function (hooks) {
     const model = store.peekRecord('host-set', '123abc');
     await model.removeHost('3');
   });
+
+  test('it has isStatic and returns the expected values', async function (assert) {
+    assert.expect(3);
+    const store = this.owner.lookup('service:store');
+    const modelA = store.createRecord('host-set', { type: 'static' });
+    const modelB = store.createRecord('host-set', { type: 'plugin' });
+    assert.equal(typeof modelA.isStatic, 'boolean');
+    assert.true(modelA.isStatic);
+    assert.false(modelB.isStatic);
+  });
+
+  test('it has isPlugin and returns the expected values', async function (assert) {
+    assert.expect(3);
+    const store = this.owner.lookup('service:store');
+    const modelPlugin = store.createRecord('host-set', { type: 'plugin' });
+    const modelStatic = store.createRecord('host-set', { type: 'static' });
+    assert.equal(typeof modelPlugin.isPlugin, 'boolean');
+    assert.true(modelPlugin.isPlugin);
+    assert.false(modelStatic.isPlugin);
+  });
+
+  test('it has isAws and return the expected values', async function (assert) {
+    assert.expect(3);
+    const store = this.owner.lookup('service:store');
+    const modelAws = store.createRecord('host-set', {
+      type: 'plugin',
+      plugin: { name: 'aws' },
+    });
+    const modelRandom = store.createRecord('host-set', {
+      plugin: { name: 'random' },
+    });
+    assert.equal(typeof modelAws.isAWS, 'boolean');
+    assert.true(modelAws.isAWS);
+    assert.false(modelRandom.isAWS);
+  });
+
+  test('it has isAzure and return the expected values', async function (assert) {
+    assert.expect(3);
+    const store = this.owner.lookup('service:store');
+    const modelAzure = store.createRecord('host-set', {
+      type: 'plugin',
+      plugin: { name: 'azure' },
+    });
+    const modelRandom = store.createRecord('host-set', {
+      plugin: { name: 'random' },
+    });
+    assert.equal(typeof modelAzure.isAzure, 'boolean');
+    assert.true(modelAzure.isAzure);
+    assert.false(modelRandom.isAzure);
+  });
+
+  test('get compositeType return expected values', async function (assert) {
+    assert.expect(3);
+    const store = this.owner.lookup('service:store');
+    const modelPlugin1 = store.createRecord('host-set', {
+      type: 'plugin',
+      plugin: { name: 'aws' },
+    });
+    const modelPlugin2 = store.createRecord('host-set', {
+      type: 'plugin',
+      plugin: { name: 'Test name' },
+    });
+    const modelStatic = store.createRecord('host-set', {
+      type: 'static',
+    });
+    assert.equal(modelPlugin1.compositeType, 'aws');
+    assert.equal(modelPlugin2.compositeType, 'unknown');
+    assert.equal(modelStatic.compositeType, 'static');
+  });
+
+  test('set compositeType sets expected values', async function (assert) {
+    assert.expect(3);
+    const store = this.owner.lookup('service:store');
+    const modelPlugin = store.createRecord('host-set', {
+      compositeType: 'aws',
+    });
+    const modelStatic = store.createRecord('host-set', {
+      compositeType: 'static',
+    });
+
+    assert.equal(modelPlugin.type, 'plugin');
+    assert.equal(modelPlugin.plugin.name, 'aws');
+    assert.equal(modelStatic.type, 'static');
+  });
 });

addons/api/tests/unit/models/host-test.js

@@ -22,4 +22,84 @@ module('Unit | Model | host', function (hooks) {
     });
     assert.equal(model.attributes.address, '127.0.0.1');
   });
+
+  test('it has isStatic and returns the expected values', async function (assert) {
+    assert.expect(3);
+    const store = this.owner.lookup('service:store');
+    const modelA = store.createRecord('host', { type: 'static' });
+    const modelB = store.createRecord('host', { type: 'plugin' });
+    assert.equal(typeof modelA.isStatic, 'boolean');
+    assert.true(modelA.isStatic);
+    assert.false(modelB.isStatic);
+  });
+
+  test('it has isPlugin and returns the expected values', async function (assert) {
+    assert.expect(3);
+    const store = this.owner.lookup('service:store');
+    const modelPlugin = store.createRecord('host', { type: 'plugin' });
+    const modelStatic = store.createRecord('host', { type: 'static' });
+    assert.equal(typeof modelPlugin.isPlugin, 'boolean');
+    assert.true(modelPlugin.isPlugin);
+    assert.false(modelStatic.isPlugin);
+  });
+
+  test('it has isAWS and returns the expected values', async function (assert) {
+    assert.expect(3);
+    const store = this.owner.lookup('service:store');
+    const modelAws = store.createRecord('host', {
+      type: 'plugin',
+      plugin: { name: 'aws' },
+    });
+    const modelRandom = store.createRecord('host', {
+      plugin: { name: 'random' },
+    });
+    assert.equal(typeof modelAws.isAWS, 'boolean');
+    assert.true(modelAws.isAWS);
+    assert.false(modelRandom.isAWS);
+  });
+
+  test('it has isAzure and returns the expected values', async function (assert) {
+    assert.expect(3);
+    const store = this.owner.lookup('service:store');
+    const modelAzure = store.createRecord('host', {
+      type: 'plugin',
+      plugin: { name: 'azure' },
+    });
+    const modelRandom = store.createRecord('host', {
+      plugin: { name: 'random' },
+    });
+    assert.equal(typeof modelAzure.isAzure, 'boolean');
+    assert.true(modelAzure.isAzure);
+    assert.false(modelRandom.isAzure);
+  });
+
+  test('get compositeType returns expected values', async function (assert) {
+    assert.expect(3);
+    const store = this.owner.lookup('service:store');
+    const modelPlugin = store.createRecord('host', {
+      type: 'plugin',
+      plugin: { name: 'Test name' },
+    });
+    const modelStatic = store.createRecord('host', {
+      type: 'static',
+    });
+    assert.equal(typeof modelPlugin.compositeType, 'string');
+    assert.equal(modelPlugin.compositeType, 'Test name');
+    assert.equal(modelStatic.compositeType, 'static');
+  });
+
+  test('set compositeType sets expected values', async function (assert) {
+    assert.expect(3);
+    const store = this.owner.lookup('service:store');
+    const modelPlugin = store.createRecord('host', {
+      compositeType: 'aws',
+    });
+    const modelStatic = store.createRecord('host', {
+      compositeType: 'static',
+    });
+
+    assert.equal(modelPlugin.type, 'plugin');
+    assert.equal(modelPlugin.plugin.name, 'aws');
+    assert.equal(modelStatic.type, 'static');
+  });
 });

addons/api/tests/unit/models/target-test.js

@@ -384,4 +384,24 @@ module('Unit | Model | target', function (hooks) {
     const model = store.peekRecord('target', '123abc');
     await model.removeCredentialSource('2');
   });
+
+  test('it has isSSH property and returns the expected values', function (assert) {
+    assert.expect(2);
+    const store = this.owner.lookup('service:store');
+    const modelSSH = store.createRecord('target', {
+      type: 'ssh',
+    });
+    assert.true(modelSSH.isSSH);
+    assert.false(modelSSH.isTCP);
+  });
+
+  test('it has isTCP property and returns the expected values', function (assert) {
+    assert.expect(2);
+    const store = this.owner.lookup('service:store');
+    const modelTCP = store.createRecord('target', {
+      type: 'tcp',
+    });
+    assert.true(modelTCP.isTCP);
+    assert.false(modelTCP.isSSH);
+  });
 });

addons/api/tests/unit/models/user-test.js

@@ -115,4 +115,39 @@ module('Unit | Model | user', function (hooks) {
       'User has empty account_ids by default'
     );
   });
+
+  test('it defaults to null for readonly attributes when response does not have fields', async function (assert) {
+    assert.expect(3);
+    this.server.post('/v1/users/123abc:remove-accounts', (schema, request) => {
+      const body = JSON.parse(request.requestBody);
+      assert.deepEqual(body, {
+        account_ids: ['3'],
+        version: 1,
+      });
+      return { id: '123abc', name: 'newName' };
+    });
+    const store = this.owner.lookup('service:store');
+    store.push({
+      data: {
+        id: '123abc',
+        type: 'user',
+        attributes: {
+          name: 'user',
+          description: 'Description',
+          account_ids: ['3'],
+          version: 1,
+          login_name: 'zed',
+          scope: {
+            scope_id: 'o_1',
+            type: 'scope',
+          },
+        },
+      },
+    });
+    const model = store.peekRecord('user', '123abc');
+    await model.removeAccount('3');
+
+    assert.equal(model.login_name, null);
+    assert.equal(model.name, 'newName');
+  });
 });

addons/api/tests/unit/serializers/application-test.js

@@ -211,4 +211,41 @@ module('Unit | Serializer | application', function (hooks) {
       },
     });
   });
+
+  test('it normalizes removed fields correctly', function (assert) {
+    assert.expect(1);
+    const store = this.owner.lookup('service:store');
+    const serializer = store.serializerFor('user');
+    const user = store.createRecord('user').constructor;
+    const payload = {
+      id: '1',
+      name: 'user 1',
+      scope: { id: 'o_123' },
+    };
+    const normalized = serializer.normalizeUpdateRecordResponse(
+      store,
+      user,
+      payload
+    );
+    assert.deepEqual(normalized, {
+      included: [],
+      data: {
+        id: '1',
+        type: 'user',
+        attributes: {
+          authorized_actions: [],
+          name: 'user 1',
+          scope: { scope_id: 'o_123' },
+          account_ids: [],
+          authorized_collection_actions: null,
+          created_time: null,
+          email: null,
+          full_name: null,
+          login_name: null,
+          updated_time: null,
+        },
+        relationships: {},
+      },
+    });
+  });
 });

addons/api/tests/unit/serializers/host-catalog-test.js

@@ -0,0 +1,321 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Serializer | host catalog', function (hooks) {
+  setupTest(hooks);
+
+  test('it serializes records', function (assert) {
+    const store = this.owner.lookup('service:store');
+    const record = store.createRecord('host-catalog', {});
+
+    assert.ok(record.serialize());
+  });
+
+  test('it serializes a static host-catalog as expected', async function (assert) {
+    assert.expect(1);
+    const store = this.owner.lookup('service:store');
+    const record = store.createRecord('host-catalog', {
+      name: 'static',
+      description: 'this is a static host-catalog',
+      type: 'static',
+    });
+    const expectedResult = {
+      name: 'static',
+      description: 'this is a static host-catalog',
+      type: 'static',
+    };
+    assert.deepEqual(record.serialize(), expectedResult);
+  });
+
+  test('it serializes a new aws plugin as expected, ignoring azure fields', async function (assert) {
+    assert.expect(1);
+    const store = this.owner.lookup('service:store');
+    const record = store.createRecord('host-catalog', {
+      compositeType: 'aws',
+      name: 'AWS',
+      description: 'this is a Aws plugin host-catalog',
+      disable_credential_rotation: true,
+      // these are AWS fields and should be included
+      region: 'spain',
+      access_key_id: 'foobars',
+      secret_access_key: 'testing',
+      // these are Azure fields and should be excluded
+      tenant_id: 'a1b2c3',
+      client_id: 'a1b2c3',
+      subscription_id: 'a1b2c3',
+      secret_id: 'a1b2c3',
+      secret_value: 'a1b2c3',
+    });
+    const expectedResult = {
+      name: 'AWS',
+      description: 'this is a Aws plugin host-catalog',
+      type: 'plugin',
+      attributes: {
+        disable_credential_rotation: true,
+        region: 'spain',
+      },
+      secrets: {
+        access_key_id: 'foobars',
+        secret_access_key: 'testing',
+      },
+    };
+    assert.deepEqual(record.serialize(), expectedResult);
+  });
+
+  test('it serializes a new azure record as expected, ignoring aws fields', async function (assert) {
+    assert.expect(1);
+    const store = this.owner.lookup('service:store');
+    const record = store.createRecord('host-catalog', {
+      compositeType: 'azure',
+      name: 'Azure',
+      description: 'this is a Azure plugin host-catalog',
+      disable_credential_rotation: true,
+      region: 'spain',
+      access_key_id: 'foobars',
+      secret_access_key: 'testing',
+      // these are Azure fields and should be excluded
+      tenant_id: 'a1b2c3',
+      client_id: 'a1b2c3',
+      subscription_id: 'a1b2c3',
+      secret_id: 'a1b2c3',
+      secret_value: 'a1b2c3',
+    });
+    const expectedResult = {
+      name: 'Azure',
+      description: 'this is a Azure plugin host-catalog',
+      type: 'plugin',
+      attributes: {
+        disable_credential_rotation: true,
+        tenant_id: 'a1b2c3',
+        client_id: 'a1b2c3',
+        subscription_id: 'a1b2c3',
+      },
+      secrets: {
+        secret_id: 'a1b2c3',
+        secret_value: 'a1b2c3',
+      },
+    };
+    assert.deepEqual(record.serialize(), expectedResult);
+  });
+
+  test('it serializes an existing aws record correctly', function (assert) {
+    assert.expect(1);
+    const store = this.owner.lookup('service:store');
+    store.push({
+      data: {
+        id: '1',
+        type: 'host-catalog',
+        attributes: {
+          type: 'plugin',
+          name: 'aws',
+          description: 'test description',
+          plugin: {
+            name: 'aws',
+          },
+          region: 'andorra',
+        },
+      },
+    });
+    const record = store.peekRecord('host-catalog', '1');
+    const expectedResult = {
+      type: 'plugin',
+      name: 'aws',
+      description: 'test description',
+      attributes: {
+        disable_credential_rotation: false,
+        region: 'andorra',
+      },
+    };
+    assert.deepEqual(record.serialize(), expectedResult);
+  });
+
+  test('it serializes an existing azure record correctly', function (assert) {
+    assert.expect(1);
+    const store = this.owner.lookup('service:store');
+    store.push({
+      data: {
+        id: '2',
+        type: 'host-catalog',
+        attributes: {
+          type: 'plugin',
+          name: 'azure',
+          description: 'test description',
+          plugin: {
+            name: 'azure',
+          },
+          tenant_id: 'a1b2c3',
+          client_id: 'foobars12',
+          subscription_id: 'barsfoo21',
+        },
+      },
+    });
+    const record = store.peekRecord('host-catalog', '2');
+    const expectedResult = {
+      type: 'plugin',
+      name: 'azure',
+      description: 'test description',
+      attributes: {
+        disable_credential_rotation: false,
+        tenant_id: 'a1b2c3',
+        client_id: 'foobars12',
+        subscription_id: 'barsfoo21',
+      },
+    };
+    assert.deepEqual(record.serialize(), expectedResult);
+  });
+
+  test('it normalizes an static host catalog as expected', function (assert) {
+    assert.expect(1);
+    const store = this.owner.lookup('service:store');
+    const serializer = store.serializerFor('host-catalog');
+    const hostCatalog = store.createRecord('host-catalog').constructor;
+    const payload = {
+      id: '1',
+      name: 'Host catalog test',
+      description: 'Test description',
+      authorized_actions: ['no-op'],
+      type: 'static',
+    };
+    const normalized = serializer.normalizeSingleResponse(
+      store,
+      hostCatalog,
+      payload
+    );
+    assert.deepEqual(normalized, {
+      data: {
+        id: '1',
+        type: 'host-catalog',
+        attributes: {
+          name: 'Host catalog test',
+          description: 'Test description',
+          authorized_actions: ['no-op'],
+          type: 'static',
+          access_key_id: null,
+          secret_access_key: null,
+          secret_id: null,
+          secret_value: null,
+        },
+        relationships: {},
+      },
+      included: [],
+    });
+  });
+
+  test('it normalizes an aws plugin type host catalog as expected', function (assert) {
+    assert.expect(1);
+    const store = this.owner.lookup('service:store');
+    const serializer = store.serializerFor('host-catalog');
+    const hostCatalog = store.createRecord('host-catalog').constructor;
+    const payload = {
+      id: '1',
+      name: 'Host catalog test',
+      description: 'Test description',
+      authorized_actions: ['no-op'],
+      type: 'plugin',
+      plugin: {
+        id: 'plugin-id-5',
+        name: 'aws',
+        description: 'aws host catalog',
+      },
+      attributes: {
+        disable_credential_rotation: false,
+        region: 'Illinois',
+      },
+      secrets: {
+        access_key_id: '0xF3B0a6f8',
+        secret_access_key: 'zq{2:IVc8@W^',
+      },
+    };
+    const normalized = serializer.normalizeSingleResponse(
+      store,
+      hostCatalog,
+      payload
+    );
+    assert.deepEqual(normalized, {
+      data: {
+        id: '1',
+        type: 'host-catalog',
+        attributes: {
+          name: 'Host catalog test',
+          type: 'plugin',
+          description: 'Test description',
+          authorized_actions: ['no-op'],
+          plugin: {
+            id: 'plugin-id-5',
+            name: 'aws',
+            description: 'aws host catalog',
+          },
+          disable_credential_rotation: false,
+          region: 'Illinois',
+          access_key_id: '0xF3B0a6f8',
+          secret_access_key: 'zq{2:IVc8@W^',
+          secret_id: null,
+          secret_value: null,
+        },
+        relationships: {},
+      },
+      included: [],
+    });
+  });
+
+  test('it normalizes an azure plugin type host catalog as expected', function (assert) {
+    assert.expect(1);
+    const store = this.owner.lookup('service:store');
+    const serializer = store.serializerFor('host-catalog');
+    const hostCatalog = store.createRecord('host-catalog').constructor;
+    const payload = {
+      id: '1',
+      name: 'Host catalog test',
+      description: 'Test description',
+      authorized_actions: ['no-op', 'read', 'update', 'delete'],
+      type: 'plugin',
+      plugin: {
+        id: 'plugin-id-6',
+        name: 'azure',
+        description: 'azure host catalog',
+      },
+      attributes: {
+        disable_credential_rotation: true,
+        tenant_id: 'tenant',
+        client_id: 'client',
+        subscription_id: 'subscription',
+      },
+      secrets: {
+        secret_id: '0xF3B0a6f8',
+        secret_value: 'zq{2:IVc8@W^',
+      },
+    };
+    const normalized = serializer.normalizeSingleResponse(
+      store,
+      hostCatalog,
+      payload
+    );
+    assert.deepEqual(normalized, {
+      data: {
+        id: '1',
+        type: 'host-catalog',
+        attributes: {
+          name: 'Host catalog test',
+          type: 'plugin',
+          description: 'Test description',
+          authorized_actions: ['no-op', 'read', 'update', 'delete'],
+          plugin: {
+            id: 'plugin-id-6',
+            name: 'azure',
+            description: 'azure host catalog',
+          },
+          disable_credential_rotation: true,
+          secret_id: '0xF3B0a6f8',
+          secret_value: 'zq{2:IVc8@W^',
+          client_id: 'client',
+          tenant_id: 'tenant',
+          subscription_id: 'subscription',
+          access_key_id: null,
+          secret_access_key: null,
+        },
+        relationships: {},
+      },
+      included: [],
+    });
+  });
+});

addons/api/tests/unit/serializers/host-set-test.js

@@ -7,17 +7,14 @@ module('Unit | Serializer | host set', function (hooks) {
   test('it serializes host sets normally, without host_ids', function (assert) {
     assert.expect(1);
     const store = this.owner.lookup('service:store');
-    const serializer = store.serializerFor('host-set');
     const record = store.createRecord('host-set', {
       name: 'Host Set 1',
+      compositeType: 'static',
       description: 'Description',
       host_catalog_id: '123',
       version: 1,
     });
-    const snapshot = record._createSnapshot();
-    snapshot.adapterOptions = {};
-    const serializedRecord = serializer.serialize(snapshot);
-    assert.deepEqual(serializedRecord, {
+    assert.deepEqual(record.serialize(), {
       name: 'Host Set 1',
       description: 'Description',
       host_catalog_id: '123',
@@ -46,6 +43,58 @@ module('Unit | Serializer | host set', function (hooks) {
     });
   });
 
+  test('it serializes host sets as expected for Aws plugin', function (assert) {
+    assert.expect(1);
+    const store = this.owner.lookup('service:store');
+    const record = store.createRecord('host-set', {
+      name: 'Host Set 1',
+      compositeType: 'aws',
+      description: 'Description',
+      host_catalog_id: '123',
+      version: 1,
+      preferred_endpoints: [{ value: 'option 1' }, { value: 'option 2' }],
+      sync_interval_seconds: 1,
+      filters: [{ value: 'filter 1' }, { value: 'filter 2' }],
+    });
+    assert.deepEqual(record.serialize(), {
+      name: 'Host Set 1',
+      description: 'Description',
+      host_catalog_id: '123',
+      version: 1,
+      preferred_endpoints: ['option 1', 'option 2'],
+      sync_interval_seconds: 1,
+      attributes: {
+        filters: ['filter 1', 'filter 2'],
+      },
+    });
+  });
+
+  test('it serializes host sets as expected for Azure plugin', function (assert) {
+    assert.expect(1);
+    const store = this.owner.lookup('service:store');
+    const record = store.createRecord('host-set', {
+      name: 'Host Set 1',
+      compositeType: 'azure',
+      description: 'Description',
+      host_catalog_id: '123',
+      version: 1,
+      preferred_endpoints: [{ value: 'option 1' }, { value: 'option 2' }],
+      sync_interval_seconds: 1,
+      filter: 'filter 1 && filter 2',
+    });
+    assert.deepEqual(record.serialize(), {
+      name: 'Host Set 1',
+      description: 'Description',
+      host_catalog_id: '123',
+      version: 1,
+      preferred_endpoints: ['option 1', 'option 2'],
+      sync_interval_seconds: 1,
+      attributes: {
+        filter: 'filter 1 && filter 2',
+      },
+    });
+  });
+
   test('it normalizes records with array fields', function (assert) {
     assert.expect(1);
     const store = this.owner.lookup('service:store');
@@ -54,22 +103,32 @@ module('Unit | Serializer | host set', function (hooks) {
     const payload = {
       id: '1',
       name: 'Host Set 1',
+      type: 'static',
       host_ids: ['1', '2', '3'],
+      preferred_endpoints: ['endpoint 1', 'endpoint 2'],
+      filters: ['filter 1', 'filter 2'],
     };
     const normalized = serializer.normalizeSingleResponse(
       store,
       hostSetModelClass,
       payload
     );
+
     assert.deepEqual(normalized, {
       included: [],
       data: {
         id: '1',
         type: 'host-set',
         attributes: {
+          type: 'static',
           authorized_actions: [],
           name: 'Host Set 1',
           host_ids: [{ value: '1' }, { value: '2' }, { value: '3' }],
+          preferred_endpoints: [
+            { value: 'endpoint 1' },
+            { value: 'endpoint 2' },
+          ],
+          filters: [{ value: 'filter 1' }, { value: 'filter 2' }],
         },
         relationships: {},
       },
@@ -101,6 +160,41 @@ module('Unit | Serializer | host set', function (hooks) {
           name: 'Host Set 1',
           scope: { scope_id: 'o_123' },
           host_ids: [],
+          preferred_endpoints: [],
+          filters: [],
+        },
+        relationships: {},
+      },
+    });
+  });
+
+  test('it normalizes missing array fields to empty array', function (assert) {
+    assert.expect(1);
+    const store = this.owner.lookup('service:store');
+    const serializer = store.serializerFor('host-set');
+    const hostSet = store.createRecord('host-set').constructor;
+    const payload = {
+      id: '1',
+      name: 'Host Set 1',
+      scope: { id: 'o_123' },
+    };
+    const normalized = serializer.normalizeSingleResponse(
+      store,
+      hostSet,
+      payload
+    );
+    assert.deepEqual(normalized, {
+      included: [],
+      data: {
+        id: '1',
+        type: 'host-set',
+        attributes: {
+          authorized_actions: [],
+          name: 'Host Set 1',
+          scope: { scope_id: 'o_123' },
+          host_ids: [],
+          preferred_endpoints: [],
+          filters: [],
         },
         relationships: {},
       },

addons/api/tests/unit/serializers/host-test.js

@@ -4,19 +4,92 @@ import { setupTest } from 'ember-qunit';
 module('Unit | Serializer | host', function (hooks) {
   setupTest(hooks);
 
-  test('it exists', function (assert) {
-    let store = this.owner.lookup('service:store');
-    let serializer = store.serializerFor('host');
-
-    assert.ok(serializer);
+  test('it serializes host with type static as expected', function (assert) {
+    assert.expect(1);
+    const store = this.owner.lookup('service:store');
+    const record = store.createRecord('host', {
+      name: 'Host 1',
+      compositeType: 'static',
+      description: 'Description',
+      host_catalog_id: '123',
+      version: 1,
+      address: '188e:68a9:b342:c05c:2595:2f46:499c:759f',
+    });
+    assert.deepEqual(record.serialize(), {
+      name: 'Host 1',
+      description: 'Description',
+      type: 'static',
+      host_catalog_id: '123',
+      version: 1,
+      attributes: {
+        address: '188e:68a9:b342:c05c:2595:2f46:499c:759f',
+      },
+    });
   });
 
-  test('it serializes records', function (assert) {
-    let store = this.owner.lookup('service:store');
-    let record = store.createRecord('host', {});
+  test('it normalizes type static record as expected', function (assert) {
+    assert.expect(1);
+    const store = this.owner.lookup('service:store');
+    const serializer = store.serializerFor('host');
+    const host = store.createRecord('host').constructor;
+    const payload = {
+      id: '1',
+      name: 'host test',
+      type: 'static',
+      authorized_actions: ['no-op', 'read'],
+      address: '10.0.0.1',
+    };
+    const normalized = serializer.normalizeSingleResponse(store, host, payload);
+    assert.deepEqual(normalized, {
+      included: [],
+      data: {
+        id: '1',
+        type: 'host',
+        attributes: {
+          name: 'host test',
+          type: 'static',
+          authorized_actions: ['no-op', 'read'],
+          address: '10.0.0.1',
+          dns_names: [],
+          ip_addresses: [],
+        },
+        relationships: {},
+      },
+    });
+  });
 
-    let serializedRecord = record.serialize();
-
-    assert.ok(serializedRecord);
+  test('it normalizes type plugin (aws) record as expected', function (assert) {
+    assert.expect(1);
+    const store = this.owner.lookup('service:store');
+    const serializer = store.serializerFor('host');
+    const host = store.createRecord('host').constructor;
+    const payload = {
+      id: '1',
+      name: 'host test',
+      type: 'plugin',
+      plugin: {
+        name: 'aws',
+      },
+      authorized_actions: ['no-op', 'read'],
+      ip_addresses: ['10.0.0.1', '10.0.0.2', '10.0.0.3'],
+      dns_names: ['test.example.internal', 'test.example.external'],
+    };
+    const normalized = serializer.normalizeSingleResponse(store, host, payload);
+    assert.deepEqual(normalized, {
+      included: [],
+      data: {
+        id: '1',
+        type: 'host',
+        attributes: {
+          name: 'host test',
+          type: 'plugin',
+          authorized_actions: ['no-op', 'read'],
+          ip_addresses: ['10.0.0.1', '10.0.0.2', '10.0.0.3'],
+          dns_names: ['test.example.internal', 'test.example.external'],
+          plugin: { name: 'aws' },
+        },
+        relationships: {},
+      },
+    });
   });
 });

addons/api/tests/unit/serializers/target-test.js

@@ -20,6 +20,7 @@ module('Unit | Serializer | target', function (hooks) {
         scope_id: 'org_1',
         type: 'org',
       },
+      default_port: 1234,
       version: 1,
       type: 'tcp',
     });
@@ -34,8 +35,9 @@ module('Unit | Serializer | target', function (hooks) {
       scope_id: 'org_1',
       session_max_seconds: 28800,
       session_connection_limit: 1,
+      worker_filter: null,
       attributes: {
-        default_port: null,
+        default_port: 1234,
       },
     });
   });
@@ -85,6 +87,38 @@ module('Unit | Serializer | target', function (hooks) {
     });
   });
 
+  test('it serializes the worker_filter attribute if present', function (assert) {
+    assert.expect(1);
+    const store = this.owner.lookup('service:store');
+    const serializer = store.serializerFor('target');
+    const record = store.createRecord('target', {
+      name: 'User',
+      description: 'Description',
+      version: 1,
+      type: 'ssh',
+      worker_filter: 'worker',
+      default_port: 1234,
+      scope: {
+        scope_id: 'org_1',
+      },
+    });
+    const snapshot = record._createSnapshot();
+    const serializedRecord = serializer.serialize(snapshot);
+    assert.deepEqual(serializedRecord, {
+      name: 'User',
+      description: 'Description',
+      version: 1,
+      type: 'ssh',
+      scope_id: 'org_1',
+      session_max_seconds: 28800,
+      session_connection_limit: 1,
+      worker_filter: 'worker',
+      attributes: {
+        default_port: 1234,
+      },
+    });
+  });
+
   test('it normalizes records with array fields', function (assert) {
     assert.expect(1);
     const store = this.owner.lookup('service:store');
@@ -123,6 +157,40 @@ module('Unit | Serializer | target', function (hooks) {
     });
   });
 
+  test('it normalizes records with nested attributes', function (assert) {
+    assert.expect(1);
+    const store = this.owner.lookup('service:store');
+    const serializer = store.serializerFor('target');
+    const targetModelClass = store.createRecord('target').constructor;
+    const payload = {
+      id: '1',
+      name: 'Target 1',
+      attributes: {
+        default_port: 1234,
+      },
+    };
+    const normalized = serializer.normalizeSingleResponse(
+      store,
+      targetModelClass,
+      payload
+    );
+    assert.deepEqual(normalized, {
+      included: [],
+      data: {
+        id: '1',
+        type: 'target',
+        attributes: {
+          application_credential_source_ids: [],
+          authorized_actions: [],
+          host_sources: [],
+          name: 'Target 1',
+          default_port: 1234,
+        },
+        relationships: {},
+      },
+    });
+  });
+
   test('it normalizes missing host_sources and application_credential_source_ids to empty array', function (assert) {
     assert.expect(1);
     const store = this.owner.lookup('service:store');
@@ -154,4 +222,36 @@ module('Unit | Serializer | target', function (hooks) {
       },
     });
   });
+
+  test('it normalizes the worker_filter attribute if present', function (assert) {
+    assert.expect(1);
+    const store = this.owner.lookup('service:store');
+    const serializer = store.serializerFor('target');
+    const target = store.createRecord('target').constructor;
+    const payload = {
+      id: '1',
+      name: 'Target 1',
+      worker_filter: 'worker',
+    };
+    const normalized = serializer.normalizeSingleResponse(
+      store,
+      target,
+      payload
+    );
+    assert.deepEqual(normalized, {
+      included: [],
+      data: {
+        id: '1',
+        type: 'target',
+        attributes: {
+          authorized_actions: [],
+          name: 'Target 1',
+          host_sources: [],
+          application_credential_source_ids: [],
+          worker_filter: 'worker',
+        },
+        relationships: {},
+      },
+    });
+  });
 });

addons/auth/.eslintignore

@@ -14,8 +14,3 @@
 /coverage/
 !.*
 .eslintcache
-
-# ember-try
-/.node_modules.ember-try/
-/bower.json.ember-try
-/package.json.ember-try

addons/auth/.eslintrc.js

@@ -2,13 +2,16 @@
 
 module.exports = {
   root: true,
-  parser: 'babel-eslint',
+  parser: '@babel/eslint-parser',
   parserOptions: {
     ecmaVersion: 2018,
     sourceType: 'module',
-    ecmaFeatures: {
-      legacyDecorators: true,
+    // This is specific babel-config. If grows consider creating a babel config file
+    requireConfigFile: false,
+    babelOptions: {
+      plugins: [['@babel/plugin-proposal-decorators', { legacy: true }]],
     },
+    // end of babel-config
   },
   plugins: ['ember'],
   extends: [

addons/auth/.npmignore

@@ -19,15 +19,9 @@
 /.travis.yml
 /.watchmanconfig
 /bower.json
-/config/ember-try.js
 /CONTRIBUTING.md
 /ember-cli-build.js
 /testem.js
 /tests/
 /yarn.lock
 .gitkeep
-
-# ember-try
-/.node_modules.ember-try/
-/bower.json.ember-try
-/package.json.ember-try

addons/auth/.prettierignore

@@ -14,8 +14,3 @@
 /coverage/
 !.*
 .eslintcache
-
-# ember-try
-/.node_modules.ember-try/
-/bower.json.ember-try
-/package.json.ember-try

addons/auth/README.md

@@ -34,19 +34,21 @@ List of available project commands.  `yarn run <command-name>`
 | Command | Description |
 | ------- | ----------- |
 | lint | Runs all lint commands. |
+| lint:fix | Runs automatic lint fixes for all files. |
 | lint:js | Lints `js` files. |
+| lint:js:fix | Runs automatic lint fixes for `js` files. |
 | format | Runs all auto-formatters. |
 | format:js | Auto-formats `js` files using Prettier. |
 | start | Runs the dummy app local server. |
 | test | Runs all tests. |
 | test:all | Runs tests across multiple Ember versions with ember-try. |
+| precommit | Runs all lint, format and tests. |
 | doc:toc | Automatically generates a table of contents for this README file. |
 
 Additional commands in the monorepo package may affect this projects.
 
 ## Linting
 
-* `yarn lint:hbs`
 * `yarn lint:js`
 * `yarn lint:js --fix`
 

addons/auth/config/ember-try.js

@@ -1,79 +0,0 @@
-'use strict';
-
-const getChannelURL = require('ember-source-channel-url');
-
-module.exports = async function () {
-  return {
-    useYarn: true,
-    scenarios: [
-      {
-        name: 'ember-lts-3.16',
-        npm: {
-          devDependencies: {
-            'ember-source': '~3.16.0',
-          },
-        },
-      },
-      {
-        name: 'ember-lts-3.20',
-        npm: {
-          devDependencies: {
-            'ember-source': '~3.20.5',
-          },
-        },
-      },
-      {
-        name: 'ember-release',
-        npm: {
-          devDependencies: {
-            'ember-source': await getChannelURL('release'),
-          },
-        },
-      },
-      {
-        name: 'ember-beta',
-        npm: {
-          devDependencies: {
-            'ember-source': await getChannelURL('beta'),
-          },
-        },
-      },
-      {
-        name: 'ember-canary',
-        npm: {
-          devDependencies: {
-            'ember-source': await getChannelURL('canary'),
-          },
-        },
-      },
-      {
-        name: 'ember-default-with-jquery',
-        env: {
-          EMBER_OPTIONAL_FEATURES: JSON.stringify({
-            'jquery-integration': true,
-          }),
-        },
-        npm: {
-          devDependencies: {
-            '@ember/jquery': '^1.1.0',
-          },
-        },
-      },
-      {
-        name: 'ember-classic',
-        env: {
-          EMBER_OPTIONAL_FEATURES: JSON.stringify({
-            'application-template-wrapper': true,
-            'default-async-observers': false,
-            'template-only-glimmer-components': false,
-          }),
-        },
-        npm: {
-          ember: {
-            edition: 'classic',
-          },
-        },
-      },
-    ],
-  };
-};