From 88b04751490c7ae9a6c7694ad5a726bb2d41f30f Mon Sep 17 00:00:00 2001 From: athakor Date: Wed, 8 Jul 2020 16:41:16 +0530 Subject: [PATCH 1/4] docs(samples): remove bucket CORS configuration --- .../storage/buckets/RemoveBucketCors.java | 40 +++++++++++++++++++ .../storage/snippets/ITBucketSnippets.java | 14 +++++++ 2 files changed, 54 insertions(+) create mode 100644 google-cloud-examples/src/main/java/com/google/cloud/examples/storage/buckets/RemoveBucketCors.java 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 new file mode 100644 index 000000000000..36ae440a6d91 --- /dev/null +++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/storage/buckets/RemoveBucketCors.java @@ -0,0 +1,40 @@ +/* + * 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; + +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 com.google.common.collect.ImmutableList; + +// [START storage_remove_cors_configuration] +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); + bucket.toBuilder().setCors(ImmutableList.of()).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 index 44dd6de14ec6..e9206f9cc998 100644 --- 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 @@ -37,6 +37,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; @@ -358,6 +359,19 @@ public void testConfigureBucketCors() { assertTrue(cors.getMethods().get(0).toString().equalsIgnoreCase("GET")); } + @Test + public void testRemoveBucketCors() { + ConfigureBucketCors.configureBucketCors( + PROJECT_ID, BUCKET, "http://example.appspot.com", "Content-Type", 3600); + Cors cors = storage.get(BUCKET).getCors().get(0); + 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); From 0c5e1d499ed3c2ebf311a242f4f17b5f5f2af203 Mon Sep 17 00:00:00 2001 From: athakor Date: Thu, 9 Jul 2020 12:46:05 +0530 Subject: [PATCH 2/4] docs(samples): change the place of region tag --- .../google/cloud/examples/storage/buckets/RemoveBucketCors.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 36ae440a6d91..c5509b1a826f 100644 --- 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 @@ -15,13 +15,13 @@ */ 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 com.google.common.collect.ImmutableList; -// [START storage_remove_cors_configuration] public class RemoveBucketCors { public static void removeBucketCors(String projectId, String bucketName) { // The ID of your GCP project From 6d7f635b8cf13ac7a7a22a6d6f7a7166f261aa1c Mon Sep 17 00:00:00 2001 From: athakor Date: Tue, 21 Jul 2020 17:41:24 +0530 Subject: [PATCH 3/4] docs(samples): addresse additional comments --- .../storage/buckets/RemoveBucketCors.java | 18 +++++++++++++++--- .../storage/snippets/ITBucketSnippets.java | 17 +++++++++++++++-- 2 files changed, 30 insertions(+), 5 deletions(-) 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 index c5509b1a826f..aa3b1c21d5a0 100644 --- 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 @@ -20,7 +20,8 @@ import com.google.cloud.storage.Cors; import com.google.cloud.storage.Storage; import com.google.cloud.storage.StorageOptions; -import com.google.common.collect.ImmutableList; +import java.util.ArrayList; +import java.util.List; public class RemoveBucketCors { public static void removeBucketCors(String projectId, String bucketName) { @@ -31,9 +32,20 @@ public static void removeBucketCors(String projectId, String bucketName) { // String bucketName = "your-unique-bucket-name"; Storage storage = StorageOptions.newBuilder().setProjectId(projectId).build().getService(); - Bucket bucket = storage.get(bucketName); - bucket.toBuilder().setCors(ImmutableList.of()).build().update(); + 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 = new ArrayList<>(bucket.getCors()); + + // Remove bucket CORS configuration. + for (int index = 0; index < cors.size(); index++) { + Cors value = cors.get(index); + cors.remove(value); + } + + // Update bucket to remove CORS + bucket.toBuilder().setCors(cors).build().update(); System.out.println("Removed CORS configuration from bucket " + bucketName); } } 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 index e9206f9cc998..5e3dd2a4b8fd 100644 --- 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 @@ -50,6 +50,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; @@ -361,9 +362,21 @@ public void testConfigureBucketCors() { @Test public void testRemoveBucketCors() { - ConfigureBucketCors.configureBucketCors( - PROJECT_ID, BUCKET, "http://example.appspot.com", "Content-Type", 3600); + 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()); From c5d815f054cc2faec53b08acc8691909536a9c28 Mon Sep 17 00:00:00 2001 From: athakor Date: Wed, 22 Jul 2020 10:28:54 +0530 Subject: [PATCH 4/4] feat: use clear to clear the cors list --- .../cloud/examples/storage/buckets/RemoveBucketCors.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) 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 index aa3b1c21d5a0..180efbd71300 100644 --- 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 @@ -38,13 +38,10 @@ public static void removeBucketCors(String projectId, String bucketName) { // getCors() returns the List and copying over to an ArrayList so it's mutable. List cors = new ArrayList<>(bucket.getCors()); - // Remove bucket CORS configuration. - for (int index = 0; index < cors.size(); index++) { - Cors value = cors.get(index); - cors.remove(value); - } + // Clear bucket CORS configuration. + cors.clear(); - // Update bucket to remove CORS + // Update bucket to remove CORS. bucket.toBuilder().setCors(cors).build().update(); System.out.println("Removed CORS configuration from bucket " + bucketName); }