From 942d0b79b6630f47e92a6c826ad964cf0ae88cd3 Mon Sep 17 00:00:00 2001 From: Anthony Wens Date: Fri, 11 Dec 2020 18:54:31 +0000 Subject: [PATCH 1/4] docs: Wrap samples with future prefix --- .../snippets/CreateNotificationConfigSnippets.java | 4 ++++ .../snippets/DeleteNotificationConfigSnippets.java | 2 ++ .../snippets/GetNotificationConfigSnippets.java | 4 ++++ .../snippets/ListNotificationConfigSnippets.java | 4 ++++ .../securitycenter/snippets/NotificationReceiver.java | 2 ++ .../snippets/UpdateNotificationConfigSnippets.java | 4 ++++ 6 files changed, 20 insertions(+) diff --git a/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/CreateNotificationConfigSnippets.java b/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/CreateNotificationConfigSnippets.java index 07c345c83..b8bd2c89a 100644 --- a/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/CreateNotificationConfigSnippets.java +++ b/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/CreateNotificationConfigSnippets.java @@ -16,6 +16,7 @@ package com.google.cloud.examples.securitycenter.snippets; +// [START securitycenter_create_notification_config] // [START scc_create_notification_config] import com.google.cloud.securitycenter.v1.CreateNotificationConfigRequest; import com.google.cloud.securitycenter.v1.NotificationConfig; @@ -23,11 +24,13 @@ import com.google.cloud.securitycenter.v1.SecurityCenterClient; import java.io.IOException; // [END scc_create_notification_config] +// [END securitycenter_create_notification_config] /** Create NotificationConfig Snippet. */ final class CreateNotificationConfigSnippets { private CreateNotificationConfigSnippets() {} + // [START securitycenter_create_notification_config] // [START scc_create_notification_config] public static NotificationConfig createNotificationConfig( String organizationId, String notificationConfigId, String projectId, String topicName) @@ -62,4 +65,5 @@ public static NotificationConfig createNotificationConfig( } } // [END scc_create_notification_config] + // [END securitycenter_create_notification_config] } diff --git a/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/DeleteNotificationConfigSnippets.java b/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/DeleteNotificationConfigSnippets.java index 24f84c91a..881a4562c 100644 --- a/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/DeleteNotificationConfigSnippets.java +++ b/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/DeleteNotificationConfigSnippets.java @@ -16,11 +16,13 @@ package com.google.cloud.examples.securitycenter.snippets; +// [START securitycenter_delete_notification_config] // [START scc_delete_notification_config] import com.google.cloud.securitycenter.v1.NotificationConfigName; import com.google.cloud.securitycenter.v1.SecurityCenterClient; import java.io.IOException; // [END scc_delete_notification_config] +// [END securitycenter_delete_notification_config] /** Snippets for how to Delete NotificationConfigs. */ final class DeleteNotificationConfigSnippets { diff --git a/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/GetNotificationConfigSnippets.java b/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/GetNotificationConfigSnippets.java index 807536a13..8e8735da2 100644 --- a/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/GetNotificationConfigSnippets.java +++ b/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/GetNotificationConfigSnippets.java @@ -16,17 +16,20 @@ package com.google.cloud.examples.securitycenter.snippets; +// [START securitycenter_get_notification_config] // [START scc_get_notification_config] import com.google.cloud.securitycenter.v1.NotificationConfig; import com.google.cloud.securitycenter.v1.NotificationConfigName; import com.google.cloud.securitycenter.v1.SecurityCenterClient; import java.io.IOException; // [END scc_get_notification_config] +// [END securitycenter_get_notification_config] /** Snippets for how to GetNotificationConfig. */ final class GetNotificationConfigSnippets { private GetNotificationConfigSnippets() {} + // [START securitycenter_get_notification_config] // [START scc_get_notification_config] public static NotificationConfig getNotificationConfig( String organizationId, String notificationConfigId) throws IOException { @@ -47,4 +50,5 @@ public static NotificationConfig getNotificationConfig( } } // [END scc_get_notification_config] + // [END securitycenter_get_notification_config] } diff --git a/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/ListNotificationConfigSnippets.java b/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/ListNotificationConfigSnippets.java index 7fd3fcc5b..f27739e99 100644 --- a/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/ListNotificationConfigSnippets.java +++ b/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/ListNotificationConfigSnippets.java @@ -16,6 +16,7 @@ package com.google.cloud.examples.securitycenter.snippets; +// [START securitycenter_list_notification_configs] // [START scc_list_notification_configs] import com.google.cloud.securitycenter.v1.NotificationConfig; import com.google.cloud.securitycenter.v1.OrganizationName; @@ -24,11 +25,13 @@ import com.google.common.collect.ImmutableList; import java.io.IOException; // [END scc_list_notification_configs] +// [END securitycenter_list_notification_configs] /** Snippets for how to ListNotificationConfig. */ final class ListNotificationConfigSnippets { private ListNotificationConfigSnippets() {} + // [START securitycenter_list_notification_configs] // [START scc_list_notification_configs] public static ImmutableList listNotificationConfigs(String organizationId) throws IOException { @@ -48,5 +51,6 @@ public static ImmutableList listNotificationConfigs(String o } } // [END scc_list_notification_configs] + // [END securitycenter_list_notification_configs] } diff --git a/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/NotificationReceiver.java b/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/NotificationReceiver.java index 4253d645b..4fe7e96a1 100644 --- a/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/NotificationReceiver.java +++ b/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/NotificationReceiver.java @@ -16,6 +16,7 @@ package com.google.cloud.examples.securitycenter.snippets; +// [START securitycenter_receive_notifications] // [START scc_receive_notifications] import com.google.cloud.pubsub.v1.AckReplyConsumer; @@ -73,3 +74,4 @@ public static void receiveNotificationMessages(String projectId, String subscrip } } // [END scc_receive_notifications] +// [END securitycenter_receive_notifications] diff --git a/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/UpdateNotificationConfigSnippets.java b/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/UpdateNotificationConfigSnippets.java index dffc0dd9e..6103d1dd2 100644 --- a/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/UpdateNotificationConfigSnippets.java +++ b/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/UpdateNotificationConfigSnippets.java @@ -16,6 +16,7 @@ package com.google.cloud.examples.securitycenter.snippets; +// [START securitycenter_update_notification_config] // [START scc_update_notification_config] import com.google.cloud.securitycenter.v1.NotificationConfig; import com.google.cloud.securitycenter.v1.NotificationConfig.StreamingConfig; @@ -23,11 +24,13 @@ import com.google.protobuf.FieldMask; import java.io.IOException; // [END scc_update_notification_config] +// [END securitycenter_update_notification_config] /** Snippets for UpdateNotificationConfig. */ final class UpdateNotificationConfigSnippets { private UpdateNotificationConfigSnippets() {} + // [START securitycenter_update_notification_config] // [START scc_update_notification_config] public static NotificationConfig updateNotificationConfig( String organizationId, String notificationConfigId, String projectId, String topicName) @@ -65,4 +68,5 @@ public static NotificationConfig updateNotificationConfig( } } // [END scc_update_notification_config] + // [END securitycenter_update_notification_config] } \ No newline at end of file From 95d4ad1b76076f0b2e44d1b523b3cdd811ba4f14 Mon Sep 17 00:00:00 2001 From: Anthony Wens Date: Mon, 1 Mar 2021 17:34:26 +0000 Subject: [PATCH 2/4] docs: remove unused region tags --- .../snippets/DeleteNotificationConfigSnippets.java | 6 +----- .../snippets/GetNotificationConfigSnippets.java | 4 ---- .../snippets/ListNotificationConfigSnippets.java | 4 ---- .../securitycenter/snippets/NotificationReceiver.java | 2 -- .../snippets/UpdateNotificationConfigSnippets.java | 4 ---- 5 files changed, 1 insertion(+), 19 deletions(-) diff --git a/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/DeleteNotificationConfigSnippets.java b/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/DeleteNotificationConfigSnippets.java index 881a4562c..33ef92790 100644 --- a/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/DeleteNotificationConfigSnippets.java +++ b/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/DeleteNotificationConfigSnippets.java @@ -17,18 +17,14 @@ package com.google.cloud.examples.securitycenter.snippets; // [START securitycenter_delete_notification_config] -// [START scc_delete_notification_config] import com.google.cloud.securitycenter.v1.NotificationConfigName; import com.google.cloud.securitycenter.v1.SecurityCenterClient; import java.io.IOException; -// [END scc_delete_notification_config] -// [END securitycenter_delete_notification_config] /** Snippets for how to Delete NotificationConfigs. */ final class DeleteNotificationConfigSnippets { private DeleteNotificationConfigSnippets() {} - // [START scc_delete_notification_config] public static boolean deleteNotificationConfig(String organizationId, String notificationConfigId) throws IOException { // String organizationId = "{your-org-id}"; @@ -48,5 +44,5 @@ public static boolean deleteNotificationConfig(String organizationId, String not return true; } - // [END scc_delete_notification_config] +// [END securitycenter_delete_notification_config] } diff --git a/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/GetNotificationConfigSnippets.java b/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/GetNotificationConfigSnippets.java index 8e8735da2..ae688f9c8 100644 --- a/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/GetNotificationConfigSnippets.java +++ b/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/GetNotificationConfigSnippets.java @@ -17,12 +17,10 @@ package com.google.cloud.examples.securitycenter.snippets; // [START securitycenter_get_notification_config] -// [START scc_get_notification_config] import com.google.cloud.securitycenter.v1.NotificationConfig; import com.google.cloud.securitycenter.v1.NotificationConfigName; import com.google.cloud.securitycenter.v1.SecurityCenterClient; import java.io.IOException; -// [END scc_get_notification_config] // [END securitycenter_get_notification_config] /** Snippets for how to GetNotificationConfig. */ @@ -30,7 +28,6 @@ final class GetNotificationConfigSnippets { private GetNotificationConfigSnippets() {} // [START securitycenter_get_notification_config] - // [START scc_get_notification_config] public static NotificationConfig getNotificationConfig( String organizationId, String notificationConfigId) throws IOException { @@ -49,6 +46,5 @@ public static NotificationConfig getNotificationConfig( return response; } } - // [END scc_get_notification_config] // [END securitycenter_get_notification_config] } diff --git a/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/ListNotificationConfigSnippets.java b/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/ListNotificationConfigSnippets.java index f27739e99..765375b70 100644 --- a/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/ListNotificationConfigSnippets.java +++ b/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/ListNotificationConfigSnippets.java @@ -17,14 +17,12 @@ package com.google.cloud.examples.securitycenter.snippets; // [START securitycenter_list_notification_configs] -// [START scc_list_notification_configs] import com.google.cloud.securitycenter.v1.NotificationConfig; import com.google.cloud.securitycenter.v1.OrganizationName; import com.google.cloud.securitycenter.v1.SecurityCenterClient; import com.google.cloud.securitycenter.v1.SecurityCenterClient.ListNotificationConfigsPagedResponse; import com.google.common.collect.ImmutableList; import java.io.IOException; -// [END scc_list_notification_configs] // [END securitycenter_list_notification_configs] /** Snippets for how to ListNotificationConfig. */ @@ -32,7 +30,6 @@ final class ListNotificationConfigSnippets { private ListNotificationConfigSnippets() {} // [START securitycenter_list_notification_configs] - // [START scc_list_notification_configs] public static ImmutableList listNotificationConfigs(String organizationId) throws IOException { // String organizationId = "{your-org-id}"; @@ -50,7 +47,6 @@ public static ImmutableList listNotificationConfigs(String o return notificationConfigs; } } - // [END scc_list_notification_configs] // [END securitycenter_list_notification_configs] } diff --git a/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/NotificationReceiver.java b/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/NotificationReceiver.java index 4fe7e96a1..a8980a6d3 100644 --- a/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/NotificationReceiver.java +++ b/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/NotificationReceiver.java @@ -17,7 +17,6 @@ package com.google.cloud.examples.securitycenter.snippets; // [START securitycenter_receive_notifications] -// [START scc_receive_notifications] import com.google.cloud.pubsub.v1.AckReplyConsumer; import com.google.cloud.pubsub.v1.MessageReceiver; @@ -73,5 +72,4 @@ public static void receiveNotificationMessages(String projectId, String subscrip } } } -// [END scc_receive_notifications] // [END securitycenter_receive_notifications] diff --git a/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/UpdateNotificationConfigSnippets.java b/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/UpdateNotificationConfigSnippets.java index 6103d1dd2..bc77d5568 100644 --- a/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/UpdateNotificationConfigSnippets.java +++ b/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/UpdateNotificationConfigSnippets.java @@ -17,13 +17,11 @@ package com.google.cloud.examples.securitycenter.snippets; // [START securitycenter_update_notification_config] -// [START scc_update_notification_config] import com.google.cloud.securitycenter.v1.NotificationConfig; import com.google.cloud.securitycenter.v1.NotificationConfig.StreamingConfig; import com.google.cloud.securitycenter.v1.SecurityCenterClient; import com.google.protobuf.FieldMask; import java.io.IOException; -// [END scc_update_notification_config] // [END securitycenter_update_notification_config] /** Snippets for UpdateNotificationConfig. */ @@ -31,7 +29,6 @@ final class UpdateNotificationConfigSnippets { private UpdateNotificationConfigSnippets() {} // [START securitycenter_update_notification_config] - // [START scc_update_notification_config] public static NotificationConfig updateNotificationConfig( String organizationId, String notificationConfigId, String projectId, String topicName) throws IOException { @@ -67,6 +64,5 @@ public static NotificationConfig updateNotificationConfig( return updatedConfig; } } - // [END scc_update_notification_config] // [END securitycenter_update_notification_config] } \ No newline at end of file From 2a514443b7f6d98ff030e98bfd2f1c332d0d4b19 Mon Sep 17 00:00:00 2001 From: Anthony Wens Date: Mon, 1 Mar 2021 17:40:15 +0000 Subject: [PATCH 3/4] docs: add overlooked change --- .../snippets/CreateNotificationConfigSnippets.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/CreateNotificationConfigSnippets.java b/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/CreateNotificationConfigSnippets.java index b8bd2c89a..bb065579e 100644 --- a/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/CreateNotificationConfigSnippets.java +++ b/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/CreateNotificationConfigSnippets.java @@ -17,13 +17,11 @@ package com.google.cloud.examples.securitycenter.snippets; // [START securitycenter_create_notification_config] -// [START scc_create_notification_config] import com.google.cloud.securitycenter.v1.CreateNotificationConfigRequest; import com.google.cloud.securitycenter.v1.NotificationConfig; import com.google.cloud.securitycenter.v1.NotificationConfig.StreamingConfig; import com.google.cloud.securitycenter.v1.SecurityCenterClient; import java.io.IOException; -// [END scc_create_notification_config] // [END securitycenter_create_notification_config] /** Create NotificationConfig Snippet. */ @@ -31,7 +29,6 @@ final class CreateNotificationConfigSnippets { private CreateNotificationConfigSnippets() {} // [START securitycenter_create_notification_config] - // [START scc_create_notification_config] public static NotificationConfig createNotificationConfig( String organizationId, String notificationConfigId, String projectId, String topicName) throws IOException { @@ -64,6 +61,5 @@ public static NotificationConfig createNotificationConfig( return response; } } - // [END scc_create_notification_config] // [END securitycenter_create_notification_config] } From 38008cd66be185b98925c1b86b74965ebd45ab44 Mon Sep 17 00:00:00 2001 From: Anthony Wens Date: Mon, 1 Mar 2021 19:27:38 +0000 Subject: [PATCH 4/4] docs: fix region tag placement --- .../snippets/DeleteNotificationConfigSnippets.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/DeleteNotificationConfigSnippets.java b/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/DeleteNotificationConfigSnippets.java index 33ef92790..487fe0a56 100644 --- a/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/DeleteNotificationConfigSnippets.java +++ b/samples/snippets/src/main/java/com/google/cloud/examples/securitycenter/snippets/DeleteNotificationConfigSnippets.java @@ -44,5 +44,5 @@ public static boolean deleteNotificationConfig(String organizationId, String not return true; } -// [END securitycenter_delete_notification_config] } +// [END securitycenter_delete_notification_config]