chore: s3 config cleanup

Author: denis256

internal/gcphelper/config.go

@@ -137,7 +137,7 @@ func createGCPCredentialsFromGoogleCredentialsEnv(ctx context.Context, opts *opt
 	}
 
 	if err := json.Unmarshal([]byte(contents), &account); err != nil {
-		return nil, errors.Errorf("Error parsing GCP credentials.")
+		return nil, errors.Errorf("Error parsing GCP credentials: %w", err)
 	}
 
 	conf := jwt.Config{

internal/github/client_test.go

@@ -8,6 +8,7 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
+	"sync/atomic"
 	"testing"
 	"time"
 
@@ -155,7 +156,7 @@ func TestGetLatestReleaseInvalidRepository(t *testing.T) {
 	for _, repo := range testCases {
 		t.Run(fmt.Sprintf("repo=%s", repo), func(tt *testing.T) {
 			_, err := client.GetLatestRelease(tt.Context(), repo)
-			require.Error(t, err)
+			require.Error(tt, err)
 		})
 	}
 }
@@ -200,10 +201,10 @@ func TestGetLatestReleaseEmptyTag(t *testing.T) {
 func TestGetLatestReleaseCaching(t *testing.T) {
 	t.Parallel()
 
-	callCount := 0
+	var callCount atomic.Int32
 	// Create a mock server that tracks how many times it's called
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		callCount++
+		callCount.Add(1)
 		w.Header().Set("Content-Type", "application/json")
 		response := `{"tag_name": "v1.0.0"}`
 		_, err := fmt.Fprint(w, response)
@@ -218,14 +219,14 @@ func TestGetLatestReleaseCaching(t *testing.T) {
 	require.NoError(t, err)
 
 	assert.Equal(t, "v1.0.0", tag1)
-	assert.Equal(t, 1, callCount)
+	assert.Equal(t, int32(1), callCount.Load())
 
 	// Second call should use cache
 	tag2, err := client.GetLatestReleaseTag(t.Context(), "owner/repo")
 	require.NoError(t, err)
 
 	assert.Equal(t, "v1.0.0", tag2)
-	assert.Equal(t, 1, callCount)
+	assert.Equal(t, int32(1), callCount.Load())
 }
 
 // Tests for GitHubReleasesDownloadClient

internal/remotestate/backend/s3/client.go

@@ -735,16 +735,16 @@ func isBucketAlreadyOwnedByYouError(err error) bool {
 func isBucketErrorRetriable(l log.Logger, err error) bool {
 	var apiErr smithy.APIError
 	if errors.As(err, &apiErr) {
-		unrecoverable := apiErr.ErrorCode() == "InternalError" || apiErr.ErrorCode() == "OperationAborted" || apiErr.ErrorCode() == "InvalidParameter"
+		retriable := apiErr.ErrorCode() == "InternalError" || apiErr.ErrorCode() == "OperationAborted" || apiErr.ErrorCode() == "InvalidParameter"
 
-		if !unrecoverable {
+		if retriable {
 			l.Debugf(
 				"Encountered AWS API error '%s' during bucket creation. Assuming it's retriable and will retry.",
 				apiErr.ErrorCode(),
 			)
 		}
 
-		return unrecoverable
+		return retriable
 	}
 
 	l.Debugf(