Skip to content
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

Jump to bottom

fix: update BucketInfo translation code to properly handle lifecycle rules #852

Merged
merged 4 commits into from Jun 1, 2021
Merged

fix: update BucketInfo translation code to properly handle lifecycle rules #852

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
76a82cc
fix: update BucketInfo translation code to properly handle lifecycle …
BenWhitehead May 27, 2021
13f79a5
update handling of rules to ensure removal of rules is correctly acco…
BenWhitehead May 27, 2021
c39b188
bow to the all mighty formatter *bow*
BenWhitehead May 27, 2021
38b2abc
add comment
BenWhitehead Jun 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java
View file
Open in desktop
Expand Up @@ -1843,6 +1843,14 @@ public ObjectAccessControl apply(Acl acl) {
if (deleteRules != null || lifecycleRules != null) {
Lifecycle lifecycle = new Lifecycle();

// Here we determine if we need to "clear" any defined Lifecycle rules by explicitly setting
// the Rule list of lifecycle to the empty list.
// In order for us to clear the rules, one of the three following must be true:
// 1. deleteRules is null while lifecycleRules is non-null and empty
// 2. lifecycleRules is null while deleteRules is non-null and empty
// 3. lifecycleRules is non-null and empty while deleteRules is non-null and empty
// If none of the above three is true, we will interpret as the Lifecycle rules being
// updated to the defined set of DeleteRule and LifecycleRule.
if ((deleteRules == null && lifecycleRules.isEmpty())
|| (lifecycleRules == null && deleteRules.isEmpty())
BenWhitehead marked this conversation as resolved.
Show resolved Hide resolved
|| (deleteRules != null && deleteRules.isEmpty() && lifecycleRules.isEmpty())) {
BenWhitehead marked this conversation as resolved.
Show resolved Hide resolved
Expand Down