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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport of Fix resolution message for S3/DynamoDB state checksum mismatch into v1.8 #34889

Draft
wants to merge 1 commit into
base: v1.8
Choose a base branch
from

Conversation

teamterraform
Copy link
Contributor

Backport

This PR is auto-generated from #34387 to be assessed for backporting due to the inclusion of the label 1.8-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: unable to process merge commit: "c140e2eef1f2cb25a05dd8a87386499ebbdc56ba", automatic backport requires rebase workflow

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


The current resolution message incorrectly suggests updating the DynamoDB value to the value already stored there, rather than to the calculated checksum of the S3 state file.

Draft CHANGELOG entry

BUG FIXES

  • Fixed the digest value displayed for DynamoDB/S3 state checksum mismatches.

Overview of commits

@jar-b
Copy link
Member

jar-b commented Mar 26, 2024

As the v1.8.0 release candidate has already been cut, will wait on this until 1.8.1.

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 ./...
ok      github.com/hashicorp/terraform/internal/backend/remote-state/s3 145.903s

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.

None yet

3 participants