Skip to content

Commit 6d73e46

Browse files
authored
fix: update PAP to use inherited instead of unspecified (#1051)
1 parent 2e7f041 commit 6d73e46

File tree

2 files changed

+20
-10
lines changed

2 files changed

+20
-10
lines changed

google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java

+18-8
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,19 @@ public com.google.api.services.storage.model.Bucket apply(BucketInfo bucketInfo)
113113
*/
114114
public enum PublicAccessPrevention {
115115
ENFORCED("enforced"),
116-
/** Default value for Public Access Prevention */
117-
UNSPECIFIED("unspecified"),
116+
/**
117+
* Default value for Public Access Prevention
118+
*
119+
* @deprecated use {@link #INHERITED}
120+
*/
121+
@Deprecated
122+
UNSPECIFIED("inherited"),
118123
/**
119124
* If the api returns a value that isn't defined in {@link PublicAccessPrevention} this value
120125
* will be returned.
121126
*/
122-
UNKNOWN(null);
127+
UNKNOWN(null),
128+
INHERITED("inherited");
123129

124130
private final String value;
125131

@@ -133,10 +139,14 @@ public String getValue() {
133139

134140
public static PublicAccessPrevention parse(String value) {
135141
String upper = value.toUpperCase();
136-
try {
137-
return valueOf(upper);
138-
} catch (IllegalArgumentException ignore) {
139-
return UNKNOWN;
142+
switch (upper) {
143+
case "ENFORCED":
144+
return ENFORCED;
145+
case "UNSPECIFIED":
146+
case "INHERITED":
147+
return INHERITED;
148+
default:
149+
return UNKNOWN;
140150
}
141151
}
142152
}
@@ -300,7 +310,7 @@ Builder setUniformBucketLevelAccessLockedTime(Long uniformBucketLevelAccessLocke
300310

301311
/**
302312
* Sets the bucket's Public Access Prevention configuration. Currently supported options are
303-
* {@link PublicAccessPrevention#UNSPECIFIED} or {@link PublicAccessPrevention#ENFORCED}
313+
* {@link PublicAccessPrevention#INHERITED} or {@link PublicAccessPrevention#ENFORCED}
304314
*
305315
* @see <a
306316
* href="https://cloud.google.com/storage/docs/public-access-prevention">public-access-prevention</a>

google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -3296,7 +3296,7 @@ private Bucket generatePublicAccessPreventionBucket(String bucketName, boolean e
32963296
.setPublicAccessPrevention(
32973297
enforced
32983298
? BucketInfo.PublicAccessPrevention.ENFORCED
3299-
: BucketInfo.PublicAccessPrevention.UNSPECIFIED)
3299+
: BucketInfo.PublicAccessPrevention.INHERITED)
33003300
.build())
33013301
.build());
33023302
}
@@ -3389,7 +3389,7 @@ public void testUBLAWithPublicAccessPreventionOnBucket() throws Exception {
33893389
Bucket bucket = generatePublicAccessPreventionBucket(papBucket, false);
33903390
assertEquals(
33913391
bucket.getIamConfiguration().getPublicAccessPrevention(),
3392-
BucketInfo.PublicAccessPrevention.UNSPECIFIED);
3392+
BucketInfo.PublicAccessPrevention.INHERITED);
33933393
assertFalse(bucket.getIamConfiguration().isUniformBucketLevelAccessEnabled());
33943394
assertFalse(bucket.getIamConfiguration().isBucketPolicyOnlyEnabled());
33953395

0 commit comments

Comments
 (0)