feat: add support of public access prevention

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

@@ -101,6 +101,21 @@ public com.google.api.services.storage.model.Bucket apply(BucketInfo bucketInfo)
   private final String locationType;
   private final Logging logging;
 
+  public enum PublicAccessPrevention {
+    ENFORCED("enforced"),
+    UNSPECIFIED("unspecified");
+
+    private final String value;
+
+    PublicAccessPrevention(String value) {
+      this.value = value;
+    }
+
+    public String getValue() {
+      return value;
+    }
+  }
+
   /**
    * The Bucket's IAM Configuration.
    *
@@ -112,6 +127,7 @@ public static class IamConfiguration implements Serializable {
 
     private Boolean isUniformBucketLevelAccessEnabled;
     private Long uniformBucketLevelAccessLockedTime;
+    private PublicAccessPrevention publicAccessPrevention;
 
     @Override
     public boolean equals(Object o) {
@@ -125,12 +141,16 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-      return Objects.hash(isUniformBucketLevelAccessEnabled, uniformBucketLevelAccessLockedTime);
+      return Objects.hash(
+          isUniformBucketLevelAccessEnabled,
+          uniformBucketLevelAccessLockedTime,
+          publicAccessPrevention);
     }
 
     private IamConfiguration(Builder builder) {
       this.isUniformBucketLevelAccessEnabled = builder.isUniformBucketLevelAccessEnabled;
       this.uniformBucketLevelAccessLockedTime = builder.uniformBucketLevelAccessLockedTime;
+      this.publicAccessPrevention = builder.publicAccessPrevention;
     }
 
     public static Builder newBuilder() {
@@ -141,6 +161,7 @@ public Builder toBuilder() {
       Builder builder = new Builder();
       builder.isUniformBucketLevelAccessEnabled = isUniformBucketLevelAccessEnabled;
       builder.uniformBucketLevelAccessLockedTime = uniformBucketLevelAccessLockedTime;
+      builder.publicAccessPrevention = publicAccessPrevention;
       return builder;
     }
 
@@ -164,6 +185,11 @@ public Long getUniformBucketLevelAccessLockedTime() {
       return uniformBucketLevelAccessLockedTime;
     }
 
+    /** Returns the Public Access Prevention. * */
+    public PublicAccessPrevention getPublicAccessPrevention() {
+      return publicAccessPrevention;
+    }
+
     Bucket.IamConfiguration toPb() {
       Bucket.IamConfiguration iamConfiguration = new Bucket.IamConfiguration();
 
@@ -176,6 +202,8 @@ Bucket.IamConfiguration toPb() {
               : new DateTime(uniformBucketLevelAccessLockedTime));
 
       iamConfiguration.setUniformBucketLevelAccess(uniformBucketLevelAccess);
+      iamConfiguration.setPublicAccessPrevention(
+          publicAccessPrevention == null ? null : publicAccessPrevention.getValue());
 
       return iamConfiguration;
     }
@@ -184,17 +212,23 @@ static IamConfiguration fromPb(Bucket.IamConfiguration iamConfiguration) {
       Bucket.IamConfiguration.UniformBucketLevelAccess uniformBucketLevelAccess =
           iamConfiguration.getUniformBucketLevelAccess();
       DateTime lockedTime = uniformBucketLevelAccess.getLockedTime();
+      String publicAccessPrevention = iamConfiguration.getPublicAccessPrevention();
 
       return newBuilder()
           .setIsUniformBucketLevelAccessEnabled(uniformBucketLevelAccess.getEnabled())
           .setUniformBucketLevelAccessLockedTime(lockedTime == null ? null : lockedTime.getValue())
+          .setPublicAccessPrevention(
+              publicAccessPrevention == null
+                  ? null
+                  : PublicAccessPrevention.valueOf(publicAccessPrevention.toUpperCase()))
           .build();
     }
 
     /** Builder for {@code IamConfiguration} */
     public static class Builder {
       private Boolean isUniformBucketLevelAccessEnabled;
       private Long uniformBucketLevelAccessLockedTime;
+      private PublicAccessPrevention publicAccessPrevention;
 
       /** Deprecated in favor of setIsUniformBucketLevelAccessEnabled(). */
       @Deprecated
@@ -235,6 +269,21 @@ Builder setUniformBucketLevelAccessLockedTime(Long uniformBucketLevelAccessLocke
         return this;
       }
 
+      /**
+       * Sets the bucket's Public Access Prevention configuration. Currently supported options are
+       * 'unspecified' (default) or 'enforced'.
+       *
+       * @see <a
+       *     href="https://cloud.google.com/storage/docs/public-access-prevention">public-access-prevention</a>
+       */
+      public Builder setPublicAccessPrevention(PublicAccessPrevention publicAccessPrevention) {
+        this.publicAccessPrevention =
+            publicAccessPrevention == null
+                ? publicAccessPrevention.UNSPECIFIED
+                : publicAccessPrevention;
+        return this;
+      }
+
       /** Builds an {@code IamConfiguration} object */
       public IamConfiguration build() {
         return new IamConfiguration(this);

google-cloud-storage/src/test/java/com/google/cloud/storage/BucketInfoTest.java

@@ -72,10 +72,12 @@ public class BucketInfoTest {
               LifecycleAction.newDeleteAction(),
               LifecycleCondition.newBuilder().setAge(5).build()));
   private static final String INDEX_PAGE = "index.html";
+  private static final String PUBLIC_ACCESS_PREVENTION_ENFORCED = "enforced";
   private static final BucketInfo.IamConfiguration IAM_CONFIGURATION =
       BucketInfo.IamConfiguration.newBuilder()
           .setIsUniformBucketLevelAccessEnabled(true)
           .setUniformBucketLevelAccessLockedTime(System.currentTimeMillis())
+          .setPublicAccessPrevention(BucketInfo.PublicAccessPrevention.ENFORCED)
           .build();
   private static final BucketInfo.Logging LOGGING =
       BucketInfo.Logging.newBuilder()
@@ -358,11 +360,15 @@ public void testIamConfiguration() {
         BucketInfo.IamConfiguration.newBuilder()
             .setIsUniformBucketLevelAccessEnabled(true)
             .setUniformBucketLevelAccessLockedTime(System.currentTimeMillis())
+            .setPublicAccessPrevention(BucketInfo.PublicAccessPrevention.ENFORCED)
             .build()
             .toPb();
 
     assertEquals(Boolean.TRUE, iamConfiguration.getUniformBucketLevelAccess().getEnabled());
     assertNotNull(iamConfiguration.getUniformBucketLevelAccess().getLockedTime());
+    assertEquals(
+        BucketInfo.PublicAccessPrevention.ENFORCED.getValue(),
+        iamConfiguration.getPublicAccessPrevention());
   }
 
   @Test

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

@@ -3235,6 +3235,55 @@ public void testEnableAndDisableUniformBucketLevelAccessOnExistingBucket() throw
     }
   }
 
+  @Test
+  public void testUnspecifiedAndEnforcedPublicAccessPreventionOnBucket() throws Exception {
+    String papBucket = RemoteStorageHelper.generateBucketName();
+    try {
+      BucketInfo.IamConfiguration iamConfiguration =
+          BucketInfo.IamConfiguration.newBuilder()
+              .setIsUniformBucketLevelAccessEnabled(true)
+              .build();
+      Bucket bucket =
+          storage.create(
+              Bucket.newBuilder(papBucket).setIamConfiguration(iamConfiguration).build());
+      assertEquals(
+          BucketInfo.PublicAccessPrevention.UNSPECIFIED.getValue(),
+          bucket.getIamConfiguration().getPublicAccessPrevention().getValue());
+      assertTrue(bucket.getIamConfiguration().isUniformBucketLevelAccessEnabled());
+
+      bucket
+          .toBuilder()
+          .setIamConfiguration(
+              iamConfiguration
+                  .toBuilder()
+                  .setPublicAccessPrevention(BucketInfo.PublicAccessPrevention.ENFORCED)
+                  .build())
+          .build()
+          .update();
+      Bucket remoteBucket =
+          storage.get(papBucket, Storage.BucketGetOption.fields(BucketField.IAMCONFIGURATION));
+      assertEquals(
+          BucketInfo.PublicAccessPrevention.ENFORCED.getValue(),
+          remoteBucket.getIamConfiguration().getPublicAccessPrevention().getValue());
+
+      remoteBucket
+          .toBuilder()
+          .setIamConfiguration(
+              iamConfiguration.toBuilder().setIsUniformBucketLevelAccessEnabled(false).build())
+          .build()
+          .update();
+      remoteBucket =
+          storage.get(papBucket, Storage.BucketGetOption.fields(BucketField.IAMCONFIGURATION));
+      assertEquals(
+          BucketInfo.PublicAccessPrevention.ENFORCED.getValue(),
+          remoteBucket.getIamConfiguration().getPublicAccessPrevention().getValue());
+      assertFalse(remoteBucket.getIamConfiguration().isUniformBucketLevelAccessEnabled());
+
+    } finally {
+      RemoteStorageHelper.forceDelete(storage, papBucket, 1, TimeUnit.MINUTES);
+    }
+  }
+
   @Test
   public void testUploadUsingSignedURL() throws Exception {
     String blobName = "test-signed-url-upload";