Skip to content

Commit 36f8d0f

Browse files
fix(server): fix redis key when trying to delete blob (#8649)
1 parent f1329c7 commit 36f8d0f

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

pkg/cache/redis.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ func (c RedisCache) PutBlob(blobID string, blobInfo types.BlobInfo) error {
142142
func (c RedisCache) DeleteBlobs(blobIDs []string) error {
143143
var errs error
144144
for _, blobID := range blobIDs {
145-
key := fmt.Sprintf("%s::%s::%s", redisPrefix, artifactBucket, blobID)
145+
key := fmt.Sprintf("%s::%s::%s", redisPrefix, blobBucket, blobID)
146146
if err := c.client.Del(context.TODO(), key).Err(); err != nil {
147147
errs = multierror.Append(errs, xerrors.Errorf("unable to delete blob %s: %w", blobID, err))
148148
}

pkg/cache/redis_test.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -523,8 +523,6 @@ func TestRedisCache_DeleteBlobs(t *testing.T) {
523523
require.NoError(t, err)
524524
defer s.Close()
525525

526-
s.Set(correctHash, "any string")
527-
528526
for _, tt := range tests {
529527
t.Run(tt.name, func(t *testing.T) {
530528
addr := s.Addr()
@@ -535,12 +533,18 @@ func TestRedisCache_DeleteBlobs(t *testing.T) {
535533
c, err := cache.NewRedisCache(fmt.Sprintf("redis://%s", addr), "", "", "", false, 0)
536534
require.NoError(t, err)
537535

536+
s.Set(tt.wantKey, "any string")
537+
538538
err = c.DeleteBlobs(tt.args.blobIDs)
539539
if tt.wantErr != "" {
540540
require.ErrorContains(t, err, tt.wantErr)
541541
return
542542
}
543543
require.NoError(t, err)
544+
545+
// Verify that the blobs are deleted
546+
got := s.Keys()
547+
assert.NotContains(t, got, tt.wantKey)
544548
})
545549
}
546550
}

0 commit comments

Comments
 (0)