fix: 🐛 Fix raw api output not displaying codemirror properly (#1354)

✅ Closes: ICU-6249

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

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

.husky/pre-commit

@@ -0,0 +1,6 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+yarn compliance:licenses
+npx lint-staged
+yarn test

.husky/prepare-commit-msg

@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+COMMIT_MSG_FILE=$1
+COMMIT_SOURCE=$2
+SHA1=$3
+
+# Don't run commitizen for merge or squash commits
+if [ "${COMMIT_SOURCE}" = merge ] || [ "${COMMIT_SOURCE}" = squash ];then
+    exit 0
+fi
+
+# This is to allow interaction with the terminal for commitizen
+exec < /dev/tty && npx git-cz --hook || true

README.md

@@ -66,7 +66,6 @@ List of available project commands.  `yarn run <command-name>`
 |---------------------|---|
 | build               | Builds Admin UI. |
 | test                | Runs tests in CI mode. |
-| commit              | Replaces `git commit`, ensures compliance, audit, lint, and test checks pass before commit is allowed and normalizes commit messages across authors. |
 | lint                | Runs ember-template-lint on all of the hbs, js, and sass files. |
 | compliance:audit    | Checks for issues using `yarn audit` with moderate and above criticality.|
 | compliance:licenses | Checks that all dependencies have OSS-compatible licenses. |
@@ -160,15 +159,16 @@ You will need to turn `off` mirage and run it: `$ ENABLE_MIRAGE=false yarn start
 
 In login screen, authenticate using generated admin login name and password.
 
-Enter the origin of your Boundary dev instance, by default is: `http://localhost:9200`.
+Enter the cluster URL of your Boundary dev instance, by default is: `http://localhost:9200`.
 
 ### Committing
 
-Instead of the default `git commit`, we prescribe a custom command that ensures
+We use `husky` and `lint-staged` to ensure linting and other checks pass before a
-linting and other checks pass before a commit may be completed.  It also ensures
+commit is completed. Simply do a `yarn install` to make sure the hooks are installed.
-that all contributors author consistent commit messages.  To get started with a
+
-commit, stage your files as usual.  Then run `yarn commit` and follow the
+Use a normal `git commit` to go through the checks, if you need to skip these checks,
-on-screen instructions to author your message.
+use `git commit --no-verify` to bypass them. However, a consistent commit message will
+still be enforced even if you use `--no-verify`.
 
 #### License Checking
 

addons/api/.eslintrc.js

@@ -14,11 +14,7 @@ module.exports = {
     // end of babel-config
   },
   plugins: ['ember'],
-  extends: [
+  extends: ['eslint:recommended', 'plugin:ember/recommended', 'prettier'],
-    'eslint:recommended',
-    'plugin:ember/recommended',
-    'plugin:prettier/recommended',
-  ],
   env: {
     browser: true,
   },

addons/api/.template-lintrc.js

@@ -1,5 +1,5 @@
 'use strict';
 
 module.exports = {
-  extends: 'octane',
+  extends: ['recommended', 'stylistic'],
 };

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

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

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

@@ -1,9 +1,13 @@
 import ModelAbility from './model';
-
+import { inject as service } from '@ember/service';
 /**
  * Provides abilities for credential store.
  */
 export default class CredentialStoreAbility extends ModelAbility {
+  // =services
+
+  @service features;
+
   // =permissions
 
   /**
@@ -11,6 +15,8 @@ export default class CredentialStoreAbility extends ModelAbility {
    * @type {boolean}
    */
   get canRead() {
-    return !this.model.isStatic && this.hasAuthorizedAction('read');
+    return this.features.isEnabled('static-credentials')
+      ? this.hasAuthorizedAction('read')
+      : !this.model.isStatic && this.hasAuthorizedAction('read');
   }
 }

addons/api/addon/abilities/credential.js

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

addons/api/addon/abilities/target.js

@@ -30,10 +30,18 @@ export default class TargetAbility extends ModelAbility {
   /**
    * @type {boolean}
    */
-  get canAddCredentialSources() {
+  get canAddBrokeredCredentialSources() {
     return this.hasAuthorizedAction('add-credential-sources');
   }
 
+  /**
+   * @type {boolean}
+   */
+  get canAddInjectedApplicationCredentialSources() {
+    return (
+      this.model.isSSH && this.hasAuthorizedAction('add-credential-sources')
+    );
+  }
   /**
    * @type {boolean}
    */

addons/api/addon/abilities/worker.js

@@ -0,0 +1,15 @@
+import ModelAbility from './model';
+
+/**
+ * Provides abilities for workers.
+ */
+export default class WorkerAbility extends ModelAbility {
+  // =permissions
+
+  /**
+   * @type {boolean}
+   */
+  get canCreateWorkerLed() {
+    return this.hasAuthorizedCollectionAction('create:worker-led');
+  }
+}

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

@@ -43,4 +43,20 @@ export default class GeneratedAccountModel extends BaseModel {
     description: 'Current version number of this resource.',
   })
   version;
+
+  // =attributes (password)
+  @attr('string', {
+    for: 'password',
+    isNestedAttribute: true,
+    description: 'The account login name',
+  })
+  login_name;
+
+  // =attributes (OIDC)
+  @attr('string', { for: 'oidc', isNestedAttribute: true }) subject;
+  @attr('string', { for: 'oidc', isNestedAttribute: true }) issuer;
+  @attr('string', { for: 'oidc', isNestedAttribute: true, readOnly: true })
+  email;
+  @attr('string', { for: 'oidc', isNestedAttribute: true, readOnly: true })
+  full_name;
 }

addons/api/addon/generated/models/credential-library.js

@@ -44,4 +44,27 @@ export default class GeneratedCredentialLibraryModel extends BaseModel {
     description: 'Current version number of this resource.',
   })
   version;
+
+  //= attributes (vault)
+
+  @attr('string', {
+    isNestedAttribute: true,
+    description:
+      'The HTTP method the library uses when requesting credentials from Vault.',
+    defaultValue: () => 'GET',
+  })
+  http_method;
+
+  @attr('string', {
+    isNestedAttribute: true,
+    description:
+      'The body of the HTTP request the library sends to Vault when requesting credentials. Only valid if `http_method` is set to `POST`.',
+  })
+  http_request_body;
+
+  @attr('string', {
+    isNestedAttribute: true,
+    description: 'The path in Vault to request credentials from.',
+  })
+  path;
 }

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

@@ -39,4 +39,90 @@ export default class GeneratedCredentialStoreModel extends BaseModel {
     description: 'Current version number of this resource.',
   })
   version;
+
+  // =attributes (vault)
+  @attr('string', {
+    for: 'vault',
+    isNestedAttribute: true,
+    description:
+      "The address to Vault server. This should be a complete URL such as 'https://127.0.0.1:8200'",
+  })
+  address;
+
+  @attr('string', {
+    for: 'vault',
+    isNestedAttribute: true,
+    description: 'The namespace within Vault to use.',
+  })
+  namespace;
+
+  @attr('string', {
+    for: 'vault',
+    isNestedAttribute: true,
+    description:
+      "A PEM-encoded CA certificate to verify the Vault server's TLS certificate.",
+  })
+  ca_cert;
+
+  @attr('string', {
+    for: 'vault',
+    isNestedAttribute: true,
+    description:
+      'Name to use as the SNI host when connecting to Vault via TLS.',
+  })
+  tls_server_name;
+
+  @attr('boolean', {
+    for: 'vault',
+    isNestedAttribute: true,
+    description: 'Whether or not to skip TLS verification.',
+  })
+  tls_skip_verify;
+
+  @attr('string', {
+    for: 'vault',
+    isNestedAttribute: true,
+    description: 'A token used for accessing Vault.',
+  })
+  token;
+
+  @attr('string', {
+    for: 'vault',
+    isNestedAttribute: true,
+    description: 'The Vault token hmac.',
+    readOnly: true,
+  })
+  token_hmac;
+
+  @attr('string', {
+    for: 'vault',
+    isNestedAttribute: true,
+    description:
+      'A PEM-encoded client certificate to use for TLS authentication to the Vault server.',
+  })
+  client_certificate;
+
+  @attr('string', {
+    for: 'vault',
+    isNestedAttribute: true,
+    description:
+      "A PEM-encoded private key matching the client certificate from 'client_certificate'.",
+  })
+  client_certificate_key;
+
+  @attr('string', {
+    for: 'vault',
+    isNestedAttribute: true,
+    description: 'The Vault client certificate key hmac.',
+    readOnly: true,
+  })
+  client_certificate_key_hmac;
+
+  @attr('string', {
+    for: 'vault',
+    isNestedAttribute: true,
+    description:
+      'Filters to the worker(s) who can handle Vault requests for this cred store.',
+  })
+  worker_filter;
 }

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

@@ -0,0 +1,79 @@
+import BaseModel from '../../models/base';
+import { attr } from '@ember-data/model';
+
+/**
+ * A credential is a data structure containing one or more secrets that binds an
+ * identity to a set of permissions or capabilities on a host for a session.
+ */
+export default class GeneratedCredentialModel extends BaseModel {
+  // =attributes
+
+  @attr('string', {
+    description:
+      'The ID of the Credential Store of which this Credential is a part.',
+  })
+  credential_store_id;
+
+  @attr('string', {
+    description: 'The type of the resource, to help differentiate schemas',
+  })
+  type;
+
+  @attr('string', {
+    description: 'Optional name for identification purposes',
+  })
+  name;
+
+  @attr('string', {
+    description: 'Optional user-set description for identification purposes',
+  })
+  description;
+
+  @attr('date', {
+    description: 'The time this resource was created\nOutput only.',
+    readOnly: true,
+  })
+  created_time;
+
+  @attr('date', {
+    description: 'The time this resource was last updated\nOutput only.',
+    readOnly: true,
+  })
+  updated_time;
+
+  @attr('number', {
+    description: 'Current version number of this resource.',
+  })
+  version;
+
+  // =attributes (username_password, ssh_private_key)
+  @attr('string', {
+    for: ['username_password', 'ssh_private_key'],
+    isNestedAttribute: true,
+    description: 'The username for credential.',
+  })
+  username;
+
+  // =attributes (username_password)
+  @attr('string', {
+    for: 'username_password',
+    isNestedAttribute: true,
+    description: 'The password for credential.',
+  })
+  password;
+
+  // =attributes (ssh_private_key)
+  @attr('string', {
+    for: 'ssh_private_key',
+    isNestedAttribute: true,
+    description: 'The private key for credential.',
+  })
+  private_key;
+
+  @attr('string', {
+    for: 'ssh_private_key',
+    isNestedAttribute: true,
+    description: 'The private key passphrase for credential.',
+  })
+  private_key_passphrase;
+}

addons/api/addon/generated/models/managed-group.js

@@ -44,4 +44,13 @@ export default class GeneratedManagedGroupModel extends BaseModel {
       'The ID of the Auth Method that is associated with this ManagedGroup',
   })
   auth_method_id;
+
+  // =attributes (OIDC)
+
+  @attr('string', {
+    isNestedAttribute: true,
+    description:
+      'The boolean expression filter to use to determine membership.',
+  })
+  filter;
 }

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

@@ -30,7 +30,6 @@ export default class GeneratedTargetModel extends BaseModel {
 
   @attr('number', {
     description: '',
-    defaultValue: 1,
   })
   session_connection_limit;
 

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

@@ -0,0 +1,70 @@
+import BaseModel from '../../models/base';
+import { attr } from '@ember-data/model';
+
+/**
+ * Worker contains all fields related to a worker resource
+ */
+export default class GeneratedWorkerModel extends BaseModel {
+  // =attributes
+
+  @attr('string', {
+    description: 'Optional name for identification purposes.',
+  })
+  name;
+
+  @attr('string', {
+    description: 'Optional user-set description for identification purposes.',
+  })
+  description;
+
+  @attr('date', {
+    description: 'The time this resource was created\nOutput only.',
+    readOnly: true,
+  })
+  created_time;
+
+  @attr('date', {
+    description: 'The time this resource was last updated\nOutput only.',
+    readOnly: true,
+  })
+  updated_time;
+
+  @attr('number', {
+    description: 'Current version number of this resource.',
+  })
+  version;
+
+  @attr('string', {
+    description: 'The address that this worker is reachable at.\nOutput only.',
+    readOnly: true,
+  })
+  address;
+
+  @attr('date', {
+    description:
+      'The time this worker was last reported its status.\nOutput only.',
+    readOnly: true,
+  })
+  last_status_time;
+
+  @attr('string', {
+    description:
+      'The version of the Boundary binary the worker is running.\nOutput only.',
+    readOnly: true,
+  })
+  release_version;
+
+  @attr('number', {
+    description:
+      'The number of connections that this worker is currently handling.\nOutput only.',
+    readOnly: true,
+  })
+  active_connection_count;
+
+  @attr('string', {
+    description:
+      'The type of the worker, denoted by how it authenticates: pki or kms.\nOutput only.',
+    readOnly: true,
+  })
+  type;
+}

addons/api/addon/models/account.js

@@ -1,17 +1,10 @@
 import GeneratedAccountModel from '../generated/models/account';
-import { fragment } from 'ember-data-model-fragments/attributes';
 import { computed } from '@ember/object';
 import { equal } from '@ember/object/computed';
 
 export default class AccountModel extends GeneratedAccountModel {
   // =attributes
 
-  /**
-   * Attributes of this resource, if any, represented as a JSON fragment.
-   * @type {FragmentAccountAttributesModel}
-   */
-  @fragment('fragment-account-attributes', { defaultValue: {} }) attributes;
-
   /**
    * @type {boolean}
    */
@@ -26,9 +19,9 @@ export default class AccountModel extends GeneratedAccountModel {
    * Convenience for getting username in account.
    * @type {string}
    */
-  @computed('attributes.{email,full_name,login_name}')
+  @computed('{email,full_name,login_name}')
   get accountName() {
-    const { email, full_name, login_name } = this.attributes;
+    const { email, full_name, login_name } = this;
     return email || full_name || login_name;
   }
 

addons/api/addon/models/base.js

@@ -1,6 +1,5 @@
 import Model from '@ember-data/model';
 import { attr } from '@ember-data/model';
-import { fragment } from 'ember-data-model-fragments/attributes';
 import { computed } from '@ember/object';
 
 /**
@@ -30,9 +29,8 @@ export default class BaseModel extends Model {
 
   /**
    * Scope of this resource, if any, represented as a JSON fragment.
-   * @type {FragmentScope}
    */
-  @fragment('fragment-scope') scope;
+  @attr() scope;
 
   // =attributes
 
@@ -55,6 +53,10 @@ export default class BaseModel extends Model {
     if (model) {
       const json = model.serialize();
       json.scope_id = model.id;
+      json.type = model.type;
+      json.isGlobal = model.isGlobal;
+      json.isOrg = model.isOrg;
+      json.isProject = model.isProject;
       this.scope = json;
     }
   }

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

@@ -1,6 +1,4 @@
 import GeneratedCredentialLibraryModel from '../generated/models/credential-library';
-import { attr } from '@ember-data/model';
-import { fragment } from 'ember-data-model-fragments/attributes';
 
 /**
  * Enum options for credential library.
@@ -9,22 +7,27 @@ export const options = {
   http_method: ['GET', 'POST'],
 };
 
+/**
+ * Supported Credential Library types.
+ */
+export const types = ['vault'];
+
 export default class CredentialLibraryModel extends GeneratedCredentialLibraryModel {
-  // =error attributes
-  // These attributes exist solely to capture errors on nested fields.
-  // See the application adapter's error normalization method for
-  // more information.
-
-  @attr('string', { readOnly: true }) attributes_http_method;
-  @attr('string', { readOnly: true }) attributes_http_request_body;
-  @attr('string', { readOnly: true }) attributes_path;
-
   // =attributes
 
   /**
-   * Attributes of this resource, if any, represented as a JSON fragment.
+   * True if credential is an unknown type.
-   * @type {FragmentCredentialLibraryAttributesModel}
+   * @type {boolean}
    */
-  @fragment('fragment-credential-library-attributes', { defaultValue: {} })
+  get isUnknown() {
-  attributes;
+    return !types.includes(this.type);
+  }
+
+  /**
+   * True if credential is a vault type.
+   * @type {boolean}
+   */
+  get isVault() {
+    return this.type === 'vault';
+  }
 }

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

@@ -1,32 +1,9 @@
 import GeneratedCredentialStoreModel from '../generated/models/credential-store';
-import { attr } from '@ember-data/model';
-import { fragment } from 'ember-data-model-fragments/attributes';
 import { equal } from '@ember/object/computed';
 
 export default class CredentialStoreModel extends GeneratedCredentialStoreModel {
-  // =error attributes
-  // These attributes exist solely to capture errors on nested fields.
-  // See the application adapter's error normalization method for
-  // more information.
-
-  @attr('string', { readOnly: true }) attributes_address;
-  @attr('string', { readOnly: true }) attributes_namespace;
-  @attr('string', { readOnly: true }) attributes_ca_cert;
-  @attr('string', { readOnly: true }) attributes_tls_server_name;
-  @attr('string', { readOnly: true }) attributes_tls_skip_verify;
-  @attr('string', { readOnly: true }) attributes_token;
-  @attr('string', { readOnly: true }) attributes_client_certificate;
-  @attr('string', { readOnly: true }) attributes_client_certificate_key;
-
   // =attributes
 
-  /**
-   * Attributes of this resource, if any, represented as a JSON fragment.
-   * @type {FragmentAuthMethodAttributesModel}
-   */
-  @fragment('fragment-credential-store-attributes', { defaultValue: {} })
-  attributes;
-
   /**
    * @type {boolean}
    */

addons/api/addon/models/credential.js

@@ -0,0 +1,28 @@
+import GeneratedCredentialModel from '../generated/models/credential';
+
+/**
+ * Supported Credential types.
+ */
+export const types = ['username_password', 'ssh_private_key'];
+
+export default class CredentialModel extends GeneratedCredentialModel {
+  // =attributes
+  /**
+   * All Credentials are prefixed with "cred" and are considered
+   * static due to their relation with Static Credential Stores.
+   * 
+   * True if credential starts with the "cred" prefix.
+   * @type {boolean}
+   */
+  get isStatic() {
+    return this.id.startsWith('cred');
+  }
+
+  /**
+   * True if credential is an unknown type.
+   * @type {boolean}
+   */
+  get isUnknown() {
+    return !types.includes(this.type);
+  }
+}

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

@@ -1,17 +0,0 @@
-import Fragment from 'ember-data-model-fragments/fragment';
-import { attr } from '@ember-data/model';
-
-export default class FragmentAccountAttributesModel extends Fragment {
-  // =attributes (password)
-  @attr('string', {
-    for: 'password',
-    description: 'The account login name',
-  })
-  login_name;
-
-  // =attributes (OIDC)
-  @attr('string', { for: 'oidc' }) subject;
-  @attr('string', { for: 'oidc' }) issuer;
-  @attr('string', { for: 'oidc', readOnly: true }) email;
-  @attr('string', { for: 'oidc', readOnly: true }) full_name;
-}

addons/api/addon/models/fragment-credential-library-attributes.js

@@ -1,25 +0,0 @@
-import Fragment from 'ember-data-model-fragments/fragment';
-import { attr } from '@ember-data/model';
-import { options } from './credential-library';
-
-export default class FragmentCredentialLibraryAttributesModel extends Fragment {
-  //= attributes (vault)
-
-  @attr('string', {
-    description:
-      'The HTTP method the library uses when requesting credentials from Vault.',
-    defaultValue: () => options.http_method[0],
-  })
-  http_method;
-
-  @attr('string', {
-    description:
-      'The body of the HTTP request the library sends to Vault when requesting credentials. Only valid if `http_method` is set to `POST`.',
-  })
-  http_request_body;
-
-  @attr('string', {
-    description: 'The path in Vault to request credentials from.',
-  })
-  path;
-}

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

@@ -1,72 +0,0 @@
-import Fragment from 'ember-data-model-fragments/fragment';
-import { attr } from '@ember-data/model';
-
-export default class FragmentCredentialStoreAttributesModel extends Fragment {
-  // =attributes (vault)
-  @attr('string', {
-    for: 'vault',
-    description:
-      "The address to Vault server. This should be a complete URL such as 'https://127.0.0.1:8200'",
-  })
-  address;
-
-  @attr('string', {
-    for: 'vault',
-    description: 'The namespace within Vault to use.',
-  })
-  namespace;
-
-  @attr('string', {
-    for: 'vault',
-    description:
-      "A PEM-encoded CA certificate to verify the Vault server's TLS certificate.",
-  })
-  ca_cert;
-
-  @attr('string', {
-    for: 'vault',
-    description:
-      'Name to use as the SNI host when connecting to Vault via TLS.',
-  })
-  tls_server_name;
-
-  @attr('boolean', {
-    for: 'vault',
-    description: 'Whether or not to skip TLS verification.',
-  })
-  tls_skip_verify;
-
-  @attr('string', {
-    for: 'vault',
-    description: 'A token used for accessing Vault.',
-  })
-  token;
-
-  @attr('string', {
-    for: 'vault',
-    description: 'The Vault token hmac.',
-    readOnly: true,
-  })
-  token_hmac;
-
-  @attr('string', {
-    for: 'vault',
-    description:
-      'A PEM-encoded client certificate to use for TLS authentication to the Vault server.',
-  })
-  client_certificate;
-
-  @attr('string', {
-    for: 'vault',
-    description:
-      "A PEM-encoded private key matching the client certificate from 'client_certificate'.",
-  })
-  client_certificate_key;
-
-  @attr('string', {
-    for: 'vault',
-    description: 'The Vault client certificate key hmac.',
-    readOnly: true,
-  })
-  client_certificate_key_hmac;
-}

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

@@ -1,16 +0,0 @@
-import Fragment from 'ember-data-model-fragments/fragment';
-import { attr } from '@ember-data/model';
-
-export default class FragmentHostSourceModel extends Fragment {
-  // =attributes
-
-  @attr('string', {
-    description: 'ID of the related host source',
-  })
-  host_source_id;
-
-  @attr('string', {
-    description: 'ID of the catalog to which the host set belongs',
-  })
-  host_catalog_id;
-}

addons/api/addon/models/fragment-managed-group-attributes.js

@@ -1,12 +0,0 @@
-import Fragment from 'ember-data-model-fragments/fragment';
-import { attr } from '@ember-data/model';
-
-export default class FragmentManagedGroupAttributesModel extends Fragment {
-  // =attributes (OIDC)
-
-  @attr('string', {
-    description:
-      'The boolean expression filter to use to determine membership.',
-  })
-  filter;
-}

addons/api/addon/models/fragment-principal.js

@@ -1,21 +0,0 @@
-import Fragment from 'ember-data-model-fragments/fragment';
-import { attr } from '@ember-data/model';
-
-export default class FragmentPrincipal extends Fragment {
-  // =attributes
-
-  @attr('string', {
-    description: 'ID of the related scope',
-  })
-  scope_id;
-
-  @attr('string', {
-    description: 'ID of the related principal (user or group)',
-  })
-  principal_id;
-
-  @attr('string', {
-    description: 'Type of the related principal (user or group)',
-  })
-  type;
-}

addons/api/addon/models/fragment-scope.js

@@ -1,42 +0,0 @@
-import Fragment from 'ember-data-model-fragments/fragment';
-import { computed } from '@ember/object';
-import { attr } from '@ember-data/model';
-import { scopeTypes } from './scope';
-
-export default class FragmentScope extends Fragment {
-  // =attributes
-
-  @attr('string', {
-    description: 'ID of the related scope',
-  })
-  scope_id;
-
-  @attr('string', {
-    description: 'The type of the resource',
-  })
-  type;
-
-  /**
-   * @type {boolean}
-   */
-  @computed('type')
-  get isGlobal() {
-    return this.type === scopeTypes.global;
-  }
-
-  /**
-   * @type {boolean}
-   */
-  @computed('type')
-  get isOrg() {
-    return this.type === scopeTypes.org;
-  }
-
-  /**
-   * @type {boolean}
-   */
-  @computed('type')
-  get isProject() {
-    return this.type === scopeTypes.project;
-  }
-}

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

@@ -1,16 +1,10 @@
 import GeneratedManagedGroupModel from '../generated/models/managed-group';
 import { attr } from '@ember-data/model';
-import { fragment } from 'ember-data-model-fragments/attributes';
 import { A } from '@ember/array';
 
 export default class ManagedGroupModel extends GeneratedManagedGroupModel {
   // =attributes
 
-  // =error attributes
-  // These attributes exist solely to capture errors on nested fields.
-  // See the application adapter's error normalization method for
-  // more information.
-
   @attr('string', { readOnly: true }) attributes_filter;
 
   /**
@@ -23,7 +17,4 @@ export default class ManagedGroupModel extends GeneratedManagedGroupModel {
     emptyArrayIfMissing: true,
   })
   member_ids;
-
-  @fragment('fragment-managed-group-attributes', { defaultValue: {} })
-  attributes;
 }

addons/api/addon/models/role.js

@@ -1,5 +1,5 @@
 import GeneratedRoleModel from '../generated/models/role';
-import { fragmentArray, array } from 'ember-data-model-fragments/attributes';
+import { attr } from '@ember-data/model';
 
 export default class RoleModel extends GeneratedRoleModel {
   // =attributes
@@ -11,7 +11,7 @@ export default class RoleModel extends GeneratedRoleModel {
    * see obvious.  Instead, the application layer is expected to load referenced
    * users and groups as needed.
    */
-  @fragmentArray('fragment-principal', {
+  @attr('principal-array', {
     readOnly: true,
     emptyArrayIfMissing: true,
   })
@@ -21,13 +21,15 @@ export default class RoleModel extends GeneratedRoleModel {
    * Grant strings are read-only.  But grants can be persisted via a dedicated
    * call to `saveGrantStrings(grants)`.
    */
-  @array('string', { readOnly: true }) grant_strings;
+  @attr({ readOnly: true, emptyArrayIfMissing: true }) grant_strings;
 
   /**
    * Convenience for looking up the grant scope, if loaded.
    */
   get grantScope() {
-    return this.store.peekRecord('scope', this.grant_scope_id);
+    return this.grant_scope_id
+      ? this.store.peekRecord('scope', this.grant_scope_id)
+      : null;
   }
 
   // =methods

addons/api/addon/models/target.js

@@ -1,35 +1,43 @@
 import GeneratedTargetModel from '../generated/models/target';
 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
 
   @attr('number', {
     isNestedAttribute: true,
-    description: 'The  default port a target should use if present.',
+    description: 'The default port a target should use if present.',
   })
   default_port;
 
   /**
-   * @type {[FragmentHostSourceModel]}
+   * @type Array
    */
-  @fragmentArray('fragment-host-source', {
+  @attr('host-source-id-array', {
     readOnly: true,
     emptyArrayIfMissing: true,
   })
   host_sources;
 
   /**
-   * Credential source ids are read only and can be
+   * Brokered Credential source ids are read only and can be
-   * persisted via a dedicated call to `addCredentialSources()`.
+   * persisted via a dedicated call to `addBrokeredCredentialSources()`.
    */
-  @fragmentArray('fragment-string', {
+  @attr('string-array', {
     readOnly: true,
     emptyArrayIfMissing: true,
   })
-  application_credential_source_ids;
+  brokered_credential_source_ids;
+
+  /**
+   * Injected Application Credential source ids are read only and can be
+   * persisted via a dedicated call to `addInjectedApplicationCredentialSources()`.
+   */
+  @attr('string-array', {
+    readOnly: true,
+    emptyArrayIfMissing: true,
+  })
+  injected_application_credential_source_ids;
 
   /**
    * An array of resolved host set and host catalog instances.  Model instances
@@ -37,7 +45,6 @@ export default class TargetModel extends GeneratedTargetModel {
    * instances).  Unresolvable instances are excluded from the array.
    * @type {[{model: HostSetModel, hostCatalog: HostCatalogModel}]}
    */
-  @computed('host_sources.[]', 'store')
   get hostSets() {
     return this.host_sources
       .map(({ host_source_id, host_catalog_id }) => ({
@@ -48,17 +55,38 @@ export default class TargetModel extends GeneratedTargetModel {
   }
 
   /**
-   * An array of resolved credential library instances.  Model instances
+   * An array of resolved credential library and credential instances.  Model instances
    * must already be loaded into the store (this method will not load unloaded
    * instances).  Unresolvable instances are excluded from the array.
-   * @type {[CredentialLibraryModel]}
+   * @type {[CredentialLibraryModel, CredentialModel]}
    */
-  @computed('application_credential_source_ids.[]', 'store')
+  get brokeredCredentialSources() {
-  get credentialLibraries() {
+    return this.brokered_credential_source_ids
-    return this.application_credential_source_ids
+      .map((source) => {
-      .map((source) =>
+        if (source.value.startsWith('cred')) {
-        this.store.peekRecord('credential-library', source.value)
+          return this.store.peekRecord('credential', source.value);
-      )
+        } else {
+          return this.store.peekRecord('credential-library', source.value);
+        }
+      })
+      .filter(Boolean);
+  }
+
+  /**
+   * An array of resolved credential library and credential instances.  Model instances
+   * must already be loaded into the store (this method will not load unloaded
+   * instances).  Unresolvable instances are excluded from the array.
+   * @type {[CredentialLibraryModel, CredentialModel]}
+   */
+  get injectedApplicationCredentialSources() {
+    return this.injected_application_credential_source_ids
+      .map((source) => {
+        if (source.value.startsWith('cred')) {
+          return this.store.peekRecord('credential', source.value);
+        } else {
+          return this.store.peekRecord('credential-library', source.value);
+        }
+      })
       .filter(Boolean);
   }
 
@@ -150,17 +178,20 @@ export default class TargetModel extends GeneratedTargetModel {
   }
 
   /**
-   * Adds credential libraries via the `add-credential-sources` method.
+   * Adds credential sources via the `add-credential-sources` method.
    * See serializer and adapter for more information.
-   * @param {[string]} credentialLibraryIDs
+   * @param {[string]} brokeredCredentialSourceIDs
    * @param {object} options
    * @param {object} options.adapterOptions
    * @return {Promise}
    */
-  addCredentialSources(credentialLibraryIDs, options = { adapterOptions: {} }) {
+  addBrokeredCredentialSources(
+    brokeredCredentialSourceIDs,
+    options = { adapterOptions: {} }
+  ) {
     const defaultAdapterOptions = {
       method: 'add-credential-sources',
-      credentialLibraryIDs,
+      brokeredCredentialSourceIDs,
     };
     // There is no "deep merge" in ES.
     return this.save({
@@ -173,20 +204,46 @@ export default class TargetModel extends GeneratedTargetModel {
   }
 
   /**
-   * Delete credential libraries via the `remove-credential-sources` method.
+   * Adds credential sources via the `add-credential-sources` method.
    * See serializer and adapter for more information.
-   * @param {[string]} credentialLibraryIDs
+   * @param {[string]} injectedApplicationCredentialSourceIDs
    * @param {object} options
    * @param {object} options.adapterOptions
    * @return {Promise}
    */
-  removeCredentialSources(
+  addInjectedApplicationCredentialSources(
-    credentialLibraryIDs,
+    injectedApplicationCredentialSourceIDs,
+    options = { adapterOptions: {} }
+  ) {
+    const defaultAdapterOptions = {
+      method: 'add-credential-sources',
+      injectedApplicationCredentialSourceIDs,
+    };
+    // There is no "deep merge" in ES.
+    return this.save({
+      ...options,
+      adapterOptions: {
+        ...defaultAdapterOptions,
+        ...options.adapterOptions,
+      },
+    });
+  }
+
+  /**
+   * Delete credential libraries and credentials via the `remove-credential-sources` method.
+   * See serializer and adapter for more information.
+   * @param {[string]} brokeredCredentialSourceIDs
+   * @param {object} options
+   * @param {object} options.adapterOptions
+   * @return {Promise}
+   */
+  removeBrokeredCredentialSources(
+    brokeredCredentialSourceIDs,
     options = { adapterOptions: {} }
   ) {
     const defaultAdapterOptions = {
       method: 'remove-credential-sources',
-      credentialLibraryIDs,
+      brokeredCredentialSourceIDs,
     };
     // There is no "deep merge" in ES.
     return this.save({
@@ -199,15 +256,59 @@ export default class TargetModel extends GeneratedTargetModel {
   }
 
   /**
-   * Delete a single credential library set via the `remove-credential-sources` method.
+   * Delete a single credential library/credential set via the `remove-credential-sources` method.
-   * @param {number} credentialLibraryID
+   * @param {number} brokeredCredentialSourceID
    * @param {object} options
    * @return {Promise}
    */
-  removeCredentialSource(credentialLibraryID, options) {
+  removeBrokeredCredentialSource(brokeredCredentialSourceID, options) {
-    return this.removeCredentialSources([credentialLibraryID], options);
+    return this.removeBrokeredCredentialSources(
+      [brokeredCredentialSourceID],
+      options
+    );
   }
 
+  /**
+   * Delete credential libraries and credentials via the `remove-credential-sources` method.
+   * See serializer and adapter for more information.
+   * @param {[string]} injectedApplicationCredentialSourceIDs
+   * @param {object} options
+   * @param {object} options.adapterOptions
+   * @return {Promise}
+   */
+  removeInjectedApplicationCredentialSources(
+    injectedApplicationCredentialSourceIDs,
+    options = { adapterOptions: {} }
+  ) {
+    const defaultAdapterOptions = {
+      method: 'remove-credential-sources',
+      injectedApplicationCredentialSourceIDs,
+    };
+    // There is no "deep merge" in ES.
+    return this.save({
+      ...options,
+      adapterOptions: {
+        ...defaultAdapterOptions,
+        ...options.adapterOptions,
+      },
+    });
+  }
+
+  /**
+   * Delete a single credential library/credential set via the `remove-credential-sources` method.
+   * @param {number} injectedApplicationCredentialSourceID
+   * @param {object} options
+   * @return {Promise}
+   */
+  removeInjectedApplicationCredentialSource(
+    injectedApplicationCredentialSourceID,
+    options
+  ) {
+    return this.removeInjectedApplicationCredentialSources(
+      [injectedApplicationCredentialSourceID],
+      options
+    );
+  }
   /**
    * True if the target type is tcp.
    * @type {boolean}

addons/api/addon/models/worker.js

@@ -0,0 +1,88 @@
+import GeneratedWorkerModel from '../generated/models/worker';
+import { attr } from '@ember-data/model';
+
+export default class WorkerModel extends GeneratedWorkerModel {
+  // =attributes
+
+  /**
+   * Names are optional on models in our API.  Thus we need to fallback on ID
+   * for display purposes.
+   * @type {string}
+   */
+  get displayName() {
+    return this.name || this.id;
+  }
+
+  /**
+   * Returns whether the worker is a pki worker.
+   * @type {boolean}
+   */
+  get isPki() {
+    return this.type === 'pki';
+  }
+
+  /**
+   * Returns the number of config tags present on the worker.
+   * @type {number}
+   */
+  get tagCount() {
+    if (!this.config_tags) {
+      return 0;
+    }
+
+    return Object.values(this.config_tags).reduce(
+      (previousCount, currentTags) => previousCount + currentTags.length,
+      0
+    );
+  }
+
+  /**
+   * Returns the config tags as an array of key/value pair objects.
+   * @type {[object]}
+   */
+  getConfigTagList() {
+    if (!this.config_tags) {
+      return null;
+    }
+
+    return Object.entries(this.config_tags).flatMap(([key, value]) =>
+      value.map((tag) => ({ key, value: tag }))
+    );
+  }
+
+  @attr({
+    description:
+      'The deduplicated union of the tags reported by the worker ' +
+      'from its configuration and any tags added through other means.\nOutput only.',
+    readOnly: true,
+  })
+  canonical_tags;
+
+  @attr({
+    description:
+      "The tags set in the worker's configuration file.\nOutput only.",
+    readOnly: true,
+  })
+  config_tags;
+
+  /**
+   * Method to modify the adapter to handle custom POST route for creating worker.
+   * @param {string} workerGeneratedAuthToken
+   * @param {object} options
+   * @param {object} options.adapterOptions
+   * @return {Promise}
+   */
+  createWorkerLed(workerGeneratedAuthToken, options = { adapterOptions: {} }) {
+    const defaultAdapterOptions = {
+      method: 'create:worker-led',
+      workerGeneratedAuthToken,
+    };
+    return super.save({
+      ...options,
+      adapterOptions: {
+        ...defaultAdapterOptions,
+        ...options.adapterOptions,
+      },
+    });
+  }
+}

addons/api/addon/serializers/account.js

@@ -38,7 +38,7 @@ export default class AccountSerializer extends ApplicationSerializer {
     delete serialized.attributes;
     if (isNew) {
       serialized.attributes = {};
-      const { issuer, subject } = snapshot.attr('attributes').record;
+      const { issuer, subject } = snapshot.record;
       if (issuer) serialized.attributes.issuer = issuer;
       if (subject) serialized.attributes.subject = subject;
     }

addons/api/addon/serializers/application.js

@@ -96,7 +96,7 @@ export default class ApplicationSerializer extends RESTSerializer {
     delete serialized.scope;
     // And serialize `scope_id`
     if (this.serializeScopeID) {
-      const scope_id = snapshot?.attr('scope')?.attr('scope_id');
+      const scope_id = snapshot?.attr('scope')?.scope_id;
       if (scope_id) serialized.scope_id = scope_id;
     }
     return serialized;
@@ -199,11 +199,9 @@ export default class ApplicationSerializer extends RESTSerializer {
   }
 
   /**
-   * One consequence of using model fragments to represent the embedded scope
+   * Hydrates the incoming scope JSON with additional boolean fields and
-   * is that they cannot have `id` fields.  We still need to know scope IDs,
+   * delegates nested attributes and secrets normalization.
-   * so we copy the `scope.id` value into the `scope.scope_id` field.
    * @override
-   * @see FragmentScope
    * @param {Model} typeClass
    * @param {Object} hash
    * @return {Object}
@@ -211,7 +209,14 @@ export default class ApplicationSerializer extends RESTSerializer {
   normalize(typeClass, hash) {
     let normalizedHash = copy(hash, true);
     const scopeID = get(normalizedHash, 'scope.id');
+    const scopeType = get(normalizedHash, 'scope.type');
     if (scopeID) normalizedHash.scope.scope_id = scopeID;
+    if (scopeType) {
+      normalizedHash.scope.type = scopeType;
+      normalizedHash.scope.isGlobal = scopeType === 'global';
+      normalizedHash.scope.isOrg = scopeType === 'org';
+      normalizedHash.scope.isProject = scopeType === 'project';
+    }
     normalizedHash = this.normalizeNestedAttributes(typeClass, normalizedHash);
     normalizedHash = this.normalizeNestedSecrets(typeClass, normalizedHash);
     return super.normalize(typeClass, normalizedHash);

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

@@ -81,7 +81,6 @@ export default class AuthMethodSerializer extends ApplicationSerializer {
    *
    * TODO:  generalize this so that all zero values are reified.
    * @override
-   * @see FragmentScope
    * @param {Model} typeClass
    * @param {Object} hash
    * @return {Object}

addons/api/addon/serializers/credential-library.js

@@ -1,3 +1,25 @@
 import ApplicationSerializer from './application';
 
-export default class CredentialLibrarySerializer extends ApplicationSerializer {}
+export default class CredentialLibrarySerializer extends ApplicationSerializer {
+  // =properties
+
+  /**
+   * @type {boolean}
+   */
+  serializeScopeID = false;
+
+  /**
+   * @override
+   * @method serialize
+   * @param {Snapshot} snapshot
+   */
+  serialize() {
+    const serialized = super.serialize(...arguments);
+    if (serialized.attributes) {
+      // Serialize `http_request_body` only if `http_method` is POST
+      if (!serialized.attributes?.http_method?.match(/post/i))
+        delete serialized.attributes.http_request_body;
+    }
+    return serialized;
+  }
+}

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

@@ -1,3 +1,50 @@
 import ApplicationSerializer from './application';
+import { copy } from 'ember-copy';
 
-export default class CredentialStoreSerializer extends ApplicationSerializer {}
+export default class CredentialStoreSerializer extends ApplicationSerializer {
+  /**
+   * @override
+   * @method serialize
+   * @param {Snapshot} snapshot
+   */
+  serialize(snapshot) {
+    switch (snapshot.record.type) {
+      case 'vault':
+        return this.serializeVault(...arguments);
+      case 'static':
+      default:
+        return this.serializeStatic(...arguments);
+    }
+  }
+
+  serializeVault() {
+    const serialized = super.serialize(...arguments);
+    if (serialized.attributes) {
+      // Token cannot be unset.  If it's falsy, it must be removed.
+      if (!serialized.attributes?.token) delete serialized.attributes.token;
+      // Client certificate key cannot be unset when certificate is set.
+      // If it's falsy, it must be removed.
+      if (
+        !serialized.attributes?.client_certificate_key &&
+        serialized.attributes?.client_certificate
+      )
+        delete serialized.attributes.client_certificate_key;
+    }
+    return serialized;
+  }
+
+  serializeStatic() {
+    const serialized = super.serialize(...arguments);
+    // Delete attributes for static cred store
+    delete serialized.attributes;
+    return serialized;
+  }
+
+  normalize(typeClass, hash, ...rest) {
+    const normalizedHash = copy(hash, true);
+    const normalized = super.normalize(typeClass, normalizedHash, ...rest);
+    // Remove secret fields as we don't track them after being created/updated
+    normalized.data.attributes.token = '';
+    return normalized;
+  }
+}

addons/api/addon/serializers/credential.js

@@ -0,0 +1,66 @@
+import ApplicationSerializer from './application';
+import { copy } from 'ember-copy';
+
+export default class CredentialSerializer extends ApplicationSerializer {
+  /**
+   * @override
+   * @method serialize
+   * @param {Snapshot} snapshot
+   */
+
+  /**
+   * @type {boolean}
+   */
+  serializeScopeID = false;
+
+  serialize(snapshot) {
+    switch (snapshot.record.type) {
+      case 'username_password':
+        return this.serializeUsernamePassword(...arguments);
+      case 'ssh_private_key':
+      default:
+        return this.serializeSSHPrivateKey(...arguments);
+    }
+  }
+
+  serializeUsernamePassword() {
+    const serialized = super.serialize(...arguments);
+    // Remove non-username_password type attributes
+    delete serialized.attributes.private_key;
+    delete serialized.attributes.private_key_passphrase;
+    // Remove password from the payload if null
+    // or empty string. This allows the user to only update
+    // the username without providing the password again.
+    // Users cannot unset the password, they would have
+    // to delete the credential entirely.
+    if (!serialized?.attributes?.password)
+      delete serialized.attributes.password;
+    return serialized;
+  }
+
+  serializeSSHPrivateKey() {
+    const serialized = super.serialize(...arguments);
+    // Remove non-ssh_private_key type attributes
+    delete serialized.attributes.password;
+    // Remove private_key and/or private_key_passphrase from the payload
+    // if null or empty string. This allows the user to only update
+    // the username without providing the private key and passphrase again.
+    // Users cannot unset the private key or passphrase, they would have
+    // to delete the credential entirely.
+    if (!serialized?.attributes?.private_key_passphrase)
+      delete serialized.attributes.private_key_passphrase;
+    if (!serialized?.attributes?.private_key)
+      delete serialized.attributes.private_key;
+    return serialized;
+  }
+
+  normalize(typeClass, hash, ...rest) {
+    const normalizedHash = copy(hash, true);
+    const normalized = super.normalize(typeClass, normalizedHash, ...rest);
+    // Remove secret fields as we don't track them after being created/updated
+    normalized.data.attributes.password = '';
+    normalized.data.attributes.private_key = '';
+    normalized.data.attributes.private_key_passphrase = '';
+    return normalized;
+  }
+}

addons/api/addon/serializers/fragment-account-attributes.js

@@ -1,26 +0,0 @@
-import JSONSerializer from '@ember-data/serializer/json';
-
-export default class FragmentAccountAttributesSerializer extends JSONSerializer {
-  /**
-   * If an attribute is annotated as readOnly in the model, don't serialize it.
-   * Otherwise delegate to default attribute serializer.
-   *
-   * @override
-   * @method serializeAttribute
-   * @param {Snapshot} snapshot
-   * @param {Object} json
-   * @param {String} key
-   * @param {Object} attribute
-   */
-  serializeAttribute(snapshot, json, key, attribute) {
-    const { type, options } = attribute;
-    let value = super.serializeAttribute(...arguments);
-    // Convert empty strings to null.
-    if (type === 'string' && json[key] === '') json[key] = null;
-    // Do not serialize read-only attributes.
-    if (options.readOnly) delete json[key];
-    // Client secret cannot be unset.  If it's falsy, it must be removed.
-    if (key === 'client_secret' && !json[key]) delete json[key];
-    return value;
-  }
-}

addons/api/addon/serializers/fragment-credential-library-attributes.js

@@ -1,27 +0,0 @@
-import JSONSerializer from '@ember-data/serializer/json';
-
-export default class FragmentCredentialLibraryAttributesSerializer extends JSONSerializer {
-  /**
-   * If an attribute is annotated as readOnly in the model, don't serialize it.
-   * Otherwise delegate to default attribute serializer.
-   * Only serialize http_request_body when `http_method` is set to `POST`.
-   * @override
-   * @method serializeAttribute
-   * @param {Snapshot} snapshot
-   * @param {Object} json
-   * @param {String} key
-   * @param {Object} attribute
-   */
-  serializeAttribute(snapshot, json, key, attribute) {
-    const { type, options } = attribute;
-    let value = super.serializeAttribute(...arguments);
-    // Convert empty strings to null.
-    if (type === 'string' && json[key] === '') json[key] = null;
-    // Do not serialize read-only attributes.
-    if (options.readOnly) delete json[key];
-    // Do not serialize http_request_body unless http_method is POST
-    if (key === 'http_request_body' && !json['http_method']?.match(/post/i))
-      delete json[key];
-    return value;
-  }
-}

addons/api/addon/serializers/fragment-credential-store-attributes.js

@@ -1,34 +0,0 @@
-import JSONSerializer from '@ember-data/serializer/json';
-
-export default class FragmentCredentialStoreAttributesSerializer extends JSONSerializer {
-  /**
-   * If an attribute is annotated as readOnly in the model, don't serialize it.
-   * Otherwise delegate to default attribute serializer.
-   *
-   * @override
-   * @method serializeAttribute
-   * @param {Snapshot} snapshot
-   * @param {Object} json
-   * @param {String} key
-   * @param {Object} attribute
-   */
-  serializeAttribute(snapshot, json, key, attribute) {
-    const { type, options } = attribute;
-    let value = super.serializeAttribute(...arguments);
-    // Convert empty strings to null.
-    if (type === 'string' && json[key] === '') json[key] = null;
-    // Do not serialize read-only attributes.
-    if (options.readOnly) delete json[key];
-    // Token cannot be unset.  If it's falsy, it must be removed.
-    if (key === 'token' && !json[key]) delete json[key];
-    // Client certificate key cannot be unset when certificate is set.
-    // If it's falsy, it must be removed.
-    if (
-      key === 'client_certificate_key' &&
-      !json[key] &&
-      json['client_certificate']
-    )
-      delete json[key];
-    return value;
-  }
-}

addons/api/addon/serializers/fragment-host-source.js

@@ -1,16 +0,0 @@
-import JSONSerializer from '@ember-data/serializer/json';
-
-export default class FragmentHostSourceSerializer extends JSONSerializer {
-  // =methods
-
-  /**
-   * Renames `id` to `host_source_id` because fragments may not have IDs.
-   * Otherwise normalizes as normal.
-   * @param {ModelClass} typeClass
-   * @param {object} resourceHash
-   * @return {object}
-   */
-  normalize(typeClass, { id: host_source_id, ...obj }) {
-    return super.normalize(typeClass, { host_source_id, ...obj });
-  }
-}

addons/api/addon/serializers/fragment-managed-group-attributes.js

@@ -1,27 +0,0 @@
-import JSONSerializer from '@ember-data/serializer/json';
-
-export default class FragmentManagedGroupAttributesSerializer extends JSONSerializer {
-  /**
-   * If an attribute is annotated as readOnly in the model, don't serialize it.
-   * Otherwise delegate to default attribute serializer.
-   * @override
-   * @method serializeAttribute
-   * @param {Snapshot} snapshot
-   * @param {Object} json
-   * @param {String} key
-   * @param {Object} attribute
-   */
-  serializeAttribute(snapshot, json, key, attribute) {
-    const { type, options } = attribute;
-    let value = super.serializeAttribute(...arguments);
-    // Convert empty string to null.
-    if (type === 'string' && json[key] === '') json[key] = null;
-    // Do not serialize read-only attributes.
-    if (options.readOnly) delete json[key];
-    // Version is sent only if it has a non-nullish value
-    if (key === 'version') {
-      if (json[key] === null || json[key] === undefined) delete json[key];
-    }
-    return value;
-  }
-}

addons/api/addon/serializers/fragment-principal.js

@@ -1,16 +0,0 @@
-import JSONSerializer from '@ember-data/serializer/json';
-
-export default class FragmentPrincipalSerializer extends JSONSerializer {
-  // =methods
-
-  /**
-   * Renames `id` to `principal_id` because fragments may not have IDs.
-   * Otherwise normalizes as normal.
-   * @param {ModelClass} typeClass
-   * @param {object} resourceHash
-   * @return {object}
-   */
-  normalize(typeClass, { id: principal_id, ...obj }) {
-    return super.normalize(typeClass, { principal_id, ...obj });
-  }
-}

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

@@ -80,8 +80,8 @@ export default class HostSetSerializer extends ApplicationSerializer {
    */
   normalize(typeClass, hash, ...rest) {
     const normalizedHash = copy(hash, true);
-    if (typeof normalizedHash?.filters === 'string') {
+    if (typeof normalizedHash?.attributes?.filters === 'string') {
-      normalizedHash.filters = [normalizedHash.filters];
+      normalizedHash.attributes.filters = [normalizedHash.attributes.filters];
     }
     const normalized = super.normalize(typeClass, normalizedHash, ...rest);
     return normalized;

addons/api/addon/serializers/target.js

@@ -7,10 +7,10 @@ export default class TargetSerializer extends ApplicationSerializer {
    * If `adapterOptions.hostSets` is set to an array of host set models,
    * the resulting target serialization should include **only host sets**
    * and the version.
-   * If `adapterOptions.credentialLibraries` is set to an array of
+   * If `adapterOptions.credentialSources` is set to an array of
-   * credential library models, the resulting target serialization should
+   * credential library and credential models, the resulting target serialization should
-   * include **only credential libraries** and the version.
+   * include **only credential libraries and crendentials** and the version.
-   * Normally, neither host sets or credential libraries are not serialized.
+   * Normally, neither host sets or credential libraries or credentials are not serialized.
    * @override
    * @param {Snapshot} snapshot
    * @return {object}
@@ -21,11 +21,20 @@ export default class TargetSerializer extends ApplicationSerializer {
     if (hostSourceIDs) {
       serialized = this.serializeWithHostSources(snapshot, hostSourceIDs);
     }
-    const credentialSourceIDs = snapshot?.adapterOptions?.credentialLibraryIDs;
+    const brokeredCredentialSourceIDs =
-    if (credentialSourceIDs)
+      snapshot?.adapterOptions?.brokeredCredentialSourceIDs;
-      serialized = this.serializeWithCredentialSources(
+    const injectedApplicationCredentialSourceIDs =
+      snapshot?.adapterOptions?.injectedApplicationCredentialSourceIDs;
+
+    if (brokeredCredentialSourceIDs)
+      serialized = this.serializeWithBrokeredCredentialSources(
         snapshot,
-        credentialSourceIDs
+        brokeredCredentialSourceIDs
+      );
+    if (injectedApplicationCredentialSourceIDs)
+      serialized = this.serializeWithInjectedApplicationCredentialSources(
+        snapshot,
+        injectedApplicationCredentialSourceIDs
       );
     return serialized;
   }
@@ -48,13 +57,33 @@ export default class TargetSerializer extends ApplicationSerializer {
    * Returns a payload containing only version and an array of passed IDs,
    * rather than existing instances on the model.
    * @param {Snapshot} snapshot
-   * @param {[string]} credentialSourceIDs
+   * @param {[string]} brokered_credential_source_ids
    * @return {object}
    */
-  serializeWithCredentialSources(snapshot, credentialSourceIDs) {
+  serializeWithBrokeredCredentialSources(
+    snapshot,
+    brokered_credential_source_ids
+  ) {
     return {
       version: snapshot.attr('version'),
-      application_credential_source_ids: credentialSourceIDs,
+      brokered_credential_source_ids,
+    };
+  }
+
+  /**
+   * Returns a payload containing only version and an array of passed IDs,
+   * rather than existing instances on the model.
+   * @param {Snapshot} snapshot
+   * @param {[string]} injected_application_credential_source_ids
+   * @return {object}
+   */
+  serializeWithInjectedApplicationCredentialSources(
+    snapshot,
+    injected_application_credential_source_ids
+  ) {
+    return {
+      version: snapshot.attr('version'),
+      injected_application_credential_source_ids,
     };
   }
 }

addons/api/addon/serializers/worker.js

@@ -0,0 +1,37 @@
+import ApplicationSerializer from './application';
+
+export default class WorkerSerializer extends ApplicationSerializer {
+  // =methods
+
+  /**
+   * If `adapterOptions.workerGeneratedAuthToken` is set,
+   * then the payload is serialized via `serializedWithGeneratedToken`.
+   * @override
+   * @param {Snapshot} snapshot
+   * @return {object}
+   */
+  serialize(snapshot) {
+    let serialized = super.serialize(...arguments);
+    const workerGeneratedAuthToken =
+      snapshot?.adapterOptions?.workerGeneratedAuthToken;
+    if (workerGeneratedAuthToken)
+      serialized = this.serializeWithGeneratedToken(
+        snapshot,
+        workerGeneratedAuthToken
+      );
+    return serialized;
+  }
+
+  /**
+   * Returns a payload with `worker_generated_auth_token` serialized.
+   * @param {Snapshot} snapshot
+   * @param {[string]} worker_generated_auth_token
+   * @return {object}
+   */
+  serializeWithGeneratedToken(snapshot, workerGeneratedAuthToken) {
+    return {
+      scope_id: snapshot.attr('scope').scope_id,
+      worker_generated_auth_token: workerGeneratedAuthToken,
+    };
+  }
+}

addons/api/addon/transforms/host-source-id-array.js

@@ -0,0 +1,16 @@
+import Transform from '@ember-data/serializer/transform';
+
+export default class HostSourceIdArrayTransform extends Transform {
+  deserialize(serialized) {
+    const stringValues = serialized || [];
+    return stringValues.map(({ id: host_source_id, ...obj }) => ({
+      host_source_id,
+      ...obj,
+    }));
+  }
+
+  serialize(deserialized) {
+    const strings = deserialized || [];
+    return strings.map(({ host_source_id: id, ...obj }) => ({ id, ...obj }));
+  }
+}

addons/api/addon/transforms/principal-array.js

@@ -0,0 +1,21 @@
+import Transform from '@ember-data/serializer/transform';
+
+export default class PrincipalArrayTransform extends Transform {
+  deserialize(serialized) {
+    const stringValues = serialized || [];
+    return stringValues.map(({ id: principal_id, scope_id, type }) => ({
+      principal_id,
+      scope_id,
+      type,
+    }));
+  }
+
+  serialize(deserialized) {
+    const strings = deserialized || [];
+    return strings.map(({ principal_id: id, scope_id, type }) => ({
+      id,
+      scope_id,
+      type,
+    }));
+  }
+}

addons/api/addon/transforms/string-array.js

@@ -0,0 +1,13 @@
+import Transform from '@ember-data/serializer/transform';
+
+export default class StringArrayTransform extends Transform {
+  deserialize(serialized) {
+    const stringValues = serialized || [];
+    return stringValues.map((value) => ({ value }));
+  }
+
+  serialize(deserialized) {
+    const strings = deserialized || [];
+    return strings.map(({ value }) => value);
+  }
+}

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

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

addons/api/app/abilities/credential.js

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

addons/api/app/abilities/worker.js

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

addons/api/app/models/credential.js

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

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

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

addons/api/app/models/fragment-credential-library-attributes.js

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

addons/api/app/models/fragment-credential-store-attributes.js

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

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

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

addons/api/app/models/fragment-managed-group-attributes.js

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

addons/api/app/models/fragment-principal.js

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

addons/api/app/models/fragment-scope.js

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

addons/api/app/models/worker.js

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

addons/api/app/serializers/credential.js

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

addons/api/app/serializers/fragment-account-attributes.js

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

addons/api/app/serializers/fragment-credential-library-attributes.js

@@ -1 +0,0 @@
-export { default } from 'api/serializers/fragment-credential-library-attributes';

addons/api/app/serializers/fragment-credential-store-attributes.js

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

addons/api/app/serializers/fragment-host-source.js

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

addons/api/app/serializers/fragment-managed-group-attributes.js

@@ -1 +0,0 @@
-export { default } from 'api/serializers/fragment-managed-group-attributes';

addons/api/app/serializers/fragment-principal.js

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

addons/api/app/serializers/worker.js

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

addons/api/app/transforms/host-source-id-array.js

@@ -0,0 +1 @@
+export { default } from 'api/transforms/host-source-id-array';

addons/api/app/transforms/principal-array.js

@@ -0,0 +1 @@
+export { default } from 'api/transforms/principal-array';

addons/api/app/transforms/string-array.js

@@ -0,0 +1 @@
+export { default } from 'api/transforms/string-array';

addons/api/mirage/config.js

@@ -1,5 +1,6 @@
 import config from '../config/environment';
 import { authHandler, deauthHandler } from './route-handlers/auth';
+import { targetHandler } from './route-handlers/target';
 import { pickRandomStatusString } from './factories/session';
 import { Response } from 'miragejs';
 import initializeMockIPC from './scenarios/ipc';
@@ -57,8 +58,23 @@ export default function () {
 
   this.get(
     '/auth-methods',
-    ({ authMethods }, { queryParams: { scope_id: scopeId, filter } }) => {
+    ({ authMethods }, { queryParams: { scope_id, recursive, filter } }) => {
-      const resultSet = authMethods.where({ scopeId });
+      let resultSet;
+      if (recursive && scope_id === 'global') {
+        resultSet = authMethods.all();
+      } else if (recursive) {
+        resultSet = authMethods.where((authMethod) => {
+          const authMethodModel = authMethods.find(authMethod.id);
+          return (
+            authMethod.scopeId === scope_id ||
+            authMethodModel?.scope?.scope?.id === scope_id
+          );
+        });
+      } else {
+        resultSet = authMethods.where(
+          (authMethod) => authMethod.scopeId === scope_id
+        );
+      }
       return resultSet.filter(makeBooleanFilter(filter));
     }
   );
@@ -123,12 +139,29 @@ export default function () {
   // Authenticate + auth methods custom routes
   this.post('/auth-methods/:id_method', authHandler);
   // Deauthenticate route
-  this.post('/scopes/:id_method', deauthHandler);
+  this.delete('/auth-tokens/:id', deauthHandler);
 
   // IAM : Users
-  this.get('/users', ({ users }, { queryParams: { scope_id: scopeId } }) => {
+  this.get(
-    return users.where({ scopeId });
+    '/users',
-  });
+    ({ users }, { queryParams: { scope_id, recursive, filter } }) => {
+      let resultSet;
+      if (recursive && scope_id === 'global') {
+        resultSet = users.all();
+      } else if (recursive) {
+        resultSet = users.where((user) => {
+          const userModel = users.find(user.id);
+          return (
+            user.scopeId === scope_id ||
+            userModel?.scope?.scope?.id === scope_id
+          );
+        });
+      } else {
+        resultSet = users.where((user) => user.scopeId === scope_id);
+      }
+      return resultSet.filter(makeBooleanFilter(filter));
+    }
+  );
   this.post('/users');
   this.get('/users/:id');
   this.patch('/users/:id');
@@ -160,9 +193,26 @@ export default function () {
   });
 
   // IAM: Groups
-  this.get('/groups', ({ groups }, { queryParams: { scope_id: scopeId } }) => {
+  this.get(
-    return groups.where({ scopeId });
+    '/groups',
-  });
+    ({ groups }, { queryParams: { scope_id, recursive, filter } }) => {
+      let resultSet;
+      if (recursive && scope_id === 'global') {
+        resultSet = groups.all();
+      } else if (recursive) {
+        resultSet = groups.where((group) => {
+          const groupModel = groups.find(group.id);
+          return (
+            group.scopeId === scope_id ||
+            groupModel?.scope?.scope?.id === scope_id
+          );
+        });
+      } else {
+        resultSet = groups.where((group) => group.scopeId === scope_id);
+      }
+      return resultSet.filter(makeBooleanFilter(filter));
+    }
+  );
   this.post('/groups');
   this.get('/groups/:id');
   this.patch('/groups/:id');
@@ -386,52 +436,7 @@ export default function () {
   this.get('/targets/:id');
   this.patch('/targets/:id');
   this.del('/targets/:id');
-  this.post(
+  this.post('/targets/:idMethod', targetHandler);
-    '/targets/:idMethod',
-    function ({ targets }, { params: { idMethod } }) {
-      const attrs = this.normalizedRequestAttrs();
-      const id = idMethod.split(':')[0];
-      const method = idMethod.split(':')[1];
-      const target = targets.find(id);
-      const updatedAttrs = {
-        version: attrs.version,
-      };
-      // If adding host sources, push them into the array
-      if (method === 'add-host-sources') {
-        updatedAttrs.hostSetIds = target.hostSetIds;
-        attrs.hostSourceIds.forEach((id) => {
-          if (!updatedAttrs.hostSetIds.includes(id)) {
-            updatedAttrs.hostSetIds.push(id);
-          }
-        });
-      }
-      // If deleting host sources, filter them out of the array
-      if (method === 'remove-host-sources') {
-        updatedAttrs.hostSetIds = target.hostSetIds;
-        updatedAttrs.hostSetIds = updatedAttrs.hostSetIds.filter((id) => {
-          return !attrs.hostSourceIds.includes(id);
-        });
-      }
-      // If adding credential sources, push them into the array
-      if (method === 'add-credential-sources') {
-        updatedAttrs.credentialLibraryIds = target.credentialLibraryIds;
-        attrs.applicationCredentialSourceIds.forEach((id) => {
-          if (!updatedAttrs.credentialLibraryIds.includes(id)) {
-            updatedAttrs.credentialLibraryIds.push(id);
-          }
-        });
-      }
-      // If deleting credential sources, filter them out of the array
-      if (method === 'remove-credential-sources') {
-        updatedAttrs.credentialLibraryIds = target.credentialLibraryIds;
-        updatedAttrs.credentialLibraryIds =
-          updatedAttrs.credentialLibraryIds.filter((id) => {
-            return !attrs.applicationCredentialSourceIds.includes(id);
-          });
-      }
-      return target.update(updatedAttrs);
-    }
-  );
 
   // session
 
@@ -541,6 +546,26 @@ export default function () {
   this.del('/credential-libraries/:id');
   this.patch('/credential-libraries/:id');
 
+  // credentials
+
+  this.get(
+    '/credentials',
+    (
+      { credentials },
+      { queryParams: { credential_store_id: credentialStoreId } }
+    ) => credentials.where({ credentialStoreId })
+  );
+  this.get('/credentials/:id');
+  this.post('/credentials', function ({ credentialStores, credentials }) {
+    const attrs = this.normalizedRequestAttrs();
+    const credentialStore = credentialStores.find(attrs.credentialStoreId);
+    attrs.scopeId = credentialStore.scope.id;
+    return credentials.create(attrs);
+  });
+
+  this.del('/credentials/:id');
+  this.patch('/credentials/:id');
+
   // managed-groups
   this.get(
     '/managed-groups',
@@ -553,6 +578,28 @@ export default function () {
   this.patch('/managed-groups/:id');
   this.del('/managed-groups/:id');
 
+  // worker
+
+  this.get(
+    '/workers',
+    ({ workers }, { queryParams: { scope_id: scopeId } }) => {
+      return workers.where({ scopeId });
+    }
+  );
+  this.get('/workers/:id');
+  this.del('/workers/:id');
+  this.patch('/workers/:id');
+  this.post('/workers:create:worker-led', ({ workers, scopes }) => {
+    const globalScope = scopes.find('global');
+
+    // This POST only takes in a token so we need to generate a random worker to return
+    const newWorker = this.create('worker', {
+      type: 'pki',
+      scope: globalScope,
+    });
+    return workers.create(newWorker.attrs);
+  });
+
   /* Uncomment the following line and the Response import above
    * Then change the response code to simulate error responses.
    * this.get('/scopes', () => new Response(505));

addons/api/mirage/factories/account.js

@@ -1,5 +1,5 @@
 import factory from '../generated/factories/account';
-import { random, internet } from 'faker';
+import { faker } from '@faker-js/faker';
 import permissions from '../helpers/permissions';
 import generateId from '../helpers/id';
 
@@ -18,13 +18,13 @@ export default factory.extend({
   attributes() {
     switch (this.type) {
       case 'password':
-        return { login_name: random.words() };
+        return { login_name: faker.random.words() };
       case 'oidc':
         return {
-          issuer: internet.ip(),
+          issuer: faker.internet.ip(),
           subject: 'sub',
-          email: internet.email(),
+          email: faker.internet.email(),
-          full_name: random.words(),
+          full_name: faker.random.words(),
         };
     }
   },

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

@@ -12,6 +12,7 @@ export default factory.extend({
       'read',
       'update',
       'delete',
+      'authenticate',
     ],
   authorized_collection_actions: () => {
     return {

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

@@ -1,5 +1,5 @@
 import factory from '../generated/factories/credential-library';
-import { random, system } from 'faker';
+import { faker } from '@faker-js/faker';
 import permissions from '../helpers/permissions';
 import generateId from '../helpers/id';
 
@@ -22,8 +22,8 @@ export default factory.extend({
       case 'vault':
         return {
           http_method: 'GET',
-          http_request_body: random.word(),
+          http_request_body: faker.random.word(),
-          path: system.directoryPath(),
+          path: faker.system.directoryPath(),
         };
     }
   },

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

@@ -1,5 +1,5 @@
 import factory from '../generated/factories/credential-store';
-import { random, internet, datatype } from 'faker';
+import { faker } from '@faker-js/faker';
 import { trait } from 'ember-cli-mirage';
 import permissions from '../helpers/permissions';
 import generateId from '../helpers/id';
@@ -14,10 +14,18 @@ export default factory.extend({
       'update',
       'delete',
     ],
-  authorized_collection_actions: () => {
+  authorized_collection_actions() {
-    return {
+    switch (this.type) {
-      'credential-libraries': ['create', 'list'],
+      case 'vault':
-    };
+        return {
+          'credential-libraries': ['create', 'list'],
+        };
+      case 'static':
+      default:
+        return {
+          credentials: ['create', 'list'],
+        };
+    }
   },
   id: () => generateId('cs_'),
   type: (i) => types[i % types.length],
@@ -26,25 +34,36 @@ export default factory.extend({
     switch (this.type) {
       case 'vault':
         return {
-          address: internet.ip(),
+          address: faker.internet.ip(),
-          namespace: random.word(),
+          namespace: faker.random.word(),
           ca_cert: 'ca-cert-123',
-          tls_server_name: internet.domainName(),
+          tls_server_name: faker.internet.domainName(),
-          tls_skip_verify: datatype.boolean(),
+          tls_skip_verify: faker.datatype.boolean(),
           token_hmac: 'token-hmac-abcde0987654321',
           client_certificate: 'client-cert-123',
           client_certificate_key_hmac: 'client-cert-key-hmac-abcde0987654321',
+          worker_filter: faker.random.words(),
         };
     }
   },
 
   withAssociations: trait({
     afterCreate(credentialStore, server) {
-      const { scope } = credentialStore;
+      const { scope, type } = credentialStore;
-      server.createList('credential-library', 2, {
+      switch (type) {
-        scope,
+        case 'vault':
-        credentialStore,
+          server.createList('credential-library', 2, {
-      });
+            scope,
+            credentialStore,
+          });
+          break;
+        case 'static':
+        default:
+          server.createList('credential', 3, {
+            scope,
+            credentialStore,
+          });
+      }
     },
   }),
 });

addons/api/mirage/factories/credential.js

@@ -0,0 +1,32 @@
+import factory from '../generated/factories/credential';
+import { faker } from '@faker-js/faker';
+import permissions from '../helpers/permissions';
+import generatedId from '../helpers/id';
+
+const types = ['username_password', 'ssh_private_key', 'json'];
+
+export default factory.extend({
+  type: (i) => types[i % types.length],
+  id() {
+    switch (this.type) {
+      case 'ssh_private_key':
+        return generatedId('credspk_');
+      case 'username_password':
+        return generatedId('credup_');
+      case 'json':
+        return generatedId('credjson_');
+    }
+  },
+  authorized_actions: () =>
+    permissions.authorizedActionsFor('credential') || [
+      'no-op',
+      'read',
+      'update',
+      'delete',
+    ],
+  attributes() {
+    return {
+      username: faker.random.word(),
+    };
+  },
+});

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

@@ -1,7 +1,7 @@
 import factory from '../generated/factories/host-catalog';
 import { trait } from 'ember-cli-mirage';
 import permissions from '../helpers/permissions';
-import { datatype, address, random } from 'faker';
+import { faker } from '@faker-js/faker';
 import generateId from '../helpers/id';
 
 const types = ['static', 'plugin'];
@@ -38,7 +38,7 @@ export default factory.extend({
       return {
         id: `plugin-id-${i}`,
         name: pluginTypes[pluginTypeCounter++ % pluginTypes.length],
-        description: random.words(),
+        description: faker.random.words(),
       };
     }
   },
@@ -47,15 +47,15 @@ export default factory.extend({
     switch (this.plugin?.name) {
       case 'aws':
         return {
-          disable_credential_rotation: datatype.boolean(),
+          disable_credential_rotation: faker.datatype.boolean(),
-          region: address.state(),
+          region: faker.address.state(),
         };
       case 'azure':
         return {
-          disable_credential_rotation: datatype.boolean(),
+          disable_credential_rotation: faker.datatype.boolean(),
-          tenant_id: datatype.hexaDecimal(6),
+          tenant_id: faker.datatype.hexadecimal(6),
-          client_id: datatype.hexaDecimal(6),
+          client_id: faker.datatype.hexadecimal(6),
-          subscription_id: datatype.hexaDecimal(8),
+          subscription_id: faker.datatype.hexadecimal(8),
         };
     }
   },
@@ -64,13 +64,13 @@ export default factory.extend({
     switch (this.plugin?.name) {
       case 'aws':
         return {
-          access_key_id: datatype.hexaDecimal(8),
+          access_key_id: faker.datatype.hexadecimal(8),
-          secret_access_key: datatype.string(12),
+          secret_access_key: faker.datatype.string(12),
         };
       case 'azure':
         return {
-          secret_id: datatype.hexaDecimal(6),
+          secret_id: faker.datatype.hexadecimal(6),
-          secret_value: datatype.string(12),
+          secret_value: faker.datatype.string(12),
         };
     }
   },

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

@@ -1,6 +1,6 @@
 import factory from '../generated/factories/host-set';
 import permissions from '../helpers/permissions';
-import { datatype, internet, database } from 'faker';
+import { faker } from '@faker-js/faker';
 import generateId from '../helpers/id';
 
 export default factory.extend({
@@ -22,34 +22,37 @@ export default factory.extend({
   },
   preferred_endpoints() {
     if (this.type === 'plugin') {
-      const enpointsAmount = datatype.number({ min: 1, max: 5 });
+      const enpointsAmount = faker.datatype.number({ min: 1, max: 5 });
       let result = [];
       for (let i = 0; i < enpointsAmount; ++i) {
-        result.push(internet.ip());
+        result.push(faker.internet.ip());
       }
       return result;
     }
   },
   sync_interval_seconds() {
     if (this.type === 'plugin') {
-      return datatype.number();
+      return faker.datatype.number();
     }
   },
-  // AWS specific
+
-  filters() {
+  attributes() {
+    // AWS specific
     if (this.plugin?.name === 'aws') {
-      const filtersAmount = datatype.number({ min: 1, max: 5 });
+      const filtersAmount = faker.datatype.number({ min: 1, max: 5 });
-      let result = [];
+      let filters = [];
       for (let i = 0; i < filtersAmount; ++i) {
-        result.push(`${datatype.string(3)}=${datatype.string(8)}`);
+        filters.push(`${faker.datatype.string(3)}=${faker.datatype.string(8)}`);
       }
-      return result;
+      return {
+        filters,
+      };
     }
-  },
+    // Azure specific
-  // Azure specific
-  filter() {
     if (this.plugin?.name === 'azure') {
-      return `${database.column()}=${database.collation()}`;
+      return {
+        filter: `${faker.database.column()}=${faker.database.collation()}`,
+      };
     }
   },
 });

addons/api/mirage/factories/host.js

@@ -1,6 +1,6 @@
 import factory from '../generated/factories/host';
 import permissions from '../helpers/permissions';
-import { internet, datatype } from 'faker';
+import { faker } from '@faker-js/faker';
 import generateId from '../helpers/id';
 
 export default factory.extend({
@@ -25,12 +25,12 @@ export default factory.extend({
     const addressesAmount = Math.floor(Math.random() * 6) + 1;
     let result = [];
     for (let i = 0; i < addressesAmount; ++i) {
-      result.push(internet.ip());
+      result.push(faker.internet.ip());
     }
     return result;
   },
   external_id() {
-    return datatype.uuid();
+    return faker.datatype.uuid();
   },
   // Only aws plugins have dns_names
   dns_names() {
@@ -38,7 +38,7 @@ export default factory.extend({
       const dnsNamesAmount = Math.floor(Math.random() * 6) + 1;
       let result = [];
       for (let i = 0; i < dnsNamesAmount; i++) {
-        result.push(internet.domainName());
+        result.push(faker.internet.domainName());
       }
       return result;
     }

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

@@ -1,5 +1,5 @@
 import factory from '../generated/factories/managed-group';
-import { random } from 'faker';
+import { faker } from '@faker-js/faker';
 import permissions from '../helpers/permissions';
 import generateId from '../helpers/id';
 
@@ -22,7 +22,7 @@ export default factory.extend({
     switch (this.type) {
       case 'oidc':
         return {
-          filter: random.words(),
+          filter: faker.random.words(),
         };
     }
   },

addons/api/mirage/factories/scope.js

@@ -14,8 +14,8 @@ export default factory.extend({
       'delete',
     ],
 
-  authorized_collection_actions: () => {
+  authorized_collection_actions() {
-    return {
+    const collectionActions = {
       scopes: ['create', 'list'],
       users: ['create', 'list'],
       sessions: ['list'],
@@ -26,6 +26,13 @@ export default factory.extend({
       'auth-methods': ['create', 'list'],
       'host-catalogs': ['create', 'list'],
     };
+
+    // Worker permissions only available on the global scope
+    if (this.type === 'global') {
+      collectionActions.workers = ['create:worker-led', 'list'];
+    }
+
+    return collectionActions;
   },
 
   id: () => generateId('s_'),

addons/api/mirage/factories/session.js

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

addons/api/mirage/factories/target.js

@@ -1,6 +1,6 @@
 import factory from '../generated/factories/target';
 import { trait } from 'ember-cli-mirage';
-import { random, datatype } from 'faker';
+import { faker } from '@faker-js/faker';
 import permissions from '../helpers/permissions';
 import generateId from '../helpers/id';
 
@@ -27,8 +27,9 @@ export default factory.extend({
   /**
    * -1 means "unlimited" and we want to generate these on occasion.
    */
-  session_connection_limit: () => random.arrayElement([-1, datatype.number()]),
+  session_connection_limit: () =>
-  worker_filter: (i) => (i % 2 === 0 ? random.words() : null),
+    faker.helpers.arrayElement([-1, faker.datatype.number()]),
+  worker_filter: (i) => (i % 2 === 0 ? faker.random.words() : null),
   type: (i) => types[i % types.length],
   /**
    * Generates attributes fields by type.
@@ -37,7 +38,7 @@ export default factory.extend({
     if (target.type === 'tcp' || target.type === 'ssh') {
       target.update({
         attributes: {
-          default_port: datatype.number(),
+          default_port: faker.datatype.number(),
         },
       });
     }
@@ -48,7 +49,9 @@ export default factory.extend({
    */
   withAssociations: trait({
     afterCreate(target, server) {
-      let randomlySelectedHostSets, randomlySelectedCredentialLibraries;
+      let randomlySelectedHostSets,
+        randomlySelectedCredentialLibraries,
+        randomlySelectedCredentials;
       randomlySelectedHostSets = server.schema.hostSets
         // BLERG:  fun fact, for no reason at all, the element passed
         // into a where function is not a full model instance, as you might
@@ -62,11 +65,22 @@ export default factory.extend({
         .where(
           (credentialLibrary) => credentialLibrary.scopeId === target.scope.id
         )
-        .models.filter(() => randomBoolean());
+        .models.filter(() => randomBoolean())
-
+        .map((cred) => cred.id);
+      randomlySelectedCredentials = server.schema.credentials
+        .where((credential) => credential.scopeId === target.scope.id)
+        .models.filter(() => randomBoolean())
+        .map((cred) => cred.id);
       target.update({
         hostSets: randomlySelectedHostSets,
-        credentialLibraries: randomlySelectedCredentialLibraries,
+        brokeredCredentialSourceIds: [
+          ...randomlySelectedCredentialLibraries,
+          ...randomlySelectedCredentials,
+        ],
+        injectedApplicationCredentialSourceIds: [
+          ...randomlySelectedCredentialLibraries,
+          ...randomlySelectedCredentials,
+        ],
       });
     },
   }),

addons/api/mirage/factories/worker.js

@@ -0,0 +1,44 @@
+import factory from '../generated/factories/worker';
+import permissions from '../helpers/permissions';
+import generateId from '../helpers/id';
+import { faker } from '@faker-js/faker';
+
+const types = ['pki', 'kms'];
+
+export default factory.extend({
+  id: () => generateId('w_'),
+  authorized_actions: () =>
+    permissions.authorizedActionsFor('worker') || [
+      'no-op',
+      'read',
+      'update',
+      'delete',
+    ],
+  type: (i) => types[i % types.length],
+  canonical_tags: (i) => {
+    if (i % 3 === 0) {
+      return { os: ['ubuntu'] };
+    }
+    if (i % 2 === 0) {
+      return {
+        type: [faker.random.word(), faker.random.word()],
+        os: ['ubuntu'],
+        env: ['dev', 'local'],
+      };
+    }
+    return undefined;
+  },
+  config_tags: (i) => {
+    if (i % 3 === 0) {
+      return { os: ['ubuntu'] };
+    }
+    if (i % 2 === 0) {
+      return {
+        type: [faker.random.word(), faker.random.word()],
+        os: ['ubuntu'],
+        env: ['dev', 'local'],
+      };
+    }
+    return undefined;
+  },
+});

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

@@ -1,14 +1,12 @@
 import { Factory } from 'ember-cli-mirage';
-import { date, datatype } from 'faker';
+import { faker } from '@faker-js/faker';
 
 /**
  * GeneratedAccountFactory
  */
 export default Factory.extend({
   type: 'password',
-  // name: () => random.words(),
+  created_time: () => faker.date.recent(),
-  // description: () => random.words(),
+  updated_time: () => faker.date.recent(),
-  created_time: () => date.recent(),
+  version: () => faker.datatype.number(),
-  updated_time: () => date.recent(),
-  version: () => datatype.number(),
 });

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

@@ -1,16 +1,16 @@
 import { Factory } from 'ember-cli-mirage';
-import { random, date, datatype } from 'faker';
+import { faker } from '@faker-js/faker';
 
 /**
  * GeneratedAuthMethodModelFactory
  */
 export default Factory.extend({
   type: 'password',
-  name: () => random.words(),
+  name: () => faker.random.words(),
-  description: () => random.words(),
+  description: () => faker.random.words(),
-  created_time: () => date.recent(),
+  created_time: () => faker.date.recent(),
-  updated_time: () => date.recent(),
+  updated_time: () => faker.date.recent(),
-  disabled: () => datatype.boolean(),
+  disabled: () => faker.datatype.boolean(),
 
   attributes: function () {
     let attrs;

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

@@ -1,12 +1,12 @@
 import { Factory } from 'ember-cli-mirage';
-import { random, date } from 'faker';
+import { faker } from '@faker-js/faker';
 
 /**
  * GeneratedCredentialLibraryModelFactory
  */
 export default Factory.extend({
-  name: () => random.words(),
+  name: () => faker.random.words(),
-  description: () => random.words(),
+  description: () => faker.random.words(),
-  created_time: () => date.recent(),
+  created_time: () => faker.date.recent(),
-  updated_time: () => date.recent(),
+  updated_time: () => faker.date.recent(),
 });

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

@@ -1,12 +1,12 @@
 import { Factory } from 'ember-cli-mirage';
-import { random, date } from 'faker';
+import { faker } from '@faker-js/faker';
 
 /**
  * GeneratedCredentialStoreModelFactory
  */
 export default Factory.extend({
-  name: () => random.words(),
+  name: () => faker.random.words(),
-  description: () => random.words(),
+  description: () => faker.random.words(),
-  created_time: () => date.recent(),
+  created_time: () => faker.date.recent(),
-  updated_time: () => date.recent(),
+  updated_time: () => faker.date.recent(),
 });

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

@@ -0,0 +1,13 @@
+import { Factory } from 'ember-cli-mirage';
+import { faker } from '@faker-js/faker';
+
+/**
+ * GeneratedCredentialModelFactory
+ */
+export default Factory.extend({
+  name: () => faker.random.words(),
+  description: () => faker.random.words(),
+  created_time: () => faker.date.recent(),
+  updated_time: () => faker.date.recent(),
+  version: () => faker.datatype.number(),
+});

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

@@ -1,14 +1,14 @@
 import { Factory } from 'ember-cli-mirage';
-import { random, date, datatype } from 'faker';
+import { faker } from '@faker-js/faker';
 
 /**
  * GeneratedGroupModelFactory
  * Group contains all fields related to a Group resource
  */
 export default Factory.extend({
-  name: () => random.words(),
+  name: () => faker.random.words(),
-  description: () => random.words(),
+  description: () => faker.random.words(),
-  created_time: () => date.recent(),
+  created_time: () => faker.date.recent(),
-  updated_time: () => date.recent(),
+  updated_time: () => faker.date.recent(),
-  disabled: () => datatype.boolean(),
+  disabled: () => faker.datatype.boolean(),
 });

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

@@ -1,14 +1,14 @@
 import { Factory } from 'ember-cli-mirage';
-import { random, date, datatype } from 'faker';
+import { faker } from '@faker-js/faker';
 
 /**
  * GeneratedHostCatalogModelFactory
  */
 export default Factory.extend({
   type: 'static',
-  name: () => random.words(),
+  name: () => faker.random.words(),
-  description: () => random.words(),
+  description: () => faker.random.words(),
-  created_time: () => date.recent(),
+  created_time: () => faker.date.recent(),
-  updated_time: () => date.recent(),
+  updated_time: () => faker.date.recent(),
-  disabled: () => datatype.boolean(),
+  disabled: () => faker.datatype.boolean(),
 });

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

@@ -1,15 +1,15 @@
 import { Factory } from 'ember-cli-mirage';
-import { random, date, datatype } from 'faker';
+import { faker } from '@faker-js/faker';
 
 /**
  * GeneratedHostSetModelFactory
  */
 export default Factory.extend({
   type: 'static',
-  name: () => random.words(),
+  name: () => faker.random.words(),
-  description: () => random.words(),
+  description: () => faker.random.words(),
-  created_time: () => date.recent(),
+  created_time: () => faker.date.recent(),
-  updated_time: () => date.recent(),
+  updated_time: () => faker.date.recent(),
-  version: () => datatype.number(),
+  version: () => faker.datatype.number(),
-  size: () => datatype.number(),
+  size: () => faker.datatype.number(),
 });

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

@@ -1,17 +1,17 @@
 import { Factory } from 'ember-cli-mirage';
-import { random, date, datatype, internet } from 'faker';
+import { faker } from '@faker-js/faker';
 
 /**
  * GeneratedHostModelFactory
  */
 export default Factory.extend({
   type: 'static',
-  name: () => random.words(),
+  name: () => faker.random.words(),
-  description: () => random.words(),
+  description: () => faker.random.words(),
-  created_time: () => date.recent(),
+  created_time: () => faker.date.recent(),
-  updated_time: () => date.recent(),
+  updated_time: () => faker.date.recent(),
-  version: () => datatype.number(),
+  version: () => faker.datatype.number(),
   attributes: () => {
-    return { address: internet.ipv6() };
+    return { address: faker.internet.ipv6() };
   },
 });

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

@@ -1,14 +1,14 @@
 import { Factory } from 'ember-cli-mirage';
-import { random, date, datatype } from 'faker';
+import { faker } from '@faker-js/faker';
 
 /**
  * GeneratedManagedGroupFactory
  * A managed group is a resource that represents a collection of accounts.
  */
 export default Factory.extend({
-  name: () => random.words(),
+  name: () => faker.random.words(),
-  description: () => random.words(),
+  description: () => faker.random.words(),
-  created_time: () => date.recent(),
+  created_time: () => faker.date.recent(),
-  updated_time: () => date.recent(),
+  updated_time: () => faker.date.recent(),
-  version: () => datatype.number(),
+  version: () => faker.datatype.number(),
 });

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

@@ -1,13 +1,13 @@
 import { Factory } from 'ember-cli-mirage';
-import { random, date } from 'faker';
+import { faker } from '@faker-js/faker';
 
 /**
  * GeneratedOrgModelFactory
  *
  */
 export default Factory.extend({
-  name: () => random.words(),
+  name: () => faker.random.words(),
-  description: () => random.words(),
+  description: () => faker.random.words(),
-  created_time: () => date.recent(),
+  created_time: () => faker.date.recent(),
-  updated_time: () => date.recent(),
+  updated_time: () => faker.date.recent(),
 });