feat: [google-cloud-batch] Add tags field in Job's AllocationPolicy field in v1alpha (googleapis#12171)

gcf-owl-bot[bot] · web-flow · commit ce7ddbfdb90a · 2024-01-09T08:39:34.000-05:00
- [ ] Regenerate this pull request now. BEGIN_COMMIT_OVERRIDE feat: Add `tags` field in Job's AllocationPolicy field in v1alpha feat: Add `run_as_non_root field` and deprecate `enable_oslogin` for non-root execution docs: updated comments END_COMMIT_OVERRIDE PiperOrigin-RevId: 596742590 Source-Link: googleapis/googleapis@09b78e2 Source-Link: https://github.com/googleapis/googleapis-gen/commit/d5d869942aafdf9446c274380b7348c1591c156d Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWJhdGNoLy5Pd2xCb3QueWFtbCIsImgiOiJkNWQ4Njk5NDJhYWZkZjk0NDZjMjc0MzgwYjczNDhjMTU5MWMxNTZkIn0= --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
diff --git 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.6"  # {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
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "0.17.6"  # {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
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "0.17.6"  # {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
@@ -548,6 +548,12 @@ class AllocationPolicy(proto.Message):
             instead of this field.
         placement (google.cloud.batch_v1alpha.types.AllocationPolicy.PlacementPolicy):
             The placement policy.
+        tags (MutableSequence[str]):
+            Optional. Tags applied to the VM instances.
+
+            The tags identify valid sources or targets for network
+            firewalls. Each tag must be 1-63 characters long, and comply
+            with `RFC1035 <https://www.ietf.org/rfc/rfc1035.txt>`__.
     """
 
     class ProvisioningModel(proto.Enum):
@@ -1059,6 +1065,10 @@ class PlacementPolicy(proto.Message):
         number=10,
         message=PlacementPolicy,
     )
+    tags: MutableSequence[str] = proto.RepeatedField(
+        proto.STRING,
+        number=11,
+    )
 
 
 class TaskGroup(proto.Message):
@@ -1126,9 +1136,9 @@ class TaskGroup(proto.Message):
             passwordless login between VMs running the Batch
             tasks in the same TaskGroup.
         enable_oslogin (bool):
-            Optional. When true, Batch will use the OS Login generated
-            POSIX account to exeucute the runnables instead of the
-            default root user.
+            Optional. Deprecated: When true, Batch will use the OS Login
+            generated POSIX account to exeucute the runnables instead of
+            the default root user.
 
             | To control root or non-root privilege for runnable
               execution, the project
@@ -1138,6 +1148,14 @@ class TaskGroup(proto.Message):
               roles/compute.osAdminLogin should be granted to the Batch
               job submitter. Otherwise, roles/compute.osLogin should be
               granted to the Batch job submitter.
+        run_as_non_root (bool):
+            Optional. If not set or set to false, Batch
+            will use root user to execute runnables. If set
+            to true, Batch will make sure to run the
+            runnables using non-root user. Currently, the
+            non-root user Batch used is generated by OS
+            login. Reference:
+            https://cloud.google.com/compute/docs/oslogin
     """
 
     class SchedulingPolicy(proto.Enum):
@@ -1213,6 +1231,10 @@ class SchedulingPolicy(proto.Enum):
         proto.BOOL,
         number=13,
     )
+    run_as_non_root: bool = proto.Field(
+        proto.BOOL,
+        number=14,
+    )
 
 
 class ServiceAccount(proto.Message):
diff --git a/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/task.py b/packages/google-cloud-batch/google/cloud/batch_v1alpha/types/task.py
@@ -366,12 +366,13 @@ class Container(proto.Message):
                 password matches ``projects/*/secrets/*/versions/*`` then
                 Batch will read the password from the Secret Manager;
             enable_image_streaming (bool):
-                Optional. Not yet implemented.
-                If set to true, container will run with Image
-                streaming. The container runtime will be changed
-                to containerd instead of docker. Currently, only
-                imageUri, commands, entrypoint and volumes are
-                supported and any other fields will be ignored.
+                Optional. If set to true, container will run with Image
+                streaming. The container runtime will be changed to
+                containerd instead of docker. Currently, only imageUri,
+                commands, entrypoint and volumes are supported and any other
+                fields will be ignored. Please refer
+                `here <https://github.com/GoogleCloudPlatform/batch-samples/tree/main/api-samples/image-streaming>`__
+                for the feature requirements and limitations.
         """
 
         image_uri: str = proto.Field(
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
@@ -8,7 +8,7 @@
     ],
     "language": "PYTHON",
     "name": "google-cloud-batch",
-    "version": "0.17.6"
+    "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
@@ -8,7 +8,7 @@
     ],
     "language": "PYTHON",
     "name": "google-cloud-batch",
-    "version": "0.17.6"
+    "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
@@ -2681,13 +2681,15 @@ def test_create_job_rest(request_type):
                         "collocation": "collocation_value",
                         "max_distance": 1264,
                     },
+                    "tags": ["tags_value1", "tags_value2"],
                 },
                 "labels": {},
                 "task_environments": {},
                 "task_count_per_node": 2022,
                 "require_hosts_file": True,
                 "permissive_ssh": True,
                 "enable_oslogin": True,
+                "run_as_non_root": True,
             }
         ],
         "scheduling_policy": 1,

Original file line number	Diff line number	Diff line change
`@@ -13,4 +13,4 @@`
`13`	`13`	`# See the License for the specific language governing permissions and`
`14`	`14`	`# limitations under the License.`
`15`	`15`	`#`
`16`		`-__version__ = "0.17.6" # {x-release-please-version}`
	`16`	`+__version__ = "0.0.0" # {x-release-please-version}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`],`
`9`	`9`	`"language": "PYTHON",`
`10`	`10`	`"name": "google-cloud-batch",`
`11`		`- "version": "0.17.6"`
	`11`	`+ "version": "0.1.0"`
`12`	`12`	`},`
`13`	`13`	`"snippets": [`
`14`	`14`	`{`