From 807fc3e6d060cbfcd68d5d5f9e7b0371e81ebf29 Mon Sep 17 00:00:00 2001
From: Graham Davison <gdavison@hashicorp.com>
Date: Mon, 23 Oct 2023 16:57:18 -0700
Subject: [PATCH] Fixes error check

---
 internal/backend/remote-state/s3/client.go      | 4 ++--
 internal/backend/remote-state/s3/client_test.go | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/internal/backend/remote-state/s3/client.go b/internal/backend/remote-state/s3/client.go
index 204ddde314..80fa65303e 100644
--- a/internal/backend/remote-state/s3/client.go
+++ b/internal/backend/remote-state/s3/client.go
@@ -231,13 +231,13 @@ func (c *RemoteClient) put(data []byte, optFns ...func(*s3.Options)) error {
 	})
 	_, err := uploader.Upload(ctx, input)
 	if err != nil {
-		return fmt.Errorf("failed to upload state: %s", err)
+		return fmt.Errorf("failed to upload state: %w", err)
 	}
 
 	if err := c.putMD5(ctx, sum[:]); err != nil {
 		// if this errors out, we unfortunately have to error out altogether,
 		// since the next Get will inevitably fail.
-		return fmt.Errorf("failed to store state MD5: %s", err)
+		return fmt.Errorf("failed to store state MD5: %w", err)
 	}
 
 	return nil
diff --git a/internal/backend/remote-state/s3/client_test.go b/internal/backend/remote-state/s3/client_test.go
index 49133f3d7d..f9a7d77648 100644
--- a/internal/backend/remote-state/s3/client_test.go
+++ b/internal/backend/remote-state/s3/client_test.go
@@ -7,6 +7,7 @@ import (
 	"bytes"
 	"context"
 	"crypto/md5"
+	"errors"
 	"fmt"
 	"io"
 	"testing"
@@ -452,8 +453,10 @@ func TestRemoteClientSkipS3Checksum(t *testing.T) {
 					addCancelRequestMiddleware(),
 				)
 			})
-			if err != nil {
-				t.Fatal(err)
+			if err == nil {
+				t.Fatal("Expected an error, got none")
+			} else if !errors.Is(err, errCancelOperation) {
+				t.Fatalf("Unexpected error: %s", err)
 			}
 
 			if a, e := header, testcase.expected; a != e {