Delete SSH type targets mention on changelog

✅ Closes: ICU-3642

.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
+        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@v2
         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@v2
+      - uses: actions/cache@v2
+        id: node-modules-cache
+        with:
+          path: '**/node_modules'
+          key: node-modules-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            node-modules-
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '16.x'
+        if: steps.node-modules-cache.outputs.cache-hit != 'true'
       - run: yarn run compliance:licenses
 
   lint:
     name: Lint
+    needs: [dependencies]
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
       - uses: actions/checkout@v2
       - uses: actions/cache@v2
-        id: cache
+        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@v2
         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: [dependencies]
     runs-on: ubuntu-latest
     timeout-minutes: 15
     steps:
       - uses: actions/checkout@v2
       - uses: actions/cache@v2
-        id: cache
+        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@v2
         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

addons/api/.eslintignore

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

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/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/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/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/base.js

@@ -47,6 +47,10 @@ export default class BaseModel extends Model {
   })
   authorized_collection_actions;
 
+  get scopeModel() {
+    const id = this.scopeID;
+    return this.store.peekRecord('scope', id);
+  }
   set scopeModel(model) {
     if (model) {
       const json = model.serialize();

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,3 +1,71 @@
 import GeneratedHostCatalogModel from '../generated/models/host-catalog';
 
-export default class HostCatalogModel extends GeneratedHostCatalogModel {}
+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/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/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;
   }
 
@@ -195,9 +209,63 @@ 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;
+  }
 }

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/addon/services/resource-filter-store.js

@@ -8,10 +8,11 @@ import { inject as service } from '@ember/service';
  * @example
  *   const filter = new ResourceFilter({
  *     type: 'oidc',
- *     status: ['active', 'pending']
+ *     status: ['active', 'pending'],
+ *     authorized_actions: [{ contains: 'read' }]
  *   });
  *   log(filter.queryExpression);
- *   // ("/item/type" == "oidc") and ("/item/status" == "active" or "/item/status" == "pending")
+ *   // ("/item/type" == "oidc") and ("/item/status" == "active" or "/item/status" == "pending") and ("read" in "/item/authorized_actions")
  */
 export class ResourceFilter {
   // =attributes
@@ -30,7 +31,14 @@ export class ResourceFilter {
         const value = this.#filterObject[key];
         const valuesArray = Array.isArray(value) ? value : [value];
         return this.parenthetical(
-          this.or(valuesArray.map((value) => this.equals(key, value)))
+          this.or(
+            valuesArray.map((value) => {
+              if (value && value.contains) {
+                return this.in(value.contains, key);
+              }
+              return this.equals(key, value);
+            })
+          )
         );
       })
       .flat()
@@ -56,6 +64,15 @@ export class ResourceFilter {
     return value !== null ? `"/item/${key}" == "${value}"` : null;
   }
 
+  /**
+   * @param {string} key
+   * @param value
+   * @return {string}
+   */
+  in(value, key) {
+    return value !== null ? `"${value}" in "/item/${key}"` : null;
+  }
+
   /**
    * @param {string[]} clauses
    * @return {string}

addons/api/app/abilities/collection.js

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

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

@@ -26,16 +26,18 @@ export default function () {
 
   this.get(
     '/scopes',
-    ({ scopes }, { queryParams: { scope_id, recursive } }) => {
+    ({ scopes }, { queryParams: { scope_id, recursive, filter } }) => {
+      let resultSet;
       // Default parent scope is global
       if (!scope_id) scope_id = 'global';
       if (recursive && scope_id === 'global') {
-        return scopes.all();
+        resultSet = scopes.all();
       } else {
-        return scopes.where((scope) => {
+        resultSet = scopes.where((scope) => {
           return scope.scope ? scope.scope.id === scope_id : false;
         });
       }
+      return resultSet.filter(makeBooleanFilter(filter));
     }
   );
   this.post('/scopes', function ({ scopes }) {
@@ -268,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');
@@ -347,19 +361,22 @@ export default function () {
 
   this.get(
     '/targets',
-    function ({ targets }, { queryParams: { scope_id, recursive } }) {
+    function ({ targets }, { queryParams: { scope_id, recursive, filter } }) {
+      let resultSet;
       if (recursive && scope_id === 'global') {
-        return targets.all();
+        resultSet = targets.all();
       } else if (recursive) {
-        return targets.where((target) => {
+        resultSet = targets.where((target) => {
           const targetModel = targets.find(target.id);
           return (
             target.scopeId === scope_id ||
             targetModel?.scope?.scope?.id === scope_id
           );
         });
+      } else {
+        resultSet = targets.where((target) => target.scopeId === scope_id);
       }
-      return targets.where((target) => target.scopeId === scope_id);
+      return resultSet.filter(makeBooleanFilter(filter));
     }
   );
   this.post('/targets', function ({ targets }) {
@@ -531,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/host-catalog.js

@@ -1,8 +1,21 @@
 import factory from '../generated/factories/host-catalog';
 import { trait } from 'ember-cli-mirage';
 import permissions from '../helpers/permissions';
+import { datatype, address, random } from 'faker';
+
+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: (i) => `host-catalog-id-${i}`,
+
+  // Cycle through available types
+  type: (i) => types[i % types.length],
+
   authorized_actions: () =>
     permissions.authorizedActionsFor('host-catalog') || [
       'no-op',
@@ -10,17 +23,61 @@ 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 } = hostCatalog;
-      const hosts = server.createList('host', 10, { scope, hostCatalog });
-      server.createList('host-set', 3, { scope, hostCatalog, hosts });
+      const { scope, type } = hostCatalog;
+      const hosts = server.createList('host', 10, { scope, hostCatalog, type });
+      server.createList('host-set', 3, { scope, hostCatalog, hosts, type });
     },
   }),
 });

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

@@ -1,15 +1,54 @@
 import factory from '../generated/factories/host-set';
 import permissions from '../helpers/permissions';
+import { datatype, internet, database } from 'faker';
 
 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}`,
+  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,44 @@
 import factory from '../generated/factories/host';
 import permissions from '../helpers/permissions';
+import { internet, datatype } from 'faker';
 
 export default factory.extend({
-  authorized_actions: () =>
-    permissions.authorizedActionsFor('host') || [
-      'no-op',
-      'read',
-      'update',
-      'delete',
-    ],
   id: (i) => `host-id-${i}`,
+  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/target.js

@@ -5,6 +5,7 @@ import permissions from '../helpers/permissions';
 
 const randomBoolean = (chance = 0.5) => Math.random() < chance;
 const hostSetChance = 0.3;
+const types = ['tcp', 'ssh'];
 
 export default factory.extend({
   authorized_actions: () =>
@@ -24,12 +25,12 @@ export default factory.extend({
    * -1 means "unlimited" and we want to generate these on occasion.
    */
   session_connection_limit: () => random.arrayElement([-1, datatype.number()]),
-
+  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/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/route-handlers/auth.js

@@ -44,7 +44,7 @@ const commandHandlers = {
               id: 'token123',
               token: 'thetokenstring',
               account_id: '1',
-              user_id: 'user123',
+              user_id: 'authenticateduser',
               auth_method_id: 'authmethod123',
               created_time: '',
               updated_time: '',
@@ -93,7 +93,7 @@ const commandHandlers = {
               id: 'token123',
               token: 'thetokenstring',
               account_id: '1',
-              user_id: 'user123',
+              user_id: 'authenticateduser',
               auth_method_id: 'authmethod123',
               created_time: '',
               updated_time: '',

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/package.json

@@ -25,7 +25,7 @@
   },
   "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",
@@ -34,16 +34,16 @@
   },
   "devDependencies": {
     "js-bexpr": "hashicorp/js-bexpr#9b4a4b54d85eba67fdfc0990133d1518d890b1e1",
-    "@babel/core": "^7.15.8",
+    "@babel/core": "^7.16.5",
     "@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,13 +53,11 @@
     "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-config-prettier": "^8.3.0",
     "eslint-plugin-ember": "^10.5.4",
@@ -73,7 +71,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/base-test.js

@@ -13,8 +13,8 @@ module('Unit | Model | base', function (hooks) {
     assert.ok(model);
   });
 
-  test('it may have a scope fragment', function (assert) {
-    assert.expect(1);
+  test('it may have a scope fragment (and thus a scopeModel)', function (assert) {
+    assert.expect(2);
     const store = this.owner.lookup('service:store');
     store.push({
       data: {
@@ -37,6 +37,7 @@ module('Unit | Model | base', function (hooks) {
     const scope = store.peekRecord('scope', 'o_1');
     const model = store.peekRecord('user', '123abc');
     assert.equal(model.scope.scope_id, scope.id);
+    assert.equal(model.scopeModel.id, scope.id);
   });
 
   test('it may accept a `scopeModel` for convenience, instead of a fragment', function (assert) {

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

@@ -9,4 +9,108 @@ module('Unit | Model | host catalog', function (hooks) {
     let model = store.createRecord('host-catalog', {});
     assert.ok(model);
   });
+
+  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', { 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

@@ -5,12 +5,14 @@ module('Unit | Model | host', function (hooks) {
   setupTest(hooks);
 
   test('it exists', function (assert) {
+    assert.expect(1);
     let store = this.owner.lookup('service:store');
     let model = store.createRecord('host', {});
     assert.ok(model);
   });
 
   test('it contains attributes', function (assert) {
+    assert.expect(1);
     let store = this.owner.lookup('service:store');
     let model = store.createRecord('host', {
       type: 'static',
@@ -20,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/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',
     });
@@ -35,7 +36,7 @@ module('Unit | Serializer | target', function (hooks) {
       session_max_seconds: 28800,
       session_connection_limit: 1,
       attributes: {
-        default_port: null,
+        default_port: 1234,
       },
     });
   });
@@ -123,6 +124,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');

addons/api/tests/unit/services/resource-filter-store-test.js

@@ -10,9 +10,10 @@ module('Unit | Service | resource-filter-store', function (hooks) {
     const filter = new ResourceFilter({
       type: 'oidc',
       status: ['active', 'pending'],
+      authorized_actions: [{ contains: 'read' }],
     });
     const expected =
-      '("/item/type" == "oidc") and ("/item/status" == "active" or "/item/status" == "pending")';
+      '("/item/type" == "oidc") and ("/item/status" == "active" or "/item/status" == "pending") and ("read" in "/item/authorized_actions")';
     assert.equal(filter.queryExpression, expected);
   });
 });

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/.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/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',
-          },
-        },
-      },
-    ],
-  };
-};

addons/auth/package.json

@@ -21,22 +21,22 @@
     "doc:toc": "doctoc README.md"
   },
   "dependencies": {
-    "ember-cli-babel": "^7.26.6",
+    "ember-cli-babel": "^7.26.8",
     "ember-cli-htmlbars": "^5.7.1",
     "ember-fetch": "^8.1.1",
     "ember-simple-auth": "^4.0.0"
   },
   "devDependencies": {
     "@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",
     "core": "*",
-    "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",
@@ -46,13 +46,11 @@
     "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-config-prettier": "^8.3.0",
     "eslint-plugin-ember": "^10.5.4",
@@ -66,7 +64,7 @@
     "qunit-dom": "^2.0.0"
   },
   "engines": {
-    "node": ">=12 <=17"
+    "node": "12.* || 14.* || 16.*"
   },
   "ember": {
     "edition": "octane"

addons/core/.eslintignore

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

addons/core/.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/core/.prettierignore

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

addons/core/addon/components/doc-link/index.hbs

@@ -1,6 +1,6 @@
 <a
   class="doc-link"
-  href={{doc-url @doc}}
+  href={{(doc-url @doc)}}
   target="_blank"
   rel="noreferrer noopener"
   title={{t "actions.get-topic-help"}}>

addons/core/addon/decorators/resource-filter-param.js

@@ -1,92 +0,0 @@
-/**
- * A resource filter param is a concise way to express a route query parameter.
- * Resource filter params abstract away a route's query parameter
- * interface, treating a query param as a simple attribute on a route instance.
- * Getting the attribute value is equivalent to looking up the associated query
- * parameter.  Setting the attribute is equivalent to transitioning to the route
- * and passing the associated query parameter value.
- *
- * Additionally, resource filter params may declare `allowedValues`, an array
- * containing the set of values the parameter may take.  While unenforced,
- * `allowedValues` are useful metadata about a resource filter and may be fetch
- * via `ResourceFilterParamHelper`.  An optional default value may be specified
- * via `defaultValue` passed to the decorator.
- *
- * @see ResourceFilterParamHelper
- *
- * @example
- *
- *   export default class MyRoute extends Route {
- *
- *     @resourceFilterParam(['active', 'pending'], ['active'])
- *     status;
- *
- *     @action
- *     changeStatus(status) {
- *       // Sets query param `filter-status` on the current route, which occurs
- *       // via a route transition.
- *       this.status = status;
- *       // Log the value of query param `filter-status`.
- *       log(this.status);
- *     }
- *   }
- *
- */
-export function resourceFilterParam(allowedValues, defaultValue) {
-  /**
-   * @param {object} target
-   * @param {string} name
-   * @param {object} descriptor
-   * @return {object{get, set}}
-   */
-  return function (target, name /*, descriptor*/) {
-    const filterKey = `filter-${name}`;
-    const filterAllowedValuesKey = `filter-allowed-values-${name}`;
-
-    // If the route has no query params specified yet, declare them.
-    if (!Object.keys(target.queryParams).length) target.queryParams = {};
-
-    // If the route has no resource filters list specified yet, create one.
-    if (!target.resourceFilterParams) target.resourceFilterParams = [];
-
-    // Add the resource filter query parameter to the route.  Resource filter
-    // param changes refresh the model but do not contribute to browser history.
-    // See https://guides.emberjs.com/release/routing/query-params/
-    target.queryParams[filterKey] = {
-      refreshModel: true,
-      replace: true,
-    };
-
-    // Note the name of this filter param.
-    target.resourceFilterParams.push(name);
-
-    // Store the allowed values for future lookup
-    // (via `ResourceFilterParamHelper`).
-    target[filterAllowedValuesKey] = allowedValues;
-
-    // Override the decorated attribute with a getter and setter.
-    return {
-      /**
-       * Returns the JSON-parsed query parameter value OR defaultValue.
-       */
-      get() {
-        const value =
-          this.paramsFor(this.routeName)[filterKey] ||
-          JSON.stringify(defaultValue);
-        return value ? JSON.parse(value) : null;
-      },
-
-      /**
-       * Sets the resource filter param to the stringified representation
-       * of `value`.  NOTE:  this is equivalent to transitioning into the
-       * current route, changing the associated query param.
-       * @param value
-       */
-      set(value) {
-        const queryParams = {};
-        queryParams[filterKey] = JSON.stringify(value);
-        this.transitionTo({ queryParams });
-      },
-    };
-  };
-}

addons/core/addon/decorators/resource-filter.js

@@ -0,0 +1,256 @@
+import EmberObject from '@ember/object';
+import { getOwner } from '@ember/application';
+import { typeOf } from '@ember/utils';
+
+/**
+ * @param value
+ * @return {boolean} true if `value` is a function
+ */
+const isFunction = (value) => typeOf(value) === 'function';
+
+/**
+ * Represents a filter on a specific route and maintains filter state.
+ * @class
+ */
+class RouteResourceFilter extends EmberObject {
+  // =attributes
+
+  route;
+  name;
+  defaultValue;
+  allowed;
+  serialize;
+  findBySerialized;
+
+  // =computed
+
+  /**
+   * Query parameter name where the selected value(s) for this filter are
+   * stored in the URL.
+   * @type {string}
+   */
+  get filterKey() {
+    return `filter-${this.name}`;
+  }
+
+  /**
+   * The allowed values for this filter.  See `allowed`.
+   * @type {?array}
+   */
+  get allowedValues() {
+    if (isFunction(this.allowed)) {
+      return this.allowed(this.route);
+    }
+    return this.allowed;
+  }
+
+  get router() {
+    const owner = getOwner(this.route);
+    return owner.lookup('service:router');
+  }
+
+  /**
+   * Currently selected value(s) for this filter, deserialized from the value of
+   * the associated route query parameter.
+   * @type {?array}
+   */
+  get value() {
+    const decodedValue =
+      this.route.paramsFor(this.route.routeName)[this.filterKey] ||
+      JSON.stringify(this.defaultValue);
+    const value = decodedValue ? JSON.parse(decodedValue) : null;
+    const deserializedValue = value
+      ? value.map((serializedValue) =>
+          this.allowedValues.find((item) =>
+            this.deserializeValue(item, serializedValue)
+          )
+        )
+      : null;
+    return deserializedValue;
+  }
+  set value(value) {
+    const queryParams = {};
+    const serialized = value.map((value) => this.serializeValue(value));
+    queryParams[this.filterKey] = JSON.stringify(serialized);
+    this.router.transitionTo(this.route.routeName, { queryParams });
+  }
+
+  // =methods
+
+  /**
+   * Calls `serialize` (if set) on the passed value.  Otherwise returns the
+   * value unaltered.
+   */
+  serializeValue(value) {
+    if (this.serialize) {
+      return this.serialize(...arguments);
+    }
+    return value;
+  }
+
+  /**
+   * Tests if `item` is represented by `serializedValue` when deserializing
+   * items from the query string.  If `findBySerialized` is unspecified,
+   * a simple equality test is used.
+   * @param item
+   * @param {string} serializedValue
+   * @return {boolean} item is represented by `serializedValue`
+   */
+  deserializeValue(item, serializedValue) {
+    if (this.findBySerialized) {
+      return this.findBySerialized(...arguments);
+    }
+    return item === serializedValue;
+  }
+
+  // =static methods
+
+  /**
+   * Configures the specified route with a query parameter of `name` that, when
+   * changed, refreshes the route model and replaces history (rather than
+   * advancing history).
+   * @static
+   * @param {Route} routeClass
+   * @param {string} name
+   */
+  static setupRouteQueryParams(routeClass, name) {
+    const filterKey = `filter-${name}`;
+
+    // If the route has no query params specified yet, declare them.
+    if (!Object.keys(routeClass.queryParams).length)
+      routeClass.queryParams = {};
+
+    // If the route has no resource filters list specified yet, create one.
+    if (!routeClass.resourceFilterParams) routeClass.resourceFilterParams = [];
+
+    // Add the resource filter query parameter to the route.  Resource filter
+    // param changes refresh the model but do not contribute to browser history.
+    // See https://guides.emberjs.com/release/routing/query-params/
+    routeClass.queryParams[filterKey] = {
+      refreshModel: true,
+      replace: true,
+    };
+  }
+
+  /**
+   * Factory method to instantiate an instance of this class.
+   * @static
+   * @param {Route} routeInstance
+   * @param {string} name
+   * @param {array|function} allowed
+   * @param {?array} defaultValue
+   * @param {?function} serialize
+   * @param {?function} findBySerialized
+   * @return {RouteResourceFilter}
+   */
+  static getOrCreateRouteResourceFilter(
+    routeInstance,
+    name,
+    allowed,
+    defaultValue,
+    serialize,
+    findBySerialized
+  ) {
+    const owner = getOwner(routeInstance);
+    const containerKey = `resource-filter:${name}@${routeInstance.routeName}`;
+    const factory = owner.factoryFor(containerKey);
+    if (!factory) {
+      // create factory
+      class AppliedRouteResourceFilter extends this {
+        route = routeInstance;
+        name = name;
+        allowed = allowed;
+        defaultValue = defaultValue;
+        serialize = serialize;
+        findBySerialized = findBySerialized;
+      }
+      owner.register(containerKey, AppliedRouteResourceFilter);
+    }
+    const instance = owner.lookup(containerKey);
+    return instance;
+  }
+}
+
+/**
+ * This decorator provides a concise way to express a route resource filter.
+ * Resource filter params abstract away a route's query parameter
+ * interface, treating a query param as just an attribute on a route instance.
+ * Getting the attribute value is equivalent to looking up the associated query
+ * parameter.  Setting the attribute is equivalent to transitioning to the route
+ * and passing the associated query parameter value.
+ *
+ * Additionally, resource filter params may declare `allowed`, an array
+ * (or function returning an array) containing the set of values the parameter
+ * may take.  While unenforced, `allowed` are useful metadata about a resource
+ * filter and may be fetch via `ResourceFilterParamHelper`.  An optional default
+ * value may be specified via `defaultValue` passed to the decorator.
+ *
+ * @see ResourceFilterParamHelper
+ *
+ * @example
+ *
+ *   export default class MyRoute extends Route {
+ *
+ *     @resourceFilter({
+ *       allowed: ['active', 'pending'],
+ *       defaultvalue: ['active'],         // optional
+ *     })
+ *     status;
+ *
+ *     @action
+ *     changeStatus(status) {
+ *       // Sets query param `filter-status` on the current route, which occurs
+ *       // via a route transition.
+ *       this.status = status;
+ *       // Log the value of query param `filter-status`.
+ *       log(this.status);
+ *     }
+ *   }
+ *
+ */
+export function resourceFilter({
+  allowed,
+  defaultValue,
+  serialize,
+  findBySerialized,
+}) {
+  /**
+   * @param {object} target
+   * @param {string} name
+   * @param {object} descriptor
+   * @return {object{get, set}}
+   */
+  return function (target, name /*, descriptor*/) {
+    RouteResourceFilter.setupRouteQueryParams(target, name);
+
+    let instance;
+
+    // Override the decorated attribute with a getter and setter.
+    return {
+      /**
+       * Returns the current value of the resource filter.
+       */
+      get() {
+        instance = RouteResourceFilter.getOrCreateRouteResourceFilter(
+          this,
+          name,
+          allowed,
+          defaultValue,
+          serialize,
+          findBySerialized
+        );
+        return instance.value;
+      },
+
+      /**
+       * Sets the resource filter param to the stringified representation
+       * of `value`.  NOTE:  this is equivalent to transitioning into the
+       * current route, changing the associated query param.
+       * @param value
+       */
+      set(value) {
+        instance.value = value;
+      },
+    };
+  };
+}

addons/core/addon/helpers/has-resource-filter-selections.js

@@ -11,11 +11,11 @@ import { action } from '@ember/object';
  *
  * @example
  *
- *   {{#if (has-resource-filter-param-selections 'route.name' 'field')}}
+ *   {{#if (has-resource-filter-selections 'route.name' 'field')}}
  *     Field has filter selections.
  *   {{/if}}
  */
-export default class HasResourceFilterParamSelectionsHelper extends Helper {
+export default class HasRouteResourceFilterSelectionsHelper extends Helper {
   // =services
 
   @service router;
@@ -44,14 +44,14 @@ export default class HasResourceFilterParamSelectionsHelper extends Helper {
 
   /**
    * Returns true if the specified route has a value set for
-   * any resource filter.
+   * any resource filter passed into the helper.
    * @param {string} routeName
+   * @param {string[]} names - names of resource filter fields
    * @return {boolean}
    */
-  compute([routeName]) {
+  compute([routeName, ...names]) {
     const owner = getOwner(this);
     const route = owner.lookup(`route:${routeName}`);
-    const names = route.resourceFilterParams;
     const selectedValues = names.map((name) => route[name] || null).flat();
     const anyTruthy = selectedValues.reduce(
       (previousValue, currentValue) => previousValue || currentValue,

addons/core/addon/helpers/resource-filter.js

@@ -7,15 +7,15 @@ import { action } from '@ember/object';
  * Use this helper to fetch the current value of a resource filter param,
  * as well as its allowedValues.
  *
- * @see resourceFilterParam (decorator)
+ * @see resourceFilter (decorator)
  *
  * @example
  *
- *   {{#with resource-filter-param 'status' as |param|}}
+ *   {{#with resource-filter 'status' as |param|}}
  *     {{param.name}} / {{param.value}} / {{param.selectedValue}}
  *   {{/with}}
  */
-export default class ResourceFilterParamHelper extends Helper {
+export default class ResourceFilterHelper extends Helper {
   // =services
 
   @service router;
@@ -50,13 +50,9 @@ export default class ResourceFilterParamHelper extends Helper {
    */
   compute([routeName, name]) {
     const owner = getOwner(this);
-    // Filter options
-    const route = owner.lookup(`route:${routeName}`);
-    const filterAllowedValuesKey = `filter-allowed-values-${name}`;
-    const allowedValues = route[filterAllowedValuesKey];
-    // Selected filters
-    const rawValue = route[name];
-    const selectedValue = rawValue || null;
+    const containerKey = `resource-filter:${name}@${routeName}`;
+    const resourceFilter = owner.lookup(containerKey);
+    const { allowedValues, value: selectedValue } = resourceFilter;
     return { name, allowedValues, selectedValue };
   }
 

addons/core/app/decorators/resource-filter-param.js

@@ -1 +0,0 @@
-export { default } from 'core/decorators/resource-filter-param';

addons/core/app/decorators/resource-filter.js

@@ -0,0 +1 @@
+export { default } from 'core/decorators/resource-filter';

addons/core/app/helpers/has-resource-filter-param-selections.js

@@ -1 +0,0 @@
-export { default } from 'core/helpers/has-resource-filter-param-selections';

addons/core/app/helpers/has-resource-filter-selections.js

@@ -0,0 +1 @@
+export { default } from 'core/helpers/has-resource-filter-selections';

addons/core/app/helpers/resource-filter-param.js

@@ -1 +0,0 @@
-export { default } from 'core/helpers/resource-filter-param';

addons/core/app/helpers/resource-filter.js

@@ -0,0 +1 @@
+export { default } from 'core/helpers/resource-filter';

addons/core/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',
-          },
-        },
-      },
-    ],
-  };
-};

addons/core/package.json

@@ -31,25 +31,25 @@
     "api": "*",
     "auth": "*",
     "ember-browser-services": "^2.0.0",
-    "ember-cli-babel": "^7.26.6",
+    "ember-cli-babel": "^7.26.8",
     "ember-cli-htmlbars": "^5.7.1",
     "ember-feature-flags": "^6.0.0",
     "ember-intl": "^5.7.0",
-    "ember-loading": "^0.4.0",
+    "ember-loading": "^2.0.0",
     "ember-route-action-helper": "^2.0.8",
     "ember-truth-helpers": "^3.0.0",
     "rose": "*"
   },
   "devDependencies": {
     "@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",
@@ -59,13 +59,11 @@
     "ember-inline-svg": "^1.0.0",
     "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-config-prettier": "^8.3.0",
     "eslint-plugin-ember": "^10.5.4",
@@ -81,7 +79,7 @@
     "qunit-dom": "^2.0.0"
   },
   "engines": {
-    "node": ">=12 <=17"
+    "node": "12.* || 14.* || 16.*"
   },
   "ember": {
     "edition": "octane"

addons/core/translations/actions/en-us.yaml

@@ -36,3 +36,4 @@ toggle-secret: Toggle secret visibility
 minimize: Minimize
 fullscreen: Fullscreen
 clear-all-filters: Clear all filters
+learn-more: Learn more

addons/core/translations/en-us.yaml

@@ -30,12 +30,17 @@ titles:
   label: Label
   value: Value
   no-results: No Results
+  choose-a-provider: Choose a provider
+  provider: Provider
 descriptions:
   empty-set: There are no items to display yet.  You may be able to add items or try back later.
   origin-initialization: To get started, please enter your origin URL
   create-but-not-list: You do not have permission to list {resource}, but you can create new instances.
   neither-list-nor-create: You do not have permission to list or create {resource}.
   no-results: We found no matching records.
+  choose-a-provider: There are several built-in plugins for the most common providers. You can choose from on of the included plugins or use a custom plugin.
+  choose-a-provider-azure: Boundary does not yet support rotating credentials.
+  provider: This is the provider for this host catalog. The format of the host set filters are specific to each provider.
 questions:
   delete-confirm: Are you sure you want to delete this resource?
   remove-confirm: Are you sure you want to remove this association?

addons/core/translations/form/en-us.yaml

@@ -118,3 +118,28 @@ callback_url:
 filter:
   label: Filter
   help: A boolean expression defining a filter run against the provided information.
+tenant_id:
+  label: Tenant ID
+  help: The tenant (directory) ID for your Azure Active Directory application.
+subscription_id:
+  label: Subscription ID
+  help: The subscription ID for the subscription with read access.
+access_key_id:
+  label: Access Key ID
+  help: The access key ID found on the Security Credentials page in AWS.
+secret_access_key:
+  label: Secret Access Key
+  help: The secret access key found on the Security Credentials page in AWS.
+region:
+  label: Region
+secret:
+  label: Client secret value
+  help: The client secret value for the client you want Boundary to use
+disable_credential_rotation:
+  label: Disable credential rotation
+dns_names:
+  label: Latest DNS Names
+host:
+  label: Host
+ip_addresses:
+  label: Latest IP Addresses

addons/core/translations/resources/en-us.yaml

@@ -78,13 +78,25 @@ host-catalog:
   title: Host Catalog
   title_plural: Host Catalogs
   description: A host catalog is a collection of hosts and host sets.
+  type: Type
   messages:
     welcome:
       title: Welcome to Host Catalogs
   actions:
     delete: Delete Host Catalog
+  help:
+    static: Provide a list of hosts and host sets with static addresses
+    dynamic: Automate discovery of target hosts and services on Azure or AWS
   types:
     static: Static
+    unknown: Plugin
+    aws: AWS
+    azure: Azure
+    dynamic: Dynamic
+  form:
+    azure_client_id:
+      label: Client ID
+      help: The client ID for the client you want Boundary to use.
 host-set:
   title: Host Set
   title_plural: Host Sets
@@ -95,6 +107,13 @@ host-set:
     delete: Delete Host Set
     create-and-add-host: Create and Add Host
     add-hosts: Add Existing Host
+  form:
+    filter: 
+      label: Filter
+      help: Create a filter to select resources using values such as tag name or tag value. Filter format is specific to each provider
+    preferred_endpoints:
+      label: Preferred Endpoints
+      help: Selects addresses of hosts, in cidr:<valid IPv4/6 CIDR> or dns:<globbed name>  format
   messages:
     welcome:
       title: Welcome to Host Sets
@@ -109,8 +128,6 @@ host-set:
       add-none:
         title: No Hosts Available
         description: No hosts available for selection.
-  types:
-    static: Static
 host:
   title: Host
   title_plural: Hosts
@@ -128,8 +145,6 @@ host:
     add: Add Host
     create: New Host
     delete: Delete Host
-  types:
-    static: Static
 session:
   title: Session
   title_plural: Sessions
@@ -262,6 +277,7 @@ target:
     add-credential-sources: Add Credential Sources
   types:
     tcp: TCP
+    ssh: SSH
   host-source:
     title: Host Source
     title_plural: Host Sources

addons/rose/.eslintignore

@@ -17,9 +17,4 @@ main.js
 !.*
 .eslintcache
 
-# ember-try
-/.node_modules.ember-try/
-/bower.json.ember-try
-/package.json.ember-try
-
 index.js

addons/rose/.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/rose/.prettierignore

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

addons/rose/addon/components/rose/form/helper-text/index.hbs

@@ -4,4 +4,9 @@
   ...attributes
 >
   {{yield}}
+  {{#if @link}} 
+    {{#if @linkText}}
+      <a href={{@link}} target='_blank' rel='noreferrer noopener'>{{@linkText}}</a>
+    {{/if}}
+  {{/if}}
 </span>

addons/rose/addon/components/rose/form/helper-text/index.stories.mdx

@@ -11,7 +11,7 @@ Displays helpful messages related to a form field.  This component is used
 by form fields and should not be used directly.
 
 ```html
-<Rose::Form::HelperText @id="helper-text-{{field.id}}">
+<Rose::Form::HelperText @id="helper-text-{{field.id}}" @link='link' @linkText='link text goes here'>
   Helper text
 </Rose::Form::HelperText>
 ```
@@ -19,12 +19,14 @@ by form fields and should not be used directly.
 <Preview>
   <Story name="HelperText">{{
     template: hbs`
-      <Rose::Form::HelperText @error={{this.error}}>
+      <Rose::Form::HelperText @error={{this.error}} @link={{this.link}} @linkText={{this.linkText}}>
         Helper text
       </Rose::Form::HelperText>
     `,
     context: {
-      error: boolean('error', false)
+      error: boolean('error', false),
+      link: text('link', 'http://www.example.net/'),
+      linkText: text('linkText', 'sample link text')
     },
   }}</Story>
 </Preview>

addons/rose/addon/components/rose/form/input/index.hbs

@@ -29,7 +29,7 @@
     </Rose::Form::Label>
 
     {{#if @helperText}}
-      <Rose::Form::HelperText @id="helper-text-{{this.id}}" @error={{@error}}>
+      <Rose::Form::HelperText @id="helper-text-{{this.id}}" @error={{@error}} @link={{@link}} @linkText={{@linkText}}>
         {{@helperText}}
       </Rose::Form::HelperText>
     {{/if}}

addons/rose/addon/components/rose/form/input/index.stories.mdx

@@ -16,6 +16,8 @@ Renders a simple form input.
   @value="info@example.com"
   @label="Email"
   @helperText="Enter your email"
+  @link='www.example.net'
+  @linkText='sample link text'
   @error={{false}}
   @disabled={{false}}
   @icon='flight-icons/svg/search-16'
@@ -33,6 +35,8 @@ Or a fully contextual component without a wrapper, for maximum flexibility.
   @value="info@example.com"
   @label="Email"
   @helperText="Enter your email"
+  @link='www.example.net'
+  @linkText='sample link text'
   @error={{false}}
   @disabled={{false}}
   readonly={{false}}
@@ -50,6 +54,8 @@ Or a fully contextual component without a wrapper, for maximum flexibility.
         @value={{value}}
         @label={{label}}
         @helperText={{helperText}}
+        @link={{link}}
+        @linkText={{linkText}}
         @error={{false}}
         @disabled={{disabled}}
         readonly={{read-only}}
@@ -70,6 +76,8 @@ Or a fully contextual component without a wrapper, for maximum flexibility.
       value: text('value', 'Value'),
       label: text('label', 'Label'),
       helperText: text('helperText', 'Helper text'),
+      link: text('link', 'link goes here'),
+      linkText: text('linkText', 'link text'),
       disabled: boolean('disabled', false),
       'read-only': boolean('readonly', false),
       icon: select(
@@ -93,6 +101,8 @@ Or a fully contextual component without a wrapper, for maximum flexibility.
         @value={{value}}
         @label={{label}}
         @helperText={{helperText}}
+        @link={{link}}
+        @linkText={{linkText}}
         @error={{true}}
         @disabled={{disabled}}
         readonly={{read-only}}
@@ -117,6 +127,8 @@ Or a fully contextual component without a wrapper, for maximum flexibility.
       value: text('value', 'Value'),
       label: text('label', 'Label'),
       helperText: text('helperText', 'Helper text'),
+      link: text('link', 'link goes here'),
+      linkText: text('linkText', 'link text'),
       disabled: boolean('disabled', false),
       'read-only': boolean('readonly', false),
     }

addons/rose/addon/components/rose/form/radio/card/index.js

@@ -0,0 +1,7 @@
+import RoseFormRadioRadioComponent from '../radio';
+
+export default class RoseFormRadioCardComponent extends RoseFormRadioRadioComponent {
+  // =attributes
+  layout = this.args.layout;
+  className = `rose-form-radio-card ${this.layout}`;
+}

addons/rose/addon/components/rose/form/radio/card/index.stories.mdx

@@ -0,0 +1,100 @@
+import { Meta, Story, Preview } from '@storybook/addon-docs/blocks';
+import { hbs } from 'ember-cli-htmlbars';
+import { text, boolean, select } from '@storybook/addon-knobs';
+
+<Meta title="Rose|Form/Radio/Radio/Card" component="Form/Radio/Radio/Card" />
+
+# Form Radiofield in a wide format
+
+Renders a form radiofield in a Wide format.
+
+```htmlbars
+<Rose::Form::Radio::Card
+  @label="Yes"
+  @error={{false}}
+  @value="yes-agree"
+  @selectedValue="yes-agree"
+  @disabled={{false}}
+  @changed={{fn}}
+  @layout='wide'
+  />
+```
+
+<Preview>
+  <Story name="Wide" height="10rem">{{
+    template: hbs`
+      <Rose::Form::Radio::Card
+        @label={{label}}
+        @error={{error}}
+        @value={{value}}
+        @selectedValue={{selectedValue}}
+        @disabled={{disabled}}
+        @icon={{icon}}
+        @helperText={{helperText}}
+        @layout='wide'
+        />
+    `,
+    context: {
+      label: text('text', 'Azure'),
+      error: boolean('error', false),
+      value: text('value', 'value and selectedValue must match to select radiofield'),
+      selectedValue: text(
+        'selectedValue',
+        'value and selectedValue must match to select radiofield'
+      ),
+      helperText: text('helperText', 'Record financial transactions using'),
+      disabled: boolean('disabled', false),
+    }
+  }}</Story>
+</Preview>
+
+
+Renders a form radiofield in a tile format.
+
+```htmlbars
+<Rose::Form::Radio::Card
+  @label="Yes"
+  @error={{false}}
+  @value="yes-agree"
+  @selectedValue="yes-agree"
+  @disabled={{false}}
+  @changed={{fn}}
+  @layout='tile'
+  />
+```
+
+<Preview>
+  <Story name="Tile" height="10rem">{{
+    template: hbs`
+      <Rose::Form::Radio::Card
+        @label={{label}}
+        @error={{error}}
+        @value={{value}}
+        @selectedValue={{selectedValue}}
+        @disabled={{disabled}}
+        @icon={{icon}}
+        @helperText={{helperText}}
+        @layout='tile'
+        />
+    `,
+    context: {
+      label: text('text', 'Azure'),
+      error: boolean('error', false),
+      value: text('value', 'value and selectedValue must match to select radiofield'),
+      selectedValue: text(
+        'selectedValue',
+        'value and selectedValue must match to select radiofield'
+      ),
+      helperText: text('helperText', 'Record financial transactions using'),
+      disabled: boolean('disabled', false),
+      icon: select(
+        'icon',
+        {
+          'none': null,
+          'flight-icons/svg/azure-color-16': 'flight-icons/svg/azure-color-16',
+        },
+        null
+      ),
+    }
+  }}</Story>
+</Preview>

addons/rose/addon/components/rose/form/radio/group/index.hbs

@@ -1,3 +1,4 @@
 {{yield (hash
   radio=(component 'rose/form/radio/radio' name=@name selectedValue=@selectedValue disabled=@disabled changed=@changed inline=@inline)
-)}}
+  card=(component 'rose/form/radio/card' name=@name selectedValue=@selectedValue disabled=@disabled changed=@changed layout=@layout)
+)}}

addons/rose/addon/components/rose/form/radio/group/index.stories.mdx

@@ -81,3 +81,173 @@ Renders a form radiofield group.
   }
   }}</Story>
 </Preview>
+
+```htmlbars
+<Rose::Form::Radio::Group
+  @disabled={{false}}
+  @name={{name}}
+  @selectedValue="disagree"
+  @changed={{fn}}
+  @inline={{false}}
+  as |radioGroup|
+>
+  <radioGroup.Card
+    @label="Agree"
+    @value="agree"
+    @layout='tile'
+       @helperText="dwsd"
+  />
+  <radioGroup.Card
+    @label="disagree"
+    @value="disagree"
+    @layout='tile'
+       @helperText="dwsd"
+  />
+  <radioGroup.Card
+    @label="maybe"
+    @value="maybe"
+    @layout='tile'
+    @helperText="dwsd"
+  />
+</Rose::Form::Radio::Group>
+```
+<Preview>
+  <Story name="Card:  Tile" height="10rem">{{
+  template: hbs`
+    <Rose::Form::Radio::Group
+      @disabled={{disabled}}
+      @name={{name}}
+      @selectedValue={{selectedValue}}
+      @changed={{changed}}
+      as |radioGroup|
+    >
+      <radioGroup.card
+        @label={{firstFieldLabel}}
+        @value={{firstFieldValue}}
+        @icon={{firstFieldIcon}}
+        @layout='tile'
+      />
+      <radioGroup.card
+        @label={{secondFieldLabel}}
+        @value={{secondFieldValue}}
+        @icon={{secondFieldIcon}}
+        @layout="tile"
+      />
+      <radioGroup.card
+        @label={{thirdFieldLabel}}
+        @value={{thirdFieldValue}}
+        @icon={{thirdFieldIcon}}
+        @layout="tile"
+      />
+    </Rose::Form::Radio::Group>
+  `,
+  context: {
+    name: text('name', 'mustagree'),
+    disabled: boolean('disabled', false),
+    selectedValue: text('selectedValue', 'disagree'),
+    firstFieldLabel: text('first label', 'Agree'),
+    firstFieldValue: text('first value', 'agree'),
+    firstFieldIcon: select(
+        'firstFieldIcon',
+        {
+          'none': null,
+          'flight-icons/svg/azure-color-16': 'flight-icons/svg/azure-color-16',
+        },
+        null
+      ),
+         secondFieldIcon: select(
+        'secondFieldIcon',
+        {
+          'none': null,
+          'flight-icons/svg/azure-color-16': 'flight-icons/svg/azure-color-16',
+        },
+        null
+      ),
+         thirdFieldIcon: select(
+        'thirdFieldIcon',
+        {
+          'none': null,
+          'flight-icons/svg/azure-color-16': 'flight-icons/svg/azure-color-16',
+        },
+        null
+      ),
+    secondFieldLabel: text('second label', 'Maybe'),
+    secondFieldValue: text('second value', 'maybe'),
+    thirdFieldLabel: text('third label', 'Disagree'),
+    thirdFieldValue: text('third value', 'disagree'),
+    changed: action('changed')
+  }
+  }}</Story>
+</Preview>
+
+```htmlbars
+<Rose::Form::Radio::Group
+  @disabled={{false}}
+  @name={{name}}
+  @selectedValue="disagree"
+  @changed={{fn}}
+  @inline={{false}}
+  as |radioGroup|
+>
+  <radioGroup.Card
+    @label="Agree"
+    @value="agree"
+    @layout='wide'
+  />
+  <radioGroup.Card
+    @label="disagree"
+    @value="disagree"
+    @layout='wide'
+  />
+</Rose::Form::Radio::Group>
+```
+<Preview>
+  <Story name="Card:  Wide" height="10rem">{{
+  template: hbs`
+    <Rose::Form::Radio::Group
+      @disabled={{disabled}}
+      @name={{name}}
+      @selectedValue={{selectedValue}}
+      @changed={{changed}}
+      as |radioGroup|
+    >
+      <radioGroup.card
+        @label={{firstFieldLabel}}
+        @value={{firstFieldValue}}
+        @icon={{firstFieldIcon}}
+        @layout="wide"
+      />
+      <radioGroup.card
+        @label={{secondFieldLabel}}
+        @value={{secondFieldValue}}
+        @layout="wide"
+      />
+      <radioGroup.card
+        @label={{thirdFieldLabel}}
+        @value={{thirdFieldValue}}
+        @layout="wide"
+      />
+    </Rose::Form::Radio::Group>
+  `,
+  context: {
+    name: text('name', 'mustagree'),
+    disabled: boolean('disabled', false),
+    selectedValue: text('selectedValue', 'disagree'),
+    firstFieldLabel: text('first label', 'Agree'),
+    firstFieldValue: text('first value', 'agree'),
+    firstFieldIcon: select(
+        'firstFieldIcon',
+        {
+          'none': null,
+          'flight-icons/svg/azure-color-16': 'flight-icons/svg/azure-color-16',
+        },
+        null
+      ),
+    secondFieldLabel: text('second label', 'Maybe'),
+    secondFieldValue: text('second value', 'maybe'),
+    thirdFieldLabel: text('third label', 'Disagree'),
+    thirdFieldValue: text('third value', 'disagree'),
+    changed: action('changed')
+  }
+  }}</Story>
+</Preview>

addons/rose/addon/components/rose/form/radio/radio/index.hbs

@@ -1,4 +1,4 @@
-<div class="rose-form-radio{{if @error " error"}} {{if @inline "inline"}}">
+<div class="{{this.className}} {{if @error " error"}} {{if @inline "inline"}}">
 
   <RadioButton
     ...attributes
@@ -22,7 +22,12 @@
     {{/if}}
 
     {{@label}}
-
+  <span class="radio-card-overlay"></span>
+     {{#if @helperText}}
+      <Rose::Form::HelperText @id="helper-text-{{this.id}}" @error={{@error}} @link={{@link}} @linkText={{@linkText}}>
+        {{@helperText}}
+      </Rose::Form::HelperText>
+    {{/if}}
   </label>
 
   {{yield}}

addons/rose/addon/components/rose/form/radio/radio/index.js

@@ -3,6 +3,6 @@ import { generateComponentID } from '../../../../../utilities/component-auto-id'
 
 export default class RoseFormRadioRadioComponent extends Component {
   // =attributes
-
+  className = 'rose-form-radio';
   id = generateComponentID();
 }

addons/rose/addon/components/rose/form/radio/radio/index.stories.mdx

@@ -29,12 +29,14 @@ Renders a form radiofield.
         @selectedValue={{selectedValue}}
         @disabled={{disabled}}
         @icon={{icon}}
+        @helperText={{helperText}}
         />
     `,
     context: {
       label: text('text', 'Radiofield'),
       error: boolean('error', false),
       value: text('value', 'value and selectedValue must match to select radiofield'),
+      helperText: text('helperText', 'Helper text'),
       selectedValue: text(
         'selectedValue',
         'value and selectedValue must match to select radiofield'
@@ -63,6 +65,7 @@ Renders a form radiofield.
   @disabled={{false}}
   @changed={{fn}}
   @inline={{true}}
+  @helperText={{helperText}}
   />
 ```
 
@@ -77,6 +80,7 @@ Renders a form radiofield.
         @disabled={{disabled}}
         @icon={{icon}}
         @inline={{inline}}
+        @helperText={{helperText}}
         />
       <Rose::Form::Radio::Radio
         @label='Radiofield2'
@@ -86,6 +90,7 @@ Renders a form radiofield.
         @disabled={{disabled}}
         @icon={{icon}}
         @inline={{inline}}
+        @helperText={{helperText}}
         />
       <Rose::Form::Radio::Radio
         @label='Radiofield3'
@@ -95,6 +100,7 @@ Renders a form radiofield.
         @disabled={{disabled}}
         @icon={{icon}}
         @inline={{inline}}
+        @helperText={{helperText}}
         />
     `,
     context: {
@@ -104,6 +110,7 @@ Renders a form radiofield.
         'selectedValue',
         'value and selectedValue must match to select radiofield'
       ),
+      helperText: text('helperText', 'Helper text'),
       disabled: boolean('disabled', false),
       icon: select(
         'icon',

addons/rose/addon/components/rose/form/textarea/index.hbs

@@ -28,7 +28,7 @@
     </Rose::Form::Label>
 
     {{#if @helperText}}
-      <Rose::Form::HelperText @id="helper-text-{{this.id}}" @error={{@error}}>
+      <Rose::Form::HelperText @id="helper-text-{{this.id}}" @error={{@error}}  @link={{@link}} @linkText={{@linkText}}>
         {{@helperText}}
       </Rose::Form::HelperText>
     {{/if}}

addons/rose/addon/components/rose/form/textarea/index.stories.mdx

@@ -18,6 +18,8 @@ Renders a simple form textarea.
   @error={{false}}
   @disabled={{false}}
   readonly={{false}}
+  @link='www.example.net'
+  @linkText='link text goes here'
 />
 ```
 
@@ -32,12 +34,16 @@ Renders a simple form textarea.
         @error={{false}}
         @disabled={{disabled}}
         readonly={{read-only}}
+        @link='www.example.net'
+        @linkText='link text goes here'
         />
     `,
     context: {
       value: text('value', 'Value'),
       label: text('label', 'Label'),
       helperText: text('helperText', 'Helper text'),
+      link: text('link', 'link'),
+      linkText: text('linkText', 'link text goes here'),
       disabled: boolean('disabled', false),
       'read-only': boolean('readonly', false),
     }

addons/rose/addon/components/rose/nav/breadcrumbs/index.hbs

@@ -1,5 +1,5 @@
 <nav ...attributes class="rose-nav-breadcrumbs" aria-label="breadcrumbs">
   {{yield (hash
-    link=(component "link-to" class="rose-nav-breadcrumbs-link")
+    link=(component "rose/nav/link")
   )}}
 </nav>

addons/rose/addon/components/rose/nav/link/index.hbs

@@ -0,0 +1,9 @@
+{{#if @model}}
+  <LinkTo @route={{@route}} @model={{@model}} class="rose-nav-link">
+    {{yield}}
+  </LinkTo>
+{{else}}
+  <LinkTo @route={{@route}} class="rose-nav-link">
+    {{yield}}
+  </LinkTo>
+{{/if}}

addons/rose/addon/components/rose/nav/link/index.stories.mdx

@@ -0,0 +1,23 @@
+import { Meta, Story, Preview } from '@storybook/addon-docs/blocks';
+import { hbs } from 'ember-cli-htmlbars';
+import { action } from '@storybook/addon-actions';
+import { text, boolean, select } from '@storybook/addon-knobs';
+
+<Meta title="Rose|Nav|Link" component="Nav/Link" />
+
+# Generic Navigation Link
+
+Proxies the built-in `LinkTo` component, applying a class `rose-nav-link`.
+
+```html
+<Rose::Nav::Link @route='index'>Text</nav.link>
+```
+
+<Preview>
+  <Story name="Basic Nav Link">{{
+    template: hbs`
+      <Rose::Nav::Link @route='index'>Text</nav.link>
+    `,
+    context: {},
+  }}</Story>
+</Preview>

addons/rose/addon/components/rose/nav/sidebar/index.hbs

@@ -12,7 +12,7 @@
   {{/if}}
 
   {{yield (hash
-    link=(component "link-to" class="rose-nav-link")
+    link=(component "rose/nav/link")
   )}}
 
 </nav>

addons/rose/addon/components/rose/nav/tabs/index.hbs

@@ -3,7 +3,7 @@
   class="rose-nav-tabs">
 
   {{yield (hash
-    link=(component "link-to" class="rose-nav-link")
+    link=(component "rose/nav/link")
   )}}
 
 </nav>