Merge branch 'googleapis:main' into main

yoshi-code-bot · Oct 26, 2024 · 521162f · 521162f
2 parents d2cda70 + ca21732
commit 521162f
Show file tree

Hide file tree

Showing 135 changed files with 45,370 additions and 22 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -130,7 +130,7 @@ jobs:
           gcr.io/cloud-devrel-public-resources/java-library-generation:"${library_generation_image_tag}" \
           /src/cli/entry_point.py validate-generation-config
       env:
-        library_generation_image_tag: 2.48.0
+        library_generation_image_tag: 2.49.0
         workspace_name: /workspace
 
 # TODO: Uncomment the needed Github Actions

diff --git a/.github/workflows/generated_files_sync.yaml b/.github/workflows/generated_files_sync.yaml
@@ -20,7 +20,7 @@ on:
   pull_request:
 name: generation diff
 env:
-  library_generation_image_tag: 2.48.0
+  library_generation_image_tag: 2.49.0
 jobs:
   root-pom:
     # root pom.xml does not have diff from generated one

diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml
@@ -37,7 +37,7 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
-    - uses: googleapis/sdk-platform-java/.github/scripts@v2.48.0
+    - uses: googleapis/sdk-platform-java/.github/scripts@v2.49.0
       if: env.SHOULD_RUN == 'true'
       with:
         base_ref: ${{ github.base_ref }}

diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: mvn install -B -ntp  -T 1C -DskipTests -Dclirr.skip -Dcheckstyle.skip -Denforcer.skip
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.38.0
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.39.0
       with:
         bom-path: gapic-libraries-bom/pom.xml
diff --git a/.kokoro/nightly/graalvm-native-17.cfg b/.kokoro/nightly/graalvm-native-17.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.38.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.39.0"
 }
 
 env_vars: {

diff --git a/.kokoro/nightly/graalvm-native-a.cfg b/.kokoro/nightly/graalvm-native-a.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.38.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.39.0"
 }
 
 env_vars: {

diff --git a/.kokoro/nightly/graalvm-native-b.cfg b/.kokoro/nightly/graalvm-native-b.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.38.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.39.0"
 }
 
 env_vars: {

diff --git a/.kokoro/nightly/graalvm-native.cfg b/.kokoro/nightly/graalvm-native.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.38.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.39.0"
 }
 
 env_vars: {

diff --git a/.kokoro/nightly/graalvm-sub-jobs/native-17/common.cfg b/.kokoro/nightly/graalvm-sub-jobs/native-17/common.cfg
@@ -24,7 +24,7 @@ env_vars: {
 
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.38.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.39.0"
 }
 
 env_vars: {

diff --git a/.kokoro/nightly/graalvm-sub-jobs/native-a/common.cfg b/.kokoro/nightly/graalvm-sub-jobs/native-a/common.cfg
@@ -29,7 +29,7 @@ env_vars: {
 
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.38.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.39.0"
 }
 
 # TODO: remove this after we've migrated all tests and scripts

diff --git a/.kokoro/nightly/graalvm-sub-jobs/native-b/common.cfg b/.kokoro/nightly/graalvm-sub-jobs/native-b/common.cfg
@@ -24,7 +24,7 @@ env_vars: {
 
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.38.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.39.0"
 }
 
 env_vars: {

diff --git a/.kokoro/nightly/graalvm-sub-jobs/native/common.cfg b/.kokoro/nightly/graalvm-sub-jobs/native/common.cfg
@@ -29,7 +29,7 @@ env_vars: {
 
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.38.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.39.0"
 }
 
 # TODO: remove this after we've migrated all tests and scripts

diff --git a/.kokoro/presubmit/graalvm-native-17-presubmit.cfg b/.kokoro/presubmit/graalvm-native-17-presubmit.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.38.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.39.0"
 }
 
 env_vars: {

diff --git a/.kokoro/presubmit/graalvm-native-a-presubmit.cfg b/.kokoro/presubmit/graalvm-native-a-presubmit.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.38.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.39.0"
 }
 
 env_vars: {

diff --git a/.kokoro/presubmit/graalvm-native-b-presubmit.cfg b/.kokoro/presubmit/graalvm-native-b-presubmit.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.38.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.39.0"
 }
 
 env_vars: {

diff --git a/.kokoro/presubmit/graalvm-native-presubmit.cfg b/.kokoro/presubmit/graalvm-native-presubmit.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.38.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.39.0"
 }
 
 env_vars: {

diff --git a/generation_config.yaml b/generation_config.yaml
@@ -1612,6 +1612,7 @@ libraries:
   cloud_api: true
   GAPICs:
   - proto_path: google/cloud/parallelstore/v1beta
+  - proto_path: google/cloud/parallelstore/v1
   requires_billing: true
 - api_shortname: phishingprotection
   name_pretty: Phishing Protection

diff --git a/google-cloud-jar-parent/pom.xml b/google-cloud-jar-parent/pom.xml
@@ -39,7 +39,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-pubsub-bom</artifactId>
-        <version>1.133.1</version>
+        <version>1.134.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/google-cloud-pom-parent/pom.xml b/google-cloud-pom-parent/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>sdk-platform-java-config</artifactId>
-    <version>3.38.0</version>
+    <version>3.39.0</version>
     <relativePath/>
   </parent>
 

diff --git a/java-network-management/owlbot.py b/java-network-management/owlbot.py
@@ -61,6 +61,16 @@
         r'\s+@Test\n\s+public void testIamPermissionsTest\(\) throws Exception.*',
         '@Ignore("See: https://github.com/googleapis/sdk-platform-java/issues/1839")@Test\npublic void testIamPermissionsTest() throws Exception {'
     )
+    s.replace(
+        v1beta1_file_name,
+        r'\s+@Test\n\s+public void listConnectivityTestsTest\(\) throws Exception.*',
+        '@Ignore("See: https://github.com/googleapis/sdk-platform-java/issues/1839")@Test\npublic void listConnectivityTestsTest() throws Exception {'
+    )
+    s.replace(
+        v1beta1_file_name,
+        r'\s+@Test\n\s+public void createConnectivityTestTest\(\) throws Exception.*',
+        '@Ignore("See: https://github.com/googleapis/sdk-platform-java/issues/1839")@Test\npublic void createConnectivityTestTest() throws Exception {'
+    )
     s.replace(
         v1beta1_vpcflowlogs_file_name,
         r'^import org.junit.Test;',
@@ -96,4 +106,4 @@
     "license-checks.xml",
     "renovate.json",
     ".gitignore"
-])
+])
diff --git a/java-parallelstore/README.md b/java-parallelstore/README.md
@@ -40,7 +40,6 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
 
 If you are using Maven without the BOM, add this to your dependencies:
 
-<!-- {x-version-update-start:google-cloud-parallelstore:released} -->
 
 ```xml
 <dependency>
@@ -61,7 +60,6 @@ If you are using SBT, add this to your dependencies:
 ```Scala
 libraryDependencies += "com.google.cloud" % "google-cloud-parallelstore" % "0.15.0"
 ```
-<!-- {x-version-update-end} -->
 
 ## Authentication
 
@@ -202,7 +200,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/google-cloud-java/java11.html
 [stability-image]: https://img.shields.io/badge/stability-preview-yellow
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-parallelstore.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-parallelstore/0.14.0
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-parallelstore/0.15.0
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles

diff --git a/java-parallelstore/google-cloud-parallelstore-bom/pom.xml b/java-parallelstore/google-cloud-parallelstore-bom/pom.xml
@@ -33,11 +33,21 @@
         <artifactId>grpc-google-cloud-parallelstore-v1beta</artifactId>
         <version>0.16.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-parallelstore-v1beta:current} -->
       </dependency>
+      <dependency>
+        <groupId>com.google.api.grpc</groupId>
+        <artifactId>grpc-google-cloud-parallelstore-v1</artifactId>
+        <version>0.16.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-parallelstore-v1:current} -->
+      </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-parallelstore-v1beta</artifactId>
         <version>0.16.0-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-parallelstore-v1beta:current} -->
       </dependency>
+      <dependency>
+        <groupId>com.google.api.grpc</groupId>
+        <artifactId>proto-google-cloud-parallelstore-v1</artifactId>
+        <version>0.16.0-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-parallelstore-v1:current} -->
+      </dependency>
     </dependencies>
   </dependencyManagement>
 </project>
diff --git a/java-parallelstore/google-cloud-parallelstore/pom.xml b/java-parallelstore/google-cloud-parallelstore/pom.xml
@@ -41,6 +41,10 @@
       <artifactId>proto-google-common-protos</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>com.google.api.grpc</groupId>
+      <artifactId>proto-google-cloud-parallelstore-v1</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.google.api.grpc</groupId>
       <artifactId>proto-google-cloud-parallelstore-v1beta</artifactId>
@@ -66,6 +70,11 @@
       <artifactId>grpc-google-common-protos</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.google.api.grpc</groupId>
+      <artifactId>grpc-google-cloud-parallelstore-v1</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>com.google.api.grpc</groupId>
       <artifactId>proto-google-iam-v1</artifactId>