From 919241019eb602be7b50e574c48c6b6a409debae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Nov 2024 08:44:14 +0000 Subject: [PATCH] backport of commit 3dfbc890b28ecd22ad863071227c0d9eb5440250 --- .changelog/24316.txt | 3 - .github/pull_request_template.md | 35 ------- .github/workflows/build.yml | 8 +- .github/workflows/checks.yaml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/security-scan.yml | 2 +- .github/workflows/test-core.yaml | 6 +- .github/workflows/test-e2e.yml | 4 +- .github/workflows/test-windows.yml | 2 +- CHANGELOG.md | 30 +----- dev/hooks/pre-push | 11 +-- e2e/allocexec/docker_exec_test.go | 8 +- go.mod | 10 +- go.sum | 20 ++-- ui/app/components/actions-flyout.hbs | 2 +- .../components/allocation-service-sidebar.hbs | 10 +- .../job-status/allocation-status-block.hbs | 6 +- .../components/job-status/failed-or-lost.hbs | 4 +- .../job-status/individual-allocation.hbs | 6 +- .../job-status/latest-deployment.hbs | 2 +- .../components/job-status/panel/deploying.hbs | 6 +- ui/app/components/task-sub-row.hbs | 2 +- ui/app/components/variable-paths.hbs | 4 +- ui/app/components/variable-paths.js | 18 +--- ui/app/controllers/variables/index.js | 5 + ui/app/styles/components/actions.scss | 10 +- .../styles/components/job-status-panel.scss | 2 +- .../administration/policies/policy.hbs | 2 +- .../templates/administration/roles/role.hbs | 2 +- .../allocations/allocation/index.hbs | 6 +- ui/app/templates/clients/client/index.hbs | 4 +- .../templates/components/job-service-row.hbs | 6 +- .../components/scale-events-accordion.hbs | 4 +- ui/app/templates/components/task-row.hbs | 2 +- ui/app/templates/components/topo-viz/node.hbs | 4 +- ui/app/templates/jobs/index.hbs | 8 +- .../templates/jobs/job/services/service.hbs | 2 +- ui/app/templates/variables/variable/index.hbs | 5 +- ui/ember-cli-build.js | 1 + ui/package.json | 3 +- ui/tests/acceptance/variables-test.js | 4 +- ui/tests/pages/clients/list.js | 2 +- ui/tests/pages/components/topo-viz/node.js | 2 +- ui/yarn.lock | 96 ++++++++++--------- 44 files changed, 147 insertions(+), 226 deletions(-) delete mode 100644 .changelog/24316.txt delete mode 100644 .github/pull_request_template.md diff --git a/.changelog/24316.txt b/.changelog/24316.txt deleted file mode 100644 index 4cf0785f6ae..00000000000 --- a/.changelog/24316.txt +++ /dev/null @@ -1,3 +0,0 @@ -```release-note:bug -ui: Fix an issue where cmd+click or ctrl+click would double-open a var -``` diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md deleted file mode 100644 index 6f45b095e98..00000000000 --- a/.github/pull_request_template.md +++ /dev/null @@ -1,35 +0,0 @@ -### Description - - -### Testing & Reproduction steps - - -### Links - - -### Contributor Checklist -- [ ] **Changelog Entry** If this PR changes user-facing behavior, please generate and add a - changelog entry using the `make cl` command. -- [ ] **Testing** Please add tests to cover any new functionality or to demonstrate bug fixes and - ensure regressions will be caught. -- [ ] **Documentation** If the change impacts user-facing functionality such as the CLI, API, UI, - and job configuration, please update the Nomad website documentation to reflect this. Refer to - the [website README](../website/README.md) for docs guidelines. Please also consider whether the - change requires notes within the [upgrade guide](../website/content/docs/upgrade/upgrade-specific.mdx). - -### Reviewer Checklist -- [ ] **Backport Labels** Please add the correct backport labels as described by the internal - backporting document. -- [ ] **Commit Type** Ensure the correct merge method is selected which should be "squash and merge" - in the majority of situations. The main exceptions are long-lived feature branches or merges where - history should be preserved. -- [ ] **Enterprise PRs** If this is an enterprise only PR, please add any required changelog entry - within the public repository. diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c4b8587e4de..e2da17aca4f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -90,7 +90,7 @@ jobs: with: ref: ${{ github.event.inputs.build-ref }} - name: Setup go - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 + uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: go-version: ${{ needs.get-go-version.outputs.go-version }} @@ -142,7 +142,7 @@ jobs: with: ref: ${{ github.event.inputs.build-ref }} - name: Setup go - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 + uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: go-version: ${{ needs.get-go-version.outputs.go-version }} @@ -265,7 +265,7 @@ jobs: run: git config --global url.'https://${{ env.ELEVATED_GITHUB_TOKEN }}@github.com'.insteadOf 'https://github.com' - name: Setup go - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 + uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: go-version: ${{ needs.get-go-version.outputs.go-version }} @@ -356,7 +356,7 @@ jobs: goos: [linux] goarch: [amd64] steps: - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 + - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: go-version: ${{needs.get-go-version.outputs.go-version}} - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml index 63faa862168..ccb948ce35c 100644 --- a/.github/workflows/checks.yaml +++ b/.github/workflows/checks.yaml @@ -41,7 +41,7 @@ jobs: - name: Git config token if: endsWith(github.repository, '-enterprise') run: git config --global url.'https://${{ env.ELEVATED_GITHUB_TOKEN }}@github.com'.insteadOf 'https://github.com' - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 + - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: cache: true go-version-file: .go-version diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 785fec0b9dd..6efc7670f78 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -81,7 +81,7 @@ jobs: echo "go-version=$(cat .go-version)" >> "$GITHUB_OUTPUT" - name: Setup go - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 + uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: go-version: ${{ steps.get-go-version.outputs.go-version }} diff --git a/.github/workflows/security-scan.yml b/.github/workflows/security-scan.yml index a458be15f76..0b32e1e0601 100644 --- a/.github/workflows/security-scan.yml +++ b/.github/workflows/security-scan.yml @@ -37,7 +37,7 @@ jobs: steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 + - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: cache: ${{ contains(runner.name, 'Github Actions') }} go-version-file: .go-version diff --git a/.github/workflows/test-core.yaml b/.github/workflows/test-core.yaml index 9b006697d10..56972391358 100644 --- a/.github/workflows/test-core.yaml +++ b/.github/workflows/test-core.yaml @@ -59,7 +59,7 @@ jobs: timeout-minutes: 20 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 + - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: cache: ${{ contains(runner.name, 'Github Actions') }} go-version-file: .go-version @@ -74,7 +74,7 @@ jobs: timeout-minutes: 8 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 + - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: cache: true go-version-file: .go-version @@ -102,7 +102,7 @@ jobs: - quick steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 + - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: cache: ${{ contains(runner.name, 'Github Actions') }} go-version-file: .go-version diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml index 10a5dbc195d..ab08c3047b3 100644 --- a/.github/workflows/test-e2e.yml +++ b/.github/workflows/test-e2e.yml @@ -53,7 +53,7 @@ jobs: - name: Git config token if: endsWith(github.repository, '-enterprise') run: git config --global url.'https://${{ env.ELEVATED_GITHUB_TOKEN }}@github.com'.insteadOf 'https://github.com' - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 + - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: cache: ${{ contains(runner.name, 'Github Actions') }} go-version-file: .go-version @@ -70,7 +70,7 @@ jobs: - name: Git config token if: endsWith(github.repository, '-enterprise') run: git config --global url.'https://${{ secrets.ELEVATED_GITHUB_TOKEN }}@github.com'.insteadOf 'https://github.com' - - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 + - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: cache: ${{ contains(runner.name, 'Github Actions') }} go-version-file: .go-version diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index 39dc4d93007..7d908185f65 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -52,7 +52,7 @@ jobs: - run: git config --global core.autocrlf false - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Setup go - uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 + uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: go-version-file: ".go-version" - name: Show installed Go version diff --git a/CHANGELOG.md b/CHANGELOG.md index 3806cbb6e13..5c04911b4e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -94,18 +94,6 @@ BUG FIXES: * template: Fixed a panic on client restart when using change_mode=script [[GH-24057](https://github.com/hashicorp/nomad/issues/24057)] * ui: Fixes an issue where variables paths would not let namespaced users write variables unless they also had wildcard namespace variable write permissions [[GH-24073](https://github.com/hashicorp/nomad/issues/24073)] -## 1.8.7 Enterprise (November 8, 2024) - -SECURITY: - -* csi: Fixed a bug where a user with csi-write-volume permissions to one namespace can create volumes in another namespace (CVE-2024-10975) [[GH-24396](https://github.com/hashicorp/nomad/issues/24396)] - -BUG FIXES: - -* connect: add validation to ensure that connect native services specify a port [[GH-24329](https://github.com/hashicorp/nomad/issues/24329)] -* keyring: Fixed a panic on server startup when decrypting AEAD key data with empty RSA block [[GH-24383](https://github.com/hashicorp/nomad/issues/24383)] -* scheduler: fixed a bug where resource calculation did not account correctly for poststart tasks [[GH-24297](https://github.com/hashicorp/nomad/issues/24297)] - ## 1.8.6 Enterprise(October 21, 2024) IMPROVEMENTS: @@ -245,7 +233,7 @@ BUG FIXES: * server: Fixed a bug where expiring heartbeats for garbage collected nodes could panic the server [[GH-23383](https://github.com/hashicorp/nomad/issues/23383)] * template: Fix template rendering on Windows [[GH-23432](https://github.com/hashicorp/nomad/issues/23432)] * ui: Actions run from jobs with explicit name properties now work from the web UI [[GH-23553](https://github.com/hashicorp/nomad/issues/23553)] -* ui: Don't show keyboard nav hints when taking a screenshot [[GH-23365](https://github.com/hashicorp/nomad/issues/23365)] +* ui: Dont show keyboard nav hints when taking a screenshot [[GH-23365](https://github.com/hashicorp/nomad/issues/23365)] * ui: Fix an issue where a remotely purged job would prevent redirect from taking place in the web UI [[GH-23492](https://github.com/hashicorp/nomad/issues/23492)] * ui: Fix an issue where access to Job Templates in the UI was restricted to variable.write access [[GH-23458](https://github.com/hashicorp/nomad/issues/23458)] * ui: Fix the Upload Jobspec button on the Run Job page [[GH-23548](https://github.com/hashicorp/nomad/issues/23548)] @@ -342,18 +330,6 @@ BUG FIXES: * ui: Show the namespace in the web UI exec command hint [[GH-20218](https://github.com/hashicorp/nomad/issues/20218)] * windows: Fixed a regression where scanning task processes was inefficient [[GH-20619](https://github.com/hashicorp/nomad/issues/20619)] -## 1.7.15 (November 8, 2024) - -SECURITY: - -* csi: Fixed a bug where a user with csi-write-volume permissions to one namespace can create volumes in another namespace (CVE-2024-10975) [[GH-24396](https://github.com/hashicorp/nomad/issues/24396)] - -BUG FIXES: - -* connect: add validation to ensure that connect native services specify a port [[GH-24329](https://github.com/hashicorp/nomad/issues/24329)] -* deps: Fixed a bug where restarting Nomad could cause an unrelated process with the same PID as a failed executor to be killed [[GH-24265](https://github.com/hashicorp/nomad/issues/24265)] -* scheduler: fixed a bug where resource calculation did not account correctly for poststart tasks [[GH-24297](https://github.com/hashicorp/nomad/issues/24297)] - ## 1.7.14 Enterprise (October 21, 2024) IMPROVEMENTS: @@ -645,7 +621,7 @@ IMPROVEMENTS: * audit (Enterprise): Added ACL token role links to audit log auth objects [[GH-19415](https://github.com/hashicorp/nomad/issues/19415)] * ui: Added a new example template with Task Actions [[GH-19153](https://github.com/hashicorp/nomad/issues/19153)] -* ui: Don't allow new jobspec download until template is populated, and remove group count from jobs index [[GH-19377](https://github.com/hashicorp/nomad/issues/19377)] +* ui: dont allow new jobspec download until template is populated, and remove group count from jobs index [[GH-19377](https://github.com/hashicorp/nomad/issues/19377)] * ui: make the exec window look nicer on mobile screens [[GH-19332](https://github.com/hashicorp/nomad/issues/19332)] BUG FIXES: @@ -720,7 +696,7 @@ IMPROVEMENTS: * ui: for system and sysbatch jobs, now show client name on hover in job panel [[GH-19051](https://github.com/hashicorp/nomad/issues/19051)] * ui: nicer comment styles in UI example jobs [[GH-19037](https://github.com/hashicorp/nomad/issues/19037)] * ui: show plan output warnings alongside placement failures and dry-run info when running a job through the web ui [[GH-19225](https://github.com/hashicorp/nomad/issues/19225)] -* ui: simplify presentation of task event times (10m2.230948s becomes 10m2s etc.) [[GH-18595](https://github.com/hashicorp/nomad/issues/18595)] +* ui: simplify presentation of task event times (10m2.230948s bceomes 10m2s etc.) [[GH-18595](https://github.com/hashicorp/nomad/issues/18595)] * vars: Added a locking feature for Nomad Variables [[GH-18520](https://github.com/hashicorp/nomad/issues/18520)] DEPRECATIONS: diff --git a/dev/hooks/pre-push b/dev/hooks/pre-push index 2a62a40f335..0f6cc35f4be 100755 --- a/dev/hooks/pre-push +++ b/dev/hooks/pre-push @@ -31,7 +31,6 @@ if [ -f version/version_ent.go ]; then fi # do not push directly to main, stable-*, release/* -# do not push Enterprise tags # ==================== while read local_ref local_sha remote_ref remote_sha do @@ -46,13 +45,5 @@ do if echo "$remote_ref"|grep -q 'refs/heads/release/.*'; then fail "refusing to push directly to a branch prefixed \`release/\`" fi - - if echo "$remote_ref" | grep -q 'refs/tags/v.*\+ent'; then - fail "refusing to push Nomad Enterprise tag" - fi - - if echo "$remote_ref" | grep -q 'refs/tags/v.*\+pro'; then - fail "refusing to push Nomad Enterprise (pro) tag" - fi - done + diff --git a/e2e/allocexec/docker_exec_test.go b/e2e/allocexec/docker_exec_test.go index 17c165af4ba..2956d700d81 100644 --- a/e2e/allocexec/docker_exec_test.go +++ b/e2e/allocexec/docker_exec_test.go @@ -7,7 +7,6 @@ import ( "archive/tar" "bytes" "context" - "fmt" "strings" "testing" "time" @@ -28,14 +27,13 @@ func TestDockerAllocExec(t *testing.T) { } func testDockerExecStdin(t *testing.T) { - sub, cleanup := jobs3.Submit(t, "./input/sleepytar.hcl") + _, cleanup := jobs3.Submit(t, "./input/sleepytar.hcl") t.Cleanup(cleanup) client, err := nomadapi.NewClient(nomadapi.DefaultConfig()) must.NoError(t, err) - filter := fmt.Sprintf("JobID == \"%s\"", sub.JobID()) - allocations, _, err := client.Allocations().List(&nomadapi.QueryOptions{Filter: filter}) + allocations, _, err := client.Allocations().List(nil) must.NoError(t, err) must.SliceLen(t, 1, allocations) @@ -87,7 +85,7 @@ func testDockerExecStdin(t *testing.T) { nil, nil, ) - must.NoError(t, err, must.Sprintf("error executing command inside the container: %v", err)) + must.NoError(t, err) must.Zero(t, exitCode) // check the output of tar diff --git a/go.mod b/go.mod index 209997f23b1..e6ff11330a7 100644 --- a/go.mod +++ b/go.mod @@ -69,7 +69,7 @@ require ( github.com/hashicorp/go-plugin v1.6.2 github.com/hashicorp/go-secure-stdlib/listenerutil v0.1.9 github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 - github.com/hashicorp/go-set/v3 v3.0.0 + github.com/hashicorp/go-set/v3 v3.0.0-alpha.1 github.com/hashicorp/go-sockaddr v1.0.6 github.com/hashicorp/go-syslog v1.0.0 github.com/hashicorp/go-uuid v1.0.3 @@ -133,7 +133,7 @@ require ( golang.org/x/sync v0.8.0 golang.org/x/sys v0.27.0 golang.org/x/time v0.3.0 - google.golang.org/grpc v1.68.0 + google.golang.org/grpc v1.59.0 google.golang.org/protobuf v1.34.2 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 gopkg.in/tomb.v2 v2.0.0-20140626144623-14b3d72120e8 @@ -142,7 +142,7 @@ require ( require ( cloud.google.com/go v0.110.8 // indirect - cloud.google.com/go/compute/metadata v0.5.0 // indirect + cloud.google.com/go/compute/metadata v0.3.0 // indirect cloud.google.com/go/iam v1.1.2 // indirect cloud.google.com/go/kms v1.15.2 // indirect cloud.google.com/go/storage v1.30.1 // indirect @@ -306,8 +306,8 @@ require ( google.golang.org/api v0.128.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto v0.0.0-20230920204549-e6e6cdab5c13 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 // indirect gopkg.in/fsnotify.v1 v1.4.7 // indirect gopkg.in/resty.v1 v1.12.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/go.sum b/go.sum index a13c27b5328..8a0dbaf645a 100644 --- a/go.sum +++ b/go.sum @@ -68,8 +68,8 @@ cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU= cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U= cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU= -cloud.google.com/go/compute/metadata v0.5.0 h1:Zr0eK8JbFv6+Wi4ilXAR8FJ3wyNdpxHKJNPos6LTZOY= -cloud.google.com/go/compute/metadata v0.5.0/go.mod h1:aHnloV2TPI38yx4s9+wAZhHykWvVCfu7hQbF+9CWoiY= +cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2QxYC4trgAKZc= +cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k= cloud.google.com/go/containeranalysis v0.5.1/go.mod h1:1D92jd8gRR/c0fGMlymRgxWD3Qw9C1ff6/T7mLgVL8I= cloud.google.com/go/containeranalysis v0.6.0/go.mod h1:HEJoiEIu+lEXM+k7+qLCci0h33lX3ZqoYFdmPcoO7s4= cloud.google.com/go/datacatalog v1.3.0/go.mod h1:g9svFY6tuR+j+hrTw3J2dNcmI0dzmSiyOzm8kpLq0a0= @@ -712,8 +712,8 @@ github.com/hashicorp/go-secure-stdlib/tlsutil v0.1.3 h1:xbrxd0U9XQW8qL1BAz2XrAjA github.com/hashicorp/go-secure-stdlib/tlsutil v0.1.3/go.mod h1:LWq2Sy8UoKKuK4lFuCNWSjJj57MhNNf2zzBWMtkAIX4= github.com/hashicorp/go-set/v2 v2.1.0 h1:iERPCQWks+I+4bTgy0CT2myZsCqNgBg79ZHqwniohXo= github.com/hashicorp/go-set/v2 v2.1.0/go.mod h1:6q4nh8UCVZODn2tJ5RbJi8+ki7pjZBsAEYGt6yaGeTo= -github.com/hashicorp/go-set/v3 v3.0.0 h1:CaJBQvQCOWoftrBcDt7Nwgo0kdpmrKxar/x2o6pV9JA= -github.com/hashicorp/go-set/v3 v3.0.0/go.mod h1:IEghM2MpE5IaNvL+D7X480dfNtxjRXZ6VMpK3C8s2ok= +github.com/hashicorp/go-set/v3 v3.0.0-alpha.1 h1:dPUtuqKJGgxtF7YO42oE+NdUONXi5nfLMKH2NpBffIM= +github.com/hashicorp/go-set/v3 v3.0.0-alpha.1/go.mod h1:7bJRgsF3EL3AtRTzcKXdjAFbYGSef+1gHXhglGGO52k= github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A= github.com/hashicorp/go-sockaddr v1.0.6 h1:RSG8rKU28VTUTvEKghe5gIhIQpv8evvNpnDEyqO4u9I= github.com/hashicorp/go-sockaddr v1.0.6/go.mod h1:uoUUmtwU7n9Dv3O4SNLeFvg0SxQ3lyjsj6+CCykpaxI= @@ -1675,10 +1675,10 @@ google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= google.golang.org/genproto v0.0.0-20230920204549-e6e6cdab5c13 h1:vlzZttNJGVqTsRFU9AmdnrcO1Znh8Ew9kCD//yjigk0= google.golang.org/genproto v0.0.0-20230920204549-e6e6cdab5c13/go.mod h1:CCviP9RmpZ1mxVr8MUjCnSiY09IbAXZxhLE6EhHIdPU= -google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 h1:hjSy6tcFQZ171igDaN5QHOw2n6vx40juYbC/x67CEhc= -google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:qpvKtACPCQhAdu3PyQgV4l3LMXZEtft7y8QcarRsp9I= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= +google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb h1:lK0oleSc7IQsUxO3U5TjL9DWlsxpEBemh+zpB7IqhWI= +google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 h1:6GQBEOdGkX6MMTLT9V+TjtIRZCw9VPD5Z+yHY9wMgS0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97/go.mod h1:v7nGkzlmW8P3n/bKmWBn2WpBjpOEx8Q6gMueudAmKfY= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -1715,8 +1715,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= -google.golang.org/grpc v1.68.0 h1:aHQeeJbo8zAkAa3pRzrVjZlbz6uSfeOXlJNQM0RAbz0= -google.golang.org/grpc v1.68.0/go.mod h1:fmSPC5AsjSBCK54MyHRx48kpOti1/jRfOlwEWywNjWA= +google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= +google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= diff --git a/ui/app/components/actions-flyout.hbs b/ui/app/components/actions-flyout.hbs index f945999202c..fccf16f91fc 100644 --- a/ui/app/components/actions-flyout.hbs +++ b/ui/app/components/actions-flyout.hbs @@ -33,7 +33,7 @@ - + diff --git a/ui/app/components/allocation-service-sidebar.hbs b/ui/app/components/allocation-service-sidebar.hbs index 62d9152907c..7ad7ab4485a 100644 --- a/ui/app/components/allocation-service-sidebar.hbs +++ b/ui/app/components/allocation-service-sidebar.hbs @@ -18,15 +18,15 @@ {{#if (not-eq @service.provider "consul")}} {{#if (eq this.aggregateStatus 'Unhealthy')}} - + Unhealthy {{else if (eq this.aggregateStatus 'Unknown')}} - + Health Unknown {{else}} - + Healthy {{/if}} @@ -133,10 +133,10 @@ {{#if (eq row.model.Status "success")}} - + Healthy {{else if (eq row.model.Status "failure")}} - + Unhealthy {{else if (eq row.model.Status "pending")}} Pending diff --git a/ui/app/components/job-status/allocation-status-block.hbs b/ui/app/components/job-status/allocation-status-block.hbs index 4365627715c..7bafb99fd29 100644 --- a/ui/app/components/job-status/allocation-status-block.hbs +++ b/ui/app/components/job-status/allocation-status-block.hbs @@ -45,11 +45,11 @@ {{#if (eq @status "running")}} {{#if (eq @health "healthy")}} - + {{else if (eq @health "unhealthy")}} - + {{else}} - + {{/if}} {{/if}} diff --git a/ui/app/components/job-status/failed-or-lost.hbs b/ui/app/components/job-status/failed-or-lost.hbs index 8613eace12e..433bd186baa 100644 --- a/ui/app/components/job-status/failed-or-lost.hbs +++ b/ui/app/components/job-status/failed-or-lost.hbs @@ -9,7 +9,7 @@ {{#if @supportsRescheduling}} - + - + {{#if (eq @health "healthy")}} - + {{else if (eq @health "unhealthy")}} - + {{else}} - + {{/if}} {{/if}} diff --git a/ui/app/components/job-status/latest-deployment.hbs b/ui/app/components/job-status/latest-deployment.hbs index 80d60888d9a..01a3763ba64 100644 --- a/ui/app/components/job-status/latest-deployment.hbs +++ b/ui/app/components/job-status/latest-deployment.hbs @@ -7,7 +7,7 @@

Latest Deployment - +

diff --git a/ui/app/components/job-status/panel/deploying.hbs b/ui/app/components/job-status/panel/deploying.hbs index 59354b6b440..a511cac74af 100644 --- a/ui/app/components/job-status/panel/deploying.hbs +++ b/ui/app/components/job-status/panel/deploying.hbs @@ -140,11 +140,11 @@ {{#if (eq health "healthy")}} - + {{else if (eq health "unhealthy")}} - + {{else}} - + {{/if}} diff --git a/ui/app/components/task-sub-row.hbs b/ui/app/components/task-sub-row.hbs index 6428371c382..a4cdf58c500 100644 --- a/ui/app/components/task-sub-row.hbs +++ b/ui/app/components/task-sub-row.hbs @@ -13,7 +13,7 @@
{{this.task.name}}
diff --git a/ui/app/components/variable-paths.hbs b/ui/app/components/variable-paths.hbs index ea6cc09a7c8..4b00fc46f43 100644 --- a/ui/app/components/variable-paths.hbs +++ b/ui/app/components/variable-paths.hbs @@ -27,7 +27,7 @@ }} > - + {{trim-path folder.name}} @@ -48,7 +48,7 @@ }} > - + {{#if (can "read variable" path=file.absoluteFilePath namespace=file.variable.namespace)}} .hds-flyout__header { position: relative; z-index: $z-base; - - .hds-flyout__title .hds-text { + .hds-flyout__title { display: flex; align-items: center; gap: 1rem; justify-content: space-between; - h3 { flex-grow: 1; } } - - .hds-dismiss-button { - align-self: center; - } } .hds-application-state { diff --git a/ui/app/styles/components/job-status-panel.scss b/ui/app/styles/components/job-status-panel.scss index cd5742df734..917277ad595 100644 --- a/ui/app/styles/components/job-status-panel.scss +++ b/ui/app/styles/components/job-status-panel.scss @@ -423,7 +423,7 @@ } } - .legend-item .represented-allocation .hds-icon { + .legend-item .represented-allocation .flight-icon { animation: none; } diff --git a/ui/app/templates/administration/policies/policy.hbs b/ui/app/templates/administration/policies/policy.hbs index 45a8d065e9a..365e90c69ca 100644 --- a/ui/app/templates/administration/policies/policy.hbs +++ b/ui/app/templates/administration/policies/policy.hbs @@ -58,7 +58,7 @@

Create Tokens from the Nomad CLI

-

When you're ready to create more tokens, you can do so via the Nomad CLI with the following: +

When you're ready to create more tokens, you can do so via the Nomad CLI with the following: 

                 {{this.newTokenString}}
                 Create Tokens from the Nomad CLI
-

When you're ready to create more tokens, you can do so via the Nomad CLI with the following: +

When you're ready to create more tokens, you can do so via the Nomad CLI with the following: 

                 {{this.newTokenString}}
                 
               
                 {{#if (eq row.model.provider "nomad")}}
-                  
+                  
                 {{else}}
-                  
+                  
                   {{#if row.model.connect}}
-                    
+                    
                   {{/if}}
                 {{/if}}
               
diff --git a/ui/app/templates/clients/client/index.hbs b/ui/app/templates/clients/client/index.hbs
index 47d29e7b9bb..bea905f4e52 100644
--- a/ui/app/templates/clients/client/index.hbs
+++ b/ui/app/templates/clients/client/index.hbs
@@ -186,7 +186,7 @@
           aria-label="More information"
           class="is-faded"
         >
-          
+          
         
         
-        
+
diff --git a/ui/app/templates/components/job-service-row.hbs b/ui/app/templates/components/job-service-row.hbs index 7160e453fd5..57c034eb940 100644 --- a/ui/app/templates/components/job-service-row.hbs +++ b/ui/app/templates/components/job-service-row.hbs @@ -19,10 +19,10 @@ }} > {{#if (eq @service.provider "nomad")}} - + {{@service.name}} {{else}} - + {{#if (and (eq @service.provider "consul") this.consulRedirectLink)}} {{@service.name}} @@ -31,7 +31,7 @@ {{@service.name}} {{/if}} {{#if @service.connect}} - + {{/if}} {{/if}} diff --git a/ui/app/templates/components/scale-events-accordion.hbs b/ui/app/templates/components/scale-events-accordion.hbs index f85571a8549..6a5f8e1e27d 100644 --- a/ui/app/templates/components/scale-events-accordion.hbs +++ b/ui/app/templates/components/scale-events-accordion.hbs @@ -33,9 +33,9 @@ to {{a.item.count}}" aria-label="More information"> {{#if a.item.increased}} - + {{else}} - + {{/if}} diff --git a/ui/app/templates/components/task-row.hbs b/ui/app/templates/components/task-row.hbs index 838297a68e4..bd811f1c753 100644 --- a/ui/app/templates/components/task-row.hbs +++ b/ui/app/templates/components/task-row.hbs @@ -6,7 +6,7 @@ {{#unless this.task.driverStatus.healthy}} - + {{/unless}} diff --git a/ui/app/templates/components/topo-viz/node.hbs b/ui/app/templates/components/topo-viz/node.hbs index b4fa1b81aca..c411df1bd54 100644 --- a/ui/app/templates/components/topo-viz/node.hbs +++ b/ui/app/templates/components/topo-viz/node.hbs @@ -12,7 +12,7 @@ @text="Client is draining" aria-label="Client is draining" > - + {{else if (not @node.node.isEligible)}} - + {{/if}} {{@node.node.name}} diff --git a/ui/app/templates/jobs/index.hbs b/ui/app/templates/jobs/index.hbs index 2fea518b84c..21a6db3e43d 100644 --- a/ui/app/templates/jobs/index.hbs +++ b/ui/app/templates/jobs/index.hbs @@ -342,7 +342,7 @@ /> {{/if}} - + - @@ -362,8 +362,8 @@ - - + {{/if}} diff --git a/ui/app/templates/jobs/job/services/service.hbs b/ui/app/templates/jobs/job/services/service.hbs index 9d39473f294..70f5fe7c330 100644 --- a/ui/app/templates/jobs/job/services/service.hbs +++ b/ui/app/templates/jobs/job/services/service.hbs @@ -6,7 +6,7 @@

- + {{this.model.name}}

diff --git a/ui/app/templates/variables/variable/index.hbs b/ui/app/templates/variables/variable/index.hbs index 00d4c4cbddd..d14e16eef52 100644 --- a/ui/app/templates/variables/variable/index.hbs +++ b/ui/app/templates/variables/variable/index.hbs @@ -125,7 +125,10 @@ }} > - + {{#if B.data.isVisible}} diff --git a/ui/ember-cli-build.js b/ui/ember-cli-build.js index d0b8e81f64c..364c8fbc27f 100644 --- a/ui/ember-cli-build.js +++ b/ui/ember-cli-build.js @@ -40,6 +40,7 @@ module.exports = function (defaults) { precision: 4, includePaths: [ './node_modules/@hashicorp/design-system-tokens/dist/products/css', + './node_modules/@hashicorp/ember-flight-icons/dist/styles', './node_modules/@hashicorp/design-system-components/dist/styles', ], }, diff --git a/ui/package.json b/ui/package.json index 147c368b240..0c75d86e05c 100644 --- a/ui/package.json +++ b/ui/package.json @@ -167,7 +167,8 @@ }, "dependencies": { "@babel/helper-string-parser": "^7.19.4", - "@hashicorp/design-system-components": "^4.13.0", + "@hashicorp/design-system-components": "^4.3.0", + "@hashicorp/ember-flight-icons": "^5.0.2", "@percy/cli": "^1.30.0", "@percy/ember": "^4.2.0", "curved-arrows": "^0.1.0", diff --git a/ui/tests/acceptance/variables-test.js b/ui/tests/acceptance/variables-test.js index d425ef2e4a1..f66cd8784ea 100644 --- a/ui/tests/acceptance/variables-test.js +++ b/ui/tests/acceptance/variables-test.js @@ -410,7 +410,9 @@ module('Acceptance | variables', function (hooks) { await typeIn('[data-test-path-input]', 'foo/bar'); await clickToggle('[data-test-variable-namespace-filter]'); assert - .dom('[data-test-variable-namespace-filter] .hds-dropdown__content') + .dom( + '[data-test-variable-namespace-filter] .hds-menu-primitive__content' + ) .exists('Namespace can be edited.'); assert .dom('[data-test-variable-namespace-filter]') diff --git a/ui/tests/pages/clients/list.js b/ui/tests/pages/clients/list.js index 8d59790fcfa..13e567e7908 100644 --- a/ui/tests/pages/clients/list.js +++ b/ui/tests/pages/clients/list.js @@ -22,7 +22,7 @@ const heliosFacet = (scope) => ({ scope, toggle: clickable('button'), options: collection( - '.hds-dropdown__content .hds-dropdown__list .hds-dropdown-list-item--variant-checkbox', + '.hds-menu-primitive__content .hds-dropdown__content .hds-dropdown__list .hds-dropdown-list-item--variant-checkbox', { toggle: clickable('label'), count: text('label .hds-dropdown-list-item__count'), diff --git a/ui/tests/pages/components/topo-viz/node.js b/ui/tests/pages/components/topo-viz/node.js index a59549b6070..2910bac3ae6 100644 --- a/ui/tests/pages/components/topo-viz/node.js +++ b/ui/tests/pages/components/topo-viz/node.js @@ -31,7 +31,7 @@ export default (scope) => ({ label: text('[data-test-label]'), labelIsPresent: isPresent('[data-test-label]'), - statusIcon: attribute('class', '[data-test-status-icon] .hds-icon'), + statusIcon: attribute('class', '[data-test-status-icon] .flight-icon'), statusIconLabel: attribute('aria-label', '[data-test-status-icon]'), selectNode: clickable('[data-test-node-background]'), diff --git a/ui/yarn.lock b/ui/yarn.lock index 8930c2a8c51..dae76cfeb3d 100644 --- a/ui/yarn.lock +++ b/ui/yarn.lock @@ -2556,43 +2556,53 @@ resolved "https://registry.yarnpkg.com/@handlebars/parser/-/parser-2.0.0.tgz#5e8b7298f31ff8f7b260e6b7363c7e9ceed7d9c5" integrity sha512-EP9uEDZv/L5Qh9IWuMUGJRfwhXJ4h1dqKTT4/3+tY0eu7sPis7xh23j61SYUnNF4vqCQvvUXpDo9Bh/+q1zASA== -"@hashicorp/design-system-components@^4.13.0": - version "4.13.1" - resolved "https://registry.yarnpkg.com/@hashicorp/design-system-components/-/design-system-components-4.13.1.tgz#18a12eb23e52a7676613f6bf39e4defdfd73182a" - integrity sha512-yEiQJxAs0zgt/dxM6ZYPcVJT0a3C2wrO+8iOxUd623jyDXlbyjD/vZSp7qOCvkomQkHvWgD/7clVdl75a5i3rQ== +"@hashicorp/design-system-components@^4.3.0": + version "4.4.0" + resolved "https://registry.yarnpkg.com/@hashicorp/design-system-components/-/design-system-components-4.4.0.tgz#c633ec2df53a9e9a303e63182566c0266e326aa6" + integrity sha512-87K3/TQvyVeA68olUh66TjaGL1x9QJM9G0nJW053/+zemFnud2je6/+BdO/uc5iJtDnGNSahWy71TDObYsN3pg== dependencies: "@ember/render-modifiers" "^2.0.5" "@ember/string" "^3.1.1" "@ember/test-waiters" "^3.1.0" "@embroider/addon-shim" "^1.8.7" "@floating-ui/dom" "^1.6.3" - "@hashicorp/design-system-tokens" "^2.2.1" - "@hashicorp/flight-icons" "^3.7.0" + "@hashicorp/design-system-tokens" "^2.1.0" + "@hashicorp/ember-flight-icons" "^5.0.2" + "@oddbird/popover-polyfill" "^0.4.3" decorator-transforms "^1.1.0" - ember-a11y-refocus "^4.1.3" + ember-a11y-refocus "^3.0.2" ember-cli-sass "^11.0.1" ember-composable-helpers "^5.0.0" ember-element-helper "^0.8.5" ember-focus-trap "^1.1.0" - ember-get-config "^2.1.1" + ember-keyboard "^8.2.1" ember-modifier "^4.1.0" ember-power-select "^8.2.0" ember-stargate "^0.4.3" - ember-style-modifier "^4.4.0" + ember-style-modifier "^3.0.1" ember-truth-helpers "^4.0.3" prismjs "^1.29.0" sass "^1.69.5" tippy.js "^6.3.7" -"@hashicorp/design-system-tokens@^2.2.1": - version "2.2.1" - resolved "https://registry.yarnpkg.com/@hashicorp/design-system-tokens/-/design-system-tokens-2.2.1.tgz#9112c4cf9099ef1706a6b4f83be400960b473e91" - integrity sha512-Pnbnk5jbOXmW82W0wimP0PdOWYAi7dYsC3TE88JbR+jHzpwUdyVGsqcYF7ClOl/C/KDbK60N0FEJbFdaFj6ZXQ== +"@hashicorp/design-system-tokens@^2.1.0": + version "2.1.0" + resolved "https://registry.yarnpkg.com/@hashicorp/design-system-tokens/-/design-system-tokens-2.1.0.tgz#e72284f375631f624ff2f3198dc6d2ee03e0d422" + integrity sha512-8SFUmRsX9v9pCc1Oq+zZGAmZGLxdZ6WnVEvwOzPAswlUTxBPa5zdoKdKEOPw8Xr3j142Mie6WVk2SMTV9EjQIQ== -"@hashicorp/flight-icons@^3.7.0": - version "3.7.0" - resolved "https://registry.yarnpkg.com/@hashicorp/flight-icons/-/flight-icons-3.7.0.tgz#cc8e4fb7cc8ac585a4841f6d724217a054cfe959" - integrity sha512-oSnIjGqzXciibyQjgc45u4GUHBrIgyFSBCjxP4t0WXbJ578J3/DB6eyvWoMJ4r4GSf0MxUgOg0A/fJV/V4yEdA== +"@hashicorp/ember-flight-icons@^5.0.2": + version "5.0.2" + resolved "https://registry.yarnpkg.com/@hashicorp/ember-flight-icons/-/ember-flight-icons-5.0.2.tgz#e2f4d1d1fadd9364a0db2dd2e2da5b9595e5a159" + integrity sha512-jb9h7fe9KNyPq1rPnLN6C/+7ldsFPiRmTe16KWyteJ+1dPmBLOUKl/Fr95L+u3Zh3DzzchZVcSdwia0U03I3EQ== + dependencies: + "@embroider/addon-shim" "^1.8.7" + "@hashicorp/flight-icons" "^3.2.0" + ember-get-config "^2.1.1" + +"@hashicorp/flight-icons@^3.2.0": + version "3.2.0" + resolved "https://registry.yarnpkg.com/@hashicorp/flight-icons/-/flight-icons-3.2.0.tgz#048d5d32d99bb5d5f7e2f76298adaadf82598405" + integrity sha512-blvRLVlWRldiOZao0CuiGxgZ4rCSPNkK5SrcnSbja+bOoTsPyD2bcLTpwtCHVYa+G9MS4bFtolrMhTLKjMSsCQ== "@hashicorp/structure-icons@^1.3.0": version "1.9.2" @@ -2679,6 +2689,11 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" +"@oddbird/popover-polyfill@^0.4.3": + version "0.4.3" + resolved "https://registry.yarnpkg.com/@oddbird/popover-polyfill/-/popover-polyfill-0.4.3.tgz#310d61c8fc7ee12d8dba05cdfa8bd7e5d5a281a3" + integrity sha512-kBS0ZAwH8kZqFl0mV89KPK4cLYl2ZoKSfYngK4dz1eLAhKzTK0yu4LrvLdMeM7JhjWK6GxBtiY+cl1s6vR2pUg== + "@percy/cli-app@1.30.0": version "1.30.0" resolved "https://registry.yarnpkg.com/@percy/cli-app/-/cli-app-1.30.0.tgz#d9b0058514766bcfd0c36887c062a2824f0362f9" @@ -6036,11 +6051,6 @@ cssstyle@^2.3.0: dependencies: cssom "~0.3.6" -csstype@^3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81" - integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw== - curved-arrows@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/curved-arrows/-/curved-arrows-0.1.0.tgz#824709316a856e28970c1f577803093a57475bb0" @@ -6384,14 +6394,6 @@ decorator-transforms@^1.1.0: "@babel/plugin-syntax-decorators" "^7.23.3" babel-import-util "^2.0.1" -decorator-transforms@^2.0.0: - version "2.2.2" - resolved "https://registry.yarnpkg.com/decorator-transforms/-/decorator-transforms-2.2.2.tgz#c163e86815c78152528a8c1549e95d8f3403e61b" - integrity sha512-NHCSJXOUQ29YFli1QzstXWo72EyASpoVx+s0YdkMwswpovf/iAJP580nD1tB0Ph9exvtbfWdVrSAloXrWVo1Xg== - dependencies: - "@babel/plugin-syntax-decorators" "^7.23.3" - babel-import-util "^3.0.0" - deep-is@^0.1.3: version "0.1.4" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" @@ -6618,10 +6620,10 @@ electron-to-chromium@^1.5.4: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.26.tgz#449b4fa90e83ab98abbe3b6a96c8ee395de94452" integrity sha512-Z+OMe9M/V6Ep9n/52+b7lkvYEps26z4Yz3vjWL1V61W0q+VLF1pOHhMY17sa4roz4AWmULSI8E6SAojZA5L0YQ== -ember-a11y-refocus@^4.1.3: - version "4.1.4" - resolved "https://registry.yarnpkg.com/ember-a11y-refocus/-/ember-a11y-refocus-4.1.4.tgz#ffcabbc91503379cd2c0124cb5f0bc93178098b5" - integrity sha512-51tGk30bskObL1LsGZRxzqIxgZhIE8ZvvDYcT1OWphxZlq00+Arz57aMLS4Vz4qhSE40BfeN2qFYP/gXtp9qDA== +ember-a11y-refocus@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/ember-a11y-refocus/-/ember-a11y-refocus-3.0.2.tgz#e648c491d3a8d84cb594679bafc8430cd22b2ed4" + integrity sha512-5T9kAvl0RUBF6SSeaaWpVS2WC8MTktgqiGdLAbxVjT2f2NGrDDPmv7riDVNMsuL5sHRwSKm0EHCIzZ4M3aFMow== dependencies: ember-cli-babel "^7.26.11" ember-cli-htmlbars "^6.0.1" @@ -7439,7 +7441,7 @@ ember-decorators@^6.1.1: "@ember-decorators/object" "^6.1.1" ember-cli-babel "^7.7.3" -ember-destroyable-polyfill@^2.0.1, ember-destroyable-polyfill@^2.0.2: +ember-destroyable-polyfill@^2.0.1, ember-destroyable-polyfill@^2.0.2, ember-destroyable-polyfill@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/ember-destroyable-polyfill/-/ember-destroyable-polyfill-2.0.3.tgz#1673ed66609a82268ef270a7d917ebd3647f11e1" integrity sha512-TovtNqCumzyAiW0/OisSkkVK93xnVF4NRU6+FN0ubpfwEOpRrmM2RqDwXI6YAChCgSHON1cz0DfQStpA1Gjuuw== @@ -7565,6 +7567,16 @@ ember-inline-svg@^1.0.1: svgo "~1.2.2" walk-sync "~2.0.2" +ember-keyboard@^8.2.1: + version "8.2.1" + resolved "https://registry.yarnpkg.com/ember-keyboard/-/ember-keyboard-8.2.1.tgz#945a8a71068d81c06ad26851008ef81061db2a59" + integrity sha512-wT9xpt3GKsiodGZoifKU4OyeRjXWlmKV9ZHHsp6wJBwMFpl4wWPjTNdINxivk2qg/WFNIh8nUiwuG4+soWXPdw== + dependencies: + "@embroider/addon-shim" "^1.8.4" + ember-destroyable-polyfill "^2.0.3" + ember-modifier "^2.1.2 || ^3.1.0 || ^4.0.0" + ember-modifier-manager-polyfill "^1.2.0" + ember-lifeline@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/ember-lifeline/-/ember-lifeline-7.0.0.tgz#46780c8f832b6c784ee4681b938a1e1437bfa676" @@ -7619,7 +7631,7 @@ ember-modifier@3.2.7, ember-modifier@^3.2.0, ember-modifier@^3.2.7: ember-cli-typescript "^5.0.0" ember-compatibility-helpers "^1.2.5" -"ember-modifier@^3.2.7 || ^4.0.0", "ember-modifier@^3.2.7 || ^4.1.0", ember-modifier@^4.1.0: +"ember-modifier@^2.1.2 || ^3.1.0 || ^4.0.0", "ember-modifier@^3.2.7 || ^4.0.0", "ember-modifier@^3.2.7 || ^4.1.0", ember-modifier@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/ember-modifier/-/ember-modifier-4.1.0.tgz#cb91efbf8ca4ff4a1a859767afa42dddba5a2bbd" integrity sha512-YFCNpEYj6jdyy3EjslRb2ehNiDvaOrXTilR9+ngq+iUqSHYto2zKV0rleiA1XJQ27ELM1q8RihT29U6Lq5EyqQ== @@ -7837,7 +7849,7 @@ ember-statecharts@^0.13.2: ember-usable "https://github.com/pzuraq/ember-usable#0d03a50" xstate "^4.12.0" -"ember-style-modifier@^0.8.0 || ^1.0.0 || ^2.0.0 || ^3.0.0": +"ember-style-modifier@^0.8.0 || ^1.0.0 || ^2.0.0 || ^3.0.0", ember-style-modifier@^3.0.1: version "3.1.1" resolved "https://registry.yarnpkg.com/ember-style-modifier/-/ember-style-modifier-3.1.1.tgz#313269708552c42255806586160411840adc98c5" integrity sha512-J91YLKVp3/m7LrcLEWNSG2sJlSFhE5Ny75empU048qYJtdJMe788Ks/EpKEi953o1mJujVRg792YGrwbrpTzNA== @@ -7846,16 +7858,6 @@ ember-statecharts@^0.13.2: ember-cli-babel "^7.26.11" ember-modifier "^3.2.7 || ^4.0.0" -ember-style-modifier@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/ember-style-modifier/-/ember-style-modifier-4.4.0.tgz#2d1fa6a35d41d88612277d7d149f1e569acaf8d3" - integrity sha512-gT1ckbhl1KSj5sWTo/8UChj98eZeE+mUmYoXw8VjwJgWP0wiTCibGZjVbC0WlIUd7umxuG61OQ/ivfF+sAiOEQ== - dependencies: - "@embroider/addon-shim" "^1.8.7" - csstype "^3.1.3" - decorator-transforms "^2.0.0" - ember-modifier "^3.2.7 || ^4.0.0" - ember-template-lint@^3.15.0: version "3.16.0" resolved "https://registry.yarnpkg.com/ember-template-lint/-/ember-template-lint-3.16.0.tgz#7af2ec8d4386f4726be08c14c39ba121c56f0896"