Skip to content

Conversation

@hashishaw
Copy link
Contributor

@hashishaw hashishaw commented Apr 11, 2024

This PR manually makes the same changes as #26346 but specifically for 1.15.x

We had a number of outdated upstream dependencies. In order to resolve these, I first deleted yarn.lock and then re-ran yarn install, which updated the following nested packages to an acceptable version:

Other dependencies needed specific resolutions:

async @ 2.6.4

An old version of async was required by fireworm, which is only consumed by testem. We are on the latest version of testem (3.12.0), so the best way to resolve this is to pin async@^2.6.4 which matches the version already imported to the codebase.
yarn why async showing fireworm@0.7.2 requiring async@0.2.10

nth-check @ 2.1.1

An old version of nth-check is a nested dependency of ember-svg-jar which is currently used to display some SVGs that are not available from HDS. I first tried to pin the css-select dependency but that caused build errors. Pinning nth-check directly allowed the UI to build, although there were typescript errors that I resolved in the next commit
yarn why nth-check showing requirement by svgo

ansi-html @ 0.0.8

The requirement for this dependency is ^0.0.7 which should have resolved to 0.0.8 but it seems like yarn doesn't know anything about the package, because when I do yarn info ansi-html it has returns with:

Usage Error: No package matched your request

I pinned it and that seems to resolve and build fine.
yarn why ansi-html showing requirement ^0.0.7

ember-template-lint

Lint jobs were failing with a mysterious error on this branch, so I updated ember-template-lint to 6.0.0 and it was working again. I added the failing lint checks to the template-lintrc file, and will fix the automatic ones in a separate PR so this can be backported

d3 deps

I removed ember-d3 which is unnecessary since we are pulling in the d3 libraries we need. I was able to update all of the d3 libraries we use except d3-selection which was failing in compareAttributes with this error:
d3-selection-fail

@hashishaw hashishaw requested review from a team as code owners April 11, 2024 14:33
@hashishaw hashishaw changed the base branch from main to release/1.15.x April 11, 2024 14:33
@github-actions github-actions bot added the hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed label Apr 11, 2024
@github-actions
Copy link

Build Results:
All builds succeeded! ✅

@github-actions
Copy link

github-actions bot commented Apr 11, 2024

CI Results:
All Go tests succeeded! ✅

@hashishaw hashishaw added this to the 1.15.8 milestone Apr 11, 2024
@hashishaw hashishaw merged commit 6475216 into release/1.15.x Apr 11, 2024
@hashishaw hashishaw deleted the ui/dependency-bumps-1.15.x branch April 11, 2024 16:31
akshya96 pushed a commit that referenced this pull request Apr 11, 2024
* reform yarn.lock without minimatch or qs in resolutions

* pin async and nth-check

* fix TS errors after bump

* bump ember-template-lint and disable broken rules

* pin ansi-html

* add extra lint rule to skip

* remove ember-d3 in favor of specific d3 libraries we import except d3-selection which was failing in compareAttributes

* add changelog from PR to main
@mladlow
Copy link
Collaborator

mladlow commented Apr 12, 2024

Thanks @hashishaw ! That's a great PR description too.

akshya96 added a commit that referenced this pull request Apr 12, 2024
….15.x (#26143)

* Change minimum retention window CE changes  (#26118)

* Retention window oss changes

* latest oss changes

* remove operator_diagnose change

* backport of commit da21b85 (#25666)

Co-authored-by: Scott Miller <[email protected]>

* headers only modified if we have a header formatter and headers (#26140)

* backport of commit 1885f16 (#26153)

Co-authored-by: miagilepner <[email protected]>

* Known issues: Vault Enterprise - Performance Standby nodes audit log all request headers (#26158) (#26159)

* Add known issue docs for Ent Perf Standby audit header logging issue

* attempt to improve description

Co-authored-by: Peter Wilson <[email protected]>

* Correct version for next 1.15 release (#26212)

* Update CHANGELOG.md (#26215)

To follow new processes for creating release notes on GitHub, I need to update the changelog on the release branch. I've opted to copy the entirety of the 1.15 changelog content to the release branch, adding the notes for 1.15.7.

Next I'll create the tag per these instructions https://github.com/hashicorp/engineering-docs/blob/main/consul/releases/release-process.md#manually-create-github-releases-for-ent-only-patch-releases, and update the release notes for that tag & release.

* backport of commit 92c5847 (#26234)

Co-authored-by: Theron Voran <[email protected]>

* backport of commit f1922d2 (#26272)

Co-authored-by: Socheat Sok <[email protected]>

* UI: Don't show Resultant-ACL banner when wildcard policy present (#26233) (#26271)

* Add wildcard calc helpers to permissions service with tests

* Check for wildcard access when calculating permissionsBanner

* Move resultant-acl banner within TokenExpireWarning so it's mutually exclusive with token expired banner

* fix permissions banner if statement

* Add margin to resultant-acl

* cleanup comments

* backport of commit d1fda88 (#26302)

Co-authored-by: James Bayer <[email protected]>

* backport of commit 02312cb (#26305)

Co-authored-by: Victor Rodriguez <[email protected]>

* backport of commit c9dafc1 (#26187)

Co-authored-by: NikolaiMagicnet <[email protected]>

* UI: Replication page navigation fix (#26325) (#26339)

* Add replication mirage handler

* Add test with skipped failed assertion

* Use component-calculated attrsForCurrentMode instead of cluster.replicationAttrs which wasn't triggering component updates

* assert previously-skipped assertion

* Add changelog

* UI: fix replication nav 1.15.x (#26349)

* Update test selectors specific to 1.15.x

* calculate attrs based on replication-mode service instead of cluster model getter

* backport of commit 71758f4 (#26358)

Co-authored-by: Ryan Cragun <[email protected]>

* UI: Dependency bumps 1.15.x (#26371)

* reform yarn.lock without minimatch or qs in resolutions

* pin async and nth-check

* fix TS errors after bump

* bump ember-template-lint and disable broken rules

* pin ansi-html

* add extra lint rule to skip

* remove ember-d3 in favor of specific d3 libraries we import except d3-selection which was failing in compareAttributes

* add changelog from PR to main

---------

Co-authored-by: akshya96 <[email protected]>
Co-authored-by: Scott Miller <[email protected]>
Co-authored-by: Peter Wilson <[email protected]>
Co-authored-by: miagilepner <[email protected]>
Co-authored-by: Meggie <[email protected]>
Co-authored-by: Theron Voran <[email protected]>
Co-authored-by: Socheat Sok <[email protected]>
Co-authored-by: Chelsea Shaw <[email protected]>
Co-authored-by: James Bayer <[email protected]>
Co-authored-by: Victor Rodriguez <[email protected]>
Co-authored-by: NikolaiMagicnet <[email protected]>
Co-authored-by: Ryan Cragun <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed ui

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants