Skip to content

Backport of AWS European Sovereign Cloud support, bump aws-sdk-go-base into v1.14#37743

Merged
liamcervante merged 10 commits intov1.14from
backport/t-bump-aws-sdk-go-base/abnormally-solid-wahoo
Oct 8, 2025
Merged

Backport of AWS European Sovereign Cloud support, bump aws-sdk-go-base into v1.14#37743
liamcervante merged 10 commits intov1.14from
backport/t-bump-aws-sdk-go-base/abnormally-solid-wahoo

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

@github-actions github-actions bot commented Oct 8, 2025

Backport

This PR is auto-generated from #37721 to be assessed for backporting due to the inclusion of the label 1.14-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:
@YakDriver
This person should resolve the merge-conflict(s) by either:

  • Manually completing the cherry picks into this branch
  • Creating a new branch and manually cherry-picking all commits being backported

merge conflict error: unable to process merge commit: "c7c388839f120f53a53510aa15231e61f077851c", automatic backport requires rebase workflow

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


Relates:

This may add full support for EUSC. However, without a way to verify (access to EUSC), I can't be certain. It is also possible these dependency updates add more support but not complete support.

Target Release

1.14.x

Rollback Plan

  • If a change needs to be reverted, we will roll out an update to the code within 7 days.

Changes to Security Controls

Are there any changes to security controls (access controls, encryption, logging) in this pull request? If so, explain.

CHANGELOG entry

  • 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 YakDriver October 8, 2025 14:33
@YakDriver YakDriver marked this pull request as ready for review October 8, 2025 14:35
@YakDriver YakDriver requested review from a team as code owners October 8, 2025 14:35
Copy link
Copy Markdown
Member

@jar-b jar-b left a comment

Choose a reason for hiding this comment

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

LGTM 🚀

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

@liamcervante
Copy link
Copy Markdown
Contributor

I have another PR queued which is gonna cause conflicts with this one. So I'll merge this, and resolve the conflicts on my side instead of forcing the problem into this one.

@liamcervante liamcervante merged commit b7a39f7 into v1.14 Oct 8, 2025
7 checks passed
@liamcervante liamcervante deleted the backport/t-bump-aws-sdk-go-base/abnormally-solid-wahoo branch October 8, 2025 17:42
@github-actions
Copy link
Copy Markdown
Contributor Author

github-actions bot commented Nov 8, 2025

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active contributions.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 8, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants