diff --git a/generation_config.yaml b/generation_config.yaml index dc2fcf55546c..d74143fb612b 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ gapic_generator_version: 2.66.1 -googleapis_commitish: 6eead6ed94bddc12fe22189880a0b8f722c70478 +googleapis_commitish: 055f92c9384689eb0bb32d035d3bc6d98c8347c0 libraries_bom_version: 26.75.0 libraries: - api_shortname: accessapproval diff --git a/java-dataproc/README.md b/java-dataproc/README.md index 825b7fe9a9d4..d4be2b4221d5 100644 --- a/java-dataproc/README.md +++ b/java-dataproc/README.md @@ -42,20 +42,20 @@ If you are using Maven without the BOM, add this to your dependencies: com.google.cloud google-cloud-dataproc - 4.80.0 + 4.81.0 ``` If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-dataproc:4.80.0' +implementation 'com.google.cloud:google-cloud-dataproc:4.81.0' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-dataproc" % "4.80.0" +libraryDependencies += "com.google.cloud" % "google-cloud-dataproc" % "4.81.0" ``` ## Authentication @@ -175,7 +175,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [javadocs]: https://cloud.google.com/java/docs/reference/google-cloud-dataproc/latest/overview [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-dataproc.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-dataproc/4.80.0 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-dataproc/4.81.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-dataproc/google-cloud-dataproc/src/main/resources/META-INF/native-image/com.google.cloud.dataproc.v1/reflect-config.json b/java-dataproc/google-cloud-dataproc/src/main/resources/META-INF/native-image/com.google.cloud.dataproc.v1/reflect-config.json index f5884806a07e..cfce7b2b6ee3 100644 --- a/java-dataproc/google-cloud-dataproc/src/main/resources/META-INF/native-image/com.google.cloud.dataproc.v1/reflect-config.json +++ b/java-dataproc/google-cloud-dataproc/src/main/resources/META-INF/native-image/com.google.cloud.dataproc.v1/reflect-config.json @@ -494,6 +494,15 @@ "allDeclaredClasses": true, "allPublicClasses": true }, + { + "name": "com.google.cloud.dataproc.v1.AutoscalingPolicy$ClusterType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, { "name": "com.google.cloud.dataproc.v1.AutotuningConfig", "queryAllDeclaredConstructors": true, @@ -728,6 +737,15 @@ "allDeclaredClasses": true, "allPublicClasses": true }, + { + "name": "com.google.cloud.dataproc.v1.ClusterConfig$ClusterType", + "queryAllDeclaredConstructors": true, + "queryAllPublicConstructors": true, + "queryAllDeclaredMethods": true, + "allPublicMethods": true, + "allDeclaredClasses": true, + "allPublicClasses": true + }, { "name": "com.google.cloud.dataproc.v1.ClusterMetrics", "queryAllDeclaredConstructors": true, diff --git a/java-dataproc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/AutoscalingPoliciesProto.java b/java-dataproc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/AutoscalingPoliciesProto.java index 9feb26437105..529ff4e37f23 100644 --- a/java-dataproc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/AutoscalingPoliciesProto.java +++ b/java-dataproc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/AutoscalingPoliciesProto.java @@ -99,7 +99,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\034google/api/annotations.proto\032\027google/ap" + "i/client.proto\032\037google/api/field_behavio" + "r.proto\032\031google/api/resource.proto\032\036goog" - + "le/protobuf/duration.proto\032\033google/protobuf/empty.proto\"\245\005\n" + + "le/protobuf/duration.proto\032\033google/protobuf/empty.proto\"\304\006\n" + "\021AutoscalingPolicy\022\n\n" + "\002id\030\001 \001(\t\022\021\n" + "\004name\030\002 \001(\tB\003\340A\003\022S\n" @@ -110,17 +110,23 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\027secondary_worker_config\030\005 \001(\0132>" + ".google.cloud.dataproc.v1.InstanceGroupAutoscalingPolicyConfigB\003\340A\001\022L\n" + "\006labels\030\006 " - + "\003(\01327.google.cloud.dataproc.v1.AutoscalingPolicy.LabelsEntryB\003\340A\001\032-\n" + + "\003(\01327.google.cloud.dataproc.v1.AutoscalingPolicy.LabelsEntryB\003\340A\001\022R\n" + + "\014cluster_type\030\007" + + " \001(\01627.google.cloud.dataproc.v1.AutoscalingPolicy.ClusterTypeB\003\340A\001\032-\n" + "\013LabelsEntry\022\013\n" + "\003key\030\001 \001(\t\022\r\n" - + "\005value\030\002 \001(\t:\0028\001:\317\001\352A\313\001\n" - + ")dataproc.googleapis.com/AutoscalingPolicy\022Pprojects/{project}/locations/{locati" - + "on}/autoscalingPolicies/{autoscaling_policy}\022Lprojects/{project}/regions/{region" - + "}/autoscalingPolicies/{autoscaling_policy}B\013\n" + + "\005value\030\002 \001(\t:\0028\001\"I\n" + + "\013ClusterType\022\034\n" + + "\030CLUSTER_TYPE_UNSPECIFIED\020\000\022\014\n" + + "\010STANDARD\020\001\022\016\n\n" + + "ZERO_SCALE\020\002:\317\001\352A\313\001\n" + + ")dataproc.googleapis.com/AutoscalingPolicy\022Pprojects/{project}/locations/{locatio" + + "n}/autoscalingPolicies/{autoscaling_policy}\022Lprojects/{project}/regions/{region}" + + "/autoscalingPolicies/{autoscaling_policy}B\013\n" + "\talgorithm\"\260\001\n" + "\031BasicAutoscalingAlgorithm\022P\n" - + "\013yarn_config\030\001 \001(\01324.google.clou" - + "d.dataproc.v1.BasicYarnAutoscalingConfigB\003\340A\002H\000\0227\n" + + "\013yarn_config\030\001 \001(\01324.google.cloud" + + ".dataproc.v1.BasicYarnAutoscalingConfigB\003\340A\002H\000\0227\n" + "\017cooldown_period\030\002" + " \001(\0132\031.google.protobuf.DurationB\003\340A\001B\010\n" + "\006config\"\371\001\n" @@ -138,56 +144,56 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\036CreateAutoscalingPolicyRequest\022A\n" + "\006parent\030\001 \001(" + "\tB1\340A\002\372A+\022)dataproc.googleapis.com/AutoscalingPolicy\022@\n" - + "\006policy\030\002 \001(" - + "\0132+.google.cloud.dataproc.v1.AutoscalingPolicyB\003\340A\002\"^\n" + + "\006policy\030\002 \001(\013" + + "2+.google.cloud.dataproc.v1.AutoscalingPolicyB\003\340A\002\"^\n" + "\033GetAutoscalingPolicyRequest\022?\n" + "\004name\030\001 \001(\tB1\340A\002\372A+\n" + ")dataproc.googleapis.com/AutoscalingPolicy\"b\n" + "\036UpdateAutoscalingPolicyRequest\022@\n" - + "\006policy\030\001 \001(\0132+." - + "google.cloud.dataproc.v1.AutoscalingPolicyB\003\340A\002\"a\n" + + "\006policy\030\001 \001(\0132+.g" + + "oogle.cloud.dataproc.v1.AutoscalingPolicyB\003\340A\002\"a\n" + "\036DeleteAutoscalingPolicyRequest\022?\n" + "\004name\030\001 \001(\tB1\340A\002\372A+\n" + ")dataproc.googleapis.com/AutoscalingPolicy\"\224\001\n" + "\036ListAutoscalingPoliciesRequest\022A\n" - + "\006parent\030\001 \001(\tB1\340" - + "A\002\372A+\022)dataproc.googleapis.com/AutoscalingPolicy\022\026\n" + + "\006parent\030\001 \001(\tB1\340A" + + "\002\372A+\022)dataproc.googleapis.com/AutoscalingPolicy\022\026\n" + "\tpage_size\030\002 \001(\005B\003\340A\001\022\027\n\n" + "page_token\030\003 \001(\tB\003\340A\001\"\203\001\n" + "\037ListAutoscalingPoliciesResponse\022B\n" - + "\010policies\030\001 \003(\0132+.google" - + ".cloud.dataproc.v1.AutoscalingPolicyB\003\340A\003\022\034\n" + + "\010policies\030\001 \003(\0132+.google." + + "cloud.dataproc.v1.AutoscalingPolicyB\003\340A\003\022\034\n" + "\017next_page_token\030\002 \001(\tB\003\340A\0032\256\013\n" + "\030AutoscalingPolicyService\022\234\002\n" - + "\027CreateAutoscalingPolicy\0228.google.cloud.dataproc.v1.Crea" - + "teAutoscalingPolicyRequest\032+.google.cloud.dataproc.v1.AutoscalingPolicy\"\231\001\332A\r" - + "parent,policy\202\323\344\223\002\202\001\"7/v1/{parent=projects/" - + "*/locations/*}/autoscalingPolicies:\006poli" - + "cyZ?\"5/v1/{parent=projects/*/regions/*}/autoscalingPolicies:\006policy\022\243\002\n" - + "\027UpdateAutoscalingPolicy\0228.google.cloud.dataproc." - + "v1.UpdateAutoscalingPolicyRequest\032+.goog" - + "le.cloud.dataproc.v1.AutoscalingPolicy\"\240" - + "\001\332A\006policy\202\323\344\223\002\220\001\032>/v1/{policy.name=proj" - + "ects/*/locations/*/autoscalingPolicies/*}:\006policyZF\032/v1/{policy.name=proje" + + "cts/*/locations/*/autoscalingPolicies/*}:\006policyZF\032 builde private AutoscalingPolicy() { id_ = ""; name_ = ""; + clusterType_ = 0; } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { @@ -83,6 +84,178 @@ protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldRefl com.google.cloud.dataproc.v1.AutoscalingPolicy.Builder.class); } + /** + * + * + *
+   * The type of the clusters for which this autoscaling policy is to be
+   * configured.
+   * 
+ * + * Protobuf enum {@code google.cloud.dataproc.v1.AutoscalingPolicy.ClusterType} + */ + public enum ClusterType implements com.google.protobuf.ProtocolMessageEnum { + /** + * + * + *
+     * Not set.
+     * 
+ * + * CLUSTER_TYPE_UNSPECIFIED = 0; + */ + CLUSTER_TYPE_UNSPECIFIED(0), + /** + * + * + *
+     * Standard dataproc cluster with a minimum of two primary workers.
+     * 
+ * + * STANDARD = 1; + */ + STANDARD(1), + /** + * + * + *
+     * Clusters that can use only secondary workers and be scaled down to zero
+     * secondary worker nodes.
+     * 
+ * + * ZERO_SCALE = 2; + */ + ZERO_SCALE(2), + UNRECOGNIZED(-1), + ; + + static { + com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( + com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, + /* major= */ 4, + /* minor= */ 33, + /* patch= */ 2, + /* suffix= */ "", + "ClusterType"); + } + + /** + * + * + *
+     * Not set.
+     * 
+ * + * CLUSTER_TYPE_UNSPECIFIED = 0; + */ + public static final int CLUSTER_TYPE_UNSPECIFIED_VALUE = 0; + + /** + * + * + *
+     * Standard dataproc cluster with a minimum of two primary workers.
+     * 
+ * + * STANDARD = 1; + */ + public static final int STANDARD_VALUE = 1; + + /** + * + * + *
+     * Clusters that can use only secondary workers and be scaled down to zero
+     * secondary worker nodes.
+     * 
+ * + * ZERO_SCALE = 2; + */ + public static final int ZERO_SCALE_VALUE = 2; + + public final int getNumber() { + if (this == UNRECOGNIZED) { + throw new java.lang.IllegalArgumentException( + "Can't get the number of an unknown enum value."); + } + return value; + } + + /** + * @param value The numeric wire value of the corresponding enum entry. + * @return The enum associated with the given numeric wire value. + * @deprecated Use {@link #forNumber(int)} instead. + */ + @java.lang.Deprecated + public static ClusterType valueOf(int value) { + return forNumber(value); + } + + /** + * @param value The numeric wire value of the corresponding enum entry. + * @return The enum associated with the given numeric wire value. + */ + public static ClusterType forNumber(int value) { + switch (value) { + case 0: + return CLUSTER_TYPE_UNSPECIFIED; + case 1: + return STANDARD; + case 2: + return ZERO_SCALE; + default: + return null; + } + } + + public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() { + return internalValueMap; + } + + private static final com.google.protobuf.Internal.EnumLiteMap internalValueMap = + new com.google.protobuf.Internal.EnumLiteMap() { + public ClusterType findValueByNumber(int number) { + return ClusterType.forNumber(number); + } + }; + + public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() { + if (this == UNRECOGNIZED) { + throw new java.lang.IllegalStateException( + "Can't get the descriptor of an unrecognized enum value."); + } + return getDescriptor().getValues().get(ordinal()); + } + + public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() { + return getDescriptor(); + } + + public static com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { + return com.google.cloud.dataproc.v1.AutoscalingPolicy.getDescriptor().getEnumTypes().get(0); + } + + private static final ClusterType[] VALUES = values(); + + public static ClusterType valueOf(com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + if (desc.getType() != getDescriptor()) { + throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type."); + } + if (desc.getIndex() == -1) { + return UNRECOGNIZED; + } + return VALUES[desc.getIndex()]; + } + + private final int value; + + private ClusterType(int value) { + this.value = value; + } + + // @@protoc_insertion_point(enum_scope:google.cloud.dataproc.v1.AutoscalingPolicy.ClusterType) + } + private int bitField0_; private int algorithmCase_ = 0; @@ -558,6 +731,51 @@ public java.lang.String getLabelsOrThrow(java.lang.String key) { return map.get(key); } + public static final int CLUSTER_TYPE_FIELD_NUMBER = 7; + private int clusterType_ = 0; + + /** + * + * + *
+   * Optional. The type of the clusters for which this autoscaling policy is to
+   * be configured.
+   * 
+ * + * + * .google.cloud.dataproc.v1.AutoscalingPolicy.ClusterType cluster_type = 7 [(.google.api.field_behavior) = OPTIONAL]; + * + * + * @return The enum numeric value on the wire for clusterType. + */ + @java.lang.Override + public int getClusterTypeValue() { + return clusterType_; + } + + /** + * + * + *
+   * Optional. The type of the clusters for which this autoscaling policy is to
+   * be configured.
+   * 
+ * + * + * .google.cloud.dataproc.v1.AutoscalingPolicy.ClusterType cluster_type = 7 [(.google.api.field_behavior) = OPTIONAL]; + * + * + * @return The clusterType. + */ + @java.lang.Override + public com.google.cloud.dataproc.v1.AutoscalingPolicy.ClusterType getClusterType() { + com.google.cloud.dataproc.v1.AutoscalingPolicy.ClusterType result = + com.google.cloud.dataproc.v1.AutoscalingPolicy.ClusterType.forNumber(clusterType_); + return result == null + ? com.google.cloud.dataproc.v1.AutoscalingPolicy.ClusterType.UNRECOGNIZED + : result; + } + private byte memoizedIsInitialized = -1; @java.lang.Override @@ -589,6 +807,11 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io } com.google.protobuf.GeneratedMessage.serializeStringMapTo( output, internalGetLabels(), LabelsDefaultEntryHolder.defaultEntry, 6); + if (clusterType_ + != com.google.cloud.dataproc.v1.AutoscalingPolicy.ClusterType.CLUSTER_TYPE_UNSPECIFIED + .getNumber()) { + output.writeEnum(7, clusterType_); + } getUnknownFields().writeTo(output); } @@ -626,6 +849,11 @@ public int getSerializedSize() { .build(); size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, labels__); } + if (clusterType_ + != com.google.cloud.dataproc.v1.AutoscalingPolicy.ClusterType.CLUSTER_TYPE_UNSPECIFIED + .getNumber()) { + size += com.google.protobuf.CodedOutputStream.computeEnumSize(7, clusterType_); + } size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; @@ -653,6 +881,7 @@ public boolean equals(final java.lang.Object obj) { if (!getSecondaryWorkerConfig().equals(other.getSecondaryWorkerConfig())) return false; } if (!internalGetLabels().equals(other.internalGetLabels())) return false; + if (clusterType_ != other.clusterType_) return false; if (!getAlgorithmCase().equals(other.getAlgorithmCase())) return false; switch (algorithmCase_) { case 3: @@ -688,6 +917,8 @@ public int hashCode() { hash = (37 * hash) + LABELS_FIELD_NUMBER; hash = (53 * hash) + internalGetLabels().hashCode(); } + hash = (37 * hash) + CLUSTER_TYPE_FIELD_NUMBER; + hash = (53 * hash) + clusterType_; switch (algorithmCase_) { case 3: hash = (37 * hash) + BASIC_ALGORITHM_FIELD_NUMBER; @@ -884,6 +1115,7 @@ public Builder clear() { secondaryWorkerConfigBuilder_ = null; } internalGetMutableLabels().clear(); + clusterType_ = 0; algorithmCase_ = 0; algorithm_ = null; return this; @@ -946,6 +1178,9 @@ private void buildPartial0(com.google.cloud.dataproc.v1.AutoscalingPolicy result result.labels_ = internalGetLabels(); result.labels_.makeImmutable(); } + if (((from_bitField0_ & 0x00000040) != 0)) { + result.clusterType_ = clusterType_; + } result.bitField0_ |= to_bitField0_; } @@ -987,6 +1222,9 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.AutoscalingPolicy other) { } internalGetMutableLabels().mergeFrom(other.internalGetLabels()); bitField0_ |= 0x00000020; + if (other.clusterType_ != 0) { + setClusterTypeValue(other.getClusterTypeValue()); + } switch (other.getAlgorithmCase()) { case BASIC_ALGORITHM: { @@ -1069,6 +1307,12 @@ public Builder mergeFrom( bitField0_ |= 0x00000020; break; } // case 50 + case 56: + { + clusterType_ = input.readEnum(); + bitField0_ |= 0x00000040; + break; + } // case 56 default: { if (!super.parseUnknownField(input, extensionRegistry, tag)) { @@ -2229,6 +2473,119 @@ public Builder putAllLabels(java.util.Map va return this; } + private int clusterType_ = 0; + + /** + * + * + *
+     * Optional. The type of the clusters for which this autoscaling policy is to
+     * be configured.
+     * 
+ * + * + * .google.cloud.dataproc.v1.AutoscalingPolicy.ClusterType cluster_type = 7 [(.google.api.field_behavior) = OPTIONAL]; + * + * + * @return The enum numeric value on the wire for clusterType. + */ + @java.lang.Override + public int getClusterTypeValue() { + return clusterType_; + } + + /** + * + * + *
+     * Optional. The type of the clusters for which this autoscaling policy is to
+     * be configured.
+     * 
+ * + * + * .google.cloud.dataproc.v1.AutoscalingPolicy.ClusterType cluster_type = 7 [(.google.api.field_behavior) = OPTIONAL]; + * + * + * @param value The enum numeric value on the wire for clusterType to set. + * @return This builder for chaining. + */ + public Builder setClusterTypeValue(int value) { + clusterType_ = value; + bitField0_ |= 0x00000040; + onChanged(); + return this; + } + + /** + * + * + *
+     * Optional. The type of the clusters for which this autoscaling policy is to
+     * be configured.
+     * 
+ * + * + * .google.cloud.dataproc.v1.AutoscalingPolicy.ClusterType cluster_type = 7 [(.google.api.field_behavior) = OPTIONAL]; + * + * + * @return The clusterType. + */ + @java.lang.Override + public com.google.cloud.dataproc.v1.AutoscalingPolicy.ClusterType getClusterType() { + com.google.cloud.dataproc.v1.AutoscalingPolicy.ClusterType result = + com.google.cloud.dataproc.v1.AutoscalingPolicy.ClusterType.forNumber(clusterType_); + return result == null + ? com.google.cloud.dataproc.v1.AutoscalingPolicy.ClusterType.UNRECOGNIZED + : result; + } + + /** + * + * + *
+     * Optional. The type of the clusters for which this autoscaling policy is to
+     * be configured.
+     * 
+ * + * + * .google.cloud.dataproc.v1.AutoscalingPolicy.ClusterType cluster_type = 7 [(.google.api.field_behavior) = OPTIONAL]; + * + * + * @param value The clusterType to set. + * @return This builder for chaining. + */ + public Builder setClusterType( + com.google.cloud.dataproc.v1.AutoscalingPolicy.ClusterType value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000040; + clusterType_ = value.getNumber(); + onChanged(); + return this; + } + + /** + * + * + *
+     * Optional. The type of the clusters for which this autoscaling policy is to
+     * be configured.
+     * 
+ * + * + * .google.cloud.dataproc.v1.AutoscalingPolicy.ClusterType cluster_type = 7 [(.google.api.field_behavior) = OPTIONAL]; + * + * + * @return This builder for chaining. + */ + public Builder clearClusterType() { + bitField0_ = (bitField0_ & ~0x00000040); + clusterType_ = 0; + onChanged(); + return this; + } + // @@protoc_insertion_point(builder_scope:google.cloud.dataproc.v1.AutoscalingPolicy) } diff --git a/java-dataproc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/AutoscalingPolicyOrBuilder.java b/java-dataproc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/AutoscalingPolicyOrBuilder.java index 4c71b3f5a643..79eb2d9230b5 100644 --- a/java-dataproc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/AutoscalingPolicyOrBuilder.java +++ b/java-dataproc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/AutoscalingPolicyOrBuilder.java @@ -310,5 +310,37 @@ java.lang.String getLabelsOrDefault( */ java.lang.String getLabelsOrThrow(java.lang.String key); + /** + * + * + *
+   * Optional. The type of the clusters for which this autoscaling policy is to
+   * be configured.
+   * 
+ * + * + * .google.cloud.dataproc.v1.AutoscalingPolicy.ClusterType cluster_type = 7 [(.google.api.field_behavior) = OPTIONAL]; + * + * + * @return The enum numeric value on the wire for clusterType. + */ + int getClusterTypeValue(); + + /** + * + * + *
+   * Optional. The type of the clusters for which this autoscaling policy is to
+   * be configured.
+   * 
+ * + * + * .google.cloud.dataproc.v1.AutoscalingPolicy.ClusterType cluster_type = 7 [(.google.api.field_behavior) = OPTIONAL]; + * + * + * @return The clusterType. + */ + com.google.cloud.dataproc.v1.AutoscalingPolicy.ClusterType getClusterType(); + com.google.cloud.dataproc.v1.AutoscalingPolicy.AlgorithmCase getAlgorithmCase(); } diff --git a/java-dataproc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ClusterConfig.java b/java-dataproc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ClusterConfig.java index 1f6cbfc7f3af..2c604e8dd7c4 100644 --- a/java-dataproc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ClusterConfig.java +++ b/java-dataproc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ClusterConfig.java @@ -52,6 +52,7 @@ private ClusterConfig(com.google.protobuf.GeneratedMessage.Builder builder) { } private ClusterConfig() { + clusterType_ = 0; clusterTier_ = 0; configBucket_ = ""; tempBucket_ = ""; @@ -74,6 +75,200 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { com.google.cloud.dataproc.v1.ClusterConfig.Builder.class); } + /** + * + * + *
+   * The type of the cluster.
+   * 
+ * + * Protobuf enum {@code google.cloud.dataproc.v1.ClusterConfig.ClusterType} + */ + public enum ClusterType implements com.google.protobuf.ProtocolMessageEnum { + /** + * + * + *
+     * Not set.
+     * 
+ * + * CLUSTER_TYPE_UNSPECIFIED = 0; + */ + CLUSTER_TYPE_UNSPECIFIED(0), + /** + * + * + *
+     * Standard dataproc cluster with a minimum of two primary workers.
+     * 
+ * + * STANDARD = 1; + */ + STANDARD(1), + /** + * + * + *
+     * https://cloud.google.com/dataproc/docs/concepts/configuring-clusters/single-node-clusters
+     * 
+ * + * SINGLE_NODE = 2; + */ + SINGLE_NODE(2), + /** + * + * + *
+     * Clusters that can use only secondary workers and be scaled down to zero
+     * secondary worker nodes.
+     * 
+ * + * ZERO_SCALE = 3; + */ + ZERO_SCALE(3), + UNRECOGNIZED(-1), + ; + + static { + com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( + com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, + /* major= */ 4, + /* minor= */ 33, + /* patch= */ 2, + /* suffix= */ "", + "ClusterType"); + } + + /** + * + * + *
+     * Not set.
+     * 
+ * + * CLUSTER_TYPE_UNSPECIFIED = 0; + */ + public static final int CLUSTER_TYPE_UNSPECIFIED_VALUE = 0; + + /** + * + * + *
+     * Standard dataproc cluster with a minimum of two primary workers.
+     * 
+ * + * STANDARD = 1; + */ + public static final int STANDARD_VALUE = 1; + + /** + * + * + *
+     * https://cloud.google.com/dataproc/docs/concepts/configuring-clusters/single-node-clusters
+     * 
+ * + * SINGLE_NODE = 2; + */ + public static final int SINGLE_NODE_VALUE = 2; + + /** + * + * + *
+     * Clusters that can use only secondary workers and be scaled down to zero
+     * secondary worker nodes.
+     * 
+ * + * ZERO_SCALE = 3; + */ + public static final int ZERO_SCALE_VALUE = 3; + + public final int getNumber() { + if (this == UNRECOGNIZED) { + throw new java.lang.IllegalArgumentException( + "Can't get the number of an unknown enum value."); + } + return value; + } + + /** + * @param value The numeric wire value of the corresponding enum entry. + * @return The enum associated with the given numeric wire value. + * @deprecated Use {@link #forNumber(int)} instead. + */ + @java.lang.Deprecated + public static ClusterType valueOf(int value) { + return forNumber(value); + } + + /** + * @param value The numeric wire value of the corresponding enum entry. + * @return The enum associated with the given numeric wire value. + */ + public static ClusterType forNumber(int value) { + switch (value) { + case 0: + return CLUSTER_TYPE_UNSPECIFIED; + case 1: + return STANDARD; + case 2: + return SINGLE_NODE; + case 3: + return ZERO_SCALE; + default: + return null; + } + } + + public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() { + return internalValueMap; + } + + private static final com.google.protobuf.Internal.EnumLiteMap internalValueMap = + new com.google.protobuf.Internal.EnumLiteMap() { + public ClusterType findValueByNumber(int number) { + return ClusterType.forNumber(number); + } + }; + + public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() { + if (this == UNRECOGNIZED) { + throw new java.lang.IllegalStateException( + "Can't get the descriptor of an unrecognized enum value."); + } + return getDescriptor().getValues().get(ordinal()); + } + + public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() { + return getDescriptor(); + } + + public static com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { + return com.google.cloud.dataproc.v1.ClusterConfig.getDescriptor().getEnumTypes().get(0); + } + + private static final ClusterType[] VALUES = values(); + + public static ClusterType valueOf(com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + if (desc.getType() != getDescriptor()) { + throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type."); + } + if (desc.getIndex() == -1) { + return UNRECOGNIZED; + } + return VALUES[desc.getIndex()]; + } + + private final int value; + + private ClusterType(int value) { + this.value = value; + } + + // @@protoc_insertion_point(enum_scope:google.cloud.dataproc.v1.ClusterConfig.ClusterType) + } + /** * * @@ -219,7 +414,7 @@ public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType } public static com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return com.google.cloud.dataproc.v1.ClusterConfig.getDescriptor().getEnumTypes().get(0); + return com.google.cloud.dataproc.v1.ClusterConfig.getDescriptor().getEnumTypes().get(1); } private static final ClusterTier[] VALUES = values(); @@ -244,6 +439,49 @@ private ClusterTier(int value) { } private int bitField0_; + public static final int CLUSTER_TYPE_FIELD_NUMBER = 27; + private int clusterType_ = 0; + + /** + * + * + *
+   * Optional. The type of the cluster.
+   * 
+ * + * + * .google.cloud.dataproc.v1.ClusterConfig.ClusterType cluster_type = 27 [(.google.api.field_behavior) = OPTIONAL]; + * + * + * @return The enum numeric value on the wire for clusterType. + */ + @java.lang.Override + public int getClusterTypeValue() { + return clusterType_; + } + + /** + * + * + *
+   * Optional. The type of the cluster.
+   * 
+ * + * + * .google.cloud.dataproc.v1.ClusterConfig.ClusterType cluster_type = 27 [(.google.api.field_behavior) = OPTIONAL]; + * + * + * @return The clusterType. + */ + @java.lang.Override + public com.google.cloud.dataproc.v1.ClusterConfig.ClusterType getClusterType() { + com.google.cloud.dataproc.v1.ClusterConfig.ClusterType result = + com.google.cloud.dataproc.v1.ClusterConfig.ClusterType.forNumber(clusterType_); + return result == null + ? com.google.cloud.dataproc.v1.ClusterConfig.ClusterType.UNRECOGNIZED + : result; + } + public static final int CLUSTER_TIER_FIELD_NUMBER = 29; private int clusterTier_ = 0; @@ -1457,6 +1695,11 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < auxiliaryNodeGroups_.size(); i++) { output.writeMessage(25, auxiliaryNodeGroups_.get(i)); } + if (clusterType_ + != com.google.cloud.dataproc.v1.ClusterConfig.ClusterType.CLUSTER_TYPE_UNSPECIFIED + .getNumber()) { + output.writeEnum(27, clusterType_); + } if (clusterTier_ != com.google.cloud.dataproc.v1.ClusterConfig.ClusterTier.CLUSTER_TIER_UNSPECIFIED .getNumber()) { @@ -1524,6 +1767,11 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream.computeMessageSize(25, auxiliaryNodeGroups_.get(i)); } + if (clusterType_ + != com.google.cloud.dataproc.v1.ClusterConfig.ClusterType.CLUSTER_TYPE_UNSPECIFIED + .getNumber()) { + size += com.google.protobuf.CodedOutputStream.computeEnumSize(27, clusterType_); + } if (clusterTier_ != com.google.cloud.dataproc.v1.ClusterConfig.ClusterTier.CLUSTER_TIER_UNSPECIFIED .getNumber()) { @@ -1545,6 +1793,7 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.dataproc.v1.ClusterConfig other = (com.google.cloud.dataproc.v1.ClusterConfig) obj; + if (clusterType_ != other.clusterType_) return false; if (clusterTier_ != other.clusterTier_) return false; if (!getConfigBucket().equals(other.getConfigBucket())) return false; if (!getTempBucket().equals(other.getTempBucket())) return false; @@ -1609,6 +1858,8 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + CLUSTER_TYPE_FIELD_NUMBER; + hash = (53 * hash) + clusterType_; hash = (37 * hash) + CLUSTER_TIER_FIELD_NUMBER; hash = (53 * hash) + clusterTier_; hash = (37 * hash) + CONFIG_BUCKET_FIELD_NUMBER; @@ -1833,6 +2084,7 @@ private void maybeForceBuilderInitialization() { public Builder clear() { super.clear(); bitField0_ = 0; + clusterType_ = 0; clusterTier_ = 0; configBucket_ = ""; tempBucket_ = ""; @@ -1867,7 +2119,7 @@ public Builder clear() { initializationActions_ = null; initializationActionsBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000100); + bitField0_ = (bitField0_ & ~0x00000200); encryptionConfig_ = null; if (encryptionConfigBuilder_ != null) { encryptionConfigBuilder_.dispose(); @@ -1909,7 +2161,7 @@ public Builder clear() { auxiliaryNodeGroups_ = null; auxiliaryNodeGroupsBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00010000); + bitField0_ = (bitField0_ & ~0x00020000); return this; } @@ -1947,18 +2199,18 @@ public com.google.cloud.dataproc.v1.ClusterConfig buildPartial() { private void buildPartialRepeatedFields(com.google.cloud.dataproc.v1.ClusterConfig result) { if (initializationActionsBuilder_ == null) { - if (((bitField0_ & 0x00000100) != 0)) { + if (((bitField0_ & 0x00000200) != 0)) { initializationActions_ = java.util.Collections.unmodifiableList(initializationActions_); - bitField0_ = (bitField0_ & ~0x00000100); + bitField0_ = (bitField0_ & ~0x00000200); } result.initializationActions_ = initializationActions_; } else { result.initializationActions_ = initializationActionsBuilder_.build(); } if (auxiliaryNodeGroupsBuilder_ == null) { - if (((bitField0_ & 0x00010000) != 0)) { + if (((bitField0_ & 0x00020000) != 0)) { auxiliaryNodeGroups_ = java.util.Collections.unmodifiableList(auxiliaryNodeGroups_); - bitField0_ = (bitField0_ & ~0x00010000); + bitField0_ = (bitField0_ & ~0x00020000); } result.auxiliaryNodeGroups_ = auxiliaryNodeGroups_; } else { @@ -1969,75 +2221,78 @@ private void buildPartialRepeatedFields(com.google.cloud.dataproc.v1.ClusterConf private void buildPartial0(com.google.cloud.dataproc.v1.ClusterConfig result) { int from_bitField0_ = bitField0_; if (((from_bitField0_ & 0x00000001) != 0)) { - result.clusterTier_ = clusterTier_; + result.clusterType_ = clusterType_; } if (((from_bitField0_ & 0x00000002) != 0)) { - result.configBucket_ = configBucket_; + result.clusterTier_ = clusterTier_; } if (((from_bitField0_ & 0x00000004) != 0)) { + result.configBucket_ = configBucket_; + } + if (((from_bitField0_ & 0x00000008) != 0)) { result.tempBucket_ = tempBucket_; } int to_bitField0_ = 0; - if (((from_bitField0_ & 0x00000008) != 0)) { + if (((from_bitField0_ & 0x00000010) != 0)) { result.gceClusterConfig_ = gceClusterConfigBuilder_ == null ? gceClusterConfig_ : gceClusterConfigBuilder_.build(); to_bitField0_ |= 0x00000001; } - if (((from_bitField0_ & 0x00000010) != 0)) { + if (((from_bitField0_ & 0x00000020) != 0)) { result.masterConfig_ = masterConfigBuilder_ == null ? masterConfig_ : masterConfigBuilder_.build(); to_bitField0_ |= 0x00000002; } - if (((from_bitField0_ & 0x00000020) != 0)) { + if (((from_bitField0_ & 0x00000040) != 0)) { result.workerConfig_ = workerConfigBuilder_ == null ? workerConfig_ : workerConfigBuilder_.build(); to_bitField0_ |= 0x00000004; } - if (((from_bitField0_ & 0x00000040) != 0)) { + if (((from_bitField0_ & 0x00000080) != 0)) { result.secondaryWorkerConfig_ = secondaryWorkerConfigBuilder_ == null ? secondaryWorkerConfig_ : secondaryWorkerConfigBuilder_.build(); to_bitField0_ |= 0x00000008; } - if (((from_bitField0_ & 0x00000080) != 0)) { + if (((from_bitField0_ & 0x00000100) != 0)) { result.softwareConfig_ = softwareConfigBuilder_ == null ? softwareConfig_ : softwareConfigBuilder_.build(); to_bitField0_ |= 0x00000010; } - if (((from_bitField0_ & 0x00000200) != 0)) { + if (((from_bitField0_ & 0x00000400) != 0)) { result.encryptionConfig_ = encryptionConfigBuilder_ == null ? encryptionConfig_ : encryptionConfigBuilder_.build(); to_bitField0_ |= 0x00000020; } - if (((from_bitField0_ & 0x00000400) != 0)) { + if (((from_bitField0_ & 0x00000800) != 0)) { result.autoscalingConfig_ = autoscalingConfigBuilder_ == null ? autoscalingConfig_ : autoscalingConfigBuilder_.build(); to_bitField0_ |= 0x00000040; } - if (((from_bitField0_ & 0x00000800) != 0)) { + if (((from_bitField0_ & 0x00001000) != 0)) { result.securityConfig_ = securityConfigBuilder_ == null ? securityConfig_ : securityConfigBuilder_.build(); to_bitField0_ |= 0x00000080; } - if (((from_bitField0_ & 0x00001000) != 0)) { + if (((from_bitField0_ & 0x00002000) != 0)) { result.lifecycleConfig_ = lifecycleConfigBuilder_ == null ? lifecycleConfig_ : lifecycleConfigBuilder_.build(); to_bitField0_ |= 0x00000100; } - if (((from_bitField0_ & 0x00002000) != 0)) { + if (((from_bitField0_ & 0x00004000) != 0)) { result.endpointConfig_ = endpointConfigBuilder_ == null ? endpointConfig_ : endpointConfigBuilder_.build(); to_bitField0_ |= 0x00000200; } - if (((from_bitField0_ & 0x00004000) != 0)) { + if (((from_bitField0_ & 0x00008000) != 0)) { result.metastoreConfig_ = metastoreConfigBuilder_ == null ? metastoreConfig_ : metastoreConfigBuilder_.build(); to_bitField0_ |= 0x00000400; } - if (((from_bitField0_ & 0x00008000) != 0)) { + if (((from_bitField0_ & 0x00010000) != 0)) { result.dataprocMetricConfig_ = dataprocMetricConfigBuilder_ == null ? dataprocMetricConfig_ @@ -2059,17 +2314,20 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(com.google.cloud.dataproc.v1.ClusterConfig other) { if (other == com.google.cloud.dataproc.v1.ClusterConfig.getDefaultInstance()) return this; + if (other.clusterType_ != 0) { + setClusterTypeValue(other.getClusterTypeValue()); + } if (other.clusterTier_ != 0) { setClusterTierValue(other.getClusterTierValue()); } if (!other.getConfigBucket().isEmpty()) { configBucket_ = other.configBucket_; - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; onChanged(); } if (!other.getTempBucket().isEmpty()) { tempBucket_ = other.tempBucket_; - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; onChanged(); } if (other.hasGceClusterConfig()) { @@ -2091,7 +2349,7 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.ClusterConfig other) { if (!other.initializationActions_.isEmpty()) { if (initializationActions_.isEmpty()) { initializationActions_ = other.initializationActions_; - bitField0_ = (bitField0_ & ~0x00000100); + bitField0_ = (bitField0_ & ~0x00000200); } else { ensureInitializationActionsIsMutable(); initializationActions_.addAll(other.initializationActions_); @@ -2104,7 +2362,7 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.ClusterConfig other) { initializationActionsBuilder_.dispose(); initializationActionsBuilder_ = null; initializationActions_ = other.initializationActions_; - bitField0_ = (bitField0_ & ~0x00000100); + bitField0_ = (bitField0_ & ~0x00000200); initializationActionsBuilder_ = com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? internalGetInitializationActionsFieldBuilder() @@ -2139,7 +2397,7 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.ClusterConfig other) { if (!other.auxiliaryNodeGroups_.isEmpty()) { if (auxiliaryNodeGroups_.isEmpty()) { auxiliaryNodeGroups_ = other.auxiliaryNodeGroups_; - bitField0_ = (bitField0_ & ~0x00010000); + bitField0_ = (bitField0_ & ~0x00020000); } else { ensureAuxiliaryNodeGroupsIsMutable(); auxiliaryNodeGroups_.addAll(other.auxiliaryNodeGroups_); @@ -2152,7 +2410,7 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.ClusterConfig other) { auxiliaryNodeGroupsBuilder_.dispose(); auxiliaryNodeGroupsBuilder_ = null; auxiliaryNodeGroups_ = other.auxiliaryNodeGroups_; - bitField0_ = (bitField0_ & ~0x00010000); + bitField0_ = (bitField0_ & ~0x00020000); auxiliaryNodeGroupsBuilder_ = com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? internalGetAuxiliaryNodeGroupsFieldBuilder() @@ -2191,34 +2449,34 @@ public Builder mergeFrom( case 10: { configBucket_ = input.readStringRequireUtf8(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; break; } // case 10 case 18: { tempBucket_ = input.readStringRequireUtf8(); - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; break; } // case 18 case 66: { input.readMessage( internalGetGceClusterConfigFieldBuilder().getBuilder(), extensionRegistry); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; break; } // case 66 case 74: { input.readMessage( internalGetMasterConfigFieldBuilder().getBuilder(), extensionRegistry); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; break; } // case 74 case 82: { input.readMessage( internalGetWorkerConfigFieldBuilder().getBuilder(), extensionRegistry); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000040; break; } // case 82 case 90: @@ -2239,63 +2497,63 @@ public Builder mergeFrom( { input.readMessage( internalGetSecondaryWorkerConfigFieldBuilder().getBuilder(), extensionRegistry); - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; break; } // case 98 case 106: { input.readMessage( internalGetSoftwareConfigFieldBuilder().getBuilder(), extensionRegistry); - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000100; break; } // case 106 case 122: { input.readMessage( internalGetEncryptionConfigFieldBuilder().getBuilder(), extensionRegistry); - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000400; break; } // case 122 case 130: { input.readMessage( internalGetSecurityConfigFieldBuilder().getBuilder(), extensionRegistry); - bitField0_ |= 0x00000800; + bitField0_ |= 0x00001000; break; } // case 130 case 138: { input.readMessage( internalGetLifecycleConfigFieldBuilder().getBuilder(), extensionRegistry); - bitField0_ |= 0x00001000; + bitField0_ |= 0x00002000; break; } // case 138 case 146: { input.readMessage( internalGetAutoscalingConfigFieldBuilder().getBuilder(), extensionRegistry); - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000800; break; } // case 146 case 154: { input.readMessage( internalGetEndpointConfigFieldBuilder().getBuilder(), extensionRegistry); - bitField0_ |= 0x00002000; + bitField0_ |= 0x00004000; break; } // case 154 case 162: { input.readMessage( internalGetMetastoreConfigFieldBuilder().getBuilder(), extensionRegistry); - bitField0_ |= 0x00004000; + bitField0_ |= 0x00008000; break; } // case 162 case 186: { input.readMessage( internalGetDataprocMetricConfigFieldBuilder().getBuilder(), extensionRegistry); - bitField0_ |= 0x00008000; + bitField0_ |= 0x00010000; break; } // case 186 case 202: @@ -2312,10 +2570,16 @@ public Builder mergeFrom( } break; } // case 202 + case 216: + { + clusterType_ = input.readEnum(); + bitField0_ |= 0x00000001; + break; + } // case 216 case 232: { clusterTier_ = input.readEnum(); - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; break; } // case 232 default: @@ -2337,6 +2601,113 @@ public Builder mergeFrom( private int bitField0_; + private int clusterType_ = 0; + + /** + * + * + *
+     * Optional. The type of the cluster.
+     * 
+ * + * + * .google.cloud.dataproc.v1.ClusterConfig.ClusterType cluster_type = 27 [(.google.api.field_behavior) = OPTIONAL]; + * + * + * @return The enum numeric value on the wire for clusterType. + */ + @java.lang.Override + public int getClusterTypeValue() { + return clusterType_; + } + + /** + * + * + *
+     * Optional. The type of the cluster.
+     * 
+ * + * + * .google.cloud.dataproc.v1.ClusterConfig.ClusterType cluster_type = 27 [(.google.api.field_behavior) = OPTIONAL]; + * + * + * @param value The enum numeric value on the wire for clusterType to set. + * @return This builder for chaining. + */ + public Builder setClusterTypeValue(int value) { + clusterType_ = value; + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + + /** + * + * + *
+     * Optional. The type of the cluster.
+     * 
+ * + * + * .google.cloud.dataproc.v1.ClusterConfig.ClusterType cluster_type = 27 [(.google.api.field_behavior) = OPTIONAL]; + * + * + * @return The clusterType. + */ + @java.lang.Override + public com.google.cloud.dataproc.v1.ClusterConfig.ClusterType getClusterType() { + com.google.cloud.dataproc.v1.ClusterConfig.ClusterType result = + com.google.cloud.dataproc.v1.ClusterConfig.ClusterType.forNumber(clusterType_); + return result == null + ? com.google.cloud.dataproc.v1.ClusterConfig.ClusterType.UNRECOGNIZED + : result; + } + + /** + * + * + *
+     * Optional. The type of the cluster.
+     * 
+ * + * + * .google.cloud.dataproc.v1.ClusterConfig.ClusterType cluster_type = 27 [(.google.api.field_behavior) = OPTIONAL]; + * + * + * @param value The clusterType to set. + * @return This builder for chaining. + */ + public Builder setClusterType(com.google.cloud.dataproc.v1.ClusterConfig.ClusterType value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000001; + clusterType_ = value.getNumber(); + onChanged(); + return this; + } + + /** + * + * + *
+     * Optional. The type of the cluster.
+     * 
+ * + * + * .google.cloud.dataproc.v1.ClusterConfig.ClusterType cluster_type = 27 [(.google.api.field_behavior) = OPTIONAL]; + * + * + * @return This builder for chaining. + */ + public Builder clearClusterType() { + bitField0_ = (bitField0_ & ~0x00000001); + clusterType_ = 0; + onChanged(); + return this; + } + private int clusterTier_ = 0; /** @@ -2373,7 +2744,7 @@ public int getClusterTierValue() { */ public Builder setClusterTierValue(int value) { clusterTier_ = value; - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; onChanged(); return this; } @@ -2418,7 +2789,7 @@ public Builder setClusterTier(com.google.cloud.dataproc.v1.ClusterConfig.Cluster if (value == null) { throw new NullPointerException(); } - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; clusterTier_ = value.getNumber(); onChanged(); return this; @@ -2438,7 +2809,7 @@ public Builder setClusterTier(com.google.cloud.dataproc.v1.ClusterConfig.Cluster * @return This builder for chaining. */ public Builder clearClusterTier() { - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); clusterTier_ = 0; onChanged(); return this; @@ -2539,7 +2910,7 @@ public Builder setConfigBucket(java.lang.String value) { throw new NullPointerException(); } configBucket_ = value; - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -2567,7 +2938,7 @@ public Builder setConfigBucket(java.lang.String value) { */ public Builder clearConfigBucket() { configBucket_ = getDefaultInstance().getConfigBucket(); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; } @@ -2600,7 +2971,7 @@ public Builder setConfigBucketBytes(com.google.protobuf.ByteString value) { } checkByteStringIsUtf8(value); configBucket_ = value; - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; onChanged(); return this; } @@ -2700,7 +3071,7 @@ public Builder setTempBucket(java.lang.String value) { throw new NullPointerException(); } tempBucket_ = value; - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -2728,7 +3099,7 @@ public Builder setTempBucket(java.lang.String value) { */ public Builder clearTempBucket() { tempBucket_ = getDefaultInstance().getTempBucket(); - bitField0_ = (bitField0_ & ~0x00000004); + bitField0_ = (bitField0_ & ~0x00000008); onChanged(); return this; } @@ -2761,7 +3132,7 @@ public Builder setTempBucketBytes(com.google.protobuf.ByteString value) { } checkByteStringIsUtf8(value); tempBucket_ = value; - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; onChanged(); return this; } @@ -2788,7 +3159,7 @@ public Builder setTempBucketBytes(com.google.protobuf.ByteString value) { * @return Whether the gceClusterConfig field is set. */ public boolean hasGceClusterConfig() { - return ((bitField0_ & 0x00000008) != 0); + return ((bitField0_ & 0x00000010) != 0); } /** @@ -2836,7 +3207,7 @@ public Builder setGceClusterConfig(com.google.cloud.dataproc.v1.GceClusterConfig } else { gceClusterConfigBuilder_.setMessage(value); } - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; onChanged(); return this; } @@ -2860,7 +3231,7 @@ public Builder setGceClusterConfig( } else { gceClusterConfigBuilder_.setMessage(builderForValue.build()); } - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; onChanged(); return this; } @@ -2879,7 +3250,7 @@ public Builder setGceClusterConfig( */ public Builder mergeGceClusterConfig(com.google.cloud.dataproc.v1.GceClusterConfig value) { if (gceClusterConfigBuilder_ == null) { - if (((bitField0_ & 0x00000008) != 0) + if (((bitField0_ & 0x00000010) != 0) && gceClusterConfig_ != null && gceClusterConfig_ != com.google.cloud.dataproc.v1.GceClusterConfig.getDefaultInstance()) { @@ -2891,7 +3262,7 @@ public Builder mergeGceClusterConfig(com.google.cloud.dataproc.v1.GceClusterConf gceClusterConfigBuilder_.mergeFrom(value); } if (gceClusterConfig_ != null) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; onChanged(); } return this; @@ -2910,7 +3281,7 @@ public Builder mergeGceClusterConfig(com.google.cloud.dataproc.v1.GceClusterConf * */ public Builder clearGceClusterConfig() { - bitField0_ = (bitField0_ & ~0x00000008); + bitField0_ = (bitField0_ & ~0x00000010); gceClusterConfig_ = null; if (gceClusterConfigBuilder_ != null) { gceClusterConfigBuilder_.dispose(); @@ -2933,7 +3304,7 @@ public Builder clearGceClusterConfig() { * */ public com.google.cloud.dataproc.v1.GceClusterConfig.Builder getGceClusterConfigBuilder() { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000010; onChanged(); return internalGetGceClusterConfigFieldBuilder().getBuilder(); } @@ -3011,7 +3382,7 @@ public com.google.cloud.dataproc.v1.GceClusterConfigOrBuilder getGceClusterConfi * @return Whether the masterConfig field is set. */ public boolean hasMasterConfig() { - return ((bitField0_ & 0x00000010) != 0); + return ((bitField0_ & 0x00000020) != 0); } /** @@ -3059,7 +3430,7 @@ public Builder setMasterConfig(com.google.cloud.dataproc.v1.InstanceGroupConfig } else { masterConfigBuilder_.setMessage(value); } - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; onChanged(); return this; } @@ -3083,7 +3454,7 @@ public Builder setMasterConfig( } else { masterConfigBuilder_.setMessage(builderForValue.build()); } - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; onChanged(); return this; } @@ -3102,7 +3473,7 @@ public Builder setMasterConfig( */ public Builder mergeMasterConfig(com.google.cloud.dataproc.v1.InstanceGroupConfig value) { if (masterConfigBuilder_ == null) { - if (((bitField0_ & 0x00000010) != 0) + if (((bitField0_ & 0x00000020) != 0) && masterConfig_ != null && masterConfig_ != com.google.cloud.dataproc.v1.InstanceGroupConfig.getDefaultInstance()) { @@ -3114,7 +3485,7 @@ public Builder mergeMasterConfig(com.google.cloud.dataproc.v1.InstanceGroupConfi masterConfigBuilder_.mergeFrom(value); } if (masterConfig_ != null) { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; onChanged(); } return this; @@ -3133,7 +3504,7 @@ public Builder mergeMasterConfig(com.google.cloud.dataproc.v1.InstanceGroupConfi * */ public Builder clearMasterConfig() { - bitField0_ = (bitField0_ & ~0x00000010); + bitField0_ = (bitField0_ & ~0x00000020); masterConfig_ = null; if (masterConfigBuilder_ != null) { masterConfigBuilder_.dispose(); @@ -3156,7 +3527,7 @@ public Builder clearMasterConfig() { * */ public com.google.cloud.dataproc.v1.InstanceGroupConfig.Builder getMasterConfigBuilder() { - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; onChanged(); return internalGetMasterConfigFieldBuilder().getBuilder(); } @@ -3234,7 +3605,7 @@ public com.google.cloud.dataproc.v1.InstanceGroupConfigOrBuilder getMasterConfig * @return Whether the workerConfig field is set. */ public boolean hasWorkerConfig() { - return ((bitField0_ & 0x00000020) != 0); + return ((bitField0_ & 0x00000040) != 0); } /** @@ -3282,7 +3653,7 @@ public Builder setWorkerConfig(com.google.cloud.dataproc.v1.InstanceGroupConfig } else { workerConfigBuilder_.setMessage(value); } - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000040; onChanged(); return this; } @@ -3306,7 +3677,7 @@ public Builder setWorkerConfig( } else { workerConfigBuilder_.setMessage(builderForValue.build()); } - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000040; onChanged(); return this; } @@ -3325,7 +3696,7 @@ public Builder setWorkerConfig( */ public Builder mergeWorkerConfig(com.google.cloud.dataproc.v1.InstanceGroupConfig value) { if (workerConfigBuilder_ == null) { - if (((bitField0_ & 0x00000020) != 0) + if (((bitField0_ & 0x00000040) != 0) && workerConfig_ != null && workerConfig_ != com.google.cloud.dataproc.v1.InstanceGroupConfig.getDefaultInstance()) { @@ -3337,7 +3708,7 @@ public Builder mergeWorkerConfig(com.google.cloud.dataproc.v1.InstanceGroupConfi workerConfigBuilder_.mergeFrom(value); } if (workerConfig_ != null) { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000040; onChanged(); } return this; @@ -3356,7 +3727,7 @@ public Builder mergeWorkerConfig(com.google.cloud.dataproc.v1.InstanceGroupConfi * */ public Builder clearWorkerConfig() { - bitField0_ = (bitField0_ & ~0x00000020); + bitField0_ = (bitField0_ & ~0x00000040); workerConfig_ = null; if (workerConfigBuilder_ != null) { workerConfigBuilder_.dispose(); @@ -3379,7 +3750,7 @@ public Builder clearWorkerConfig() { * */ public com.google.cloud.dataproc.v1.InstanceGroupConfig.Builder getWorkerConfigBuilder() { - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000040; onChanged(); return internalGetWorkerConfigFieldBuilder().getBuilder(); } @@ -3457,7 +3828,7 @@ public com.google.cloud.dataproc.v1.InstanceGroupConfigOrBuilder getWorkerConfig * @return Whether the secondaryWorkerConfig field is set. */ public boolean hasSecondaryWorkerConfig() { - return ((bitField0_ & 0x00000040) != 0); + return ((bitField0_ & 0x00000080) != 0); } /** @@ -3506,7 +3877,7 @@ public Builder setSecondaryWorkerConfig( } else { secondaryWorkerConfigBuilder_.setMessage(value); } - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; onChanged(); return this; } @@ -3530,7 +3901,7 @@ public Builder setSecondaryWorkerConfig( } else { secondaryWorkerConfigBuilder_.setMessage(builderForValue.build()); } - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; onChanged(); return this; } @@ -3550,7 +3921,7 @@ public Builder setSecondaryWorkerConfig( public Builder mergeSecondaryWorkerConfig( com.google.cloud.dataproc.v1.InstanceGroupConfig value) { if (secondaryWorkerConfigBuilder_ == null) { - if (((bitField0_ & 0x00000040) != 0) + if (((bitField0_ & 0x00000080) != 0) && secondaryWorkerConfig_ != null && secondaryWorkerConfig_ != com.google.cloud.dataproc.v1.InstanceGroupConfig.getDefaultInstance()) { @@ -3562,7 +3933,7 @@ public Builder mergeSecondaryWorkerConfig( secondaryWorkerConfigBuilder_.mergeFrom(value); } if (secondaryWorkerConfig_ != null) { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; onChanged(); } return this; @@ -3581,7 +3952,7 @@ public Builder mergeSecondaryWorkerConfig( * */ public Builder clearSecondaryWorkerConfig() { - bitField0_ = (bitField0_ & ~0x00000040); + bitField0_ = (bitField0_ & ~0x00000080); secondaryWorkerConfig_ = null; if (secondaryWorkerConfigBuilder_ != null) { secondaryWorkerConfigBuilder_.dispose(); @@ -3605,7 +3976,7 @@ public Builder clearSecondaryWorkerConfig() { */ public com.google.cloud.dataproc.v1.InstanceGroupConfig.Builder getSecondaryWorkerConfigBuilder() { - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; onChanged(); return internalGetSecondaryWorkerConfigFieldBuilder().getBuilder(); } @@ -3683,7 +4054,7 @@ public Builder clearSecondaryWorkerConfig() { * @return Whether the softwareConfig field is set. */ public boolean hasSoftwareConfig() { - return ((bitField0_ & 0x00000080) != 0); + return ((bitField0_ & 0x00000100) != 0); } /** @@ -3729,7 +4100,7 @@ public Builder setSoftwareConfig(com.google.cloud.dataproc.v1.SoftwareConfig val } else { softwareConfigBuilder_.setMessage(value); } - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000100; onChanged(); return this; } @@ -3752,7 +4123,7 @@ public Builder setSoftwareConfig( } else { softwareConfigBuilder_.setMessage(builderForValue.build()); } - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000100; onChanged(); return this; } @@ -3770,7 +4141,7 @@ public Builder setSoftwareConfig( */ public Builder mergeSoftwareConfig(com.google.cloud.dataproc.v1.SoftwareConfig value) { if (softwareConfigBuilder_ == null) { - if (((bitField0_ & 0x00000080) != 0) + if (((bitField0_ & 0x00000100) != 0) && softwareConfig_ != null && softwareConfig_ != com.google.cloud.dataproc.v1.SoftwareConfig.getDefaultInstance()) { @@ -3782,7 +4153,7 @@ public Builder mergeSoftwareConfig(com.google.cloud.dataproc.v1.SoftwareConfig v softwareConfigBuilder_.mergeFrom(value); } if (softwareConfig_ != null) { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000100; onChanged(); } return this; @@ -3800,7 +4171,7 @@ public Builder mergeSoftwareConfig(com.google.cloud.dataproc.v1.SoftwareConfig v * */ public Builder clearSoftwareConfig() { - bitField0_ = (bitField0_ & ~0x00000080); + bitField0_ = (bitField0_ & ~0x00000100); softwareConfig_ = null; if (softwareConfigBuilder_ != null) { softwareConfigBuilder_.dispose(); @@ -3822,7 +4193,7 @@ public Builder clearSoftwareConfig() { * */ public com.google.cloud.dataproc.v1.SoftwareConfig.Builder getSoftwareConfigBuilder() { - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000100; onChanged(); return internalGetSoftwareConfigFieldBuilder().getBuilder(); } @@ -3880,11 +4251,11 @@ public com.google.cloud.dataproc.v1.SoftwareConfigOrBuilder getSoftwareConfigOrB initializationActions_ = java.util.Collections.emptyList(); private void ensureInitializationActionsIsMutable() { - if (!((bitField0_ & 0x00000100) != 0)) { + if (!((bitField0_ & 0x00000200) != 0)) { initializationActions_ = new java.util.ArrayList( initializationActions_); - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; } } @@ -4270,7 +4641,7 @@ public Builder addAllInitializationActions( public Builder clearInitializationActions() { if (initializationActionsBuilder_ == null) { initializationActions_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000100); + bitField0_ = (bitField0_ & ~0x00000200); onChanged(); } else { initializationActionsBuilder_.clear(); @@ -4503,7 +4874,7 @@ public Builder removeInitializationActions(int index) { com.google.cloud.dataproc.v1.NodeInitializationAction.Builder, com.google.cloud.dataproc.v1.NodeInitializationActionOrBuilder>( initializationActions_, - ((bitField0_ & 0x00000100) != 0), + ((bitField0_ & 0x00000200) != 0), getParentForChildren(), isClean()); initializationActions_ = null; @@ -4532,7 +4903,7 @@ public Builder removeInitializationActions(int index) { * @return Whether the encryptionConfig field is set. */ public boolean hasEncryptionConfig() { - return ((bitField0_ & 0x00000200) != 0); + return ((bitField0_ & 0x00000400) != 0); } /** @@ -4578,7 +4949,7 @@ public Builder setEncryptionConfig(com.google.cloud.dataproc.v1.EncryptionConfig } else { encryptionConfigBuilder_.setMessage(value); } - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000400; onChanged(); return this; } @@ -4601,7 +4972,7 @@ public Builder setEncryptionConfig( } else { encryptionConfigBuilder_.setMessage(builderForValue.build()); } - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000400; onChanged(); return this; } @@ -4619,7 +4990,7 @@ public Builder setEncryptionConfig( */ public Builder mergeEncryptionConfig(com.google.cloud.dataproc.v1.EncryptionConfig value) { if (encryptionConfigBuilder_ == null) { - if (((bitField0_ & 0x00000200) != 0) + if (((bitField0_ & 0x00000400) != 0) && encryptionConfig_ != null && encryptionConfig_ != com.google.cloud.dataproc.v1.EncryptionConfig.getDefaultInstance()) { @@ -4631,7 +5002,7 @@ public Builder mergeEncryptionConfig(com.google.cloud.dataproc.v1.EncryptionConf encryptionConfigBuilder_.mergeFrom(value); } if (encryptionConfig_ != null) { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000400; onChanged(); } return this; @@ -4649,7 +5020,7 @@ public Builder mergeEncryptionConfig(com.google.cloud.dataproc.v1.EncryptionConf * */ public Builder clearEncryptionConfig() { - bitField0_ = (bitField0_ & ~0x00000200); + bitField0_ = (bitField0_ & ~0x00000400); encryptionConfig_ = null; if (encryptionConfigBuilder_ != null) { encryptionConfigBuilder_.dispose(); @@ -4671,7 +5042,7 @@ public Builder clearEncryptionConfig() { * */ public com.google.cloud.dataproc.v1.EncryptionConfig.Builder getEncryptionConfigBuilder() { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000400; onChanged(); return internalGetEncryptionConfigFieldBuilder().getBuilder(); } @@ -4747,7 +5118,7 @@ public com.google.cloud.dataproc.v1.EncryptionConfigOrBuilder getEncryptionConfi * @return Whether the autoscalingConfig field is set. */ public boolean hasAutoscalingConfig() { - return ((bitField0_ & 0x00000400) != 0); + return ((bitField0_ & 0x00000800) != 0); } /** @@ -4795,7 +5166,7 @@ public Builder setAutoscalingConfig(com.google.cloud.dataproc.v1.AutoscalingConf } else { autoscalingConfigBuilder_.setMessage(value); } - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000800; onChanged(); return this; } @@ -4819,7 +5190,7 @@ public Builder setAutoscalingConfig( } else { autoscalingConfigBuilder_.setMessage(builderForValue.build()); } - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000800; onChanged(); return this; } @@ -4838,7 +5209,7 @@ public Builder setAutoscalingConfig( */ public Builder mergeAutoscalingConfig(com.google.cloud.dataproc.v1.AutoscalingConfig value) { if (autoscalingConfigBuilder_ == null) { - if (((bitField0_ & 0x00000400) != 0) + if (((bitField0_ & 0x00000800) != 0) && autoscalingConfig_ != null && autoscalingConfig_ != com.google.cloud.dataproc.v1.AutoscalingConfig.getDefaultInstance()) { @@ -4850,7 +5221,7 @@ public Builder mergeAutoscalingConfig(com.google.cloud.dataproc.v1.AutoscalingCo autoscalingConfigBuilder_.mergeFrom(value); } if (autoscalingConfig_ != null) { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000800; onChanged(); } return this; @@ -4869,7 +5240,7 @@ public Builder mergeAutoscalingConfig(com.google.cloud.dataproc.v1.AutoscalingCo * */ public Builder clearAutoscalingConfig() { - bitField0_ = (bitField0_ & ~0x00000400); + bitField0_ = (bitField0_ & ~0x00000800); autoscalingConfig_ = null; if (autoscalingConfigBuilder_ != null) { autoscalingConfigBuilder_.dispose(); @@ -4892,7 +5263,7 @@ public Builder clearAutoscalingConfig() { * */ public com.google.cloud.dataproc.v1.AutoscalingConfig.Builder getAutoscalingConfigBuilder() { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000800; onChanged(); return internalGetAutoscalingConfigFieldBuilder().getBuilder(); } @@ -4969,7 +5340,7 @@ public com.google.cloud.dataproc.v1.AutoscalingConfigOrBuilder getAutoscalingCon * @return Whether the securityConfig field is set. */ public boolean hasSecurityConfig() { - return ((bitField0_ & 0x00000800) != 0); + return ((bitField0_ & 0x00001000) != 0); } /** @@ -5015,7 +5386,7 @@ public Builder setSecurityConfig(com.google.cloud.dataproc.v1.SecurityConfig val } else { securityConfigBuilder_.setMessage(value); } - bitField0_ |= 0x00000800; + bitField0_ |= 0x00001000; onChanged(); return this; } @@ -5038,7 +5409,7 @@ public Builder setSecurityConfig( } else { securityConfigBuilder_.setMessage(builderForValue.build()); } - bitField0_ |= 0x00000800; + bitField0_ |= 0x00001000; onChanged(); return this; } @@ -5056,7 +5427,7 @@ public Builder setSecurityConfig( */ public Builder mergeSecurityConfig(com.google.cloud.dataproc.v1.SecurityConfig value) { if (securityConfigBuilder_ == null) { - if (((bitField0_ & 0x00000800) != 0) + if (((bitField0_ & 0x00001000) != 0) && securityConfig_ != null && securityConfig_ != com.google.cloud.dataproc.v1.SecurityConfig.getDefaultInstance()) { @@ -5068,7 +5439,7 @@ public Builder mergeSecurityConfig(com.google.cloud.dataproc.v1.SecurityConfig v securityConfigBuilder_.mergeFrom(value); } if (securityConfig_ != null) { - bitField0_ |= 0x00000800; + bitField0_ |= 0x00001000; onChanged(); } return this; @@ -5086,7 +5457,7 @@ public Builder mergeSecurityConfig(com.google.cloud.dataproc.v1.SecurityConfig v * */ public Builder clearSecurityConfig() { - bitField0_ = (bitField0_ & ~0x00000800); + bitField0_ = (bitField0_ & ~0x00001000); securityConfig_ = null; if (securityConfigBuilder_ != null) { securityConfigBuilder_.dispose(); @@ -5108,7 +5479,7 @@ public Builder clearSecurityConfig() { * */ public com.google.cloud.dataproc.v1.SecurityConfig.Builder getSecurityConfigBuilder() { - bitField0_ |= 0x00000800; + bitField0_ |= 0x00001000; onChanged(); return internalGetSecurityConfigFieldBuilder().getBuilder(); } @@ -5183,7 +5554,7 @@ public com.google.cloud.dataproc.v1.SecurityConfigOrBuilder getSecurityConfigOrB * @return Whether the lifecycleConfig field is set. */ public boolean hasLifecycleConfig() { - return ((bitField0_ & 0x00001000) != 0); + return ((bitField0_ & 0x00002000) != 0); } /** @@ -5229,7 +5600,7 @@ public Builder setLifecycleConfig(com.google.cloud.dataproc.v1.LifecycleConfig v } else { lifecycleConfigBuilder_.setMessage(value); } - bitField0_ |= 0x00001000; + bitField0_ |= 0x00002000; onChanged(); return this; } @@ -5252,7 +5623,7 @@ public Builder setLifecycleConfig( } else { lifecycleConfigBuilder_.setMessage(builderForValue.build()); } - bitField0_ |= 0x00001000; + bitField0_ |= 0x00002000; onChanged(); return this; } @@ -5270,7 +5641,7 @@ public Builder setLifecycleConfig( */ public Builder mergeLifecycleConfig(com.google.cloud.dataproc.v1.LifecycleConfig value) { if (lifecycleConfigBuilder_ == null) { - if (((bitField0_ & 0x00001000) != 0) + if (((bitField0_ & 0x00002000) != 0) && lifecycleConfig_ != null && lifecycleConfig_ != com.google.cloud.dataproc.v1.LifecycleConfig.getDefaultInstance()) { @@ -5282,7 +5653,7 @@ public Builder mergeLifecycleConfig(com.google.cloud.dataproc.v1.LifecycleConfig lifecycleConfigBuilder_.mergeFrom(value); } if (lifecycleConfig_ != null) { - bitField0_ |= 0x00001000; + bitField0_ |= 0x00002000; onChanged(); } return this; @@ -5300,7 +5671,7 @@ public Builder mergeLifecycleConfig(com.google.cloud.dataproc.v1.LifecycleConfig * */ public Builder clearLifecycleConfig() { - bitField0_ = (bitField0_ & ~0x00001000); + bitField0_ = (bitField0_ & ~0x00002000); lifecycleConfig_ = null; if (lifecycleConfigBuilder_ != null) { lifecycleConfigBuilder_.dispose(); @@ -5322,7 +5693,7 @@ public Builder clearLifecycleConfig() { * */ public com.google.cloud.dataproc.v1.LifecycleConfig.Builder getLifecycleConfigBuilder() { - bitField0_ |= 0x00001000; + bitField0_ |= 0x00002000; onChanged(); return internalGetLifecycleConfigFieldBuilder().getBuilder(); } @@ -5397,7 +5768,7 @@ public com.google.cloud.dataproc.v1.LifecycleConfigOrBuilder getLifecycleConfigO * @return Whether the endpointConfig field is set. */ public boolean hasEndpointConfig() { - return ((bitField0_ & 0x00002000) != 0); + return ((bitField0_ & 0x00004000) != 0); } /** @@ -5443,7 +5814,7 @@ public Builder setEndpointConfig(com.google.cloud.dataproc.v1.EndpointConfig val } else { endpointConfigBuilder_.setMessage(value); } - bitField0_ |= 0x00002000; + bitField0_ |= 0x00004000; onChanged(); return this; } @@ -5466,7 +5837,7 @@ public Builder setEndpointConfig( } else { endpointConfigBuilder_.setMessage(builderForValue.build()); } - bitField0_ |= 0x00002000; + bitField0_ |= 0x00004000; onChanged(); return this; } @@ -5484,7 +5855,7 @@ public Builder setEndpointConfig( */ public Builder mergeEndpointConfig(com.google.cloud.dataproc.v1.EndpointConfig value) { if (endpointConfigBuilder_ == null) { - if (((bitField0_ & 0x00002000) != 0) + if (((bitField0_ & 0x00004000) != 0) && endpointConfig_ != null && endpointConfig_ != com.google.cloud.dataproc.v1.EndpointConfig.getDefaultInstance()) { @@ -5496,7 +5867,7 @@ public Builder mergeEndpointConfig(com.google.cloud.dataproc.v1.EndpointConfig v endpointConfigBuilder_.mergeFrom(value); } if (endpointConfig_ != null) { - bitField0_ |= 0x00002000; + bitField0_ |= 0x00004000; onChanged(); } return this; @@ -5514,7 +5885,7 @@ public Builder mergeEndpointConfig(com.google.cloud.dataproc.v1.EndpointConfig v * */ public Builder clearEndpointConfig() { - bitField0_ = (bitField0_ & ~0x00002000); + bitField0_ = (bitField0_ & ~0x00004000); endpointConfig_ = null; if (endpointConfigBuilder_ != null) { endpointConfigBuilder_.dispose(); @@ -5536,7 +5907,7 @@ public Builder clearEndpointConfig() { * */ public com.google.cloud.dataproc.v1.EndpointConfig.Builder getEndpointConfigBuilder() { - bitField0_ |= 0x00002000; + bitField0_ |= 0x00004000; onChanged(); return internalGetEndpointConfigFieldBuilder().getBuilder(); } @@ -5611,7 +5982,7 @@ public com.google.cloud.dataproc.v1.EndpointConfigOrBuilder getEndpointConfigOrB * @return Whether the metastoreConfig field is set. */ public boolean hasMetastoreConfig() { - return ((bitField0_ & 0x00004000) != 0); + return ((bitField0_ & 0x00008000) != 0); } /** @@ -5657,7 +6028,7 @@ public Builder setMetastoreConfig(com.google.cloud.dataproc.v1.MetastoreConfig v } else { metastoreConfigBuilder_.setMessage(value); } - bitField0_ |= 0x00004000; + bitField0_ |= 0x00008000; onChanged(); return this; } @@ -5680,7 +6051,7 @@ public Builder setMetastoreConfig( } else { metastoreConfigBuilder_.setMessage(builderForValue.build()); } - bitField0_ |= 0x00004000; + bitField0_ |= 0x00008000; onChanged(); return this; } @@ -5698,7 +6069,7 @@ public Builder setMetastoreConfig( */ public Builder mergeMetastoreConfig(com.google.cloud.dataproc.v1.MetastoreConfig value) { if (metastoreConfigBuilder_ == null) { - if (((bitField0_ & 0x00004000) != 0) + if (((bitField0_ & 0x00008000) != 0) && metastoreConfig_ != null && metastoreConfig_ != com.google.cloud.dataproc.v1.MetastoreConfig.getDefaultInstance()) { @@ -5710,7 +6081,7 @@ public Builder mergeMetastoreConfig(com.google.cloud.dataproc.v1.MetastoreConfig metastoreConfigBuilder_.mergeFrom(value); } if (metastoreConfig_ != null) { - bitField0_ |= 0x00004000; + bitField0_ |= 0x00008000; onChanged(); } return this; @@ -5728,7 +6099,7 @@ public Builder mergeMetastoreConfig(com.google.cloud.dataproc.v1.MetastoreConfig * */ public Builder clearMetastoreConfig() { - bitField0_ = (bitField0_ & ~0x00004000); + bitField0_ = (bitField0_ & ~0x00008000); metastoreConfig_ = null; if (metastoreConfigBuilder_ != null) { metastoreConfigBuilder_.dispose(); @@ -5750,7 +6121,7 @@ public Builder clearMetastoreConfig() { * */ public com.google.cloud.dataproc.v1.MetastoreConfig.Builder getMetastoreConfigBuilder() { - bitField0_ |= 0x00004000; + bitField0_ |= 0x00008000; onChanged(); return internalGetMetastoreConfigFieldBuilder().getBuilder(); } @@ -5825,7 +6196,7 @@ public com.google.cloud.dataproc.v1.MetastoreConfigOrBuilder getMetastoreConfigO * @return Whether the dataprocMetricConfig field is set. */ public boolean hasDataprocMetricConfig() { - return ((bitField0_ & 0x00008000) != 0); + return ((bitField0_ & 0x00010000) != 0); } /** @@ -5872,7 +6243,7 @@ public Builder setDataprocMetricConfig( } else { dataprocMetricConfigBuilder_.setMessage(value); } - bitField0_ |= 0x00008000; + bitField0_ |= 0x00010000; onChanged(); return this; } @@ -5895,7 +6266,7 @@ public Builder setDataprocMetricConfig( } else { dataprocMetricConfigBuilder_.setMessage(builderForValue.build()); } - bitField0_ |= 0x00008000; + bitField0_ |= 0x00010000; onChanged(); return this; } @@ -5914,7 +6285,7 @@ public Builder setDataprocMetricConfig( public Builder mergeDataprocMetricConfig( com.google.cloud.dataproc.v1.DataprocMetricConfig value) { if (dataprocMetricConfigBuilder_ == null) { - if (((bitField0_ & 0x00008000) != 0) + if (((bitField0_ & 0x00010000) != 0) && dataprocMetricConfig_ != null && dataprocMetricConfig_ != com.google.cloud.dataproc.v1.DataprocMetricConfig.getDefaultInstance()) { @@ -5926,7 +6297,7 @@ public Builder mergeDataprocMetricConfig( dataprocMetricConfigBuilder_.mergeFrom(value); } if (dataprocMetricConfig_ != null) { - bitField0_ |= 0x00008000; + bitField0_ |= 0x00010000; onChanged(); } return this; @@ -5944,7 +6315,7 @@ public Builder mergeDataprocMetricConfig( * */ public Builder clearDataprocMetricConfig() { - bitField0_ = (bitField0_ & ~0x00008000); + bitField0_ = (bitField0_ & ~0x00010000); dataprocMetricConfig_ = null; if (dataprocMetricConfigBuilder_ != null) { dataprocMetricConfigBuilder_.dispose(); @@ -5967,7 +6338,7 @@ public Builder clearDataprocMetricConfig() { */ public com.google.cloud.dataproc.v1.DataprocMetricConfig.Builder getDataprocMetricConfigBuilder() { - bitField0_ |= 0x00008000; + bitField0_ |= 0x00010000; onChanged(); return internalGetDataprocMetricConfigFieldBuilder().getBuilder(); } @@ -6026,11 +6397,11 @@ public Builder clearDataprocMetricConfig() { java.util.Collections.emptyList(); private void ensureAuxiliaryNodeGroupsIsMutable() { - if (!((bitField0_ & 0x00010000) != 0)) { + if (!((bitField0_ & 0x00020000) != 0)) { auxiliaryNodeGroups_ = new java.util.ArrayList( auxiliaryNodeGroups_); - bitField0_ |= 0x00010000; + bitField0_ |= 0x00020000; } } @@ -6281,7 +6652,7 @@ public Builder addAllAuxiliaryNodeGroups( public Builder clearAuxiliaryNodeGroups() { if (auxiliaryNodeGroupsBuilder_ == null) { auxiliaryNodeGroups_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00010000); + bitField0_ = (bitField0_ & ~0x00020000); onChanged(); } else { auxiliaryNodeGroupsBuilder_.clear(); @@ -6428,7 +6799,7 @@ public com.google.cloud.dataproc.v1.AuxiliaryNodeGroup.Builder addAuxiliaryNodeG com.google.cloud.dataproc.v1.AuxiliaryNodeGroup.Builder, com.google.cloud.dataproc.v1.AuxiliaryNodeGroupOrBuilder>( auxiliaryNodeGroups_, - ((bitField0_ & 0x00010000) != 0), + ((bitField0_ & 0x00020000) != 0), getParentForChildren(), isClean()); auxiliaryNodeGroups_ = null; diff --git a/java-dataproc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ClusterConfigOrBuilder.java b/java-dataproc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ClusterConfigOrBuilder.java index 786d36f463fa..a1b2294e2353 100644 --- a/java-dataproc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ClusterConfigOrBuilder.java +++ b/java-dataproc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ClusterConfigOrBuilder.java @@ -26,6 +26,36 @@ public interface ClusterConfigOrBuilder // @@protoc_insertion_point(interface_extends:google.cloud.dataproc.v1.ClusterConfig) com.google.protobuf.MessageOrBuilder { + /** + * + * + *
+   * Optional. The type of the cluster.
+   * 
+ * + * + * .google.cloud.dataproc.v1.ClusterConfig.ClusterType cluster_type = 27 [(.google.api.field_behavior) = OPTIONAL]; + * + * + * @return The enum numeric value on the wire for clusterType. + */ + int getClusterTypeValue(); + + /** + * + * + *
+   * Optional. The type of the cluster.
+   * 
+ * + * + * .google.cloud.dataproc.v1.ClusterConfig.ClusterType cluster_type = 27 [(.google.api.field_behavior) = OPTIONAL]; + * + * + * @return The clusterType. + */ + com.google.cloud.dataproc.v1.ClusterConfig.ClusterType getClusterType(); + /** * * diff --git a/java-dataproc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ClustersProto.java b/java-dataproc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ClustersProto.java index af32dfc1dbff..e47d4f05559c 100644 --- a/java-dataproc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ClustersProto.java +++ b/java-dataproc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ClustersProto.java @@ -291,8 +291,10 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + " \001(\0132(.google.cloud.dataproc.v1.ClusterMetricsB\003\340A\003\032-\n" + "\013LabelsEntry\022\013\n" + "\003key\030\001 \001(\t\022\r\n" - + "\005value\030\002 \001(\t:\0028\001\"\265\n\n\r" + + "\005value\030\002 \001(\t:\0028\001\"\341\013\n\r" + "ClusterConfig\022N\n" + + "\014cluster_type\030\033 \001(\01623" + + ".google.cloud.dataproc.v1.ClusterConfig.ClusterTypeB\003\340A\001\022N\n" + "\014cluster_tier\030\035 \001(\01623" + ".google.cloud.dataproc.v1.ClusterConfig.ClusterTierB\003\340A\001\022\032\n\r" + "config_bucket\030\001 \001(\tB\003\340A\001\022\030\n" @@ -324,26 +326,31 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\026dataproc_metric_config\030\027" + " \001(\0132..google.cloud.dataproc.v1.DataprocMetricConfigB\003\340A\001\022P\n" + "\025auxiliary_node_groups\030\031" - + " \003(\0132,.google.cloud.dataproc.v1.AuxiliaryNodeGroupB\003\340A\001\"`\n" + + " \003(\0132,.google.cloud.dataproc.v1.AuxiliaryNodeGroupB\003\340A\001\"Z\n" + + "\013ClusterType\022\034\n" + + "\030CLUSTER_TYPE_UNSPECIFIED\020\000\022\014\n" + + "\010STANDARD\020\001\022\017\n" + + "\013SINGLE_NODE\020\002\022\016\n\n" + + "ZERO_SCALE\020\003\"`\n" + "\013ClusterTier\022\034\n" + "\030CLUSTER_TIER_UNSPECIFIED\020\000\022\031\n" + "\025CLUSTER_TIER_STANDARD\020\001\022\030\n" + "\024CLUSTER_TIER_PREMIUM\020\002\"\204\002\n" + "\024VirtualClusterConfig\022\033\n" + "\016staging_bucket\030\001 \001(\tB\003\340A\001\022[\n" - + "\031kubernetes_cluster_config\030\006 \001(\01321.google.cloud.d" - + "ataproc.v1.KubernetesClusterConfigB\003\340A\002H\000\022Y\n" - + "\031auxiliary_services_config\030\007 \001(\01321.g" - + "oogle.cloud.dataproc.v1.AuxiliaryServicesConfigB\003\340A\001B\027\n" + + "\031kubernetes_cluster_config\030\006 \001(\01321.go" + + "ogle.cloud.dataproc.v1.KubernetesClusterConfigB\003\340A\002H\000\022Y\n" + + "\031auxiliary_services_config\030\007" + + " \001(\01321.google.cloud.dataproc.v1.AuxiliaryServicesConfigB\003\340A\001B\027\n" + "\025infrastructure_config\"\301\001\n" + "\027AuxiliaryServicesConfig\022H\n" + "\020metastore_config\030\001" + " \001(\0132).google.cloud.dataproc.v1.MetastoreConfigB\003\340A\001\022\\\n" - + "\033spark_history_server_config\030\002" - + " \001(\01322.google.cloud.dataproc.v1.SparkHistoryServerConfigB\003\340A\001\"\272\001\n" + + "\033spark_history_server_config\030\002 \001(\01322.google.cl" + + "oud.dataproc.v1.SparkHistoryServerConfigB\003\340A\001\"\272\001\n" + "\016EndpointConfig\022P\n\n" - + "http_ports\030\001 \003(\01327.googl" - + "e.cloud.dataproc.v1.EndpointConfig.HttpPortsEntryB\003\340A\003\022$\n" + + "http_ports\030\001" + + " \003(\01327.google.cloud.dataproc.v1.EndpointConfig.HttpPortsEntryB\003\340A\003\022$\n" + "\027enable_http_port_access\030\002 \001(\010B\003\340A\001\0320\n" + "\016HttpPortsEntry\022\013\n" + "\003key\030\001 \001(\t\022\r\n" @@ -359,21 +366,21 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\013network_uri\030\002 \001(\tB\003\340A\001\022\033\n" + "\016subnetwork_uri\030\006 \001(\tB\003\340A\001\022\"\n" + "\020internal_ip_only\030\007 \001(\010B\003\340A\001H\000\210\001\001\022k\n" - + "\032private_ipv6_google_access\030\014 \001(\0162B.goog" - + "le.cloud.dataproc.v1.GceClusterConfig.PrivateIpv6GoogleAccessB\003\340A\001\022\034\n" + + "\032private_ipv6_google_access\030\014 \001(\0162B.google.cloud.dataproc.v1.GceClus" + + "terConfig.PrivateIpv6GoogleAccessB\003\340A\001\022\034\n" + "\017service_account\030\010 \001(\tB\003\340A\001\022#\n" + "\026service_account_scopes\030\003 \003(\tB\003\340A\001\022\014\n" + "\004tags\030\004 \003(\t\022O\n" - + "\010metadata\030\005" - + " \003(\01328.google.cloud.dataproc.v1.GceClusterConfig.MetadataEntryB\003\340A\001\022P\n" - + "\024reservation_affinity\030\013" - + " \001(\0132-.google.cloud.dataproc.v1.ReservationAffinityB\003\340A\001\022M\n" + + "\010metadata\030\005 \003(\01328.google.cloud.datapro" + + "c.v1.GceClusterConfig.MetadataEntryB\003\340A\001\022P\n" + + "\024reservation_affinity\030\013 \001(\0132-.google." + + "cloud.dataproc.v1.ReservationAffinityB\003\340A\001\022M\n" + "\023node_group_affinity\030\r" + " \001(\0132+.google.cloud.dataproc.v1.NodeGroupAffinityB\003\340A\001\022W\n" - + "\030shielded_instance_config\030\016 \001(\01320.google.cloud.d" - + "ataproc.v1.ShieldedInstanceConfigB\003\340A\001\022_\n" - + "\034confidential_instance_config\030\017 \001(\01324.g" - + "oogle.cloud.dataproc.v1.ConfidentialInstanceConfigB\003\340A\001\032/\n\r" + + "\030shielded_instance_config\030\016 \001(\01320.go" + + "ogle.cloud.dataproc.v1.ShieldedInstanceConfigB\003\340A\001\022_\n" + + "\034confidential_instance_config\030\017" + + " \001(\01324.google.cloud.dataproc.v1.ConfidentialInstanceConfigB\003\340A\001\032/\n\r" + "MetadataEntry\022\013\n" + "\003key\030\001 \001(\t\022\r\n" + "\005value\030\002 \001(\t:\0028\001\"\203\001\n" @@ -398,19 +405,20 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\023InstanceGroupConfig\022\032\n\r" + "num_instances\030\001 \001(\005B\003\340A\001\022\033\n" + "\016instance_names\030\002 \003(\tB\003\340A\003\022M\n" - + "\023instance_references\030\013" - + " \003(\0132+.google.cloud.dataproc.v1.InstanceReferenceB\003\340A\003\022\026\n" + + "\023instance_references\030\013 \003(\0132+." + + "google.cloud.dataproc.v1.InstanceReferenceB\003\340A\003\022\026\n" + "\timage_uri\030\003 \001(\tB\003\340A\001\022\035\n" + "\020machine_type_uri\030\004 \001(\tB\003\340A\001\022>\n" - + "\013disk_config\030\005" - + " \001(\0132$.google.cloud.dataproc.v1.DiskConfigB\003\340A\001\022\033\n" + + "\013disk_config\030\005 " + + "\001(\0132$.google.cloud.dataproc.v1.DiskConfigB\003\340A\001\022\033\n" + "\016is_preemptible\030\006 \001(\010B\003\340A\003\022Y\n" + "\016preemptibility\030\n" - + " \001(\0162<.google.cloud.dataproc.v1.InstanceGroupConfig.PreemptibilityB\003\340A\001\022O\n" - + "\024managed_group_config\030\007" - + " \001(\0132,.google.cloud.dataproc.v1.ManagedGroupConfigB\003\340A\003\022F\n" - + "\014accelerators\030\010" - + " \003(\0132+.google.cloud.dataproc.v1.AcceleratorConfigB\003\340A\001\022\035\n" + + " \001(\0162<.google.cloud.datap" + + "roc.v1.InstanceGroupConfig.PreemptibilityB\003\340A\001\022O\n" + + "\024managed_group_config\030\007 \001(\0132,.g" + + "oogle.cloud.dataproc.v1.ManagedGroupConfigB\003\340A\003\022F\n" + + "\014accelerators\030\010 \003(\0132+.google.c" + + "loud.dataproc.v1.AcceleratorConfigB\003\340A\001\022\035\n" + "\020min_cpu_platform\030\t \001(\tB\003\340A\001\022\036\n" + "\021min_num_instances\030\014 \001(\005B\003\340A\001\022]\n" + "\033instance_flexibility_policy\030\r" @@ -436,13 +444,12 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\033instance_group_manager_name\030\002 \001(\tB\003\340A\003\022\'\n" + "\032instance_group_manager_uri\030\003 \001(\tB\003\340A\003\"\345\005\n" + "\031InstanceFlexibilityPolicy\022m\n" - + "\026provisioning_model_mix\030\001 \001(\0132H.google.cloud.dataproc.v1.I" - + "nstanceFlexibilityPolicy.ProvisioningModelMixB\003\340A\001\022k\n" - + "\027instance_selection_list\030\002 \003(\0132E.google.cloud.dataproc.v1.InstanceF" - + "lexibilityPolicy.InstanceSelectionB\003\340A\001\022t\n" - + "\032instance_selection_results\030\003 \003(\0132K.go" - + "ogle.cloud.dataproc.v1.InstanceFlexibili" - + "tyPolicy.InstanceSelectionResultB\003\340A\003\032\274\001\n" + + "\026provisioning_model_mix\030\001 \001(\0132H.google.cloud.d" + + "ataproc.v1.InstanceFlexibilityPolicy.ProvisioningModelMixB\003\340A\001\022k\n" + + "\027instance_selection_list\030\002 \003(\0132E.google.cloud.dataproc." + + "v1.InstanceFlexibilityPolicy.InstanceSelectionB\003\340A\001\022t\n" + + "\032instance_selection_results\030\003 \003(\0132K.google.cloud.dataproc.v1.Insta" + + "nceFlexibilityPolicy.InstanceSelectionResultB\003\340A\003\032\274\001\n" + "\024ProvisioningModelMix\022(\n" + "\026standard_capacity_base\030\001 \001(\005B\003\340A\001H\000\210\001\001\0226\n" + "$standard_capacity_percent_above_base\030\002" @@ -471,37 +478,37 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\033_boot_disk_provisioned_iopsB#\n" + "!_boot_disk_provisioned_throughput\"n\n" + "\022AuxiliaryNodeGroup\022<\n\n" - + "node_group\030\001 \001(\0132#" - + ".google.cloud.dataproc.v1.NodeGroupB\003\340A\002\022\032\n\r" + + "node_group\030\001" + + " \001(\0132#.google.cloud.dataproc.v1.NodeGroupB\003\340A\002\022\032\n\r" + "node_group_id\030\002 \001(\tB\003\340A\001\"\275\003\n" + "\tNodeGroup\022\014\n" + "\004name\030\001 \001(\t\022<\n" - + "\005roles\030\002 \003(\0162(.google" - + ".cloud.dataproc.v1.NodeGroup.RoleB\003\340A\002\022M\n" - + "\021node_group_config\030\003" - + " \001(\0132-.google.cloud.dataproc.v1.InstanceGroupConfigB\003\340A\001\022D\n" - + "\006labels\030\004" - + " \003(\0132/.google.cloud.dataproc.v1.NodeGroup.LabelsEntryB\003\340A\001\032-\n" + + "\005roles\030\002 " + + "\003(\0162(.google.cloud.dataproc.v1.NodeGroup.RoleB\003\340A\002\022M\n" + + "\021node_group_config\030\003 \001(\0132-." + + "google.cloud.dataproc.v1.InstanceGroupConfigB\003\340A\001\022D\n" + + "\006labels\030\004 \003(\0132/.google.cloud" + + ".dataproc.v1.NodeGroup.LabelsEntryB\003\340A\001\032-\n" + "\013LabelsEntry\022\013\n" + "\003key\030\001 \001(\t\022\r\n" + "\005value\030\002 \001(\t:\0028\001\"(\n" + "\004Role\022\024\n" + "\020ROLE_UNSPECIFIED\020\000\022\n\n" + "\006DRIVER\020\001:v\352As\n" - + "!dataproc.googleapis.com/NodeGroup\022Npr" - + "ojects/{project}/regions/{region}/clusters/{cluster}/nodeGroups/{node_group}\"s\n" + + "!dataproc.googleapis.com/NodeGroup\022Nprojects/{project}/regions/{re" + + "gion}/clusters/{cluster}/nodeGroups/{node_group}\"s\n" + "\030NodeInitializationAction\022\034\n" + "\017executable_file\030\001 \001(\tB\003\340A\002\0229\n" + "\021execution_timeout\030\002" + " \001(\0132\031.google.protobuf.DurationB\003\340A\001\"\326\003\n\r" + "ClusterStatus\022A\n" - + "\005state\030\001 \001(\0162-.google.clou" - + "d.dataproc.v1.ClusterStatus.StateB\003\340A\003\022\026\n" + + "\005state\030\001 \001(\0162-" + + ".google.cloud.dataproc.v1.ClusterStatus.StateB\003\340A\003\022\026\n" + "\006detail\030\002 \001(\tB\006\340A\003\340A\001\0229\n" + "\020state_start_time\030\003" + " \001(\0132\032.google.protobuf.TimestampB\003\340A\003\022G\n" - + "\010substate\030\004" - + " \001(\01620.google.cloud.dataproc.v1.ClusterStatus.SubstateB\003\340A\003\"\247\001\n" + + "\010substate\030\004 \001(\01620.google" + + ".cloud.dataproc.v1.ClusterStatus.SubstateB\003\340A\003\"\247\001\n" + "\005State\022\013\n" + "\007UNKNOWN\020\000\022\014\n" + "\010CREATING\020\001\022\013\n" @@ -520,10 +527,10 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\tUNHEALTHY\020\001\022\020\n" + "\014STALE_STATUS\020\002\"\240\001\n" + "\016SecurityConfig\022F\n" - + "\017kerberos_config\030\001" - + " \001(\0132(.google.cloud.dataproc.v1.KerberosConfigB\003\340A\001\022F\n" - + "\017identity_config\030\002" - + " \001(\0132(.google.cloud.dataproc.v1.IdentityConfigB\003\340A\001\"\220\004\n" + + "\017kerberos_config\030\001 \001" + + "(\0132(.google.cloud.dataproc.v1.KerberosConfigB\003\340A\001\022F\n" + + "\017identity_config\030\002 \001(\0132(.goo" + + "gle.cloud.dataproc.v1.IdentityConfigB\003\340A\001\"\220\004\n" + "\016KerberosConfig\022\034\n" + "\017enable_kerberos\030\001 \001(\010B\003\340A\001\022(\n" + "\033root_principal_password_uri\030\002 \001(\tB\003\340A\001\022\030\n" @@ -543,17 +550,17 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\022tgt_lifetime_hours\030\016 \001(\005B\003\340A\001\022\022\n" + "\005realm\030\017 \001(\tB\003\340A\001\"\306\001\n" + "\016IdentityConfig\022r\n" - + "\034user_service_account_mapping\030\001 \003(\0132G.google.cloud.datapro" - + "c.v1.IdentityConfig.UserServiceAccountMappingEntryB\003\340A\002\032@\n" + + "\034user_service_account_mapping\030\001 \003(\0132G.google.c" + + "loud.dataproc.v1.IdentityConfig.UserServiceAccountMappingEntryB\003\340A\002\032@\n" + "\036UserServiceAccountMappingEntry\022\013\n" + "\003key\030\001 \001(\t\022\r\n" + "\005value\030\002 \001(\t:\0028\001\"\371\001\n" + "\016SoftwareConfig\022\032\n\r" + "image_version\030\001 \001(\tB\003\340A\001\022Q\n\n" - + "properties\030\002 \003(\01328.google.cl" - + "oud.dataproc.v1.SoftwareConfig.PropertiesEntryB\003\340A\001\022E\n" - + "\023optional_components\030\003 \003(\016" - + "2#.google.cloud.dataproc.v1.ComponentB\003\340A\001\0321\n" + + "properties\030\002 \003(\013" + + "28.google.cloud.dataproc.v1.SoftwareConfig.PropertiesEntryB\003\340A\001\022E\n" + + "\023optional_components\030\003" + + " \003(\0162#.google.cloud.dataproc.v1.ComponentB\003\340A\001\0321\n" + "\017PropertiesEntry\022\013\n" + "\003key\030\001 \001(\t\022\r\n" + "\005value\030\002 \001(\t:\0028\001\"\203\002\n" @@ -571,23 +578,23 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\032dataproc_metastore_service\030\001 \001(\tB(\340A\002\372A\"\n" + " metastore.googleapis.com/Service\"\232\002\n" + "\016ClusterMetrics\022O\n" - + "\014hdfs_metrics\030\001" - + " \003(\01329.google.cloud.dataproc.v1.ClusterMetrics.HdfsMetricsEntry\022O\n" - + "\014yarn_metrics\030\002" - + " \003(\01329.google.cloud.dataproc.v1.ClusterMetrics.YarnMetricsEntry\0322\n" + + "\014hdfs_metrics\030\001 \003(\01329.google.cloud" + + ".dataproc.v1.ClusterMetrics.HdfsMetricsEntry\022O\n" + + "\014yarn_metrics\030\002 \003(\01329.google.clou" + + "d.dataproc.v1.ClusterMetrics.YarnMetricsEntry\0322\n" + "\020HdfsMetricsEntry\022\013\n" - + "\003key\030\001 \001(\t\022\r\n" - + "\005value\030\002 \001(\003:\0028\001\0322\n" - + "\020YarnMetricsEntry\022\013\n" + "\003key\030\001 \001(\t\022\r" + "\n" + + "\005value\030\002 \001(\003:\0028\001\0322\n" + + "\020YarnMetricsEntry\022\013\n" + + "\003key\030\001 \001(\t\022\r\n" + "\005value\030\002 \001(\003:\0028\001\"\235\003\n" + "\024DataprocMetricConfig\022K\n" - + "\007metrics\030\001 \003(\01325.google.cloud.datap" - + "roc.v1.DataprocMetricConfig.MetricB\003\340A\002\032\200\001\n" + + "\007metrics\030\001 \003(\01325.google" + + ".cloud.dataproc.v1.DataprocMetricConfig.MetricB\003\340A\002\032\200\001\n" + "\006Metric\022W\n\r" - + "metric_source\030\001 \001(\0162;.goog" - + "le.cloud.dataproc.v1.DataprocMetricConfig.MetricSourceB\003\340A\002\022\035\n" + + "metric_source\030\001" + + " \001(\0162;.google.cloud.dataproc.v1.DataprocMetricConfig.MetricSourceB\003\340A\002\022\035\n" + "\020metric_overrides\030\002 \003(\tB\003\340A\001\"\264\001\n" + "\014MetricSource\022\035\n" + "\031METRIC_SOURCE_UNSPECIFIED\020\000\022\035\n" @@ -602,11 +609,11 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\024CreateClusterRequest\022\027\n\n" + "project_id\030\001 \001(\tB\003\340A\002\022\023\n" + "\006region\030\003 \001(\tB\003\340A\002\0227\n" - + "\007cluster\030\002 \001(" - + "\0132!.google.cloud.dataproc.v1.ClusterB\003\340A\002\022\027\n\n" + + "\007cluster\030\002" + + " \001(\0132!.google.cloud.dataproc.v1.ClusterB\003\340A\002\022\027\n\n" + "request_id\030\004 \001(\tB\003\340A\001\022V\n" - + " action_on_failed_primary_workers\030\005" - + " \001(\0162\'.google.cloud.dataproc.v1.FailureActionB\003\340A\001\"\256\002\n" + + " action_on_failed_primary_workers\030\005 \001(\016" + + "2\'.google.cloud.dataproc.v1.FailureActionB\003\340A\001\"\256\002\n" + "\024UpdateClusterRequest\022\027\n\n" + "project_id\030\001 \001(\tB\003\340A\002\022\023\n" + "\006region\030\005 \001(\tB\003\340A\002\022\031\n" @@ -654,13 +661,14 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\006region\030\003 \001(\tB\003\340A\002\022\031\n" + "\014cluster_name\030\002 \001(\tB\003\340A\002\022\034\n" + "\017tarball_gcs_dir\030\004 \001(\tB\003\340A\001\022[\n" - + "\016tarball_access\030\005" - + " \001(\0162>.google.cloud.dataproc.v1.DiagnoseClusterRequest.TarballAccessB\003\340A\001\0226\n" + + "\016tarball_access\030\005 \001(\0162>.google.cloud.datapr" + + "oc.v1.DiagnoseClusterRequest.TarballAccessB\003\340A\001\0226\n" + "\022diagnosis_interval\030\006" + " \001(\0132\025.google.type.IntervalB\003\340A\001\022\021\n" + "\004jobs\030\n" + " \003(\tB\003\340A\001\022!\n" - + "\024yarn_application_ids\030\013 \003(\tB\003\340A\001\"g\n\r" + + "\024yarn_application_ids\030\013 \003(\tB\003\340A\001\"g\n" + + "\r" + "TarballAccess\022\036\n" + "\032TARBALL_ACCESS_UNSPECIFIED\020\000\022\030\n" + "\024GOOGLE_CLOUD_SUPPORT\020\001\022\034\n" @@ -668,8 +676,8 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\026DiagnoseClusterResults\022\027\n\n" + "output_uri\030\001 \001(\tB\003\340A\003\"\370\001\n" + "\023ReservationAffinity\022Y\n" - + "\030consume_reservation_type\030\001 \001(\0162" - + "2.google.cloud.dataproc.v1.ReservationAffinity.TypeB\003\340A\001\022\020\n" + + "\030consume_reservation_type\030\001" + + " \001(\01622.google.cloud.dataproc.v1.ReservationAffinity.TypeB\003\340A\001\022\020\n" + "\003key\030\002 \001(\tB\003\340A\001\022\023\n" + "\006values\030\003 \003(\tB\003\340A\001\"_\n" + "\004Type\022\024\n" @@ -678,53 +686,51 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\017ANY_RESERVATION\020\002\022\030\n" + "\024SPECIFIC_RESERVATION\020\0032\344\020\n" + "\021ClusterController\022\200\002\n\r" - + "CreateCluster\022..googl" - + "e.cloud.dataproc.v1.CreateClusterRequest\032\035.google.longrunning.Operation\"\237\001\312A<\n" - + "\007Cluster\0221google.cloud.dataproc.v1.Cluster" - + "OperationMetadata\332A\031project_id,region,cl" - + "uster\202\323\344\223\002>\"3/v1/projects/{project_id}/regions/{region}/clusters:\007cluster\022\250\002\n\r" - + "UpdateCluster\022..google.cloud.dataproc.v1.U" - + "pdateClusterRequest\032\035.google.longrunning.Operation\"\307\001\312A<\n" - + "\007Cluster\0221google.cloud.dataproc.v1.ClusterOperationMetadata\332A2p" - + "roject_id,region,cluster_name,cluster,up" - + "date_mask\202\323\344\223\002M2B/v1/projects/{project_i" - + "d}/regions/{region}/clusters/{cluster_name}:\007cluster\022\356\001\n" - + "\013StopCluster\022,.google.cl" - + "oud.dataproc.v1.StopClusterRequest\032\035.google.longrunning.Operation\"\221\001\312A<\n" - + "\007Cluster\0221google.cloud.dataproc.v1.ClusterOperat" - + "ionMetadata\202\323\344\223\002L\"G/v1/projects/{project" - + "_id}/regions/{region}/clusters/{cluster_name}:stop:\001*\022\361\001\n" - + "\014StartCluster\022-.google." - + "cloud.dataproc.v1.StartClusterRequest\032\035.google.longrunning.Operation\"\222\001\312A<\n" - + "\007Cluster\0221google.cloud.dataproc.v1.ClusterOpe" - + "rationMetadata\202\323\344\223\002M\"H/v1/projects/{proj" - + "ect_id}/regions/{region}/clusters/{cluster_name}:start:\001*\022\231\002\n\r" - + "DeleteCluster\022..google.cloud.dataproc.v1.DeleteClusterRequ" - + "est\032\035.google.longrunning.Operation\"\270\001\312AJ\n" - + "\025google.protobuf.Empty\0221google.cloud.da" - + "taproc.v1.ClusterOperationMetadata\332A\036pro" - + "ject_id,region,cluster_name\202\323\344\223\002D*B/v1/p" - + "rojects/{project_id}/regions/{region}/clusters/{cluster_name}\022\311\001\n\n" - + "GetCluster\022+.google.cloud.dataproc.v1.GetClusterReques" - + "t\032!.google.cloud.dataproc.v1.Cluster\"k\332A" - + "\036project_id,region,cluster_name\202\323\344\223\002D\022B/" - + "v1/projects/{project_id}/regions/{region}/clusters/{cluster_name}\022\331\001\n" - + "\014ListClusters\022-.google.cloud.dataproc.v1.ListCluste" - + "rsRequest\032..google.cloud.dataproc.v1.Lis" - + "tClustersResponse\"j\332A\021project_id,region\332" - + "A\030project_id,region,filter\202\323\344\223\0025\0223/v1/pr" - + "ojects/{project_id}/regions/{region}/clusters\022\252\002\n" - + "\017DiagnoseCluster\0220.google.cloud" - + ".dataproc.v1.DiagnoseClusterRequest\032\035.google.longrunning.Operation\"\305\001\312AK\n" - + "\026DiagnoseClusterResults\0221google.cloud.dataproc." - + "v1.ClusterOperationMetadata\332A\036project_id" - + ",region,cluster_name\202\323\344\223\002P\"K/v1/projects" - + "/{project_id}/regions/{region}/clusters/" - + "{cluster_name}:diagnose:\001*\032K\312A\027dataproc." - + "googleapis.com\322A.https://www.googleapis.com/auth/cloud-platformBl\n" + + "CreateCluster\022..google.cloud.dataproc.v1.CreateCl" + + "usterRequest\032\035.google.longrunning.Operation\"\237\001\312A<\n" + + "\007Cluster\0221google.cloud.dataproc.v1.ClusterOperationMetadata\332A\031project_" + + "id,region,cluster\202\323\344\223\002>\"3/v1/projects/{p" + + "roject_id}/regions/{region}/clusters:\007cluster\022\250\002\n\r" + + "UpdateCluster\022..google.cloud.d" + + "ataproc.v1.UpdateClusterRequest\032\035.google.longrunning.Operation\"\307\001\312A<\n" + + "\007Cluster\0221google.cloud.dataproc.v1.ClusterOperation" + + "Metadata\332A2project_id,region,cluster_nam" + + "e,cluster,update_mask\202\323\344\223\002M2B/v1/project" + + "s/{project_id}/regions/{region}/clusters/{cluster_name}:\007cluster\022\356\001\n" + + "\013StopCluster\022,.google.cloud.dataproc.v1.StopClusterR" + + "equest\032\035.google.longrunning.Operation\"\221\001\312A<\n" + + "\007Cluster\0221google.cloud.dataproc.v1.C" + + "lusterOperationMetadata\202\323\344\223\002L\"G/v1/proje" + + "cts/{project_id}/regions/{region}/clusters/{cluster_name}:stop:\001*\022\361\001\n" + + "\014StartCluster\022-.google.cloud.dataproc.v1.StartClust" + + "erRequest\032\035.google.longrunning.Operation\"\222\001\312A<\n" + + "\007Cluster\0221google.cloud.dataproc.v" + + "1.ClusterOperationMetadata\202\323\344\223\002M\"H/v1/pr" + + "ojects/{project_id}/regions/{region}/clusters/{cluster_name}:start:\001*\022\231\002\n\r" + + "DeleteCluster\022..google.cloud.dataproc.v1.Delet" + + "eClusterRequest\032\035.google.longrunning.Operation\"\270\001\312AJ\n" + + "\025google.protobuf.Empty\0221google.cloud.dataproc.v1.ClusterOperationMe" + + "tadata\332A\036project_id,region,cluster_name\202" + + "\323\344\223\002D*B/v1/projects/{project_id}/regions/{region}/clusters/{cluster_name}\022\311\001\n\n" + + "GetCluster\022+.google.cloud.dataproc.v1.GetC" + + "lusterRequest\032!.google.cloud.dataproc.v1" + + ".Cluster\"k\332A\036project_id,region,cluster_n" + + "ame\202\323\344\223\002D\022B/v1/projects/{project_id}/reg" + + "ions/{region}/clusters/{cluster_name}\022\331\001\n" + + "\014ListClusters\022-.google.cloud.dataproc.v" + + "1.ListClustersRequest\032..google.cloud.dat" + + "aproc.v1.ListClustersResponse\"j\332A\021projec" + + "t_id,region\332A\030project_id,region,filter\202\323" + + "\344\223\0025\0223/v1/projects/{project_id}/regions/{region}/clusters\022\252\002\n" + + "\017DiagnoseCluster\0220.google.cloud.dataproc.v1.DiagnoseCluster" + + "Request\032\035.google.longrunning.Operation\"\305\001\312AK\n" + + "\026DiagnoseClusterResults\0221google.cloud.dataproc.v1.ClusterOperationMetadata\332" + + "A\036project_id,region,cluster_name\202\323\344\223\002P\"K" + + "/v1/projects/{project_id}/regions/{region}/clusters/{cluster_name}:diagnose:\001*\032K" + + "\312A\027dataproc.googleapis.com\322A.https://www.googleapis.com/auth/cloud-platformBl\n" + "\034com.google.cloud.dataproc.v1B\r" - + "ClustersProtoP\001Z;cloud.google.com/go/dataproc/v2/apiv1/dataproc" - + "pb;dataprocpbb\006proto3" + + "ClustersProtoP\001Z;cloud.google.com/go/dataproc/v2/ap" + + "iv1/dataprocpb;dataprocpbb\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( @@ -773,6 +779,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_google_cloud_dataproc_v1_ClusterConfig_descriptor, new java.lang.String[] { + "ClusterType", "ClusterTier", "ConfigBucket", "TempBucket", diff --git a/java-dataproc/proto-google-cloud-dataproc-v1/src/main/proto/google/cloud/dataproc/v1/autoscaling_policies.proto b/java-dataproc/proto-google-cloud-dataproc-v1/src/main/proto/google/cloud/dataproc/v1/autoscaling_policies.proto index cf2322cc7007..e9d6fa76ff7b 100644 --- a/java-dataproc/proto-google-cloud-dataproc-v1/src/main/proto/google/cloud/dataproc/v1/autoscaling_policies.proto +++ b/java-dataproc/proto-google-cloud-dataproc-v1/src/main/proto/google/cloud/dataproc/v1/autoscaling_policies.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -116,6 +116,20 @@ message AutoscalingPolicy { pattern: "projects/{project}/regions/{region}/autoscalingPolicies/{autoscaling_policy}" }; + // The type of the clusters for which this autoscaling policy is to be + // configured. + enum ClusterType { + // Not set. + CLUSTER_TYPE_UNSPECIFIED = 0; + + // Standard dataproc cluster with a minimum of two primary workers. + STANDARD = 1; + + // Clusters that can use only secondary workers and be scaled down to zero + // secondary worker nodes. + ZERO_SCALE = 2; + } + // Required. The policy id. // // The id must contain only letters (a-z, A-Z), numbers (0-9), @@ -158,6 +172,10 @@ message AutoscalingPolicy { // 1035](https://www.ietf.org/rfc/rfc1035.txt). No more than 32 labels can be // associated with an autoscaling policy. map labels = 6 [(google.api.field_behavior) = OPTIONAL]; + + // Optional. The type of the clusters for which this autoscaling policy is to + // be configured. + ClusterType cluster_type = 7 [(google.api.field_behavior) = OPTIONAL]; } // Basic algorithm for autoscaling. diff --git a/java-dataproc/proto-google-cloud-dataproc-v1/src/main/proto/google/cloud/dataproc/v1/clusters.proto b/java-dataproc/proto-google-cloud-dataproc-v1/src/main/proto/google/cloud/dataproc/v1/clusters.proto index c48db0db367e..d55ea617419e 100644 --- a/java-dataproc/proto-google-cloud-dataproc-v1/src/main/proto/google/cloud/dataproc/v1/clusters.proto +++ b/java-dataproc/proto-google-cloud-dataproc-v1/src/main/proto/google/cloud/dataproc/v1/clusters.proto @@ -1,4 +1,4 @@ -// Copyright 2025 Google LLC +// Copyright 2026 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -215,6 +215,22 @@ message Cluster { // The cluster config. message ClusterConfig { + // The type of the cluster. + enum ClusterType { + // Not set. + CLUSTER_TYPE_UNSPECIFIED = 0; + + // Standard dataproc cluster with a minimum of two primary workers. + STANDARD = 1; + + // https://cloud.google.com/dataproc/docs/concepts/configuring-clusters/single-node-clusters + SINGLE_NODE = 2; + + // Clusters that can use only secondary workers and be scaled down to zero + // secondary worker nodes. + ZERO_SCALE = 3; + } + // The cluster tier. enum ClusterTier { // Not set. Works the same as CLUSTER_TIER_STANDARD. @@ -227,6 +243,9 @@ message ClusterConfig { CLUSTER_TIER_PREMIUM = 2; } + // Optional. The type of the cluster. + ClusterType cluster_type = 27 [(google.api.field_behavior) = OPTIONAL]; + // Optional. The cluster tier. ClusterTier cluster_tier = 29 [(google.api.field_behavior) = OPTIONAL];