Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating cypress version and fixing CVE-2024-21538 #1247

Merged
merged 5 commits into from
Jan 30, 2025

Conversation

tandonks
Copy link
Collaborator

@tandonks tandonks commented Jan 30, 2025

Description

  • Upgrading cypress version to 12.17.4 to bring it in line with OSD
  • Fixing CVE-2024-21538

Issues Resolved

Resolves #1246

Check List

  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: Kshitij Tandon <[email protected]>
Signed-off-by: Kshitij Tandon <[email protected]>
@tandonks tandonks changed the title Updating cypress version Updating cypress version and fixing CVE-2024-21538 Jan 30, 2025
@tandonks
Copy link
Collaborator Author

The cypress test github workflow needs to be reconfigured to execute the tests after bumping the cypress version so will investigate that separately. For now, will merge this bump to unblock 2.19 release.

Signed-off-by: Kshitij Tandon <[email protected]>
Signed-off-by: Kshitij Tandon <[email protected]>
Copy link

codecov bot commented Jan 30, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 60.92%. Comparing base (a53ff41) to head (f3a8ffa).
Report is 36 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1247      +/-   ##
==========================================
- Coverage   61.61%   60.92%   -0.70%     
==========================================
  Files         345      348       +3     
  Lines       12449    12842     +393     
  Branches     2509     2589      +80     
==========================================
+ Hits         7671     7824     +153     
- Misses       4075     4279     +204     
- Partials      703      739      +36     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@shiv0408 shiv0408 merged commit 3eb1b24 into opensearch-project:main Jan 30, 2025
10 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/index-management-dashboards-plugin/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/index-management-dashboards-plugin/backport-2.x
# Create a new branch
git switch --create backport/backport-1247-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 3eb1b24382f63abf362eb61147a174500b3085ed
# Push it to GitHub
git push --set-upstream origin backport/backport-1247-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/index-management-dashboards-plugin/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-1247-to-2.x.

tandonks added a commit to tandonks/index-management-dashboards-plugin that referenced this pull request Jan 30, 2025
…t#1247)

* Updating cypress version

Signed-off-by: Kshitij Tandon <[email protected]>

* Fixing CVE-2024-21538

Signed-off-by: Kshitij Tandon <[email protected]>

* Testing cypress baselining

Signed-off-by: Kshitij Tandon <[email protected]>

* Modifying spec patterns

Signed-off-by: Kshitij Tandon <[email protected]>

* Fixing an issue in snpashot e2e test

Signed-off-by: Kshitij Tandon <[email protected]>

---------

Signed-off-by: Kshitij Tandon <[email protected]>
(cherry picked from commit 3eb1b24)
tandonks added a commit to tandonks/index-management-dashboards-plugin that referenced this pull request Jan 30, 2025
…t#1247)

* Updating cypress version

Signed-off-by: Kshitij Tandon <[email protected]>

* Fixing CVE-2024-21538

Signed-off-by: Kshitij Tandon <[email protected]>

* Testing cypress baselining

Signed-off-by: Kshitij Tandon <[email protected]>

* Modifying spec patterns

Signed-off-by: Kshitij Tandon <[email protected]>

* Fixing an issue in snpashot e2e test

Signed-off-by: Kshitij Tandon <[email protected]>

---------

Signed-off-by: Kshitij Tandon <[email protected]>
(cherry picked from commit 3eb1b24)
rishabh6788 pushed a commit that referenced this pull request Jan 30, 2025
) (#1249)

* Updating cypress version and fixing CVE-2024-21538 (#1247)

* Updating cypress version

Signed-off-by: Kshitij Tandon <[email protected]>

* Fixing CVE-2024-21538

Signed-off-by: Kshitij Tandon <[email protected]>

* Testing cypress baselining

Signed-off-by: Kshitij Tandon <[email protected]>

* Modifying spec patterns

Signed-off-by: Kshitij Tandon <[email protected]>

* Fixing an issue in snpashot e2e test

Signed-off-by: Kshitij Tandon <[email protected]>

---------

Signed-off-by: Kshitij Tandon <[email protected]>
(cherry picked from commit 3eb1b24)

* Updating upload artifacts to v4

Signed-off-by: Kshitij Tandon <[email protected]>

* Updating certificates and key

Signed-off-by: Kshitij Tandon <[email protected]>

* Updating cypress.config

Signed-off-by: Kshitij Tandon <[email protected]>

---------

Signed-off-by: Kshitij Tandon <[email protected]>
rishabh6788 pushed a commit that referenced this pull request Jan 30, 2025
…1247) (#1252)

* Updating cypress version and fixing CVE-2024-21538 (#1247)

* Updating cypress version

Signed-off-by: Kshitij Tandon <[email protected]>

* Fixing CVE-2024-21538

Signed-off-by: Kshitij Tandon <[email protected]>

* Testing cypress baselining

Signed-off-by: Kshitij Tandon <[email protected]>

* Modifying spec patterns

Signed-off-by: Kshitij Tandon <[email protected]>

* Fixing an issue in snpashot e2e test

Signed-off-by: Kshitij Tandon <[email protected]>

---------

Signed-off-by: Kshitij Tandon <[email protected]>
(cherry picked from commit 3eb1b24)

* Updating upload artifacts to v4

Signed-off-by: Kshitij Tandon <[email protected]>

* Updating certificates in cypress.config

Signed-off-by: Kshitij Tandon <[email protected]>

---------

Signed-off-by: Kshitij Tandon <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Upgrade ISM cypress version to v12 which similar to OSD to pass build failures.
2 participants