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

Show file tree
Hide file tree
Changes from 3 commits
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
62 changes: 37 additions & 25 deletions google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java
View file
Open in desktop
Expand Up @@ -43,6 +43,7 @@
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -1838,33 +1839,44 @@ public ObjectAccessControl apply(Acl acl) {
website.setNotFoundPage(notFoundPage);
bucketPb.setWebsite(website);
}
Set<Rule> rules = new HashSet<>();
if (deleteRules != null) {
rules.addAll(
transform(
deleteRules,
new Function<DeleteRule, Rule>() {
@Override
public Rule apply(DeleteRule deleteRule) {
return deleteRule.toPb();
}
}));
}
if (lifecycleRules != null) {
rules.addAll(
transform(
lifecycleRules,
new Function<LifecycleRule, Rule>() {
@Override
public Rule apply(LifecycleRule lifecycleRule) {
return lifecycleRule.toPb();
}
}));
}

if (rules != null) {
if (deleteRules != null || lifecycleRules != null) {
Lifecycle lifecycle = new Lifecycle();
lifecycle.setRule(ImmutableList.copyOf(rules));

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
lifecycle.setRule(Collections.<Rule>emptyList());
} else {
Set<Rule> rules = new HashSet<>();
if (deleteRules != null) {
rules.addAll(
transform(
deleteRules,
new Function<DeleteRule, Rule>() {
@Override
public Rule apply(DeleteRule deleteRule) {
return deleteRule.toPb();
}
}));
}
if (lifecycleRules != null) {
rules.addAll(
transform(
lifecycleRules,
new Function<LifecycleRule, Rule>() {
@Override
public Rule apply(LifecycleRule lifecycleRule) {
return lifecycleRule.toPb();
}
}));
}

if (!rules.isEmpty()) {
lifecycle.setRule(ImmutableList.copyOf(rules));
}
}

bucketPb.setLifecycle(lifecycle);
}

Expand Down
71 changes: 71 additions & 0 deletions google-cloud-storage/src/test/java/com/google/cloud/storage/BucketInfoTest.java
View file
Open in desktop
Expand Up @@ -19,10 +19,12 @@
import static com.google.cloud.storage.Acl.Project.ProjectRole.VIEWERS;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;

import com.google.api.client.util.DateTime;
import com.google.api.services.storage.model.Bucket;
import com.google.api.services.storage.model.Bucket.Lifecycle;
import com.google.api.services.storage.model.Bucket.Lifecycle.Rule;
import com.google.cloud.storage.Acl.Project;
import com.google.cloud.storage.Acl.Role;
Expand All @@ -39,6 +41,7 @@
import com.google.cloud.storage.BucketInfo.RawDeleteRule;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
Expand Down Expand Up @@ -172,6 +175,8 @@ public class BucketInfoTest {
.setLogging(LOGGING)
.build();

private static final Lifecycle EMPTY_LIFECYCLE = lifecycle(Collections.<Rule>emptyList());

@Test
public void testToBuilder() {
compareBuckets(BUCKET_INFO, BUCKET_INFO.toBuilder().build());
Expand Down Expand Up @@ -376,4 +381,70 @@ public void testLogging() {
assertEquals("test-bucket", logging.getLogBucket());
assertEquals("test-", logging.getLogObjectPrefix());
}

@Test
public void testRuleMappingIsCorrect_noMutations() {
Bucket bucket = bi().build().toPb();
assertNull(bucket.getLifecycle());
}

@Test
public void testRuleMappingIsCorrect_deleteLifecycleRules() {
Bucket bucket = bi().deleteLifecycleRules().build().toPb();
assertEquals(EMPTY_LIFECYCLE, bucket.getLifecycle());
}

@Test
@SuppressWarnings({"deprecation"})
public void testRuleMappingIsCorrect_setDeleteRules_null() {
Bucket bucket = bi().setDeleteRules(null).build().toPb();
assertNull(bucket.getLifecycle());
}

@Test
@SuppressWarnings({"deprecation"})
public void testRuleMappingIsCorrect_setDeleteRules_empty() {
Bucket bucket = bi().setDeleteRules(Collections.<DeleteRule>emptyList()).build().toPb();
assertEquals(EMPTY_LIFECYCLE, bucket.getLifecycle());
}

@Test
public void testRuleMappingIsCorrect_setLifecycleRules_empty() {
Bucket bucket = bi().setLifecycleRules(Collections.<LifecycleRule>emptyList()).build().toPb();
assertEquals(EMPTY_LIFECYCLE, bucket.getLifecycle());
}

@Test
public void testRuleMappingIsCorrect_setLifeCycleRules_nonEmpty() {
LifecycleRule lifecycleRule =
new LifecycleRule(
LifecycleAction.newDeleteAction(), LifecycleCondition.newBuilder().setAge(10).build());
Rule lifecycleDeleteAfter10 = lifecycleRule.toPb();
Bucket bucket = bi().setLifecycleRules(ImmutableList.of(lifecycleRule)).build().toPb();
assertEquals(lifecycle(lifecycleDeleteAfter10), bucket.getLifecycle());
}

@Test
@SuppressWarnings({"deprecation"})
public void testRuleMappingIsCorrect_setDeleteRules_nonEmpty() {
DeleteRule deleteRule = DELETE_RULES.get(0);
Rule deleteRuleAge5 = deleteRule.toPb();
Bucket bucket = bi().setDeleteRules(ImmutableList.of(deleteRule)).build().toPb();
assertEquals(lifecycle(deleteRuleAge5), bucket.getLifecycle());
}

private static Lifecycle lifecycle(Rule... rules) {
return lifecycle(Arrays.asList(rules));
}

private static Lifecycle lifecycle(List<Rule> rules) {
Lifecycle emptyLifecycle = new Lifecycle();
emptyLifecycle.setRule(rules);
return emptyLifecycle;
}

private static BucketInfo.Builder bi() {
String bucketId = "bucketId";
return BucketInfo.newBuilder(bucketId);
}
}