Skip to content

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

Closed
ghost wants to merge 1 commit intov1.8from
backport/patch-1/scarcely-touched-jennet
Closed

Backport of Fix resolution message for S3/DynamoDB state checksum mismatch into v1.8#34889
ghost wants to merge 1 commit intov1.8from
backport/patch-1/scarcely-touched-jennet

Conversation

@ghost
Copy link
Copy Markdown

@ghost ghost commented Mar 26, 2024

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

@ghost ghost force-pushed the backport/patch-1/scarcely-touched-jennet branch from bd44cc6 to 5ff7ed6 Compare March 26, 2024 19:10
@ghost ghost assigned jar-b Mar 26, 2024
@ghost ghost requested a review from jar-b March 26, 2024 19:10
@jar-b
Copy link
Copy Markdown
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
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 ./...
ok      github.com/hashicorp/terraform/internal/backend/remote-state/s3 145.903s

@jar-b
Copy link
Copy Markdown
Member

jar-b commented Jul 19, 2024

🤦 I whiffed on revisiting this for 1.8.1. However, now that the fix is available in the 1.9.X series, I don't think a back port is necessary any longer. Going to go ahead and close this out.

@jar-b jar-b closed this Jul 19, 2024
@github-actions
Copy link
Copy Markdown
Contributor

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 Aug 19, 2024
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.

2 participants