Skip to content

Commit 3271f85

Browse files
committed
style(auth): satisfy linter in token caching code
Wraps the store error in `getStoredToken` (wrapcheck), uses a static error in the tests (err113), and adds the blank lines wsl_v5 expects.
1 parent 1c8b1ec commit 3271f85

2 files changed

Lines changed: 10 additions & 2 deletions

File tree

‎internal/auth/token.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ func (ts *TokenSource) getStoredToken() (Token, error) {
167167

168168
tok, err := ts.store.GetToken(ts.client, ts.email)
169169
if err != nil {
170-
return Token{}, err
170+
return Token{}, fmt.Errorf("get stored token: %w", err)
171171
}
172172

173173
ts.storedToken = tok

‎internal/auth/token_test.go‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ func TestTokenSourceUsesRotatedRefreshTokenWhenStoreUpdateFails(t *testing.T) {
111111
Email: "alice@example.com",
112112
RefreshToken: "refresh-a",
113113
},
114-
setTokenErr: errors.New("keychain unavailable"),
114+
setTokenErr: errStoreUnavailable,
115115
}
116116
ts := NewTokenSource("default", "alice@example.com", store)
117117

@@ -182,6 +182,8 @@ func TestTokenSourceReturnsCachedAccessTokenWithoutStoreRead(t *testing.T) {
182182
}
183183
}
184184

185+
var errStoreUnavailable = errors.New("keychain unavailable")
186+
185187
type countingStore struct {
186188
token Token
187189
getTokenErr error
@@ -200,6 +202,7 @@ func (s *countingStore) SetToken(client, email string, tok Token) error {
200202
return s.setTokenErr
201203
}
202204
s.token = tok
205+
203206
return nil
204207
}
205208

@@ -208,6 +211,7 @@ func (s *countingStore) GetToken(client, email string) (Token, error) {
208211
if s.getTokenErr != nil {
209212
return Token{}, s.getTokenErr
210213
}
214+
211215
return s.token, nil
212216
}
213217

@@ -265,6 +269,7 @@ func (r *tokenRefreshRecorder) handler(w http.ResponseWriter, req *http.Request)
265269
}
266270

267271
w.Header().Set("Content-Type", "application/json")
272+
268273
if err := json.NewEncoder(w).Encode(payload); err != nil {
269274
panic(fmt.Sprintf("encode token response: %v", err))
270275
}
@@ -276,6 +281,7 @@ func (r *tokenRefreshRecorder) refreshTokens() []string {
276281

277282
out := make([]string, len(r.tokens))
278283
copy(out, r.tokens)
284+
279285
return out
280286
}
281287

@@ -287,6 +293,7 @@ func withTokenEndpoint(t *testing.T, handler http.HandlerFunc) {
287293

288294
oldEndpoint := frontEndpoint
289295
frontEndpoint.TokenURL = server.URL
296+
290297
t.Cleanup(func() { frontEndpoint = oldEndpoint })
291298
}
292299

@@ -296,6 +303,7 @@ func withTestClientCredentials(t *testing.T) {
296303
home := t.TempDir()
297304
oldHome := os.Getenv("HOME")
298305
_ = os.Setenv("HOME", home)
306+
299307
t.Cleanup(func() { _ = os.Setenv("HOME", oldHome) })
300308

301309
if err := config.WriteClientCredentials("default", config.OAuthCredentials{

0 commit comments

Comments
 (0)