From a40483eee529d84f6c1f62a42454e8a4b801b41a Mon Sep 17 00:00:00 2001 From: Johannes Fleck Date: Wed, 18 Nov 2026 14:34:11 +0100 Subject: [PATCH 1/2] fix(storage): Show lifecycle rule filter conditions in bucket details The bucket details modal checked the S3 lifecycle filter for lowercase `prefix` and `and` keys, but the AWS SDK filter uses capitalised keys, so every non-empty filter was rendered as raw JSON. Map the SDK filter server-side into a typed `LifecycleFilter` (prefix, tags, object size bounds), merging single-condition and `And` filters and honouring the deprecated rule-level `Prefix`. The modal renders one label per condition. --- e2e/storage/details.spec.ts | 53 +++++++++++++++++++ messages/de.json | 4 ++ messages/en.json | 4 ++ .../modals/details/BucketDetails.svelte | 48 +++++++++++------ .../storage/s3-provider-bucket-info.test.ts | 52 ++++++++++++++++++ src/lib/server/storage/s3-provider.ts | 32 +++++++++-- src/lib/storage/details-types.ts | 11 +++- .../(app)/api/storage/buckets/server.test.ts | 2 +- 8 files changed, 185 insertions(+), 21 deletions(-) diff --git a/e2e/storage/details.spec.ts b/e2e/storage/details.spec.ts index fcec5179..0546a87e 100644 --- a/e2e/storage/details.spec.ts +++ b/e2e/storage/details.spec.ts @@ -226,4 +226,57 @@ test.describe('Storage S3 — Details Modal', () => { await expect(modal.getByText('Disabled')).toHaveCount(0); await expect(modal.getByText('No lifecycle rules')).toBeVisible(); }); + + test('shows lifecycle rule filter conditions', async ({ page }) => { + const credentials = requireGarageCredentials(); + const bucket = credentials.bucket; + const rule = (id: string, filter: object) => ({ + id, + status: 'Enabled', + filter: { tags: [], ...filter }, + transitions: [], + expirations: [{ days: 30 }], + noncurrentVersionTransitions: [], + noncurrentVersionExpirations: [], + abortIncompleteMultipartUploads: [] + }); + + await page.route( + (url) => + url.pathname === '/api/storage/buckets' && url.searchParams.get('details') === 'true', + (route) => + route.fulfill({ + json: { + name: bucket, + versioning: 'Enabled', + lifecycleRules: [ + rule('prefix-only', { prefix: 'logs/' }), + rule('combined', { + prefix: 'tmp/', + tags: [{ key: 'team', value: 'data' }], + objectSizeGreaterThan: 1_000_000 + }), + rule('everything', {}) + ], + tags: {}, + acl: null + } + }) + ); + + await connectToStorage(page, credentials); + await expect(page).toHaveURL('/storage'); + + const sidebar = page.getByRole('navigation', { name: 'Buckets' }); + await sidebar.getByText(bucket).click({ button: 'right' }); + await page.getByRole('menuitem', { name: 'Details' }).click(); + + const modal = page.getByRole('dialog'); + await expect(modal.getByText('Prefix: logs/')).toBeVisible(); + await expect(modal.getByText('Prefix: tmp/')).toBeVisible(); + await expect(modal.getByText('Tag: team = data')).toBeVisible(); + await expect(modal.getByText('Size > 1 MB')).toBeVisible(); + await expect(modal.getByText('All objects')).toHaveCount(1); + await expect(modal.getByText(/[{}]/)).toHaveCount(0); + }); }); diff --git a/messages/de.json b/messages/de.json index 342bd668..eb9a6f27 100644 --- a/messages/de.json +++ b/messages/de.json @@ -657,6 +657,10 @@ "storage_details_lifecycle_noncurrent_transition": "Übergang inakt. Versionen", "storage_details_lifecycle_transition_to": "→ {storageClass}", "storage_details_lifecycle_prefix_filter": "Präfix: {prefix}", + "storage_details_lifecycle_filter_and": "und", + "storage_details_lifecycle_tag_filter": "Tag: {key} = {value}", + "storage_details_lifecycle_size_greater_filter": "Größe > {size}", + "storage_details_lifecycle_size_less_filter": "Größe < {size}", "storage_details_lifecycle_all_objects": "Alle Objekte", "storage_details_lifecycle_no_rules": "Keine Lebenszyklus-Regeln konfiguriert", "storage_details_tags": "Tags", diff --git a/messages/en.json b/messages/en.json index 31485b93..573a3397 100644 --- a/messages/en.json +++ b/messages/en.json @@ -657,6 +657,10 @@ "storage_details_lifecycle_noncurrent_transition": "Noncurrent transition", "storage_details_lifecycle_transition_to": "→ {storageClass}", "storage_details_lifecycle_prefix_filter": "Prefix: {prefix}", + "storage_details_lifecycle_filter_and": "and", + "storage_details_lifecycle_tag_filter": "Tag: {key} = {value}", + "storage_details_lifecycle_size_greater_filter": "Size > {size}", + "storage_details_lifecycle_size_less_filter": "Size < {size}", "storage_details_lifecycle_all_objects": "All objects", "storage_details_lifecycle_no_rules": "No lifecycle rules configured", "storage_details_tags": "Tags", diff --git a/src/lib/components/storage/modals/details/BucketDetails.svelte b/src/lib/components/storage/modals/details/BucketDetails.svelte index fed13b19..676b9805 100644 --- a/src/lib/components/storage/modals/details/BucketDetails.svelte +++ b/src/lib/components/storage/modals/details/BucketDetails.svelte @@ -6,7 +6,11 @@ import IconKey from 'virtual:icons/material-symbols/key'; import { getStorageState } from '$lib/storage/context.js'; import { getDetailsErrorMessage } from '$lib/storage/errors.js'; - import type { BucketDetails as BucketDetailsType } from '$lib/storage/details-types.js'; + import type { + BucketDetails as BucketDetailsType, + LifecycleFilter + } from '$lib/storage/details-types.js'; + import { formatFileSize } from '$lib/storage/utils.js'; interface Props { bucket: string; @@ -16,6 +20,29 @@ const storage = getStorageState(); + /** One label per filter condition; S3 requires all of them to match. */ + function lifecycleFilterConditions(filter: LifecycleFilter): string[] { + const size = (bytes: number) => formatFileSize(bytes, undefined, {}); + return [ + ...(filter.prefix + ? [m.storage_details_lifecycle_prefix_filter({ prefix: filter.prefix })] + : []), + ...filter.tags.map((t) => + m.storage_details_lifecycle_tag_filter({ key: t.key, value: t.value }) + ), + ...(filter.objectSizeGreaterThan !== undefined + ? [ + m.storage_details_lifecycle_size_greater_filter({ + size: size(filter.objectSizeGreaterThan) + }) + ] + : []), + ...(filter.objectSizeLessThan !== undefined + ? [m.storage_details_lifecycle_size_less_filter({ size: size(filter.objectSizeLessThan) })] + : []) + ]; + } + let loading = $state(true); let error = $state(null); let details = $state(null); @@ -163,25 +190,14 @@
{m.storage_details_lifecycle_filter()}: - {#if rule.filter && typeof rule.filter === 'object' && 'prefix' in (rule.filter as Record) && (rule.filter as Record).prefix} - - {m.storage_details_lifecycle_prefix_filter({ - prefix: String((rule.filter as Record).prefix) - })} - - {:else if rule.filter && typeof rule.filter === 'object' && 'and' in (rule.filter as Record)} - - AND ({(rule.filter as Record).and as string}) - - {:else if rule.filter && typeof rule.filter === 'object' && Object.keys(rule.filter).length > 0} - - {JSON.stringify(rule.filter)} - + {#each lifecycleFilterConditions(rule.filter) as condition, i (i)} + {#if i > 0}{m.storage_details_lifecycle_filter_and()}{/if} + {condition} {:else} {m.storage_details_lifecycle_all_objects()} - {/if} + {/each}
{#if rule.transitions.length > 0} diff --git a/src/lib/server/storage/s3-provider-bucket-info.test.ts b/src/lib/server/storage/s3-provider-bucket-info.test.ts index c0742d1c..3bc5b9d1 100644 --- a/src/lib/server/storage/s3-provider-bucket-info.test.ts +++ b/src/lib/server/storage/s3-provider-bucket-info.test.ts @@ -82,6 +82,58 @@ describe('S3StorageProvider.getBucketLifecycleRules', () => { ]); }); + it.each([ + ['no filter', {}, { prefix: undefined, tags: [] }], + ['an empty filter', { Filter: {} }, { prefix: undefined, tags: [] }], + ['an empty prefix', { Filter: { Prefix: '' } }, { prefix: undefined, tags: [] }], + ['a prefix', { Filter: { Prefix: 'logs/' } }, { prefix: 'logs/', tags: [] }], + ['a legacy rule prefix', { Prefix: 'old/' }, { prefix: 'old/', tags: [] }], + [ + 'a single tag', + { Filter: { Tag: { Key: 'team', Value: 'data' } } }, + { prefix: undefined, tags: [{ key: 'team', value: 'data' }] } + ], + [ + 'a size bound', + { Filter: { ObjectSizeGreaterThan: 1024 } }, + { prefix: undefined, tags: [], objectSizeGreaterThan: 1024 } + ], + [ + 'an And filter', + { + Filter: { + And: { + Prefix: 'tmp/', + Tags: [ + { Key: 'a', Value: '1' }, + { Key: 'b', Value: '2' } + ], + ObjectSizeGreaterThan: 10, + ObjectSizeLessThan: 100 + } + } + }, + { + prefix: 'tmp/', + tags: [ + { key: 'a', value: '1' }, + { key: 'b', value: '2' } + ], + objectSizeGreaterThan: 10, + objectSizeLessThan: 100 + } + ] + ])('maps a rule with %s', async (_name, rule, filter) => { + const { provider, send } = makeProvider(); + send.mockResolvedValue({ Rules: [{ ID: 'r', Status: 'Enabled', ...rule }] }); + const rules = await provider.getBucketLifecycleRules(); + expect(rules?.[0].filter).toEqual({ + objectSizeGreaterThan: undefined, + objectSizeLessThan: undefined, + ...filter + }); + }); + it('returns an empty list when no lifecycle configuration exists', async () => { const { provider, send } = makeProvider(); send.mockRejectedValue(makeS3Error('NoSuchLifecycleConfiguration', 404)); diff --git a/src/lib/server/storage/s3-provider.ts b/src/lib/server/storage/s3-provider.ts index 631f2eb4..f54244de 100644 --- a/src/lib/server/storage/s3-provider.ts +++ b/src/lib/server/storage/s3-provider.ts @@ -17,7 +17,8 @@ import { UploadPartCopyCommand, CompleteMultipartUploadCommand, AbortMultipartUploadCommand, - type ListObjectsV2CommandOutput + type ListObjectsV2CommandOutput, + type LifecycleRule as S3LifecycleRule } from '@aws-sdk/client-s3'; import { Upload } from '@aws-sdk/lib-storage'; import { error } from '@sveltejs/kit'; @@ -37,7 +38,12 @@ import type { StorageMetadata, SearchResultItem } from '$lib/storage/types.js'; -import type { LifecycleRule, BucketAcl, BucketVersioning } from '$lib/storage/details-types.js'; +import type { + LifecycleFilter, + LifecycleRule, + BucketAcl, + BucketVersioning +} from '$lib/storage/details-types.js'; import { logger } from '$lib/server/logging'; import { createS3Client } from './s3-client.js'; import { mapS3ErrorToHttp } from './s3-errors.js'; @@ -114,6 +120,26 @@ async function withS3Errors( } } +/** + * Flatten an S3 lifecycle filter into its conditions. S3 allows a single condition or an `And` + * of several; both mean all conditions must match, so they are merged. Rules from the deprecated + * schema carry their prefix on the rule itself instead of in `Filter`. + */ +function mapLifecycleFilter(rule: S3LifecycleRule): LifecycleFilter { + const filter = rule.Filter ?? {}; + const and = filter.And ?? {}; + const tags = [...(filter.Tag ? [filter.Tag] : []), ...(and.Tags ?? [])].map((t) => ({ + key: t.Key ?? '', + value: t.Value ?? '' + })); + return { + prefix: filter.Prefix || and.Prefix || rule.Prefix || undefined, + tags, + objectSizeGreaterThan: filter.ObjectSizeGreaterThan ?? and.ObjectSizeGreaterThan, + objectSizeLessThan: filter.ObjectSizeLessThan ?? and.ObjectSizeLessThan + }; +} + export class S3StorageProvider implements StorageProvider { private readonly client: S3Client; private readonly bucket: string; @@ -515,7 +541,7 @@ export class S3StorageProvider implements StorageProvider { return { id: rule.ID ?? '', status: rule.Status === 'Enabled' ? 'Enabled' : 'Disabled', - filter: (rule.Filter as Record) ?? {}, + filter: mapLifecycleFilter(rule), transitions: (rule.Transitions ?? []).map((t) => ({ days: t.Days ?? 0, storageClass: t.StorageClass ?? '' diff --git a/src/lib/storage/details-types.ts b/src/lib/storage/details-types.ts index dc632a6c..96573d39 100644 --- a/src/lib/storage/details-types.ts +++ b/src/lib/storage/details-types.ts @@ -92,11 +92,20 @@ interface DirectorySizeError { export type DirectorySizeEvent = DirectorySizeProgress | DirectorySizeResult | DirectorySizeError; +/** Objects a lifecycle rule applies to. All set conditions must match; an + * empty filter applies to all objects in the bucket. */ +export interface LifecycleFilter { + prefix?: string; + tags: Array<{ key: string; value: string }>; + objectSizeGreaterThan?: number; + objectSizeLessThan?: number; +} + /** Lifecycle rule from S3 bucket lifecycle configuration. */ export interface LifecycleRule { id: string; status: 'Enabled' | 'Disabled'; - filter: Record; + filter: LifecycleFilter; transitions: Array<{ days: number; storageClass: string }>; expirations: Array<{ days?: number; date?: string; expiredObjectDeleteMarker?: boolean }>; noncurrentVersionTransitions: Array<{ noncurrentDays: number; storageClass: string }>; diff --git a/src/routes/(app)/api/storage/buckets/server.test.ts b/src/routes/(app)/api/storage/buckets/server.test.ts index eb4a20aa..3a7ab172 100644 --- a/src/routes/(app)/api/storage/buckets/server.test.ts +++ b/src/routes/(app)/api/storage/buckets/server.test.ts @@ -168,7 +168,7 @@ describe('GET /api/storage/buckets', () => { { id: 'rule-1', status: 'Enabled', - filter: { prefix: 'logs/' }, + filter: { prefix: 'logs/', tags: [] }, transitions: [], expirations: [{ days: 30 }], noncurrentVersionTransitions: [], From e5602ad5e43c88263f9554a0846d5987df406d2c Mon Sep 17 00:00:00 2001 From: Johannes Fleck Date: Wed, 18 Nov 2026 14:38:45 +0100 Subject: [PATCH 2/2] fix(storage): Separate lifecycle filter conditions with a space Svelte trims whitespace at each iteration's edges, so combined conditions rendered as "Prefix: tmp/and Tag: ...". Also drop a no-op undefined spread from the filter mapping test. --- e2e/storage/details.spec.ts | 1 + .../components/storage/modals/details/BucketDetails.svelte | 3 ++- src/lib/server/storage/s3-provider-bucket-info.test.ts | 6 +----- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/e2e/storage/details.spec.ts b/e2e/storage/details.spec.ts index 0546a87e..15df609b 100644 --- a/e2e/storage/details.spec.ts +++ b/e2e/storage/details.spec.ts @@ -276,6 +276,7 @@ test.describe('Storage S3 — Details Modal', () => { await expect(modal.getByText('Prefix: tmp/')).toBeVisible(); await expect(modal.getByText('Tag: team = data')).toBeVisible(); await expect(modal.getByText('Size > 1 MB')).toBeVisible(); + await expect(modal).toContainText('Prefix: tmp/ and Tag: team = data and Size > 1 MB'); await expect(modal.getByText('All objects')).toHaveCount(1); await expect(modal.getByText(/[{}]/)).toHaveCount(0); }); diff --git a/src/lib/components/storage/modals/details/BucketDetails.svelte b/src/lib/components/storage/modals/details/BucketDetails.svelte index 676b9805..eb7ccbef 100644 --- a/src/lib/components/storage/modals/details/BucketDetails.svelte +++ b/src/lib/components/storage/modals/details/BucketDetails.svelte @@ -191,7 +191,8 @@
{m.storage_details_lifecycle_filter()}: {#each lifecycleFilterConditions(rule.filter) as condition, i (i)} - {#if i > 0}{m.storage_details_lifecycle_filter_and()}{/if} + + {#if i > 0} {m.storage_details_lifecycle_filter_and()}{/if} {condition} {:else} { const { provider, send } = makeProvider(); send.mockResolvedValue({ Rules: [{ ID: 'r', Status: 'Enabled', ...rule }] }); const rules = await provider.getBucketLifecycleRules(); - expect(rules?.[0].filter).toEqual({ - objectSizeGreaterThan: undefined, - objectSizeLessThan: undefined, - ...filter - }); + expect(rules?.[0].filter).toEqual(filter); }); it('returns an empty list when no lifecycle configuration exists', async () => {