From 13fd2e1256668b3e5ca92bccd9029b1c41839e41 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Mon, 13 Nov 2023 21:16:15 -0500
Subject: [PATCH] feat: [google-cloud-batch] add a CloudLoggingOption and
 use_generic_task_monitored_resource fields for users to opt out new batch
 monitored resource in cloud logging (#12019)

- [ ] Regenerate this pull request now.

PiperOrigin-RevId: 582090179

Source-Link:
https://github.com/googleapis/googleapis/commit/8690a75447e67f19cd3fb14368cab12af0c5bfd1

Source-Link:
https://github.com/googleapis/googleapis-gen/commit/dc7262fbf316b83248cdbd4ce6c9f126a3d02b1a
Copy-Tag:
eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWJhdGNoLy5Pd2xCb3QueWFtbCIsImgiOiJkYzcyNjJmYmYzMTZiODMyNDhjZGJkNGNlNmM5ZjEyNmEzZDAyYjFhIn0=

---------

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
---
 .../google/cloud/batch/gapic_version.py       |  2 +-
 .../google/cloud/batch_v1/gapic_version.py    |  2 +-
 .../cloud/batch_v1alpha/gapic_version.py      |  2 +-
 .../google/cloud/batch_v1alpha/types/job.py   | 24 +++++++++++++++++++
 ...nippet_metadata_google.cloud.batch.v1.json |  2 +-
 ...t_metadata_google.cloud.batch.v1alpha.json |  2 +-
 .../gapic/batch_v1alpha/test_batch_service.py |  6 ++++-
 7 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/packages/google-cloud-batch/google/cloud/batch/gapic_version.py b/packages/google-cloud-batch/google/cloud/batch/gapic_version.py
index 9e6d0c6a0a5b..360a0d13ebdd 100644
--- a/packages/google-cloud-batch/google/cloud/batch/gapic_version.py
+++ b/packages/google-cloud-batch/google/cloud/batch/gapic_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "0.17.3"  # {x-release-please-version}
+__version__ = "0.0.0"  # {x-release-please-version}
diff --git a/packages/google-cloud-batch/google/cloud/batch_v1/gapic_version.py b/packages/google-cloud-batch/google/cloud/batch_v1/gapic_version.py
index 9e6d0c6a0a5b..360a0d13ebdd 100644
--- a/packages/google-cloud-batch/google/cloud/batch_v1/gapic_version.py
+++ b/packages/google-cloud-batch/google/cloud/batch_v1/gapic_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "0.17.3"  # {x-release-please-version}
+__version__ = "0.0.0"  # {x-release-please-version}
diff --git a/packages/google-cloud-batch/google/cloud/batch_v1alpha/gapic_version.py b/packages/google-cloud-batch/google/cloud/batch_v1alpha/gapic_version.py
index 9e6d0c6a0a5b..360a0d13ebdd 100644
--- a/packages/google-cloud-batch/google/cloud/batch_v1alpha/gapic_version.py
+++ b/packages/google-cloud-batch/google/cloud/batch_v1alpha/gapic_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "0.17.3"  # {x-release-please-version}
+__version__ = "0.0.0"  # {x-release-please-version}
diff --git a/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/job.py b/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/job.py
index f2fdc76214d9..2a8396ef6047 100644
--- a/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/job.py
+++ b/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/job.py
@@ -188,6 +188,10 @@ class LogsPolicy(proto.Message):
             path on the VM, or under the mount point of a
             Persistent Disk or Filestore, or a Cloud Storage
             path.
+        cloud_logging_option (google.cloud.batch_v1alpha.types.LogsPolicy.CloudLoggingOption):
+            Optional. Additional settings for Cloud Logging. It will
+            only take effect when the destination of LogsPolicy is set
+            to CLOUD_LOGGING.
     """
 
     class Destination(proto.Enum):
@@ -205,6 +209,21 @@ class Destination(proto.Enum):
         CLOUD_LOGGING = 1
         PATH = 2
 
+    class CloudLoggingOption(proto.Message):
+        r"""CloudLoggingOption contains additional settings for cloud
+        logging generated by Batch job.
+
+        Attributes:
+            use_generic_task_monitored_resource (bool):
+                Optional. Set this flag to true to use generic_task as
+                monitored resource for Batch job generated cloud logging.
+        """
+
+        use_generic_task_monitored_resource: bool = proto.Field(
+            proto.BOOL,
+            number=1,
+        )
+
     destination: Destination = proto.Field(
         proto.ENUM,
         number=1,
@@ -214,6 +233,11 @@ class Destination(proto.Enum):
         proto.STRING,
         number=2,
     )
+    cloud_logging_option: CloudLoggingOption = proto.Field(
+        proto.MESSAGE,
+        number=3,
+        message=CloudLoggingOption,
+    )
 
 
 class JobDependency(proto.Message):
diff --git a/packages/google-cloud-batch/samples/generated_samples/snippet_metadata_google.cloud.batch.v1.json b/packages/google-cloud-batch/samples/generated_samples/snippet_metadata_google.cloud.batch.v1.json
index 3406a4b97995..e2df1067e4dd 100644
--- a/packages/google-cloud-batch/samples/generated_samples/snippet_metadata_google.cloud.batch.v1.json
+++ b/packages/google-cloud-batch/samples/generated_samples/snippet_metadata_google.cloud.batch.v1.json
@@ -8,7 +8,7 @@
     ],
     "language": "PYTHON",
     "name": "google-cloud-batch",
-    "version": "0.17.3"
+    "version": "0.1.0"
   },
   "snippets": [
     {
diff --git a/packages/google-cloud-batch/samples/generated_samples/snippet_metadata_google.cloud.batch.v1alpha.json b/packages/google-cloud-batch/samples/generated_samples/snippet_metadata_google.cloud.batch.v1alpha.json
index 6e6ca43675e1..4862cc9a6486 100644
--- a/packages/google-cloud-batch/samples/generated_samples/snippet_metadata_google.cloud.batch.v1alpha.json
+++ b/packages/google-cloud-batch/samples/generated_samples/snippet_metadata_google.cloud.batch.v1alpha.json
@@ -8,7 +8,7 @@
     ],
     "language": "PYTHON",
     "name": "google-cloud-batch",
-    "version": "0.17.3"
+    "version": "0.1.0"
   },
   "snippets": [
     {
diff --git a/packages/google-cloud-batch/tests/unit/gapic/batch_v1alpha/test_batch_service.py b/packages/google-cloud-batch/tests/unit/gapic/batch_v1alpha/test_batch_service.py
index d2feecbdad84..32bc0de49021 100644
--- a/packages/google-cloud-batch/tests/unit/gapic/batch_v1alpha/test_batch_service.py
+++ b/packages/google-cloud-batch/tests/unit/gapic/batch_v1alpha/test_batch_service.py
@@ -2717,7 +2717,11 @@ def test_create_job_rest(request_type):
         },
         "create_time": {},
         "update_time": {},
-        "logs_policy": {"destination": 1, "logs_path": "logs_path_value"},
+        "logs_policy": {
+            "destination": 1,
+            "logs_path": "logs_path_value",
+            "cloud_logging_option": {"use_generic_task_monitored_resource": True},
+        },
         "notifications": {},
     }
     # The version of a generated dependency at test runtime may differ from the version used during generation.