Skip to content

Backport of deps: aws-sdk-go v1.44.289 into release/1.15.x#17879

Merged
loshz merged 1 commit intorelease/1.15.xfrom
backport/loshz/bump-aws-sdk-go/initially-clear-blowfish
Jun 26, 2023
Merged

Backport of deps: aws-sdk-go v1.44.289 into release/1.15.x#17879
loshz merged 1 commit intorelease/1.15.xfrom
backport/loshz/bump-aws-sdk-go/initially-clear-blowfish

Conversation

@hc-github-team-consul-core
Copy link
Collaborator

Backport

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

🚨

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:
@loshz
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/consul/merges: 409 Merge conflict []

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


Description

Bumps the aws-sdk-go from v1.42.34 -> v1.44.289

Addresses CVEs noted in #17358


Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/loshz/bump-aws-sdk-go/initially-clear-blowfish branch from df7795e to d9ffcc1 Compare June 26, 2023 17:07
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/loshz/bump-aws-sdk-go/initially-clear-blowfish branch from d9ffcc1 to df7795e Compare June 26, 2023 17:07
@hashicorp-cla
Copy link

hashicorp-cla commented Jun 26, 2023

CLA assistant check
All committers have signed the CLA.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Auto approved Consul Bot automated PR

@vercel vercel bot temporarily deployed to Preview – consul-ui-staging June 26, 2023 17:11 Inactive
@vercel vercel bot temporarily deployed to Preview – consul June 26, 2023 17:17 Inactive
@loshz loshz force-pushed the backport/loshz/bump-aws-sdk-go/initially-clear-blowfish branch from 5e9364e to 4681454 Compare June 26, 2023 17:30
Signed-off-by: Dan Bond <danbond@protonmail.com>
@loshz loshz marked this pull request as ready for review June 26, 2023 17:44
@loshz loshz enabled auto-merge (squash) June 26, 2023 17:44
@loshz loshz merged commit fa791fa into release/1.15.x Jun 26, 2023
@loshz loshz deleted the backport/loshz/bump-aws-sdk-go/initially-clear-blowfish branch June 26, 2023 17:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants