From 448620be7deb0546d65a82b9856ebbc553530a33 Mon Sep 17 00:00:00 2001 From: Kevin Gordillo Date: Tue, 23 Jun 2026 21:20:25 +0000 Subject: [PATCH 1/3] chore: move securitycenter sample and rename region tag --- .../securitycenter/FindingSnippets.java | 4 +- .../securitycenter/SourceSnippets.java | 0 .../securitycenter/ITFindingSnippets.java | 0 .../securitycenter/ITSourceSnippets.java | 0 securitycenter/snippets/pom.xml | 48 ------------------- 5 files changed, 2 insertions(+), 50 deletions(-) rename {securitycenter => security-command-center}/snippets/src/main/java/com/example/securitycenter/FindingSnippets.java (99%) rename {securitycenter => security-command-center}/snippets/src/main/java/com/example/securitycenter/SourceSnippets.java (100%) rename {securitycenter => security-command-center}/snippets/src/test/java/com/example/securitycenter/ITFindingSnippets.java (100%) rename {securitycenter => security-command-center}/snippets/src/test/java/com/example/securitycenter/ITSourceSnippets.java (100%) delete mode 100644 securitycenter/snippets/pom.xml diff --git a/securitycenter/snippets/src/main/java/com/example/securitycenter/FindingSnippets.java b/security-command-center/snippets/src/main/java/com/example/securitycenter/FindingSnippets.java similarity index 99% rename from securitycenter/snippets/src/main/java/com/example/securitycenter/FindingSnippets.java rename to security-command-center/snippets/src/main/java/com/example/securitycenter/FindingSnippets.java index b2f0b71c10d..b89f766909d 100644 --- a/securitycenter/snippets/src/main/java/com/example/securitycenter/FindingSnippets.java +++ b/security-command-center/snippets/src/main/java/com/example/securitycenter/FindingSnippets.java @@ -289,7 +289,7 @@ static ImmutableList listFilteredFindings(SourceName sourceN * * @param sourceName The source to list findings at a specific time for. */ - // [START securitycenter_list_findings_at_time] + // [START securitycenter_list_findings_within_time_range] static ImmutableList listFindingsAtTime(SourceName sourceName) { try (SecurityCenterClient client = SecurityCenterClient.create()) { // parentId: must be one of the following: @@ -321,7 +321,7 @@ static ImmutableList listFindingsAtTime(SourceName sourceNam throw new RuntimeException("Couldn't create client.", e); } } - // [END securitycenter_list_findings_at_time] + // [END securitycenter_list_findings_within_time_range] /** * Demonstrate calling testIamPermissions to determin if the service account has the correct diff --git a/securitycenter/snippets/src/main/java/com/example/securitycenter/SourceSnippets.java b/security-command-center/snippets/src/main/java/com/example/securitycenter/SourceSnippets.java similarity index 100% rename from securitycenter/snippets/src/main/java/com/example/securitycenter/SourceSnippets.java rename to security-command-center/snippets/src/main/java/com/example/securitycenter/SourceSnippets.java diff --git a/securitycenter/snippets/src/test/java/com/example/securitycenter/ITFindingSnippets.java b/security-command-center/snippets/src/test/java/com/example/securitycenter/ITFindingSnippets.java similarity index 100% rename from securitycenter/snippets/src/test/java/com/example/securitycenter/ITFindingSnippets.java rename to security-command-center/snippets/src/test/java/com/example/securitycenter/ITFindingSnippets.java diff --git a/securitycenter/snippets/src/test/java/com/example/securitycenter/ITSourceSnippets.java b/security-command-center/snippets/src/test/java/com/example/securitycenter/ITSourceSnippets.java similarity index 100% rename from securitycenter/snippets/src/test/java/com/example/securitycenter/ITSourceSnippets.java rename to security-command-center/snippets/src/test/java/com/example/securitycenter/ITSourceSnippets.java diff --git a/securitycenter/snippets/pom.xml b/securitycenter/snippets/pom.xml deleted file mode 100644 index d216b83b341..00000000000 --- a/securitycenter/snippets/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - 4.0.0 - com.example.securitycenter - securitycenter-snippets - jar - Google Security Center Snippets - - - com.google.cloud.samples - shared-configuration - 1.2.0 - - - - 1.8 - 1.8 - UTF-8 - - - - - - com.google.cloud - libraries-bom - 26.33.0 - pom - import - - - - - - - com.google.cloud - google-cloud-securitycenter - - - - junit - junit - 4.13.2 - test - - - \ No newline at end of file From b32aca8b5a4e88760e5e02906044f0c51d7ebc9c Mon Sep 17 00:00:00 2001 From: Kevin Gordillo Date: Tue, 23 Jun 2026 22:40:58 +0000 Subject: [PATCH 2/3] test: add pre-test cleanup logic to delete existing custom modules in setup methods --- .../api/EventThreatDetectionCustomModuleTest.java | 14 ++++++++++++++ .../SecurityHealthAnalyticsCustomModuleTest.java | 13 +++++++++++++ 2 files changed, 27 insertions(+) diff --git a/security-command-center/snippets/src/test/java/management/api/EventThreatDetectionCustomModuleTest.java b/security-command-center/snippets/src/test/java/management/api/EventThreatDetectionCustomModuleTest.java index 5c0743c5233..58f0eb6cf46 100644 --- a/security-command-center/snippets/src/test/java/management/api/EventThreatDetectionCustomModuleTest.java +++ b/security-command-center/snippets/src/test/java/management/api/EventThreatDetectionCustomModuleTest.java @@ -69,6 +69,20 @@ public static void requireEnvVar(String envVarName) { public static void setUp() { requireEnvVar("GOOGLE_APPLICATION_CREDENTIALS"); requireEnvVar("SCC_PROJECT_ID"); + try { + ListEventThreatDetectionCustomModulesPagedResponse response = + ListEventThreatDetectionCustomModules + .listEventThreatDetectionCustomModules(PROJECT_ID); + for (EventThreatDetectionCustomModule module : response.iterateAll()) { + if (module.getDisplayName() != null + && module.getDisplayName().startsWith("java_sample_etd_custom_module_test_")) { + deleteCustomModule(PROJECT_ID, extractCustomModuleId(module.getName())); + } + } + } catch (Exception e) { + System.err.println( + "Warning: Pre-test cleanup of custom modules failed: " + e.getMessage()); + } } @AfterClass diff --git a/security-command-center/snippets/src/test/java/management/api/SecurityHealthAnalyticsCustomModuleTest.java b/security-command-center/snippets/src/test/java/management/api/SecurityHealthAnalyticsCustomModuleTest.java index 7e2bae5e109..a1cd235b524 100644 --- a/security-command-center/snippets/src/test/java/management/api/SecurityHealthAnalyticsCustomModuleTest.java +++ b/security-command-center/snippets/src/test/java/management/api/SecurityHealthAnalyticsCustomModuleTest.java @@ -67,6 +67,19 @@ public static void requireEnvVar(String envVarName) { public static void setUp() throws InterruptedException { requireEnvVar("GOOGLE_APPLICATION_CREDENTIALS"); requireEnvVar("SCC_PROJECT_ID"); + try { + ListSecurityHealthAnalyticsCustomModulesPagedResponse response = + ListSecurityHealthAnalyticsCustomModules + .listSecurityHealthAnalyticsCustomModules(PROJECT_ID); + for (SecurityHealthAnalyticsCustomModule module : response.iterateAll()) { + if (CUSTOM_MODULE_DISPLAY_NAME.equals(module.getDisplayName())) { + deleteCustomModule(PROJECT_ID, extractCustomModuleId(module.getName())); + } + } + } catch (Exception e) { + System.err.println( + "Warning: Pre-test cleanup of custom modules failed: " + e.getMessage()); + } } @AfterClass From e3a7f87dd3b1127f11987076ad0ede8b993cb5ee Mon Sep 17 00:00:00 2001 From: Kevin Gordillo Date: Tue, 23 Jun 2026 23:50:24 +0000 Subject: [PATCH 3/3] refactor: replace paged response types with ImmutableList in Security Command Center management snippets --- ...dantEventThreatDetectionCustomModules.java | 11 +++++----- ...tSecurityHealthAnalyticsCustomModules.java | 11 +++++----- ...tiveEventThreatDetectionCustomModules.java | 11 +++++----- ...eSecurityHealthAnalyticsCustomModules.java | 11 +++++----- ...ListEventThreatDetectionCustomModules.java | 11 +++++----- .../api/ListSecurityCenterServices.java | 8 ++++---- ...tSecurityHealthAnalyticsCustomModules.java | 11 +++++----- .../EventThreatDetectionCustomModuleTest.java | 20 +++++++++---------- .../api/SecurityCenterServiceTest.java | 7 +++---- ...curityHealthAnalyticsCustomModuleTest.java | 20 +++++++++---------- 10 files changed, 55 insertions(+), 66 deletions(-) diff --git a/security-command-center/snippets/src/main/java/management/api/ListDescendantEventThreatDetectionCustomModules.java b/security-command-center/snippets/src/main/java/management/api/ListDescendantEventThreatDetectionCustomModules.java index 1aeccbd4582..758aac2829b 100644 --- a/security-command-center/snippets/src/main/java/management/api/ListDescendantEventThreatDetectionCustomModules.java +++ b/security-command-center/snippets/src/main/java/management/api/ListDescendantEventThreatDetectionCustomModules.java @@ -17,9 +17,10 @@ package management.api; // [START securitycenter_list_descendant_event_threat_detection_custom_module] +import com.google.cloud.securitycentermanagement.v1.EventThreatDetectionCustomModule; import com.google.cloud.securitycentermanagement.v1.ListDescendantEventThreatDetectionCustomModulesRequest; import com.google.cloud.securitycentermanagement.v1.SecurityCenterManagementClient; -import com.google.cloud.securitycentermanagement.v1.SecurityCenterManagementClient.ListDescendantEventThreatDetectionCustomModulesPagedResponse; +import com.google.common.collect.ImmutableList; import java.io.IOException; public class ListDescendantEventThreatDetectionCustomModules { @@ -31,7 +32,7 @@ public static void main(String[] args) throws IOException { listDescendantEventThreatDetectionCustomModules(projectId); } - public static ListDescendantEventThreatDetectionCustomModulesPagedResponse + public static ImmutableList listDescendantEventThreatDetectionCustomModules(String projectId) throws IOException { // Initialize client that will be used to send requests. This client only needs @@ -46,10 +47,8 @@ public static void main(String[] args) throws IOException { .setParent(parent) .build(); - ListDescendantEventThreatDetectionCustomModulesPagedResponse response = - client.listDescendantEventThreatDetectionCustomModules(request); - - return response; + return ImmutableList.copyOf( + client.listDescendantEventThreatDetectionCustomModules(request).iterateAll()); } } } diff --git a/security-command-center/snippets/src/main/java/management/api/ListDescendantSecurityHealthAnalyticsCustomModules.java b/security-command-center/snippets/src/main/java/management/api/ListDescendantSecurityHealthAnalyticsCustomModules.java index ae39a37deb5..90209d83b03 100644 --- a/security-command-center/snippets/src/main/java/management/api/ListDescendantSecurityHealthAnalyticsCustomModules.java +++ b/security-command-center/snippets/src/main/java/management/api/ListDescendantSecurityHealthAnalyticsCustomModules.java @@ -19,7 +19,8 @@ // [START securitycenter_list_descendant_security_health_analytics_custom_module] import com.google.cloud.securitycentermanagement.v1.ListDescendantSecurityHealthAnalyticsCustomModulesRequest; import com.google.cloud.securitycentermanagement.v1.SecurityCenterManagementClient; -import com.google.cloud.securitycentermanagement.v1.SecurityCenterManagementClient.ListDescendantSecurityHealthAnalyticsCustomModulesPagedResponse; +import com.google.cloud.securitycentermanagement.v1.SecurityHealthAnalyticsCustomModule; +import com.google.common.collect.ImmutableList; import java.io.IOException; public class ListDescendantSecurityHealthAnalyticsCustomModules { @@ -32,7 +33,7 @@ public static void main(String[] args) throws IOException { listDescendantSecurityHealthAnalyticsCustomModules(projectId); } - public static ListDescendantSecurityHealthAnalyticsCustomModulesPagedResponse + public static ImmutableList listDescendantSecurityHealthAnalyticsCustomModules(String projectId) throws IOException { // Initialize client that will be used to send requests. This client only needs @@ -45,10 +46,8 @@ public static void main(String[] args) throws IOException { .setParent(String.format("projects/%s/locations/global", projectId)) .build(); - ListDescendantSecurityHealthAnalyticsCustomModulesPagedResponse response = - client.listDescendantSecurityHealthAnalyticsCustomModules(request); - - return response; + return ImmutableList.copyOf( + client.listDescendantSecurityHealthAnalyticsCustomModules(request).iterateAll()); } } } diff --git a/security-command-center/snippets/src/main/java/management/api/ListEffectiveEventThreatDetectionCustomModules.java b/security-command-center/snippets/src/main/java/management/api/ListEffectiveEventThreatDetectionCustomModules.java index e44490bc436..e291aad5a3c 100644 --- a/security-command-center/snippets/src/main/java/management/api/ListEffectiveEventThreatDetectionCustomModules.java +++ b/security-command-center/snippets/src/main/java/management/api/ListEffectiveEventThreatDetectionCustomModules.java @@ -17,9 +17,10 @@ package management.api; // [START securitycenter_list_effective_event_threat_detection_custom_module] +import com.google.cloud.securitycentermanagement.v1.EffectiveEventThreatDetectionCustomModule; import com.google.cloud.securitycentermanagement.v1.ListEffectiveEventThreatDetectionCustomModulesRequest; import com.google.cloud.securitycentermanagement.v1.SecurityCenterManagementClient; -import com.google.cloud.securitycentermanagement.v1.SecurityCenterManagementClient.ListEffectiveEventThreatDetectionCustomModulesPagedResponse; +import com.google.common.collect.ImmutableList; import java.io.IOException; public class ListEffectiveEventThreatDetectionCustomModules { @@ -31,7 +32,7 @@ public static void main(String[] args) throws IOException { listEffectiveEventThreatDetectionCustomModules(projectId); } - public static ListEffectiveEventThreatDetectionCustomModulesPagedResponse + public static ImmutableList listEffectiveEventThreatDetectionCustomModules(String projectId) throws IOException { // Initialize client that will be used to send requests. This client only needs @@ -46,10 +47,8 @@ public static void main(String[] args) throws IOException { .setParent(parent) .build(); - ListEffectiveEventThreatDetectionCustomModulesPagedResponse response = - client.listEffectiveEventThreatDetectionCustomModules(request); - - return response; + return ImmutableList.copyOf( + client.listEffectiveEventThreatDetectionCustomModules(request).iterateAll()); } } } diff --git a/security-command-center/snippets/src/main/java/management/api/ListEffectiveSecurityHealthAnalyticsCustomModules.java b/security-command-center/snippets/src/main/java/management/api/ListEffectiveSecurityHealthAnalyticsCustomModules.java index 8e4da2917d9..4e57d9f70ae 100644 --- a/security-command-center/snippets/src/main/java/management/api/ListEffectiveSecurityHealthAnalyticsCustomModules.java +++ b/security-command-center/snippets/src/main/java/management/api/ListEffectiveSecurityHealthAnalyticsCustomModules.java @@ -17,9 +17,10 @@ package management.api; // [START securitycenter_list_effective_security_health_analytics_custom_module] +import com.google.cloud.securitycentermanagement.v1.EffectiveSecurityHealthAnalyticsCustomModule; import com.google.cloud.securitycentermanagement.v1.ListEffectiveSecurityHealthAnalyticsCustomModulesRequest; import com.google.cloud.securitycentermanagement.v1.SecurityCenterManagementClient; -import com.google.cloud.securitycentermanagement.v1.SecurityCenterManagementClient.ListEffectiveSecurityHealthAnalyticsCustomModulesPagedResponse; +import com.google.common.collect.ImmutableList; import java.io.IOException; public class ListEffectiveSecurityHealthAnalyticsCustomModules { @@ -32,7 +33,7 @@ public static void main(String[] args) throws IOException { listEffectiveSecurityHealthAnalyticsCustomModules(projectId); } - public static ListEffectiveSecurityHealthAnalyticsCustomModulesPagedResponse + public static ImmutableList listEffectiveSecurityHealthAnalyticsCustomModules(String projectId) throws IOException { // Initialize client that will be used to send requests. This client only needs @@ -45,10 +46,8 @@ public static void main(String[] args) throws IOException { .setParent(String.format("projects/%s/locations/global", projectId)) .build(); - ListEffectiveSecurityHealthAnalyticsCustomModulesPagedResponse response = - client.listEffectiveSecurityHealthAnalyticsCustomModules(request); - - return response; + return ImmutableList.copyOf( + client.listEffectiveSecurityHealthAnalyticsCustomModules(request).iterateAll()); } } } diff --git a/security-command-center/snippets/src/main/java/management/api/ListEventThreatDetectionCustomModules.java b/security-command-center/snippets/src/main/java/management/api/ListEventThreatDetectionCustomModules.java index 4e4b0340a1a..f7f287f0350 100644 --- a/security-command-center/snippets/src/main/java/management/api/ListEventThreatDetectionCustomModules.java +++ b/security-command-center/snippets/src/main/java/management/api/ListEventThreatDetectionCustomModules.java @@ -17,9 +17,10 @@ package management.api; // [START securitycenter_list_event_threat_detection_custom_module] +import com.google.cloud.securitycentermanagement.v1.EventThreatDetectionCustomModule; import com.google.cloud.securitycentermanagement.v1.ListEventThreatDetectionCustomModulesRequest; import com.google.cloud.securitycentermanagement.v1.SecurityCenterManagementClient; -import com.google.cloud.securitycentermanagement.v1.SecurityCenterManagementClient.ListEventThreatDetectionCustomModulesPagedResponse; +import com.google.common.collect.ImmutableList; import java.io.IOException; public class ListEventThreatDetectionCustomModules { @@ -32,7 +33,7 @@ public static void main(String[] args) throws IOException { listEventThreatDetectionCustomModules(projectId); } - public static ListEventThreatDetectionCustomModulesPagedResponse + public static ImmutableList listEventThreatDetectionCustomModules(String projectId) throws IOException { // Initialize client that will be used to send requests. This client only needs @@ -45,10 +46,8 @@ public static void main(String[] args) throws IOException { ListEventThreatDetectionCustomModulesRequest request = ListEventThreatDetectionCustomModulesRequest.newBuilder().setParent(parent).build(); - ListEventThreatDetectionCustomModulesPagedResponse response = - client.listEventThreatDetectionCustomModules(request); - - return response; + return ImmutableList.copyOf( + client.listEventThreatDetectionCustomModules(request).iterateAll()); } } } diff --git a/security-command-center/snippets/src/main/java/management/api/ListSecurityCenterServices.java b/security-command-center/snippets/src/main/java/management/api/ListSecurityCenterServices.java index 95978804ecd..775f2a7cdab 100644 --- a/security-command-center/snippets/src/main/java/management/api/ListSecurityCenterServices.java +++ b/security-command-center/snippets/src/main/java/management/api/ListSecurityCenterServices.java @@ -19,7 +19,8 @@ // [START securitycenter_list_security_center_service] import com.google.cloud.securitycentermanagement.v1.ListSecurityCenterServicesRequest; import com.google.cloud.securitycentermanagement.v1.SecurityCenterManagementClient; -import com.google.cloud.securitycentermanagement.v1.SecurityCenterManagementClient.ListSecurityCenterServicesPagedResponse; +import com.google.cloud.securitycentermanagement.v1.SecurityCenterService; +import com.google.common.collect.ImmutableList; import java.io.IOException; public class ListSecurityCenterServices { @@ -32,7 +33,7 @@ public static void main(String[] args) throws IOException { listSecurityCenterServices(projectId); } - public static ListSecurityCenterServicesPagedResponse listSecurityCenterServices(String projectId) + public static ImmutableList listSecurityCenterServices(String projectId) throws IOException { // Initialize client that will be used to send requests. This client only needs // to be created @@ -42,8 +43,7 @@ public static ListSecurityCenterServicesPagedResponse listSecurityCenterServices ListSecurityCenterServicesRequest.newBuilder() .setParent(String.format("projects/%s/locations/global", projectId)) .build(); - ListSecurityCenterServicesPagedResponse response = client.listSecurityCenterServices(request); - return response; + return ImmutableList.copyOf(client.listSecurityCenterServices(request).iterateAll()); } } } diff --git a/security-command-center/snippets/src/main/java/management/api/ListSecurityHealthAnalyticsCustomModules.java b/security-command-center/snippets/src/main/java/management/api/ListSecurityHealthAnalyticsCustomModules.java index f3d994f9c60..a47807e9f58 100644 --- a/security-command-center/snippets/src/main/java/management/api/ListSecurityHealthAnalyticsCustomModules.java +++ b/security-command-center/snippets/src/main/java/management/api/ListSecurityHealthAnalyticsCustomModules.java @@ -19,7 +19,8 @@ // [START securitycenter_list_security_health_analytics_custom_module] import com.google.cloud.securitycentermanagement.v1.ListSecurityHealthAnalyticsCustomModulesRequest; import com.google.cloud.securitycentermanagement.v1.SecurityCenterManagementClient; -import com.google.cloud.securitycentermanagement.v1.SecurityCenterManagementClient.ListSecurityHealthAnalyticsCustomModulesPagedResponse; +import com.google.cloud.securitycentermanagement.v1.SecurityHealthAnalyticsCustomModule; +import com.google.common.collect.ImmutableList; import java.io.IOException; public class ListSecurityHealthAnalyticsCustomModules { @@ -32,7 +33,7 @@ public static void main(String[] args) throws IOException { listSecurityHealthAnalyticsCustomModules(projectId); } - public static ListSecurityHealthAnalyticsCustomModulesPagedResponse + public static ImmutableList listSecurityHealthAnalyticsCustomModules(String projectId) throws IOException { // Initialize client that will be used to send requests. This client only needs // to be created @@ -44,10 +45,8 @@ public static void main(String[] args) throws IOException { .setParent(String.format("projects/%s/locations/global", projectId)) .build(); - ListSecurityHealthAnalyticsCustomModulesPagedResponse response = - client.listSecurityHealthAnalyticsCustomModules(request); - - return response; + return ImmutableList.copyOf( + client.listSecurityHealthAnalyticsCustomModules(request).iterateAll()); } } } diff --git a/security-command-center/snippets/src/test/java/management/api/EventThreatDetectionCustomModuleTest.java b/security-command-center/snippets/src/test/java/management/api/EventThreatDetectionCustomModuleTest.java index 58f0eb6cf46..cbce3e4632e 100644 --- a/security-command-center/snippets/src/test/java/management/api/EventThreatDetectionCustomModuleTest.java +++ b/security-command-center/snippets/src/test/java/management/api/EventThreatDetectionCustomModuleTest.java @@ -24,12 +24,10 @@ import com.google.cloud.securitycentermanagement.v1.EffectiveEventThreatDetectionCustomModule; import com.google.cloud.securitycentermanagement.v1.EventThreatDetectionCustomModule; import com.google.cloud.securitycentermanagement.v1.EventThreatDetectionCustomModule.EnablementState; -import com.google.cloud.securitycentermanagement.v1.SecurityCenterManagementClient.ListDescendantEventThreatDetectionCustomModulesPagedResponse; -import com.google.cloud.securitycentermanagement.v1.SecurityCenterManagementClient.ListEffectiveEventThreatDetectionCustomModulesPagedResponse; -import com.google.cloud.securitycentermanagement.v1.SecurityCenterManagementClient.ListEventThreatDetectionCustomModulesPagedResponse; import com.google.cloud.securitycentermanagement.v1.ValidateEventThreatDetectionCustomModuleResponse; import com.google.cloud.testing.junit4.MultipleAttemptsRule; import com.google.common.base.Strings; +import com.google.common.collect.ImmutableList; import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -70,10 +68,10 @@ public static void setUp() { requireEnvVar("GOOGLE_APPLICATION_CREDENTIALS"); requireEnvVar("SCC_PROJECT_ID"); try { - ListEventThreatDetectionCustomModulesPagedResponse response = + ImmutableList response = ListEventThreatDetectionCustomModules .listEventThreatDetectionCustomModules(PROJECT_ID); - for (EventThreatDetectionCustomModule module : response.iterateAll()) { + for (EventThreatDetectionCustomModule module : response) { if (module.getDisplayName() != null && module.getDisplayName().startsWith("java_sample_etd_custom_module_test_")) { deleteCustomModule(PROJECT_ID, extractCustomModuleId(module.getName())); @@ -148,10 +146,10 @@ public void testListEventThreatDetectionCustomModules() throws IOException { CreateEventThreatDetectionCustomModule.createEventThreatDetectionCustomModule( PROJECT_ID, CUSTOM_MODULE_DISPLAY_NAME); createdCustomModuleIds.add(extractCustomModuleId(createCustomModuleResponse.getName())); - ListEventThreatDetectionCustomModulesPagedResponse response = + ImmutableList response = ListEventThreatDetectionCustomModules.listEventThreatDetectionCustomModules(PROJECT_ID); assertTrue( - StreamSupport.stream(response.iterateAll().spliterator(), false) + response.stream() .anyMatch(module -> CUSTOM_MODULE_DISPLAY_NAME.equals(module.getDisplayName()))); } @@ -207,11 +205,11 @@ public void testListEffectiveEventThreatDetectionCustomModules() throws IOExcept CreateEventThreatDetectionCustomModule.createEventThreatDetectionCustomModule( PROJECT_ID, CUSTOM_MODULE_DISPLAY_NAME); createdCustomModuleIds.add(extractCustomModuleId(createCustomModuleResponse.getName())); - ListEffectiveEventThreatDetectionCustomModulesPagedResponse response = + ImmutableList response = ListEffectiveEventThreatDetectionCustomModules .listEffectiveEventThreatDetectionCustomModules(PROJECT_ID); assertTrue( - StreamSupport.stream(response.iterateAll().spliterator(), false) + response.stream() .anyMatch(module -> CUSTOM_MODULE_DISPLAY_NAME.equals(module.getDisplayName()))); } @@ -221,11 +219,11 @@ public void testListDescendantEventThreatDetectionCustomModules() throws IOExcep CreateEventThreatDetectionCustomModule.createEventThreatDetectionCustomModule( PROJECT_ID, CUSTOM_MODULE_DISPLAY_NAME); createdCustomModuleIds.add(extractCustomModuleId(createCustomModuleResponse.getName())); - ListDescendantEventThreatDetectionCustomModulesPagedResponse response = + ImmutableList response = ListDescendantEventThreatDetectionCustomModules .listDescendantEventThreatDetectionCustomModules(PROJECT_ID); assertTrue( - StreamSupport.stream(response.iterateAll().spliterator(), false) + response.stream() .anyMatch(module -> CUSTOM_MODULE_DISPLAY_NAME.equals(module.getDisplayName()))); } diff --git a/security-command-center/snippets/src/test/java/management/api/SecurityCenterServiceTest.java b/security-command-center/snippets/src/test/java/management/api/SecurityCenterServiceTest.java index fba741c7ad7..096a3292afc 100644 --- a/security-command-center/snippets/src/test/java/management/api/SecurityCenterServiceTest.java +++ b/security-command-center/snippets/src/test/java/management/api/SecurityCenterServiceTest.java @@ -21,11 +21,10 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import com.google.cloud.securitycentermanagement.v1.SecurityCenterManagementClient.ListSecurityCenterServicesPagedResponse; import com.google.cloud.securitycentermanagement.v1.SecurityCenterService; import com.google.cloud.securitycentermanagement.v1.SecurityCenterService.EnablementState; +import com.google.common.collect.ImmutableList; import java.io.IOException; -import java.util.stream.StreamSupport; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -63,12 +62,12 @@ public void testGetSecurityCenterService() throws IOException { @Test public void testListSecurityCenterServices() throws IOException { - ListSecurityCenterServicesPagedResponse response = + ImmutableList response = ListSecurityCenterServices.listSecurityCenterServices(PROJECT_ID); assertNotNull(response); // check whether the response contains the specified service assertTrue( - StreamSupport.stream(response.iterateAll().spliterator(), false) + response.stream() .anyMatch(service -> service.getName().contains(SERVICE))); } diff --git a/security-command-center/snippets/src/test/java/management/api/SecurityHealthAnalyticsCustomModuleTest.java b/security-command-center/snippets/src/test/java/management/api/SecurityHealthAnalyticsCustomModuleTest.java index a1cd235b524..852e2617986 100644 --- a/security-command-center/snippets/src/test/java/management/api/SecurityHealthAnalyticsCustomModuleTest.java +++ b/security-command-center/snippets/src/test/java/management/api/SecurityHealthAnalyticsCustomModuleTest.java @@ -22,14 +22,12 @@ import static org.junit.Assert.assertTrue; import com.google.cloud.securitycentermanagement.v1.EffectiveSecurityHealthAnalyticsCustomModule; -import com.google.cloud.securitycentermanagement.v1.SecurityCenterManagementClient.ListDescendantSecurityHealthAnalyticsCustomModulesPagedResponse; -import com.google.cloud.securitycentermanagement.v1.SecurityCenterManagementClient.ListEffectiveSecurityHealthAnalyticsCustomModulesPagedResponse; -import com.google.cloud.securitycentermanagement.v1.SecurityCenterManagementClient.ListSecurityHealthAnalyticsCustomModulesPagedResponse; import com.google.cloud.securitycentermanagement.v1.SecurityHealthAnalyticsCustomModule; import com.google.cloud.securitycentermanagement.v1.SecurityHealthAnalyticsCustomModule.EnablementState; import com.google.cloud.securitycentermanagement.v1.SimulateSecurityHealthAnalyticsCustomModuleResponse; import com.google.cloud.testing.junit4.MultipleAttemptsRule; import com.google.common.base.Strings; +import com.google.common.collect.ImmutableList; import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -68,10 +66,10 @@ public static void setUp() throws InterruptedException { requireEnvVar("GOOGLE_APPLICATION_CREDENTIALS"); requireEnvVar("SCC_PROJECT_ID"); try { - ListSecurityHealthAnalyticsCustomModulesPagedResponse response = + ImmutableList response = ListSecurityHealthAnalyticsCustomModules .listSecurityHealthAnalyticsCustomModules(PROJECT_ID); - for (SecurityHealthAnalyticsCustomModule module : response.iterateAll()) { + for (SecurityHealthAnalyticsCustomModule module : response) { if (CUSTOM_MODULE_DISPLAY_NAME.equals(module.getDisplayName())) { deleteCustomModule(PROJECT_ID, extractCustomModuleId(module.getName())); } @@ -145,11 +143,11 @@ public void testListSecurityHealthAnalyticsCustomModules() throws IOException { CreateSecurityHealthAnalyticsCustomModule.createSecurityHealthAnalyticsCustomModule( PROJECT_ID, CUSTOM_MODULE_DISPLAY_NAME); createdCustomModuleIds.add(extractCustomModuleId(createCustomModuleResponse.getName())); - ListSecurityHealthAnalyticsCustomModulesPagedResponse response = + ImmutableList response = ListSecurityHealthAnalyticsCustomModules.listSecurityHealthAnalyticsCustomModules( PROJECT_ID); assertTrue( - StreamSupport.stream(response.iterateAll().spliterator(), false) + response.stream() .anyMatch(module -> CUSTOM_MODULE_DISPLAY_NAME.equals(module.getDisplayName()))); } @@ -205,11 +203,11 @@ public void testListEffectiveSecurityHealthAnalyticsCustomModules() throws IOExc CreateSecurityHealthAnalyticsCustomModule.createSecurityHealthAnalyticsCustomModule( PROJECT_ID, CUSTOM_MODULE_DISPLAY_NAME); createdCustomModuleIds.add(extractCustomModuleId(createCustomModuleResponse.getName())); - ListEffectiveSecurityHealthAnalyticsCustomModulesPagedResponse response = + ImmutableList response = ListEffectiveSecurityHealthAnalyticsCustomModules .listEffectiveSecurityHealthAnalyticsCustomModules(PROJECT_ID); assertTrue( - StreamSupport.stream(response.iterateAll().spliterator(), false) + response.stream() .anyMatch(module -> CUSTOM_MODULE_DISPLAY_NAME.equals(module.getDisplayName()))); } @@ -219,11 +217,11 @@ public void testListDescendantSecurityHealthAnalyticsCustomModules() throws IOEx CreateSecurityHealthAnalyticsCustomModule.createSecurityHealthAnalyticsCustomModule( PROJECT_ID, CUSTOM_MODULE_DISPLAY_NAME); createdCustomModuleIds.add(extractCustomModuleId(createCustomModuleResponse.getName())); - ListDescendantSecurityHealthAnalyticsCustomModulesPagedResponse response = + ImmutableList response = ListDescendantSecurityHealthAnalyticsCustomModules .listDescendantSecurityHealthAnalyticsCustomModules(PROJECT_ID); assertTrue( - StreamSupport.stream(response.iterateAll().spliterator(), false) + response.stream() .anyMatch(module -> CUSTOM_MODULE_DISPLAY_NAME.equals(module.getDisplayName()))); }