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

Backport of Bump cockroach-go to v2.3.8 into release/1.15.x #26853

Merged

Conversation

hc-github-team-secure-vault-core
Copy link
Collaborator

Backport

This PR is auto-generated from #26842 to be assessed for backporting due to the inclusion of the label backport/1.15.x.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@mpalmi
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: POST https://api.github.com/repos/hashicorp/vault/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


PR cockroachdb/cockroach-go#179 addresses CVE-2024-27289 and CVE-2024-27304 by bumping jackc/pgx to v4.18.3.

This PR pulls in these changes by updating our cockroach-go dep to v2.3.8.

Resolves: VAULT-26033


Overview of commits

Copy link

hashicorp-cla-app bot commented May 7, 2024

CLA assistant check
All committers have signed the CLA.

@github-actions github-actions bot added the hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed label May 7, 2024
Copy link

CLA assistant check

Thank you for your submission! We require that all contributors sign our Contributor License Agreement ("CLA") before we can accept the contribution. Read and sign the agreement

Learn more about why HashiCorp requires a CLA and what the CLA includes


temp seems not to be a GitHub user.
You need a GitHub account to be able to sign the CLA.
If you have already a GitHub account, please add the email address used for this commit to your account.

Have you signed the CLA already but the status is still pending? Recheck it.

Copy link

github-actions bot commented May 7, 2024

CI Results:
All Go tests succeeded! ✅

@mpalmi mpalmi force-pushed the backport/cockroach-go-v2.3.8/totally-on-skunk branch from 044acb4 to e11699d Compare May 7, 2024 13:35
@mpalmi mpalmi marked this pull request as ready for review May 7, 2024 13:38
@mpalmi mpalmi added this to the 1.15.9 milestone May 7, 2024
Copy link

github-actions bot commented May 7, 2024

Build Results:
All builds succeeded! ✅

@mpalmi mpalmi force-pushed the backport/cockroach-go-v2.3.8/totally-on-skunk branch from e11699d to 21792f8 Compare May 7, 2024 13:51
@mpalmi mpalmi enabled auto-merge (squash) May 7, 2024 14:01
@mpalmi mpalmi merged commit 6186bd2 into release/1.15.x May 7, 2024
75 of 76 checks passed
@mpalmi mpalmi deleted the backport/cockroach-go-v2.3.8/totally-on-skunk branch May 7, 2024 14:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed pr/no-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants