From 934c92940ec76f96aa71b13249a81cde58bab5ee Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 17 Oct 2023 14:55:10 -0400 Subject: [PATCH] feat: [batch] expose display_name to batch v1 API (#9967) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: expose display_name to batch v1 API PiperOrigin-RevId: 573914933 Source-Link: https://github.com/googleapis/googleapis/commit/ab87375e21aa0bfd996ed50c3e197d8e76406e15 Source-Link: https://github.com/googleapis/googleapis-gen/commit/0eabaacbf7ffa1de6a8518c904acc3a1c3bc75be Copy-Tag: eyJwIjoiamF2YS1iYXRjaC8uT3dsQm90LnlhbWwiLCJoIjoiMGVhYmFhY2JmN2ZmYTFkZTZhODUxOGM5MDRhY2MzYTFjM2JjNzViZSJ9 * 🦉 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 | 4 +- .../com/google/cloud/batch/v1/Runnable.java | 280 +++++++++++++++--- .../cloud/batch/v1/RunnableOrBuilder.java | 31 ++ .../com/google/cloud/batch/v1/TaskProto.java | 111 +++---- .../proto/google/cloud/batch/v1/task.proto | 6 + 5 files changed, 338 insertions(+), 94 deletions(-) diff --git a/java-batch/README.md b/java-batch/README.md index 1d7f4129894e..de83a621f4aa 100644 --- a/java-batch/README.md +++ b/java-batch/README.md @@ -23,7 +23,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file: com.google.cloud libraries-bom - 26.24.0 + 26.25.0 pom import @@ -201,7 +201,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/google-cloud-java/java11.html [stability-image]: https://img.shields.io/badge/stability-preview-yellow [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-batch.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-batch/0.27.0 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-batch/0.28.0 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles diff --git a/java-batch/proto-google-cloud-batch-v1/src/main/java/com/google/cloud/batch/v1/Runnable.java b/java-batch/proto-google-cloud-batch-v1/src/main/java/com/google/cloud/batch/v1/Runnable.java index a7c436e033dd..5db4776de1af 100644 --- a/java-batch/proto-google-cloud-batch-v1/src/main/java/com/google/cloud/batch/v1/Runnable.java +++ b/java-batch/proto-google-cloud-batch-v1/src/main/java/com/google/cloud/batch/v1/Runnable.java @@ -38,7 +38,9 @@ private Runnable(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private Runnable() {} + private Runnable() { + displayName_ = ""; + } @java.lang.Override @SuppressWarnings({"unused"}) @@ -4644,6 +4646,63 @@ public com.google.cloud.batch.v1.Runnable.BarrierOrBuilder getBarrierOrBuilder() return com.google.cloud.batch.v1.Runnable.Barrier.getDefaultInstance(); } + public static final int DISPLAY_NAME_FIELD_NUMBER = 10; + + @SuppressWarnings("serial") + private volatile java.lang.Object displayName_ = ""; + /** + * + * + * 
+   * Optional. DisplayName is an optional field that can be provided by the
+   * caller. If provided, it will be used in logs and other outputs to identify
+   * the script, making it easier for users to understand the logs. If not
+   * provided the index of the runnable will be used for outputs.
+   *
+ * + * string display_name = 10 [(.google.api.field_behavior) = OPTIONAL]; + * + * @return The displayName. + */ + @java.lang.Override + public java.lang.String getDisplayName() { + java.lang.Object ref = displayName_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + displayName_ = s; + return s; + } + } + /** + * + * + * 
+   * Optional. DisplayName is an optional field that can be provided by the
+   * caller. If provided, it will be used in logs and other outputs to identify
+   * the script, making it easier for users to understand the logs. If not
+   * provided the index of the runnable will be used for outputs.
+   *
+ * + * string display_name = 10 [(.google.api.field_behavior) = OPTIONAL]; + * + * @return The bytes for displayName. + */ + @java.lang.Override + public com.google.protobuf.ByteString getDisplayNameBytes() { + java.lang.Object ref = displayName_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + displayName_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + public static final int IGNORE_EXIT_STATUS_FIELD_NUMBER = 3; private boolean ignoreExitStatus_ = false; /** @@ -4949,6 +5008,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io } com.google.protobuf.GeneratedMessageV3.serializeStringMapTo( output, internalGetLabels(), LabelsDefaultEntryHolder.defaultEntry, 9); + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(displayName_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 10, displayName_); + } getUnknownFields().writeTo(output); } @@ -4998,6 +5060,9 @@ public int getSerializedSize() { .build(); size += com.google.protobuf.CodedOutputStream.computeMessageSize(9, labels__); } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(displayName_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(10, displayName_); + } size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; @@ -5013,6 +5078,7 @@ public boolean equals(final java.lang.Object obj) { } com.google.cloud.batch.v1.Runnable other = (com.google.cloud.batch.v1.Runnable) obj; + if (!getDisplayName().equals(other.getDisplayName())) return false; if (getIgnoreExitStatus() != other.getIgnoreExitStatus()) return false; if (getBackground() != other.getBackground()) return false; if (getAlwaysRun() != other.getAlwaysRun()) return false; @@ -5050,6 +5116,8 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + DISPLAY_NAME_FIELD_NUMBER; + hash = (53 * hash) + getDisplayName().hashCode(); hash = (37 * hash) + IGNORE_EXIT_STATUS_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getIgnoreExitStatus()); hash = (37 * hash) + BACKGROUND_FIELD_NUMBER; @@ -5252,6 +5320,7 @@ public Builder clear() { if (barrierBuilder_ != null) { barrierBuilder_.clear(); } + displayName_ = ""; ignoreExitStatus_ = false; background_ = false; alwaysRun_ = false; @@ -5305,22 +5374,25 @@ public com.google.cloud.batch.v1.Runnable buildPartial() { private void buildPartial0(com.google.cloud.batch.v1.Runnable result) { int from_bitField0_ = bitField0_; if (((from_bitField0_ & 0x00000008) != 0)) { - result.ignoreExitStatus_ = ignoreExitStatus_; + result.displayName_ = displayName_; } if (((from_bitField0_ & 0x00000010) != 0)) { - result.background_ = background_; + result.ignoreExitStatus_ = ignoreExitStatus_; } if (((from_bitField0_ & 0x00000020) != 0)) { - result.alwaysRun_ = alwaysRun_; + result.background_ = background_; } if (((from_bitField0_ & 0x00000040) != 0)) { + result.alwaysRun_ = alwaysRun_; + } + if (((from_bitField0_ & 0x00000080) != 0)) { result.environment_ = environmentBuilder_ == null ? environment_ : environmentBuilder_.build(); } - if (((from_bitField0_ & 0x00000080) != 0)) { + if (((from_bitField0_ & 0x00000100) != 0)) { result.timeout_ = timeoutBuilder_ == null ? timeout_ : timeoutBuilder_.build(); } - if (((from_bitField0_ & 0x00000100) != 0)) { + if (((from_bitField0_ & 0x00000200) != 0)) { result.labels_ = internalGetLabels(); result.labels_.makeImmutable(); } @@ -5385,6 +5457,11 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(com.google.cloud.batch.v1.Runnable other) { if (other == com.google.cloud.batch.v1.Runnable.getDefaultInstance()) return this; + if (!other.getDisplayName().isEmpty()) { + displayName_ = other.displayName_; + bitField0_ |= 0x00000008; + onChanged(); + } if (other.getIgnoreExitStatus() != false) { setIgnoreExitStatus(other.getIgnoreExitStatus()); } @@ -5401,7 +5478,7 @@ public Builder mergeFrom(com.google.cloud.batch.v1.Runnable other) { mergeTimeout(other.getTimeout()); } internalGetMutableLabels().mergeFrom(other.internalGetLabels()); - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; switch (other.getExecutableCase()) { case CONTAINER: { @@ -5464,19 +5541,19 @@ public Builder mergeFrom( case 24: { ignoreExitStatus_ = input.readBool(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; break; } // case 24 case 32: { background_ = input.readBool(); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; break; } // case 32 case 40: { alwaysRun_ = input.readBool(); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000040; break; } // case 40 case 50: @@ -5488,13 +5565,13 @@ public Builder mergeFrom( case 58: { input.readMessage(getEnvironmentFieldBuilder().getBuilder(), extensionRegistry); - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; break; } // case 58 case 66: { input.readMessage(getTimeoutFieldBuilder().getBuilder(), extensionRegistry); - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000100; break; } // case 66 case 74: @@ -5506,9 +5583,15 @@ public Builder mergeFrom( internalGetMutableLabels() .getMutableMap() .put(labels__.getKey(), labels__.getValue()); - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; break; } // case 74 + case 82: + { + displayName_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000008; + break; + } // case 82 default: { if (!super.parseUnknownField(input, extensionRegistry, tag)) { @@ -6167,6 +6250,127 @@ public com.google.cloud.batch.v1.Runnable.BarrierOrBuilder getBarrierOrBuilder() return barrierBuilder_; } + private java.lang.Object displayName_ = ""; + /** + * + * + * 
+     * Optional. DisplayName is an optional field that can be provided by the
+     * caller. If provided, it will be used in logs and other outputs to identify
+     * the script, making it easier for users to understand the logs. If not
+     * provided the index of the runnable will be used for outputs.
+     *
+ * + * string display_name = 10 [(.google.api.field_behavior) = OPTIONAL]; + * + * @return The displayName. + */ + public java.lang.String getDisplayName() { + java.lang.Object ref = displayName_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + displayName_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * + * + * 
+     * Optional. DisplayName is an optional field that can be provided by the
+     * caller. If provided, it will be used in logs and other outputs to identify
+     * the script, making it easier for users to understand the logs. If not
+     * provided the index of the runnable will be used for outputs.
+     *
+ * + * string display_name = 10 [(.google.api.field_behavior) = OPTIONAL]; + * + * @return The bytes for displayName. + */ + public com.google.protobuf.ByteString getDisplayNameBytes() { + java.lang.Object ref = displayName_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + displayName_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * + * + * 
+     * Optional. DisplayName is an optional field that can be provided by the
+     * caller. If provided, it will be used in logs and other outputs to identify
+     * the script, making it easier for users to understand the logs. If not
+     * provided the index of the runnable will be used for outputs.
+     *
+ * + * string display_name = 10 [(.google.api.field_behavior) = OPTIONAL]; + * + * @param value The displayName to set. + * @return This builder for chaining. + */ + public Builder setDisplayName(java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + displayName_ = value; + bitField0_ |= 0x00000008; + onChanged(); + return this; + } + /** + * + * + * 
+     * Optional. DisplayName is an optional field that can be provided by the
+     * caller. If provided, it will be used in logs and other outputs to identify
+     * the script, making it easier for users to understand the logs. If not
+     * provided the index of the runnable will be used for outputs.
+     *
+ * + * string display_name = 10 [(.google.api.field_behavior) = OPTIONAL]; + * + * @return This builder for chaining. + */ + public Builder clearDisplayName() { + displayName_ = getDefaultInstance().getDisplayName(); + bitField0_ = (bitField0_ & ~0x00000008); + onChanged(); + return this; + } + /** + * + * + * 
+     * Optional. DisplayName is an optional field that can be provided by the
+     * caller. If provided, it will be used in logs and other outputs to identify
+     * the script, making it easier for users to understand the logs. If not
+     * provided the index of the runnable will be used for outputs.
+     *
+ * + * string display_name = 10 [(.google.api.field_behavior) = OPTIONAL]; + * + * @param value The bytes for displayName to set. + * @return This builder for chaining. + */ + public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + displayName_ = value; + bitField0_ |= 0x00000008; + onChanged(); + return this; + } + private boolean ignoreExitStatus_; /** * @@ -6200,7 +6404,7 @@ public boolean getIgnoreExitStatus() { public Builder setIgnoreExitStatus(boolean value) { ignoreExitStatus_ = value; - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; onChanged(); return this; } @@ -6217,7 +6421,7 @@ public Builder setIgnoreExitStatus(boolean value) { * @return This builder for chaining. */ public Builder clearIgnoreExitStatus() { - bitField0_ = (bitField0_ & ~0x00000008); + bitField0_ = (bitField0_ & ~0x00000010); ignoreExitStatus_ = false; onChanged(); return this; @@ -6258,7 +6462,7 @@ public boolean getBackground() { public Builder setBackground(boolean value) { background_ = value; - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; onChanged(); return this; } @@ -6276,7 +6480,7 @@ public Builder setBackground(boolean value) { * @return This builder for chaining. */ public Builder clearBackground() { - bitField0_ = (bitField0_ & ~0x00000010); + bitField0_ = (bitField0_ & ~0x00000020); background_ = false; onChanged(); return this; @@ -6327,7 +6531,7 @@ public boolean getAlwaysRun() { public Builder setAlwaysRun(boolean value) { alwaysRun_ = value; - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000040; onChanged(); return this; } @@ -6350,7 +6554,7 @@ public Builder setAlwaysRun(boolean value) { * @return This builder for chaining. */ public Builder clearAlwaysRun() { - bitField0_ = (bitField0_ & ~0x00000020); + bitField0_ = (bitField0_ & ~0x00000040); alwaysRun_ = false; onChanged(); return this; @@ -6375,7 +6579,7 @@ public Builder clearAlwaysRun() { * @return Whether the environment field is set. */ public boolean hasEnvironment() { - return ((bitField0_ & 0x00000040) != 0); + return ((bitField0_ & 0x00000080) != 0); } /** * @@ -6417,7 +6621,7 @@ public Builder setEnvironment(com.google.cloud.batch.v1.Environment value) { } else { environmentBuilder_.setMessage(value); } - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; onChanged(); return this; } @@ -6437,7 +6641,7 @@ public Builder setEnvironment(com.google.cloud.batch.v1.Environment.Builder buil } else { environmentBuilder_.setMessage(builderForValue.build()); } - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; onChanged(); return this; } @@ -6453,7 +6657,7 @@ public Builder setEnvironment(com.google.cloud.batch.v1.Environment.Builder buil */ public Builder mergeEnvironment(com.google.cloud.batch.v1.Environment value) { if (environmentBuilder_ == null) { - if (((bitField0_ & 0x00000040) != 0) + if (((bitField0_ & 0x00000080) != 0) && environment_ != null && environment_ != com.google.cloud.batch.v1.Environment.getDefaultInstance()) { getEnvironmentBuilder().mergeFrom(value); @@ -6463,7 +6667,7 @@ public Builder mergeEnvironment(com.google.cloud.batch.v1.Environment value) { } else { environmentBuilder_.mergeFrom(value); } - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; onChanged(); return this; } @@ -6478,7 +6682,7 @@ public Builder mergeEnvironment(com.google.cloud.batch.v1.Environment value) { * .google.cloud.batch.v1.Environment environment = 7; */ public Builder clearEnvironment() { - bitField0_ = (bitField0_ & ~0x00000040); + bitField0_ = (bitField0_ & ~0x00000080); environment_ = null; if (environmentBuilder_ != null) { environmentBuilder_.dispose(); @@ -6498,7 +6702,7 @@ public Builder clearEnvironment() { * .google.cloud.batch.v1.Environment environment = 7; */ public com.google.cloud.batch.v1.Environment.Builder getEnvironmentBuilder() { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; onChanged(); return getEnvironmentFieldBuilder().getBuilder(); } @@ -6566,7 +6770,7 @@ public com.google.cloud.batch.v1.EnvironmentOrBuilder getEnvironmentOrBuilder() * @return Whether the timeout field is set. */ public boolean hasTimeout() { - return ((bitField0_ & 0x00000080) != 0); + return ((bitField0_ & 0x00000100) != 0); } /** * @@ -6604,7 +6808,7 @@ public Builder setTimeout(com.google.protobuf.Duration value) { } else { timeoutBuilder_.setMessage(value); } - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000100; onChanged(); return this; } @@ -6623,7 +6827,7 @@ public Builder setTimeout(com.google.protobuf.Duration.Builder builderForValue) } else { timeoutBuilder_.setMessage(builderForValue.build()); } - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000100; onChanged(); return this; } @@ -6638,7 +6842,7 @@ public Builder setTimeout(com.google.protobuf.Duration.Builder builderForValue) */ public Builder mergeTimeout(com.google.protobuf.Duration value) { if (timeoutBuilder_ == null) { - if (((bitField0_ & 0x00000080) != 0) + if (((bitField0_ & 0x00000100) != 0) && timeout_ != null && timeout_ != com.google.protobuf.Duration.getDefaultInstance()) { getTimeoutBuilder().mergeFrom(value); @@ -6648,7 +6852,7 @@ public Builder mergeTimeout(com.google.protobuf.Duration value) { } else { timeoutBuilder_.mergeFrom(value); } - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000100; onChanged(); return this; } @@ -6662,7 +6866,7 @@ public Builder mergeTimeout(com.google.protobuf.Duration value) { * .google.protobuf.Duration timeout = 8; */ public Builder clearTimeout() { - bitField0_ = (bitField0_ & ~0x00000080); + bitField0_ = (bitField0_ & ~0x00000100); timeout_ = null; if (timeoutBuilder_ != null) { timeoutBuilder_.dispose(); @@ -6681,7 +6885,7 @@ public Builder clearTimeout() { * .google.protobuf.Duration timeout = 8; */ public com.google.protobuf.Duration.Builder getTimeoutBuilder() { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000100; onChanged(); return getTimeoutFieldBuilder().getBuilder(); } @@ -6744,7 +6948,7 @@ private com.google.protobuf.MapField interna if (!labels_.isMutable()) { labels_ = labels_.copy(); } - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; onChanged(); return labels_; } @@ -6829,7 +7033,7 @@ public java.lang.String getLabelsOrThrow(java.lang.String key) { } public Builder clearLabels() { - bitField0_ = (bitField0_ & ~0x00000100); + bitField0_ = (bitField0_ & ~0x00000200); internalGetMutableLabels().getMutableMap().clear(); return this; } @@ -6852,7 +7056,7 @@ public Builder removeLabels(java.lang.String key) { /** Use alternate mutation accessors instead. */ @java.lang.Deprecated public java.util.Map getMutableLabels() { - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; return internalGetMutableLabels().getMutableMap(); } /** @@ -6872,7 +7076,7 @@ public Builder putLabels(java.lang.String key, java.lang.String value) { throw new NullPointerException("map value"); } internalGetMutableLabels().getMutableMap().put(key, value); - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; return this; } /** @@ -6886,7 +7090,7 @@ public Builder putLabels(java.lang.String key, java.lang.String value) { */ public Builder putAllLabels(java.util.Map values) { internalGetMutableLabels().getMutableMap().putAll(values); - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; return this; } diff --git a/java-batch/proto-google-cloud-batch-v1/src/main/java/com/google/cloud/batch/v1/RunnableOrBuilder.java b/java-batch/proto-google-cloud-batch-v1/src/main/java/com/google/cloud/batch/v1/RunnableOrBuilder.java index 9d177296a7ff..6e13d3d6442d 100644 --- a/java-batch/proto-google-cloud-batch-v1/src/main/java/com/google/cloud/batch/v1/RunnableOrBuilder.java +++ b/java-batch/proto-google-cloud-batch-v1/src/main/java/com/google/cloud/batch/v1/RunnableOrBuilder.java @@ -128,6 +128,37 @@ public interface RunnableOrBuilder */ com.google.cloud.batch.v1.Runnable.BarrierOrBuilder getBarrierOrBuilder(); + /** + * + * + * 
+   * Optional. DisplayName is an optional field that can be provided by the
+   * caller. If provided, it will be used in logs and other outputs to identify
+   * the script, making it easier for users to understand the logs. If not
+   * provided the index of the runnable will be used for outputs.
+   *
+ * + * string display_name = 10 [(.google.api.field_behavior) = OPTIONAL]; + * + * @return The displayName. + */ + java.lang.String getDisplayName(); + /** + * + * + * 
+   * Optional. DisplayName is an optional field that can be provided by the
+   * caller. If provided, it will be used in logs and other outputs to identify
+   * the script, making it easier for users to understand the logs. If not
+   * provided the index of the runnable will be used for outputs.
+   *
+ * + * string display_name = 10 [(.google.api.field_behavior) = OPTIONAL]; + * + * @return The bytes for displayName. + */ + com.google.protobuf.ByteString getDisplayNameBytes(); + /** * * diff --git a/java-batch/proto-google-cloud-batch-v1/src/main/java/com/google/cloud/batch/v1/TaskProto.java b/java-batch/proto-google-cloud-batch-v1/src/main/java/com/google/cloud/batch/v1/TaskProto.java index de3a9488bd3e..3e9fc8aab53a 100644 --- a/java-batch/proto-google-cloud-batch-v1/src/main/java/com/google/cloud/batch/v1/TaskProto.java +++ b/java-batch/proto-google-cloud-batch-v1/src/main/java/com/google/cloud/batch/v1/TaskProto.java @@ -128,64 +128,65 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "usEvent\"q\n\005State\022\025\n\021STATE_UNSPECIFIED\020\000\022" + "\013\n\007PENDING\020\001\022\014\n\010ASSIGNED\020\002\022\013\n\007RUNNING\020\003\022" + "\n\n\006FAILED\020\004\022\r\n\tSUCCEEDED\020\005\022\016\n\nUNEXECUTED" - + "\020\006\"\336\005\n\010Runnable\022>\n\tcontainer\030\001 \001(\0132).goo" + + "\020\006\"\372\005\n\010Runnable\022>\n\tcontainer\030\001 \001(\0132).goo" + "gle.cloud.batch.v1.Runnable.ContainerH\000\022" + "8\n\006script\030\002 \001(\0132&.google.cloud.batch.v1." + "Runnable.ScriptH\000\022:\n\007barrier\030\006 \001(\0132\'.goo" + "gle.cloud.batch.v1.Runnable.BarrierH\000\022\032\n" - + "\022ignore_exit_status\030\003 \001(\010\022\022\n\nbackground\030" - + "\004 \001(\010\022\022\n\nalways_run\030\005 \001(\010\0227\n\013environment" - + "\030\007 \001(\0132\".google.cloud.batch.v1.Environme" - + "nt\022*\n\007timeout\030\010 \001(\0132\031.google.protobuf.Du" - + "ration\022;\n\006labels\030\t \003(\0132+.google.cloud.ba" - + "tch.v1.Runnable.LabelsEntry\032\252\001\n\tContaine" - + "r\022\021\n\timage_uri\030\001 \001(\t\022\020\n\010commands\030\002 \003(\t\022\022" - + "\n\nentrypoint\030\003 \001(\t\022\017\n\007volumes\030\007 \003(\t\022\017\n\007o" - + "ptions\030\010 \001(\t\022\036\n\026block_external_network\030\t" - + " \001(\010\022\020\n\010username\030\n \001(\t\022\020\n\010password\030\013 \001(\t" - + "\0323\n\006Script\022\016\n\004path\030\001 \001(\tH\000\022\016\n\004text\030\002 \001(\t" - + "H\000B\t\n\007command\032\027\n\007Barrier\022\014\n\004name\030\001 \001(\t\032-" - + "\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(" - + "\t:\0028\001B\014\n\nexecutable\"\375\003\n\010TaskSpec\0222\n\trunn" - + "ables\030\010 \003(\0132\037.google.cloud.batch.v1.Runn" - + "able\022@\n\020compute_resource\030\003 \001(\0132&.google." - + "cloud.batch.v1.ComputeResource\0223\n\020max_ru" - + "n_duration\030\004 \001(\0132\031.google.protobuf.Durat" - + "ion\022\027\n\017max_retry_count\030\005 \001(\005\022B\n\022lifecycl" - + "e_policies\030\t \003(\0132&.google.cloud.batch.v1" - + ".LifecyclePolicy\022K\n\014environments\030\006 \003(\01321" - + ".google.cloud.batch.v1.TaskSpec.Environm" - + "entsEntryB\002\030\001\022.\n\007volumes\030\007 \003(\0132\035.google." - + "cloud.batch.v1.Volume\0227\n\013environment\030\n \001" - + "(\0132\".google.cloud.batch.v1.Environment\0323" - + "\n\021EnvironmentsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005valu" - + "e\030\002 \001(\t:\0028\001\"\212\002\n\017LifecyclePolicy\022=\n\006actio" - + "n\030\001 \001(\0162-.google.cloud.batch.v1.Lifecycl" - + "ePolicy.Action\022P\n\020action_condition\030\002 \001(\013" - + "26.google.cloud.batch.v1.LifecyclePolicy" - + ".ActionCondition\032%\n\017ActionCondition\022\022\n\ne" - + "xit_codes\030\001 \003(\005\"?\n\006Action\022\026\n\022ACTION_UNSP" - + "ECIFIED\020\000\022\016\n\nRETRY_TASK\020\001\022\r\n\tFAIL_TASK\020\002" - + "\"\300\001\n\004Task\022\014\n\004name\030\001 \001(\t\0221\n\006status\030\002 \001(\0132" - + "!.google.cloud.batch.v1.TaskStatus:w\352At\n" - + "\031batch.googleapis.com/Task\022Wprojects/{pr" - + "oject}/locations/{location}/jobs/{job}/t" - + "askGroups/{task_group}/tasks/{task}\"\217\003\n\013" - + "Environment\022D\n\tvariables\030\001 \003(\01321.google." - + "cloud.batch.v1.Environment.VariablesEntr" - + "y\022Q\n\020secret_variables\030\002 \003(\01327.google.clo" - + "ud.batch.v1.Environment.SecretVariablesE" - + "ntry\022I\n\023encrypted_variables\030\003 \001(\0132,.goog" - + "le.cloud.batch.v1.Environment.KMSEnvMap\032" - + "2\n\tKMSEnvMap\022\020\n\010key_name\030\001 \001(\t\022\023\n\013cipher" - + "_text\030\002 \001(\t\0320\n\016VariablesEntry\022\013\n\003key\030\001 \001" - + "(\t\022\r\n\005value\030\002 \001(\t:\0028\001\0326\n\024SecretVariables" - + "Entry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001B\252\001" - + "\n\031com.google.cloud.batch.v1B\tTaskProtoP\001" - + "Z/cloud.google.com/go/batch/apiv1/batchp" - + "b;batchpb\242\002\003GCB\252\002\025Google.Cloud.Batch.V1\312" - + "\002\025Google\\Cloud\\Batch\\V1\352\002\030Google::Cloud:" - + ":Batch::V1b\006proto3" + + "\014display_name\030\n \001(\tB\004\342A\001\001\022\032\n\022ignore_exit" + + "_status\030\003 \001(\010\022\022\n\nbackground\030\004 \001(\010\022\022\n\nalw" + + "ays_run\030\005 \001(\010\0227\n\013environment\030\007 \001(\0132\".goo" + + "gle.cloud.batch.v1.Environment\022*\n\007timeou" + + "t\030\010 \001(\0132\031.google.protobuf.Duration\022;\n\006la" + + "bels\030\t \003(\0132+.google.cloud.batch.v1.Runna" + + "ble.LabelsEntry\032\252\001\n\tContainer\022\021\n\timage_u" + + "ri\030\001 \001(\t\022\020\n\010commands\030\002 \003(\t\022\022\n\nentrypoint" + + "\030\003 \001(\t\022\017\n\007volumes\030\007 \003(\t\022\017\n\007options\030\010 \001(\t" + + "\022\036\n\026block_external_network\030\t \001(\010\022\020\n\010user" + + "name\030\n \001(\t\022\020\n\010password\030\013 \001(\t\0323\n\006Script\022\016" + + "\n\004path\030\001 \001(\tH\000\022\016\n\004text\030\002 \001(\tH\000B\t\n\007comman" + + "d\032\027\n\007Barrier\022\014\n\004name\030\001 \001(\t\032-\n\013LabelsEntr" + + "y\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001B\014\n\nexe" + + "cutable\"\375\003\n\010TaskSpec\0222\n\trunnables\030\010 \003(\0132" + + "\037.google.cloud.batch.v1.Runnable\022@\n\020comp" + + "ute_resource\030\003 \001(\0132&.google.cloud.batch." + + "v1.ComputeResource\0223\n\020max_run_duration\030\004" + + " \001(\0132\031.google.protobuf.Duration\022\027\n\017max_r" + + "etry_count\030\005 \001(\005\022B\n\022lifecycle_policies\030\t" + + " \003(\0132&.google.cloud.batch.v1.LifecyclePo" + + "licy\022K\n\014environments\030\006 \003(\01321.google.clou" + + "d.batch.v1.TaskSpec.EnvironmentsEntryB\002\030" + + "\001\022.\n\007volumes\030\007 \003(\0132\035.google.cloud.batch." + + "v1.Volume\0227\n\013environment\030\n \001(\0132\".google." + + "cloud.batch.v1.Environment\0323\n\021Environmen" + + "tsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"" + + "\212\002\n\017LifecyclePolicy\022=\n\006action\030\001 \001(\0162-.go" + + "ogle.cloud.batch.v1.LifecyclePolicy.Acti" + + "on\022P\n\020action_condition\030\002 \001(\01326.google.cl" + + "oud.batch.v1.LifecyclePolicy.ActionCondi" + + "tion\032%\n\017ActionCondition\022\022\n\nexit_codes\030\001 " + + "\003(\005\"?\n\006Action\022\026\n\022ACTION_UNSPECIFIED\020\000\022\016\n" + + "\nRETRY_TASK\020\001\022\r\n\tFAIL_TASK\020\002\"\300\001\n\004Task\022\014\n" + + "\004name\030\001 \001(\t\0221\n\006status\030\002 \001(\0132!.google.clo" + + "ud.batch.v1.TaskStatus:w\352At\n\031batch.googl" + + "eapis.com/Task\022Wprojects/{project}/locat" + + "ions/{location}/jobs/{job}/taskGroups/{t" + + "ask_group}/tasks/{task}\"\217\003\n\013Environment\022" + + "D\n\tvariables\030\001 \003(\01321.google.cloud.batch." + + "v1.Environment.VariablesEntry\022Q\n\020secret_" + + "variables\030\002 \003(\01327.google.cloud.batch.v1." + + "Environment.SecretVariablesEntry\022I\n\023encr" + + "ypted_variables\030\003 \001(\0132,.google.cloud.bat" + + "ch.v1.Environment.KMSEnvMap\0322\n\tKMSEnvMap" + + "\022\020\n\010key_name\030\001 \001(\t\022\023\n\013cipher_text\030\002 \001(\t\032" + + "0\n\016VariablesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030" + + "\002 \001(\t:\0028\001\0326\n\024SecretVariablesEntry\022\013\n\003key" + + "\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001B\252\001\n\031com.google" + + ".cloud.batch.v1B\tTaskProtoP\001Z/cloud.goog" + + "le.com/go/batch/apiv1/batchpb;batchpb\242\002\003" + + "GCB\252\002\025Google.Cloud.Batch.V1\312\002\025Google\\Clo" + + "ud\\Batch\\V1\352\002\030Google::Cloud::Batch::V1b\006" + + "proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( @@ -238,6 +239,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Container", "Script", "Barrier", + "DisplayName", "IgnoreExitStatus", "Background", "AlwaysRun", @@ -366,6 +368,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { }); com.google.protobuf.ExtensionRegistry registry = com.google.protobuf.ExtensionRegistry.newInstance(); + registry.add(com.google.api.FieldBehaviorProto.fieldBehavior); registry.add(com.google.api.ResourceProto.resource); com.google.protobuf.Descriptors.FileDescriptor.internalUpdateFileDescriptor( descriptor, registry); diff --git a/java-batch/proto-google-cloud-batch-v1/src/main/proto/google/cloud/batch/v1/task.proto b/java-batch/proto-google-cloud-batch-v1/src/main/proto/google/cloud/batch/v1/task.proto index f0cc9a477c8d..7bdf5f1ad0f0 100644 --- a/java-batch/proto-google-cloud-batch-v1/src/main/proto/google/cloud/batch/v1/task.proto +++ b/java-batch/proto-google-cloud-batch-v1/src/main/proto/google/cloud/batch/v1/task.proto @@ -234,6 +234,12 @@ message Runnable { Barrier barrier = 6; } + // Optional. DisplayName is an optional field that can be provided by the + // caller. If provided, it will be used in logs and other outputs to identify + // the script, making it easier for users to understand the logs. If not + // provided the index of the runnable will be used for outputs. + string display_name = 10 [(google.api.field_behavior) = OPTIONAL]; + // Normally, a non-zero exit status causes the Task to fail. This flag allows // execution of other Runnables to continue instead. bool ignore_exit_status = 3;