chore: merge main into generate-libraries-main

Author: cloud-java-bot

.github/workflows/generated_files_sync.yaml

@@ -14,9 +14,6 @@
 # GitHub action job to test core java library features on
 # downstream client libraries before they are released.
 on:
-  push:
-    branches:
-    - main
   pull_request:
 name: generation diff
 env:

.github/workflows/scorecard.yml

@@ -9,10 +9,10 @@ on:
   branch_protection_rule:
   # To guarantee Maintained check is occasionally updated. See
   # https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
-  schedule:
-    - cron: '43 11 * * 5'
-  push:
-    branches: [ "main" ]
+  # schedule:
+  #   - cron: '43 11 * * 5'
+  # push:
+  #   branches: [ "main" ]
 
 # Declare default permissions as read only.
 permissions: read-all

.kokoro/build.sh

@@ -93,21 +93,29 @@ case ${JOB_TYPE} in
     fi
     ;;
   lint)
-    changed_file_list=$(git diff --name-only "${BASE_SHA}" "${HEAD_SHA}")
-    echo "${changed_file_list}"
-    has_code_change="false"
-    while IFS= read -r changed_file; do
-        if [ -n "${changed_file}" ] && [[ "${changed_file}" == *.java ]]; then
-          echo "Matched: ${changed_file}"
-          has_code_change="true"
-          break
+    if [ -n "${BASE_SHA}" ] && [ -n "${HEAD_SHA}" ]; then
+        changed_file_list=$(git diff --name-only "${BASE_SHA}" "${HEAD_SHA}")
+        echo "${changed_file_list}"
+        
+        has_code_change="false"
+        
+        while IFS= read -r changed_file; do
+            # Checks if the line is not empty AND if it matches a .java file
+            if [ -n "${changed_file}" ] && [[ "${changed_file}" == *.java ]]; then
+                echo "Matched: ${changed_file}"
+                has_code_change="true"
+                break
+            fi
+        done <<< "${changed_file_list}"
+        
+        if [ "${has_code_change}" == "false" ]; then
+            echo "No java modules affected. Skipping linter check."
+            exit 0
         fi
-    done <<< "${changed_file_list}"
-    if [ "${has_code_change}" == "false" ]; then
-        echo "No java modules affected. Skipping linter check."
-        exit 0
+    else
+        echo "BASE_SHA or HEAD_SHA is empty. Skipping file difference check."
     fi
-
+    
     mvn -B -ntp \
       -T 1.5C \
       com.spotify.fmt:fmt-maven-plugin:check

generation_config.yaml

@@ -2741,7 +2741,7 @@ libraries:
   group_id: com.google.cloud
   cloud_api: true
   GAPICs:
-  - proto_path: google/ads/datamanager/v1
+  - proto_path: google/cloud/vectorsearch/v1beta
   requires_billing: true
 - api_shortname: videointelligence
   name_pretty: Cloud Video Intelligence

java-vectorsearch/.OwlBot-hermetic.yaml

@@ -23,13 +23,13 @@ deep-preserve-regex:
 - "/java-vectorsearch/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java"
 
 deep-copy-regex:
-- source: "/google/ads/datamanager/(v.*)/.*-java/proto-google-.*/src"
+- source: "/google/cloud/vectorsearch/(v.*)/.*-java/proto-google-.*/src"
   dest: "/owl-bot-staging/java-vectorsearch/$1/proto-google-cloud-vectorsearch-$1/src"
-- source: "/google/ads/datamanager/(v.*)/.*-java/grpc-google-.*/src"
+- source: "/google/cloud/vectorsearch/(v.*)/.*-java/grpc-google-.*/src"
   dest: "/owl-bot-staging/java-vectorsearch/$1/grpc-google-cloud-vectorsearch-$1/src"
-- source: "/google/ads/datamanager/(v.*)/.*-java/gapic-google-.*/src"
+- source: "/google/cloud/vectorsearch/(v.*)/.*-java/gapic-google-.*/src"
   dest: "/owl-bot-staging/java-vectorsearch/$1/google-cloud-vectorsearch/src"
-- source: "/google/ads/datamanager/(v.*)/.*-java/samples/snippets/generated"
+- source: "/google/cloud/vectorsearch/(v.*)/.*-java/samples/snippets/generated"
   dest: "/owl-bot-staging/java-vectorsearch/$1/samples/snippets/generated"
 
 api-name: vectorsearch

java-vectorsearch/google-cloud-vectorsearch-bom/pom.xml

@@ -30,13 +30,13 @@
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
-        <artifactId>grpc-google-cloud-vectorsearch-v1</artifactId>
-        <version>0.1.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-vectorsearch-v1:current} -->
+        <artifactId>grpc-google-cloud-vectorsearch-v1beta</artifactId>
+        <version>0.1.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-vectorsearch-v1beta:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
-        <artifactId>proto-google-cloud-vectorsearch-v1</artifactId>
-        <version>0.1.0-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-vectorsearch-v1:current} -->
+        <artifactId>proto-google-cloud-vectorsearch-v1beta</artifactId>
+        <version>0.1.0-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-vectorsearch-v1beta:current} -->
       </dependency>
     </dependencies>
   </dependencyManagement>

java-vectorsearch/google-cloud-vectorsearch/pom.xml

@@ -43,7 +43,7 @@
 
     <dependency>
       <groupId>com.google.api.grpc</groupId>
-      <artifactId>proto-google-cloud-vectorsearch-v1</artifactId>
+      <artifactId>proto-google-cloud-vectorsearch-v1beta</artifactId>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
@@ -89,7 +89,7 @@
 
     <dependency>
       <groupId>com.google.api.grpc</groupId>
-      <artifactId>grpc-google-cloud-vectorsearch-v1</artifactId>
+      <artifactId>grpc-google-cloud-vectorsearch-v1beta</artifactId>
       <scope>test</scope>
     </dependency>
     <!-- Need testing utility classes for generated gRPC clients tests -->