From 37a574a11f78034d00e201ca6f8fecbc9cd6101c Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 15 Feb 2023 14:05:46 -0500 Subject: [PATCH] feat: [batch] support custom scopes for service account in v1 (#9082) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: support custom scopes for service account in v1 --- feat: Add boot disk field in InstanceStatus --- feat: Add boot disk and image source fields to v1 InstancePolicy PiperOrigin-RevId: 507014714 Source-Link: https://github.com/googleapis/googleapis/commit/12b32ef4a7602f7f6700125007c50a05ab130196 Source-Link: https://github.com/googleapis/googleapis-gen/commit/547061f90bc7e6706395ae372e0f61010bb4949e Copy-Tag: eyJwIjoiamF2YS1iYXRjaC8uT3dsQm90LnlhbWwiLCJoIjoiNTQ3MDYxZjkwYmM3ZTY3MDYzOTVhZTM3MmUwZjYxMDEwYmI0OTQ5ZSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * feat: support custom scopes for service account in v1 --- feat: Add boot disk field in InstanceStatus --- feat: Add boot disk and image source fields to v1 InstancePolicy PiperOrigin-RevId: 507014772 Source-Link: https://github.com/googleapis/googleapis/commit/9d6497f0f81f000562fc4fc5df8c4fcc8e09e864 Source-Link: https://github.com/googleapis/googleapis-gen/commit/13ef8a3b7efeb45866ebcea380dfd6a43ee5d486 Copy-Tag: eyJwIjoiamF2YS1iYXRjaC8uT3dsQm90LnlhbWwiLCJoIjoiMTNlZjhhM2I3ZWZlYjQ1ODY2ZWJjZWEzODBkZmQ2YTQzZWU1ZDQ4NiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- java-batch/README.md | 6 +- .../cloud/batch/v1/AllocationPolicy.java | 563 ++++++++++++++++-- .../com/google/cloud/batch/v1/BatchProto.java | 134 ++--- .../com/google/cloud/batch/v1/JobProto.java | 170 +++--- .../com/google/cloud/batch/v1/JobStatus.java | 301 ++++++++++ .../google/cloud/batch/v1/ServiceAccount.java | 289 +++++++++ .../batch/v1/ServiceAccountOrBuilder.java | 55 ++ .../proto/google/cloud/batch/v1/batch.proto | 2 - .../proto/google/cloud/batch/v1/job.proto | 36 +- .../cloud/batch/v1alpha/AllocationPolicy.java | 345 ++++++++--- .../v1alpha/AllocationPolicyOrBuilder.java | 26 +- .../cloud/batch/v1alpha/BatchProto.java | 141 +++-- .../google/cloud/batch/v1alpha/JobProto.java | 202 +++---- .../google/cloud/batch/v1alpha/JobStatus.java | 301 ++++++++++ .../google/cloud/batch/v1alpha/batch.proto | 2 - .../google/cloud/batch/v1alpha/job.proto | 28 +- 16 files changed, 2119 insertions(+), 482 deletions(-) diff --git a/java-batch/README.md b/java-batch/README.md index 673b29d42888..ab5deb763eec 100644 --- a/java-batch/README.md +++ b/java-batch/README.md @@ -22,20 +22,20 @@ If you are using Maven, add this to your pom.xml file: com.google.cloud google-cloud-batch - 0.9.0 + 0.10.0 ``` If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-batch:0.9.0' +implementation 'com.google.cloud:google-cloud-batch:0.10.0' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-batch" % "0.9.0" +libraryDependencies += "com.google.cloud" % "google-cloud-batch" % "0.10.0" ``` ## Authentication diff --git a/java-batch/proto-google-cloud-batch-v1/src/main/java/com/google/cloud/batch/v1/AllocationPolicy.java b/java-batch/proto-google-cloud-batch-v1/src/main/java/com/google/cloud/batch/v1/AllocationPolicy.java index ade6f89db7fe..40213ddd732f 100644 --- a/java-batch/proto-google-cloud-batch-v1/src/main/java/com/google/cloud/batch/v1/AllocationPolicy.java +++ b/java-batch/proto-google-cloud-batch-v1/src/main/java/com/google/cloud/batch/v1/AllocationPolicy.java @@ -1218,6 +1218,16 @@ public interface DiskOrBuilder * * 
      * Name of a public or custom image used as the data source.
+     * For example, the following are all valid URLs:
+     * (1) Specify the image by its family name:
+     * projects/{project}/global/images/family/{image_family}
+     * (2) Specify the image version:
+     * projects/{project}/global/images/{image_version}
+     * You can also use Batch customized image in short names.
+     * The following image values are supported for a boot disk:
+     * "batch-debian": use Batch Debian images.
+     * "batch-centos": use Batch CentOS images.
+     * "batch-cos": use Batch Container-Optimized images.
      *
* * string image = 4; @@ -1230,6 +1240,16 @@ public interface DiskOrBuilder * * 
      * Name of a public or custom image used as the data source.
+     * For example, the following are all valid URLs:
+     * (1) Specify the image by its family name:
+     * projects/{project}/global/images/family/{image_family}
+     * (2) Specify the image version:
+     * projects/{project}/global/images/{image_version}
+     * You can also use Batch customized image in short names.
+     * The following image values are supported for a boot disk:
+     * "batch-debian": use Batch Debian images.
+     * "batch-centos": use Batch CentOS images.
+     * "batch-cos": use Batch Container-Optimized images.
      *
* * string image = 4; @@ -1242,6 +1262,16 @@ public interface DiskOrBuilder * * 
      * Name of a public or custom image used as the data source.
+     * For example, the following are all valid URLs:
+     * (1) Specify the image by its family name:
+     * projects/{project}/global/images/family/{image_family}
+     * (2) Specify the image version:
+     * projects/{project}/global/images/{image_version}
+     * You can also use Batch customized image in short names.
+     * The following image values are supported for a boot disk:
+     * "batch-debian": use Batch Debian images.
+     * "batch-centos": use Batch CentOS images.
+     * "batch-cos": use Batch Container-Optimized images.
      *
* * string image = 4; @@ -1291,8 +1321,10 @@ public interface DiskOrBuilder * * * 
-     * Disk type as shown in `gcloud compute disk-types list`
-     * For example, "pd-ssd", "pd-standard", "pd-balanced", "local-ssd".
+     * Disk type as shown in `gcloud compute disk-types list`.
+     * For example, local SSD uses type "local-ssd".
+     * Persistent disks and boot disks use "pd-balanced", "pd-extreme", "pd-ssd"
+     * or "pd-standard".
      *
* * string type = 1; @@ -1304,8 +1336,10 @@ public interface DiskOrBuilder * * * 
-     * Disk type as shown in `gcloud compute disk-types list`
-     * For example, "pd-ssd", "pd-standard", "pd-balanced", "local-ssd".
+     * Disk type as shown in `gcloud compute disk-types list`.
+     * For example, local SSD uses type "local-ssd".
+     * Persistent disks and boot disks use "pd-balanced", "pd-extreme", "pd-ssd"
+     * or "pd-standard".
      *
* * string type = 1; @@ -1319,9 +1353,14 @@ public interface DiskOrBuilder * * 
      * Disk size in GB.
-     * This field is ignored if `data_source` is `disk` or `image`.
-     * If `type` is `local-ssd`, size_gb should be a multiple of 375GB,
+     * For persistent disk, this field is ignored if `data_source` is `image` or
+     * `snapshot`.
+     * For local SSD, size_gb should be a multiple of 375GB,
      * otherwise, the final size will be the next greater multiple of 375 GB.
+     * For boot disk, Batch will calculate the boot disk size based on source
+     * image and task requirements if you do not speicify the size.
+     * If both this field and the boot_disk_mib field in task spec's
+     * compute_resource are defined, Batch will only honor this field.
      *
* * int64 size_gb = 2; @@ -1467,6 +1506,16 @@ public DataSourceCase getDataSourceCase() { * * 
      * Name of a public or custom image used as the data source.
+     * For example, the following are all valid URLs:
+     * (1) Specify the image by its family name:
+     * projects/{project}/global/images/family/{image_family}
+     * (2) Specify the image version:
+     * projects/{project}/global/images/{image_version}
+     * You can also use Batch customized image in short names.
+     * The following image values are supported for a boot disk:
+     * "batch-debian": use Batch Debian images.
+     * "batch-centos": use Batch CentOS images.
+     * "batch-cos": use Batch Container-Optimized images.
      *
* * string image = 4; @@ -1481,6 +1530,16 @@ public boolean hasImage() { * * 
      * Name of a public or custom image used as the data source.
+     * For example, the following are all valid URLs:
+     * (1) Specify the image by its family name:
+     * projects/{project}/global/images/family/{image_family}
+     * (2) Specify the image version:
+     * projects/{project}/global/images/{image_version}
+     * You can also use Batch customized image in short names.
+     * The following image values are supported for a boot disk:
+     * "batch-debian": use Batch Debian images.
+     * "batch-centos": use Batch CentOS images.
+     * "batch-cos": use Batch Container-Optimized images.
      *
* * string image = 4; @@ -1508,6 +1567,16 @@ public java.lang.String getImage() { * * 
      * Name of a public or custom image used as the data source.
+     * For example, the following are all valid URLs:
+     * (1) Specify the image by its family name:
+     * projects/{project}/global/images/family/{image_family}
+     * (2) Specify the image version:
+     * projects/{project}/global/images/{image_version}
+     * You can also use Batch customized image in short names.
+     * The following image values are supported for a boot disk:
+     * "batch-debian": use Batch Debian images.
+     * "batch-centos": use Batch CentOS images.
+     * "batch-cos": use Batch Container-Optimized images.
      *
* * string image = 4; @@ -1609,8 +1678,10 @@ public com.google.protobuf.ByteString getSnapshotBytes() { * * * 
-     * Disk type as shown in `gcloud compute disk-types list`
-     * For example, "pd-ssd", "pd-standard", "pd-balanced", "local-ssd".
+     * Disk type as shown in `gcloud compute disk-types list`.
+     * For example, local SSD uses type "local-ssd".
+     * Persistent disks and boot disks use "pd-balanced", "pd-extreme", "pd-ssd"
+     * or "pd-standard".
      *
* * string type = 1; @@ -1633,8 +1704,10 @@ public java.lang.String getType() { * * * 
-     * Disk type as shown in `gcloud compute disk-types list`
-     * For example, "pd-ssd", "pd-standard", "pd-balanced", "local-ssd".
+     * Disk type as shown in `gcloud compute disk-types list`.
+     * For example, local SSD uses type "local-ssd".
+     * Persistent disks and boot disks use "pd-balanced", "pd-extreme", "pd-ssd"
+     * or "pd-standard".
      *
* * string type = 1; @@ -1661,9 +1734,14 @@ public com.google.protobuf.ByteString getTypeBytes() { * * 
      * Disk size in GB.
-     * This field is ignored if `data_source` is `disk` or `image`.
-     * If `type` is `local-ssd`, size_gb should be a multiple of 375GB,
+     * For persistent disk, this field is ignored if `data_source` is `image` or
+     * `snapshot`.
+     * For local SSD, size_gb should be a multiple of 375GB,
      * otherwise, the final size will be the next greater multiple of 375 GB.
+     * For boot disk, Batch will calculate the boot disk size based on source
+     * image and task requirements if you do not speicify the size.
+     * If both this field and the boot_disk_mib field in task spec's
+     * compute_resource are defined, Batch will only honor this field.
      *
* * int64 size_gb = 2; @@ -2221,6 +2299,16 @@ public Builder clearDataSource() { * * 
        * Name of a public or custom image used as the data source.
+       * For example, the following are all valid URLs:
+       * (1) Specify the image by its family name:
+       * projects/{project}/global/images/family/{image_family}
+       * (2) Specify the image version:
+       * projects/{project}/global/images/{image_version}
+       * You can also use Batch customized image in short names.
+       * The following image values are supported for a boot disk:
+       * "batch-debian": use Batch Debian images.
+       * "batch-centos": use Batch CentOS images.
+       * "batch-cos": use Batch Container-Optimized images.
        *
* * string image = 4; @@ -2236,6 +2324,16 @@ public boolean hasImage() { * * 
        * Name of a public or custom image used as the data source.
+       * For example, the following are all valid URLs:
+       * (1) Specify the image by its family name:
+       * projects/{project}/global/images/family/{image_family}
+       * (2) Specify the image version:
+       * projects/{project}/global/images/{image_version}
+       * You can also use Batch customized image in short names.
+       * The following image values are supported for a boot disk:
+       * "batch-debian": use Batch Debian images.
+       * "batch-centos": use Batch CentOS images.
+       * "batch-cos": use Batch Container-Optimized images.
        *
* * string image = 4; @@ -2264,6 +2362,16 @@ public java.lang.String getImage() { * * 
        * Name of a public or custom image used as the data source.
+       * For example, the following are all valid URLs:
+       * (1) Specify the image by its family name:
+       * projects/{project}/global/images/family/{image_family}
+       * (2) Specify the image version:
+       * projects/{project}/global/images/{image_version}
+       * You can also use Batch customized image in short names.
+       * The following image values are supported for a boot disk:
+       * "batch-debian": use Batch Debian images.
+       * "batch-centos": use Batch CentOS images.
+       * "batch-cos": use Batch Container-Optimized images.
        *
* * string image = 4; @@ -2292,6 +2400,16 @@ public com.google.protobuf.ByteString getImageBytes() { * * 
        * Name of a public or custom image used as the data source.
+       * For example, the following are all valid URLs:
+       * (1) Specify the image by its family name:
+       * projects/{project}/global/images/family/{image_family}
+       * (2) Specify the image version:
+       * projects/{project}/global/images/{image_version}
+       * You can also use Batch customized image in short names.
+       * The following image values are supported for a boot disk:
+       * "batch-debian": use Batch Debian images.
+       * "batch-centos": use Batch CentOS images.
+       * "batch-cos": use Batch Container-Optimized images.
        *
* * string image = 4; @@ -2313,6 +2431,16 @@ public Builder setImage(java.lang.String value) { * * 
        * Name of a public or custom image used as the data source.
+       * For example, the following are all valid URLs:
+       * (1) Specify the image by its family name:
+       * projects/{project}/global/images/family/{image_family}
+       * (2) Specify the image version:
+       * projects/{project}/global/images/{image_version}
+       * You can also use Batch customized image in short names.
+       * The following image values are supported for a boot disk:
+       * "batch-debian": use Batch Debian images.
+       * "batch-centos": use Batch CentOS images.
+       * "batch-cos": use Batch Container-Optimized images.
        *
* * string image = 4; @@ -2332,6 +2460,16 @@ public Builder clearImage() { * * 
        * Name of a public or custom image used as the data source.
+       * For example, the following are all valid URLs:
+       * (1) Specify the image by its family name:
+       * projects/{project}/global/images/family/{image_family}
+       * (2) Specify the image version:
+       * projects/{project}/global/images/{image_version}
+       * You can also use Batch customized image in short names.
+       * The following image values are supported for a boot disk:
+       * "batch-debian": use Batch Debian images.
+       * "batch-centos": use Batch CentOS images.
+       * "batch-cos": use Batch Container-Optimized images.
        *
* * string image = 4; @@ -2489,8 +2627,10 @@ public Builder setSnapshotBytes(com.google.protobuf.ByteString value) { * * * 
-       * Disk type as shown in `gcloud compute disk-types list`
-       * For example, "pd-ssd", "pd-standard", "pd-balanced", "local-ssd".
+       * Disk type as shown in `gcloud compute disk-types list`.
+       * For example, local SSD uses type "local-ssd".
+       * Persistent disks and boot disks use "pd-balanced", "pd-extreme", "pd-ssd"
+       * or "pd-standard".
        *
* * string type = 1; @@ -2512,8 +2652,10 @@ public java.lang.String getType() { * * * 
-       * Disk type as shown in `gcloud compute disk-types list`
-       * For example, "pd-ssd", "pd-standard", "pd-balanced", "local-ssd".
+       * Disk type as shown in `gcloud compute disk-types list`.
+       * For example, local SSD uses type "local-ssd".
+       * Persistent disks and boot disks use "pd-balanced", "pd-extreme", "pd-ssd"
+       * or "pd-standard".
        *
* * string type = 1; @@ -2535,8 +2677,10 @@ public com.google.protobuf.ByteString getTypeBytes() { * * * 
-       * Disk type as shown in `gcloud compute disk-types list`
-       * For example, "pd-ssd", "pd-standard", "pd-balanced", "local-ssd".
+       * Disk type as shown in `gcloud compute disk-types list`.
+       * For example, local SSD uses type "local-ssd".
+       * Persistent disks and boot disks use "pd-balanced", "pd-extreme", "pd-ssd"
+       * or "pd-standard".
        *
* * string type = 1; @@ -2557,8 +2701,10 @@ public Builder setType(java.lang.String value) { * * * 
-       * Disk type as shown in `gcloud compute disk-types list`
-       * For example, "pd-ssd", "pd-standard", "pd-balanced", "local-ssd".
+       * Disk type as shown in `gcloud compute disk-types list`.
+       * For example, local SSD uses type "local-ssd".
+       * Persistent disks and boot disks use "pd-balanced", "pd-extreme", "pd-ssd"
+       * or "pd-standard".
        *
* * string type = 1; @@ -2575,8 +2721,10 @@ public Builder clearType() { * * * 
-       * Disk type as shown in `gcloud compute disk-types list`
-       * For example, "pd-ssd", "pd-standard", "pd-balanced", "local-ssd".
+       * Disk type as shown in `gcloud compute disk-types list`.
+       * For example, local SSD uses type "local-ssd".
+       * Persistent disks and boot disks use "pd-balanced", "pd-extreme", "pd-ssd"
+       * or "pd-standard".
        *
* * string type = 1; @@ -2601,9 +2749,14 @@ public Builder setTypeBytes(com.google.protobuf.ByteString value) { * * 
        * Disk size in GB.
-       * This field is ignored if `data_source` is `disk` or `image`.
-       * If `type` is `local-ssd`, size_gb should be a multiple of 375GB,
+       * For persistent disk, this field is ignored if `data_source` is `image` or
+       * `snapshot`.
+       * For local SSD, size_gb should be a multiple of 375GB,
        * otherwise, the final size will be the next greater multiple of 375 GB.
+       * For boot disk, Batch will calculate the boot disk size based on source
+       * image and task requirements if you do not speicify the size.
+       * If both this field and the boot_disk_mib field in task spec's
+       * compute_resource are defined, Batch will only honor this field.
        *
* * int64 size_gb = 2; @@ -2619,9 +2772,14 @@ public long getSizeGb() { * * 
        * Disk size in GB.
-       * This field is ignored if `data_source` is `disk` or `image`.
-       * If `type` is `local-ssd`, size_gb should be a multiple of 375GB,
+       * For persistent disk, this field is ignored if `data_source` is `image` or
+       * `snapshot`.
+       * For local SSD, size_gb should be a multiple of 375GB,
        * otherwise, the final size will be the next greater multiple of 375 GB.
+       * For boot disk, Batch will calculate the boot disk size based on source
+       * image and task requirements if you do not speicify the size.
+       * If both this field and the boot_disk_mib field in task spec's
+       * compute_resource are defined, Batch will only honor this field.
        *
* * int64 size_gb = 2; @@ -2641,9 +2799,14 @@ public Builder setSizeGb(long value) { * * 
        * Disk size in GB.
-       * This field is ignored if `data_source` is `disk` or `image`.
-       * If `type` is `local-ssd`, size_gb should be a multiple of 375GB,
+       * For persistent disk, this field is ignored if `data_source` is `image` or
+       * `snapshot`.
+       * For local SSD, size_gb should be a multiple of 375GB,
        * otherwise, the final size will be the next greater multiple of 375 GB.
+       * For boot disk, Batch will calculate the boot disk size based on source
+       * image and task requirements if you do not speicify the size.
+       * If both this field and the boot_disk_mib field in task spec's
+       * compute_resource are defined, Batch will only honor this field.
        *
* * int64 size_gb = 2; @@ -4143,7 +4306,7 @@ public interface AcceleratorOrBuilder * bool install_gpu_drivers = 3 [deprecated = true]; * * @deprecated google.cloud.batch.v1.AllocationPolicy.Accelerator.install_gpu_drivers is - * deprecated. See google/cloud/batch/v1/job.proto;l=294 + * deprecated. See google/cloud/batch/v1/job.proto;l=314 * @return The installGpuDrivers. */ @java.lang.Deprecated @@ -4281,7 +4444,7 @@ public long getCount() { * bool install_gpu_drivers = 3 [deprecated = true]; * * @deprecated google.cloud.batch.v1.AllocationPolicy.Accelerator.install_gpu_drivers is - * deprecated. See google/cloud/batch/v1/job.proto;l=294 + * deprecated. See google/cloud/batch/v1/job.proto;l=314 * @return The installGpuDrivers. */ @java.lang.Override @@ -4856,7 +5019,7 @@ public Builder clearCount() { * bool install_gpu_drivers = 3 [deprecated = true]; * * @deprecated google.cloud.batch.v1.AllocationPolicy.Accelerator.install_gpu_drivers is - * deprecated. See google/cloud/batch/v1/job.proto;l=294 + * deprecated. See google/cloud/batch/v1/job.proto;l=314 * @return The installGpuDrivers. */ @java.lang.Override @@ -4874,7 +5037,7 @@ public boolean getInstallGpuDrivers() { * bool install_gpu_drivers = 3 [deprecated = true]; * * @deprecated google.cloud.batch.v1.AllocationPolicy.Accelerator.install_gpu_drivers is - * deprecated. See google/cloud/batch/v1/job.proto;l=294 + * deprecated. See google/cloud/batch/v1/job.proto;l=314 * @param value The installGpuDrivers to set. * @return This builder for chaining. */ @@ -4896,7 +5059,7 @@ public Builder setInstallGpuDrivers(boolean value) { * bool install_gpu_drivers = 3 [deprecated = true]; * * @deprecated google.cloud.batch.v1.AllocationPolicy.Accelerator.install_gpu_drivers is - * deprecated. See google/cloud/batch/v1/job.proto;l=294 + * deprecated. See google/cloud/batch/v1/job.proto;l=314 * @return This builder for chaining. */ @java.lang.Deprecated @@ -5112,6 +5275,44 @@ public interface InstancePolicyOrBuilder com.google.cloud.batch.v1.AllocationPolicy.AcceleratorOrBuilder getAcceleratorsOrBuilder( int index); + /** + * + * + * 
+     * Book disk to be created and attached to each VM by this InstancePolicy.
+     * Boot disk will be deleted when the VM is deleted.
+     *
+ * + * .google.cloud.batch.v1.AllocationPolicy.Disk boot_disk = 8; + * + * @return Whether the bootDisk field is set. + */ + boolean hasBootDisk(); + /** + * + * + * 
+     * Book disk to be created and attached to each VM by this InstancePolicy.
+     * Boot disk will be deleted when the VM is deleted.
+     *
+ * + * .google.cloud.batch.v1.AllocationPolicy.Disk boot_disk = 8; + * + * @return The bootDisk. + */ + com.google.cloud.batch.v1.AllocationPolicy.Disk getBootDisk(); + /** + * + * + * 
+     * Book disk to be created and attached to each VM by this InstancePolicy.
+     * Boot disk will be deleted when the VM is deleted.
+     *
+ * + * .google.cloud.batch.v1.AllocationPolicy.Disk boot_disk = 8; + */ + com.google.cloud.batch.v1.AllocationPolicy.DiskOrBuilder getBootDiskOrBuilder(); + /** * * @@ -5444,6 +5645,59 @@ public com.google.cloud.batch.v1.AllocationPolicy.AcceleratorOrBuilder getAccele return accelerators_.get(index); } + public static final int BOOT_DISK_FIELD_NUMBER = 8; + private com.google.cloud.batch.v1.AllocationPolicy.Disk bootDisk_; + /** + * + * + * 
+     * Book disk to be created and attached to each VM by this InstancePolicy.
+     * Boot disk will be deleted when the VM is deleted.
+     *
+ * + * .google.cloud.batch.v1.AllocationPolicy.Disk boot_disk = 8; + * + * @return Whether the bootDisk field is set. + */ + @java.lang.Override + public boolean hasBootDisk() { + return bootDisk_ != null; + } + /** + * + * + * 
+     * Book disk to be created and attached to each VM by this InstancePolicy.
+     * Boot disk will be deleted when the VM is deleted.
+     *
+ * + * .google.cloud.batch.v1.AllocationPolicy.Disk boot_disk = 8; + * + * @return The bootDisk. + */ + @java.lang.Override + public com.google.cloud.batch.v1.AllocationPolicy.Disk getBootDisk() { + return bootDisk_ == null + ? com.google.cloud.batch.v1.AllocationPolicy.Disk.getDefaultInstance() + : bootDisk_; + } + /** + * + * + * 
+     * Book disk to be created and attached to each VM by this InstancePolicy.
+     * Boot disk will be deleted when the VM is deleted.
+     *
+ * + * .google.cloud.batch.v1.AllocationPolicy.Disk boot_disk = 8; + */ + @java.lang.Override + public com.google.cloud.batch.v1.AllocationPolicy.DiskOrBuilder getBootDiskOrBuilder() { + return bootDisk_ == null + ? com.google.cloud.batch.v1.AllocationPolicy.Disk.getDefaultInstance() + : bootDisk_; + } + public static final int DISKS_FIELD_NUMBER = 6; @SuppressWarnings("serial") @@ -5554,6 +5808,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < disks_.size(); i++) { output.writeMessage(6, disks_.get(i)); } + if (bootDisk_ != null) { + output.writeMessage(8, getBootDisk()); + } getUnknownFields().writeTo(output); } @@ -5581,6 +5838,9 @@ public int getSerializedSize() { for (int i = 0; i < disks_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, disks_.get(i)); } + if (bootDisk_ != null) { + size += com.google.protobuf.CodedOutputStream.computeMessageSize(8, getBootDisk()); + } size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; @@ -5601,6 +5861,10 @@ public boolean equals(final java.lang.Object obj) { if (!getMinCpuPlatform().equals(other.getMinCpuPlatform())) return false; if (provisioningModel_ != other.provisioningModel_) return false; if (!getAcceleratorsList().equals(other.getAcceleratorsList())) return false; + if (hasBootDisk() != other.hasBootDisk()) return false; + if (hasBootDisk()) { + if (!getBootDisk().equals(other.getBootDisk())) return false; + } if (!getDisksList().equals(other.getDisksList())) return false; if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; @@ -5623,6 +5887,10 @@ public int hashCode() { hash = (37 * hash) + ACCELERATORS_FIELD_NUMBER; hash = (53 * hash) + getAcceleratorsList().hashCode(); } + if (hasBootDisk()) { + hash = (37 * hash) + BOOT_DISK_FIELD_NUMBER; + hash = (53 * hash) + getBootDisk().hashCode(); + } if (getDisksCount() > 0) { hash = (37 * hash) + DISKS_FIELD_NUMBER; hash = (53 * hash) + getDisksList().hashCode(); @@ -5780,13 +6048,18 @@ public Builder clear() { acceleratorsBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000008); + bootDisk_ = null; + if (bootDiskBuilder_ != null) { + bootDiskBuilder_.dispose(); + bootDiskBuilder_ = null; + } if (disksBuilder_ == null) { disks_ = java.util.Collections.emptyList(); } else { disks_ = null; disksBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000010); + bitField0_ = (bitField0_ & ~0x00000020); return this; } @@ -5834,9 +6107,9 @@ private void buildPartialRepeatedFields( result.accelerators_ = acceleratorsBuilder_.build(); } if (disksBuilder_ == null) { - if (((bitField0_ & 0x00000010) != 0)) { + if (((bitField0_ & 0x00000020) != 0)) { disks_ = java.util.Collections.unmodifiableList(disks_); - bitField0_ = (bitField0_ & ~0x00000010); + bitField0_ = (bitField0_ & ~0x00000020); } result.disks_ = disks_; } else { @@ -5855,6 +6128,9 @@ private void buildPartial0(com.google.cloud.batch.v1.AllocationPolicy.InstancePo if (((from_bitField0_ & 0x00000004) != 0)) { result.provisioningModel_ = provisioningModel_; } + if (((from_bitField0_ & 0x00000010) != 0)) { + result.bootDisk_ = bootDiskBuilder_ == null ? bootDisk_ : bootDiskBuilder_.build(); + } } @java.lang.Override @@ -5945,11 +6221,14 @@ public Builder mergeFrom(com.google.cloud.batch.v1.AllocationPolicy.InstancePoli } } } + if (other.hasBootDisk()) { + mergeBootDisk(other.getBootDisk()); + } if (disksBuilder_ == null) { if (!other.disks_.isEmpty()) { if (disks_.isEmpty()) { disks_ = other.disks_; - bitField0_ = (bitField0_ & ~0x00000010); + bitField0_ = (bitField0_ & ~0x00000020); } else { ensureDisksIsMutable(); disks_.addAll(other.disks_); @@ -5962,7 +6241,7 @@ public Builder mergeFrom(com.google.cloud.batch.v1.AllocationPolicy.InstancePoli disksBuilder_.dispose(); disksBuilder_ = null; disks_ = other.disks_; - bitField0_ = (bitField0_ & ~0x00000010); + bitField0_ = (bitField0_ & ~0x00000020); disksBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getDisksFieldBuilder() @@ -6044,6 +6323,12 @@ public Builder mergeFrom( } break; } // case 50 + case 66: + { + input.readMessage(getBootDiskFieldBuilder().getBuilder(), extensionRegistry); + bitField0_ |= 0x00000010; + break; + } // case 66 default: { if (!super.parseUnknownField(input, extensionRegistry, tag)) { @@ -6757,15 +7042,209 @@ public com.google.cloud.batch.v1.AllocationPolicy.Accelerator.Builder addAcceler return acceleratorsBuilder_; } + private com.google.cloud.batch.v1.AllocationPolicy.Disk bootDisk_; + private com.google.protobuf.SingleFieldBuilderV3< + com.google.cloud.batch.v1.AllocationPolicy.Disk, + com.google.cloud.batch.v1.AllocationPolicy.Disk.Builder, + com.google.cloud.batch.v1.AllocationPolicy.DiskOrBuilder> + bootDiskBuilder_; + /** + * + * + * 
+       * Book disk to be created and attached to each VM by this InstancePolicy.
+       * Boot disk will be deleted when the VM is deleted.
+       *
+ * + * .google.cloud.batch.v1.AllocationPolicy.Disk boot_disk = 8; + * + * @return Whether the bootDisk field is set. + */ + public boolean hasBootDisk() { + return ((bitField0_ & 0x00000010) != 0); + } + /** + * + * + * 
+       * Book disk to be created and attached to each VM by this InstancePolicy.
+       * Boot disk will be deleted when the VM is deleted.
+       *
+ * + * .google.cloud.batch.v1.AllocationPolicy.Disk boot_disk = 8; + * + * @return The bootDisk. + */ + public com.google.cloud.batch.v1.AllocationPolicy.Disk getBootDisk() { + if (bootDiskBuilder_ == null) { + return bootDisk_ == null + ? com.google.cloud.batch.v1.AllocationPolicy.Disk.getDefaultInstance() + : bootDisk_; + } else { + return bootDiskBuilder_.getMessage(); + } + } + /** + * + * + * 
+       * Book disk to be created and attached to each VM by this InstancePolicy.
+       * Boot disk will be deleted when the VM is deleted.
+       *
+ * + * .google.cloud.batch.v1.AllocationPolicy.Disk boot_disk = 8; + */ + public Builder setBootDisk(com.google.cloud.batch.v1.AllocationPolicy.Disk value) { + if (bootDiskBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + bootDisk_ = value; + } else { + bootDiskBuilder_.setMessage(value); + } + bitField0_ |= 0x00000010; + onChanged(); + return this; + } + /** + * + * + * 
+       * Book disk to be created and attached to each VM by this InstancePolicy.
+       * Boot disk will be deleted when the VM is deleted.
+       *
+ * + * .google.cloud.batch.v1.AllocationPolicy.Disk boot_disk = 8; + */ + public Builder setBootDisk( + com.google.cloud.batch.v1.AllocationPolicy.Disk.Builder builderForValue) { + if (bootDiskBuilder_ == null) { + bootDisk_ = builderForValue.build(); + } else { + bootDiskBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000010; + onChanged(); + return this; + } + /** + * + * + * 
+       * Book disk to be created and attached to each VM by this InstancePolicy.
+       * Boot disk will be deleted when the VM is deleted.
+       *
+ * + * .google.cloud.batch.v1.AllocationPolicy.Disk boot_disk = 8; + */ + public Builder mergeBootDisk(com.google.cloud.batch.v1.AllocationPolicy.Disk value) { + if (bootDiskBuilder_ == null) { + if (((bitField0_ & 0x00000010) != 0) + && bootDisk_ != null + && bootDisk_ + != com.google.cloud.batch.v1.AllocationPolicy.Disk.getDefaultInstance()) { + getBootDiskBuilder().mergeFrom(value); + } else { + bootDisk_ = value; + } + } else { + bootDiskBuilder_.mergeFrom(value); + } + bitField0_ |= 0x00000010; + onChanged(); + return this; + } + /** + * + * + * 
+       * Book disk to be created and attached to each VM by this InstancePolicy.
+       * Boot disk will be deleted when the VM is deleted.
+       *
+ * + * .google.cloud.batch.v1.AllocationPolicy.Disk boot_disk = 8; + */ + public Builder clearBootDisk() { + bitField0_ = (bitField0_ & ~0x00000010); + bootDisk_ = null; + if (bootDiskBuilder_ != null) { + bootDiskBuilder_.dispose(); + bootDiskBuilder_ = null; + } + onChanged(); + return this; + } + /** + * + * + * 
+       * Book disk to be created and attached to each VM by this InstancePolicy.
+       * Boot disk will be deleted when the VM is deleted.
+       *
+ * + * .google.cloud.batch.v1.AllocationPolicy.Disk boot_disk = 8; + */ + public com.google.cloud.batch.v1.AllocationPolicy.Disk.Builder getBootDiskBuilder() { + bitField0_ |= 0x00000010; + onChanged(); + return getBootDiskFieldBuilder().getBuilder(); + } + /** + * + * + * 
+       * Book disk to be created and attached to each VM by this InstancePolicy.
+       * Boot disk will be deleted when the VM is deleted.
+       *
+ * + * .google.cloud.batch.v1.AllocationPolicy.Disk boot_disk = 8; + */ + public com.google.cloud.batch.v1.AllocationPolicy.DiskOrBuilder getBootDiskOrBuilder() { + if (bootDiskBuilder_ != null) { + return bootDiskBuilder_.getMessageOrBuilder(); + } else { + return bootDisk_ == null + ? com.google.cloud.batch.v1.AllocationPolicy.Disk.getDefaultInstance() + : bootDisk_; + } + } + /** + * + * + * 
+       * Book disk to be created and attached to each VM by this InstancePolicy.
+       * Boot disk will be deleted when the VM is deleted.
+       *
+ * + * .google.cloud.batch.v1.AllocationPolicy.Disk boot_disk = 8; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.cloud.batch.v1.AllocationPolicy.Disk, + com.google.cloud.batch.v1.AllocationPolicy.Disk.Builder, + com.google.cloud.batch.v1.AllocationPolicy.DiskOrBuilder> + getBootDiskFieldBuilder() { + if (bootDiskBuilder_ == null) { + bootDiskBuilder_ = + new com.google.protobuf.SingleFieldBuilderV3< + com.google.cloud.batch.v1.AllocationPolicy.Disk, + com.google.cloud.batch.v1.AllocationPolicy.Disk.Builder, + com.google.cloud.batch.v1.AllocationPolicy.DiskOrBuilder>( + getBootDisk(), getParentForChildren(), isClean()); + bootDisk_ = null; + } + return bootDiskBuilder_; + } + private java.util.List disks_ = java.util.Collections.emptyList(); private void ensureDisksIsMutable() { - if (!((bitField0_ & 0x00000010) != 0)) { + if (!((bitField0_ & 0x00000020) != 0)) { disks_ = new java.util.ArrayList( disks_); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; } } @@ -6998,7 +7477,7 @@ public Builder addAllDisks( public Builder clearDisks() { if (disksBuilder_ == null) { disks_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000010); + bitField0_ = (bitField0_ & ~0x00000020); onChanged(); } else { disksBuilder_.clear(); @@ -7134,7 +7613,7 @@ public com.google.cloud.batch.v1.AllocationPolicy.AttachedDisk.Builder addDisksB com.google.cloud.batch.v1.AllocationPolicy.AttachedDisk, com.google.cloud.batch.v1.AllocationPolicy.AttachedDisk.Builder, com.google.cloud.batch.v1.AllocationPolicy.AttachedDiskOrBuilder>( - disks_, ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean()); + disks_, ((bitField0_ & 0x00000020) != 0), getParentForChildren(), isClean()); disks_ = null; } return disksBuilder_; diff --git a/java-batch/proto-google-cloud-batch-v1/src/main/java/com/google/cloud/batch/v1/BatchProto.java b/java-batch/proto-google-cloud-batch-v1/src/main/java/com/google/cloud/batch/v1/BatchProto.java index f8eef6b0c94f..3d4a1be3a96a 100644 --- a/java-batch/proto-google-cloud-batch-v1/src/main/java/com/google/cloud/batch/v1/BatchProto.java +++ b/java-batch/proto-google-cloud-batch-v1/src/main/java/com/google/cloud/batch/v1/BatchProto.java @@ -73,78 +73,77 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { static { java.lang.String[] descriptorData = { "\n!google/cloud/batch/v1/batch.proto\022\025goo" - + "gle.cloud.batch.v1\032\033google/protobuf/empt" - + "y.proto\032\034google/api/annotations.proto\032\027g" - + "oogle/api/client.proto\032\037google/api/field" - + "_behavior.proto\032\031google/api/resource.pro" - + "to\032\037google/cloud/batch/v1/job.proto\032 goo" - + "gle/cloud/batch/v1/task.proto\032#google/lo" - + "ngrunning/operations.proto\032\037google/proto" - + "buf/timestamp.proto\"\233\001\n\020CreateJobRequest" - + "\0220\n\006parent\030\001 \001(\tB \340A\002\372A\032\022\030batch.googleap" - + "is.com/Job\022\016\n\006job_id\030\002 \001(\t\022,\n\003job\030\003 \001(\0132" - + "\032.google.cloud.batch.v1.JobB\003\340A\002\022\027\n\nrequ" - + "est_id\030\004 \001(\tB\003\340A\001\"?\n\rGetJobRequest\022.\n\004na" - + "me\030\001 \001(\tB \340A\002\372A\032\n\030batch.googleapis.com/J" - + "ob\"N\n\020DeleteJobRequest\022\014\n\004name\030\001 \001(\t\022\023\n\006" - + "reason\030\002 \001(\tB\003\340A\001\022\027\n\nrequest_id\030\004 \001(\tB\003\340" - + "A\001\"X\n\017ListJobsRequest\022\016\n\006parent\030\001 \001(\t\022\016\n" - + "\006filter\030\004 \001(\t\022\021\n\tpage_size\030\002 \001(\005\022\022\n\npage" - + "_token\030\003 \001(\t\"j\n\020ListJobsResponse\022(\n\004jobs" - + "\030\001 \003(\0132\032.google.cloud.batch.v1.Job\022\027\n\017ne" - + "xt_page_token\030\002 \001(\t\022\023\n\013unreachable\030\003 \003(\t" - + "\"\201\001\n\020ListTasksRequest\0226\n\006parent\030\001 \001(\tB&\340" - + "A\002\372A \n\036batch.googleapis.com/TaskGroup\022\016\n" - + "\006filter\030\002 \001(\t\022\021\n\tpage_size\030\003 \001(\005\022\022\n\npage" - + "_token\030\004 \001(\t\"m\n\021ListTasksResponse\022*\n\005tas" - + "ks\030\001 \003(\0132\033.google.cloud.batch.v1.Task\022\027\n" - + "\017next_page_token\030\002 \001(\t\022\023\n\013unreachable\030\003 " - + "\003(\t\"A\n\016GetTaskRequest\022/\n\004name\030\001 \001(\tB!\340A\002" - + "\372A\033\n\031batch.googleapis.com/Task\"\200\002\n\021Opera" - + "tionMetadata\0224\n\013create_time\030\001 \001(\0132\032.goog" - + "le.protobuf.TimestampB\003\340A\003\0221\n\010end_time\030\002" - + " \001(\0132\032.google.protobuf.TimestampB\003\340A\003\022\023\n" - + "\006target\030\003 \001(\tB\003\340A\003\022\021\n\004verb\030\004 \001(\tB\003\340A\003\022\033\n" - + "\016status_message\030\005 \001(\tB\003\340A\003\022#\n\026requested_" - + "cancellation\030\006 \001(\010B\003\340A\003\022\030\n\013api_version\030\007" - + " \001(\tB\003\340A\0032\266\010\n\014BatchService\022\233\001\n\tCreateJob" - + "\022\'.google.cloud.batch.v1.CreateJobReques" - + "t\032\032.google.cloud.batch.v1.Job\"I\202\323\344\223\002/\"(/" - + "v1/{parent=projects/*/locations/*}/jobs:" - + "\003job\332A\021parent,job,job_id\022\203\001\n\006GetJob\022$.go" - + "ogle.cloud.batch.v1.GetJobRequest\032\032.goog" - + "le.cloud.batch.v1.Job\"7\202\323\344\223\002*\022(/v1/{name" - + "=projects/*/locations/*/jobs/*}\332A\004name\022\317" - + "\001\n\tDeleteJob\022\'.google.cloud.batch.v1.Del" - + "eteJobRequest\032\035.google.longrunning.Opera" - + "tion\"z\202\323\344\223\002**(/v1/{name=projects/*/locat" - + "ions/*/jobs/*}\332A\004name\312A@\n\025google.protobu" - + "f.Empty\022\'google.cloud.batch.v1.Operation" - + "Metadata\022\226\001\n\010ListJobs\022&.google.cloud.bat" - + "ch.v1.ListJobsRequest\032\'.google.cloud.bat" - + "ch.v1.ListJobsResponse\"9\202\323\344\223\002*\022(/v1/{par" - + "ent=projects/*/locations/*}/jobs\332A\006paren" - + "t\022\233\001\n\007GetTask\022%.google.cloud.batch.v1.Ge" - + "tTaskRequest\032\033.google.cloud.batch.v1.Tas" - + "k\"L\202\323\344\223\002?\022=/v1/{name=projects/*/location" - + "s/*/jobs/*/taskGroups/*/tasks/*}\332A\004name\022" - + "\256\001\n\tListTasks\022\'.google.cloud.batch.v1.Li" - + "stTasksRequest\032(.google.cloud.batch.v1.L" - + "istTasksResponse\"N\202\323\344\223\002?\022=/v1/{parent=pr" - + "ojects/*/locations/*/jobs/*/taskGroups/*" - + "}/tasks\332A\006parent\032H\312A\024batch.googleapis.co" - + "m\322A.https://www.googleapis.com/auth/clou" - + "d-platformB\253\001\n\031com.google.cloud.batch.v1" - + "B\nBatchProtoP\001Z/cloud.google.com/go/batc" - + "h/apiv1/batchpb;batchpb\242\002\003GCB\252\002\025Google.C" - + "loud.Batch.V1\312\002\025Google\\Cloud\\Batch\\V1\352\002\030" - + "Google::Cloud::Batch::V1P\000b\006proto3" + + "gle.cloud.batch.v1\032\034google/api/annotatio" + + "ns.proto\032\027google/api/client.proto\032\037googl" + + "e/api/field_behavior.proto\032\031google/api/r" + + "esource.proto\032\037google/cloud/batch/v1/job" + + ".proto\032 google/cloud/batch/v1/task.proto" + + "\032#google/longrunning/operations.proto\032\037g" + + "oogle/protobuf/timestamp.proto\"\233\001\n\020Creat" + + "eJobRequest\0220\n\006parent\030\001 \001(\tB \340A\002\372A\032\022\030bat" + + "ch.googleapis.com/Job\022\016\n\006job_id\030\002 \001(\t\022,\n" + + "\003job\030\003 \001(\0132\032.google.cloud.batch.v1.JobB\003" + + "\340A\002\022\027\n\nrequest_id\030\004 \001(\tB\003\340A\001\"?\n\rGetJobRe" + + "quest\022.\n\004name\030\001 \001(\tB \340A\002\372A\032\n\030batch.googl" + + "eapis.com/Job\"N\n\020DeleteJobRequest\022\014\n\004nam" + + "e\030\001 \001(\t\022\023\n\006reason\030\002 \001(\tB\003\340A\001\022\027\n\nrequest_" + + "id\030\004 \001(\tB\003\340A\001\"X\n\017ListJobsRequest\022\016\n\006pare" + + "nt\030\001 \001(\t\022\016\n\006filter\030\004 \001(\t\022\021\n\tpage_size\030\002 " + + "\001(\005\022\022\n\npage_token\030\003 \001(\t\"j\n\020ListJobsRespo" + + "nse\022(\n\004jobs\030\001 \003(\0132\032.google.cloud.batch.v" + + "1.Job\022\027\n\017next_page_token\030\002 \001(\t\022\023\n\013unreac" + + "hable\030\003 \003(\t\"\201\001\n\020ListTasksRequest\0226\n\006pare" + + "nt\030\001 \001(\tB&\340A\002\372A \n\036batch.googleapis.com/T" + + "askGroup\022\016\n\006filter\030\002 \001(\t\022\021\n\tpage_size\030\003 " + + "\001(\005\022\022\n\npage_token\030\004 \001(\t\"m\n\021ListTasksResp" + + "onse\022*\n\005tasks\030\001 \003(\0132\033.google.cloud.batch" + + ".v1.Task\022\027\n\017next_page_token\030\002 \001(\t\022\023\n\013unr" + + "eachable\030\003 \003(\t\"A\n\016GetTaskRequest\022/\n\004name" + + "\030\001 \001(\tB!\340A\002\372A\033\n\031batch.googleapis.com/Tas" + + "k\"\200\002\n\021OperationMetadata\0224\n\013create_time\030\001" + + " \001(\0132\032.google.protobuf.TimestampB\003\340A\003\0221\n" + + "\010end_time\030\002 \001(\0132\032.google.protobuf.Timest" + + "ampB\003\340A\003\022\023\n\006target\030\003 \001(\tB\003\340A\003\022\021\n\004verb\030\004 " + + "\001(\tB\003\340A\003\022\033\n\016status_message\030\005 \001(\tB\003\340A\003\022#\n" + + "\026requested_cancellation\030\006 \001(\010B\003\340A\003\022\030\n\013ap" + + "i_version\030\007 \001(\tB\003\340A\0032\266\010\n\014BatchService\022\233\001" + + "\n\tCreateJob\022\'.google.cloud.batch.v1.Crea" + + "teJobRequest\032\032.google.cloud.batch.v1.Job" + + "\"I\202\323\344\223\002/\"(/v1/{parent=projects/*/locatio" + + "ns/*}/jobs:\003job\332A\021parent,job,job_id\022\203\001\n\006" + + "GetJob\022$.google.cloud.batch.v1.GetJobReq" + + "uest\032\032.google.cloud.batch.v1.Job\"7\202\323\344\223\002*" + + "\022(/v1/{name=projects/*/locations/*/jobs/" + + "*}\332A\004name\022\317\001\n\tDeleteJob\022\'.google.cloud.b" + + "atch.v1.DeleteJobRequest\032\035.google.longru" + + "nning.Operation\"z\202\323\344\223\002**(/v1/{name=proje" + + "cts/*/locations/*/jobs/*}\332A\004name\312A@\n\025goo" + + "gle.protobuf.Empty\022\'google.cloud.batch.v" + + "1.OperationMetadata\022\226\001\n\010ListJobs\022&.googl" + + "e.cloud.batch.v1.ListJobsRequest\032\'.googl" + + "e.cloud.batch.v1.ListJobsResponse\"9\202\323\344\223\002" + + "*\022(/v1/{parent=projects/*/locations/*}/j" + + "obs\332A\006parent\022\233\001\n\007GetTask\022%.google.cloud." + + "batch.v1.GetTaskRequest\032\033.google.cloud.b" + + "atch.v1.Task\"L\202\323\344\223\002?\022=/v1/{name=projects" + + "/*/locations/*/jobs/*/taskGroups/*/tasks" + + "/*}\332A\004name\022\256\001\n\tListTasks\022\'.google.cloud." + + "batch.v1.ListTasksRequest\032(.google.cloud" + + ".batch.v1.ListTasksResponse\"N\202\323\344\223\002?\022=/v1" + + "/{parent=projects/*/locations/*/jobs/*/t" + + "askGroups/*}/tasks\332A\006parent\032H\312A\024batch.go" + + "ogleapis.com\322A.https://www.googleapis.co" + + "m/auth/cloud-platformB\253\001\n\031com.google.clo" + + "ud.batch.v1B\nBatchProtoP\001Z/cloud.google." + + "com/go/batch/apiv1/batchpb;batchpb\242\002\003GCB" + + "\252\002\025Google.Cloud.Batch.V1\312\002\025Google\\Cloud\\" + + "Batch\\V1\352\002\030Google::Cloud::Batch::V1b\006pro" + + "to3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - com.google.protobuf.EmptyProto.getDescriptor(), com.google.api.AnnotationsProto.getDescriptor(), com.google.api.ClientProto.getDescriptor(), com.google.api.FieldBehaviorProto.getDescriptor(), @@ -243,7 +242,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { registry.add(com.google.longrunning.OperationsProto.operationInfo); com.google.protobuf.Descriptors.FileDescriptor.internalUpdateFileDescriptor( descriptor, registry); - com.google.protobuf.EmptyProto.getDescriptor(); com.google.api.AnnotationsProto.getDescriptor(); com.google.api.ClientProto.getDescriptor(); com.google.api.FieldBehaviorProto.getDescriptor(); diff --git a/java-batch/proto-google-cloud-batch-v1/src/main/java/com/google/cloud/batch/v1/JobProto.java b/java-batch/proto-google-cloud-batch-v1/src/main/java/com/google/cloud/batch/v1/JobProto.java index 96449c92238c..b12dd78ca652 100644 --- a/java-batch/proto-google-cloud-batch-v1/src/main/java/com/google/cloud/batch/v1/JobProto.java +++ b/java-batch/proto-google-cloud-batch-v1/src/main/java/com/google/cloud/batch/v1/JobProto.java @@ -150,92 +150,95 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "cloud.batch.v1.LogsPolicy.Destination\022\021\n" + "\tlogs_path\030\002 \001(\t\"G\n\013Destination\022\033\n\027DESTI" + "NATION_UNSPECIFIED\020\000\022\021\n\rCLOUD_LOGGING\020\001\022" - + "\010\n\004PATH\020\002\"\277\006\n\tJobStatus\0225\n\005state\030\001 \001(\0162&" + + "\010\n\004PATH\020\002\"\200\007\n\tJobStatus\0225\n\005state\030\001 \001(\0162&" + ".google.cloud.batch.v1.JobStatus.State\0229" + "\n\rstatus_events\030\002 \003(\0132\".google.cloud.bat" + "ch.v1.StatusEvent\022E\n\013task_groups\030\004 \003(\01320" + ".google.cloud.batch.v1.JobStatus.TaskGro" + "upsEntry\022/\n\014run_duration\030\005 \001(\0132\031.google." - + "protobuf.Duration\032\220\001\n\016InstanceStatus\022\024\n\014" + + "protobuf.Duration\032\321\001\n\016InstanceStatus\022\024\n\014" + "machine_type\030\001 \001(\t\022U\n\022provisioning_model" + "\030\002 \001(\01629.google.cloud.batch.v1.Allocatio" + "nPolicy.ProvisioningModel\022\021\n\ttask_pack\030\003" - + " \001(\003\032\322\001\n\017TaskGroupStatus\022L\n\006counts\030\001 \003(\013" - + "2<.google.cloud.batch.v1.JobStatus.TaskG" - + "roupStatus.CountsEntry\022B\n\tinstances\030\002 \003(" - + "\0132/.google.cloud.batch.v1.JobStatus.Inst" - + "anceStatus\032-\n\013CountsEntry\022\013\n\003key\030\001 \001(\t\022\r" - + "\n\005value\030\002 \001(\003:\0028\001\032c\n\017TaskGroupsEntry\022\013\n\003" - + "key\030\001 \001(\t\022?\n\005value\030\002 \001(\01320.google.cloud." - + "batch.v1.JobStatus.TaskGroupStatus:\0028\001\"{" - + "\n\005State\022\025\n\021STATE_UNSPECIFIED\020\000\022\n\n\006QUEUED" - + "\020\001\022\r\n\tSCHEDULED\020\002\022\013\n\007RUNNING\020\003\022\r\n\tSUCCEE" - + "DED\020\004\022\n\n\006FAILED\020\005\022\030\n\024DELETION_IN_PROGRES" - + "S\020\006\"\374\002\n\017JobNotification\022\024\n\014pubsub_topic\030" - + "\001 \001(\t\022?\n\007message\030\002 \001(\0132..google.cloud.ba" - + "tch.v1.JobNotification.Message\032\304\001\n\007Messa" - + "ge\0229\n\004type\030\001 \001(\0162+.google.cloud.batch.v1" - + ".JobNotification.Type\022=\n\rnew_job_state\030\002" - + " \001(\0162&.google.cloud.batch.v1.JobStatus.S" - + "tate\022?\n\016new_task_state\030\003 \001(\0162\'.google.cl" - + "oud.batch.v1.TaskStatus.State\"K\n\004Type\022\024\n" - + "\020TYPE_UNSPECIFIED\020\000\022\025\n\021JOB_STATE_CHANGED" - + "\020\001\022\026\n\022TASK_STATE_CHANGED\020\002\"\247\014\n\020Allocatio" - + "nPolicy\022H\n\010location\030\001 \001(\01326.google.cloud" - + ".batch.v1.AllocationPolicy.LocationPolic" - + "y\022S\n\tinstances\030\010 \003(\0132@.google.cloud.batc" - + "h.v1.AllocationPolicy.InstancePolicyOrTe" - + "mplate\022>\n\017service_account\030\t \001(\0132%.google" - + ".cloud.batch.v1.ServiceAccount\022C\n\006labels" - + "\030\006 \003(\01323.google.cloud.batch.v1.Allocatio" - + "nPolicy.LabelsEntry\022F\n\007network\030\007 \001(\01325.g" - + "oogle.cloud.batch.v1.AllocationPolicy.Ne" - + "tworkPolicy\032+\n\016LocationPolicy\022\031\n\021allowed" - + "_locations\030\001 \003(\t\032q\n\004Disk\022\017\n\005image\030\004 \001(\tH" - + "\000\022\022\n\010snapshot\030\005 \001(\tH\000\022\014\n\004type\030\001 \001(\t\022\017\n\007s" - + "ize_gb\030\002 \001(\003\022\026\n\016disk_interface\030\006 \001(\tB\r\n\013" - + "data_source\032\212\001\n\014AttachedDisk\022@\n\010new_disk" - + "\030\001 \001(\0132,.google.cloud.batch.v1.Allocatio" - + "nPolicy.DiskH\000\022\027\n\rexisting_disk\030\002 \001(\tH\000\022" - + "\023\n\013device_name\030\003 \001(\tB\n\n\010attached\032K\n\013Acce" - + "lerator\022\014\n\004type\030\001 \001(\t\022\r\n\005count\030\002 \001(\003\022\037\n\023" - + "install_gpu_drivers\030\003 \001(\010B\002\030\001\032\247\002\n\016Instan" - + "cePolicy\022\024\n\014machine_type\030\002 \001(\t\022\030\n\020min_cp" - + "u_platform\030\003 \001(\t\022U\n\022provisioning_model\030\004" - + " \001(\01629.google.cloud.batch.v1.AllocationP" - + "olicy.ProvisioningModel\022I\n\014accelerators\030" - + "\005 \003(\01323.google.cloud.batch.v1.Allocation" - + "Policy.Accelerator\022C\n\005disks\030\006 \003(\01324.goog" - + "le.cloud.batch.v1.AllocationPolicy.Attac" - + "hedDisk\032\261\001\n\030InstancePolicyOrTemplate\022H\n\006" - + "policy\030\001 \001(\01326.google.cloud.batch.v1.All" - + "ocationPolicy.InstancePolicyH\000\022\033\n\021instan" - + "ce_template\030\002 \001(\tH\000\022\033\n\023install_gpu_drive" - + "rs\030\003 \001(\010B\021\n\017policy_template\032W\n\020NetworkIn" - + "terface\022\017\n\007network\030\001 \001(\t\022\022\n\nsubnetwork\030\002" - + " \001(\t\022\036\n\026no_external_ip_address\030\003 \001(\010\032e\n\r" - + "NetworkPolicy\022T\n\022network_interfaces\030\001 \003(" - + "\01328.google.cloud.batch.v1.AllocationPoli" - + "cy.NetworkInterface\032-\n\013LabelsEntry\022\013\n\003ke" - + "y\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"`\n\021Provisioni" - + "ngModel\022\"\n\036PROVISIONING_MODEL_UNSPECIFIE" - + "D\020\000\022\014\n\010STANDARD\020\001\022\010\n\004SPOT\020\002\022\017\n\013PREEMPTIB" - + "LE\020\003\"\201\003\n\tTaskGroup\022\021\n\004name\030\001 \001(\tB\003\340A\003\0227\n" - + "\ttask_spec\030\003 \001(\0132\037.google.cloud.batch.v1" - + ".TaskSpecB\003\340A\002\022\022\n\ntask_count\030\004 \001(\003\022\023\n\013pa" - + "rallelism\030\005 \001(\003\022=\n\021task_environments\030\t \003" - + "(\0132\".google.cloud.batch.v1.Environment\022\033" - + "\n\023task_count_per_node\030\n \001(\003\022\032\n\022require_h" - + "osts_file\030\013 \001(\010\022\026\n\016permissive_ssh\030\014 \001(\010:" - + "o\352Al\n\036batch.googleapis.com/TaskGroup\022Jpr" - + "ojects/{project}/locations/{location}/jo" - + "bs/{job}/taskGroups/{task_group}\"\037\n\016Serv" - + "iceAccount\022\r\n\005email\030\001 \001(\tB\251\001\n\031com.google" - + ".cloud.batch.v1B\010JobProtoP\001Z/cloud.googl" - + "e.com/go/batch/apiv1/batchpb;batchpb\242\002\003G" - + "CB\252\002\025Google.Cloud.Batch.V1\312\002\025Google\\Clou" - + "d\\Batch\\V1\352\002\030Google::Cloud::Batch::V1b\006p" - + "roto3" + + " \001(\003\022?\n\tboot_disk\030\004 \001(\0132,.google.cloud.b" + + "atch.v1.AllocationPolicy.Disk\032\322\001\n\017TaskGr" + + "oupStatus\022L\n\006counts\030\001 \003(\0132<.google.cloud" + + ".batch.v1.JobStatus.TaskGroupStatus.Coun" + + "tsEntry\022B\n\tinstances\030\002 \003(\0132/.google.clou" + + "d.batch.v1.JobStatus.InstanceStatus\032-\n\013C" + + "ountsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\003:\002" + + "8\001\032c\n\017TaskGroupsEntry\022\013\n\003key\030\001 \001(\t\022?\n\005va" + + "lue\030\002 \001(\01320.google.cloud.batch.v1.JobSta" + + "tus.TaskGroupStatus:\0028\001\"{\n\005State\022\025\n\021STAT" + + "E_UNSPECIFIED\020\000\022\n\n\006QUEUED\020\001\022\r\n\tSCHEDULED" + + "\020\002\022\013\n\007RUNNING\020\003\022\r\n\tSUCCEEDED\020\004\022\n\n\006FAILED" + + "\020\005\022\030\n\024DELETION_IN_PROGRESS\020\006\"\374\002\n\017JobNoti" + + "fication\022\024\n\014pubsub_topic\030\001 \001(\t\022?\n\007messag" + + "e\030\002 \001(\0132..google.cloud.batch.v1.JobNotif" + + "ication.Message\032\304\001\n\007Message\0229\n\004type\030\001 \001(" + + "\0162+.google.cloud.batch.v1.JobNotificatio" + + "n.Type\022=\n\rnew_job_state\030\002 \001(\0162&.google.c" + + "loud.batch.v1.JobStatus.State\022?\n\016new_tas" + + "k_state\030\003 \001(\0162\'.google.cloud.batch.v1.Ta" + + "skStatus.State\"K\n\004Type\022\024\n\020TYPE_UNSPECIFI" + + "ED\020\000\022\025\n\021JOB_STATE_CHANGED\020\001\022\026\n\022TASK_STAT" + + "E_CHANGED\020\002\"\350\014\n\020AllocationPolicy\022H\n\010loca" + + "tion\030\001 \001(\01326.google.cloud.batch.v1.Alloc" + + "ationPolicy.LocationPolicy\022S\n\tinstances\030" + + "\010 \003(\0132@.google.cloud.batch.v1.Allocation" + + "Policy.InstancePolicyOrTemplate\022>\n\017servi" + + "ce_account\030\t \001(\0132%.google.cloud.batch.v1" + + ".ServiceAccount\022C\n\006labels\030\006 \003(\01323.google" + + ".cloud.batch.v1.AllocationPolicy.LabelsE" + + "ntry\022F\n\007network\030\007 \001(\01325.google.cloud.bat" + + "ch.v1.AllocationPolicy.NetworkPolicy\032+\n\016" + + "LocationPolicy\022\031\n\021allowed_locations\030\001 \003(" + + "\t\032q\n\004Disk\022\017\n\005image\030\004 \001(\tH\000\022\022\n\010snapshot\030\005" + + " \001(\tH\000\022\014\n\004type\030\001 \001(\t\022\017\n\007size_gb\030\002 \001(\003\022\026\n" + + "\016disk_interface\030\006 \001(\tB\r\n\013data_source\032\212\001\n" + + "\014AttachedDisk\022@\n\010new_disk\030\001 \001(\0132,.google" + + ".cloud.batch.v1.AllocationPolicy.DiskH\000\022" + + "\027\n\rexisting_disk\030\002 \001(\tH\000\022\023\n\013device_name\030" + + "\003 \001(\tB\n\n\010attached\032K\n\013Accelerator\022\014\n\004type" + + "\030\001 \001(\t\022\r\n\005count\030\002 \001(\003\022\037\n\023install_gpu_dri" + + "vers\030\003 \001(\010B\002\030\001\032\350\002\n\016InstancePolicy\022\024\n\014mac" + + "hine_type\030\002 \001(\t\022\030\n\020min_cpu_platform\030\003 \001(" + + "\t\022U\n\022provisioning_model\030\004 \001(\01629.google.c" + + "loud.batch.v1.AllocationPolicy.Provision" + + "ingModel\022I\n\014accelerators\030\005 \003(\01323.google." + + "cloud.batch.v1.AllocationPolicy.Accelera" + + "tor\022?\n\tboot_disk\030\010 \001(\0132,.google.cloud.ba" + + "tch.v1.AllocationPolicy.Disk\022C\n\005disks\030\006 " + + "\003(\01324.google.cloud.batch.v1.AllocationPo" + + "licy.AttachedDisk\032\261\001\n\030InstancePolicyOrTe" + + "mplate\022H\n\006policy\030\001 \001(\01326.google.cloud.ba" + + "tch.v1.AllocationPolicy.InstancePolicyH\000" + + "\022\033\n\021instance_template\030\002 \001(\tH\000\022\033\n\023install" + + "_gpu_drivers\030\003 \001(\010B\021\n\017policy_template\032W\n" + + "\020NetworkInterface\022\017\n\007network\030\001 \001(\t\022\022\n\nsu" + + "bnetwork\030\002 \001(\t\022\036\n\026no_external_ip_address" + + "\030\003 \001(\010\032e\n\rNetworkPolicy\022T\n\022network_inter" + + "faces\030\001 \003(\01328.google.cloud.batch.v1.Allo" + + "cationPolicy.NetworkInterface\032-\n\013LabelsE" + + "ntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"`\n\021" + + "ProvisioningModel\022\"\n\036PROVISIONING_MODEL_" + + "UNSPECIFIED\020\000\022\014\n\010STANDARD\020\001\022\010\n\004SPOT\020\002\022\017\n" + + "\013PREEMPTIBLE\020\003\"\201\003\n\tTaskGroup\022\021\n\004name\030\001 \001" + + "(\tB\003\340A\003\0227\n\ttask_spec\030\003 \001(\0132\037.google.clou" + + "d.batch.v1.TaskSpecB\003\340A\002\022\022\n\ntask_count\030\004" + + " \001(\003\022\023\n\013parallelism\030\005 \001(\003\022=\n\021task_enviro" + + "nments\030\t \003(\0132\".google.cloud.batch.v1.Env" + + "ironment\022\033\n\023task_count_per_node\030\n \001(\003\022\032\n" + + "\022require_hosts_file\030\013 \001(\010\022\026\n\016permissive_" + + "ssh\030\014 \001(\010:o\352Al\n\036batch.googleapis.com/Tas" + + "kGroup\022Jprojects/{project}/locations/{lo" + + "cation}/jobs/{job}/taskGroups/{task_grou" + + "p}\"/\n\016ServiceAccount\022\r\n\005email\030\001 \001(\t\022\016\n\006s" + + "copes\030\002 \003(\tB\251\001\n\031com.google.cloud.batch.v" + + "1B\010JobProtoP\001Z/cloud.google.com/go/batch" + + "/apiv1/batchpb;batchpb\242\002\003GCB\252\002\025Google.Cl" + + "oud.Batch.V1\312\002\025Google\\Cloud\\Batch\\V1\352\002\030G" + + "oogle::Cloud::Batch::V1b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( @@ -294,7 +297,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_cloud_batch_v1_JobStatus_InstanceStatus_descriptor, new java.lang.String[] { - "MachineType", "ProvisioningModel", "TaskPack", + "MachineType", "ProvisioningModel", "TaskPack", "BootDisk", }); internal_static_google_cloud_batch_v1_JobStatus_TaskGroupStatus_descriptor = internal_static_google_cloud_batch_v1_JobStatus_descriptor.getNestedTypes().get(1); @@ -384,7 +387,12 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_cloud_batch_v1_AllocationPolicy_InstancePolicy_descriptor, new java.lang.String[] { - "MachineType", "MinCpuPlatform", "ProvisioningModel", "Accelerators", "Disks", + "MachineType", + "MinCpuPlatform", + "ProvisioningModel", + "Accelerators", + "BootDisk", + "Disks", }); internal_static_google_cloud_batch_v1_AllocationPolicy_InstancePolicyOrTemplate_descriptor = internal_static_google_cloud_batch_v1_AllocationPolicy_descriptor.getNestedTypes().get(5); @@ -439,7 +447,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_cloud_batch_v1_ServiceAccount_descriptor, new java.lang.String[] { - "Email", + "Email", "Scopes", }); com.google.protobuf.ExtensionRegistry registry = com.google.protobuf.ExtensionRegistry.newInstance(); diff --git a/java-batch/proto-google-cloud-batch-v1/src/main/java/com/google/cloud/batch/v1/JobStatus.java b/java-batch/proto-google-cloud-batch-v1/src/main/java/com/google/cloud/batch/v1/JobStatus.java index 5ef0a670a891..b198979ff43d 100644 --- a/java-batch/proto-google-cloud-batch-v1/src/main/java/com/google/cloud/batch/v1/JobStatus.java +++ b/java-batch/proto-google-cloud-batch-v1/src/main/java/com/google/cloud/batch/v1/JobStatus.java @@ -385,6 +385,41 @@ public interface InstanceStatusOrBuilder * @return The taskPack. */ long getTaskPack(); + + /** + * + * + * 
+     * The VM boot disk.
+     *
+ * + * .google.cloud.batch.v1.AllocationPolicy.Disk boot_disk = 4; + * + * @return Whether the bootDisk field is set. + */ + boolean hasBootDisk(); + /** + * + * + * 
+     * The VM boot disk.
+     *
+ * + * .google.cloud.batch.v1.AllocationPolicy.Disk boot_disk = 4; + * + * @return The bootDisk. + */ + com.google.cloud.batch.v1.AllocationPolicy.Disk getBootDisk(); + /** + * + * + * 
+     * The VM boot disk.
+     *
+ * + * .google.cloud.batch.v1.AllocationPolicy.Disk boot_disk = 4; + */ + com.google.cloud.batch.v1.AllocationPolicy.DiskOrBuilder getBootDiskOrBuilder(); } /** * @@ -545,6 +580,56 @@ public long getTaskPack() { return taskPack_; } + public static final int BOOT_DISK_FIELD_NUMBER = 4; + private com.google.cloud.batch.v1.AllocationPolicy.Disk bootDisk_; + /** + * + * + * 
+     * The VM boot disk.
+     *
+ * + * .google.cloud.batch.v1.AllocationPolicy.Disk boot_disk = 4; + * + * @return Whether the bootDisk field is set. + */ + @java.lang.Override + public boolean hasBootDisk() { + return bootDisk_ != null; + } + /** + * + * + * 
+     * The VM boot disk.
+     *
+ * + * .google.cloud.batch.v1.AllocationPolicy.Disk boot_disk = 4; + * + * @return The bootDisk. + */ + @java.lang.Override + public com.google.cloud.batch.v1.AllocationPolicy.Disk getBootDisk() { + return bootDisk_ == null + ? com.google.cloud.batch.v1.AllocationPolicy.Disk.getDefaultInstance() + : bootDisk_; + } + /** + * + * + * 
+     * The VM boot disk.
+     *
+ * + * .google.cloud.batch.v1.AllocationPolicy.Disk boot_disk = 4; + */ + @java.lang.Override + public com.google.cloud.batch.v1.AllocationPolicy.DiskOrBuilder getBootDiskOrBuilder() { + return bootDisk_ == null + ? com.google.cloud.batch.v1.AllocationPolicy.Disk.getDefaultInstance() + : bootDisk_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override @@ -571,6 +656,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (taskPack_ != 0L) { output.writeInt64(3, taskPack_); } + if (bootDisk_ != null) { + output.writeMessage(4, getBootDisk()); + } getUnknownFields().writeTo(output); } @@ -592,6 +680,9 @@ public int getSerializedSize() { if (taskPack_ != 0L) { size += com.google.protobuf.CodedOutputStream.computeInt64Size(3, taskPack_); } + if (bootDisk_ != null) { + size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getBootDisk()); + } size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; @@ -611,6 +702,10 @@ public boolean equals(final java.lang.Object obj) { if (!getMachineType().equals(other.getMachineType())) return false; if (provisioningModel_ != other.provisioningModel_) return false; if (getTaskPack() != other.getTaskPack()) return false; + if (hasBootDisk() != other.hasBootDisk()) return false; + if (hasBootDisk()) { + if (!getBootDisk().equals(other.getBootDisk())) return false; + } if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -628,6 +723,10 @@ public int hashCode() { hash = (53 * hash) + provisioningModel_; hash = (37 * hash) + TASK_PACK_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getTaskPack()); + if (hasBootDisk()) { + hash = (37 * hash) + BOOT_DISK_FIELD_NUMBER; + hash = (53 * hash) + getBootDisk().hashCode(); + } hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; @@ -772,6 +871,11 @@ public Builder clear() { machineType_ = ""; provisioningModel_ = 0; taskPack_ = 0L; + bootDisk_ = null; + if (bootDiskBuilder_ != null) { + bootDiskBuilder_.dispose(); + bootDiskBuilder_ = null; + } return this; } @@ -817,6 +921,9 @@ private void buildPartial0(com.google.cloud.batch.v1.JobStatus.InstanceStatus re if (((from_bitField0_ & 0x00000004) != 0)) { result.taskPack_ = taskPack_; } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.bootDisk_ = bootDiskBuilder_ == null ? bootDisk_ : bootDiskBuilder_.build(); + } } @java.lang.Override @@ -878,6 +985,9 @@ public Builder mergeFrom(com.google.cloud.batch.v1.JobStatus.InstanceStatus othe if (other.getTaskPack() != 0L) { setTaskPack(other.getTaskPack()); } + if (other.hasBootDisk()) { + mergeBootDisk(other.getBootDisk()); + } this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; @@ -922,6 +1032,12 @@ public Builder mergeFrom( bitField0_ |= 0x00000004; break; } // case 24 + case 34: + { + input.readMessage(getBootDiskFieldBuilder().getBuilder(), extensionRegistry); + bitField0_ |= 0x00000008; + break; + } // case 34 default: { if (!super.parseUnknownField(input, extensionRegistry, tag)) { @@ -1199,6 +1315,191 @@ public Builder clearTaskPack() { return this; } + private com.google.cloud.batch.v1.AllocationPolicy.Disk bootDisk_; + private com.google.protobuf.SingleFieldBuilderV3< + com.google.cloud.batch.v1.AllocationPolicy.Disk, + com.google.cloud.batch.v1.AllocationPolicy.Disk.Builder, + com.google.cloud.batch.v1.AllocationPolicy.DiskOrBuilder> + bootDiskBuilder_; + /** + * + * + * 
+       * The VM boot disk.
+       *
+ * + * .google.cloud.batch.v1.AllocationPolicy.Disk boot_disk = 4; + * + * @return Whether the bootDisk field is set. + */ + public boolean hasBootDisk() { + return ((bitField0_ & 0x00000008) != 0); + } + /** + * + * + * 
+       * The VM boot disk.
+       *
+ * + * .google.cloud.batch.v1.AllocationPolicy.Disk boot_disk = 4; + * + * @return The bootDisk. + */ + public com.google.cloud.batch.v1.AllocationPolicy.Disk getBootDisk() { + if (bootDiskBuilder_ == null) { + return bootDisk_ == null + ? com.google.cloud.batch.v1.AllocationPolicy.Disk.getDefaultInstance() + : bootDisk_; + } else { + return bootDiskBuilder_.getMessage(); + } + } + /** + * + * + * 
+       * The VM boot disk.
+       *
+ * + * .google.cloud.batch.v1.AllocationPolicy.Disk boot_disk = 4; + */ + public Builder setBootDisk(com.google.cloud.batch.v1.AllocationPolicy.Disk value) { + if (bootDiskBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + bootDisk_ = value; + } else { + bootDiskBuilder_.setMessage(value); + } + bitField0_ |= 0x00000008; + onChanged(); + return this; + } + /** + * + * + * 
+       * The VM boot disk.
+       *
+ * + * .google.cloud.batch.v1.AllocationPolicy.Disk boot_disk = 4; + */ + public Builder setBootDisk( + com.google.cloud.batch.v1.AllocationPolicy.Disk.Builder builderForValue) { + if (bootDiskBuilder_ == null) { + bootDisk_ = builderForValue.build(); + } else { + bootDiskBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000008; + onChanged(); + return this; + } + /** + * + * + * 
+       * The VM boot disk.
+       *
+ * + * .google.cloud.batch.v1.AllocationPolicy.Disk boot_disk = 4; + */ + public Builder mergeBootDisk(com.google.cloud.batch.v1.AllocationPolicy.Disk value) { + if (bootDiskBuilder_ == null) { + if (((bitField0_ & 0x00000008) != 0) + && bootDisk_ != null + && bootDisk_ + != com.google.cloud.batch.v1.AllocationPolicy.Disk.getDefaultInstance()) { + getBootDiskBuilder().mergeFrom(value); + } else { + bootDisk_ = value; + } + } else { + bootDiskBuilder_.mergeFrom(value); + } + bitField0_ |= 0x00000008; + onChanged(); + return this; + } + /** + * + * + * 
+       * The VM boot disk.
+       *
+ * + * .google.cloud.batch.v1.AllocationPolicy.Disk boot_disk = 4; + */ + public Builder clearBootDisk() { + bitField0_ = (bitField0_ & ~0x00000008); + bootDisk_ = null; + if (bootDiskBuilder_ != null) { + bootDiskBuilder_.dispose(); + bootDiskBuilder_ = null; + } + onChanged(); + return this; + } + /** + * + * + * 
+       * The VM boot disk.
+       *
+ * + * .google.cloud.batch.v1.AllocationPolicy.Disk boot_disk = 4; + */ + public com.google.cloud.batch.v1.AllocationPolicy.Disk.Builder getBootDiskBuilder() { + bitField0_ |= 0x00000008; + onChanged(); + return getBootDiskFieldBuilder().getBuilder(); + } + /** + * + * + * 
+       * The VM boot disk.
+       *
+ * + * .google.cloud.batch.v1.AllocationPolicy.Disk boot_disk = 4; + */ + public com.google.cloud.batch.v1.AllocationPolicy.DiskOrBuilder getBootDiskOrBuilder() { + if (bootDiskBuilder_ != null) { + return bootDiskBuilder_.getMessageOrBuilder(); + } else { + return bootDisk_ == null + ? com.google.cloud.batch.v1.AllocationPolicy.Disk.getDefaultInstance() + : bootDisk_; + } + } + /** + * + * + * 
+       * The VM boot disk.
+       *
+ * + * .google.cloud.batch.v1.AllocationPolicy.Disk boot_disk = 4; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.cloud.batch.v1.AllocationPolicy.Disk, + com.google.cloud.batch.v1.AllocationPolicy.Disk.Builder, + com.google.cloud.batch.v1.AllocationPolicy.DiskOrBuilder> + getBootDiskFieldBuilder() { + if (bootDiskBuilder_ == null) { + bootDiskBuilder_ = + new com.google.protobuf.SingleFieldBuilderV3< + com.google.cloud.batch.v1.AllocationPolicy.Disk, + com.google.cloud.batch.v1.AllocationPolicy.Disk.Builder, + com.google.cloud.batch.v1.AllocationPolicy.DiskOrBuilder>( + getBootDisk(), getParentForChildren(), isClean()); + bootDisk_ = null; + } + return bootDiskBuilder_; + } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { diff --git a/java-batch/proto-google-cloud-batch-v1/src/main/java/com/google/cloud/batch/v1/ServiceAccount.java b/java-batch/proto-google-cloud-batch-v1/src/main/java/com/google/cloud/batch/v1/ServiceAccount.java index 05a725a5e306..ea065b64720a 100644 --- a/java-batch/proto-google-cloud-batch-v1/src/main/java/com/google/cloud/batch/v1/ServiceAccount.java +++ b/java-batch/proto-google-cloud-batch-v1/src/main/java/com/google/cloud/batch/v1/ServiceAccount.java @@ -39,6 +39,7 @@ private ServiceAccount(com.google.protobuf.GeneratedMessageV3.Builder builder private ServiceAccount() { email_ = ""; + scopes_ = com.google.protobuf.LazyStringArrayList.EMPTY; } @java.lang.Override @@ -124,6 +125,73 @@ public com.google.protobuf.ByteString getEmailBytes() { } } + public static final int SCOPES_FIELD_NUMBER = 2; + + @SuppressWarnings("serial") + private com.google.protobuf.LazyStringList scopes_; + /** + * + * + * 
+   * List of scopes to be enabled for this service account on the VM, in
+   * addition to the cloud-platform API scope that will be added by default.
+   *
+ * + * repeated string scopes = 2; + * + * @return A list containing the scopes. + */ + public com.google.protobuf.ProtocolStringList getScopesList() { + return scopes_; + } + /** + * + * + * 
+   * List of scopes to be enabled for this service account on the VM, in
+   * addition to the cloud-platform API scope that will be added by default.
+   *
+ * + * repeated string scopes = 2; + * + * @return The count of scopes. + */ + public int getScopesCount() { + return scopes_.size(); + } + /** + * + * + * 
+   * List of scopes to be enabled for this service account on the VM, in
+   * addition to the cloud-platform API scope that will be added by default.
+   *
+ * + * repeated string scopes = 2; + * + * @param index The index of the element to return. + * @return The scopes at the given index. + */ + public java.lang.String getScopes(int index) { + return scopes_.get(index); + } + /** + * + * + * 
+   * List of scopes to be enabled for this service account on the VM, in
+   * addition to the cloud-platform API scope that will be added by default.
+   *
+ * + * repeated string scopes = 2; + * + * @param index The index of the value to return. + * @return The bytes of the scopes at the given index. + */ + public com.google.protobuf.ByteString getScopesBytes(int index) { + return scopes_.getByteString(index); + } + private byte memoizedIsInitialized = -1; @java.lang.Override @@ -141,6 +209,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(email_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, email_); } + for (int i = 0; i < scopes_.size(); i++) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 2, scopes_.getRaw(i)); + } getUnknownFields().writeTo(output); } @@ -153,6 +224,14 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(email_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, email_); } + { + int dataSize = 0; + for (int i = 0; i < scopes_.size(); i++) { + dataSize += computeStringSizeNoTag(scopes_.getRaw(i)); + } + size += dataSize; + size += 1 * getScopesList().size(); + } size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; @@ -169,6 +248,7 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.batch.v1.ServiceAccount other = (com.google.cloud.batch.v1.ServiceAccount) obj; if (!getEmail().equals(other.getEmail())) return false; + if (!getScopesList().equals(other.getScopesList())) return false; if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -182,6 +262,10 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + EMAIL_FIELD_NUMBER; hash = (53 * hash) + getEmail().hashCode(); + if (getScopesCount() > 0) { + hash = (37 * hash) + SCOPES_FIELD_NUMBER; + hash = (53 * hash) + getScopesList().hashCode(); + } hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; @@ -322,6 +406,8 @@ public Builder clear() { super.clear(); bitField0_ = 0; email_ = ""; + scopes_ = com.google.protobuf.LazyStringArrayList.EMPTY; + bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -349,6 +435,7 @@ public com.google.cloud.batch.v1.ServiceAccount build() { public com.google.cloud.batch.v1.ServiceAccount buildPartial() { com.google.cloud.batch.v1.ServiceAccount result = new com.google.cloud.batch.v1.ServiceAccount(this); + buildPartialRepeatedFields(result); if (bitField0_ != 0) { buildPartial0(result); } @@ -356,6 +443,14 @@ public com.google.cloud.batch.v1.ServiceAccount buildPartial() { return result; } + private void buildPartialRepeatedFields(com.google.cloud.batch.v1.ServiceAccount result) { + if (((bitField0_ & 0x00000002) != 0)) { + scopes_ = scopes_.getUnmodifiableView(); + bitField0_ = (bitField0_ & ~0x00000002); + } + result.scopes_ = scopes_; + } + private void buildPartial0(com.google.cloud.batch.v1.ServiceAccount result) { int from_bitField0_ = bitField0_; if (((from_bitField0_ & 0x00000001) != 0)) { @@ -413,6 +508,16 @@ public Builder mergeFrom(com.google.cloud.batch.v1.ServiceAccount other) { bitField0_ |= 0x00000001; onChanged(); } + if (!other.scopes_.isEmpty()) { + if (scopes_.isEmpty()) { + scopes_ = other.scopes_; + bitField0_ = (bitField0_ & ~0x00000002); + } else { + ensureScopesIsMutable(); + scopes_.addAll(other.scopes_); + } + onChanged(); + } this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; @@ -445,6 +550,13 @@ public Builder mergeFrom( bitField0_ |= 0x00000001; break; } // case 10 + case 18: + { + java.lang.String s = input.readStringRequireUtf8(); + ensureScopesIsMutable(); + scopes_.add(s); + break; + } // case 18 default: { if (!super.parseUnknownField(input, extensionRegistry, tag)) { @@ -585,6 +697,183 @@ public Builder setEmailBytes(com.google.protobuf.ByteString value) { return this; } + private com.google.protobuf.LazyStringList scopes_ = + com.google.protobuf.LazyStringArrayList.EMPTY; + + private void ensureScopesIsMutable() { + if (!((bitField0_ & 0x00000002) != 0)) { + scopes_ = new com.google.protobuf.LazyStringArrayList(scopes_); + bitField0_ |= 0x00000002; + } + } + /** + * + * + * 
+     * List of scopes to be enabled for this service account on the VM, in
+     * addition to the cloud-platform API scope that will be added by default.
+     *
+ * + * repeated string scopes = 2; + * + * @return A list containing the scopes. + */ + public com.google.protobuf.ProtocolStringList getScopesList() { + return scopes_.getUnmodifiableView(); + } + /** + * + * + * 
+     * List of scopes to be enabled for this service account on the VM, in
+     * addition to the cloud-platform API scope that will be added by default.
+     *
+ * + * repeated string scopes = 2; + * + * @return The count of scopes. + */ + public int getScopesCount() { + return scopes_.size(); + } + /** + * + * + * 
+     * List of scopes to be enabled for this service account on the VM, in
+     * addition to the cloud-platform API scope that will be added by default.
+     *
+ * + * repeated string scopes = 2; + * + * @param index The index of the element to return. + * @return The scopes at the given index. + */ + public java.lang.String getScopes(int index) { + return scopes_.get(index); + } + /** + * + * + * 
+     * List of scopes to be enabled for this service account on the VM, in
+     * addition to the cloud-platform API scope that will be added by default.
+     *
+ * + * repeated string scopes = 2; + * + * @param index The index of the value to return. + * @return The bytes of the scopes at the given index. + */ + public com.google.protobuf.ByteString getScopesBytes(int index) { + return scopes_.getByteString(index); + } + /** + * + * + * 
+     * List of scopes to be enabled for this service account on the VM, in
+     * addition to the cloud-platform API scope that will be added by default.
+     *
+ * + * repeated string scopes = 2; + * + * @param index The index to set the value at. + * @param value The scopes to set. + * @return This builder for chaining. + */ + public Builder setScopes(int index, java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + ensureScopesIsMutable(); + scopes_.set(index, value); + onChanged(); + return this; + } + /** + * + * + * 
+     * List of scopes to be enabled for this service account on the VM, in
+     * addition to the cloud-platform API scope that will be added by default.
+     *
+ * + * repeated string scopes = 2; + * + * @param value The scopes to add. + * @return This builder for chaining. + */ + public Builder addScopes(java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + ensureScopesIsMutable(); + scopes_.add(value); + onChanged(); + return this; + } + /** + * + * + * 
+     * List of scopes to be enabled for this service account on the VM, in
+     * addition to the cloud-platform API scope that will be added by default.
+     *
+ * + * repeated string scopes = 2; + * + * @param values The scopes to add. + * @return This builder for chaining. + */ + public Builder addAllScopes(java.lang.Iterable values) { + ensureScopesIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll(values, scopes_); + onChanged(); + return this; + } + /** + * + * + * 
+     * List of scopes to be enabled for this service account on the VM, in
+     * addition to the cloud-platform API scope that will be added by default.
+     *
+ * + * repeated string scopes = 2; + * + * @return This builder for chaining. + */ + public Builder clearScopes() { + scopes_ = com.google.protobuf.LazyStringArrayList.EMPTY; + bitField0_ = (bitField0_ & ~0x00000002); + onChanged(); + return this; + } + /** + * + * + * 
+     * List of scopes to be enabled for this service account on the VM, in
+     * addition to the cloud-platform API scope that will be added by default.
+     *
+ * + * repeated string scopes = 2; + * + * @param value The bytes of the scopes to add. + * @return This builder for chaining. + */ + public Builder addScopesBytes(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + ensureScopesIsMutable(); + scopes_.add(value); + onChanged(); + return this; + } + @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); diff --git a/java-batch/proto-google-cloud-batch-v1/src/main/java/com/google/cloud/batch/v1/ServiceAccountOrBuilder.java b/java-batch/proto-google-cloud-batch-v1/src/main/java/com/google/cloud/batch/v1/ServiceAccountOrBuilder.java index acf28b29decf..e2cfb02666cd 100644 --- a/java-batch/proto-google-cloud-batch-v1/src/main/java/com/google/cloud/batch/v1/ServiceAccountOrBuilder.java +++ b/java-batch/proto-google-cloud-batch-v1/src/main/java/com/google/cloud/batch/v1/ServiceAccountOrBuilder.java @@ -53,4 +53,59 @@ public interface ServiceAccountOrBuilder * @return The bytes for email. */ com.google.protobuf.ByteString getEmailBytes(); + + /** + * + * + * 
+   * List of scopes to be enabled for this service account on the VM, in
+   * addition to the cloud-platform API scope that will be added by default.
+   *
+ * + * repeated string scopes = 2; + * + * @return A list containing the scopes. + */ + java.util.List getScopesList(); + /** + * + * + * 
+   * List of scopes to be enabled for this service account on the VM, in
+   * addition to the cloud-platform API scope that will be added by default.
+   *
+ * + * repeated string scopes = 2; + * + * @return The count of scopes. + */ + int getScopesCount(); + /** + * + * + * 
+   * List of scopes to be enabled for this service account on the VM, in
+   * addition to the cloud-platform API scope that will be added by default.
+   *
+ * + * repeated string scopes = 2; + * + * @param index The index of the element to return. + * @return The scopes at the given index. + */ + java.lang.String getScopes(int index); + /** + * + * + * 
+   * List of scopes to be enabled for this service account on the VM, in
+   * addition to the cloud-platform API scope that will be added by default.
+   *
+ * + * repeated string scopes = 2; + * + * @param index The index of the value to return. + * @return The bytes of the scopes at the given index. + */ + com.google.protobuf.ByteString getScopesBytes(int index); } diff --git a/java-batch/proto-google-cloud-batch-v1/src/main/proto/google/cloud/batch/v1/batch.proto b/java-batch/proto-google-cloud-batch-v1/src/main/proto/google/cloud/batch/v1/batch.proto index 9eb8770b8339..c6bad651548c 100644 --- a/java-batch/proto-google-cloud-batch-v1/src/main/proto/google/cloud/batch/v1/batch.proto +++ b/java-batch/proto-google-cloud-batch-v1/src/main/proto/google/cloud/batch/v1/batch.proto @@ -16,8 +16,6 @@ syntax = "proto3"; package google.cloud.batch.v1; -import public "google/protobuf/empty.proto"; - import "google/api/annotations.proto"; import "google/api/client.proto"; import "google/api/field_behavior.proto"; diff --git a/java-batch/proto-google-cloud-batch-v1/src/main/proto/google/cloud/batch/v1/job.proto b/java-batch/proto-google-cloud-batch-v1/src/main/proto/google/cloud/batch/v1/job.proto index c531b4979c55..d43f229dd6f1 100644 --- a/java-batch/proto-google-cloud-batch-v1/src/main/proto/google/cloud/batch/v1/job.proto +++ b/java-batch/proto-google-cloud-batch-v1/src/main/proto/google/cloud/batch/v1/job.proto @@ -123,6 +123,9 @@ message JobStatus { // The max number of tasks can be assigned to this instance type. int64 task_pack = 3; + + // The VM boot disk. + AllocationPolicy.Disk boot_disk = 4; } // Aggregated task status for a TaskGroup. @@ -243,20 +246,37 @@ message AllocationPolicy { // A data source from which a PD will be created. oneof data_source { // Name of a public or custom image used as the data source. + // For example, the following are all valid URLs: + // (1) Specify the image by its family name: + // projects/{project}/global/images/family/{image_family} + // (2) Specify the image version: + // projects/{project}/global/images/{image_version} + // You can also use Batch customized image in short names. + // The following image values are supported for a boot disk: + // "batch-debian": use Batch Debian images. + // "batch-centos": use Batch CentOS images. + // "batch-cos": use Batch Container-Optimized images. string image = 4; // Name of a snapshot used as the data source. string snapshot = 5; } - // Disk type as shown in `gcloud compute disk-types list` - // For example, "pd-ssd", "pd-standard", "pd-balanced", "local-ssd". + // Disk type as shown in `gcloud compute disk-types list`. + // For example, local SSD uses type "local-ssd". + // Persistent disks and boot disks use "pd-balanced", "pd-extreme", "pd-ssd" + // or "pd-standard". string type = 1; // Disk size in GB. - // This field is ignored if `data_source` is `disk` or `image`. - // If `type` is `local-ssd`, size_gb should be a multiple of 375GB, + // For persistent disk, this field is ignored if `data_source` is `image` or + // `snapshot`. + // For local SSD, size_gb should be a multiple of 375GB, // otherwise, the final size will be the next greater multiple of 375 GB. + // For boot disk, Batch will calculate the boot disk size based on source + // image and task requirements if you do not speicify the size. + // If both this field and the boot_disk_mib field in task spec's + // compute_resource are defined, Batch will only honor this field. int64 size_gb = 2; // Local SSDs are available through both "SCSI" and "NVMe" interfaces. @@ -313,6 +333,10 @@ message AllocationPolicy { // The accelerators attached to each VM instance. repeated Accelerator accelerators = 5; + // Book disk to be created and attached to each VM by this InstancePolicy. + // Boot disk will be deleted when the VM is deleted. + Disk boot_disk = 8; + // Non-boot disks to be attached for each VM created by this InstancePolicy. // New disks will be deleted when the VM is deleted. repeated AttachedDisk disks = 6; @@ -474,4 +498,8 @@ message ServiceAccount { // template is being used, the service account has to be specified in the // instance template and it has to match the email field here. string email = 1; + + // List of scopes to be enabled for this service account on the VM, in + // addition to the cloud-platform API scope that will be added by default. + repeated string scopes = 2; } diff --git a/java-batch/proto-google-cloud-batch-v1alpha/src/main/java/com/google/cloud/batch/v1alpha/AllocationPolicy.java b/java-batch/proto-google-cloud-batch-v1alpha/src/main/java/com/google/cloud/batch/v1alpha/AllocationPolicy.java index 20e7024ea78c..6f0ffbd57215 100644 --- a/java-batch/proto-google-cloud-batch-v1alpha/src/main/java/com/google/cloud/batch/v1alpha/AllocationPolicy.java +++ b/java-batch/proto-google-cloud-batch-v1alpha/src/main/java/com/google/cloud/batch/v1alpha/AllocationPolicy.java @@ -1568,6 +1568,16 @@ public interface DiskOrBuilder * * 
      * Name of a public or custom image used as the data source.
+     * For example, the following are all valid URLs:
+     * (1) Specify the image by its family name:
+     * projects/{project}/global/images/family/{image_family}
+     * (2) Specify the image version:
+     * projects/{project}/global/images/{image_version}
+     * You can also use Batch customized image in short names.
+     * The following image values are supported for a boot disk:
+     * "batch-debian": use Batch Debian images.
+     * "batch-centos": use Batch CentOS images.
+     * "batch-cos": use Batch Container-Optimized images.
      *
* * string image = 4; @@ -1580,6 +1590,16 @@ public interface DiskOrBuilder * * 
      * Name of a public or custom image used as the data source.
+     * For example, the following are all valid URLs:
+     * (1) Specify the image by its family name:
+     * projects/{project}/global/images/family/{image_family}
+     * (2) Specify the image version:
+     * projects/{project}/global/images/{image_version}
+     * You can also use Batch customized image in short names.
+     * The following image values are supported for a boot disk:
+     * "batch-debian": use Batch Debian images.
+     * "batch-centos": use Batch CentOS images.
+     * "batch-cos": use Batch Container-Optimized images.
      *
* * string image = 4; @@ -1592,6 +1612,16 @@ public interface DiskOrBuilder * * 
      * Name of a public or custom image used as the data source.
+     * For example, the following are all valid URLs:
+     * (1) Specify the image by its family name:
+     * projects/{project}/global/images/family/{image_family}
+     * (2) Specify the image version:
+     * projects/{project}/global/images/{image_version}
+     * You can also use Batch customized image in short names.
+     * The following image values are supported for a boot disk:
+     * "batch-debian": use Batch Debian images.
+     * "batch-centos": use Batch CentOS images.
+     * "batch-cos": use Batch Container-Optimized images.
      *
* * string image = 4; @@ -1641,8 +1671,10 @@ public interface DiskOrBuilder * * * 
-     * Disk type as shown in `gcloud compute disk-types list`
-     * For example, "pd-ssd", "pd-standard", "pd-balanced", "local-ssd".
+     * Disk type as shown in `gcloud compute disk-types list`.
+     * For example, local SSD uses type "local-ssd".
+     * Persistent disks and boot disks use "pd-balanced", "pd-extreme", "pd-ssd"
+     * or "pd-standard".
      *
* * string type = 1; @@ -1654,8 +1686,10 @@ public interface DiskOrBuilder * * * 
-     * Disk type as shown in `gcloud compute disk-types list`
-     * For example, "pd-ssd", "pd-standard", "pd-balanced", "local-ssd".
+     * Disk type as shown in `gcloud compute disk-types list`.
+     * For example, local SSD uses type "local-ssd".
+     * Persistent disks and boot disks use "pd-balanced", "pd-extreme", "pd-ssd"
+     * or "pd-standard".
      *
* * string type = 1; @@ -1669,9 +1703,14 @@ public interface DiskOrBuilder * * 
      * Disk size in GB.
-     * This field is ignored if `data_source` is `disk` or `image`.
-     * If `type` is `local-ssd`, size_gb should be a multiple of 375GB,
+     * For persistent disk, this field is ignored if `data_source` is `image` or
+     * `snapshot`.
+     * For local SSD, size_gb should be a multiple of 375GB,
      * otherwise, the final size will be the next greater multiple of 375 GB.
+     * For boot disk, Batch will calculate the boot disk size based on source
+     * image and task requirements if you do not speicify the size.
+     * If both this field and the boot_disk_mib field in task spec's
+     * compute_resource are defined, Batch will only honor this field.
      *
* * int64 size_gb = 2; @@ -1817,6 +1856,16 @@ public DataSourceCase getDataSourceCase() { * * 
      * Name of a public or custom image used as the data source.
+     * For example, the following are all valid URLs:
+     * (1) Specify the image by its family name:
+     * projects/{project}/global/images/family/{image_family}
+     * (2) Specify the image version:
+     * projects/{project}/global/images/{image_version}
+     * You can also use Batch customized image in short names.
+     * The following image values are supported for a boot disk:
+     * "batch-debian": use Batch Debian images.
+     * "batch-centos": use Batch CentOS images.
+     * "batch-cos": use Batch Container-Optimized images.
      *
* * string image = 4; @@ -1831,6 +1880,16 @@ public boolean hasImage() { * * 
      * Name of a public or custom image used as the data source.
+     * For example, the following are all valid URLs:
+     * (1) Specify the image by its family name:
+     * projects/{project}/global/images/family/{image_family}
+     * (2) Specify the image version:
+     * projects/{project}/global/images/{image_version}
+     * You can also use Batch customized image in short names.
+     * The following image values are supported for a boot disk:
+     * "batch-debian": use Batch Debian images.
+     * "batch-centos": use Batch CentOS images.
+     * "batch-cos": use Batch Container-Optimized images.
      *
* * string image = 4; @@ -1858,6 +1917,16 @@ public java.lang.String getImage() { * * 
      * Name of a public or custom image used as the data source.
+     * For example, the following are all valid URLs:
+     * (1) Specify the image by its family name:
+     * projects/{project}/global/images/family/{image_family}
+     * (2) Specify the image version:
+     * projects/{project}/global/images/{image_version}
+     * You can also use Batch customized image in short names.
+     * The following image values are supported for a boot disk:
+     * "batch-debian": use Batch Debian images.
+     * "batch-centos": use Batch CentOS images.
+     * "batch-cos": use Batch Container-Optimized images.
      *
* * string image = 4; @@ -1959,8 +2028,10 @@ public com.google.protobuf.ByteString getSnapshotBytes() { * * * 
-     * Disk type as shown in `gcloud compute disk-types list`
-     * For example, "pd-ssd", "pd-standard", "pd-balanced", "local-ssd".
+     * Disk type as shown in `gcloud compute disk-types list`.
+     * For example, local SSD uses type "local-ssd".
+     * Persistent disks and boot disks use "pd-balanced", "pd-extreme", "pd-ssd"
+     * or "pd-standard".
      *
* * string type = 1; @@ -1983,8 +2054,10 @@ public java.lang.String getType() { * * * 
-     * Disk type as shown in `gcloud compute disk-types list`
-     * For example, "pd-ssd", "pd-standard", "pd-balanced", "local-ssd".
+     * Disk type as shown in `gcloud compute disk-types list`.
+     * For example, local SSD uses type "local-ssd".
+     * Persistent disks and boot disks use "pd-balanced", "pd-extreme", "pd-ssd"
+     * or "pd-standard".
      *
* * string type = 1; @@ -2011,9 +2084,14 @@ public com.google.protobuf.ByteString getTypeBytes() { * * 
      * Disk size in GB.
-     * This field is ignored if `data_source` is `disk` or `image`.
-     * If `type` is `local-ssd`, size_gb should be a multiple of 375GB,
+     * For persistent disk, this field is ignored if `data_source` is `image` or
+     * `snapshot`.
+     * For local SSD, size_gb should be a multiple of 375GB,
      * otherwise, the final size will be the next greater multiple of 375 GB.
+     * For boot disk, Batch will calculate the boot disk size based on source
+     * image and task requirements if you do not speicify the size.
+     * If both this field and the boot_disk_mib field in task spec's
+     * compute_resource are defined, Batch will only honor this field.
      *
* * int64 size_gb = 2; @@ -2572,6 +2650,16 @@ public Builder clearDataSource() { * * 
        * Name of a public or custom image used as the data source.
+       * For example, the following are all valid URLs:
+       * (1) Specify the image by its family name:
+       * projects/{project}/global/images/family/{image_family}
+       * (2) Specify the image version:
+       * projects/{project}/global/images/{image_version}
+       * You can also use Batch customized image in short names.
+       * The following image values are supported for a boot disk:
+       * "batch-debian": use Batch Debian images.
+       * "batch-centos": use Batch CentOS images.
+       * "batch-cos": use Batch Container-Optimized images.
        *
* * string image = 4; @@ -2587,6 +2675,16 @@ public boolean hasImage() { * * 
        * Name of a public or custom image used as the data source.
+       * For example, the following are all valid URLs:
+       * (1) Specify the image by its family name:
+       * projects/{project}/global/images/family/{image_family}
+       * (2) Specify the image version:
+       * projects/{project}/global/images/{image_version}
+       * You can also use Batch customized image in short names.
+       * The following image values are supported for a boot disk:
+       * "batch-debian": use Batch Debian images.
+       * "batch-centos": use Batch CentOS images.
+       * "batch-cos": use Batch Container-Optimized images.
        *
* * string image = 4; @@ -2615,6 +2713,16 @@ public java.lang.String getImage() { * * 
        * Name of a public or custom image used as the data source.
+       * For example, the following are all valid URLs:
+       * (1) Specify the image by its family name:
+       * projects/{project}/global/images/family/{image_family}
+       * (2) Specify the image version:
+       * projects/{project}/global/images/{image_version}
+       * You can also use Batch customized image in short names.
+       * The following image values are supported for a boot disk:
+       * "batch-debian": use Batch Debian images.
+       * "batch-centos": use Batch CentOS images.
+       * "batch-cos": use Batch Container-Optimized images.
        *
* * string image = 4; @@ -2643,6 +2751,16 @@ public com.google.protobuf.ByteString getImageBytes() { * * 
        * Name of a public or custom image used as the data source.
+       * For example, the following are all valid URLs:
+       * (1) Specify the image by its family name:
+       * projects/{project}/global/images/family/{image_family}
+       * (2) Specify the image version:
+       * projects/{project}/global/images/{image_version}
+       * You can also use Batch customized image in short names.
+       * The following image values are supported for a boot disk:
+       * "batch-debian": use Batch Debian images.
+       * "batch-centos": use Batch CentOS images.
+       * "batch-cos": use Batch Container-Optimized images.
        *
* * string image = 4; @@ -2664,6 +2782,16 @@ public Builder setImage(java.lang.String value) { * * 
        * Name of a public or custom image used as the data source.
+       * For example, the following are all valid URLs:
+       * (1) Specify the image by its family name:
+       * projects/{project}/global/images/family/{image_family}
+       * (2) Specify the image version:
+       * projects/{project}/global/images/{image_version}
+       * You can also use Batch customized image in short names.
+       * The following image values are supported for a boot disk:
+       * "batch-debian": use Batch Debian images.
+       * "batch-centos": use Batch CentOS images.
+       * "batch-cos": use Batch Container-Optimized images.
        *
* * string image = 4; @@ -2683,6 +2811,16 @@ public Builder clearImage() { * * 
        * Name of a public or custom image used as the data source.
+       * For example, the following are all valid URLs:
+       * (1) Specify the image by its family name:
+       * projects/{project}/global/images/family/{image_family}
+       * (2) Specify the image version:
+       * projects/{project}/global/images/{image_version}
+       * You can also use Batch customized image in short names.
+       * The following image values are supported for a boot disk:
+       * "batch-debian": use Batch Debian images.
+       * "batch-centos": use Batch CentOS images.
+       * "batch-cos": use Batch Container-Optimized images.
        *
* * string image = 4; @@ -2840,8 +2978,10 @@ public Builder setSnapshotBytes(com.google.protobuf.ByteString value) { * * * 
-       * Disk type as shown in `gcloud compute disk-types list`
-       * For example, "pd-ssd", "pd-standard", "pd-balanced", "local-ssd".
+       * Disk type as shown in `gcloud compute disk-types list`.
+       * For example, local SSD uses type "local-ssd".
+       * Persistent disks and boot disks use "pd-balanced", "pd-extreme", "pd-ssd"
+       * or "pd-standard".
        *
* * string type = 1; @@ -2863,8 +3003,10 @@ public java.lang.String getType() { * * * 
-       * Disk type as shown in `gcloud compute disk-types list`
-       * For example, "pd-ssd", "pd-standard", "pd-balanced", "local-ssd".
+       * Disk type as shown in `gcloud compute disk-types list`.
+       * For example, local SSD uses type "local-ssd".
+       * Persistent disks and boot disks use "pd-balanced", "pd-extreme", "pd-ssd"
+       * or "pd-standard".
        *
* * string type = 1; @@ -2886,8 +3028,10 @@ public com.google.protobuf.ByteString getTypeBytes() { * * * 
-       * Disk type as shown in `gcloud compute disk-types list`
-       * For example, "pd-ssd", "pd-standard", "pd-balanced", "local-ssd".
+       * Disk type as shown in `gcloud compute disk-types list`.
+       * For example, local SSD uses type "local-ssd".
+       * Persistent disks and boot disks use "pd-balanced", "pd-extreme", "pd-ssd"
+       * or "pd-standard".
        *
* * string type = 1; @@ -2908,8 +3052,10 @@ public Builder setType(java.lang.String value) { * * * 
-       * Disk type as shown in `gcloud compute disk-types list`
-       * For example, "pd-ssd", "pd-standard", "pd-balanced", "local-ssd".
+       * Disk type as shown in `gcloud compute disk-types list`.
+       * For example, local SSD uses type "local-ssd".
+       * Persistent disks and boot disks use "pd-balanced", "pd-extreme", "pd-ssd"
+       * or "pd-standard".
        *
* * string type = 1; @@ -2926,8 +3072,10 @@ public Builder clearType() { * * * 
-       * Disk type as shown in `gcloud compute disk-types list`
-       * For example, "pd-ssd", "pd-standard", "pd-balanced", "local-ssd".
+       * Disk type as shown in `gcloud compute disk-types list`.
+       * For example, local SSD uses type "local-ssd".
+       * Persistent disks and boot disks use "pd-balanced", "pd-extreme", "pd-ssd"
+       * or "pd-standard".
        *
* * string type = 1; @@ -2952,9 +3100,14 @@ public Builder setTypeBytes(com.google.protobuf.ByteString value) { * * 
        * Disk size in GB.
-       * This field is ignored if `data_source` is `disk` or `image`.
-       * If `type` is `local-ssd`, size_gb should be a multiple of 375GB,
+       * For persistent disk, this field is ignored if `data_source` is `image` or
+       * `snapshot`.
+       * For local SSD, size_gb should be a multiple of 375GB,
        * otherwise, the final size will be the next greater multiple of 375 GB.
+       * For boot disk, Batch will calculate the boot disk size based on source
+       * image and task requirements if you do not speicify the size.
+       * If both this field and the boot_disk_mib field in task spec's
+       * compute_resource are defined, Batch will only honor this field.
        *
* * int64 size_gb = 2; @@ -2970,9 +3123,14 @@ public long getSizeGb() { * * 
        * Disk size in GB.
-       * This field is ignored if `data_source` is `disk` or `image`.
-       * If `type` is `local-ssd`, size_gb should be a multiple of 375GB,
+       * For persistent disk, this field is ignored if `data_source` is `image` or
+       * `snapshot`.
+       * For local SSD, size_gb should be a multiple of 375GB,
        * otherwise, the final size will be the next greater multiple of 375 GB.
+       * For boot disk, Batch will calculate the boot disk size based on source
+       * image and task requirements if you do not speicify the size.
+       * If both this field and the boot_disk_mib field in task spec's
+       * compute_resource are defined, Batch will only honor this field.
        *
* * int64 size_gb = 2; @@ -2992,9 +3150,14 @@ public Builder setSizeGb(long value) { * * 
        * Disk size in GB.
-       * This field is ignored if `data_source` is `disk` or `image`.
-       * If `type` is `local-ssd`, size_gb should be a multiple of 375GB,
+       * For persistent disk, this field is ignored if `data_source` is `image` or
+       * `snapshot`.
+       * For local SSD, size_gb should be a multiple of 375GB,
        * otherwise, the final size will be the next greater multiple of 375 GB.
+       * For boot disk, Batch will calculate the boot disk size based on source
+       * image and task requirements if you do not speicify the size.
+       * If both this field and the boot_disk_mib field in task spec's
+       * compute_resource are defined, Batch will only honor this field.
        *
* * int64 size_gb = 2; @@ -4501,7 +4664,7 @@ public interface AcceleratorOrBuilder * bool install_gpu_drivers = 3 [deprecated = true]; * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.Accelerator.install_gpu_drivers is - * deprecated. See google/cloud/batch/v1alpha/job.proto;l=349 + * deprecated. See google/cloud/batch/v1alpha/job.proto;l=369 * @return The installGpuDrivers. */ @java.lang.Deprecated @@ -4639,7 +4802,7 @@ public long getCount() { * bool install_gpu_drivers = 3 [deprecated = true]; * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.Accelerator.install_gpu_drivers is - * deprecated. See google/cloud/batch/v1alpha/job.proto;l=349 + * deprecated. See google/cloud/batch/v1alpha/job.proto;l=369 * @return The installGpuDrivers. */ @java.lang.Override @@ -5217,7 +5380,7 @@ public Builder clearCount() { * bool install_gpu_drivers = 3 [deprecated = true]; * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.Accelerator.install_gpu_drivers is - * deprecated. See google/cloud/batch/v1alpha/job.proto;l=349 + * deprecated. See google/cloud/batch/v1alpha/job.proto;l=369 * @return The installGpuDrivers. */ @java.lang.Override @@ -5235,7 +5398,7 @@ public boolean getInstallGpuDrivers() { * bool install_gpu_drivers = 3 [deprecated = true]; * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.Accelerator.install_gpu_drivers is - * deprecated. See google/cloud/batch/v1alpha/job.proto;l=349 + * deprecated. See google/cloud/batch/v1alpha/job.proto;l=369 * @param value The installGpuDrivers to set. * @return This builder for chaining. */ @@ -5257,7 +5420,7 @@ public Builder setInstallGpuDrivers(boolean value) { * bool install_gpu_drivers = 3 [deprecated = true]; * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.Accelerator.install_gpu_drivers is - * deprecated. See google/cloud/batch/v1alpha/job.proto;l=349 + * deprecated. See google/cloud/batch/v1alpha/job.proto;l=369 * @return This builder for chaining. */ @java.lang.Deprecated @@ -5348,7 +5511,7 @@ public interface InstancePolicyOrBuilder * repeated string allowed_machine_types = 1 [deprecated = true]; * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.InstancePolicy.allowed_machine_types - * is deprecated. See google/cloud/batch/v1alpha/job.proto;l=356 + * is deprecated. See google/cloud/batch/v1alpha/job.proto;l=376 * @return A list containing the allowedMachineTypes. */ @java.lang.Deprecated @@ -5363,7 +5526,7 @@ public interface InstancePolicyOrBuilder * repeated string allowed_machine_types = 1 [deprecated = true]; * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.InstancePolicy.allowed_machine_types - * is deprecated. See google/cloud/batch/v1alpha/job.proto;l=356 + * is deprecated. See google/cloud/batch/v1alpha/job.proto;l=376 * @return The count of allowedMachineTypes. */ @java.lang.Deprecated @@ -5378,7 +5541,7 @@ public interface InstancePolicyOrBuilder * repeated string allowed_machine_types = 1 [deprecated = true]; * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.InstancePolicy.allowed_machine_types - * is deprecated. See google/cloud/batch/v1alpha/job.proto;l=356 + * is deprecated. See google/cloud/batch/v1alpha/job.proto;l=376 * @param index The index of the element to return. * @return The allowedMachineTypes at the given index. */ @@ -5394,7 +5557,7 @@ public interface InstancePolicyOrBuilder * repeated string allowed_machine_types = 1 [deprecated = true]; * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.InstancePolicy.allowed_machine_types - * is deprecated. See google/cloud/batch/v1alpha/job.proto;l=356 + * is deprecated. See google/cloud/batch/v1alpha/job.proto;l=376 * @param index The index of the value to return. * @return The bytes of the allowedMachineTypes at the given index. */ @@ -5734,7 +5897,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * repeated string allowed_machine_types = 1 [deprecated = true]; * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.InstancePolicy.allowed_machine_types - * is deprecated. See google/cloud/batch/v1alpha/job.proto;l=356 + * is deprecated. See google/cloud/batch/v1alpha/job.proto;l=376 * @return A list containing the allowedMachineTypes. */ @java.lang.Deprecated @@ -5751,7 +5914,7 @@ public com.google.protobuf.ProtocolStringList getAllowedMachineTypesList() { * repeated string allowed_machine_types = 1 [deprecated = true]; * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.InstancePolicy.allowed_machine_types - * is deprecated. See google/cloud/batch/v1alpha/job.proto;l=356 + * is deprecated. See google/cloud/batch/v1alpha/job.proto;l=376 * @return The count of allowedMachineTypes. */ @java.lang.Deprecated @@ -5768,7 +5931,7 @@ public int getAllowedMachineTypesCount() { * repeated string allowed_machine_types = 1 [deprecated = true]; * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.InstancePolicy.allowed_machine_types - * is deprecated. See google/cloud/batch/v1alpha/job.proto;l=356 + * is deprecated. See google/cloud/batch/v1alpha/job.proto;l=376 * @param index The index of the element to return. * @return The allowedMachineTypes at the given index. */ @@ -5786,7 +5949,7 @@ public java.lang.String getAllowedMachineTypes(int index) { * repeated string allowed_machine_types = 1 [deprecated = true]; * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.InstancePolicy.allowed_machine_types - * is deprecated. See google/cloud/batch/v1alpha/job.proto;l=356 + * is deprecated. See google/cloud/batch/v1alpha/job.proto;l=376 * @param index The index of the value to return. * @return The bytes of the allowedMachineTypes at the given index. */ @@ -6868,7 +7031,7 @@ private void ensureAllowedMachineTypesIsMutable() { * * @deprecated * google.cloud.batch.v1alpha.AllocationPolicy.InstancePolicy.allowed_machine_types is - * deprecated. See google/cloud/batch/v1alpha/job.proto;l=356 + * deprecated. See google/cloud/batch/v1alpha/job.proto;l=376 * @return A list containing the allowedMachineTypes. */ @java.lang.Deprecated @@ -6886,7 +7049,7 @@ public com.google.protobuf.ProtocolStringList getAllowedMachineTypesList() { * * @deprecated * google.cloud.batch.v1alpha.AllocationPolicy.InstancePolicy.allowed_machine_types is - * deprecated. See google/cloud/batch/v1alpha/job.proto;l=356 + * deprecated. See google/cloud/batch/v1alpha/job.proto;l=376 * @return The count of allowedMachineTypes. */ @java.lang.Deprecated @@ -6904,7 +7067,7 @@ public int getAllowedMachineTypesCount() { * * @deprecated * google.cloud.batch.v1alpha.AllocationPolicy.InstancePolicy.allowed_machine_types is - * deprecated. See google/cloud/batch/v1alpha/job.proto;l=356 + * deprecated. See google/cloud/batch/v1alpha/job.proto;l=376 * @param index The index of the element to return. * @return The allowedMachineTypes at the given index. */ @@ -6923,7 +7086,7 @@ public java.lang.String getAllowedMachineTypes(int index) { * * @deprecated * google.cloud.batch.v1alpha.AllocationPolicy.InstancePolicy.allowed_machine_types is - * deprecated. See google/cloud/batch/v1alpha/job.proto;l=356 + * deprecated. See google/cloud/batch/v1alpha/job.proto;l=376 * @param index The index of the value to return. * @return The bytes of the allowedMachineTypes at the given index. */ @@ -6942,7 +7105,7 @@ public com.google.protobuf.ByteString getAllowedMachineTypesBytes(int index) { * * @deprecated * google.cloud.batch.v1alpha.AllocationPolicy.InstancePolicy.allowed_machine_types is - * deprecated. See google/cloud/batch/v1alpha/job.proto;l=356 + * deprecated. See google/cloud/batch/v1alpha/job.proto;l=376 * @param index The index to set the value at. * @param value The allowedMachineTypes to set. * @return This builder for chaining. @@ -6968,7 +7131,7 @@ public Builder setAllowedMachineTypes(int index, java.lang.String value) { * * @deprecated * google.cloud.batch.v1alpha.AllocationPolicy.InstancePolicy.allowed_machine_types is - * deprecated. See google/cloud/batch/v1alpha/job.proto;l=356 + * deprecated. See google/cloud/batch/v1alpha/job.proto;l=376 * @param value The allowedMachineTypes to add. * @return This builder for chaining. */ @@ -6993,7 +7156,7 @@ public Builder addAllowedMachineTypes(java.lang.String value) { * * @deprecated * google.cloud.batch.v1alpha.AllocationPolicy.InstancePolicy.allowed_machine_types is - * deprecated. See google/cloud/batch/v1alpha/job.proto;l=356 + * deprecated. See google/cloud/batch/v1alpha/job.proto;l=376 * @param values The allowedMachineTypes to add. * @return This builder for chaining. */ @@ -7015,7 +7178,7 @@ public Builder addAllAllowedMachineTypes(java.lang.Iterable va * * @deprecated * google.cloud.batch.v1alpha.AllocationPolicy.InstancePolicy.allowed_machine_types is - * deprecated. See google/cloud/batch/v1alpha/job.proto;l=356 + * deprecated. See google/cloud/batch/v1alpha/job.proto;l=376 * @return This builder for chaining. */ @java.lang.Deprecated @@ -7036,7 +7199,7 @@ public Builder clearAllowedMachineTypes() { * * @deprecated * google.cloud.batch.v1alpha.AllocationPolicy.InstancePolicy.allowed_machine_types is - * deprecated. See google/cloud/batch/v1alpha/job.proto;l=356 + * deprecated. See google/cloud/batch/v1alpha/job.proto;l=376 * @param value The bytes of the allowedMachineTypes to add. * @return This builder for chaining. */ @@ -12074,7 +12237,7 @@ public com.google.cloud.batch.v1alpha.AllocationPolicy.LocationPolicy getLocatio * * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.instance is deprecated. See - * google/cloud/batch/v1alpha/job.proto;l=462 + * google/cloud/batch/v1alpha/job.proto;l=482 * @return Whether the instance field is set. */ @java.lang.Override @@ -12094,7 +12257,7 @@ public boolean hasInstance() { * * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.instance is deprecated. See - * google/cloud/batch/v1alpha/job.proto;l=462 + * google/cloud/batch/v1alpha/job.proto;l=482 * @return The instance. */ @java.lang.Override @@ -12230,7 +12393,7 @@ public com.google.cloud.batch.v1alpha.AllocationPolicy.InstancePolicyOrTemplate * repeated string instance_templates = 3 [deprecated = true]; * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.instance_templates is deprecated. See - * google/cloud/batch/v1alpha/job.proto;l=469 + * google/cloud/batch/v1alpha/job.proto;l=489 * @return A list containing the instanceTemplates. */ @java.lang.Deprecated @@ -12247,7 +12410,7 @@ public com.google.protobuf.ProtocolStringList getInstanceTemplatesList() { * repeated string instance_templates = 3 [deprecated = true]; * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.instance_templates is deprecated. See - * google/cloud/batch/v1alpha/job.proto;l=469 + * google/cloud/batch/v1alpha/job.proto;l=489 * @return The count of instanceTemplates. */ @java.lang.Deprecated @@ -12264,7 +12427,7 @@ public int getInstanceTemplatesCount() { * repeated string instance_templates = 3 [deprecated = true]; * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.instance_templates is deprecated. See - * google/cloud/batch/v1alpha/job.proto;l=469 + * google/cloud/batch/v1alpha/job.proto;l=489 * @param index The index of the element to return. * @return The instanceTemplates at the given index. */ @@ -12282,7 +12445,7 @@ public java.lang.String getInstanceTemplates(int index) { * repeated string instance_templates = 3 [deprecated = true]; * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.instance_templates is deprecated. See - * google/cloud/batch/v1alpha/job.proto;l=469 + * google/cloud/batch/v1alpha/job.proto;l=489 * @param index The index of the value to return. * @return The bytes of the instanceTemplates at the given index. */ @@ -12323,7 +12486,7 @@ public com.google.cloud.batch.v1alpha.AllocationPolicy.ProvisioningModel convert * * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.provisioning_models is deprecated. See - * google/cloud/batch/v1alpha/job.proto;l=472 + * google/cloud/batch/v1alpha/job.proto;l=492 * @return A list containing the provisioningModels. */ @java.lang.Override @@ -12346,7 +12509,7 @@ public com.google.cloud.batch.v1alpha.AllocationPolicy.ProvisioningModel convert * * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.provisioning_models is deprecated. See - * google/cloud/batch/v1alpha/job.proto;l=472 + * google/cloud/batch/v1alpha/job.proto;l=492 * @return The count of provisioningModels. */ @java.lang.Override @@ -12366,7 +12529,7 @@ public int getProvisioningModelsCount() { * * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.provisioning_models is deprecated. See - * google/cloud/batch/v1alpha/job.proto;l=472 + * google/cloud/batch/v1alpha/job.proto;l=492 * @param index The index of the element to return. * @return The provisioningModels at the given index. */ @@ -12388,7 +12551,7 @@ public com.google.cloud.batch.v1alpha.AllocationPolicy.ProvisioningModel getProv * * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.provisioning_models is deprecated. See - * google/cloud/batch/v1alpha/job.proto;l=472 + * google/cloud/batch/v1alpha/job.proto;l=492 * @return A list containing the enum numeric values on the wire for provisioningModels. */ @java.lang.Override @@ -12408,7 +12571,7 @@ public java.util.List getProvisioningModelsValueList() { * * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.provisioning_models is deprecated. See - * google/cloud/batch/v1alpha/job.proto;l=472 + * google/cloud/batch/v1alpha/job.proto;l=492 * @param index The index of the value to return. * @return The enum numeric value on the wire of provisioningModels at the given index. */ @@ -12434,7 +12597,7 @@ public int getProvisioningModelsValue(int index) { * string service_account_email = 5 [deprecated = true]; * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.service_account_email is deprecated. - * See google/cloud/batch/v1alpha/job.proto;l=475 + * See google/cloud/batch/v1alpha/job.proto;l=495 * @return The serviceAccountEmail. */ @java.lang.Override @@ -12460,7 +12623,7 @@ public java.lang.String getServiceAccountEmail() { * string service_account_email = 5 [deprecated = true]; * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.service_account_email is deprecated. - * See google/cloud/batch/v1alpha/job.proto;l=475 + * See google/cloud/batch/v1alpha/job.proto;l=495 * @return The bytes for serviceAccountEmail. */ @java.lang.Override @@ -13612,7 +13775,7 @@ public Builder clearLocation() { * * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.instance is deprecated. See - * google/cloud/batch/v1alpha/job.proto;l=462 + * google/cloud/batch/v1alpha/job.proto;l=482 * @return Whether the instance field is set. */ @java.lang.Deprecated @@ -13631,7 +13794,7 @@ public boolean hasInstance() { * * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.instance is deprecated. See - * google/cloud/batch/v1alpha/job.proto;l=462 + * google/cloud/batch/v1alpha/job.proto;l=482 * @return The instance. */ @java.lang.Deprecated @@ -14264,7 +14427,7 @@ private void ensureInstanceTemplatesIsMutable() { * repeated string instance_templates = 3 [deprecated = true]; * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.instance_templates is deprecated. See - * google/cloud/batch/v1alpha/job.proto;l=469 + * google/cloud/batch/v1alpha/job.proto;l=489 * @return A list containing the instanceTemplates. */ @java.lang.Deprecated @@ -14281,7 +14444,7 @@ public com.google.protobuf.ProtocolStringList getInstanceTemplatesList() { * repeated string instance_templates = 3 [deprecated = true]; * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.instance_templates is deprecated. See - * google/cloud/batch/v1alpha/job.proto;l=469 + * google/cloud/batch/v1alpha/job.proto;l=489 * @return The count of instanceTemplates. */ @java.lang.Deprecated @@ -14298,7 +14461,7 @@ public int getInstanceTemplatesCount() { * repeated string instance_templates = 3 [deprecated = true]; * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.instance_templates is deprecated. See - * google/cloud/batch/v1alpha/job.proto;l=469 + * google/cloud/batch/v1alpha/job.proto;l=489 * @param index The index of the element to return. * @return The instanceTemplates at the given index. */ @@ -14316,7 +14479,7 @@ public java.lang.String getInstanceTemplates(int index) { * repeated string instance_templates = 3 [deprecated = true]; * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.instance_templates is deprecated. See - * google/cloud/batch/v1alpha/job.proto;l=469 + * google/cloud/batch/v1alpha/job.proto;l=489 * @param index The index of the value to return. * @return The bytes of the instanceTemplates at the given index. */ @@ -14334,7 +14497,7 @@ public com.google.protobuf.ByteString getInstanceTemplatesBytes(int index) { * repeated string instance_templates = 3 [deprecated = true]; * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.instance_templates is deprecated. See - * google/cloud/batch/v1alpha/job.proto;l=469 + * google/cloud/batch/v1alpha/job.proto;l=489 * @param index The index to set the value at. * @param value The instanceTemplates to set. * @return This builder for chaining. @@ -14359,7 +14522,7 @@ public Builder setInstanceTemplates(int index, java.lang.String value) { * repeated string instance_templates = 3 [deprecated = true]; * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.instance_templates is deprecated. See - * google/cloud/batch/v1alpha/job.proto;l=469 + * google/cloud/batch/v1alpha/job.proto;l=489 * @param value The instanceTemplates to add. * @return This builder for chaining. */ @@ -14383,7 +14546,7 @@ public Builder addInstanceTemplates(java.lang.String value) { * repeated string instance_templates = 3 [deprecated = true]; * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.instance_templates is deprecated. See - * google/cloud/batch/v1alpha/job.proto;l=469 + * google/cloud/batch/v1alpha/job.proto;l=489 * @param values The instanceTemplates to add. * @return This builder for chaining. */ @@ -14404,7 +14567,7 @@ public Builder addAllInstanceTemplates(java.lang.Iterable valu * repeated string instance_templates = 3 [deprecated = true]; * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.instance_templates is deprecated. See - * google/cloud/batch/v1alpha/job.proto;l=469 + * google/cloud/batch/v1alpha/job.proto;l=489 * @return This builder for chaining. */ @java.lang.Deprecated @@ -14424,7 +14587,7 @@ public Builder clearInstanceTemplates() { * repeated string instance_templates = 3 [deprecated = true]; * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.instance_templates is deprecated. See - * google/cloud/batch/v1alpha/job.proto;l=469 + * google/cloud/batch/v1alpha/job.proto;l=489 * @param value The bytes of the instanceTemplates to add. * @return This builder for chaining. */ @@ -14461,7 +14624,7 @@ private void ensureProvisioningModelsIsMutable() { * * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.provisioning_models is deprecated. - * See google/cloud/batch/v1alpha/job.proto;l=472 + * See google/cloud/batch/v1alpha/job.proto;l=492 * @return A list containing the provisioningModels. */ @java.lang.Deprecated @@ -14483,7 +14646,7 @@ private void ensureProvisioningModelsIsMutable() { * * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.provisioning_models is deprecated. - * See google/cloud/batch/v1alpha/job.proto;l=472 + * See google/cloud/batch/v1alpha/job.proto;l=492 * @return The count of provisioningModels. */ @java.lang.Deprecated @@ -14502,7 +14665,7 @@ public int getProvisioningModelsCount() { * * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.provisioning_models is deprecated. - * See google/cloud/batch/v1alpha/job.proto;l=472 + * See google/cloud/batch/v1alpha/job.proto;l=492 * @param index The index of the element to return. * @return The provisioningModels at the given index. */ @@ -14523,7 +14686,7 @@ public com.google.cloud.batch.v1alpha.AllocationPolicy.ProvisioningModel getProv * * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.provisioning_models is deprecated. - * See google/cloud/batch/v1alpha/job.proto;l=472 + * See google/cloud/batch/v1alpha/job.proto;l=492 * @param index The index to set the value at. * @param value The provisioningModels to set. * @return This builder for chaining. @@ -14551,7 +14714,7 @@ public Builder setProvisioningModels( * * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.provisioning_models is deprecated. - * See google/cloud/batch/v1alpha/job.proto;l=472 + * See google/cloud/batch/v1alpha/job.proto;l=492 * @param value The provisioningModels to add. * @return This builder for chaining. */ @@ -14578,7 +14741,7 @@ public Builder addProvisioningModels( * * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.provisioning_models is deprecated. - * See google/cloud/batch/v1alpha/job.proto;l=472 + * See google/cloud/batch/v1alpha/job.proto;l=492 * @param values The provisioningModels to add. * @return This builder for chaining. */ @@ -14606,7 +14769,7 @@ public Builder addAllProvisioningModels( * * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.provisioning_models is deprecated. - * See google/cloud/batch/v1alpha/job.proto;l=472 + * See google/cloud/batch/v1alpha/job.proto;l=492 * @return This builder for chaining. */ @java.lang.Deprecated @@ -14628,7 +14791,7 @@ public Builder clearProvisioningModels() { * * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.provisioning_models is deprecated. - * See google/cloud/batch/v1alpha/job.proto;l=472 + * See google/cloud/batch/v1alpha/job.proto;l=492 * @return A list containing the enum numeric values on the wire for provisioningModels. */ @java.lang.Deprecated @@ -14647,7 +14810,7 @@ public java.util.List getProvisioningModelsValueList() { * * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.provisioning_models is deprecated. - * See google/cloud/batch/v1alpha/job.proto;l=472 + * See google/cloud/batch/v1alpha/job.proto;l=492 * @param index The index of the value to return. * @return The enum numeric value on the wire of provisioningModels at the given index. */ @@ -14667,7 +14830,7 @@ public int getProvisioningModelsValue(int index) { * * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.provisioning_models is deprecated. - * See google/cloud/batch/v1alpha/job.proto;l=472 + * See google/cloud/batch/v1alpha/job.proto;l=492 * @param index The index to set the value at. * @param value The enum numeric value on the wire for provisioningModels to set. * @return This builder for chaining. @@ -14691,7 +14854,7 @@ public Builder setProvisioningModelsValue(int index, int value) { * * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.provisioning_models is deprecated. - * See google/cloud/batch/v1alpha/job.proto;l=472 + * See google/cloud/batch/v1alpha/job.proto;l=492 * @param value The enum numeric value on the wire for provisioningModels to add. * @return This builder for chaining. */ @@ -14714,7 +14877,7 @@ public Builder addProvisioningModelsValue(int value) { * * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.provisioning_models is deprecated. - * See google/cloud/batch/v1alpha/job.proto;l=472 + * See google/cloud/batch/v1alpha/job.proto;l=492 * @param values The enum numeric values on the wire for provisioningModels to add. * @return This builder for chaining. */ @@ -14739,7 +14902,7 @@ public Builder addAllProvisioningModelsValue(java.lang.Iterablestring service_account_email = 5 [deprecated = true]; * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.service_account_email is deprecated. - * See google/cloud/batch/v1alpha/job.proto;l=475 + * See google/cloud/batch/v1alpha/job.proto;l=495 * @return The serviceAccountEmail. */ @java.lang.Deprecated @@ -14764,7 +14927,7 @@ public java.lang.String getServiceAccountEmail() { * string service_account_email = 5 [deprecated = true]; * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.service_account_email is deprecated. - * See google/cloud/batch/v1alpha/job.proto;l=475 + * See google/cloud/batch/v1alpha/job.proto;l=495 * @return The bytes for serviceAccountEmail. */ @java.lang.Deprecated @@ -14789,7 +14952,7 @@ public com.google.protobuf.ByteString getServiceAccountEmailBytes() { * string service_account_email = 5 [deprecated = true]; * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.service_account_email is deprecated. - * See google/cloud/batch/v1alpha/job.proto;l=475 + * See google/cloud/batch/v1alpha/job.proto;l=495 * @param value The serviceAccountEmail to set. * @return This builder for chaining. */ @@ -14813,7 +14976,7 @@ public Builder setServiceAccountEmail(java.lang.String value) { * string service_account_email = 5 [deprecated = true]; * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.service_account_email is deprecated. - * See google/cloud/batch/v1alpha/job.proto;l=475 + * See google/cloud/batch/v1alpha/job.proto;l=495 * @return This builder for chaining. */ @java.lang.Deprecated @@ -14833,7 +14996,7 @@ public Builder clearServiceAccountEmail() { * string service_account_email = 5 [deprecated = true]; * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.service_account_email is deprecated. - * See google/cloud/batch/v1alpha/job.proto;l=475 + * See google/cloud/batch/v1alpha/job.proto;l=495 * @param value The bytes for serviceAccountEmail to set. * @return This builder for chaining. */ diff --git a/java-batch/proto-google-cloud-batch-v1alpha/src/main/java/com/google/cloud/batch/v1alpha/AllocationPolicyOrBuilder.java b/java-batch/proto-google-cloud-batch-v1alpha/src/main/java/com/google/cloud/batch/v1alpha/AllocationPolicyOrBuilder.java index 1e9105bde1ec..25695a649a94 100644 --- a/java-batch/proto-google-cloud-batch-v1alpha/src/main/java/com/google/cloud/batch/v1alpha/AllocationPolicyOrBuilder.java +++ b/java-batch/proto-google-cloud-batch-v1alpha/src/main/java/com/google/cloud/batch/v1alpha/AllocationPolicyOrBuilder.java @@ -70,7 +70,7 @@ public interface AllocationPolicyOrBuilder * * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.instance is deprecated. See - * google/cloud/batch/v1alpha/job.proto;l=462 + * google/cloud/batch/v1alpha/job.proto;l=482 * @return Whether the instance field is set. */ @java.lang.Deprecated @@ -87,7 +87,7 @@ public interface AllocationPolicyOrBuilder * * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.instance is deprecated. See - * google/cloud/batch/v1alpha/job.proto;l=462 + * google/cloud/batch/v1alpha/job.proto;l=482 * @return The instance. */ @java.lang.Deprecated @@ -187,7 +187,7 @@ public interface AllocationPolicyOrBuilder * repeated string instance_templates = 3 [deprecated = true]; * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.instance_templates is deprecated. See - * google/cloud/batch/v1alpha/job.proto;l=469 + * google/cloud/batch/v1alpha/job.proto;l=489 * @return A list containing the instanceTemplates. */ @java.lang.Deprecated @@ -202,7 +202,7 @@ public interface AllocationPolicyOrBuilder * repeated string instance_templates = 3 [deprecated = true]; * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.instance_templates is deprecated. See - * google/cloud/batch/v1alpha/job.proto;l=469 + * google/cloud/batch/v1alpha/job.proto;l=489 * @return The count of instanceTemplates. */ @java.lang.Deprecated @@ -217,7 +217,7 @@ public interface AllocationPolicyOrBuilder * repeated string instance_templates = 3 [deprecated = true]; * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.instance_templates is deprecated. See - * google/cloud/batch/v1alpha/job.proto;l=469 + * google/cloud/batch/v1alpha/job.proto;l=489 * @param index The index of the element to return. * @return The instanceTemplates at the given index. */ @@ -233,7 +233,7 @@ public interface AllocationPolicyOrBuilder * repeated string instance_templates = 3 [deprecated = true]; * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.instance_templates is deprecated. See - * google/cloud/batch/v1alpha/job.proto;l=469 + * google/cloud/batch/v1alpha/job.proto;l=489 * @param index The index of the value to return. * @return The bytes of the instanceTemplates at the given index. */ @@ -252,7 +252,7 @@ public interface AllocationPolicyOrBuilder * * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.provisioning_models is deprecated. See - * google/cloud/batch/v1alpha/job.proto;l=472 + * google/cloud/batch/v1alpha/job.proto;l=492 * @return A list containing the provisioningModels. */ @java.lang.Deprecated @@ -270,7 +270,7 @@ public interface AllocationPolicyOrBuilder * * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.provisioning_models is deprecated. See - * google/cloud/batch/v1alpha/job.proto;l=472 + * google/cloud/batch/v1alpha/job.proto;l=492 * @return The count of provisioningModels. */ @java.lang.Deprecated @@ -287,7 +287,7 @@ public interface AllocationPolicyOrBuilder * * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.provisioning_models is deprecated. See - * google/cloud/batch/v1alpha/job.proto;l=472 + * google/cloud/batch/v1alpha/job.proto;l=492 * @param index The index of the element to return. * @return The provisioningModels at the given index. */ @@ -306,7 +306,7 @@ com.google.cloud.batch.v1alpha.AllocationPolicy.ProvisioningModel getProvisionin * * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.provisioning_models is deprecated. See - * google/cloud/batch/v1alpha/job.proto;l=472 + * google/cloud/batch/v1alpha/job.proto;l=492 * @return A list containing the enum numeric values on the wire for provisioningModels. */ @java.lang.Deprecated @@ -323,7 +323,7 @@ com.google.cloud.batch.v1alpha.AllocationPolicy.ProvisioningModel getProvisionin * * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.provisioning_models is deprecated. See - * google/cloud/batch/v1alpha/job.proto;l=472 + * google/cloud/batch/v1alpha/job.proto;l=492 * @param index The index of the value to return. * @return The enum numeric value on the wire of provisioningModels at the given index. */ @@ -340,7 +340,7 @@ com.google.cloud.batch.v1alpha.AllocationPolicy.ProvisioningModel getProvisionin * string service_account_email = 5 [deprecated = true]; * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.service_account_email is deprecated. - * See google/cloud/batch/v1alpha/job.proto;l=475 + * See google/cloud/batch/v1alpha/job.proto;l=495 * @return The serviceAccountEmail. */ @java.lang.Deprecated @@ -355,7 +355,7 @@ com.google.cloud.batch.v1alpha.AllocationPolicy.ProvisioningModel getProvisionin * string service_account_email = 5 [deprecated = true]; * * @deprecated google.cloud.batch.v1alpha.AllocationPolicy.service_account_email is deprecated. - * See google/cloud/batch/v1alpha/job.proto;l=475 + * See google/cloud/batch/v1alpha/job.proto;l=495 * @return The bytes for serviceAccountEmail. */ @java.lang.Deprecated diff --git a/java-batch/proto-google-cloud-batch-v1alpha/src/main/java/com/google/cloud/batch/v1alpha/BatchProto.java b/java-batch/proto-google-cloud-batch-v1alpha/src/main/java/com/google/cloud/batch/v1alpha/BatchProto.java index 4263163eb36d..cb647ccdaecc 100644 --- a/java-batch/proto-google-cloud-batch-v1alpha/src/main/java/com/google/cloud/batch/v1alpha/BatchProto.java +++ b/java-batch/proto-google-cloud-batch-v1alpha/src/main/java/com/google/cloud/batch/v1alpha/BatchProto.java @@ -73,82 +73,80 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { static { java.lang.String[] descriptorData = { "\n&google/cloud/batch/v1alpha/batch.proto" - + "\022\032google.cloud.batch.v1alpha\032\033google/pro" - + "tobuf/empty.proto\032\034google/api/annotation" - + "s.proto\032\027google/api/client.proto\032\037google" - + "/api/field_behavior.proto\032\031google/api/re" - + "source.proto\032$google/cloud/batch/v1alpha" - + "/job.proto\032%google/cloud/batch/v1alpha/t" - + "ask.proto\032#google/longrunning/operations" - + ".proto\032\037google/protobuf/timestamp.proto\"" - + "\240\001\n\020CreateJobRequest\0220\n\006parent\030\001 \001(\tB \340A" - + "\002\372A\032\022\030batch.googleapis.com/Job\022\016\n\006job_id" - + "\030\002 \001(\t\0221\n\003job\030\003 \001(\0132\037.google.cloud.batch" - + ".v1alpha.JobB\003\340A\002\022\027\n\nrequest_id\030\004 \001(\tB\003\340" - + "A\001\"?\n\rGetJobRequest\022.\n\004name\030\001 \001(\tB \340A\002\372A" - + "\032\n\030batch.googleapis.com/Job\"N\n\020DeleteJob" - + "Request\022\014\n\004name\030\001 \001(\t\022\023\n\006reason\030\002 \001(\tB\003\340" - + "A\001\022\027\n\nrequest_id\030\004 \001(\tB\003\340A\001\"X\n\017ListJobsR" - + "equest\022\016\n\006parent\030\001 \001(\t\022\016\n\006filter\030\004 \001(\t\022\021" - + "\n\tpage_size\030\002 \001(\005\022\022\n\npage_token\030\003 \001(\t\"o\n" - + "\020ListJobsResponse\022-\n\004jobs\030\001 \003(\0132\037.google" - + ".cloud.batch.v1alpha.Job\022\027\n\017next_page_to" - + "ken\030\002 \001(\t\022\023\n\013unreachable\030\003 \003(\t\"\201\001\n\020ListT" - + "asksRequest\0226\n\006parent\030\001 \001(\tB&\340A\002\372A \n\036bat" - + "ch.googleapis.com/TaskGroup\022\016\n\006filter\030\002 " - + "\001(\t\022\021\n\tpage_size\030\003 \001(\005\022\022\n\npage_token\030\004 \001" - + "(\t\"r\n\021ListTasksResponse\022/\n\005tasks\030\001 \003(\0132 " - + ".google.cloud.batch.v1alpha.Task\022\027\n\017next" - + "_page_token\030\002 \001(\t\022\023\n\013unreachable\030\003 \003(\t\"A" - + "\n\016GetTaskRequest\022/\n\004name\030\001 \001(\tB!\340A\002\372A\033\n\031" - + "batch.googleapis.com/Task\"\200\002\n\021OperationM" - + "etadata\0224\n\013create_time\030\001 \001(\0132\032.google.pr" - + "otobuf.TimestampB\003\340A\003\0221\n\010end_time\030\002 \001(\0132" - + "\032.google.protobuf.TimestampB\003\340A\003\022\023\n\006targ" - + "et\030\003 \001(\tB\003\340A\003\022\021\n\004verb\030\004 \001(\tB\003\340A\003\022\033\n\016stat" - + "us_message\030\005 \001(\tB\003\340A\003\022#\n\026requested_cance" - + "llation\030\006 \001(\010B\003\340A\003\022\030\n\013api_version\030\007 \001(\tB" - + "\003\340A\0032\221\t\n\014BatchService\022\252\001\n\tCreateJob\022,.go" - + "ogle.cloud.batch.v1alpha.CreateJobReques" - + "t\032\037.google.cloud.batch.v1alpha.Job\"N\202\323\344\223" - + "\0024\"-/v1alpha/{parent=projects/*/location" - + "s/*}/jobs:\003job\332A\021parent,job,job_id\022\222\001\n\006G" - + "etJob\022).google.cloud.batch.v1alpha.GetJo" - + "bRequest\032\037.google.cloud.batch.v1alpha.Jo" - + "b\"<\202\323\344\223\002/\022-/v1alpha/{name=projects/*/loc" - + "ations/*/jobs/*}\332A\004name\022\337\001\n\tDeleteJob\022,." - + "google.cloud.batch.v1alpha.DeleteJobRequ" - + "est\032\035.google.longrunning.Operation\"\204\001\202\323\344" - + "\223\002/*-/v1alpha/{name=projects/*/locations" - + "/*/jobs/*}\332A\004name\312AE\n\025google.protobuf.Em" - + "pty\022,google.cloud.batch.v1alpha.Operatio" - + "nMetadata\022\245\001\n\010ListJobs\022+.google.cloud.ba" - + "tch.v1alpha.ListJobsRequest\032,.google.clo" - + "ud.batch.v1alpha.ListJobsResponse\">\202\323\344\223\002" - + "/\022-/v1alpha/{parent=projects/*/locations" - + "/*}/jobs\332A\006parent\022\252\001\n\007GetTask\022*.google.c" - + "loud.batch.v1alpha.GetTaskRequest\032 .goog" - + "le.cloud.batch.v1alpha.Task\"Q\202\323\344\223\002D\022B/v1" - + "alpha/{name=projects/*/locations/*/jobs/" - + "*/taskGroups/*/tasks/*}\332A\004name\022\275\001\n\tListT" - + "asks\022,.google.cloud.batch.v1alpha.ListTa" - + "sksRequest\032-.google.cloud.batch.v1alpha." - + "ListTasksResponse\"S\202\323\344\223\002D\022B/v1alpha/{par" - + "ent=projects/*/locations/*/jobs/*/taskGr" - + "oups/*}/tasks\332A\006parent\032H\312A\024batch.googlea" - + "pis.com\322A.https://www.googleapis.com/aut" - + "h/cloud-platformB\304\001\n\036com.google.cloud.ba" - + "tch.v1alphaB\nBatchProtoP\001Z4cloud.google." - + "com/go/batch/apiv1alpha/batchpb;batchpb\242" - + "\002\003GCB\252\002\032Google.Cloud.Batch.V1Alpha\312\002\032Goo" - + "gle\\Cloud\\Batch\\V1alpha\352\002\035Google::Cloud:" - + ":Batch::V1alphaP\000b\006proto3" + + "\022\032google.cloud.batch.v1alpha\032\034google/api" + + "/annotations.proto\032\027google/api/client.pr" + + "oto\032\037google/api/field_behavior.proto\032\031go" + + "ogle/api/resource.proto\032$google/cloud/ba" + + "tch/v1alpha/job.proto\032%google/cloud/batc" + + "h/v1alpha/task.proto\032#google/longrunning" + + "/operations.proto\032\037google/protobuf/times" + + "tamp.proto\"\240\001\n\020CreateJobRequest\0220\n\006paren" + + "t\030\001 \001(\tB \340A\002\372A\032\022\030batch.googleapis.com/Jo" + + "b\022\016\n\006job_id\030\002 \001(\t\0221\n\003job\030\003 \001(\0132\037.google." + + "cloud.batch.v1alpha.JobB\003\340A\002\022\027\n\nrequest_" + + "id\030\004 \001(\tB\003\340A\001\"?\n\rGetJobRequest\022.\n\004name\030\001" + + " \001(\tB \340A\002\372A\032\n\030batch.googleapis.com/Job\"N" + + "\n\020DeleteJobRequest\022\014\n\004name\030\001 \001(\t\022\023\n\006reas" + + "on\030\002 \001(\tB\003\340A\001\022\027\n\nrequest_id\030\004 \001(\tB\003\340A\001\"X" + + "\n\017ListJobsRequest\022\016\n\006parent\030\001 \001(\t\022\016\n\006fil" + + "ter\030\004 \001(\t\022\021\n\tpage_size\030\002 \001(\005\022\022\n\npage_tok" + + "en\030\003 \001(\t\"o\n\020ListJobsResponse\022-\n\004jobs\030\001 \003" + + "(\0132\037.google.cloud.batch.v1alpha.Job\022\027\n\017n" + + "ext_page_token\030\002 \001(\t\022\023\n\013unreachable\030\003 \003(" + + "\t\"\201\001\n\020ListTasksRequest\0226\n\006parent\030\001 \001(\tB&" + + "\340A\002\372A \n\036batch.googleapis.com/TaskGroup\022\016" + + "\n\006filter\030\002 \001(\t\022\021\n\tpage_size\030\003 \001(\005\022\022\n\npag" + + "e_token\030\004 \001(\t\"r\n\021ListTasksResponse\022/\n\005ta" + + "sks\030\001 \003(\0132 .google.cloud.batch.v1alpha.T" + + "ask\022\027\n\017next_page_token\030\002 \001(\t\022\023\n\013unreacha" + + "ble\030\003 \003(\t\"A\n\016GetTaskRequest\022/\n\004name\030\001 \001(" + + "\tB!\340A\002\372A\033\n\031batch.googleapis.com/Task\"\200\002\n" + + "\021OperationMetadata\0224\n\013create_time\030\001 \001(\0132" + + "\032.google.protobuf.TimestampB\003\340A\003\0221\n\010end_" + + "time\030\002 \001(\0132\032.google.protobuf.TimestampB\003" + + "\340A\003\022\023\n\006target\030\003 \001(\tB\003\340A\003\022\021\n\004verb\030\004 \001(\tB\003" + + "\340A\003\022\033\n\016status_message\030\005 \001(\tB\003\340A\003\022#\n\026requ" + + "ested_cancellation\030\006 \001(\010B\003\340A\003\022\030\n\013api_ver" + + "sion\030\007 \001(\tB\003\340A\0032\221\t\n\014BatchService\022\252\001\n\tCre" + + "ateJob\022,.google.cloud.batch.v1alpha.Crea" + + "teJobRequest\032\037.google.cloud.batch.v1alph" + + "a.Job\"N\202\323\344\223\0024\"-/v1alpha/{parent=projects" + + "/*/locations/*}/jobs:\003job\332A\021parent,job,j" + + "ob_id\022\222\001\n\006GetJob\022).google.cloud.batch.v1" + + "alpha.GetJobRequest\032\037.google.cloud.batch" + + ".v1alpha.Job\"<\202\323\344\223\002/\022-/v1alpha/{name=pro" + + "jects/*/locations/*/jobs/*}\332A\004name\022\337\001\n\tD" + + "eleteJob\022,.google.cloud.batch.v1alpha.De" + + "leteJobRequest\032\035.google.longrunning.Oper" + + "ation\"\204\001\202\323\344\223\002/*-/v1alpha/{name=projects/" + + "*/locations/*/jobs/*}\332A\004name\312AE\n\025google." + + "protobuf.Empty\022,google.cloud.batch.v1alp" + + "ha.OperationMetadata\022\245\001\n\010ListJobs\022+.goog" + + "le.cloud.batch.v1alpha.ListJobsRequest\032," + + ".google.cloud.batch.v1alpha.ListJobsResp" + + "onse\">\202\323\344\223\002/\022-/v1alpha/{parent=projects/" + + "*/locations/*}/jobs\332A\006parent\022\252\001\n\007GetTask" + + "\022*.google.cloud.batch.v1alpha.GetTaskReq" + + "uest\032 .google.cloud.batch.v1alpha.Task\"Q" + + "\202\323\344\223\002D\022B/v1alpha/{name=projects/*/locati" + + "ons/*/jobs/*/taskGroups/*/tasks/*}\332A\004nam" + + "e\022\275\001\n\tListTasks\022,.google.cloud.batch.v1a" + + "lpha.ListTasksRequest\032-.google.cloud.bat" + + "ch.v1alpha.ListTasksResponse\"S\202\323\344\223\002D\022B/v" + + "1alpha/{parent=projects/*/locations/*/jo" + + "bs/*/taskGroups/*}/tasks\332A\006parent\032H\312A\024ba" + + "tch.googleapis.com\322A.https://www.googlea" + + "pis.com/auth/cloud-platformB\304\001\n\036com.goog" + + "le.cloud.batch.v1alphaB\nBatchProtoP\001Z4cl" + + "oud.google.com/go/batch/apiv1alpha/batch" + + "pb;batchpb\242\002\003GCB\252\002\032Google.Cloud.Batch.V1" + + "Alpha\312\002\032Google\\Cloud\\Batch\\V1alpha\352\002\035Goo" + + "gle::Cloud::Batch::V1alphab\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - com.google.protobuf.EmptyProto.getDescriptor(), com.google.api.AnnotationsProto.getDescriptor(), com.google.api.ClientProto.getDescriptor(), com.google.api.FieldBehaviorProto.getDescriptor(), @@ -247,7 +245,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { registry.add(com.google.longrunning.OperationsProto.operationInfo); com.google.protobuf.Descriptors.FileDescriptor.internalUpdateFileDescriptor( descriptor, registry); - com.google.protobuf.EmptyProto.getDescriptor(); com.google.api.AnnotationsProto.getDescriptor(); com.google.api.ClientProto.getDescriptor(); com.google.api.FieldBehaviorProto.getDescriptor(); diff --git a/java-batch/proto-google-cloud-batch-v1alpha/src/main/java/com/google/cloud/batch/v1alpha/JobProto.java b/java-batch/proto-google-cloud-batch-v1alpha/src/main/java/com/google/cloud/batch/v1alpha/JobProto.java index b41348dfa411..a42e2c56ad7e 100644 --- a/java-batch/proto-google-cloud-batch-v1alpha/src/main/java/com/google/cloud/batch/v1alpha/JobProto.java +++ b/java-batch/proto-google-cloud-batch-v1alpha/src/main/java/com/google/cloud/batch/v1alpha/JobProto.java @@ -177,114 +177,116 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\0162..google.cloud.batch.v1alpha.JobDepend" + "ency.Type:\0028\001\"E\n\004Type\022\024\n\020TYPE_UNSPECIFIE" + "D\020\000\022\r\n\tSUCCEEDED\020\001\022\n\n\006FAILED\020\002\022\014\n\010FINISH" - + "ED\020\003\"\342\006\n\tJobStatus\022:\n\005state\030\001 \001(\0162+.goog" + + "ED\020\003\"\250\007\n\tJobStatus\022:\n\005state\030\001 \001(\0162+.goog" + "le.cloud.batch.v1alpha.JobStatus.State\022>" + "\n\rstatus_events\030\002 \003(\0132\'.google.cloud.bat" + "ch.v1alpha.StatusEvent\022J\n\013task_groups\030\004 " + "\003(\01325.google.cloud.batch.v1alpha.JobStat" + "us.TaskGroupsEntry\022/\n\014run_duration\030\005 \001(\013" - + "2\031.google.protobuf.Duration\032\225\001\n\016Instance" + + "2\031.google.protobuf.Duration\032\333\001\n\016Instance" + "Status\022\024\n\014machine_type\030\001 \001(\t\022Z\n\022provisio" + "ning_model\030\002 \001(\0162>.google.cloud.batch.v1" + "alpha.AllocationPolicy.ProvisioningModel" - + "\022\021\n\ttask_pack\030\003 \001(\003\032\334\001\n\017TaskGroupStatus\022" - + "Q\n\006counts\030\001 \003(\0132A.google.cloud.batch.v1a" - + "lpha.JobStatus.TaskGroupStatus.CountsEnt" - + "ry\022G\n\tinstances\030\002 \003(\01324.google.cloud.bat" - + "ch.v1alpha.JobStatus.InstanceStatus\032-\n\013C" - + "ountsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\003:\002" - + "8\001\032h\n\017TaskGroupsEntry\022\013\n\003key\030\001 \001(\t\022D\n\005va" - + "lue\030\002 \001(\01325.google.cloud.batch.v1alpha.J" - + "obStatus.TaskGroupStatus:\0028\001\"{\n\005State\022\025\n" - + "\021STATE_UNSPECIFIED\020\000\022\n\n\006QUEUED\020\001\022\r\n\tSCHE" - + "DULED\020\002\022\013\n\007RUNNING\020\003\022\r\n\tSUCCEEDED\020\004\022\n\n\006F" - + "AILED\020\005\022\030\n\024DELETION_IN_PROGRESS\020\006\"\220\003\n\017Jo" - + "bNotification\022\024\n\014pubsub_topic\030\001 \001(\t\022D\n\007m" - + "essage\030\002 \001(\01323.google.cloud.batch.v1alph" - + "a.JobNotification.Message\032\323\001\n\007Message\022>\n" - + "\004type\030\001 \001(\01620.google.cloud.batch.v1alpha" - + ".JobNotification.Type\022B\n\rnew_job_state\030\002" - + " \001(\0162+.google.cloud.batch.v1alpha.JobSta" - + "tus.State\022D\n\016new_task_state\030\003 \001(\0162,.goog" - + "le.cloud.batch.v1alpha.TaskStatus.State\"" - + "K\n\004Type\022\024\n\020TYPE_UNSPECIFIED\020\000\022\025\n\021JOB_STA" - + "TE_CHANGED\020\001\022\026\n\022TASK_STATE_CHANGED\020\002\"\355\017\n" - + "\020AllocationPolicy\022M\n\010location\030\001 \001(\0132;.go" - + "ogle.cloud.batch.v1alpha.AllocationPolic" - + "y.LocationPolicy\022Q\n\010instance\030\002 \001(\0132;.goo" - + "gle.cloud.batch.v1alpha.AllocationPolicy" - + ".InstancePolicyB\002\030\001\022X\n\tinstances\030\010 \003(\0132E" + + "\022\021\n\ttask_pack\030\003 \001(\003\022D\n\tboot_disk\030\004 \001(\01321" + ".google.cloud.batch.v1alpha.AllocationPo" - + "licy.InstancePolicyOrTemplate\022\036\n\022instanc" - + "e_templates\030\003 \003(\tB\002\030\001\022_\n\023provisioning_mo" - + "dels\030\004 \003(\0162>.google.cloud.batch.v1alpha." - + "AllocationPolicy.ProvisioningModelB\002\030\001\022!" - + "\n\025service_account_email\030\005 \001(\tB\002\030\001\022C\n\017ser" - + "vice_account\030\t \001(\0132*.google.cloud.batch." - + "v1alpha.ServiceAccount\022H\n\006labels\030\006 \003(\01328" - + ".google.cloud.batch.v1alpha.AllocationPo" - + "licy.LabelsEntry\022K\n\007network\030\007 \001(\0132:.goog" - + "le.cloud.batch.v1alpha.AllocationPolicy." - + "NetworkPolicy\032E\n\016LocationPolicy\022\031\n\021allow" - + "ed_locations\030\001 \003(\t\022\030\n\020denied_locations\030\002" - + " \003(\t\032q\n\004Disk\022\017\n\005image\030\004 \001(\tH\000\022\022\n\010snapsho" - + "t\030\005 \001(\tH\000\022\014\n\004type\030\001 \001(\t\022\017\n\007size_gb\030\002 \001(\003" - + "\022\026\n\016disk_interface\030\006 \001(\tB\r\n\013data_source\032" - + "\217\001\n\014AttachedDisk\022E\n\010new_disk\030\001 \001(\01321.goo" - + "gle.cloud.batch.v1alpha.AllocationPolicy" - + ".DiskH\000\022\027\n\rexisting_disk\030\002 \001(\tH\000\022\023\n\013devi" - + "ce_name\030\003 \001(\tB\n\n\010attached\032K\n\013Accelerator" - + "\022\014\n\004type\030\001 \001(\t\022\r\n\005count\030\002 \001(\003\022\037\n\023install" - + "_gpu_drivers\030\003 \001(\010B\002\030\001\032\264\003\n\016InstancePolic" - + "y\022!\n\025allowed_machine_types\030\001 \003(\tB\002\030\001\022\024\n\014" - + "machine_type\030\002 \001(\t\022\030\n\020min_cpu_platform\030\003" - + " \001(\t\022Z\n\022provisioning_model\030\004 \001(\0162>.googl" - + "e.cloud.batch.v1alpha.AllocationPolicy.P" - + "rovisioningModel\022N\n\014accelerators\030\005 \003(\01328" - + ".google.cloud.batch.v1alpha.AllocationPo" - + "licy.Accelerator\022D\n\tboot_disk\030\010 \001(\01321.go" - + "ogle.cloud.batch.v1alpha.AllocationPolic" - + "y.Disk\022H\n\005disks\030\006 \003(\01329.google.cloud.bat" - + "ch.v1alpha.AllocationPolicy.AttachedDisk" - + "\022\023\n\013reservation\030\007 \001(\t\032\266\001\n\030InstancePolicy" - + "OrTemplate\022M\n\006policy\030\001 \001(\0132;.google.clou" - + "d.batch.v1alpha.AllocationPolicy.Instanc" - + "ePolicyH\000\022\033\n\021instance_template\030\002 \001(\tH\000\022\033" - + "\n\023install_gpu_drivers\030\003 \001(\010B\021\n\017policy_te" - + "mplate\032W\n\020NetworkInterface\022\017\n\007network\030\001 " - + "\001(\t\022\022\n\nsubnetwork\030\002 \001(\t\022\036\n\026no_external_i" - + "p_address\030\003 \001(\010\032j\n\rNetworkPolicy\022Y\n\022netw" - + "ork_interfaces\030\001 \003(\0132=.google.cloud.batc" - + "h.v1alpha.AllocationPolicy.NetworkInterf" - + "ace\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value" - + "\030\002 \001(\t:\0028\001\"`\n\021ProvisioningModel\022\"\n\036PROVI" - + "SIONING_MODEL_UNSPECIFIED\020\000\022\014\n\010STANDARD\020" - + "\001\022\010\n\004SPOT\020\002\022\017\n\013PREEMPTIBLE\020\003\"\351\005\n\tTaskGro" - + "up\022\021\n\004name\030\001 \001(\tB\003\340A\003\022<\n\ttask_spec\030\003 \001(\013" - + "2$.google.cloud.batch.v1alpha.TaskSpecB\003" - + "\340A\002\022\022\n\ntask_count\030\004 \001(\003\022\023\n\013parallelism\030\005" - + " \001(\003\022Q\n\021scheduling_policy\030\006 \001(\01626.google" - + ".cloud.batch.v1alpha.TaskGroup.Schedulin" - + "gPolicy\022G\n\021allocation_policy\030\007 \001(\0132,.goo" - + "gle.cloud.batch.v1alpha.AllocationPolicy" - + "\022A\n\006labels\030\010 \003(\01321.google.cloud.batch.v1" - + "alpha.TaskGroup.LabelsEntry\022B\n\021task_envi" - + "ronments\030\t \003(\0132\'.google.cloud.batch.v1al" - + "pha.Environment\022\033\n\023task_count_per_node\030\n" - + " \001(\003\022\032\n\022require_hosts_file\030\013 \001(\010\022\026\n\016perm" - + "issive_ssh\030\014 \001(\010\032-\n\013LabelsEntry\022\013\n\003key\030\001" - + " \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"N\n\020SchedulingPol" - + "icy\022!\n\035SCHEDULING_POLICY_UNSPECIFIED\020\000\022\027" - + "\n\023AS_SOON_AS_POSSIBLE\020\001:o\352Al\n\036batch.goog" - + "leapis.com/TaskGroup\022Jprojects/{project}" - + "/locations/{location}/jobs/{job}/taskGro" - + "ups/{task_group}\"/\n\016ServiceAccount\022\r\n\005em" - + "ail\030\001 \001(\t\022\016\n\006scopes\030\002 \003(\tB\302\001\n\036com.google" - + ".cloud.batch.v1alphaB\010JobProtoP\001Z4cloud." - + "google.com/go/batch/apiv1alpha/batchpb;b" - + "atchpb\242\002\003GCB\252\002\032Google.Cloud.Batch.V1Alph" - + "a\312\002\032Google\\Cloud\\Batch\\V1alpha\352\002\035Google:" - + ":Cloud::Batch::V1alphab\006proto3" + + "licy.Disk\032\334\001\n\017TaskGroupStatus\022Q\n\006counts\030" + + "\001 \003(\0132A.google.cloud.batch.v1alpha.JobSt" + + "atus.TaskGroupStatus.CountsEntry\022G\n\tinst" + + "ances\030\002 \003(\01324.google.cloud.batch.v1alpha" + + ".JobStatus.InstanceStatus\032-\n\013CountsEntry" + + "\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\003:\0028\001\032h\n\017Task" + + "GroupsEntry\022\013\n\003key\030\001 \001(\t\022D\n\005value\030\002 \001(\0132" + + "5.google.cloud.batch.v1alpha.JobStatus.T" + + "askGroupStatus:\0028\001\"{\n\005State\022\025\n\021STATE_UNS" + + "PECIFIED\020\000\022\n\n\006QUEUED\020\001\022\r\n\tSCHEDULED\020\002\022\013\n" + + "\007RUNNING\020\003\022\r\n\tSUCCEEDED\020\004\022\n\n\006FAILED\020\005\022\030\n" + + "\024DELETION_IN_PROGRESS\020\006\"\220\003\n\017JobNotificat" + + "ion\022\024\n\014pubsub_topic\030\001 \001(\t\022D\n\007message\030\002 \001" + + "(\01323.google.cloud.batch.v1alpha.JobNotif" + + "ication.Message\032\323\001\n\007Message\022>\n\004type\030\001 \001(" + + "\01620.google.cloud.batch.v1alpha.JobNotifi" + + "cation.Type\022B\n\rnew_job_state\030\002 \001(\0162+.goo" + + "gle.cloud.batch.v1alpha.JobStatus.State\022" + + "D\n\016new_task_state\030\003 \001(\0162,.google.cloud.b" + + "atch.v1alpha.TaskStatus.State\"K\n\004Type\022\024\n" + + "\020TYPE_UNSPECIFIED\020\000\022\025\n\021JOB_STATE_CHANGED" + + "\020\001\022\026\n\022TASK_STATE_CHANGED\020\002\"\355\017\n\020Allocatio" + + "nPolicy\022M\n\010location\030\001 \001(\0132;.google.cloud" + + ".batch.v1alpha.AllocationPolicy.Location" + + "Policy\022Q\n\010instance\030\002 \001(\0132;.google.cloud." + + "batch.v1alpha.AllocationPolicy.InstanceP" + + "olicyB\002\030\001\022X\n\tinstances\030\010 \003(\0132E.google.cl" + + "oud.batch.v1alpha.AllocationPolicy.Insta" + + "ncePolicyOrTemplate\022\036\n\022instance_template" + + "s\030\003 \003(\tB\002\030\001\022_\n\023provisioning_models\030\004 \003(\016" + + "2>.google.cloud.batch.v1alpha.Allocation" + + "Policy.ProvisioningModelB\002\030\001\022!\n\025service_" + + "account_email\030\005 \001(\tB\002\030\001\022C\n\017service_accou" + + "nt\030\t \001(\0132*.google.cloud.batch.v1alpha.Se" + + "rviceAccount\022H\n\006labels\030\006 \003(\01328.google.cl" + + "oud.batch.v1alpha.AllocationPolicy.Label" + + "sEntry\022K\n\007network\030\007 \001(\0132:.google.cloud.b" + + "atch.v1alpha.AllocationPolicy.NetworkPol" + + "icy\032E\n\016LocationPolicy\022\031\n\021allowed_locatio" + + "ns\030\001 \003(\t\022\030\n\020denied_locations\030\002 \003(\t\032q\n\004Di" + + "sk\022\017\n\005image\030\004 \001(\tH\000\022\022\n\010snapshot\030\005 \001(\tH\000\022" + + "\014\n\004type\030\001 \001(\t\022\017\n\007size_gb\030\002 \001(\003\022\026\n\016disk_i" + + "nterface\030\006 \001(\tB\r\n\013data_source\032\217\001\n\014Attach" + + "edDisk\022E\n\010new_disk\030\001 \001(\01321.google.cloud." + + "batch.v1alpha.AllocationPolicy.DiskH\000\022\027\n" + + "\rexisting_disk\030\002 \001(\tH\000\022\023\n\013device_name\030\003 " + + "\001(\tB\n\n\010attached\032K\n\013Accelerator\022\014\n\004type\030\001" + + " \001(\t\022\r\n\005count\030\002 \001(\003\022\037\n\023install_gpu_drive" + + "rs\030\003 \001(\010B\002\030\001\032\264\003\n\016InstancePolicy\022!\n\025allow" + + "ed_machine_types\030\001 \003(\tB\002\030\001\022\024\n\014machine_ty" + + "pe\030\002 \001(\t\022\030\n\020min_cpu_platform\030\003 \001(\t\022Z\n\022pr" + + "ovisioning_model\030\004 \001(\0162>.google.cloud.ba" + + "tch.v1alpha.AllocationPolicy.Provisionin" + + "gModel\022N\n\014accelerators\030\005 \003(\01328.google.cl" + + "oud.batch.v1alpha.AllocationPolicy.Accel" + + "erator\022D\n\tboot_disk\030\010 \001(\01321.google.cloud" + + ".batch.v1alpha.AllocationPolicy.Disk\022H\n\005" + + "disks\030\006 \003(\01329.google.cloud.batch.v1alpha" + + ".AllocationPolicy.AttachedDisk\022\023\n\013reserv" + + "ation\030\007 \001(\t\032\266\001\n\030InstancePolicyOrTemplate" + + "\022M\n\006policy\030\001 \001(\0132;.google.cloud.batch.v1" + + "alpha.AllocationPolicy.InstancePolicyH\000\022" + + "\033\n\021instance_template\030\002 \001(\tH\000\022\033\n\023install_" + + "gpu_drivers\030\003 \001(\010B\021\n\017policy_template\032W\n\020" + + "NetworkInterface\022\017\n\007network\030\001 \001(\t\022\022\n\nsub" + + "network\030\002 \001(\t\022\036\n\026no_external_ip_address\030" + + "\003 \001(\010\032j\n\rNetworkPolicy\022Y\n\022network_interf" + + "aces\030\001 \003(\0132=.google.cloud.batch.v1alpha." + + "AllocationPolicy.NetworkInterface\032-\n\013Lab" + + "elsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001" + + "\"`\n\021ProvisioningModel\022\"\n\036PROVISIONING_MO" + + "DEL_UNSPECIFIED\020\000\022\014\n\010STANDARD\020\001\022\010\n\004SPOT\020" + + "\002\022\017\n\013PREEMPTIBLE\020\003\"\351\005\n\tTaskGroup\022\021\n\004name" + + "\030\001 \001(\tB\003\340A\003\022<\n\ttask_spec\030\003 \001(\0132$.google." + + "cloud.batch.v1alpha.TaskSpecB\003\340A\002\022\022\n\ntas" + + "k_count\030\004 \001(\003\022\023\n\013parallelism\030\005 \001(\003\022Q\n\021sc" + + "heduling_policy\030\006 \001(\01626.google.cloud.bat" + + "ch.v1alpha.TaskGroup.SchedulingPolicy\022G\n" + + "\021allocation_policy\030\007 \001(\0132,.google.cloud." + + "batch.v1alpha.AllocationPolicy\022A\n\006labels" + + "\030\010 \003(\01321.google.cloud.batch.v1alpha.Task" + + "Group.LabelsEntry\022B\n\021task_environments\030\t" + + " \003(\0132\'.google.cloud.batch.v1alpha.Enviro" + + "nment\022\033\n\023task_count_per_node\030\n \001(\003\022\032\n\022re" + + "quire_hosts_file\030\013 \001(\010\022\026\n\016permissive_ssh" + + "\030\014 \001(\010\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005va" + + "lue\030\002 \001(\t:\0028\001\"N\n\020SchedulingPolicy\022!\n\035SCH" + + "EDULING_POLICY_UNSPECIFIED\020\000\022\027\n\023AS_SOON_" + + "AS_POSSIBLE\020\001:o\352Al\n\036batch.googleapis.com" + + "/TaskGroup\022Jprojects/{project}/locations" + + "/{location}/jobs/{job}/taskGroups/{task_" + + "group}\"/\n\016ServiceAccount\022\r\n\005email\030\001 \001(\t\022" + + "\016\n\006scopes\030\002 \003(\tB\302\001\n\036com.google.cloud.bat" + + "ch.v1alphaB\010JobProtoP\001Z4cloud.google.com" + + "/go/batch/apiv1alpha/batchpb;batchpb\242\002\003G" + + "CB\252\002\032Google.Cloud.Batch.V1Alpha\312\002\032Google" + + "\\Cloud\\Batch\\V1alpha\352\002\035Google::Cloud::Ba" + + "tch::V1alphab\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( @@ -363,7 +365,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_cloud_batch_v1alpha_JobStatus_InstanceStatus_descriptor, new java.lang.String[] { - "MachineType", "ProvisioningModel", "TaskPack", + "MachineType", "ProvisioningModel", "TaskPack", "BootDisk", }); internal_static_google_cloud_batch_v1alpha_JobStatus_TaskGroupStatus_descriptor = internal_static_google_cloud_batch_v1alpha_JobStatus_descriptor.getNestedTypes().get(1); diff --git a/java-batch/proto-google-cloud-batch-v1alpha/src/main/java/com/google/cloud/batch/v1alpha/JobStatus.java b/java-batch/proto-google-cloud-batch-v1alpha/src/main/java/com/google/cloud/batch/v1alpha/JobStatus.java index 0274955ccffc..86a3260da1d4 100644 --- a/java-batch/proto-google-cloud-batch-v1alpha/src/main/java/com/google/cloud/batch/v1alpha/JobStatus.java +++ b/java-batch/proto-google-cloud-batch-v1alpha/src/main/java/com/google/cloud/batch/v1alpha/JobStatus.java @@ -385,6 +385,41 @@ public interface InstanceStatusOrBuilder * @return The taskPack. */ long getTaskPack(); + + /** + * + * + * 
+     * The VM boot disk.
+     *
+ * + * .google.cloud.batch.v1alpha.AllocationPolicy.Disk boot_disk = 4; + * + * @return Whether the bootDisk field is set. + */ + boolean hasBootDisk(); + /** + * + * + * 
+     * The VM boot disk.
+     *
+ * + * .google.cloud.batch.v1alpha.AllocationPolicy.Disk boot_disk = 4; + * + * @return The bootDisk. + */ + com.google.cloud.batch.v1alpha.AllocationPolicy.Disk getBootDisk(); + /** + * + * + * 
+     * The VM boot disk.
+     *
+ * + * .google.cloud.batch.v1alpha.AllocationPolicy.Disk boot_disk = 4; + */ + com.google.cloud.batch.v1alpha.AllocationPolicy.DiskOrBuilder getBootDiskOrBuilder(); } /** * @@ -546,6 +581,56 @@ public long getTaskPack() { return taskPack_; } + public static final int BOOT_DISK_FIELD_NUMBER = 4; + private com.google.cloud.batch.v1alpha.AllocationPolicy.Disk bootDisk_; + /** + * + * + * 
+     * The VM boot disk.
+     *
+ * + * .google.cloud.batch.v1alpha.AllocationPolicy.Disk boot_disk = 4; + * + * @return Whether the bootDisk field is set. + */ + @java.lang.Override + public boolean hasBootDisk() { + return bootDisk_ != null; + } + /** + * + * + * 
+     * The VM boot disk.
+     *
+ * + * .google.cloud.batch.v1alpha.AllocationPolicy.Disk boot_disk = 4; + * + * @return The bootDisk. + */ + @java.lang.Override + public com.google.cloud.batch.v1alpha.AllocationPolicy.Disk getBootDisk() { + return bootDisk_ == null + ? com.google.cloud.batch.v1alpha.AllocationPolicy.Disk.getDefaultInstance() + : bootDisk_; + } + /** + * + * + * 
+     * The VM boot disk.
+     *
+ * + * .google.cloud.batch.v1alpha.AllocationPolicy.Disk boot_disk = 4; + */ + @java.lang.Override + public com.google.cloud.batch.v1alpha.AllocationPolicy.DiskOrBuilder getBootDiskOrBuilder() { + return bootDisk_ == null + ? com.google.cloud.batch.v1alpha.AllocationPolicy.Disk.getDefaultInstance() + : bootDisk_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override @@ -572,6 +657,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (taskPack_ != 0L) { output.writeInt64(3, taskPack_); } + if (bootDisk_ != null) { + output.writeMessage(4, getBootDisk()); + } getUnknownFields().writeTo(output); } @@ -593,6 +681,9 @@ public int getSerializedSize() { if (taskPack_ != 0L) { size += com.google.protobuf.CodedOutputStream.computeInt64Size(3, taskPack_); } + if (bootDisk_ != null) { + size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getBootDisk()); + } size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; @@ -612,6 +703,10 @@ public boolean equals(final java.lang.Object obj) { if (!getMachineType().equals(other.getMachineType())) return false; if (provisioningModel_ != other.provisioningModel_) return false; if (getTaskPack() != other.getTaskPack()) return false; + if (hasBootDisk() != other.hasBootDisk()) return false; + if (hasBootDisk()) { + if (!getBootDisk().equals(other.getBootDisk())) return false; + } if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -629,6 +724,10 @@ public int hashCode() { hash = (53 * hash) + provisioningModel_; hash = (37 * hash) + TASK_PACK_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getTaskPack()); + if (hasBootDisk()) { + hash = (37 * hash) + BOOT_DISK_FIELD_NUMBER; + hash = (53 * hash) + getBootDisk().hashCode(); + } hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; @@ -774,6 +873,11 @@ public Builder clear() { machineType_ = ""; provisioningModel_ = 0; taskPack_ = 0L; + bootDisk_ = null; + if (bootDiskBuilder_ != null) { + bootDiskBuilder_.dispose(); + bootDiskBuilder_ = null; + } return this; } @@ -819,6 +923,9 @@ private void buildPartial0(com.google.cloud.batch.v1alpha.JobStatus.InstanceStat if (((from_bitField0_ & 0x00000004) != 0)) { result.taskPack_ = taskPack_; } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.bootDisk_ = bootDiskBuilder_ == null ? bootDisk_ : bootDiskBuilder_.build(); + } } @java.lang.Override @@ -880,6 +987,9 @@ public Builder mergeFrom(com.google.cloud.batch.v1alpha.JobStatus.InstanceStatus if (other.getTaskPack() != 0L) { setTaskPack(other.getTaskPack()); } + if (other.hasBootDisk()) { + mergeBootDisk(other.getBootDisk()); + } this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; @@ -924,6 +1034,12 @@ public Builder mergeFrom( bitField0_ |= 0x00000004; break; } // case 24 + case 34: + { + input.readMessage(getBootDiskFieldBuilder().getBuilder(), extensionRegistry); + bitField0_ |= 0x00000008; + break; + } // case 34 default: { if (!super.parseUnknownField(input, extensionRegistry, tag)) { @@ -1207,6 +1323,191 @@ public Builder clearTaskPack() { return this; } + private com.google.cloud.batch.v1alpha.AllocationPolicy.Disk bootDisk_; + private com.google.protobuf.SingleFieldBuilderV3< + com.google.cloud.batch.v1alpha.AllocationPolicy.Disk, + com.google.cloud.batch.v1alpha.AllocationPolicy.Disk.Builder, + com.google.cloud.batch.v1alpha.AllocationPolicy.DiskOrBuilder> + bootDiskBuilder_; + /** + * + * + * 
+       * The VM boot disk.
+       *
+ * + * .google.cloud.batch.v1alpha.AllocationPolicy.Disk boot_disk = 4; + * + * @return Whether the bootDisk field is set. + */ + public boolean hasBootDisk() { + return ((bitField0_ & 0x00000008) != 0); + } + /** + * + * + * 
+       * The VM boot disk.
+       *
+ * + * .google.cloud.batch.v1alpha.AllocationPolicy.Disk boot_disk = 4; + * + * @return The bootDisk. + */ + public com.google.cloud.batch.v1alpha.AllocationPolicy.Disk getBootDisk() { + if (bootDiskBuilder_ == null) { + return bootDisk_ == null + ? com.google.cloud.batch.v1alpha.AllocationPolicy.Disk.getDefaultInstance() + : bootDisk_; + } else { + return bootDiskBuilder_.getMessage(); + } + } + /** + * + * + * 
+       * The VM boot disk.
+       *
+ * + * .google.cloud.batch.v1alpha.AllocationPolicy.Disk boot_disk = 4; + */ + public Builder setBootDisk(com.google.cloud.batch.v1alpha.AllocationPolicy.Disk value) { + if (bootDiskBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + bootDisk_ = value; + } else { + bootDiskBuilder_.setMessage(value); + } + bitField0_ |= 0x00000008; + onChanged(); + return this; + } + /** + * + * + * 
+       * The VM boot disk.
+       *
+ * + * .google.cloud.batch.v1alpha.AllocationPolicy.Disk boot_disk = 4; + */ + public Builder setBootDisk( + com.google.cloud.batch.v1alpha.AllocationPolicy.Disk.Builder builderForValue) { + if (bootDiskBuilder_ == null) { + bootDisk_ = builderForValue.build(); + } else { + bootDiskBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000008; + onChanged(); + return this; + } + /** + * + * + * 
+       * The VM boot disk.
+       *
+ * + * .google.cloud.batch.v1alpha.AllocationPolicy.Disk boot_disk = 4; + */ + public Builder mergeBootDisk(com.google.cloud.batch.v1alpha.AllocationPolicy.Disk value) { + if (bootDiskBuilder_ == null) { + if (((bitField0_ & 0x00000008) != 0) + && bootDisk_ != null + && bootDisk_ + != com.google.cloud.batch.v1alpha.AllocationPolicy.Disk.getDefaultInstance()) { + getBootDiskBuilder().mergeFrom(value); + } else { + bootDisk_ = value; + } + } else { + bootDiskBuilder_.mergeFrom(value); + } + bitField0_ |= 0x00000008; + onChanged(); + return this; + } + /** + * + * + * 
+       * The VM boot disk.
+       *
+ * + * .google.cloud.batch.v1alpha.AllocationPolicy.Disk boot_disk = 4; + */ + public Builder clearBootDisk() { + bitField0_ = (bitField0_ & ~0x00000008); + bootDisk_ = null; + if (bootDiskBuilder_ != null) { + bootDiskBuilder_.dispose(); + bootDiskBuilder_ = null; + } + onChanged(); + return this; + } + /** + * + * + * 
+       * The VM boot disk.
+       *
+ * + * .google.cloud.batch.v1alpha.AllocationPolicy.Disk boot_disk = 4; + */ + public com.google.cloud.batch.v1alpha.AllocationPolicy.Disk.Builder getBootDiskBuilder() { + bitField0_ |= 0x00000008; + onChanged(); + return getBootDiskFieldBuilder().getBuilder(); + } + /** + * + * + * 
+       * The VM boot disk.
+       *
+ * + * .google.cloud.batch.v1alpha.AllocationPolicy.Disk boot_disk = 4; + */ + public com.google.cloud.batch.v1alpha.AllocationPolicy.DiskOrBuilder getBootDiskOrBuilder() { + if (bootDiskBuilder_ != null) { + return bootDiskBuilder_.getMessageOrBuilder(); + } else { + return bootDisk_ == null + ? com.google.cloud.batch.v1alpha.AllocationPolicy.Disk.getDefaultInstance() + : bootDisk_; + } + } + /** + * + * + * 
+       * The VM boot disk.
+       *
+ * + * .google.cloud.batch.v1alpha.AllocationPolicy.Disk boot_disk = 4; + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.cloud.batch.v1alpha.AllocationPolicy.Disk, + com.google.cloud.batch.v1alpha.AllocationPolicy.Disk.Builder, + com.google.cloud.batch.v1alpha.AllocationPolicy.DiskOrBuilder> + getBootDiskFieldBuilder() { + if (bootDiskBuilder_ == null) { + bootDiskBuilder_ = + new com.google.protobuf.SingleFieldBuilderV3< + com.google.cloud.batch.v1alpha.AllocationPolicy.Disk, + com.google.cloud.batch.v1alpha.AllocationPolicy.Disk.Builder, + com.google.cloud.batch.v1alpha.AllocationPolicy.DiskOrBuilder>( + getBootDisk(), getParentForChildren(), isClean()); + bootDisk_ = null; + } + return bootDiskBuilder_; + } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { diff --git a/java-batch/proto-google-cloud-batch-v1alpha/src/main/proto/google/cloud/batch/v1alpha/batch.proto b/java-batch/proto-google-cloud-batch-v1alpha/src/main/proto/google/cloud/batch/v1alpha/batch.proto index 3897c112ac81..c92e60e18d9e 100644 --- a/java-batch/proto-google-cloud-batch-v1alpha/src/main/proto/google/cloud/batch/v1alpha/batch.proto +++ b/java-batch/proto-google-cloud-batch-v1alpha/src/main/proto/google/cloud/batch/v1alpha/batch.proto @@ -16,8 +16,6 @@ syntax = "proto3"; package google.cloud.batch.v1alpha; -import public "google/protobuf/empty.proto"; - import "google/api/annotations.proto"; import "google/api/client.proto"; import "google/api/field_behavior.proto"; diff --git a/java-batch/proto-google-cloud-batch-v1alpha/src/main/proto/google/cloud/batch/v1alpha/job.proto b/java-batch/proto-google-cloud-batch-v1alpha/src/main/proto/google/cloud/batch/v1alpha/job.proto index 5fe0b1c76503..d8fc803e8525 100644 --- a/java-batch/proto-google-cloud-batch-v1alpha/src/main/proto/google/cloud/batch/v1alpha/job.proto +++ b/java-batch/proto-google-cloud-batch-v1alpha/src/main/proto/google/cloud/batch/v1alpha/job.proto @@ -173,6 +173,9 @@ message JobStatus { // The max number of tasks can be assigned to this instance type. int64 task_pack = 3; + + // The VM boot disk. + AllocationPolicy.Disk boot_disk = 4; } // Aggregated task status for a TaskGroup. @@ -298,20 +301,37 @@ message AllocationPolicy { // A data source from which a PD will be created. oneof data_source { // Name of a public or custom image used as the data source. + // For example, the following are all valid URLs: + // (1) Specify the image by its family name: + // projects/{project}/global/images/family/{image_family} + // (2) Specify the image version: + // projects/{project}/global/images/{image_version} + // You can also use Batch customized image in short names. + // The following image values are supported for a boot disk: + // "batch-debian": use Batch Debian images. + // "batch-centos": use Batch CentOS images. + // "batch-cos": use Batch Container-Optimized images. string image = 4; // Name of a snapshot used as the data source. string snapshot = 5; } - // Disk type as shown in `gcloud compute disk-types list` - // For example, "pd-ssd", "pd-standard", "pd-balanced", "local-ssd". + // Disk type as shown in `gcloud compute disk-types list`. + // For example, local SSD uses type "local-ssd". + // Persistent disks and boot disks use "pd-balanced", "pd-extreme", "pd-ssd" + // or "pd-standard". string type = 1; // Disk size in GB. - // This field is ignored if `data_source` is `disk` or `image`. - // If `type` is `local-ssd`, size_gb should be a multiple of 375GB, + // For persistent disk, this field is ignored if `data_source` is `image` or + // `snapshot`. + // For local SSD, size_gb should be a multiple of 375GB, // otherwise, the final size will be the next greater multiple of 375 GB. + // For boot disk, Batch will calculate the boot disk size based on source + // image and task requirements if you do not speicify the size. + // If both this field and the boot_disk_mib field in task spec's + // compute_resource are defined, Batch will only honor this field. int64 size_gb = 2; // Local SSDs are available through both "SCSI" and "NVMe" interfaces.