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(s3): allow aliases for kms key into v1.6 #34038

Merged
merged 2 commits into from
Oct 9, 2023

Conversation

teamterraform
Copy link
Contributor

Backport

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

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


Release 1.6.0 broke the ability to use s3 key aliases in the s3 backend. This change adjusts the tests, and validation of kms key arn's to look for aliases

Fixes #33979
Fixes #34005

Target Release

1.6.1

Draft CHANGELOG entry

BUG FIXES

  • Fixes the ability to use KMS key aliases in the S3 backend

Overview of commits

@teamterraform teamterraform force-pushed the backport/fix/s3-backend-kms-alias/immensely-ample-pika branch 2 times, most recently from 76de03f to 49291d2 Compare October 9, 2023 20:13
@teamterraform teamterraform requested a review from a team as a code owner October 9, 2023 20:13
@teamterraform teamterraform force-pushed the backport/fix/s3-backend-kms-alias/immensely-ample-pika branch from f803b3f to 56f9f18 Compare October 9, 2023 20:13
@teamterraform teamterraform requested a review from jar-b October 9, 2023 20:13
@hashicorp-cla
Copy link

hashicorp-cla commented Oct 9, 2023

CLA assistant check
All committers have signed the CLA.

@jar-b jar-b force-pushed the backport/fix/s3-backend-kms-alias/immensely-ample-pika branch from 56f9f18 to e46fe59 Compare October 9, 2023 20:20
@jar-b jar-b force-pushed the backport/fix/s3-backend-kms-alias/immensely-ample-pika branch from e46fe59 to dcda361 Compare October 9, 2023 20:23
Copy link
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 ./internal/backend/remote-state/s3/...
ok      github.com/hashicorp/terraform/internal/backend/remote-state/s3 138.365s

@jar-b jar-b merged commit 1c3ff99 into v1.6 Oct 9, 2023
4 checks passed
@jar-b jar-b deleted the backport/fix/s3-backend-kms-alias/immensely-ample-pika branch October 9, 2023 20:34
@github-actions
Copy link
Contributor

github-actions bot commented Oct 9, 2023

Reminder for the merging maintainer: if this is a user-visible change, please update the changelog on the appropriate release branch.

@dosilyoun
Copy link

@jar-b It fixes a breaking change what affects many organizations. When it will be available with a new release? Have you thought about a hotfix?

@jar-b
Copy link
Member

jar-b commented Oct 10, 2023

This will be part of 1.6.1, which is planned to be released later today.

Copy link
Contributor

github-actions bot commented Dec 8, 2023

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 Dec 8, 2023
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.

5 participants