Merge branch 'main' into generate-libraries-main

Author: mpeddada1

.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

.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

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()