Unlock in defer

Author: JoannaaKL

pkg/lockdown/lockdown.go

@@ -102,31 +102,28 @@ func (c *RepoAccessCache) GetRepoAccessInfo(ctx context.Context, username, owner
 	key := cacheKey(owner, repo)
 	userKey := strings.ToLower(username)
 	c.mu.Lock()
+	defer c.mu.Unlock()
 	entry := c.ensureEntry(key)
 	if entry.ready {
 		if cachedHasPush, known := entry.knownUsers[userKey]; known {
 			entry.scheduleExpiry(c, key)
 			c.logDebug("repo access cache hit", "owner", owner, "repo", repo, "user", username)
 			cachedPrivate := entry.isPrivate
-			c.mu.Unlock()
 			return cachedPrivate, cachedHasPush, nil
 		}
 	}
-	c.mu.Unlock()
 	c.logDebug("repo access cache miss", "owner", owner, "repo", repo, "user", username)
 
 	isPrivate, hasPush, err := c.queryRepoAccessInfo(ctx, username, owner, repo)
 	if err != nil {
 		return false, false, err
 	}
 
-	c.mu.Lock()
 	entry = c.ensureEntry(key)
 	entry.ready = true
 	entry.isPrivate = isPrivate
 	entry.knownUsers[userKey] = hasPush
 	entry.scheduleExpiry(c, key)
-	c.mu.Unlock()
 
 	return isPrivate, hasPush, nil
 }

pkg/lockdown/lockdown_test.go

@@ -98,10 +98,9 @@ func requireAccess(ctx context.Context, t *testing.T, cache *RepoAccessCache) {
 
 func TestRepoAccessCacheEvictsAfterTTL(t *testing.T) {
 	t.Parallel()
+	ctx := t.Context()
 
 	cache, transport := newMockRepoAccessCache(t, 5*time.Millisecond)
-	ctx := context.Background()
-
 	requireAccess(ctx, t, cache)
 	requireAccess(ctx, t, cache)
 	require.EqualValues(t, 1, transport.CallCount())
@@ -113,10 +112,10 @@ func TestRepoAccessCacheEvictsAfterTTL(t *testing.T) {
 }
 
 func TestRepoAccessCacheTTLDisabled(t *testing.T) {
+	ctx := t.Context()
 	t.Parallel()
 
 	cache, transport := newMockRepoAccessCache(t, 0)
-	ctx := context.Background()
 
 	requireAccess(ctx, t, cache)
 	requireAccess(ctx, t, cache)
@@ -129,10 +128,10 @@ func TestRepoAccessCacheTTLDisabled(t *testing.T) {
 }
 
 func TestRepoAccessCacheSetTTLReschedulesExistingEntry(t *testing.T) {
+	ctx := t.Context()
 	t.Parallel()
 
 	cache, transport := newMockRepoAccessCache(t, 0)
-	ctx := context.Background()
 
 	requireAccess(ctx, t, cache)
 	require.EqualValues(t, 1, transport.CallCount())