feat: use defaul service account creadential and add testcase for del…

…ete lifecycle rules
googleapis · athakor · Dec 31, 2019 · Jan 3, 2020 · Jan 3, 2020 · Jan 6, 2020
commit 08e5c39c24e93de83b6610e169542ab217a8515a
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java
@@ -1140,8 +1140,9 @@ public boolean deleteDefaultAcl(Entity entity) {
    *
    * @return {@code true} if the bucket lifecycle rules were deleted.
    * @throws StorageException upon failure
+   * @throws IOException
    */
-  public boolean deleteLifecycleRules() {
+  public boolean deleteLifecycleRules() throws IOException {
     return storage.deleteLifecycleRules(getName());
   }
 

diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/Storage.java
@@ -39,6 +39,7 @@
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.io.BaseEncoding;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.Serializable;
 import java.net.URL;
@@ -3102,8 +3103,9 @@ PostPolicyV4 generateSignedPostPolicyV4(
    * @param bucket name of the bucket.
    * @return {@code true} if the bucket lifecycle rules were deleted.
    * @throws StorageException upon failure
+   * @throws IOException
    */
-  boolean deleteLifecycleRules(String bucket);
+  boolean deleteLifecycleRules(String bucket) throws IOException;
 
   /**
    * Creates a new default blob ACL entry on the specified bucket.

diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageImpl.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/StorageImpl.java
@@ -40,14 +40,14 @@
 import com.google.api.services.storage.model.StorageObject;
 import com.google.api.services.storage.model.TestIamPermissionsResponse;
 import com.google.auth.ServiceAccountSigner;
+import com.google.auth.oauth2.ServiceAccountCredentials;
 import com.google.cloud.BaseService;
 import com.google.cloud.BatchResult;
 import com.google.cloud.PageImpl;
 import com.google.cloud.PageImpl.NextPageFetcher;
 import com.google.cloud.Policy;
 import com.google.cloud.ReadChannel;
 import com.google.cloud.RetryHelper.RetryHelperException;
-import com.google.cloud.ServiceOptions;
 import com.google.cloud.Tuple;
 import com.google.cloud.storage.Acl.Entity;
 import com.google.cloud.storage.HmacKey.HmacKeyMetadata;
@@ -71,6 +71,7 @@
 import com.google.common.io.BaseEncoding;
 import com.google.common.primitives.Ints;
 import java.io.ByteArrayInputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
@@ -1160,16 +1161,16 @@ public Boolean call() {
   }
 
   @Override
-  public boolean deleteLifecycleRules(final String bucket) {
+  public boolean deleteLifecycleRules(final String bucket) throws IOException {
     final com.google.api.services.storage.model.Bucket bucketPb = BucketInfo.of(bucket).toPb();
-    final com.google.api.services.storage.model.ServiceAccount serviceAccount =
-        storageRpc.getServiceAccount(ServiceOptions.getDefaultProjectId());
+    final ServiceAccountCredentials serviceAccount =
+        (ServiceAccountCredentials) ServiceAccountCredentials.getApplicationDefault();
     try {
       return runWithRetries(
           new Callable<Boolean>() {
             @Override
             public Boolean call() {
-              return storageRpc.deleteLifecycleRules(bucketPb, serviceAccount.getEmailAddress());
+              return storageRpc.deleteLifecycleRules(bucketPb, serviceAccount.getClientEmail());
             }
           },
           getOptions().getRetrySettings(),

diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/StorageRpc.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/StorageRpc.java
@@ -30,6 +30,7 @@
 import com.google.cloud.ServiceRpc;
 import com.google.cloud.Tuple;
 import com.google.cloud.storage.StorageException;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.List;
@@ -261,6 +262,7 @@ public int hashCode() {
    *
    * @return {@code true} if the bucket lifecycle rules were deleted.
    * @throws StorageException upon failure
+   * @throws IOException
    */
   boolean deleteLifecycleRules(Bucket bucket, String serviceAccount);
 

diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketTest.java
@@ -45,6 +45,7 @@
 import com.google.common.collect.Lists;
 import com.google.common.io.BaseEncoding;
 import java.io.ByteArrayInputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.security.Key;
 import java.util.Collections;
@@ -704,7 +705,7 @@ public void testDeleteDefaultAcl() throws Exception {
   }
 
   @Test
-  public void testDeleteLifecycleRules() {
+  public void testDeleteLifecycleRules() throws IOException {
     expect(storage.getOptions()).andReturn(mockOptions).times(1);
     expect(storage.deleteLifecycleRules(BUCKET_INFO.getName())).andReturn(true);
     replay(storage);

diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageImplTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/StorageImplTest.java
@@ -2737,6 +2737,23 @@ public void testDeleteDefaultBucketAcl() {
     assertTrue(storage.deleteDefaultAcl(BUCKET_NAME1, User.ofAllAuthenticatedUsers()));
   }
 
+  @Test
+  public void testDeleteLifecyclesRulesOfBucket() throws IOException {
+    ServiceAccountCredentials credentials =
+        ServiceAccountCredentials.newBuilder()
+            .setClientEmail(SERVICE_ACCOUNT.getEmail())
+            .setPrivateKey(privateKey)
+            .build();
+    EasyMock.expect(
+            storageRpcMock.deleteLifecycleRules(
+                EasyMock.isA(com.google.api.services.storage.model.Bucket.class),
+                EasyMock.isA(String.class)))
+        .andReturn(true);
+    EasyMock.replay(storageRpcMock);
+    storage = options.toBuilder().setCredentials(credentials).build().getService();
+    assertTrue(storage.deleteLifecycleRules(BUCKET_NAME1));
+  }
+
   @Test
   public void testCreateDefaultBucketAcl() {
     Acl returnedAcl = ACL.toBuilder().setEtag("ETAG").setId("ID").build();

diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITStorageTest.java
@@ -3222,7 +3222,6 @@ public void testBucketLogging() throws ExecutionException, InterruptedException
   }
 
   @Test
-<<<<<<< HEAD
   public void testSignedPostPolicyV4() throws Exception {
     PostFieldsV4 fields = PostFieldsV4.newBuilder().setAcl("public-read").build();
 
@@ -3277,7 +3276,8 @@ public void testBlobReload() throws Exception {
   }
 
   @Test
-  public void testDeleteLifecycleRules() throws ExecutionException, InterruptedException {
+  public void testDeleteLifecycleRules()
+      throws ExecutionException, InterruptedException, IOException {
     String lifeCycleRuleBucket = RemoteStorageHelper.generateBucketName();
     List<LifecycleRule> lifecycleRules =
         ImmutableList.of(