Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions docs/screenshots/lifecycle-rule-desktop.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions docs/screenshots/lifecycle-rule-mobile.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
43 changes: 31 additions & 12 deletions lib/lifecycle-display.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,14 @@ export interface LifecycleRule {
Expiration?: {
Days?: number
Date?: string | Date
StorageClass?: string
ExpiredObjectDeleteMarker?: boolean
}
NoncurrentVersionExpiration?: { NoncurrentDays?: number }
Transitions?: Array<{ Days?: number; Date?: string | Date; StorageClass?: string }>
NoncurrentVersionTransitions?: Array<{
NoncurrentVersionExpiration?: {
NoncurrentDays?: number
StorageClass?: string
}>
NewerNoncurrentVersions?: number
}
Transitions?: Array<{ Days?: number; Date?: string | Date; StorageClass?: string }>
NoncurrentVersionTransitions?: Array<{ NoncurrentDays?: number; StorageClass?: string }>
}

export interface LifecycleAction {
Expand All @@ -27,27 +26,46 @@ export interface LifecycleAction {
date?: string | Date
tier?: string
deleteMarker?: boolean
newerNoncurrentVersions?: number
}

function hasExpirationAction(expiration?: LifecycleRule["Expiration"]) {
return (
expiration?.Days !== undefined ||
expiration?.Date !== undefined ||
expiration?.ExpiredObjectDeleteMarker !== undefined
)
}

function hasNoncurrentExpirationAction(expiration?: LifecycleRule["NoncurrentVersionExpiration"]) {
return (
expiration?.NoncurrentDays !== undefined ||
(expiration?.NewerNoncurrentVersions !== undefined && expiration.NewerNoncurrentVersions > 0)
)
}

export function getLifecycleActions(rule: LifecycleRule): LifecycleAction[] {
const actions: LifecycleAction[] = []
if (rule.Expiration) {
if (hasExpirationAction(rule.Expiration)) {
actions.push({
type: "Expire",
version: "Current Version",
days: rule.Expiration.Days,
date: rule.Expiration.Date,
deleteMarker: rule.Expiration.ExpiredObjectDeleteMarker,
days: rule.Expiration?.Days,
date: rule.Expiration?.Date,
deleteMarker: rule.Expiration?.ExpiredObjectDeleteMarker,
})
}
if (rule.NoncurrentVersionExpiration) {
if (hasNoncurrentExpirationAction(rule.NoncurrentVersionExpiration)) {
actions.push({
type: "Expire",
version: "Non-current Version",
days: rule.NoncurrentVersionExpiration.NoncurrentDays,
days: rule.NoncurrentVersionExpiration?.NoncurrentDays,
newerNoncurrentVersions: rule.NoncurrentVersionExpiration?.NewerNoncurrentVersions,
})
}
for (const transition of rule.Transitions ?? []) {
if (transition.Days === undefined && transition.Date === undefined && transition.StorageClass === undefined)
continue
actions.push({
type: "Transition",
version: "Current Version",
Expand All @@ -57,6 +75,7 @@ export function getLifecycleActions(rule: LifecycleRule): LifecycleAction[] {
})
}
for (const transition of rule.NoncurrentVersionTransitions ?? []) {
if (transition.NoncurrentDays === undefined && transition.StorageClass === undefined) continue
actions.push({
type: "Transition",
version: "Non-current Version",
Expand Down
18 changes: 18 additions & 0 deletions tests/lib/lifecycle-display.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,24 @@ test("mixed expiration rules retain both version labels and their own days (rust
}
})

test("empty expiration containers do not create fake actions", () => {
assert.deepEqual(getLifecycleActions({ Expiration: {} }), [])
assert.deepEqual(getLifecycleActions({ NoncurrentVersionExpiration: {} }), [])
assert.deepEqual(getLifecycleActions({ Transitions: [{}], NoncurrentVersionTransitions: [{}] }), [])
})

test("explicit delete-marker false remains an explicit action setting", () => {
assert.deepEqual(getLifecycleActions({ Expiration: { ExpiredObjectDeleteMarker: false } }), [
{
type: "Expire",
version: "Current Version",
days: undefined,
date: undefined,
deleteMarker: false,
},
])
})

test("each transition keeps its version, tier and zero-day schedule", () => {
assert.deepEqual(
getLifecycleActions({
Expand Down
Loading