CyberCoveLLC/threshold
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Linter fixes PR 3 (#4415)

Browse Source 
* Linter fixes

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

---------

Co-authored-by: Damian Debkowski <damian.debkowski@hashicorp.com>
This commit is contained in:
Jeff MitchellandDamian Debkowski authored and GitHub committed 2024-02-16 08:30:16 -05:00
1 parent e95eda7ca2
commit 35cef97bd4
119 files changed
+365 -300
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

internal/clientcache/cmd/daemon/logfile_test.go
+9 -6
View File
@@ -98,8 +98,9 @@ func TestRotation(t *testing.T) {
// write 1 mb and see it all contained in a single log file
toWrite := make([]byte, 1024)
for i := 0; i < 1024; i++ {
rand.Read(toWrite)
_, err := l.Write(toWrite)
_, err := rand.Read(toWrite)
require.NoError(t, err)
_, err = l.Write(toWrite)
require.NoError(t, err)
}
ret, err := os.ReadDir(dir)
@@ -121,8 +122,9 @@ func TestRotation(t *testing.T) {
// write another 1 mb and see a third log file is created
for i := 0; i < 1024; i++ {
rand.Read(toWrite)
_, err := l.Write(toWrite)
_, err := rand.Read(toWrite)
require.NoError(t, err)
_, err = l.Write(toWrite)
require.NoError(t, err)
}
ret, err = os.ReadDir(dir)
@@ -131,8 +133,9 @@ func TestRotation(t *testing.T) {
// and a 4th (3 backups plus the cache.log file)
for i := 0; i < 1024; i++ {
rand.Read(toWrite)
_, err := l.Write(toWrite)
_, err := rand.Read(toWrite)
require.NoError(t, err)
_, err = l.Write(toWrite)
require.NoError(t, err)
}
internal/clientcache/cmd/daemon/pidfile_nonwindows.go
+1 -1
View File
@@ -45,7 +45,7 @@ func writePidFile(ctx context.Context, pidFile string) (pidCleanup, error) {
if err := l.Lock(); err != nil {
return closeAndDeleteFileFn, errors.Wrap(ctx, err, op)
}
// Now that we have aquired the lock and verified we own the pid file
// Now that we have acquired the lock and verified we own the pid file
// we can remove it always when cleaning up.
unlockAndCleanFn := func() error {
return l.Remove()
internal/clientcache/internal/cache/refresh.go
Vendored
+2 -2
View File
@@ -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
Vendored
+4 -4
View File
@@ -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
Vendored
+5 -2
View File
@@ -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
Vendored
+8 -4
View File
@@ -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
Vendored
+1 -1
View File
@@ -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
Vendored
+4 -2
View File
@@ -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
Vendored
+1 -1
View File
@@ -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",
internal/clientcache/internal/client/client_test.go
+1
View File
@@ -82,6 +82,7 @@ func TestClient(t *testing.T) {
r, err := c.Get(ctx, "/unknown/path", nil)
assert.NoError(t, err)
assert.NotNil(t, r)
r.HttpResponse().Body.Close()
assert.Equal(t, http.StatusNotFound, r.HttpResponse().StatusCode)
})
internal/clientcache/internal/daemon/server.go
+4 -2
View File
@@ -86,7 +86,7 @@ type Config struct {
// search query to trigger an inline refresh.
MaxSearchStaleness time.Duration
// The maximum amount of time a refresh should block a search request from
// completeing before it times out.
// completing before it times out.
MaxSearchRefreshTimeout time.Duration
}
@@ -176,7 +176,9 @@ func defaultBoundaryTokenReader(ctx context.Context, cp ClientProvider) (cache.B
if err != nil {
return nil, err
}
c.SetAddr(addr)
if err := c.SetAddr(addr); err != nil {
return nil, err
}
c.SetToken(tok)
atClient := authtokens.NewClient(c)
internal/clientcache/internal/daemon/status_handler.go
+5 -2
View File
@@ -49,7 +49,7 @@ type BoundaryStatus struct {
Address string `json:"address,omitempty"`
// Whether the controller responses are supported by the cache
CacheSupport string `json:"cache_support,omitempty"`
// How long ago the Boundary instance was checked for cache compatability
// How long ago the Boundary instance was checked for cache compatibility
LastSupportCheck time.Duration `json:"last_support_check,omitempty"`
}
@@ -112,7 +112,10 @@ func newStatusHandlerFunc(ctx context.Context, repo *cache.Repository, socketAdd
return
}
w.Header().Set("Content-Type", "application/json")
w.Write(j)
if _, err := w.Write(j); err != nil {
writeError(w, err.Error(), http.StatusInternalServerError)
return
}
}, nil
}