Merge branch 'googleapis:main' into main

yoshi-code-bot · web-flow · commit a86489de9988 · 2025-07-09T18:35:34.000-07:00
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -127,7 +127,7 @@ jobs:
           gcr.io/cloud-devrel-public-resources/java-library-generation:"${library_generation_image_tag}" \
           /src/library_generation/cli/entry_point.py validate-generation-config
       env:
-        library_generation_image_tag: 2.60.0
+        library_generation_image_tag: 2.60.1
         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.60.0
+  library_generation_image_tag: 2.60.1
 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.59.0
+    - uses: googleapis/sdk-platform-java/.github/scripts@v2.60.1
       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.50.0
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.50.1
       with:
         bom-path: gapic-libraries-bom/pom.xml
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.50.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.50.1"
 }
 
 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.50.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.50.1"
 }
 
 env_vars: {
diff --git a/.kokoro/nightly/graalvm-native-c.cfg b/.kokoro/nightly/graalvm-native-c.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_c:3.50.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.50.1"
 }
 
 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.50.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.50.1"
 }
 
 # 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.50.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.50.1"
 }
 
 env_vars: {
diff --git a/.kokoro/nightly/graalvm-sub-jobs/native-c/common.cfg b/.kokoro/nightly/graalvm-sub-jobs/native-c/common.cfg
@@ -24,7 +24,7 @@ env_vars: {
 
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.50.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.50.1"
 }
 
 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.50.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.50.1"
 }
 
 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.50.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.50.1"
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native-c-presubmit.cfg b/.kokoro/presubmit/graalvm-native-c-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_c:3.50.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.50.1"
 }
 
 env_vars: {
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.50.0</version>
+    <version>3.50.1</version>
     <relativePath/>
   </parent>
 
diff --git a/java-network-management/owlbot.py b/java-network-management/owlbot.py
@@ -101,6 +101,21 @@
         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_vpcflowlogs_file_name,
+            r'\s+@Test\n\s+public void createVpcFlowLogsConfigTest3\(\) throws Exception.*',
+            '@Ignore("See: https://github.com/googleapis/sdk-platform-java/issues/1839")@Test\npublic void createVpcFlowLogsConfigTest3() throws Exception {'
+    )
+    s.replace(
+             v1beta1_vpcflowlogs_file_name,
+             r'\s+@Test\n\s+public void createVpcFlowLogsConfigTest4\(\) throws Exception.*',
+             '@Ignore("See: https://github.com/googleapis/sdk-platform-java/issues/1839")@Test\npublic void createVpcFlowLogsConfigTest4() throws Exception {'
+    )
+    s.replace(
+             v1beta1_vpcflowlogs_file_name,
+             r'\s+@Test\n\s+public void listVpcFlowLogsConfigsTest2\(\) throws Exception.*',
+             '@Ignore("See: https://github.com/googleapis/sdk-platform-java/issues/1839")@Test\npublic void listVpcFlowLogsConfigsTest2() throws Exception {'
+    )
     s.move(library)
 
 s.remove_staging_dirs()

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`# Configure the docker image for kokoro-trampoline.`
`4`	`4`	`env_vars: {`
`5`	`5`	`key: "TRAMPOLINE_IMAGE"`
`6`		`- value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.50.0"`
	`6`	`+ value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.50.1"`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`env_vars: {`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ env_vars: {`
`29`	`29`
`30`	`30`	`env_vars: {`
`31`	`31`	`key: "TRAMPOLINE_IMAGE"`
`32`		`- value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.50.0"`
	`32`	`+ value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.50.1"`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`# TODO: remove this after we've migrated all tests and scripts`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ env_vars: {`
`24`	`24`
`25`	`25`	`env_vars: {`
`26`	`26`	`key: "TRAMPOLINE_IMAGE"`
`27`		`- value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.50.0"`
	`27`	`+ value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.50.1"`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`env_vars: {`