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 fix: bump aws-sdk-go-base/v2 from v2.0.0-beta.58 to v2.0.0-beta.62 into v1.11 #36649

Merged

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Mar 6, 2025

Backport

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

🚨

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:
@jar-b
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/terraform/merges: 409 Merge conflict []

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


Bump aws-sdk-go-base/v2 version

Fixes #36624

Target Release

1.11.x

CHANGELOG entry

bump aws-sdk-go-base/v2 from v2.0.0-beta.58 to v2.0.0-beta.62

  • This change is user-facing and I added a changelog entry.
  • This change is not user-facing.

Overview of commits

@github-actions github-actions bot requested a review from jar-b March 6, 2025 18:18
Copy link

hashicorp-cla-app bot commented Mar 6, 2025

CLA assistant check
All committers have signed the CLA.

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.

This upgrade will add support for S3 backends in several new regions,
including `mx-central-1`.
@jar-b jar-b force-pushed the backport/update-aws-sdk-go-base/positively-organic-gannet branch from 02b4b22 to 596591e Compare March 6, 2025 18:27
@jar-b jar-b marked this pull request as ready for review March 6, 2025 18:29
@jar-b jar-b requested review from a team as code owners March 6, 2025 18:29
@jar-b jar-b merged commit 311ac25 into v1.11 Mar 6, 2025
13 checks passed
@jar-b jar-b deleted the backport/update-aws-sdk-go-base/positively-organic-gannet branch March 6, 2025 18:52
@jar-b
Copy link
Member

jar-b commented Mar 6, 2025

Forgot to add this before merge - S3 backend acceptance tests all pass.

% TF_ACC=1 go test ./...
ok      github.com/hashicorp/terraform/internal/backend/remote-state/s3 206.911s

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.

3 participants