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

upgrade tough-cookie to 4.1.3 #163172

Merged
merged 16 commits into from
Sep 13, 2023

Conversation

kc13greiner
Copy link
Contributor

@kc13greiner kc13greiner commented Aug 4, 2023

Summary

Upgrade tough-cookie from 2.5.0/4.1.2 to 4.1.3

This also required an update of @cypress/request

Change logs

tough-cookie: salesforce/tough-cookie@4.1.2...4.1.3
@cypress/request: cypress-io/request@2.88.10...2.88.12

@kc13greiner kc13greiner added chore Team:Security Team focused on: Auth, Users, Roles, Spaces, Audit Logging, and more! release_note:skip Skip the PR/issue when compiling release notes v8.10.0 labels Aug 4, 2023
@kibana-ci
Copy link
Collaborator

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@kc13greiner kc13greiner marked this pull request as ready for review September 8, 2023 12:28
@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-security (Team:Security)

@kc13greiner kc13greiner requested a review from a team September 8, 2023 12:29
Copy link
Contributor

@jeramysoucy jeramysoucy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@kc13greiner kc13greiner added the backport:all-open Backport to all branches that could still receive a release label Sep 13, 2023
@kc13greiner kc13greiner merged commit 135f190 into elastic:main Sep 13, 2023
27 checks passed
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Sep 13, 2023
## Summary

Upgrade `tough-cookie` from `2.5.0/4.1.2` to `4.1.3`

This also required an update of `@cypress/request`

## Change logs
`tough-cookie`:
salesforce/tough-cookie@4.1.2...4.1.3
`@cypress/request`:
cypress-io/request@2.88.10...2.88.12

---------

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
(cherry picked from commit 135f190)
@kibanamachine
Copy link
Contributor

💔 Some backports could not be created

Status Branch Result
7.17 Backport failed because of merge conflicts
8.10

Note: Successful backport PRs will be merged automatically after passing CI.

Manual backport

To create the backport manually run:

node scripts/backport --pr 163172

Questions ?

Please refer to the Backport tool documentation

kibanamachine added a commit that referenced this pull request Sep 13, 2023
# Backport

This will backport the following commits from `main` to `8.10`:
- [upgrade tough-cookie to 4.1.3
(#163172)](#163172)

<!--- Backport version: 8.9.7 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT
[{"author":{"name":"Kurt","email":"kc13greiner@users.noreply.github.com"},"sourceCommit":{"committedDate":"2023-09-13T21:35:20Z","message":"upgrade
tough-cookie to 4.1.3 (#163172)\n\n## Summary\r\n\r\nUpgrade
`tough-cookie` from `2.5.0/4.1.2` to `4.1.3`\r\n\r\nThis also required
an update of `@cypress/request`\r\n\r\n## Change
logs\r\n`tough-cookie`:\r\nhttps://github.com/salesforce/tough-cookie/compare/4.1.2...4.1.3\r\n`@cypress/request`:\r\nhttps://github.com/cypress-io/request/compare/2.88.10...2.88.12\r\n\r\n---------\r\n\r\nCo-authored-by:
kibanamachine
<42973632+kibanamachine@users.noreply.github.com>","sha":"135f190e884cf5cb644b03698aa411eeaea2182c","branchLabelMapping":{"^v8.11.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["chore","Team:Security","release_note:skip","backport:all-open","v8.11.0"],"number":163172,"url":"#163172
tough-cookie to 4.1.3 (#163172)\n\n## Summary\r\n\r\nUpgrade
`tough-cookie` from `2.5.0/4.1.2` to `4.1.3`\r\n\r\nThis also required
an update of `@cypress/request`\r\n\r\n## Change
logs\r\n`tough-cookie`:\r\nhttps://github.com/salesforce/tough-cookie/compare/4.1.2...4.1.3\r\n`@cypress/request`:\r\nhttps://github.com/cypress-io/request/compare/2.88.10...2.88.12\r\n\r\n---------\r\n\r\nCo-authored-by:
kibanamachine
<42973632+kibanamachine@users.noreply.github.com>","sha":"135f190e884cf5cb644b03698aa411eeaea2182c"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.11.0","labelRegex":"^v8.11.0$","isSourceBranch":true,"state":"MERGED","url":"#163172
tough-cookie to 4.1.3 (#163172)\n\n## Summary\r\n\r\nUpgrade
`tough-cookie` from `2.5.0/4.1.2` to `4.1.3`\r\n\r\nThis also required
an update of `@cypress/request`\r\n\r\n## Change
logs\r\n`tough-cookie`:\r\nhttps://github.com/salesforce/tough-cookie/compare/4.1.2...4.1.3\r\n`@cypress/request`:\r\nhttps://github.com/cypress-io/request/compare/2.88.10...2.88.12\r\n\r\n---------\r\n\r\nCo-authored-by:
kibanamachine
<42973632+kibanamachine@users.noreply.github.com>","sha":"135f190e884cf5cb644b03698aa411eeaea2182c"}}]}]
BACKPORT-->

Co-authored-by: Kurt <kc13greiner@users.noreply.github.com>
kc13greiner added a commit to kc13greiner/kibana that referenced this pull request Sep 25, 2023
## Summary

Upgrade `tough-cookie` from `2.5.0/4.1.2` to `4.1.3`

This also required an update of `@cypress/request`

## Change logs
`tough-cookie`:
salesforce/tough-cookie@4.1.2...4.1.3
`@cypress/request`:
cypress-io/request@2.88.10...2.88.12

---------

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
(cherry picked from commit 135f190)

# Conflicts:
#	yarn.lock
@kc13greiner
Copy link
Contributor Author

💚 All backports created successfully

Status Branch Result
7.17

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport:all-open Backport to all branches that could still receive a release chore release_note:skip Skip the PR/issue when compiling release notes Team:Security Team focused on: Auth, Users, Roles, Spaces, Audit Logging, and more! v8.10.1 v8.11.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants