Linter fixes PR 3 (#4415)

* Linter fixes

* fix(bsr): update test to register TEST protocol once

---------

Co-authored-by: Damian Debkowski <damian.debkowski@hashicorp.com>

internal/clientcache/internal/cache/refresh.go

@@ -304,14 +304,14 @@ func (r *RefreshService) RecheckCachingSupport(ctx context.Context, opt ...Optio
 
 		if err := r.repo.checkCachingTargets(ctx, u, tokens, opt...); err != nil {
 			if err == ErrRefreshNotSupported {
-				// This is expected so no need to propogate the error up
+				// This is expected so no need to propagate the error up
 				continue
 			}
 			retErr = stderrors.Join(retErr, errors.Wrap(ctx, err, op, errors.WithMsg(fmt.Sprintf("for user id %s", u.Id))))
 		}
 		if err := r.repo.checkCachingSessions(ctx, u, tokens, opt...); err != nil {
 			if err == ErrRefreshNotSupported {
-				// This is expected so no need to propogate the error up
+				// This is expected so no need to propagate the error up
 				continue
 			}
 			retErr = stderrors.Join(retErr, errors.Wrap(ctx, err, op, errors.WithMsg(fmt.Sprintf("for user id %s", u.Id))))

internal/clientcache/internal/cache/refresh_test.go

@@ -708,7 +708,7 @@ func TestRefresh(t *testing.T) {
 		assert.ElementsMatch(t, retSess[2:], cachedSessions)
 	})
 
-	t.Run("error propogates up", func(t *testing.T) {
+	t.Run("error propagates up", func(t *testing.T) {
 		s, err := db.Open(ctx)
 		require.NoError(t, err)
 		r, err := NewRepository(ctx, s, &sync.Map{}, mapBasedAuthTokenKeyringLookup(atMap), sliceBasedAuthTokenBoundaryReader(boundaryAuthTokens))
@@ -758,9 +758,9 @@ func TestRefresh(t *testing.T) {
 		require.NoError(t, err)
 		assert.Len(t, us, 1)
 
-		rs.Refresh(ctx,
+		require.NoError(t, rs.Refresh(ctx,
 			WithSessionRetrievalFunc(testStaticResourceRetrievalFunc[*sessions.Session](t, nil, nil)),
-			WithTargetRetrievalFunc(testStaticResourceRetrievalFunc[*targets.Target](t, nil, nil)))
+			WithTargetRetrievalFunc(testStaticResourceRetrievalFunc[*targets.Target](t, nil, nil))))
 
 		ps, err = r.listTokens(ctx, u)
 		require.NoError(t, err)
@@ -858,7 +858,7 @@ func TestRecheckCachingSupport(t *testing.T) {
 		assert.Empty(t, got)
 	})
 
-	t.Run("error propogates up", func(t *testing.T) {
+	t.Run("error propagates up", func(t *testing.T) {
 		s, err := db.Open(ctx)
 		require.NoError(t, err)
 		r, err := NewRepository(ctx, s, &sync.Map{}, mapBasedAuthTokenKeyringLookup(atMap), sliceBasedAuthTokenBoundaryReader(boundaryAuthTokens))

internal/clientcache/internal/cache/repository_refresh_token.go

@@ -79,7 +79,7 @@ func (r *Repository) cacheSupportState(ctx context.Context, u *user) (*cacheSupp
 }
 
 // lookupRefreshToken returns the last known valid refresh token or an empty
-// string if one is unkonwn. No error is returned if no valid refresh token is
+// string if one is unknown. No error is returned if no valid refresh token is
 // found.
 func (r *Repository) lookupRefreshToken(ctx context.Context, u *user, resourceType resourceType) (*refreshToken, error) {
 	const op = "cache.(Repsoitory).lookupRefreshToken"
@@ -198,7 +198,10 @@ func upsertRefreshToken(ctx context.Context, writer db.Writer, u *user, rt resou
 
 	switch tok {
 	case "":
-		writer.Delete(ctx, refTok)
+		_, err := writer.Delete(ctx, refTok)
+		if err != nil {
+			return errors.Wrap(ctx, err, op)
+		}
 	default:
 		onConflict := &db.OnConflict{
 			Target: db.Columns{"user_id", "resource_type"},

internal/clientcache/internal/cache/repository_refresh_token_test.go

@@ -46,10 +46,11 @@ func TestListRefreshToken(t *testing.T) {
 		require.NoError(t, r.rw.Create(ctx, known))
 
 		token := RefreshTokenValue("something")
-		r.rw.DoTx(ctx, 1, db.ExpBackoff{}, func(r db.Reader, w db.Writer) error {
+		_, err = r.rw.DoTx(ctx, 1, db.ExpBackoff{}, func(r db.Reader, w db.Writer) error {
 			require.NoError(t, upsertRefreshToken(ctx, w, known, targetResourceType, token))
 			return nil
 		})
+		require.NoError(t, err)
 
 		got, err := r.listRefreshTokens(ctx, known)
 		assert.NoError(t, err)
@@ -60,10 +61,11 @@ func TestListRefreshToken(t *testing.T) {
 		require.NoError(t, r.rw.Create(ctx, known))
 
 		token := sentinelNoRefreshToken
-		r.rw.DoTx(ctx, 1, db.ExpBackoff{}, func(r db.Reader, w db.Writer) error {
+		_, err = r.rw.DoTx(ctx, 1, db.ExpBackoff{}, func(r db.Reader, w db.Writer) error {
 			require.NoError(t, upsertRefreshToken(ctx, w, known, targetResourceType, token))
 			return nil
 		})
+		require.NoError(t, err)
 
 		got, err := r.listRefreshTokens(ctx, known)
 		assert.NoError(t, err)
@@ -74,11 +76,12 @@ func TestListRefreshToken(t *testing.T) {
 		require.NoError(t, r.rw.Create(ctx, known))
 
 		token := RefreshTokenValue("something")
-		r.rw.DoTx(ctx, 1, db.ExpBackoff{}, func(r db.Reader, w db.Writer) error {
+		_, err := r.rw.DoTx(ctx, 1, db.ExpBackoff{}, func(r db.Reader, w db.Writer) error {
 			require.NoError(t, upsertRefreshToken(ctx, w, known, targetResourceType, token))
 			require.NoError(t, upsertRefreshToken(ctx, w, known, sessionResourceType, token))
 			return nil
 		})
+		require.NoError(t, err)
 
 		got, err := r.listRefreshTokens(ctx, known)
 		assert.NoError(t, err)
@@ -116,10 +119,11 @@ func TestCacheSupportState(t *testing.T) {
 
 		now := time.Now().Truncate(time.Millisecond)
 		token := sentinelNoRefreshToken
-		r.rw.DoTx(ctx, 1, db.ExpBackoff{}, func(r db.Reader, w db.Writer) error {
+		_, err = r.rw.DoTx(ctx, 1, db.ExpBackoff{}, func(r db.Reader, w db.Writer) error {
 			require.NoError(t, upsertRefreshToken(ctx, w, known, targetResourceType, token))
 			return nil
 		})
+		require.NoError(t, err)
 
 		got, err := r.listRefreshTokens(ctx, known)
 		assert.NoError(t, err)

internal/clientcache/internal/cache/repository_test.go

@@ -117,7 +117,7 @@ func TestRepository_lookupError(t *testing.T) {
 		assert.Nil(t, got)
 	})
 	t.Run("found", func(t *testing.T) {
-		r.saveError(ctx, u, sessionResourceType, testErr)
+		require.NoError(t, r.saveError(ctx, u, sessionResourceType, testErr))
 		got, err := r.lookupError(ctx, u, sessionResourceType)
 		assert.NoError(t, err)
 		assert.NotNil(t, got)

internal/clientcache/internal/cache/repository_token_test.go

@@ -758,12 +758,13 @@ func TestCleanExpiredOrOrphanedAuthTokens_Errors(t *testing.T) {
 	assert.Error(t, err)
 	assert.ErrorContains(t, err, "writer isn't part of an inflight transaction")
 
-	rw.DoTx(ctx, 1, db.ExpBackoff{}, func(_ db.Reader, writer db.Writer) error {
+	_, err = rw.DoTx(ctx, 1, db.ExpBackoff{}, func(_ db.Reader, writer db.Writer) error {
 		err := cleanExpiredOrOrphanedAuthTokens(ctx, writer, nil)
 		assert.Error(t, err)
 		assert.ErrorContains(t, err, "keyringless auth token map is nil")
 		return nil
 	})
+	require.NoError(t, err)
 }
 
 func TestUpsertUserAndAuthToken(t *testing.T) {
@@ -779,7 +780,7 @@ func TestUpsertUserAndAuthToken(t *testing.T) {
 		UserId: "u_123",
 	}
 
-	rw.DoTx(ctx, 1, db.ExpBackoff{}, func(txReader db.Reader, txWriter db.Writer) error {
+	_, err = rw.DoTx(ctx, 1, db.ExpBackoff{}, func(txReader db.Reader, txWriter db.Writer) error {
 		errorCases := []struct {
 			name          string
 			reader        db.Reader
@@ -861,4 +862,5 @@ func TestUpsertUserAndAuthToken(t *testing.T) {
 		}
 		return nil
 	})
+	require.NoError(t, err)
 }

internal/clientcache/internal/cache/search_test.go

@@ -168,7 +168,7 @@ func TestSupported(t *testing.T) {
 		assert.False(t, got)
 	})
 
-	t.Run("unkonwn", func(t *testing.T) {
+	t.Run("unknown", func(t *testing.T) {
 		at := &AuthToken{
 			Id:     "unknown",
 			UserId: "unknown",