Update auth methods form (#1981)

Update auth methods form (#1981)

.copywrite.hcl

@@ -0,0 +1,19 @@
+schema_version = 1
+
+project {
+  license        = "MPL-2.0"
+  copyright_year = 2020
+
+  # (OPTIONAL) A list of globs that should not have copyright/license headers.
+  # Supports doublestar glob patterns for more flexibility in defining which
+  # files or folders should be ignored
+  header_ignore = [
+    ".github/**",
+    ".husky/**",
+    "**/node_modules/**",
+    "**/dist/**",
+    "**/coverage/**",
+    "ui/desktop/electron-app/out/**",
+    "ui/desktop/electron-app/ember-dist/**",
+  ]
+}

.github/ISSUE_TEMPLATE/config.yml

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 contact_links:
   - name: Ask a question
     url: https://discuss.hashicorp.com/c/boundary

.github/labeler.yml

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 addons:
   - addons/**/*
 

.github/pull_request_template.md

@@ -2,16 +2,28 @@
 
 ## Description
 
+<!-- Add a brief description of changes here -->
+
+## Screenshots (if appropriate):
+
+## How to Test
+
+<!-- Add steps to test this change. Include any other necessary relevant links -->
+
 <!--
 Replace PATH_TO_FEATURE with Vercel link
 -->
 
 :technologist: [Admin preview](PATH_TO_FEATURE)
 
-:rose: [Rose preview](PATH_TO_FEATURE)
-
 :desktop_computer: [Desktop preview](PATH_TO_FEATURE)
 
-<!-- Add a brief description of changes here. Include any other necessary relevant links -->
+## Checklist:
+<!-- strikethrough the checklist item that is not relevant to your change -->
 
-### Screenshots (if appropriate):
+- [ ] I have added before and after screenshots for UI changes
+- [ ] I have added JSON response output for API changes
+- [ ] I have added steps to reproduce and test for bug fixes in the description
+- [ ] I have commented on my code, particularly in hard-to-understand areas
+- [ ] My changes generate no new warnings
+- [ ] I have added tests that prove my fix is effective or that my feature works

.github/scripts/merge.sh

@@ -0,0 +1,94 @@
+#!/usr/bin/env bash
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
+set -euo pipefail
+
+# Configure Git
+git config --global user.email "hc-github-team-secure-boundary@hashicorp.com"
+git config --global user.name "github-team-secure-boundary"
+# Fetch branches from ENT
+git fetch origin
+BRANCH=${1}
+
+echo "BRANCH to merge is $BRANCH"
+git checkout "${BRANCH}"
+
+# Checkout OSS repo
+git remote add oss-remote https://github.com/hashicorp/boundary-ui.git
+git fetch oss-remote
+
+# Merge oss/${BRANCH} into ent/${BRANCH}
+git_merge_branch="${2}"
+git checkout -b "${git_merge_branch}"
+latest_oss_commit="$(git rev-parse --short oss-remote/${BRANCH})"
+echo "Trying to merge the latest oss commit - ${latest_oss_commit} from oss/${BRANCH} into ent/${BRANCH}"
+
+if ! errors=$(git merge -m "Merge Boundary UI OSS branch '${BRANCH}' at commit ${latest_oss_commit}" "${latest_oss_commit}"); then
+  # Here we can try to auto resolve conflicts
+  # This logic will vary from project to project. The below is just an example.
+  # We'll try to resolve package.json and yarn.lock conflicts by taking the OSS changes
+  conflicts=$(git diff --name-only --diff-filter=U)
+  printf "Found conflicts:\n${conflicts}\n"
+  # Resolve package.json conflicts by taking oss
+  if echo "$conflicts" | grep -q package.json; then
+    echo "Checking out oss package.json..."
+    git checkout --theirs package.json
+    git add package.json
+  fi
+  # Resolve yarn.lock conflicts by taking oss
+  if echo "$conflicts" | grep -q yarn.lock; then
+    echo "Checking out oss yarn.lock..."
+    git checkout --theirs yarn.lock
+    git add yarn.lock
+  fi
+
+  # If we can commit all the changes without conflict, we have resolved everything automatically
+  if ! git commit --no-edit; then
+    echo "Auto Merge failed, creating a draft PR"
+    git merge --abort
+    git clean -xfd
+    git fetch oss-remote
+    git checkout "${OSS_BRANCH}"
+    git checkout -b "${OSS_LOCAL_BRANCH}"
+    git push -f --set-upstream origin "${OSS_LOCAL_BRANCH}"
+    gh pr create \
+      --draft \
+      --fill-first \
+      --label "oss-merge" \
+      -B "${BASE_BRANCH}" \
+      -H "${OSS_LOCAL_BRANCH}" \
+      -a "${ACTOR}" \
+      -t "[${BASE_BRANCH/oss\/release\//}] OSS to ENT merge of (${SHA::7})" \
+      -b "${BASE_BRANCH/oss\//} upstream merge of (${SHA::7})
+      Merge failed, Please fix the conflicts using github UI or using the following commands:
+      \`\`\`bash
+      git checkout ${BASE_BRANCH}
+      git pull
+      git checkout ${OSS_LOCAL_BRANCH}
+      git merge ${BASE_BRANCH}
+      # fix conflicts and commit
+      git push origin ${OSS_LOCAL_BRANCH}
+      \`\`\`"
+    exit 0
+  fi
+fi
+
+# Check that there are actually changes to merge by comparing the
+# merge branch to the current checked out branch
+if (git diff ${BRANCH} --exit-code > /dev/null); then
+  echo "there are no changes to merge"
+  exit 0
+fi
+git push origin "${git_merge_branch}"
+gh pr create \
+  --fill-first \
+  --label "oss-merge" \
+  -B "${BASE_BRANCH}" \
+  -H "${MERGE_BRANCH}" \
+  -a ${ACTOR} \
+  -t "[${BASE_BRANCH/oss\/release\//}] OSS to ENT merge of (${SHA::7})" \
+  -b "${BASE_BRANCH/oss\//} upstream merge of (${SHA::7})"
+gh pr merge --auto --merge
+
+# This PR will be need to be approved manually

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

@@ -3,50 +3,51 @@ on:
   push:
     branches:
       - main
+      - "release/**"
+  workflow_dispatch:
 
 jobs:
   dependencies:
     name: Install dependencies
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
         id: node-modules-cache
         with:
-          path: '**/node_modules'
+          path: "**/node_modules"
           key: node-modules-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
             node-modules-
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
         with:
-          node-version: '16.x'
+          node-version: 16
       - run: yarn install
   build-admin-ui-oss:
     name: Build Admin UI OSS
     needs: [dependencies]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
         id: node-modules-cache
         with:
-          path: '**/node_modules'
+          path: "**/node_modules"
           key: node-modules-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
             node-modules-
       - name: Build
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
         with:
-          node-version: '16.x'
-        if: steps.node-modules-cache.outputs.cache-hit != 'true'
+          node-version: 16
       - run: yarn run build:ui:admin:oss
       - name: Upload artifact admin-ui
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
         with:
           name: admin-ui
           path: ./ui/admin/dist/
       - name: Upload artifact OSS admin UI
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
         with:
           name: admin-ui-oss
           path: ./ui/admin/dist/
@@ -55,22 +56,21 @@ jobs:
     needs: [dependencies]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
         id: node-modules-cache
         with:
-          path: '**/node_modules'
+          path: "**/node_modules"
           key: node-modules-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
             node-modules-
       - name: Build
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
         with:
-          node-version: '16.x'
-        if: steps.node-modules-cache.outputs.cache-hit != 'true'
+          node-version: 16
       - run: yarn run build:ui:admin:enterprise
       - name: Upload artifact enterprise admin UI
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
         with:
           name: admin-ui-ent
           path: ./ui/admin/dist/
@@ -79,22 +79,21 @@ jobs:
     needs: [dependencies]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
         id: node-modules-cache
         with:
-          path: '**/node_modules'
+          path: "**/node_modules"
           key: node-modules-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
             node-modules-
       - name: Build
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
         with:
-          node-version: '16.x'
-        if: steps.node-modules-cache.outputs.cache-hit != 'true'
+          node-version: 16
       - run: yarn run build:ui:admin:hcp
       - name: Upload artifact HCP admin UI
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
         with:
           name: admin-ui-hcp
           path: ./ui/admin/dist/

.github/workflows/codeql-analysis.yml

@@ -7,7 +7,7 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [main, release-v0.1.0]
+    branches: [main]
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [main]
@@ -27,23 +27,14 @@ jobs:
         language: ['javascript']
         # Learn more...
         # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
-
+    
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
-      with:
-        # We must fetch at least the immediate parents so that if this is
-        # a pull request then we can checkout the head.
-        fetch-depth: 2
-
-    # If this run was triggered by a pull request event, then checkout
-    # the head of the pull request instead of the merge commit.
-    - run: git checkout HEAD^2
-      if: ${{ github.event_name == 'pull_request' }}
+      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@bad341350a2f5616f9e048e51360cedc49181ce8 # codeql-bundle-v2.15.1
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -51,11 +42,6 @@ jobs:
         # Prefix the list here with "+" to use these queries and those in the config file.
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
-
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
 
@@ -68,4 +54,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@bad341350a2f5616f9e048e51360cedc49181ce8 # codeql-bundle-v2.15.1

.github/workflows/jira.yml

@@ -19,18 +19,18 @@ jobs:
       id: boundary-team-role
       run: |
         TEAM=boundary
-        ROLE="$(hub api orgs/hashicorp/teams/${TEAM}/memberships/${{ github.actor }} | jq -r '.role | select(.!=null)')"
+        ROLE="$(gh api orgs/hashicorp/teams/${TEAM}/memberships/${{ github.actor }} | jq -r '.role | select(.!=null)')"
         if [[ -n ${ROLE} ]]; then
           echo "Actor ${{ github.actor }} is a ${TEAM} team member, skipping ticket creation"
         else
           echo "Actor ${{ github.actor }} is not a ${TEAM} team member"
         fi
-        echo "::set-output name=role::${ROLE}"
+        echo "role=${ROLE}" >> $GITHUB_OUTPUT
       env:
         GITHUB_TOKEN: ${{ secrets.JIRA_SYNC_GITHUB_TOKEN }}
 
     - name: Login
-      uses: atlassian/gajira-login@v2.0.0
+      uses: atlassian/gajira-login@45fd029b9f1d6d8926c6f04175aa80c0e42c9026 # v3.0.1
       env:
         JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
         JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }}
@@ -41,14 +41,14 @@ jobs:
       id: set-ticket-type
       run: |
         if [[ "${{ github.event_name }}" == "pull_request_target" ]]; then
-          echo "::set-output name=type::PR"
+          echo "type=PR" >> $GITHUB_OUTPUT
         else
-          echo "::set-output name=type::ISS"
+          echo "type=ISS" >> $GITHUB_OUTPUT
         fi
 
     - name: Create ticket
       if: github.event.action == 'opened' && !steps.boundary-team-role.outputs.role
-      uses: tomhjp/gh-action-jira-create@v0.1.0
+      uses: tomhjp/gh-action-jira-create@3ed1789cad3521292e591a7cfa703215ec1348bf # v0.2.1
       with:
         project: ICU
         issuetype: "GH Issue"
@@ -61,28 +61,28 @@ jobs:
     - name: Search
       if: github.event.action != 'opened'
       id: search
-      uses: tomhjp/gh-action-jira-search@v0.2.1
+      uses: tomhjp/gh-action-jira-search@04700b457f317c3e341ce90da5a3ff4ce058f2fa # v0.2.2
       with:
         # cf[10089] is Issue Link custom field
         jql: 'issuetype = "GH Issue" and cf[10089]="${{ github.event.issue.html_url || github.event.pull_request.html_url }}"'
 
     - name: Sync comment
       if: github.event.action == 'created' && steps.search.outputs.issue
-      uses: atlassian/gajira-comment@v2.0.2
+      uses: atlassian/gajira-comment@164913891625fe50e9836957902e0bf7d9ef99a8 # v3.0.1
       with:
         issue: ${{ steps.search.outputs.issue }}
         comment: "${{ github.actor }} ${{ github.event.review.state || 'commented' }}:\n\n${{ github.event.comment.body || github.event.review.body }}\n\n${{ github.event.comment.html_url || github.event.review.html_url }}"
 
     - name: Close ticket
       if: (github.event.action == 'closed' || github.event.action == 'deleted') && steps.search.outputs.issue
-      uses: atlassian/gajira-transition@v2.0.1
+      uses: atlassian/gajira-transition@38fc9cd61b03d6a53dd35fcccda172fe04b36de3 # v3.0.1
       with:
         issue: ${{ steps.search.outputs.issue }}
         transition: Done
 
     - name: Reopen ticket
       if: github.event.action == 'reopened' && steps.search.outputs.issue
-      uses: atlassian/gajira-transition@v2.0.1
+      uses: atlassian/gajira-transition@38fc9cd61b03d6a53dd35fcccda172fe04b36de3 # v3.0.1
       with:
         issue: ${{ steps.search.outputs.issue }}
         transition: "To Do"

.github/workflows/labeler.yml

@@ -6,6 +6,6 @@ jobs:
   triage:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/labeler@main
+    - uses: actions/labeler@ac9175f8a1f3625fd0d4fb234536d26811351594 # v4.3.0
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/monorepo-validate.yaml

@@ -6,17 +6,17 @@ jobs:
     name: Install dependencies
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
         id: node-modules-cache
         with:
           path: '**/node_modules'
           key: node-modules-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
             node-modules-
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
         with:
-          node-version: '16.x'
+          node-version: 16
       - run: yarn install
 
   compliance:
@@ -24,18 +24,17 @@ jobs:
     needs: [dependencies]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
         id: node-modules-cache
         with:
           path: '**/node_modules'
           key: node-modules-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
             node-modules-
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
         with:
-          node-version: '16.x'
-        if: steps.node-modules-cache.outputs.cache-hit != 'true'
+          node-version: 16
       - run: yarn run compliance:licenses
 
   lint:
@@ -44,18 +43,17 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
         id: node-modules-cache
         with:
           path: '**/node_modules'
           key: node-modules-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
             node-modules-
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
         with:
-          node-version: '16.x'
-        if: steps.node-modules-cache.outputs.cache-hit != 'true'
+          node-version: 16
       - run: yarn lint
 
   test:
@@ -64,14 +62,13 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 15
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
         id: node-modules-cache
         with:
           path: '**/node_modules'
           key: node-modules-${{ hashFiles('**/yarn.lock') }}
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
         with:
-          node-version: '16.x'
-        if: steps.node-modules-cache.outputs.cache-hit != 'true'
+          node-version: 16
       - run: yarn test

.github/workflows/oss-merge.yml

@@ -0,0 +1,24 @@
+name: OSS → ENT Merge
+on:
+  repository_dispatch:
+    types: [ oss-merge ]
+jobs:
+  oss-merge:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        with:
+          token: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
+      - run: |
+          git fetch --prune --unshallow
+          ./.github/scripts/merge.sh "${BASE_BRANCH}" "${MERGE_BRANCH}"
+        env:
+          BASE_BRANCH: ${{ github.event.client_payload.git-ref }}
+          OSS_BRANCH:  oss-remote/${{ github.event.client_payload.git-ref }}
+          OSS_LOCAL_BRANCH:  oss/${{ github.event.client_payload.git-ref }}-${{ github.event.client_payload.git-sha }}
+          MERGE_BRANCH: oss/merge-${{ github.event.client_payload.git-ref }}-${{github.event.client_payload.git-sha}}
+          GITHUB_TOKEN: ${{secrets.ELEVATED_GITHUB_TOKEN }}
+          MERGE_APPROVE_TOKEN: ${{secrets.ELEVATED_GITHUB_TOKEN }}
+          ACTOR: ${{ github.event.client_payload.git-actor }}
+          SHA: ${{github.event.client_payload.git-sha}}

.github/workflows/ui-release-trigger.yml

@@ -9,7 +9,7 @@ jobs:
   trigger-gha-release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Release description
         run: |
           echo "Triggering release with a TAG ${GITHUB_REF#refs/tags/}"

.gitignore

@@ -20,6 +20,4 @@ libpeerconnection.log
 npm-debug.log*
 testem.log
 yarn-error.log
-storybook-static
-**/.storybook/*.html
 .watchman-cookie*

.husky/prepare-commit-msg

@@ -4,11 +4,24 @@
 COMMIT_MSG_FILE=$1
 COMMIT_SOURCE=$2
 SHA1=$3
+# Gets the current branch name but if we're in a detached head state, return "HEAD"
+BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)
+# Regex to match the ICU-#### branch name pattern we use
+ISSUE_REGEX="^(ICU-[0-9]+)"
 
-# Don't run commitizen for merge or squash commits
-if [ "${COMMIT_SOURCE}" = merge ] || [ "${COMMIT_SOURCE}" = squash ];then
+# Don't run commitizen for merge or squash commits, as well as when rebasing
+if [ "${COMMIT_SOURCE}" = merge ] || [ "${COMMIT_SOURCE}" = squash ] || [ "${COMMIT_SOURCE}" = "message" -a "${BRANCH_NAME}" = "HEAD" ];then
     exit 0
 fi
 
-# This is to allow interaction with the terminal for commitizen
-exec < /dev/tty && npx git-cz --hook || true
+# If the branch name matches, set the JIRA link automatically
+if [[ $BRANCH_NAME =~ $ISSUE_REGEX ]]
+then
+  issue="${BASH_REMATCH[1]}"
+  url="https://hashicorp.atlassian.net/browse/${issue}"
+  exec < /dev/tty && npx git-cz --issues="$url" --hook || true
+else
+  # This is to allow interaction with the terminal for commitizen
+  exec < /dev/tty && npx git-cz --hook || true
+fi
+

.release/release-metadata.hcl

@@ -1,3 +1,6 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 url_license = "https://github.com/hashicorp/boundary-ui/blob/main/LICENSE"
 url_project_website = "https://learn.hashicorp.com/tutorials/boundary/getting-started-desktop-app"
 url_source_repository = "https://github.com/hashicorp/boundary-ui"

README.md

@@ -13,44 +13,78 @@ subproject, e.g. running or testing.
 
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
-**Table of Contents**  *generated with [DocToc](https://github.com/thlorenz/doctoc)*
 
-- [Prerequisites](#prerequisites)
-- [Installation](#installation)
-- [Yarn Commands](#yarn-commands)
-- [Contributing](#contributing)
-  - [Branching](#branching)
-  - [Building ToC](#building-toc)
-  - [Building Admin UI for Production](#building-admin-ui-for-production)
-    - [Building with a Container](#building-with-a-container)
-  - [Building Desktop UI for Production](#building-desktop-ui-for-production)
-  - [Connect Boundary UI to Boundary local instance](#connect-boundary-ui-to-boundary-local-instance)
-    - [For admin](#for-admin)
-    - [For desktop](#for-desktop)
-  - [Committing](#committing)
-    - [License Checking](#license-checking)
+- [Boundary UI Monorepo](#boundary-ui-monorepo)
+  - [Projects](#projects)
+    - [Core (addons/core):](#core-addonscore)
+    - [API (addons/api):](#api-addonsapi)
+    - [Auth (addons/auth):](#auth-addonsauth)
+    - [Rose (addons/rose)](#rose-addonsrose)
+    - [Admin (ui/admin)](#admin-uiadmin)
+    - [Desktop Client (ui/desktop)](#desktop-client-uidesktop)
+  - [Prerequisites](#prerequisites)
+  - [Optional Tooling](#optional-tooling)
+  - [Installation](#installation)
+  - [Yarn Commands](#yarn-commands)
+  - [Contributing](#contributing)
+    - [Branching](#branching)
+    - [Building ToC](#building-toc)
+    - [Building Admin UI for Production](#building-admin-ui-for-production)
+      - [Building with a Container](#building-with-a-container)
+    - [Building Desktop UI for Production](#building-desktop-ui-for-production)
+    - [Connect Boundary UI to Boundary local instance](#connect-boundary-ui-to-boundary-local-instance)
+      - [For admin](#for-admin)
+      - [For desktop](#for-desktop)
+    - [Committing](#committing)
+      - [License Checking](#license-checking)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
+## Projects
+
+This monorepo contains multiple projects.
+### Core (addons/core):
+Core features use by Boundary UI's, i.e i18n, helpers or components. [Project Readme](addons/core).
+
+### API (addons/api):
+The API data access layer for Boundary and all the related mocks. [Project Readme](addons/api).
+
+### Auth (addons/auth):
+Authentication layer for Boundary. [Project Readme](addons/auth).
+
+### Rose (addons/rose)
+Common styles and components shared by Boundary UIs. [Project Readme](addons/rose).
+
+### Admin (ui/admin)
+The Admin UI for Boundary. [Project Readme](ui/admin).
+
+### Desktop Client (ui/desktop)
+The desktop client UI for Boundary. [Project Readme](ui/desktop).
+
 ## Prerequisites
 
 You will need the following things properly installed on your computer.
 
 * [Git][git]
 * [Node.js][node]
-  * Supported versions:`v12`, `v14` and `v16`.
-  * **Apple Silicon Users**:  if you experience problems building or running
-    Boundary UIs, try Node v14.
+  * Supported versions: `v16` and `v18`.
 * [Yarn][yarn] installed globally
 * [Google Chrome][chrome]
 * [Firefox][firefox]
 
-[git]: https://git-scm.com/
-[node]: https://nodejs.org/
-[yarn]: https://classic.yarnpkg.com/lang/en/
-[chrome]: https://google.com/chrome/
-[firefox]: https://firefox.com/
-[yarn-workspaces]: https://classic.yarnpkg.com/en/docs/workspaces/
+
+## Optional Tooling
+
+Our team finds the following applications useful in day-to-day development
+workflows.  These are merely recommendations.  We encourage you to use the tools
+that best suit you and your personal style.
+
+* [VS Code][vscode]: Code editor for building and debugging web applications
+* [Warp][warp]:  Terminal application for macOS
+* [Homebrew][homebrew]:  The missing package manager for macOS and Linux
+* [Ember Inspector][ember-inspector]:  Understand and debug Ember applications
+* [Postman][postman]:  Test and inspect APIs
+
 
 ## Installation
 
@@ -125,7 +159,7 @@ In windows, UI is generated using docker to provide a stable UI across platforms
 
 ```cmd
 yarn install
-docker-compose -f docker-compose-embedding.yml run build-desktop-production 
+docker-compose -f docker-compose-embedding.yml run build-desktop-production
 yarn build:ui:desktop:app
 ```
 
@@ -180,3 +214,15 @@ The change will be verified upon PR.  GPL variants and UNLICENSED dependencies
 will not be accepted.
 
 [github-flow]: https://guides.github.com/introduction/flow/
+
+[git]: https://git-scm.com/
+[node]: https://nodejs.org/
+[yarn]: https://classic.yarnpkg.com/lang/en/
+[chrome]: https://google.com/chrome/
+[firefox]: https://firefox.com/
+[yarn-workspaces]: https://classic.yarnpkg.com/en/docs/workspaces/
+[homebrew]: https://brew.sh
+[warp]: https://www.warp.dev
+[vscode]: https://code.visualstudio.com/
+[ember-inspector]: https://guides.emberjs.com/release/ember-inspector/
+[postman]: https://www.postman.com/downloads/

addons/api/.ember-cli

@@ -8,8 +8,8 @@
   "disableAnalytics": false,
 
   /**
-  Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
-  rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
+    Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
+    rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
   */
   "isTypeScriptProject": false
 }

addons/api/.eslintrc.js

@@ -1,15 +1,22 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 'use strict';
 
 module.exports = {
   root: true,
   parser: '@babel/eslint-parser',
   parserOptions: {
-    ecmaVersion: 2018,
+    ecmaVersion: 'latest',
     sourceType: 'module',
     // This is specific babel-config. If grows consider creating a babel config file
     requireConfigFile: false,
     babelOptions: {
-      plugins: [['@babel/plugin-proposal-decorators', { legacy: true }]],
+      plugins: [
+        ['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
+      ],
     },
     // end of babel-config
   },
@@ -46,8 +53,7 @@ module.exports = {
         browser: false,
         node: true,
       },
-      plugins: ['node'],
-      extends: ['plugin:node/recommended'],
+      extends: ['plugin:n/recommended'],
     },
     {
       // Test files:

addons/api/.npmignore

@@ -22,7 +22,6 @@
 /.travis.yml
 /.watchmanconfig
 /bower.json
-/config/ember-try.js
 /CONTRIBUTING.md
 /ember-cli-build.js
 /testem.js

addons/api/.prettierrc.js

@@ -1,3 +1,15 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 module.exports = {
-  singleQuote: true,
+  overrides: [
+    {
+      files: '*.{js,ts}',
+      options: {
+        singleQuote: true,
+      },
+    },
+  ],
 };

addons/api/.template-lintrc.js

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 'use strict';
 
 module.exports = {

addons/api/addon/abilities/account.js

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import ModelAbility from './model';
 
 /**
@@ -6,6 +11,30 @@ import ModelAbility from './model';
 export default class AccountAbility extends ModelAbility {
   // =permissions
 
+  /**
+   * Only "known" account types may be read.
+   * @type {boolean}
+   */
+  get canRead() {
+    return !this.model.isUnknown && this.hasAuthorizedAction('read');
+  }
+
+  /**
+   * Only "known" account types may be updated.
+   * @type {boolean}
+   */
+  get canUpdate() {
+    return !this.model.isUnknown && this.hasAuthorizedAction('update');
+  }
+
+  /**
+   * Only "known" account types may be deleted.
+   * @type {boolean}
+   */
+  get canDelete() {
+    return !this.model.isUnknown && this.hasAuthorizedAction('delete');
+  }
+
   /**
    * @type {boolean}
    */

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

@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
+import ModelAbility from './model';
+/**
+ * Provides abilities for auth method.
+ */
+export default class AuthMethodAbility extends ModelAbility {
+  // =permissions
+
+  /**
+   * Only "known" auth method types may be read.
+   * @type {boolean}
+   */
+  get canRead() {
+    return !this.model.isUnknown && this.hasAuthorizedAction('read');
+  }
+
+  /**
+   * Only "known" auth method types may be updated.
+   */
+  get canUpdate() {
+    return !this.model.isUnknown && this.hasAuthorizedAction('update');
+  }
+
+  /**
+   * Only "known" auth method types may be deleted.
+   */
+  get canDelete() {
+    return !this.model.isUnknown && this.hasAuthorizedAction('delete');
+  }
+}

addons/api/addon/abilities/channel-recording.js

@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
+import ModelAbility from './model';
+import { inject as service } from '@ember/service';
+
+/**
+ * Provides abilities for channel recordings.
+ */
+export default class ChannelRecordingAbility extends ModelAbility {
+  // =services
+  @service abilities;
+
+  // =permissions
+  get canGetAsciicast() {
+    const sessionRecording = this.model.connection_recording.session_recording;
+    const sessionRecordingAbility = this.abilities.abilityFor(
+      'session-recording',
+      sessionRecording
+    );
+
+    return this.model.isAsciicast && sessionRecordingAbility.canDownload;
+  }
+}

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

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import ModelAbility from './model';
 /**
  * Provides abilities for credential.

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

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import ModelAbility from './model';
 import { inject as service } from '@ember/service';
 /**

addons/api/addon/abilities/credential.js

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import ModelAbility from './model';
 /**
  * Provides abilities for credential.

addons/api/addon/abilities/group.js

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import ModelAbility from './model';
 
 /**

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

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import ModelAbility from './model';
 
 /**

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

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import ModelAbility from './model';
 
 /**

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

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import ModelAbility from './model';
 
 /**

addons/api/addon/abilities/model.js

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import { Ability } from 'ember-can';
 
 /**

addons/api/addon/abilities/role.js

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import ModelAbility from './model';
 import { inject as service } from '@ember/service';
 

addons/api/addon/abilities/session-recording.js

@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
+import ModelAbility from './model';
+
+/**
+ * Provides abilities for session recordings.
+ */
+export default class SessionRecordingAbility extends ModelAbility {
+  // =services
+
+  // =permissions
+
+  /**
+   * Only "known" session recording types may be read.
+   * @type {boolean}
+   */
+  get canRead() {
+    return !this.model.isUnknown && super.canRead;
+  }
+
+  get canDownload() {
+    return this.hasAuthorizedAction('download');
+  }
+}

addons/api/addon/abilities/session.js

@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
+import ModelAbility from './model';
+
+/**
+ * Provides abilities for sessions.
+ */
+export default class SessionAbility extends ModelAbility {
+  // =services
+
+  // =permissions
+
+  /**
+   * Only available sessions may be read.
+   * @type {boolean}
+   */
+  get canRead() {
+    return (
+      this.model.isAvailable &&
+      (this.hasAuthorizedAction('read:self') || super.canRead)
+    );
+  }
+
+  /**
+   * Only available sessions may be canceled.
+   * @type {boolean}
+   */
+  get canCancel() {
+    return (
+      this.model.isAvailable &&
+      (this.hasAuthorizedAction('cancel:self') ||
+        this.hasAuthorizedAction('cancel'))
+    );
+  }
+}

addons/api/addon/abilities/storage-bucket.js

@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
+import ModelAbility from './model';
+
+/**
+ * Provides abilities for storage buckets.
+ */
+export default class StorageBucketAbility extends ModelAbility {
+  // =services
+
+  // =permissions
+
+  /**
+   * Only "known" storage bucket types may be read.
+   * @type {boolean}
+   */
+  get canRead() {
+    return !this.model.isUnknown && super.canRead;
+  }
+
+  /**
+   * Only "known" storage bucket types may be updated.
+   * @type {boolean}
+   */
+  get canUpdate() {
+    return !this.model.isUnknown && super.canUpdate;
+  }
+
+  /**
+   * Only "known" storage bucket types may be deleted.
+   * @type {boolean}
+   */
+  get canDelete() {
+    return !this.model.isUnknown && super.canDelete;
+  }
+}

addons/api/addon/abilities/target.js

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import ModelAbility from './model';
 
 /**

addons/api/addon/abilities/user.js

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import ModelAbility from './model';
 
 /**
@@ -19,4 +24,20 @@ export default class UserAbility extends ModelAbility {
   get canRemoveAccounts() {
     return this.hasAuthorizedAction('remove-accounts');
   }
+
+  /**
+   * @type {boolean}
+   */
+  get canAddAccount() {
+    const { account, canAddAccounts } = this;
+    return canAddAccounts && !account.isUnknown;
+  }
+
+  /**
+   * @type {boolean}
+   */
+  get canRemoveAccount() {
+    const { account, canRemoveAccounts } = this;
+    return canRemoveAccounts && !account.isUnknown;
+  }
 }

addons/api/addon/abilities/worker.js

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import ModelAbility from './model';
 
 /**

addons/api/addon/adapters/application.js

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import RESTAdapter from '@ember-data/adapter/rest';
 import { serializeIntoHash } from '@ember-data/adapter/-private';
 /* eslint-disable-next-line ember/no-mixins */

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

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import ApplicationAdapter from './application';
 
 export default class HostCatalogAdapter extends ApplicationAdapter {
@@ -15,8 +20,12 @@ export default class HostCatalogAdapter extends ApplicationAdapter {
   buildURL(modelName, id, snapshot, requestType) {
     let url = super.buildURL(...arguments);
     if (requestType === 'createRecord') {
-      const pluginName = snapshot.attr('plugin')?.name;
-      if (pluginName) url = `${url}?plugin_name=${pluginName}`;
+      try {
+        const pluginName = snapshot.attr('plugin')?.name;
+        if (pluginName) url = `${url}?plugin_name=${pluginName}`;
+      } catch (e) {
+        // Ignore any adapter errors here
+      }
     }
     return url;
   }

addons/api/addon/adapters/session-recording.js

@@ -0,0 +1,74 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
+import ApplicationAdapter from './application';
+import { MIME_TYPE_ASCIICAST } from 'api/models/channel-recording';
+
+export default class SessionRecordingAdapter extends ApplicationAdapter {
+  /**
+   * Overrides the default `buildURL` such that for custom download methods,
+   * URLs will get the query parameters. All other request types behave as normal.
+   *
+   * @param modelName {string}
+   * @param id {string}
+   * @param snapshot {object}
+   * @param requestType {string}
+   * @param query {object}
+   * @returns {string}
+   */
+  buildURL(modelName, id, snapshot, requestType, query) {
+    let url = super.buildURL(...arguments);
+    let method;
+    try {
+      method = snapshot?.adapterOptions?.method;
+    } catch (e) {
+      // Ignore any adapter errors here
+    }
+    if (method === 'download') {
+      const queryParams = new URLSearchParams(query).toString();
+      if (queryParams) url = `${url}?${queryParams}`;
+    }
+    return url;
+  }
+
+  /**
+   * Handles the download recording for recordings. Takes in a mime type for the
+   * type or recording to return.
+   * The ID can be the session ID, session recording ID,
+   * connection recording ID, or the channel recording ID.
+   * @param id {string}
+   * @param mimeType {string}
+   * @returns {Promise<string>}
+   */
+  async getRecordingDownload({ id, mimeType }) {
+    const options = { adapterOptions: { method: 'download' } };
+    const url = this.buildURL('session-recording', id, options, 'findRecord', {
+      mime_type: mimeType,
+    });
+
+    const response = await fetch(url, { headers: this.headers });
+    if (response?.ok) {
+      return response.text();
+    } else {
+      throw this.handleResponse(
+        response.status,
+        response.headers,
+        await response.text()
+      );
+    }
+  }
+
+  /**
+   * Returns an ascii cast recording.
+   * @param id
+   * @returns {Promise<string>}
+   */
+  getAsciicast(id) {
+    return this.getRecordingDownload({
+      id,
+      mimeType: MIME_TYPE_ASCIICAST,
+    });
+  }
+}

addons/api/addon/adapters/storage-bucket.js

@@ -0,0 +1,33 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
+import ApplicationAdapter from './application';
+
+export default class StorageBucketAdapter extends ApplicationAdapter {
+  /**
+   * Overrides the default `buildURL` such that on _create_, URLs for records of
+   * type `plugin` get an extra query parameter `?plugin_name`.  All other
+   * request types behave as normal.
+   *
+   * @override
+   * @param {string} modelName
+   * @param {string} id
+   * @return {string} url
+   * @return {string} requestType
+   */
+  buildURL(modelName, id, snapshot, requestType) {
+    let url = super.buildURL(...arguments);
+    let pluginName;
+    try {
+      pluginName = snapshot?.attr('plugin')?.name;
+    } catch (e) {
+      // Ignore any adapter errors here
+    }
+    if (requestType === 'createRecord' && pluginName) {
+      url = `${url}?plugin_name=${pluginName}`;
+    }
+    return url;
+  }
+}

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

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import BaseModel from '../../models/base';
 import { attr } from '@ember-data/model';
 
@@ -44,9 +49,9 @@ export default class GeneratedAccountModel extends BaseModel {
   })
   version;
 
-  // =attributes (password)
+  // =attributes (password and LDAP)
   @attr('string', {
-    for: 'password',
+    for: ['password', 'ldap'],
     isNestedAttribute: true,
     description: 'The account login name',
   })
@@ -55,8 +60,27 @@ export default class GeneratedAccountModel extends BaseModel {
   // =attributes (OIDC)
   @attr('string', { for: 'oidc', isNestedAttribute: true }) subject;
   @attr('string', { for: 'oidc', isNestedAttribute: true }) issuer;
-  @attr('string', { for: 'oidc', isNestedAttribute: true, readOnly: true })
+
+  // =attributes (OIDC and LDAP)
+  @attr('string', {
+    for: ['oidc', 'ldap'],
+    isNestedAttribute: true,
+    readOnly: true,
+  })
   email;
-  @attr('string', { for: 'oidc', isNestedAttribute: true, readOnly: true })
+  @attr('string', {
+    for: ['oidc', 'ldap'],
+    isNestedAttribute: true,
+    readOnly: true,
+  })
   full_name;
+
+  // =attributes (LDAP)
+  @attr('string', { for: 'ldap', isNestedAttribute: true, readOnly: true }) dn;
+  @attr('string-array', {
+    for: 'ldap',
+    isNestedAttribute: true,
+    readOnly: true,
+  })
+  member_of_groups;
 }

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

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import BaseModel from '../../models/base';
 import { attr } from '@ember-data/model';
 
@@ -50,55 +55,259 @@ export default class GeneratedAuthMethodModel extends BaseModel {
   })
   version;
 
-  @attr('string', { readOnly: true, isNestedAttribute: true }) state;
+  // =attributes(oidc, ldap)
 
-  @attr('string', { isNestedAttribute: true }) issuer;
+  @attr('string', {
+    for: ['oidc', 'ldap'],
+    readOnly: true,
+    isNestedAttribute: true,
+  })
+  state;
 
-  @attr('string', { isNestedAttribute: true }) client_id;
+  // =attributes(oidc)
 
-  @attr('string', { isNestedAttribute: true }) client_secret;
+  @attr('string', {
+    for: 'oidc',
+    isNestedAttribute: true,
+  })
+  issuer;
 
-  @attr('string', { readOnly: true, isNestedAttribute: true })
+  @attr('string', {
+    for: 'oidc',
+    isNestedAttribute: true,
+  })
+  client_id;
+
+  @attr('string', {
+    for: 'oidc',
+    isNestedAttribute: true,
+    isSecret: true,
+  })
+  client_secret;
+
+  @attr('string', {
+    for: 'oidc',
+    readOnly: true,
+    isNestedAttribute: true,
+  })
   client_secret_hmac;
 
-  @attr('number', { isNestedAttribute: true }) max_age;
+  @attr('number', {
+    for: 'oidc',
+    isNestedAttribute: true,
+  })
+  max_age;
 
-  @attr('string', { isNestedAttribute: true }) api_url_prefix;
+  @attr('string', {
+    for: 'oidc',
+    isNestedAttribute: true,
+  })
+  api_url_prefix;
 
-  @attr('string', { readOnly: true, isNestedAttribute: true }) callback_url;
+  @attr('string', {
+    for: 'oidc',
+    readOnly: true,
+    isNestedAttribute: true,
+  })
+  callback_url;
 
-  @attr('boolean', { isNestedAttribute: true })
+  @attr('boolean', {
+    for: 'oidc',
+    isNestedAttribute: true,
+  })
   disable_discovered_config_validation;
 
-  @attr('boolean', { isNestedAttribute: true }) dry_run;
+  @attr('boolean', {
+    for: 'oidc',
+    isNestedAttribute: true,
+  })
+  dry_run;
 
   @attr('string-array', {
+    for: 'oidc',
     emptyArrayIfMissing: true,
     isNestedAttribute: true,
   })
   claims_scopes;
 
   @attr('string-array', {
+    for: 'oidc',
     emptyArrayIfMissing: true,
     isNestedAttribute: true,
   })
   signing_algorithms;
 
   @attr('string-array', {
+    for: 'oidc',
     emptyArrayIfMissing: true,
     isNestedAttribute: true,
   })
   allowed_audiences;
 
   @attr('string-array', {
+    for: 'oidc',
     emptyArrayIfMissing: true,
     isNestedAttribute: true,
   })
   idp_ca_certs;
 
-  @attr('account-claim-map-array', {
+  @attr('account-value-map-array', {
+    for: 'oidc',
     emptyArrayIfMissing: true,
     isNestedAttribute: true,
   })
   account_claim_maps;
+
+  // =attributes(ldap)
+
+  @attr('boolean', {
+    for: 'ldap',
+    isNestedAttribute: true,
+  })
+  start_tls;
+
+  @attr('boolean', {
+    for: 'ldap',
+    isNestedAttribute: true,
+  })
+  insecure_tls;
+
+  @attr('boolean', {
+    for: 'ldap',
+    isNestedAttribute: true,
+  })
+  discover_dn;
+
+  @attr('boolean', {
+    for: 'ldap',
+    isNestedAttribute: true,
+  })
+  anon_group_search;
+
+  @attr('string', {
+    for: 'ldap',
+    isNestedAttribute: true,
+  })
+  upn_domain;
+
+  @attr('string-array', {
+    for: 'ldap',
+    emptyArrayIfMissing: true,
+    isNestedAttribute: true,
+  })
+  urls;
+
+  @attr('string', {
+    for: 'ldap',
+    isNestedAttribute: true,
+  })
+  user_dn;
+
+  @attr('string', {
+    for: 'ldap',
+    isNestedAttribute: true,
+  })
+  user_attr;
+
+  @attr('string', {
+    for: 'ldap',
+    isNestedAttribute: true,
+  })
+  user_filter;
+
+  @attr('boolean', {
+    for: 'ldap',
+    isNestedAttribute: true,
+  })
+  enable_groups;
+
+  @attr('boolean', {
+    for: 'ldap',
+    isNestedAttribute: true,
+  })
+  use_token_groups;
+
+  @attr('string', {
+    for: 'ldap',
+    isNestedAttribute: true,
+  })
+  group_dn;
+
+  @attr('string', {
+    for: 'ldap',
+    isNestedAttribute: true,
+  })
+  group_attr;
+
+  @attr('string', {
+    for: 'ldap',
+    isNestedAttribute: true,
+  })
+  group_filter;
+
+  @attr('string-array', {
+    for: 'ldap',
+    emptyArrayIfMissing: true,
+    isNestedAttribute: true,
+  })
+  certificates;
+
+  @attr('string', {
+    for: 'ldap',
+    isNestedAttribute: true,
+  })
+  client_certificate;
+
+  @attr('string', {
+    for: 'ldap',
+    isNestedAttribute: true,
+    isSecret: true,
+  })
+  client_certificate_key;
+
+  @attr('string', {
+    for: 'ldap',
+    isNestedAttribute: true,
+    readOnly: true,
+  })
+  client_certificate_key_hmac;
+
+  @attr('string', {
+    for: 'ldap',
+    isNestedAttribute: true,
+  })
+  bind_dn;
+
+  @attr('string', {
+    for: 'ldap',
+    isNestedAttribute: true,
+    isSecret: true,
+  })
+  bind_password;
+
+  @attr('string', {
+    for: 'ldap',
+    isNestedAttribute: true,
+    readOnly: true,
+  })
+  bind_password_hmac;
+
+  @attr('account-value-map-array', {
+    for: 'ldap',
+    emptyArrayIfMissing: true,
+    isNestedAttribute: true,
+  })
+  account_attribute_maps;
+
+  @attr('number', {
+    for: 'ldap',
+    isNestedAttribute: true,
+  })
+  maximum_page_size;
+
+  @attr('string', {
+    for: 'ldap',
+    isNestedAttribute: true,
+  })
+  dereference_aliases;
 }

addons/api/addon/generated/models/auth-token.js

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import BaseModel from '../../models/base';
 
 /**

addons/api/addon/generated/models/channel-recording.js

@@ -0,0 +1,59 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
+import BaseModel from '../../models/base';
+import { attr } from '@ember-data/model';
+
+/**
+ * A channel contains data for a single channel within a connection.
+ */
+export default class GeneratedChannelRecordingModel extends BaseModel {
+  // =attributes
+
+  @attr('string', {
+    description:
+      'The total number of bytes uploaded from the client in this Channel.',
+    readOnly: true,
+  })
+  bytes_up;
+
+  @attr('string', {
+    description:
+      'The total number of bytes downloaded to the client in this Channel.',
+    readOnly: true,
+  })
+  bytes_down;
+
+  @attr('number', {
+    description:
+      'The total number of errors that occurred during the use of this Channel.',
+    readOnly: true,
+  })
+  errors;
+
+  @attr('date', {
+    description: 'The time the Channel started.',
+    readOnly: true,
+  })
+  start_time;
+
+  @attr('date', {
+    description: 'The time the Channel finished.',
+    readOnly: true,
+  })
+  end_time;
+
+  @attr({
+    description: 'The array of mime types that this recording will support.',
+    readOnly: true,
+  })
+  mime_types;
+
+  @attr('duration', {
+    description: 'The duration of this channel recording in ms.',
+    readOnly: true,
+  })
+  duration;
+}

addons/api/addon/generated/models/connection-recording.js

@@ -0,0 +1,66 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
+import BaseModel from '../../models/base';
+import { attr } from '@ember-data/model';
+
+/**
+ * A connection contains data for a boundary connection within a session.
+ */
+export default class GeneratedConnectionRecordingModel extends BaseModel {
+  // =attributes
+
+  @attr('string', {
+    description:
+      'The ID of the Connection which this Connection Recording recorded.',
+    readOnly: true,
+  })
+  connection_id;
+
+  @attr('string', {
+    description:
+      'The total number of bytes uploaded from the client in this Connection.',
+    readOnly: true,
+  })
+  bytes_up;
+
+  @attr('string', {
+    description:
+      'The total number of bytes downloaded to the client in this Connection.',
+    readOnly: true,
+  })
+  bytes_down;
+
+  @attr('number', {
+    description:
+      'The total number of errors that occurred during the use of this Connection.',
+    readOnly: true,
+  })
+  errors;
+
+  @attr('date', {
+    description: 'The time the Connection started.',
+    readOnly: true,
+  })
+  start_time;
+
+  @attr('date', {
+    description: 'The time the Connection finished.',
+    readOnly: true,
+  })
+  end_time;
+
+  @attr({
+    description: 'The array of mime types that this recording will support.',
+    readOnly: true,
+  })
+  mime_types;
+
+  @attr('duration', {
+    description: 'The duration of this connection recording in ms.',
+    readOnly: true,
+  })
+  duration;
+}

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

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import BaseModel from '../../models/base';
 import { attr } from '@ember-data/model';
 
@@ -48,6 +53,7 @@ export default class GeneratedCredentialLibraryModel extends BaseModel {
   //= attributes (vault)
 
   @attr('string', {
+    for: 'vault-generic',
     isNestedAttribute: true,
     description:
       'The HTTP method the library uses when requesting credentials from Vault.',
@@ -56,6 +62,7 @@ export default class GeneratedCredentialLibraryModel extends BaseModel {
   http_method;
 
   @attr('string', {
+    for: 'vault-generic',
     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`.',
@@ -69,18 +76,21 @@ export default class GeneratedCredentialLibraryModel extends BaseModel {
   path;
 
   @attr('string', {
+    for: 'vault-ssh-certificate',
     isNestedAttribute: true,
     description: 'The username to use when making an SSH connection.',
   })
   username;
 
   @attr('string', {
+    for: 'vault-ssh-certificate',
     isNestedAttribute: true,
     description: 'The desired key type to use when generating a private key.',
   })
   key_type;
 
   @attr('number', {
+    for: 'vault-ssh-certificate',
     isNestedAttribute: true,
     description:
       'Specifies the number of bits used when generating the private key. Not used if key type is ed25519',
@@ -88,12 +98,14 @@ export default class GeneratedCredentialLibraryModel extends BaseModel {
   key_bits;
 
   @attr('string', {
+    for: 'vault-ssh-certificate',
     isNestedAttribute: true,
     description: 'Specifies the requested time to live for the certificate.',
   })
   ttl;
 
   @attr('string', {
+    for: 'vault-ssh-certificate',
     isNestedAttribute: true,
     description:
       'Specifies the key id that the created certificate should have.',
@@ -101,6 +113,7 @@ export default class GeneratedCredentialLibraryModel extends BaseModel {
   key_id;
 
   @attr('object-as-array', {
+    for: 'vault-ssh-certificate',
     isNestedAttribute: true,
     description:
       'Specifies a map of the critical options that the certificate should be signed for.',
@@ -108,6 +121,7 @@ export default class GeneratedCredentialLibraryModel extends BaseModel {
   critical_options;
 
   @attr('object-as-array', {
+    for: 'vault-ssh-certificate',
     isNestedAttribute: true,
     description:
       'Specifies a map of the extensions that the certificate should be signed for.',

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

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import BaseModel from '../../models/base';
 import { attr } from '@ember-data/model';
 

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

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import BaseModel from '../../models/base';
 import { attr } from '@ember-data/model';
 

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

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import BaseModel from '../../models/base';
 import { attr } from '@ember-data/model';
 

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

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import BaseModel from '../../models/base';
 import { attr } from '@ember-data/model';
 

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

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import BaseModel from '../../models/base';
 import { attr } from '@ember-data/model';
 

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

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import BaseModel from '../../models/base';
 import { attr } from '@ember-data/model';
 
@@ -49,4 +54,10 @@ export default class GeneratedHostModel extends BaseModel {
     readOnly: true,
   })
   plugin;
+
+  @attr({
+    emptyArrayIfMissing: true,
+    readOnly: true,
+  })
+  host_set_ids;
 }

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

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import BaseModel from '../../models/base';
 import { attr } from '@ember-data/model';
 
@@ -48,9 +53,19 @@ export default class GeneratedManagedGroupModel extends BaseModel {
   // =attributes (OIDC)
 
   @attr('string', {
+    for: 'oidc',
     isNestedAttribute: true,
     description:
       'The boolean expression filter to use to determine membership. Comes in from API as "filter".',
   })
   filter_string;
+
+  // =attributes (LDAP)
+
+  @attr('string-array', {
+    for: 'ldap',
+    isNestedAttribute: true,
+    description: 'The list of groups that make up the ManagedGroup',
+  })
+  group_names;
 }

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

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import BaseModel from '../../models/base';
 import { attr } from '@ember-data/model';
 

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

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import BaseModel from '../../models/base';
 import { attr } from '@ember-data/model';
 

addons/api/addon/generated/models/session-recording.js

@@ -0,0 +1,112 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
+import BaseModel from '../../models/base';
+import { attr } from '@ember-data/model';
+
+/**
+ * A session recording contains all data related to session recordings
+ */
+export default class GeneratedSessionRecordingModel extends BaseModel {
+  // =attributes
+
+  @attr('string', {
+    description: 'The type of the resource, to help differentiate schemas.',
+    readOnly: true,
+  })
+  type;
+
+  @attr('date', {
+    description:
+      'The time the Session Recording was created in the controller.',
+    readOnly: true,
+  })
+  created_time;
+
+  @attr('date', {
+    description: 'The time of the most recent update to the Session Recording.',
+    readOnly: true,
+  })
+  updated_time;
+
+  @attr({
+    description:
+      'Contains the values of related fields at the time this Session Recording was created',
+    readOnly: true,
+  })
+  create_time_values;
+
+  @attr('string', {
+    description: 'The ID of the Session which this Session Recording recorded.',
+    readOnly: true,
+  })
+  session_id;
+
+  @attr('string', {
+    description:
+      'The ID of the Storage Bucket for the Target of this Session Recording',
+    readOnly: true,
+  })
+  storage_bucket_id;
+
+  @attr('string', {
+    description:
+      'The total number of bytes uploaded from the client in the Session.',
+    readOnly: true,
+  })
+  bytes_up;
+
+  @attr('string', {
+    description:
+      'The total number of bytes downloaded to the client in the Session.',
+    readOnly: true,
+  })
+  bytes_down;
+
+  @attr('number', {
+    description:
+      'The total number of errors that occurred during the use of the Session.',
+    readOnly: true,
+  })
+  errors;
+
+  @attr('date', {
+    description: 'The time the Session started.',
+    readOnly: true,
+  })
+  start_time;
+
+  @attr('date', {
+    description: 'The time the Session finished.',
+    readOnly: true,
+  })
+  end_time;
+
+  @attr({
+    description: 'The array of mime types that this recording will support.',
+    readOnly: true,
+  })
+  mime_types;
+
+  @attr('duration', {
+    description: 'The duration of this session recording in ms.',
+    readOnly: true,
+  })
+  duration;
+
+  @attr('string', {
+    description:
+      'The current state of the session recording. One of "started", "available" and "unknown".',
+    readOnly: true,
+  })
+  state;
+
+  @attr('string', {
+    description:
+      'Any error seen during the closing of the session recording. Currently only set if state is "unknown".',
+    readOnly: true,
+  })
+  error_details;
+}

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

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import BaseModel from '../../models/base';
 import { attr } from '@ember-data/model';
 

addons/api/addon/generated/models/storage-bucket.js

@@ -0,0 +1,126 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
+import BaseModel from '../../models/base';
+import { attr } from '@ember-data/model';
+
+/**
+ * A storage bucket is a resource that that represents a bucket in an external object store.
+ */
+export default class GeneratedStorageBucketModel extends BaseModel {
+  // =attributes
+
+  @attr('string', {
+    description: 'The type of the resource, to help differentiate schemas',
+  })
+  type;
+
+  @attr({
+    description: 'Plugin information for this resource.',
+    readOnly: true,
+  })
+  plugin;
+
+  @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 name of the bucket in the external object store.',
+  })
+  bucket_name;
+
+  @attr('string', {
+    description:
+      'The base path where session recordings will be stored in the external object store.',
+  })
+  bucket_prefix;
+
+  @attr('string', {
+    description:
+      'An expression used to filter the workers that have network access to a service that is hosting the external object store.',
+  })
+  worker_filter;
+
+  @attr('string', {
+    isNestedAttribute: true,
+    description: 'The AWS region to use.',
+  })
+  region;
+
+  //this field is not used in the UI, but this is kept here to replicate the API
+  @attr('string', {
+    readOnly: true,
+    isNestedAttribute: true,
+  })
+  secrets_hmac;
+
+  @attr('boolean', {
+    isNestedAttribute: true,
+    description: 'If set to `true`, credential rotation is not performed.',
+  })
+  disable_credential_rotation;
+
+  // =attributes (static credentials)
+  @attr('string', {
+    isNestedSecret: true,
+    description: 'The AWS access key ID to use.',
+  })
+  access_key_id;
+
+  @attr('string', {
+    isNestedSecret: true,
+    description: 'The secret access key to use.',
+  })
+  secret_access_key;
+
+  // =attributes (dynamic credentials)
+  @attr('string', {
+    isNestedAttribute: true,
+    description: 'The role ARN to use.',
+  })
+  role_arn;
+
+  @attr('string', {
+    isNestedAttribute: true,
+    description: 'The role external ID to use.',
+  })
+  role_external_id;
+
+  @attr('string', {
+    isNestedAttribute: true,
+    description: 'The role session to use.',
+  })
+  role_session_name;
+
+  @attr('object-as-array', {
+    isNestedAttribute: true,
+    description: 'The role tags to use.',
+  })
+  role_tags;
+}

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

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import BaseModel from '../../models/base';
 import { attr } from '@ember-data/model';
 
@@ -78,4 +83,29 @@ export default class GeneratedTargetModel extends BaseModel {
       'An IP address or DNS name for the session to connect to. Cannot be used in conjunction with host sources.',
   })
   address;
+
+  @attr('number', {
+    isNestedAttribute: true,
+    description: 'The default port a target should use if present.',
+  })
+  default_port;
+
+  @attr('number', {
+    isNestedAttribute: true,
+    description:
+      "The default port that will be listened on by the client's local proxy.",
+  })
+  default_client_port;
+
+  @attr('string', {
+    description: 'The storage bucket associated with this target.',
+    isNestedAttribute: true,
+  })
+  storage_bucket_id;
+
+  @attr('boolean', {
+    description: 'Whether session recording is enabled on the target.',
+    isNestedAttribute: true,
+  })
+  enable_session_recording;
 }

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

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import BaseModel from '../../models/base';
 import { attr } from '@ember-data/model';
 

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

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import BaseModel from '../../models/base';
 import { attr } from '@ember-data/model';
 

addons/api/addon/mixins/adapter-build-url.js

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import Mixin from '@ember/object/mixin';
 
 /**

addons/api/addon/models/account.js

@@ -1,6 +1,15 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import GeneratedAccountModel from '../generated/models/account';
-import { computed } from '@ember/object';
-import { equal } from '@ember/object/computed';
+import {
+  TYPE_AUTH_METHOD_PASSWORD,
+  TYPE_AUTH_METHOD_OIDC,
+  TYPE_AUTH_METHOD_LDAP,
+  TYPES_AUTH_METHOD,
+} from './auth-method';
 
 export default class AccountModel extends GeneratedAccountModel {
   // =attributes
@@ -8,18 +17,35 @@ export default class AccountModel extends GeneratedAccountModel {
   /**
    * @type {boolean}
    */
-  @equal('type', 'password') isPassword;
+  get isPassword() {
+    return this.type === TYPE_AUTH_METHOD_PASSWORD;
+  }
 
   /**
    * @type {boolean}
    */
-  @equal('type', 'oidc') isOIDC;
+  get isOIDC() {
+    return this.type === TYPE_AUTH_METHOD_OIDC;
+  }
+
+  /**
+   * @type {boolean}
+   */
+  get isLDAP() {
+    return this.type === TYPE_AUTH_METHOD_LDAP;
+  }
+
+  /**
+   * @type {boolean}
+   */
+  get isUnknown() {
+    return !TYPES_AUTH_METHOD.includes(this.type);
+  }
 
   /**
    * Convenience for getting username in account.
    * @type {string}
    */
-  @computed('{email,full_name,login_name}')
   get accountName() {
     const { email, full_name, login_name } = this;
     return email || full_name || login_name;

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

@@ -1,10 +1,26 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import GeneratedAuthMethodModel from '../generated/models/auth-method';
 import { equal } from '@ember/object/computed';
 
+export const TYPE_AUTH_METHOD_PASSWORD = 'password';
+export const TYPE_AUTH_METHOD_OIDC = 'oidc';
+export const TYPE_AUTH_METHOD_LDAP = 'ldap';
+
+export const TYPES_AUTH_METHOD = Object.freeze([
+  TYPE_AUTH_METHOD_PASSWORD,
+  TYPE_AUTH_METHOD_OIDC,
+  TYPE_AUTH_METHOD_LDAP,
+]);
+
 /**
  * Enum options per auth method type and field.
  */
 export const options = {
+  state: ['inactive', 'active-private', 'active-public'],
   oidc: {
     signing_algorithms: [
       'RS256',
@@ -18,11 +34,21 @@ export const options = {
       'PS512',
       'EdDSA',
     ],
-    state: ['inactive', 'active-private', 'active-public'],
     account_claim_maps: {
       to: ['sub', 'name', 'email'],
     },
   },
+  ldap: {
+    account_attribute_maps: {
+      to: ['fullName', 'email'],
+    },
+    dereference_aliases: {
+      NeverDerefAliases: 'never',
+      DerefInSearching: 'searching',
+      DerefFindingBaseObj: 'finding',
+      DerefAlways: 'always',
+    },
+  },
 };
 
 export default class AuthMethodModel extends GeneratedAuthMethodModel {
@@ -39,14 +65,28 @@ export default class AuthMethodModel extends GeneratedAuthMethodModel {
    * @type {boolean}
    */
   get isPassword() {
-    return this.type === 'password';
+    return this.type === TYPE_AUTH_METHOD_PASSWORD;
   }
 
   /**
    * @type {boolean}
    */
   get isOIDC() {
-    return this.type === 'oidc';
+    return this.type === TYPE_AUTH_METHOD_OIDC;
+  }
+
+  /**
+   * @type {boolean}
+   */
+  get isLDAP() {
+    return this.type === TYPE_AUTH_METHOD_LDAP;
+  }
+
+  /**
+   * @type {boolean}
+   */
+  get isUnknown() {
+    return !TYPES_AUTH_METHOD.includes(this.type);
   }
 
   /**
@@ -73,9 +113,9 @@ export default class AuthMethodModel extends GeneratedAuthMethodModel {
   // =methods
 
   /**
-   * Change the active and visibility state of an OIDC auth method
+   * Change the active and visibility state of an OIDC and LDAP auth method
    * given its ID.
-   * For OIDC auth methods only.
+   * For OIDC and LDAP auth methods only.
    * @param {[string]} state
    * @param {object} options
    * @param {object} options.adapterOptions
@@ -83,9 +123,11 @@ export default class AuthMethodModel extends GeneratedAuthMethodModel {
    */
   changeState(state, options = { adapterOptions: {} }) {
     const defaultAdapterOptions = {
-      method: 'change-state',
       state,
     };
+    if (this.isOIDC) {
+      defaultAdapterOptions.method = 'change-state';
+    }
     return this.save({
       ...options,
       adapterOptions: {

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

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import GeneratedAuthTokenModel from '../generated/models/auth-token';
 
 export default class AuthTokenModel extends GeneratedAuthTokenModel {}

addons/api/addon/models/base.js

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import Model from '@ember-data/model';
 import { attr } from '@ember-data/model';
 import { computed } from '@ember/object';
@@ -52,7 +57,7 @@ export default class BaseModel extends Model {
 
   get scopeModel() {
     const id = this.scopeID;
-    return this.store.peekRecord('scope', id);
+    return id ? this.store.peekRecord('scope', id) : null;
   }
 
   // Ember seems to have a bug with its internals and can't correctly set

addons/api/addon/models/channel-recording.js

@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
+import GeneratedChannelRecordingModel from '../generated/models/channel-recording';
+import { belongsTo } from '@ember-data/model';
+
+export const MIME_TYPE_ASCIICAST = 'application/x-asciicast';
+
+export default class ChannelRecordingModel extends GeneratedChannelRecordingModel {
+  @belongsTo('connection-recording', {
+    async: false,
+    inverse: 'channel_recordings',
+  })
+  connection_recording;
+
+  /**
+   * True if the channel supports asciicast.
+   * @type {boolean}
+   */
+  get isAsciicast() {
+    return this.mime_types?.includes(MIME_TYPE_ASCIICAST) ?? false;
+  }
+
+  /**
+   * Download the ascii cast recording for this channel.
+   * @returns {Promise<string>}
+   */
+  getAsciicast() {
+    const adapter = this.store.adapterFor('session-recording');
+    return adapter.getAsciicast(this.id);
+  }
+}

addons/api/addon/models/connection-recording.js

@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
+import GeneratedConnectionRecordingModel from '../generated/models/connection-recording';
+import { belongsTo, hasMany } from '@ember-data/model';
+
+export default class ConnectionRecordingModel extends GeneratedConnectionRecordingModel {
+  @belongsTo('session-recording', {
+    async: false,
+    inverse: 'connection_recordings',
+  })
+  session_recording;
+  @hasMany('channel-recording', {
+    async: false,
+    inverse: 'connection_recording',
+  })
+  channel_recordings;
+}

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

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import GeneratedCredentialLibraryModel from '../generated/models/credential-library';
 
 /**

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

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import GeneratedCredentialStoreModel from '../generated/models/credential-store';
 import { equal } from '@ember/object/computed';
 

addons/api/addon/models/credential.js

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import GeneratedCredentialModel from '../generated/models/credential';
 
 /**

addons/api/addon/models/group.js

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import GeneratedGroupModel from '../generated/models/group';
 import { attr } from '@ember-data/model';
 import { computed } from '@ember/object';

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

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import GeneratedHostCatalogModel from '../generated/models/host-catalog';
 
 export const types = ['static', 'plugin'];

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

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import GeneratedHostSetModel from '../generated/models/host-set';
 import { pluginTypes } from './host-catalog';
 

addons/api/addon/models/host.js

@@ -1,5 +1,11 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import GeneratedHostModel from '../generated/models/host';
 import { attr } from '@ember-data/model';
+import { pluginTypes } from './host-catalog';
 
 export default class HostModel extends GeneratedHostModel {
   // =attributes
@@ -24,6 +30,12 @@ export default class HostModel extends GeneratedHostModel {
   })
   external_id;
 
+  @attr('string', {
+    description: 'The external facing name for the plugin based host.',
+    readOnly: true,
+  })
+  external_name;
+
   // Aws specific
   @attr({
     readOnly: true,
@@ -47,6 +59,14 @@ export default class HostModel extends GeneratedHostModel {
     return this.type === 'plugin';
   }
 
+  /**
+   * True if the host catalog is an unknown type.
+   * @type {boolean}
+   */
+  get isUnknown() {
+    return this.isPlugin && !pluginTypes.includes(this.plugin?.name);
+  }
+
   /**
    * True if the host plugin type is AWS.
    * @type {boolean}
@@ -84,4 +104,9 @@ export default class HostModel extends GeneratedHostModel {
       this.plugin = { name: type };
     }
   }
+
+  // Plugin hosts can support an external name
+  get displayName() {
+    return this.name || this.external_name || this.id;
+  }
 }

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

@@ -1,6 +1,12 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import GeneratedManagedGroupModel from '../generated/models/managed-group';
 import { attr } from '@ember-data/model';
 import { A } from '@ember/array';
+import { TYPE_AUTH_METHOD_OIDC, TYPE_AUTH_METHOD_LDAP } from './auth-method';
 
 export default class ManagedGroupModel extends GeneratedManagedGroupModel {
   // =attributes
@@ -15,4 +21,18 @@ export default class ManagedGroupModel extends GeneratedManagedGroupModel {
     emptyArrayIfMissing: true,
   })
   member_ids;
+
+  /**
+   * @type {boolean}
+   */
+  get isOIDC() {
+    return this.type === TYPE_AUTH_METHOD_OIDC;
+  }
+
+  /**
+   * @type {boolean}
+   */
+  get isLDAP() {
+    return this.type === TYPE_AUTH_METHOD_LDAP;
+  }
 }

addons/api/addon/models/role.js

@@ -1,7 +1,16 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import GeneratedRoleModel from '../generated/models/role';
 import { attr } from '@ember-data/model';
 import { inject as service } from '@ember/service';
 import { all, resolve } from 'rsvp';
+import {
+  TYPE_AUTH_METHOD_OIDC,
+  TYPE_AUTH_METHOD_LDAP,
+} from 'api/models/auth-method';
 
 export default class RoleModel extends GeneratedRoleModel {
   // =services
@@ -128,7 +137,7 @@ export default class RoleModel extends GeneratedRoleModel {
       // Collect all auth methods.
       const authMethods = this.resourceFilterStore.queryBy(
         'auth-method',
-        { type: 'oidc' },
+        { type: [TYPE_AUTH_METHOD_OIDC, TYPE_AUTH_METHOD_LDAP] },
         { scope_id: 'global', recursive: true }
       );
 
@@ -147,7 +156,6 @@ export default class RoleModel extends GeneratedRoleModel {
         // The result is an array of arrays of model instances (grouped by
         // auth methods), so these must be flattened.
         .then((grouped) => grouped.flat());
-
       return managedGroups;
     }
 

addons/api/addon/models/scope.js

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import GeneratedScopeModel from '../generated/models/scope';
 import { computed } from '@ember/object';
 

addons/api/addon/models/session-recording.js

@@ -0,0 +1,72 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
+import GeneratedSessionRecordingModel from '../generated/models/session-recording';
+import { hasMany } from '@ember-data/model';
+import { inject as service } from '@ember/service';
+
+export const TYPE_SESSION_RECORDING_SSH = 'ssh';
+export const TYPES_SESSION_RECORDING = Object.freeze([
+  TYPE_SESSION_RECORDING_SSH,
+]);
+
+export const STATE_SESSION_RECORDING_STARTED = 'started';
+export const STATE_SESSION_RECORDING_AVAILABLE = 'available';
+export const STATE_SESSION_RECORDING_UNKNOWN = 'unknown';
+
+export default class SessionRecordingModel extends GeneratedSessionRecordingModel {
+  @hasMany('connection-recording', {
+    async: false,
+    inverse: 'session_recording',
+  })
+  connection_recordings;
+
+  @service store;
+
+  /**
+   * True if the session recording type is `ssh`.
+   * @type {boolean}
+   */
+  get isSSH() {
+    return this.type === TYPE_SESSION_RECORDING_SSH;
+  }
+
+  /**
+   * True if the session recording is an unknown type.
+   * @type {boolean}
+   */
+  get isUnknown() {
+    return !TYPES_SESSION_RECORDING.includes(this.type);
+  }
+
+  /**
+   * True if the session recording is in an available state.
+   * @type {boolean}
+   */
+  get isAvailable() {
+    return this.state === STATE_SESSION_RECORDING_AVAILABLE;
+  }
+
+  /**
+   * Returns scope name or scope id from the target that belongs to the session recording.
+   * @type {string}
+   */
+  get targetScopeDisplayName() {
+    return (
+      this.create_time_values?.target?.scope?.name ||
+      this.create_time_values?.target?.scope?.id
+    );
+  }
+
+  /**
+   * Returns the user name or user id that belongs to the session recording.
+   * @type {string}
+   */
+  get userDisplayName() {
+    return (
+      this.create_time_values?.user?.name || this.create_time_values?.user?.id
+    );
+  }
+}

addons/api/addon/models/session.js

@@ -1,11 +1,24 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import GeneratedSessionModel from '../generated/models/session';
-import { computed } from '@ember/object';
 import { equal } from '@ember/object/computed';
 import { tracked } from '@glimmer/tracking';
 import { A } from '@ember/array';
 import { inject as service } from '@ember/service';
 
-export const statusTypes = ['active', 'pending', 'canceling', 'terminated'];
+export const STATUS_SESSION_ACTIVE = 'active';
+export const STATUS_SESSION_PENDING = 'pending';
+export const STATUS_SESSION_CANCELING = 'canceling';
+export const STATUS_SESSION_TERMINATED = 'terminated';
+export const statusTypes = [
+  STATUS_SESSION_ACTIVE,
+  STATUS_SESSION_PENDING,
+  STATUS_SESSION_CANCELING,
+  STATUS_SESSION_TERMINATED,
+];
 
 /**
  *
@@ -96,10 +109,11 @@ export default class SessionModel extends GeneratedSessionModel {
   @tracked started_desktop_client;
   @tracked proxy_address;
   @tracked proxy_port;
+  @tracked host;
   credentials = A();
 
-  @equal('status', 'active') isActive;
-  @equal('status', 'pending') isPending;
+  @equal('status', STATUS_SESSION_ACTIVE) isActive;
+  @equal('status', STATUS_SESSION_PENDING) isPending;
 
   /**
    * True if status is an unknown string.
@@ -112,8 +126,7 @@ export default class SessionModel extends GeneratedSessionModel {
   /**
    * @type {boolean}
    */
-  @computed('isActive', 'isPending')
-  get isCancelable() {
+  get isAvailable() {
     return this.isActive || this.isPending;
   }
 
@@ -121,7 +134,6 @@ export default class SessionModel extends GeneratedSessionModel {
    * The full proxy address and port if address exists, otherwise null.
    * @type {?string}
    */
-  @computed('proxy_address', 'proxy_port')
   get proxy() {
     return this.proxy_address
       ? `${this.proxy_address}:${this.proxy_port}`
@@ -133,6 +145,9 @@ export default class SessionModel extends GeneratedSessionModel {
    * @type {TargetModel}
    */
   get target() {
+    if (!this.target_id) {
+      return null;
+    }
     return this.store.peekRecord('target', this.target_id);
   }
 
@@ -145,6 +160,14 @@ export default class SessionModel extends GeneratedSessionModel {
     this.credentials.pushObject(new SessionCredential(cred));
   }
 
+  /**
+   * Adds associated host to session if host present
+   * @param {HostModel} host
+   */
+  addHost(host) {
+    this.host = host;
+  }
+
   /**
    * Cancels the session via the `cancel` method.
    * See serializer and adapter for more information.

addons/api/addon/models/storage-bucket.js

@@ -0,0 +1,95 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
+import GeneratedStorageBucketModel from '../generated/models/storage-bucket';
+
+export const TYPE_STORAGE_BUCKET_PLUGIN = 'plugin';
+export const TYPES_STORAGE_BUCKET = Object.freeze([TYPE_STORAGE_BUCKET_PLUGIN]);
+
+export const TYPE_STORAGE_BUCKET_PLUGIN_AWS_S3 = 'aws';
+export const TYPES_STORAGE_BUCKET_PLUGIN = Object.freeze([
+  TYPE_STORAGE_BUCKET_PLUGIN_AWS_S3,
+]);
+
+export const TYPE_CREDENTIAL_STATIC = 'static';
+export const TYPE_CREDENTIAL_DYNAMIC = 'dynamic';
+
+export const TYPES_CREDENTIALS = Object.freeze([
+  TYPE_CREDENTIAL_STATIC,
+  TYPE_CREDENTIAL_DYNAMIC,
+]);
+
+export default class StorageBucketModel extends GeneratedStorageBucketModel {
+  // attributes
+
+  #credentialType;
+  /**
+   * True if the storage bucket is a plugin.
+   * @type {boolean}
+   */
+  get isPlugin() {
+    return this.type === TYPE_STORAGE_BUCKET_PLUGIN;
+  }
+
+  /**
+   * Gets a value from credentialType
+   * @type {string}
+   */
+  get credentialType() {
+    if (!this.#credentialType) {
+      if (this.role_arn) {
+        this.#credentialType = TYPE_CREDENTIAL_DYNAMIC;
+      } else {
+        this.#credentialType = TYPE_CREDENTIAL_STATIC;
+      }
+    }
+    return this.#credentialType;
+  }
+
+  /**
+   * Sets a value to credentialType
+   * @type {string}
+   */
+  set credentialType(type) {
+    this.#credentialType = type;
+  }
+  /**
+   * True if the storage bucket is an unknown type.
+   * @type {boolean}
+   */
+  get isUnknown() {
+    return (
+      !TYPES_STORAGE_BUCKET.includes(this.type) ||
+      (this.isPlugin &&
+        !TYPES_STORAGE_BUCKET_PLUGIN.includes(this.plugin?.name))
+    );
+  }
+
+  /**
+   * True if the storage bucket plugin type is AWS.
+   * @type {boolean}
+   */
+  get isAWS() {
+    return this.compositeType === TYPE_STORAGE_BUCKET_PLUGIN_AWS_S3;
+  }
+
+  /**
+   * If the storage bucket is a plugin return `plugin.name`,
+   * otherwise return the storage bucket type.
+   * @type {string}
+   */
+  get compositeType() {
+    if (this.isUnknown) return 'unknown';
+    return this.plugin.name;
+  }
+
+  /**
+   * Sets `type` to `plugin` and `plugin.name` to the specified type.
+   */
+  set compositeType(type) {
+    this.type = TYPE_STORAGE_BUCKET_PLUGIN;
+    this.plugin = { name: type };
+  }
+}

addons/api/addon/models/target.js

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import GeneratedTargetModel from '../generated/models/target';
 import { attr } from '@ember-data/model';
 import { inject as service } from '@ember/service';
@@ -13,12 +18,6 @@ export default class TargetModel extends GeneratedTargetModel {
 
   // =attributes
 
-  @attr('number', {
-    isNestedAttribute: true,
-    description: 'The default port a target should use if present.',
-  })
-  default_port;
-
   /**
    * @type Array
    */
@@ -318,6 +317,7 @@ export default class TargetModel extends GeneratedTargetModel {
       options
     );
   }
+
   /**
    * True if the target type is tcp.
    * @type {boolean}

addons/api/addon/models/user.js

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import GeneratedUserModel from '../generated/models/user';
 import { attr } from '@ember-data/model';
 import { computed } from '@ember/object';

addons/api/addon/models/worker.js

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import GeneratedWorkerModel from '../generated/models/worker';
 import { attr } from '@ember-data/model';
 

addons/api/addon/serializers/account.js

@@ -1,4 +1,14 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import ApplicationSerializer from './application';
+import {
+  TYPE_AUTH_METHOD_PASSWORD,
+  TYPE_AUTH_METHOD_OIDC,
+  TYPE_AUTH_METHOD_LDAP,
+} from 'api/models/auth-method';
 
 export default class AccountSerializer extends ApplicationSerializer {
   // =properties
@@ -21,13 +31,35 @@ export default class AccountSerializer extends ApplicationSerializer {
    */
   serialize(snapshot) {
     switch (snapshot.record.type) {
-      case 'password':
+      case TYPE_AUTH_METHOD_PASSWORD:
         return this.serializePassword(...arguments);
-      case 'oidc':
+      case TYPE_AUTH_METHOD_OIDC:
         return this.serializeOIDC(...arguments);
+      case TYPE_AUTH_METHOD_LDAP:
+        return this.serializeLDAP(...arguments);
     }
   }
 
+  /**
+   * LDAP serialization limits the `attributes` posted on create and omits
+   * `attributes` entirely on update.
+   */
+  serializeLDAP(snapshot) {
+    const { isNew } = snapshot?.record || {};
+    let serialized = super.serialize(...arguments);
+    delete serialized.attributes;
+    if (isNew) {
+      serialized.attributes = {};
+      const { login_name } = snapshot.record;
+      if (login_name) serialized.attributes.login_name = login_name;
+    } else {
+      // LDAP does not support updating the readonly auth method ID or type attributes.
+      delete serialized.auth_method_id;
+      delete serialized.type;
+    }
+    return serialized;
+  }
+
   /**
    * OIDC serialization limits the `attributes` posted on create and omits
    * `attributes` entirely on update.
@@ -41,6 +73,10 @@ export default class AccountSerializer extends ApplicationSerializer {
       const { issuer, subject } = snapshot.record;
       if (issuer) serialized.attributes.issuer = issuer;
       if (subject) serialized.attributes.subject = subject;
+    } else {
+      // OIDC does not support updating the readonly auth method ID or type attributes.
+      delete serialized.auth_method_id;
+      delete serialized.type;
     }
     return serialized;
   }

addons/api/addon/serializers/application.js

@@ -1,7 +1,11 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import RESTSerializer from '@ember-data/serializer/rest';
 import { underscore } from '@ember/string';
 import { get } from '@ember/object';
-import { copy } from 'ember-copy';
 
 /**
  * Manages serialization/normalization of data to/from the API.
@@ -38,6 +42,7 @@ export default class ApplicationSerializer extends RESTSerializer {
    */
   serializeAttribute(snapshot, json, key, attribute) {
     const { type, options } = attribute;
+    const { type: recordType } = snapshot.record;
     let value = super.serializeAttribute(...arguments);
     // Remove secret attributes that are null or empty
     if (options.isSecret) {
@@ -68,6 +73,21 @@ export default class ApplicationSerializer extends RESTSerializer {
       }
       delete json[key];
     }
+    // If an attribute has a `for` option, it must match the
+    // record's `type`, else the attribute is excluded
+    // from serialization.
+    //note: This doesn't handle secrets yet, we can add support for them if needed.
+    if (
+      options?.for &&
+      options.for !== recordType &&
+      !options.for.includes(recordType)
+    ) {
+      if (options.isNestedAttribute) {
+        delete json?.attributes?.[key];
+      } else {
+        delete json[key];
+      }
+    }
     return value;
   }
 
@@ -129,7 +149,7 @@ export default class ApplicationSerializer extends RESTSerializer {
     );
     // Copy the data rooted under `items` in the existing payload into the new
     // payload under the expected root key name.
-    transformedPayload[payloadKey] = copy(payload.items, true);
+    transformedPayload[payloadKey] = structuredClone(payload.items);
     // Return the result of normalizing the transformed payload.
     return super.normalizeArrayResponse(
       store,
@@ -156,7 +176,7 @@ export default class ApplicationSerializer extends RESTSerializer {
    */
   normalizeSingleResponse(store, primaryModelClass, payload, id, requestType) {
     // Copy payload (mostly to prevent mocking issues)
-    payload = copy(payload, true);
+    payload = structuredClone(payload);
     // Check for and normalize missing arrays
     payload = this.normalizeMissingArrays(store, primaryModelClass, payload);
     // Setup a new payload data structure.
@@ -189,9 +209,9 @@ export default class ApplicationSerializer extends RESTSerializer {
    * @return {object}
    */
   normalizeMissingArrays(store, primaryModelClass, payload) {
-    const attrDefs = store._attributesDefinitionFor(
-      primaryModelClass.modelName
-    );
+    const attrDefs = store
+      .getSchemaDefinitionService()
+      .attributesDefinitionFor({ type: primaryModelClass.modelName });
     if (attrDefs) {
       Object.keys(attrDefs).forEach((key) => {
         if (!payload[key] && attrDefs[key]?.options?.emptyArrayIfMissing) {
@@ -211,7 +231,7 @@ export default class ApplicationSerializer extends RESTSerializer {
    * @return {Object}
    */
   normalize(typeClass, hash) {
-    let normalizedHash = copy(hash, true);
+    let normalizedHash = structuredClone(hash);
     const scopeID = get(normalizedHash, 'scope.id');
     const scopeType = get(normalizedHash, 'scope.type');
     if (scopeID) normalizedHash.scope.scope_id = scopeID;
@@ -300,7 +320,7 @@ export default class ApplicationSerializer extends RESTSerializer {
     id,
     requestType
   ) {
-    const newPayload = copy(payload, true);
+    const newPayload = structuredClone(payload);
 
     primaryModelClass.attributes.forEach((attribute) => {
       const {

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

@@ -1,5 +1,10 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import ApplicationSerializer from './application';
-import { copy } from 'ember-copy';
+import { TYPE_AUTH_METHOD_PASSWORD } from 'api/models/auth-method';
 
 export default class AuthMethodSerializer extends ApplicationSerializer {
   // =methods
@@ -12,18 +17,18 @@ export default class AuthMethodSerializer extends ApplicationSerializer {
    */
   serialize(snapshot) {
     switch (snapshot.record.type) {
-      case 'oidc':
-        return this.serializeOIDC(...arguments);
+      case TYPE_AUTH_METHOD_PASSWORD:
+        return this.serializePassword(...arguments);
       default:
         return this.serializeDefault(...arguments);
     }
   }
 
   /**
-   * Default serialization omits `attributes`.
+   * Password serialization omits `attributes`.
    * @return {object}
    */
-  serializeDefault() {
+  serializePassword() {
     let serialized = super.serialize(...arguments);
     delete serialized.attributes;
     return serialized;
@@ -35,11 +40,11 @@ export default class AuthMethodSerializer extends ApplicationSerializer {
    * @param {Snapshot} snapshot
    * @return {object}
    */
-  serializeOIDC(snapshot) {
+  serializeDefault(snapshot) {
     let serialized = super.serialize(...arguments);
     const state = snapshot?.adapterOptions?.state;
     if (state) {
-      serialized = this.serializeOIDCWithState(snapshot, state);
+      serialized = this.serializeWithState(snapshot, state);
     } else {
       delete serialized.attributes.state;
     }
@@ -52,7 +57,7 @@ export default class AuthMethodSerializer extends ApplicationSerializer {
    * @param {string} state
    * @return {object}
    */
-  serializeOIDCWithState(snapshot, state) {
+  serializeWithState(snapshot, state) {
     return {
       version: snapshot.attr('version'),
       attributes: { state },
@@ -86,16 +91,15 @@ export default class AuthMethodSerializer extends ApplicationSerializer {
    * @return {Object}
    */
   normalize(typeClass, hash, ...rest) {
-    let normalizedHash = copy(hash, true);
-    // switch (normalizedHash.type) {
-    //   case 'oidc':
-    //     normalizedHash = this.normalizeOIDC(normalizedHash);
-    //     break;
-    // }
+    let normalizedHash = structuredClone(hash);
     const normalized = super.normalize(typeClass, normalizedHash, ...rest);
     if (!normalized.data.attributes.is_primary) {
       normalized.data.attributes.is_primary = false;
     }
+    // Remove secret fields as we don't track them after being created/updated
+    normalized.data.attributes.client_certificate_key = '';
+    normalized.data.attributes.bind_password = '';
+    normalized.data.attributes.client_secret = '';
     return normalized;
   }
 }

addons/api/addon/serializers/connection-recording.js

@@ -0,0 +1,15 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
+import ApplicationSerializer from './application';
+import { EmbeddedRecordsMixin } from '@ember-data/serializer/rest';
+
+export default class ConnectionSerializer extends ApplicationSerializer.extend(
+  EmbeddedRecordsMixin
+) {
+  attrs = {
+    channel_recordings: { embedded: 'always' },
+  };
+}

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

@@ -1,5 +1,13 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import ApplicationSerializer from './application';
-import { TYPE_CREDENTIAL_LIBRARY_VAULT_GENERIC } from '../models/credential-library';
+import {
+  TYPE_CREDENTIAL_LIBRARY_VAULT_GENERIC,
+  TYPE_CREDENTIAL_LIBRARY_VAULT_SSH_CERTIFICATE,
+} from '../models/credential-library';
 
 export default class CredentialLibrarySerializer extends ApplicationSerializer {
   // =properties
@@ -14,16 +22,24 @@ export default class CredentialLibrarySerializer extends ApplicationSerializer {
    * @method serialize
    * @param {Snapshot} snapshot
    */
-  serialize() {
+  serialize(snapshot) {
+    switch (snapshot.record.type) {
+      case TYPE_CREDENTIAL_LIBRARY_VAULT_GENERIC:
+        return this.serializeVaultGeneric(...arguments);
+      case TYPE_CREDENTIAL_LIBRARY_VAULT_SSH_CERTIFICATE:
+      default:
+        return super.serialize(...arguments);
+    }
+  }
+
+  serializeVaultGeneric() {
     const serialized = super.serialize(...arguments);
     if (serialized.attributes) {
-      if (serialized.type !== TYPE_CREDENTIAL_LIBRARY_VAULT_GENERIC) {
-        delete serialized.attributes.http_method;
+      // Set `http_request_body` only if `http_method` is POST
+      // otherwise set to null to have the field removed
+      if (!serialized.attributes?.http_method?.match(/post/i)) {
+        serialized.attributes.http_request_body = null;
       }
-
-      // 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,6 +1,9 @@
-import ApplicationSerializer from './application';
-import { copy } from 'ember-copy';
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
 
+import ApplicationSerializer from './application';
 export default class CredentialStoreSerializer extends ApplicationSerializer {
   /**
    * @override
@@ -39,7 +42,7 @@ export default class CredentialStoreSerializer extends ApplicationSerializer {
   }
 
   normalize(typeClass, hash, ...rest) {
-    const normalizedHash = copy(hash, true);
+    const normalizedHash = structuredClone(hash);
     const normalized = super.normalize(typeClass, normalizedHash, ...rest);
     // Remove secret fields as we don't track them after being created/updated
     normalized.data.attributes.token = '';

addons/api/addon/serializers/credential.js

@@ -1,6 +1,9 @@
-import ApplicationSerializer from './application';
-import { copy } from 'ember-copy';
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
 
+import ApplicationSerializer from './application';
 export default class CredentialSerializer extends ApplicationSerializer {
   /**
    * @override
@@ -33,7 +36,7 @@ export default class CredentialSerializer extends ApplicationSerializer {
   }
 
   normalize(typeClass, hash, ...rest) {
-    const normalizedHash = copy(hash, true);
+    const normalizedHash = structuredClone(hash);
     const normalized = super.normalize(typeClass, normalizedHash, ...rest);
     // Remove secret fields as we don't track them after being created/updated
     normalized.data.attributes.password = '';

addons/api/addon/serializers/group.js

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import ApplicationSerializer from './application';
 
 export default class GroupSerializer extends ApplicationSerializer {

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

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import ApplicationSerializer from './application';
 
 const fieldsByType = {

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

@@ -1,5 +1,9 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import ApplicationSerializer from './application';
-import { copy } from 'ember-copy';
 
 const fieldByType = {
   aws: ['preferred_endpoints', 'filters', 'sync_interval_seconds'],
@@ -88,7 +92,7 @@ export default class HostSetSerializer extends ApplicationSerializer {
    * TODO:  remove once API consistently returns arrays.
    */
   normalize(typeClass, hash, ...rest) {
-    const normalizedHash = copy(hash, true);
+    const normalizedHash = structuredClone(hash);
 
     if (typeof normalizedHash?.attributes?.filters === 'string') {
       normalizedHash.attributes.filters = [normalizedHash.attributes.filters];

addons/api/addon/serializers/host.js

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import ApplicationSerializer from './application';
 
 export default class HostSerializer extends ApplicationSerializer {

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

@@ -1,27 +1,49 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import ApplicationSerializer from './application';
-import { copy } from 'ember-copy';
+import {
+  TYPE_AUTH_METHOD_OIDC,
+  TYPE_AUTH_METHOD_LDAP,
+} from 'api/models/auth-method';
 
 export default class ManagedGroupSerializer extends ApplicationSerializer {
   // =properties
-
   /**
    * @type {boolean}
    */
   serializeScopeID = false;
 
-  serialize() {
-    const serialized = super.serialize(...arguments);
+  /**
+   * Delegates to a type-specific serialization, or default.
+   * @override
+   * @param {Snapshot} snapshot
+   * @return {object}
+   */
 
+  serialize(snapshot) {
+    switch (snapshot.record.type) {
+      case TYPE_AUTH_METHOD_OIDC:
+        return this.serializeOIDC(...arguments);
+      case TYPE_AUTH_METHOD_LDAP:
+      default:
+        return super.serialize(...arguments);
+    }
+  }
+
+  serializeOIDC() {
+    const serialized = super.serialize(...arguments);
     if (serialized.attributes.filter_string !== undefined) {
       serialized.attributes.filter = serialized.attributes.filter_string;
     }
     delete serialized.attributes.filter_string;
-
     return serialized;
   }
 
   normalize(typeClass, hash, ...rest) {
-    const normalizedHash = copy(hash, true);
+    const normalizedHash = structuredClone(hash);
 
     if (normalizedHash?.attributes?.filter) {
       normalizedHash.attributes.filter_string =

addons/api/addon/serializers/role.js

@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
 import ApplicationSerializer from './application';
 import { get } from '@ember/object';