Merge branch 'main' into ludo-java21

Author: ludoch

compute/mailjet/src/main/java/com/example/compute/mailjet/MailjetSender.java

@@ -16,7 +16,7 @@
 
 package com.example.compute.mailjet;
 
-// [START mailjet_imports]
+// [START compute_mailjet_imports]
 
 import com.mailjet.client.ClientOptions;
 import com.mailjet.client.MailjetClient;
@@ -27,8 +27,9 @@
 import org.json.JSONArray;
 import org.json.JSONObject;
 
-// [END mailjet_imports]
+// [END compute_mailjet_imports]
 
+// [START compute_mailjet_send_email]
 // [START app]
 public class MailjetSender {
 
@@ -82,3 +83,4 @@ public MailjetResponse sendMailjet(String recipient, String sender, MailjetClien
   }
 }
 // [END app]
+// [END compute_mailjet_send_email]

compute/sendgrid/pom.xml

@@ -37,13 +37,13 @@
   </properties>
 
   <dependencies>
-    <!-- [START dependencies] -->
+    <!-- [START compute_sendgrid_dependencies_java] -->
     <dependency>
       <groupId>com.sendgrid</groupId>
       <artifactId>sendgrid-java</artifactId>
       <version>4.10.1</version>
     </dependency>
-    <!-- [END dependencies] -->
+    <!-- [END compute_sendgrid_dependencies_java] -->
   </dependencies>
   <build>
     <plugins>

compute/sendgrid/src/main/java/com/example/compute/sendgrid/SendEmailServlet.java

@@ -25,7 +25,7 @@
 import com.sendgrid.helpers.mail.objects.Email;
 import java.io.IOException;
 
-// [START example]
+// [START compute_sendgrid]
 public class SendEmailServlet {
   static final String SENDGRID_API_KEY = "YOUR-SENDGRID-API-KEY";
   static final String SENDGRID_SENDER = "YOUR-SENDGRID-FROM-EMAIL";
@@ -64,4 +64,4 @@ public static void main(String[] args) throws IOException {
   }
 
 }
-// [END example]
+// [END compute_sendgrid]

endpoints/getting-started/k8s/esp_echo_http.yaml

@@ -38,16 +38,13 @@ spec:
       labels:
         app: esp-echo
     spec:
-      # [START endpoints_secret_1_java]
-      # [START secret-1]
+      # [START endpoints_secret1_yaml_java]
       volumes:
         - name: service-account-creds
           secret:
             secretName: service-account-creds
-      # [END secret-1]
-      # [END endpoints_secret_1_java]
-      # [START endpoints_service_java]
-      # [START service]
+      # [END endpoints_secret1_yaml_java]
+      # [START endpoints_service_yaml_java]
       containers:
         - name: esp
           image: gcr.io/endpoints-release/endpoints-runtime:1
@@ -58,19 +55,16 @@ spec:
             "--rollout_strategy", "managed",
             "--service_account_key", "/etc/nginx/creds/service-account-creds.json",
           ]
-      # [END service]
-      # [END endpoints_service_java]
+      # [END endpoints_service_yaml_java]
           ports:
             - containerPort: 8080
-          # [START endpoints_secret_2_java]
-          # [START secret-2]
+          # [START endpoints_secret2_yaml_java]
           volumeMounts:
             - mountPath: /etc/nginx/creds
               name: service-account-creds
               readOnly: true
-          # [END secret-2]
-          # [END endpoints_secret_2_java]
+          # [END endpoints_secret2_yaml_java]
         - name: echo
           image: gcr.io/endpoints-release/echo:latest
           ports:
-            - containerPort: 8081
+            - containerPort: 8081

jobs/v3/src/main/java/com/google/samples/AutoCompleteSample.java

@@ -38,7 +38,7 @@ public final class AutoCompleteSample {
   private static CloudTalentSolution talentSolutionClient =
       JobServiceQuickstart.getTalentSolutionClient();
 
-  // [START auto_complete_job_title]
+  // [START job_auto_complete_job_title]
 
   /** Auto completes job titles within given companyName. */
   public static void jobTitleAutoComplete(String companyName, String query) throws IOException {
@@ -59,9 +59,9 @@ public static void jobTitleAutoComplete(String companyName, String query) throws
 
     System.out.println(results);
   }
-  // [END auto_complete_job_title]
+  // [END job_auto_complete_job_title]
 
-  // [START auto_complete_default]
+  // [START job_auto_complete_default]
   /** Auto completes job titles within given companyName. */
   public static void defaultAutoComplete(String companyName, String query) throws IOException {
     Complete complete =
@@ -79,7 +79,7 @@ public static void defaultAutoComplete(String companyName, String query) throws
 
     System.out.println(results);
   }
-  // [END auto_complete_default]
+  // [END job_auto_complete_default]
 
   public static void main(String... args) throws Exception {
     Company companyToBeCreated = BasicCompanySample.generateCompany().setDisplayName("Google");

jobs/v3/src/main/java/com/google/samples/LocationSearchSample.java

@@ -49,7 +49,6 @@ public final class LocationSearchSample {
       JobServiceQuickstart.getTalentSolutionClient();
 
   // [START job_basic_location_search]
-  // [START basic_location_search]
 
   /** Basic location Search */
   public static void basicLocationSearch(String companyName, String location, double distance)
@@ -80,11 +79,9 @@ public static void basicLocationSearch(String companyName, String location, doub
     System.out.printf("Basic location search results: %s", response);
 
   }
-  // [END basic_location_search]
   // [END job_basic_location_search]
 
   // [START job_keyword_location_search]
-  // [START keyword_location_search]
 
   /** Keyword location Search */
   public static void keywordLocationSearch(
@@ -116,11 +113,9 @@ public static void keywordLocationSearch(
     Thread.sleep(1000);
     System.out.printf("Keyword location search results: %s", response);
   }
-  // [END keyword_location_search]
   // [END job_keyword_location_search]
 
   // [START job_city_location_search]
-  // [START city_location_search]
 
   /** City location Search */
   public static void cityLocationSearch(String companyName, String location)
@@ -149,11 +144,9 @@ public static void cityLocationSearch(String companyName, String location)
     Thread.sleep(1000);
     System.out.printf("City locations search results: %s", response);
   }
-  // [END city_location_search]
   // [END job_city_location_search]
 
   // [START job_multi_locations_search]
-  // [START multi_locations_search]
 
   /** Multiple locations Search */
   public static void multiLocationsSearch(
@@ -189,10 +182,8 @@ public static void multiLocationsSearch(
 
   }
   // [END job_multi_locations_search]
-  // [END multi_locations_search]
 
   // [START job_broadening_location_search]
-  // [START broadening_location_search]
 
   /** Broadening location Search */
   public static void broadeningLocationsSearch(String companyName, String location)
@@ -222,7 +213,6 @@ public static void broadeningLocationsSearch(String companyName, String location
     Thread.sleep(1000);
     System.out.printf("Broadening locations search results: %s", response);
   }
-  // [END broadening_location_search]
   // [END job_broadening_location_search]
 
   public static void main(String... args) throws Exception {
@@ -257,4 +247,4 @@ public static void main(String... args) throws Exception {
     BasicJobSample.deleteJob(jobName2);
     BasicCompanySample.deleteCompany(companyName);
   }
-}
+}

security-command-center/snippets/src/test/java/management/api/EventThreatDetectionCustomModuleTest.java

@@ -24,15 +24,15 @@
 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.ListEventThreatDetectionCustomModulesRequest;
-import com.google.cloud.securitycentermanagement.v1.SecurityCenterManagementClient;
 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 java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.UUID;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -52,6 +52,7 @@ public class EventThreatDetectionCustomModuleTest {
       "java_sample_etd_custom_module_test_" + UUID.randomUUID();
   private static final int MAX_ATTEMPT_COUNT = 3;
   private static final int INITIAL_BACKOFF_MILLIS = 120000; // 2 minutes
+  private static List<String> createdCustomModuleIds = new ArrayList<>();
 
   @Rule
   public final MultipleAttemptsRule multipleAttemptsRule =
@@ -71,36 +72,16 @@ public static void setUp() {
   }
 
   @AfterClass
+  // Perform cleanup of all the custom modules created by the current execution of the test, after
+  // running tests
   public static void cleanUp() throws IOException {
-    // Perform cleanup after running tests
-    cleanupExistingCustomModules();
-  }
-
-  // cleanupExistingCustomModules clean up all the existing custom module
-  private static void cleanupExistingCustomModules() throws IOException {
-    try (SecurityCenterManagementClient client = SecurityCenterManagementClient.create()) {
-      ListEventThreatDetectionCustomModulesRequest request =
-          ListEventThreatDetectionCustomModulesRequest.newBuilder()
-              .setParent(String.format("projects/%s/locations/global", PROJECT_ID))
-              .build();
-      ListEventThreatDetectionCustomModulesPagedResponse response =
-          client.listEventThreatDetectionCustomModules(request);
-      // Iterate over the response and delete custom module one by one which start with
-      // java_sample_custom_module
-      for (EventThreatDetectionCustomModule module : response.iterateAll()) {
-        try {
-          if (module.getDisplayName().startsWith("java_sample_etd_custom_module")) {
-            String customModuleId = extractCustomModuleId(module.getName());
-            deleteCustomModule(PROJECT_ID, customModuleId);
-          }
-        } catch (Exception e) {
-          System.err.println("Failed to delete module: " + module.getDisplayName());
-          e.printStackTrace();
-        }
+    for (String customModuleId : createdCustomModuleIds) {
+      try {
+        deleteCustomModule(PROJECT_ID, customModuleId);
+      } catch (Exception e) {
+        System.err.println("Failed to delete module: " + customModuleId);
+        e.printStackTrace();
       }
-    } catch (Exception e) {
-      System.err.println("Failed to process cleanupExistingCustomModules.");
-      e.printStackTrace();
     }
   }
 
@@ -131,6 +112,7 @@ public void testCreateEventThreatDetectionCustomModule() throws IOException {
     EventThreatDetectionCustomModule response =
         CreateEventThreatDetectionCustomModule.createEventThreatDetectionCustomModule(
             PROJECT_ID, CUSTOM_MODULE_DISPLAY_NAME);
+    createdCustomModuleIds.add(extractCustomModuleId(response.getName()));
     assertNotNull(response);
     assertThat(response.getDisplayName()).isEqualTo(CUSTOM_MODULE_DISPLAY_NAME);
   }
@@ -148,8 +130,10 @@ public void testDeleteEventThreatDetectionCustomModule() throws IOException {
 
   @Test
   public void testListEventThreatDetectionCustomModules() throws IOException {
-    CreateEventThreatDetectionCustomModule.createEventThreatDetectionCustomModule(
-        PROJECT_ID, CUSTOM_MODULE_DISPLAY_NAME);
+    EventThreatDetectionCustomModule createCustomModuleResponse =
+        CreateEventThreatDetectionCustomModule.createEventThreatDetectionCustomModule(
+            PROJECT_ID, CUSTOM_MODULE_DISPLAY_NAME);
+    createdCustomModuleIds.add(extractCustomModuleId(createCustomModuleResponse.getName()));
     ListEventThreatDetectionCustomModulesPagedResponse response =
         ListEventThreatDetectionCustomModules.listEventThreatDetectionCustomModules(PROJECT_ID);
     assertTrue(
@@ -163,6 +147,7 @@ public void testGetEventThreatDetectionCustomModule() throws IOException {
         CreateEventThreatDetectionCustomModule.createEventThreatDetectionCustomModule(
             PROJECT_ID, CUSTOM_MODULE_DISPLAY_NAME);
     String customModuleId = extractCustomModuleId(response.getName());
+    createdCustomModuleIds.add(customModuleId);
     EventThreatDetectionCustomModule getCustomModuleResponse =
         GetEventThreatDetectionCustomModule.getEventThreatDetectionCustomModule(
             PROJECT_ID, customModuleId);
@@ -177,6 +162,7 @@ public void testUpdateEventThreatDetectionCustomModule() throws IOException {
         CreateEventThreatDetectionCustomModule.createEventThreatDetectionCustomModule(
             PROJECT_ID, CUSTOM_MODULE_DISPLAY_NAME);
     String customModuleId = extractCustomModuleId(createCustomModuleResponse.getName());
+    createdCustomModuleIds.add(customModuleId);
     EventThreatDetectionCustomModule response =
         UpdateEventThreatDetectionCustomModule.updateEventThreatDetectionCustomModule(
             PROJECT_ID, customModuleId);
@@ -190,6 +176,7 @@ public void testGetEffectiveEventThreatDetectionCustomModule() throws IOExceptio
         CreateEventThreatDetectionCustomModule.createEventThreatDetectionCustomModule(
             PROJECT_ID, CUSTOM_MODULE_DISPLAY_NAME);
     String customModuleId = extractCustomModuleId(createCustomModuleResponse.getName());
+    createdCustomModuleIds.add(customModuleId);
     EffectiveEventThreatDetectionCustomModule getEffectiveCustomModuleResponse =
         GetEffectiveEventThreatDetectionCustomModule.getEffectiveEventThreatDetectionCustomModule(
             PROJECT_ID, customModuleId);
@@ -202,8 +189,10 @@ public void testGetEffectiveEventThreatDetectionCustomModule() throws IOExceptio
 
   @Test
   public void testListEffectiveEventThreatDetectionCustomModules() throws IOException {
-    CreateEventThreatDetectionCustomModule.createEventThreatDetectionCustomModule(
-        PROJECT_ID, CUSTOM_MODULE_DISPLAY_NAME);
+    EventThreatDetectionCustomModule createCustomModuleResponse =
+        CreateEventThreatDetectionCustomModule.createEventThreatDetectionCustomModule(
+            PROJECT_ID, CUSTOM_MODULE_DISPLAY_NAME);
+    createdCustomModuleIds.add(extractCustomModuleId(createCustomModuleResponse.getName()));
     ListEffectiveEventThreatDetectionCustomModulesPagedResponse response =
         ListEffectiveEventThreatDetectionCustomModules
             .listEffectiveEventThreatDetectionCustomModules(PROJECT_ID);
@@ -214,8 +203,10 @@ public void testListEffectiveEventThreatDetectionCustomModules() throws IOExcept
 
   @Test
   public void testListDescendantEventThreatDetectionCustomModules() throws IOException {
-    CreateEventThreatDetectionCustomModule.createEventThreatDetectionCustomModule(
-        PROJECT_ID, CUSTOM_MODULE_DISPLAY_NAME);
+    EventThreatDetectionCustomModule createCustomModuleResponse =
+        CreateEventThreatDetectionCustomModule.createEventThreatDetectionCustomModule(
+            PROJECT_ID, CUSTOM_MODULE_DISPLAY_NAME);
+    createdCustomModuleIds.add(extractCustomModuleId(createCustomModuleResponse.getName()));
     ListDescendantEventThreatDetectionCustomModulesPagedResponse response =
         ListDescendantEventThreatDetectionCustomModules
             .listDescendantEventThreatDetectionCustomModules(PROJECT_ID);
@@ -233,4 +224,4 @@ public void testValidateEventThreatDetectionCustomModule() throws IOException {
     assertNotNull(response);
     assertThat(response.getErrorsCount()).isEqualTo(0);
   }
-}
+}

storage-transfer/src/test/java/com/google/cloud/storage/storagetransfer/samples/test/util/TransferJobUtils.java

@@ -15,7 +15,6 @@
  */
 
 // [START storagetransfer_transfer_all]
-// [START all]
 
 package com.google.cloud.storage.storagetransfer.samples.test.util;
 
@@ -68,5 +67,4 @@ public static TimeOfDay createTimeOfDay(String timeString)
     return time;
   }
 }
-// [END all]
 // [END storagetransfer_transfer_all]