docs(samples): remove bucket CORS configuration (googleapis#7288)

athakor · web-flow · commit cd43d0d56ff2 · 2020-07-22T09:00:00.000-07:00
* docs(samples): remove bucket CORS configuration

* docs(samples): change the place of region tag

* docs(samples): addresse additional comments

* feat: use clear to clear the cors list
diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/buckets/RemoveBucketCors.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/buckets/RemoveBucketCors.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.cloud.examples.storage.buckets;
+
+// [START storage_remove_cors_configuration]
+import com.google.cloud.storage.Bucket;
+import com.google.cloud.storage.Cors;
+import com.google.cloud.storage.Storage;
+import com.google.cloud.storage.StorageOptions;
+import java.util.ArrayList;
+import java.util.List;
+
+public class RemoveBucketCors {
+  public static void removeBucketCors(String projectId, String bucketName) {
+    // The ID of your GCP project
+    // String projectId = "your-project-id";
+
+    // The ID of your GCS bucket
+    // String bucketName = "your-unique-bucket-name";
+
+    Storage storage = StorageOptions.newBuilder().setProjectId(projectId).build().getService();
+    Bucket bucket =
+        storage.get(bucketName, Storage.BucketGetOption.fields(Storage.BucketField.CORS));
+
+    // getCors() returns the List and copying over to an ArrayList so it's mutable.
+    List<Cors> cors = new ArrayList<>(bucket.getCors());
+
+    // Clear bucket CORS configuration.
+    cors.clear();
+
+    // Update bucket to remove CORS.
+    bucket.toBuilder().setCors(cors).build().update();
+    System.out.println("Removed CORS configuration from bucket " + bucketName);
+  }
+}
+// [END storage_remove_cors_configuration]
diff --git a/google-cloud-examples/src/test/java/com/google/cloud/examples/storage/snippets/ITBucketSnippets.java b/google-cloud-examples/src/test/java/com/google/cloud/examples/storage/snippets/ITBucketSnippets.java
@@ -38,6 +38,7 @@
 import com.google.cloud.examples.storage.buckets.ListBucketIamMembers;
 import com.google.cloud.examples.storage.buckets.ListBuckets;
 import com.google.cloud.examples.storage.buckets.MakeBucketPublic;
+import com.google.cloud.examples.storage.buckets.RemoveBucketCors;
 import com.google.cloud.examples.storage.buckets.RemoveBucketDefaultKMSKey;
 import com.google.cloud.examples.storage.buckets.RemoveBucketIamConditionalBinding;
 import com.google.cloud.examples.storage.buckets.RemoveBucketIamMember;
@@ -50,6 +51,7 @@
 import com.google.cloud.storage.Bucket;
 import com.google.cloud.storage.BucketInfo;
 import com.google.cloud.storage.Cors;
+import com.google.cloud.storage.HttpMethod;
 import com.google.cloud.storage.Storage;
 import com.google.cloud.storage.StorageException;
 import com.google.cloud.storage.StorageRoles;
@@ -376,6 +378,31 @@ public void testConfigureBucketCors() {
     assertTrue(cors.getMethods().get(0).toString().equalsIgnoreCase("GET"));
   }
 
+  @Test
+  public void testRemoveBucketCors() {
+    storage
+        .get(BUCKET)
+        .toBuilder()
+        .setCors(
+            ImmutableList.of(
+                Cors.newBuilder()
+                    .setOrigins(ImmutableList.of(Cors.Origin.of("http://example.appspot.com")))
+                    .setMethods(ImmutableList.of(HttpMethod.GET))
+                    .setResponseHeaders(ImmutableList.of("Content-Type"))
+                    .setMaxAgeSeconds(3600)
+                    .build()))
+        .build()
+        .update();
+    Cors cors = storage.get(BUCKET).getCors().get(0);
+    assertNotNull(cors);
+    assertTrue(cors.getOrigins().get(0).toString().contains("example.appspot.com"));
+    assertTrue(cors.getResponseHeaders().contains("Content-Type"));
+    assertEquals(3600, cors.getMaxAgeSeconds().intValue());
+    assertTrue(cors.getMethods().get(0).toString().equalsIgnoreCase("GET"));
+    RemoveBucketCors.removeBucketCors(PROJECT_ID, BUCKET);
+    assertNull(storage.get(BUCKET).getCors());
+  }
+
   @Test
   public void testRequesterPays() throws Exception {
     EnableRequesterPays.enableRequesterPays(PROJECT_ID, BUCKET);
