Skip to content

s3: Fix tests after changing the interface to return diagnostics #37571

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Sep 8, 2025
Merged

s3: Fix tests after changing the interface to return diagnostics #37571

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d7bd8e
Fix tests after changing the interface to return diagnostics
SarahFrench Sep 8, 2025
6f67679
Fix curly brace position
SarahFrench Sep 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 23 additions & 6 deletions internal/backend/remote-state/s3/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"github.com/hashicorp/terraform/internal/states/remote"
"github.com/hashicorp/terraform/internal/states/statefile"
"github.com/hashicorp/terraform/internal/states/statemgr"
"github.com/hashicorp/terraform/internal/tfdiags"
)

func TestRemoteClient_impl(t *testing.T) {
Expand Down Expand Up @@ -385,10 +386,18 @@ func TestRemoteClient_stateChecksum(t *testing.T) {

// fetching an empty state through client1 should now error out due to a
// mismatched checksum.
if _, diags := client1.Get(); !IsA[badChecksumError](diags.Err()) {
t.Fatalf("expected state checksum error: got %s", diags.Err())
} else if bse, ok := As[badChecksumError](diags.Err()); ok && len(bse.digest) != 0 {
t.Fatalf("expected empty checksum, got %x", bse.digest)
if _, diags := client1.Get(); diags.HasErrors() {
var comparableErr error
if errValue, isDiag := diags.Err().(tfdiags.DiagnosticsAsError); isDiag {
// To use `As` below we need to extract the error that's wrapped
// in a diagnostic.
comparableErr = errValue.WrappedErrors()[0]
}
if !IsA[badChecksumError](comparableErr) {
t.Fatalf("expected state checksum error: got %s", diags.Err())
} else if bse, ok := As[badChecksumError](comparableErr); ok && len(bse.digest) != 0 {
t.Fatalf("expected empty checksum, got %x", bse.digest)
}
}

// put the old state in place of the new, without updating the checksum
Expand All @@ -398,8 +407,16 @@ func TestRemoteClient_stateChecksum(t *testing.T) {

// fetching the wrong state through client1 should now error out due to a
// mismatched checksum.
if _, diags := client1.Get(); !IsA[badChecksumError](diags.Err()) {
t.Fatalf("expected state checksum error: got %s", diags.Err())
if _, diags := client1.Get(); diags.HasErrors() {
var comparableErr error
if errValue, isDiag := diags.Err().(tfdiags.DiagnosticsAsError); isDiag {
// To use `As` below we need to extract the error that's wrapped
// in a diagnostic.
comparableErr = errValue.WrappedErrors()[0]
}
if !IsA[badChecksumError](comparableErr) {
t.Fatalf("expected state checksum error: got %s", diags.Err())
}
}

// update the state with the correct one after we Get again
Expand Down