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

feat: add support of public access prevention #636

Merged
merged 22 commits into from Jun 28, 2021
Merged

feat: add support of public access prevention #636

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
57425e3
feat: add support of public access prevention
athakor Nov 26, 2020
29b8e13
feat: add integration test and fix review changes
athakor Dec 3, 2020
6292407
fix: build
athakor Dec 3, 2020
0aedfef
Merge remote-tracking branch 'upstream/master' into storage-616
athakor Dec 11, 2020
6c06659
feat: address review changes
athakor Dec 17, 2020
0a43446
refactor pap tests
frankyn Feb 12, 2021
7e8a6bd
address feedback
frankyn Feb 12, 2021
19c21df
address feedback
frankyn Feb 12, 2021
8a5f76c
address feedback
frankyn Feb 12, 2021
2a55013
s/AllUsers/allUsers
frankyn Mar 2, 2021
ae1724a
address feedback
frankyn Mar 2, 2021
24178d5
Merge branch 'master' into storage-616
frankyn Mar 2, 2021
3b27fd1
Merge branch 'master' into storage-616
frankyn Mar 9, 2021
09992ba
address documentation feedback
frankyn Mar 9, 2021
7400611
split up integration tests
frankyn Mar 9, 2021
c8df138
address issue in test set up
frankyn Mar 10, 2021
125da9f
Apply suggestions from code review
frankyn Mar 12, 2021
2da9fa4
fail valueOf gracefully
frankyn Mar 22, 2021
a042d43
fix: add UNKNOWN enum value to PublicAccessPrevention
BenWhitehead May 6, 2021
21b7659
fix: add comment to unknown
BenWhitehead May 7, 2021
37e19e3
fix: add test to ensure publicAccessPrevention is absent from seriali…
BenWhitehead May 7, 2021
ec75bb2
Merge branch 'master' into storage-616
frankyn Jun 10, 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
23 changes: 13 additions & 10 deletions google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java
View file
Open in desktop
Expand Up @@ -110,7 +110,8 @@ public com.google.api.services.storage.model.Bucket apply(BucketInfo bucketInfo)
public enum PublicAccessPrevention {
BenWhitehead marked this conversation as resolved.
Show resolved Hide resolved
ENFORCED("enforced"),
/** Default value for Public Access Prevention */
UNSPECIFIED("unspecified");
UNSPECIFIED("unspecified"),
UNKNOWN(null);
BenWhitehead marked this conversation as resolved.
Show resolved Hide resolved

private final String value;

Expand All @@ -121,6 +122,15 @@ public enum PublicAccessPrevention {
public String getValue() {
return value;
}

public static PublicAccessPrevention parse(String value) {
String upper = value.toUpperCase();
try {
return valueOf(upper);
} catch (IllegalArgumentException ignore) {
tritone marked this conversation as resolved.
Show resolved Hide resolved
return UNKNOWN;
}
}
}

/**
Expand Down Expand Up @@ -224,15 +234,8 @@ static IamConfiguration fromPb(Bucket.IamConfiguration iamConfiguration) {
String publicAccessPrevention = iamConfiguration.getPublicAccessPrevention();

PublicAccessPrevention publicAccessPreventionValue = null;

try {
if (publicAccessPrevention != null) {
publicAccessPreventionValue =
PublicAccessPrevention.valueOf(publicAccessPrevention.toUpperCase());
}
} catch (IllegalArgumentException ex) {
throw new IllegalArgumentException(
"IamConfiguration: Received an unexpected value of " + publicAccessPrevention);
if (publicAccessPrevention != null) {
publicAccessPreventionValue = PublicAccessPrevention.parse(publicAccessPrevention);
}

return newBuilder()
Expand Down
23 changes: 10 additions & 13 deletions google-cloud-storage/src/test/java/com/google/cloud/storage/BucketInfoTest.java
View file
Open in desktop
Expand Up @@ -20,7 +20,6 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;

import com.google.api.client.util.DateTime;
import com.google.api.services.storage.model.Bucket;
Expand All @@ -32,11 +31,13 @@
import com.google.cloud.storage.BucketInfo.CreatedBeforeDeleteRule;
import com.google.cloud.storage.BucketInfo.DeleteRule;
import com.google.cloud.storage.BucketInfo.DeleteRule.Type;
import com.google.cloud.storage.BucketInfo.IamConfiguration;
import com.google.cloud.storage.BucketInfo.IsLiveDeleteRule;
import com.google.cloud.storage.BucketInfo.LifecycleRule;
import com.google.cloud.storage.BucketInfo.LifecycleRule.LifecycleAction;
import com.google.cloud.storage.BucketInfo.LifecycleRule.LifecycleCondition;
import com.google.cloud.storage.BucketInfo.NumNewerVersionsDeleteRule;
import com.google.cloud.storage.BucketInfo.PublicAccessPrevention;
import com.google.cloud.storage.BucketInfo.RawDeleteRule;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
Expand Down Expand Up @@ -373,18 +374,14 @@ public void testIamConfiguration() {

@Test
public void testPapValueOfIamConfiguration() {
try {
Bucket.IamConfiguration iamConfiguration = new Bucket.IamConfiguration();
Bucket.IamConfiguration.UniformBucketLevelAccess uniformBucketLevelAccess =
new Bucket.IamConfiguration.UniformBucketLevelAccess();
iamConfiguration.setUniformBucketLevelAccess(uniformBucketLevelAccess);
iamConfiguration.setPublicAccessPrevention("random-string");
BucketInfo.IamConfiguration.fromPb(iamConfiguration);
fail("Expected an IllegalArgumentException when passing in a bad");
} catch (IllegalArgumentException ex) {
// expected IllegalArgumentException because random-string does not map to an enum value
assertTrue(ex.getMessage().contains("random-string"));
}
Bucket.IamConfiguration iamConfiguration = new Bucket.IamConfiguration();
Bucket.IamConfiguration.UniformBucketLevelAccess uniformBucketLevelAccess =
new Bucket.IamConfiguration.UniformBucketLevelAccess();
iamConfiguration.setUniformBucketLevelAccess(uniformBucketLevelAccess);
iamConfiguration.setPublicAccessPrevention("random-string");
IamConfiguration fromPb = IamConfiguration.fromPb(iamConfiguration);

assertEquals(PublicAccessPrevention.UNKNOWN, fromPb.getPublicAccessPrevention());
}

@Test
Expand Down