Skip to content

feat(s3): add missing storage classes and API cleanups #2834

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 13, 2019
Merged

feat(s3): add missing storage classes and API cleanups #2834

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ab08dcb
feat(s3): add missing storage classes and API cleanups
Jun 12, 2019
2b93749
Merge remote-tracking branch 'origin/master' into benisrae/s3
Jun 12, 2019
d821e54
make readonly
Jun 12, 2019
f4b5017
do not emit empty arrays
Jun 13, 2019
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
Prev Previous commit
do not emit empty arrays
  • Loading branch information
Elad Ben-Israel committed Jun 13, 2019
commit f4b50173fbb8949e2e6cf5c204c17c931f167127
12 changes: 10 additions & 2 deletions packages/@aws-cdk/aws-s3/lib/bucket.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1067,13 +1067,13 @@ export class Bucket extends BucketBase {
expirationInDays: rule.expirationInDays,
id: rule.id,
noncurrentVersionExpirationInDays: rule.noncurrentVersionExpirationInDays,
noncurrentVersionTransitions: (rule.noncurrentVersionTransitions || []).map(t => ({
noncurrentVersionTransitions: mapOrUndefined(rule.noncurrentVersionTransitions, t => ({
storageClass: t.storageClass.value,
transitionInDays: t.transitionInDays
})),
prefix: rule.prefix,
status: enabled ? 'Enabled' : 'Disabled',
transitions: (rule.transitions || []).map(t => ({
transitions: mapOrUndefined(rule.transitions, t => ({
storageClass: t.storageClass.value,
transitionDate: t.transitionDate,
transitionInDays: t.transitionInDays
Expand Down Expand Up @@ -1287,3 +1287,11 @@ export interface OnCloudTrailBucketEventOptions extends events.OnEventOptions {
*/
readonly paths?: string[];
}

function mapOrUndefined<T, U>(list: T[] | undefined, callback: (element: T) => U): U[] | undefined {
if (!list || list.length === 0) {
return undefined;
}

return list.map(callback);
}