From 344e9de6b925a97f7c9d03b94c979a815a72135f Mon Sep 17 00:00:00 2001
From: Graham Davison <gdavison@hashicorp.com>
Date: Mon, 17 Jul 2023 11:34:33 -0700
Subject: [PATCH] Linting fixes

---
 .../backend/remote-state/s3/backend_state.go  |  4 ----
 .../backend/remote-state/s3/backend_test.go   | 22 ++++++++++++++-----
 internal/backend/remote-state/s3/testing.go   | 12 ++--------
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/internal/backend/remote-state/s3/backend_state.go b/internal/backend/remote-state/s3/backend_state.go
index add7d399d8..89c2b08735 100644
--- a/internal/backend/remote-state/s3/backend_state.go
+++ b/internal/backend/remote-state/s3/backend_state.go
@@ -203,10 +203,6 @@ func (b *Backend) StateMgr(name string) (statemgr.Full, error) {
 	return stateMgr, nil
 }
 
-func (b *Backend) client() *RemoteClient {
-	return &RemoteClient{}
-}
-
 func (b *Backend) path(name string) string {
 	if name == backend.DefaultStateName {
 		return b.keyName
diff --git a/internal/backend/remote-state/s3/backend_test.go b/internal/backend/remote-state/s3/backend_test.go
index 3b244455a0..4e39e258cf 100644
--- a/internal/backend/remote-state/s3/backend_test.go
+++ b/internal/backend/remote-state/s3/backend_test.go
@@ -1038,7 +1038,9 @@ func TestBackendExtraPaths(t *testing.T) {
 
 	// Write the first state
 	stateMgr := &remote.State{Client: client}
-	stateMgr.WriteState(s1)
+	if err := stateMgr.WriteState(s1); err != nil {
+		t.Fatal(err)
+	}
 	if err := stateMgr.PersistState(nil); err != nil {
 		t.Fatal(err)
 	}
@@ -1048,7 +1050,9 @@ func TestBackendExtraPaths(t *testing.T) {
 	// states are equal, the state will not Put to the remote
 	client.path = b.path("s2")
 	stateMgr2 := &remote.State{Client: client}
-	stateMgr2.WriteState(s2)
+	if err := stateMgr2.WriteState(s2); err != nil {
+		t.Fatal(err)
+	}
 	if err := stateMgr2.PersistState(nil); err != nil {
 		t.Fatal(err)
 	}
@@ -1061,7 +1065,9 @@ func TestBackendExtraPaths(t *testing.T) {
 
 	// put a state in an env directory name
 	client.path = b.workspaceKeyPrefix + "/error"
-	stateMgr.WriteState(states.NewState())
+	if err := stateMgr.WriteState(states.NewState()); err != nil {
+		t.Fatal(err)
+	}
 	if err := stateMgr.PersistState(nil); err != nil {
 		t.Fatal(err)
 	}
@@ -1071,7 +1077,9 @@ func TestBackendExtraPaths(t *testing.T) {
 
 	// add state with the wrong key for an existing env
 	client.path = b.workspaceKeyPrefix + "/s2/notTestState"
-	stateMgr.WriteState(states.NewState())
+	if err := stateMgr.WriteState(states.NewState()); err != nil {
+		t.Fatal(err)
+	}
 	if err := stateMgr.PersistState(nil); err != nil {
 		t.Fatal(err)
 	}
@@ -1105,12 +1113,14 @@ func TestBackendExtraPaths(t *testing.T) {
 	if s2Mgr.(*remote.State).StateSnapshotMeta().Lineage == s2Lineage {
 		t.Fatal("state s2 was not deleted")
 	}
-	s2 = s2Mgr.State()
+	_ = s2Mgr.State() // We need the side-effect
 	s2Lineage = stateMgr.StateSnapshotMeta().Lineage
 
 	// add a state with a key that matches an existing environment dir name
 	client.path = b.workspaceKeyPrefix + "/s2/"
-	stateMgr.WriteState(states.NewState())
+	if err := stateMgr.WriteState(states.NewState()); err != nil {
+		t.Fatal(err)
+	}
 	if err := stateMgr.PersistState(nil); err != nil {
 		t.Fatal(err)
 	}
diff --git a/internal/backend/remote-state/s3/testing.go b/internal/backend/remote-state/s3/testing.go
index cd519a26c2..7cade2bc57 100644
--- a/internal/backend/remote-state/s3/testing.go
+++ b/internal/backend/remote-state/s3/testing.go
@@ -18,11 +18,7 @@ func diagnosticComparer(l, r tfdiags.Diagnostic) bool {
 	if len(lp) != len(rp) {
 		return false
 	}
-	if !lp.Equals(rp) {
-		return false
-	}
-
-	return true
+	return lp.Equals(rp)
 }
 
 // diagnosticSummaryComparer is a Comparer function for use with cmp.Diff to compare
@@ -34,9 +30,5 @@ func diagnosticSummaryComparer(l, r tfdiags.Diagnostic) bool {
 
 	ld := l.Description()
 	rd := r.Description()
-	if ld.Summary != rd.Summary {
-		return false
-	}
-
-	return true
+	return ld.Summary == rd.Summary
 }