---
.../dataflow/v1beta3/EnvironmentProto.java | 112 +++----
.../v1beta3/SdkHarnessContainerImage.java | 293 ++++++++++++++++++
.../SdkHarnessContainerImageOrBuilder.java | 55 ++++
.../google/dataflow/v1beta3/environment.proto | 4 +
4 files changed, 408 insertions(+), 56 deletions(-)
diff --git a/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/EnvironmentProto.java b/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/EnvironmentProto.java
index b788a4ca..b75f4459 100644
--- a/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/EnvironmentProto.java
+++ b/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/EnvironmentProto.java
@@ -121,61 +121,61 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
+ "worker_main_class\030\023 \001(\t\"p\n\023AutoscalingSe"
+ "ttings\022@\n\talgorithm\030\001 \001(\0162-.google.dataf"
+ "low.v1beta3.AutoscalingAlgorithm\022\027\n\017max_"
- + "num_workers\030\002 \001(\005\"r\n\030SdkHarnessContainer"
- + "Image\022\027\n\017container_image\030\001 \001(\t\022%\n\035use_si"
- + "ngle_core_per_container\030\002 \001(\010\022\026\n\016environ"
- + "ment_id\030\003 \001(\t\"\362\007\n\nWorkerPool\022\014\n\004kind\030\001 \001"
- + "(\t\022\023\n\013num_workers\030\002 \001(\005\0222\n\010packages\030\003 \003("
- + "\0132 .google.dataflow.v1beta3.Package\022G\n\023d"
- + "efault_package_set\030\004 \001(\0162*.google.datafl"
- + "ow.v1beta3.DefaultPackageSet\022\024\n\014machine_"
- + "type\030\005 \001(\t\022@\n\017teardown_policy\030\006 \001(\0162\'.go"
- + "ogle.dataflow.v1beta3.TeardownPolicy\022\024\n\014"
- + "disk_size_gb\030\007 \001(\005\022\021\n\tdisk_type\030\020 \001(\t\022\031\n"
- + "\021disk_source_image\030\010 \001(\t\022\014\n\004zone\030\t \001(\t\022H"
- + "\n\023taskrunner_settings\030\n \001(\0132+.google.dat"
- + "aflow.v1beta3.TaskRunnerSettings\022\033\n\023on_h"
- + "ost_maintenance\030\013 \001(\t\0221\n\ndata_disks\030\014 \003("
- + "\0132\035.google.dataflow.v1beta3.Disk\022C\n\010meta"
- + "data\030\r \003(\01321.google.dataflow.v1beta3.Wor"
- + "kerPool.MetadataEntry\022J\n\024autoscaling_set"
- + "tings\030\016 \001(\0132,.google.dataflow.v1beta3.Au"
- + "toscalingSettings\022\'\n\tpool_args\030\017 \001(\0132\024.g"
- + "oogle.protobuf.Any\022\017\n\007network\030\021 \001(\t\022\022\n\ns"
- + "ubnetwork\030\023 \001(\t\022&\n\036worker_harness_contai"
- + "ner_image\030\022 \001(\t\022\036\n\026num_threads_per_worke"
- + "r\030\024 \001(\005\022O\n\020ip_configuration\030\025 \001(\01625.goog"
- + "le.dataflow.v1beta3.WorkerIPAddressConfi"
- + "guration\022W\n\034sdk_harness_container_images"
- + "\030\026 \003(\01321.google.dataflow.v1beta3.SdkHarn"
- + "essContainerImage\032/\n\rMetadataEntry\022\013\n\003ke"
- + "y\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\".\n\014DebugOptio"
- + "ns\022\036\n\026enable_hot_key_logging\030\001 \001(\010*K\n\007Jo"
- + "bType\022\024\n\020JOB_TYPE_UNKNOWN\020\000\022\022\n\016JOB_TYPE_"
- + "BATCH\020\001\022\026\n\022JOB_TYPE_STREAMING\020\002*k\n\032FlexR"
- + "esourceSchedulingGoal\022\026\n\022FLEXRS_UNSPECIF"
- + "IED\020\000\022\032\n\026FLEXRS_SPEED_OPTIMIZED\020\001\022\031\n\025FLE"
- + "XRS_COST_OPTIMIZED\020\002*o\n\016TeardownPolicy\022\033"
- + "\n\027TEARDOWN_POLICY_UNKNOWN\020\000\022\023\n\017TEARDOWN_"
- + "ALWAYS\020\001\022\027\n\023TEARDOWN_ON_SUCCESS\020\002\022\022\n\016TEA"
- + "RDOWN_NEVER\020\003*\220\001\n\021DefaultPackageSet\022\037\n\033D"
- + "EFAULT_PACKAGE_SET_UNKNOWN\020\000\022\034\n\030DEFAULT_"
- + "PACKAGE_SET_NONE\020\001\022\034\n\030DEFAULT_PACKAGE_SE"
- + "T_JAVA\020\002\022\036\n\032DEFAULT_PACKAGE_SET_PYTHON\020\003"
- + "*z\n\024AutoscalingAlgorithm\022!\n\035AUTOSCALING_"
- + "ALGORITHM_UNKNOWN\020\000\022\036\n\032AUTOSCALING_ALGOR"
- + "ITHM_NONE\020\001\022\037\n\033AUTOSCALING_ALGORITHM_BAS"
- + "IC\020\002*f\n\034WorkerIPAddressConfiguration\022\031\n\025"
- + "WORKER_IP_UNSPECIFIED\020\000\022\024\n\020WORKER_IP_PUB"
- + "LIC\020\001\022\025\n\021WORKER_IP_PRIVATE\020\002*L\n\013ShuffleM"
- + "ode\022\034\n\030SHUFFLE_MODE_UNSPECIFIED\020\000\022\014\n\010VM_"
- + "BASED\020\001\022\021\n\rSERVICE_BASED\020\002B\325\001\n\033com.googl"
- + "e.dataflow.v1beta3B\020EnvironmentProtoP\001Z?"
- + "google.golang.org/genproto/googleapis/da"
- + "taflow/v1beta3;dataflow\252\002\035Google.Cloud.D"
- + "ataflow.V1Beta3\312\002\035Google\\Cloud\\Dataflow\\"
- + "V1beta3\352\002 Google::Cloud::Dataflow::V1bet"
- + "a3b\006proto3"
+ + "num_workers\030\002 \001(\005\"\210\001\n\030SdkHarnessContaine"
+ + "rImage\022\027\n\017container_image\030\001 \001(\t\022%\n\035use_s"
+ + "ingle_core_per_container\030\002 \001(\010\022\026\n\016enviro"
+ + "nment_id\030\003 \001(\t\022\024\n\014capabilities\030\004 \003(\t\"\362\007\n"
+ + "\nWorkerPool\022\014\n\004kind\030\001 \001(\t\022\023\n\013num_workers"
+ + "\030\002 \001(\005\0222\n\010packages\030\003 \003(\0132 .google.datafl"
+ + "ow.v1beta3.Package\022G\n\023default_package_se"
+ + "t\030\004 \001(\0162*.google.dataflow.v1beta3.Defaul"
+ + "tPackageSet\022\024\n\014machine_type\030\005 \001(\t\022@\n\017tea"
+ + "rdown_policy\030\006 \001(\0162\'.google.dataflow.v1b"
+ + "eta3.TeardownPolicy\022\024\n\014disk_size_gb\030\007 \001("
+ + "\005\022\021\n\tdisk_type\030\020 \001(\t\022\031\n\021disk_source_imag"
+ + "e\030\010 \001(\t\022\014\n\004zone\030\t \001(\t\022H\n\023taskrunner_sett"
+ + "ings\030\n \001(\0132+.google.dataflow.v1beta3.Tas"
+ + "kRunnerSettings\022\033\n\023on_host_maintenance\030\013"
+ + " \001(\t\0221\n\ndata_disks\030\014 \003(\0132\035.google.datafl"
+ + "ow.v1beta3.Disk\022C\n\010metadata\030\r \003(\01321.goog"
+ + "le.dataflow.v1beta3.WorkerPool.MetadataE"
+ + "ntry\022J\n\024autoscaling_settings\030\016 \001(\0132,.goo"
+ + "gle.dataflow.v1beta3.AutoscalingSettings"
+ + "\022\'\n\tpool_args\030\017 \001(\0132\024.google.protobuf.An"
+ + "y\022\017\n\007network\030\021 \001(\t\022\022\n\nsubnetwork\030\023 \001(\t\022&"
+ + "\n\036worker_harness_container_image\030\022 \001(\t\022\036"
+ + "\n\026num_threads_per_worker\030\024 \001(\005\022O\n\020ip_con"
+ + "figuration\030\025 \001(\01625.google.dataflow.v1bet"
+ + "a3.WorkerIPAddressConfiguration\022W\n\034sdk_h"
+ + "arness_container_images\030\026 \003(\01321.google.d"
+ + "ataflow.v1beta3.SdkHarnessContainerImage"
+ + "\032/\n\rMetadataEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030"
+ + "\002 \001(\t:\0028\001\".\n\014DebugOptions\022\036\n\026enable_hot_"
+ + "key_logging\030\001 \001(\010*K\n\007JobType\022\024\n\020JOB_TYPE"
+ + "_UNKNOWN\020\000\022\022\n\016JOB_TYPE_BATCH\020\001\022\026\n\022JOB_TY"
+ + "PE_STREAMING\020\002*k\n\032FlexResourceScheduling"
+ + "Goal\022\026\n\022FLEXRS_UNSPECIFIED\020\000\022\032\n\026FLEXRS_S"
+ + "PEED_OPTIMIZED\020\001\022\031\n\025FLEXRS_COST_OPTIMIZE"
+ + "D\020\002*o\n\016TeardownPolicy\022\033\n\027TEARDOWN_POLICY"
+ + "_UNKNOWN\020\000\022\023\n\017TEARDOWN_ALWAYS\020\001\022\027\n\023TEARD"
+ + "OWN_ON_SUCCESS\020\002\022\022\n\016TEARDOWN_NEVER\020\003*\220\001\n"
+ + "\021DefaultPackageSet\022\037\n\033DEFAULT_PACKAGE_SE"
+ + "T_UNKNOWN\020\000\022\034\n\030DEFAULT_PACKAGE_SET_NONE\020"
+ + "\001\022\034\n\030DEFAULT_PACKAGE_SET_JAVA\020\002\022\036\n\032DEFAU"
+ + "LT_PACKAGE_SET_PYTHON\020\003*z\n\024AutoscalingAl"
+ + "gorithm\022!\n\035AUTOSCALING_ALGORITHM_UNKNOWN"
+ + "\020\000\022\036\n\032AUTOSCALING_ALGORITHM_NONE\020\001\022\037\n\033AU"
+ + "TOSCALING_ALGORITHM_BASIC\020\002*f\n\034WorkerIPA"
+ + "ddressConfiguration\022\031\n\025WORKER_IP_UNSPECI"
+ + "FIED\020\000\022\024\n\020WORKER_IP_PUBLIC\020\001\022\025\n\021WORKER_I"
+ + "P_PRIVATE\020\002*L\n\013ShuffleMode\022\034\n\030SHUFFLE_MO"
+ + "DE_UNSPECIFIED\020\000\022\014\n\010VM_BASED\020\001\022\021\n\rSERVIC"
+ + "E_BASED\020\002B\325\001\n\033com.google.dataflow.v1beta"
+ + "3B\020EnvironmentProtoP\001Z?google.golang.org"
+ + "/genproto/googleapis/dataflow/v1beta3;da"
+ + "taflow\252\002\035Google.Cloud.Dataflow.V1Beta3\312\002"
+ + "\035Google\\Cloud\\Dataflow\\V1beta3\352\002 Google:"
+ + ":Cloud::Dataflow::V1beta3b\006proto3"
};
descriptor =
com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -278,7 +278,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_google_dataflow_v1beta3_SdkHarnessContainerImage_descriptor,
new java.lang.String[] {
- "ContainerImage", "UseSingleCorePerContainer", "EnvironmentId",
+ "ContainerImage", "UseSingleCorePerContainer", "EnvironmentId", "Capabilities",
});
internal_static_google_dataflow_v1beta3_WorkerPool_descriptor =
getDescriptor().getMessageTypes().get(7);
diff --git a/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/SdkHarnessContainerImage.java b/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/SdkHarnessContainerImage.java
index 5f7700d9..1266b633 100644
--- a/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/SdkHarnessContainerImage.java
+++ b/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/SdkHarnessContainerImage.java
@@ -40,6 +40,7 @@ private SdkHarnessContainerImage(com.google.protobuf.GeneratedMessageV3.Builder<
private SdkHarnessContainerImage() {
containerImage_ = "";
environmentId_ = "";
+ capabilities_ = com.google.protobuf.LazyStringArrayList.EMPTY;
}
@java.lang.Override
@@ -61,6 +62,7 @@ private SdkHarnessContainerImage(
if (extensionRegistry == null) {
throw new java.lang.NullPointerException();
}
+ int mutable_bitField0_ = 0;
com.google.protobuf.UnknownFieldSet.Builder unknownFields =
com.google.protobuf.UnknownFieldSet.newBuilder();
try {
@@ -90,6 +92,16 @@ private SdkHarnessContainerImage(
environmentId_ = s;
break;
}
+ case 34:
+ {
+ java.lang.String s = input.readStringRequireUtf8();
+ if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+ capabilities_ = new com.google.protobuf.LazyStringArrayList();
+ mutable_bitField0_ |= 0x00000001;
+ }
+ capabilities_.add(s);
+ break;
+ }
default:
{
if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
@@ -104,6 +116,9 @@ private SdkHarnessContainerImage(
} catch (java.io.IOException e) {
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
} finally {
+ if (((mutable_bitField0_ & 0x00000001) != 0)) {
+ capabilities_ = capabilities_.getUnmodifiableView();
+ }
this.unknownFields = unknownFields.build();
makeExtensionsImmutable();
}
@@ -246,6 +261,71 @@ public com.google.protobuf.ByteString getEnvironmentIdBytes() {
}
}
+ public static final int CAPABILITIES_FIELD_NUMBER = 4;
+ private com.google.protobuf.LazyStringList capabilities_;
+ /**
+ *
+ *
+ *
+ * The set of capabilities enumerated in the above Environment proto. See also
+ * https://github.com/apache/beam/blob/master/model/pipeline/src/main/proto/beam_runner_api.proto
+ *
+ *
+ * repeated string capabilities = 4;
+ *
+ * @return A list containing the capabilities.
+ */
+ public com.google.protobuf.ProtocolStringList getCapabilitiesList() {
+ return capabilities_;
+ }
+ /**
+ *
+ *
+ *
+ * The set of capabilities enumerated in the above Environment proto. See also
+ * https://github.com/apache/beam/blob/master/model/pipeline/src/main/proto/beam_runner_api.proto
+ *
+ *
+ * repeated string capabilities = 4;
+ *
+ * @return The count of capabilities.
+ */
+ public int getCapabilitiesCount() {
+ return capabilities_.size();
+ }
+ /**
+ *
+ *
+ *
+ * The set of capabilities enumerated in the above Environment proto. See also
+ * https://github.com/apache/beam/blob/master/model/pipeline/src/main/proto/beam_runner_api.proto
+ *
+ *
+ * repeated string capabilities = 4;
+ *
+ * @param index The index of the element to return.
+ * @return The capabilities at the given index.
+ */
+ public java.lang.String getCapabilities(int index) {
+ return capabilities_.get(index);
+ }
+ /**
+ *
+ *
+ *
+ * The set of capabilities enumerated in the above Environment proto. See also
+ * https://github.com/apache/beam/blob/master/model/pipeline/src/main/proto/beam_runner_api.proto
+ *
+ *
+ * repeated string capabilities = 4;
+ *
+ * @param index The index of the value to return.
+ * @return The bytes of the capabilities at the given index.
+ */
+ public com.google.protobuf.ByteString getCapabilitiesBytes(int index) {
+ return capabilities_.getByteString(index);
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
@@ -269,6 +349,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(environmentId_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 3, environmentId_);
}
+ for (int i = 0; i < capabilities_.size(); i++) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 4, capabilities_.getRaw(i));
+ }
unknownFields.writeTo(output);
}
@@ -287,6 +370,14 @@ public int getSerializedSize() {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(environmentId_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, environmentId_);
}
+ {
+ int dataSize = 0;
+ for (int i = 0; i < capabilities_.size(); i++) {
+ dataSize += computeStringSizeNoTag(capabilities_.getRaw(i));
+ }
+ size += dataSize;
+ size += 1 * getCapabilitiesList().size();
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -306,6 +397,7 @@ public boolean equals(final java.lang.Object obj) {
if (!getContainerImage().equals(other.getContainerImage())) return false;
if (getUseSingleCorePerContainer() != other.getUseSingleCorePerContainer()) return false;
if (!getEnvironmentId().equals(other.getEnvironmentId())) return false;
+ if (!getCapabilitiesList().equals(other.getCapabilitiesList())) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
}
@@ -323,6 +415,10 @@ public int hashCode() {
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getUseSingleCorePerContainer());
hash = (37 * hash) + ENVIRONMENT_ID_FIELD_NUMBER;
hash = (53 * hash) + getEnvironmentId().hashCode();
+ if (getCapabilitiesCount() > 0) {
+ hash = (37 * hash) + CAPABILITIES_FIELD_NUMBER;
+ hash = (53 * hash) + getCapabilitiesList().hashCode();
+ }
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -474,6 +570,8 @@ public Builder clear() {
environmentId_ = "";
+ capabilities_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+ bitField0_ = (bitField0_ & ~0x00000001);
return this;
}
@@ -501,9 +599,15 @@ public com.google.dataflow.v1beta3.SdkHarnessContainerImage build() {
public com.google.dataflow.v1beta3.SdkHarnessContainerImage buildPartial() {
com.google.dataflow.v1beta3.SdkHarnessContainerImage result =
new com.google.dataflow.v1beta3.SdkHarnessContainerImage(this);
+ int from_bitField0_ = bitField0_;
result.containerImage_ = containerImage_;
result.useSingleCorePerContainer_ = useSingleCorePerContainer_;
result.environmentId_ = environmentId_;
+ if (((bitField0_ & 0x00000001) != 0)) {
+ capabilities_ = capabilities_.getUnmodifiableView();
+ bitField0_ = (bitField0_ & ~0x00000001);
+ }
+ result.capabilities_ = capabilities_;
onBuilt();
return result;
}
@@ -565,6 +669,16 @@ public Builder mergeFrom(com.google.dataflow.v1beta3.SdkHarnessContainerImage ot
environmentId_ = other.environmentId_;
onChanged();
}
+ if (!other.capabilities_.isEmpty()) {
+ if (capabilities_.isEmpty()) {
+ capabilities_ = other.capabilities_;
+ bitField0_ = (bitField0_ & ~0x00000001);
+ } else {
+ ensureCapabilitiesIsMutable();
+ capabilities_.addAll(other.capabilities_);
+ }
+ onChanged();
+ }
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -595,6 +709,8 @@ public Builder mergeFrom(
return this;
}
+ private int bitField0_;
+
private java.lang.Object containerImage_ = "";
/**
*
@@ -876,6 +992,183 @@ public Builder setEnvironmentIdBytes(com.google.protobuf.ByteString value) {
return this;
}
+ private com.google.protobuf.LazyStringList capabilities_ =
+ com.google.protobuf.LazyStringArrayList.EMPTY;
+
+ private void ensureCapabilitiesIsMutable() {
+ if (!((bitField0_ & 0x00000001) != 0)) {
+ capabilities_ = new com.google.protobuf.LazyStringArrayList(capabilities_);
+ bitField0_ |= 0x00000001;
+ }
+ }
+ /**
+ *
+ *
+ *
+ * The set of capabilities enumerated in the above Environment proto. See also
+ * https://github.com/apache/beam/blob/master/model/pipeline/src/main/proto/beam_runner_api.proto
+ *
+ *
+ * repeated string capabilities = 4;
+ *
+ * @return A list containing the capabilities.
+ */
+ public com.google.protobuf.ProtocolStringList getCapabilitiesList() {
+ return capabilities_.getUnmodifiableView();
+ }
+ /**
+ *
+ *
+ *
+ * The set of capabilities enumerated in the above Environment proto. See also
+ * https://github.com/apache/beam/blob/master/model/pipeline/src/main/proto/beam_runner_api.proto
+ *
+ *
+ * repeated string capabilities = 4;
+ *
+ * @return The count of capabilities.
+ */
+ public int getCapabilitiesCount() {
+ return capabilities_.size();
+ }
+ /**
+ *
+ *
+ *
+ * The set of capabilities enumerated in the above Environment proto. See also
+ * https://github.com/apache/beam/blob/master/model/pipeline/src/main/proto/beam_runner_api.proto
+ *
+ *
+ * repeated string capabilities = 4;
+ *
+ * @param index The index of the element to return.
+ * @return The capabilities at the given index.
+ */
+ public java.lang.String getCapabilities(int index) {
+ return capabilities_.get(index);
+ }
+ /**
+ *
+ *
+ *
+ * The set of capabilities enumerated in the above Environment proto. See also
+ * https://github.com/apache/beam/blob/master/model/pipeline/src/main/proto/beam_runner_api.proto
+ *
+ *
+ * repeated string capabilities = 4;
+ *
+ * @param index The index of the value to return.
+ * @return The bytes of the capabilities at the given index.
+ */
+ public com.google.protobuf.ByteString getCapabilitiesBytes(int index) {
+ return capabilities_.getByteString(index);
+ }
+ /**
+ *
+ *
+ *
+ * The set of capabilities enumerated in the above Environment proto. See also
+ * https://github.com/apache/beam/blob/master/model/pipeline/src/main/proto/beam_runner_api.proto
+ *
+ *
+ * repeated string capabilities = 4;
+ *
+ * @param index The index to set the value at.
+ * @param value The capabilities to set.
+ * @return This builder for chaining.
+ */
+ public Builder setCapabilities(int index, java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ ensureCapabilitiesIsMutable();
+ capabilities_.set(index, value);
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ *
+ *
+ * The set of capabilities enumerated in the above Environment proto. See also
+ * https://github.com/apache/beam/blob/master/model/pipeline/src/main/proto/beam_runner_api.proto
+ *
+ *
+ * repeated string capabilities = 4;
+ *
+ * @param value The capabilities to add.
+ * @return This builder for chaining.
+ */
+ public Builder addCapabilities(java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ ensureCapabilitiesIsMutable();
+ capabilities_.add(value);
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ *
+ *
+ * The set of capabilities enumerated in the above Environment proto. See also
+ * https://github.com/apache/beam/blob/master/model/pipeline/src/main/proto/beam_runner_api.proto
+ *
+ *
+ * repeated string capabilities = 4;
+ *
+ * @param values The capabilities to add.
+ * @return This builder for chaining.
+ */
+ public Builder addAllCapabilities(java.lang.Iterable values) {
+ ensureCapabilitiesIsMutable();
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(values, capabilities_);
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ *
+ *
+ * The set of capabilities enumerated in the above Environment proto. See also
+ * https://github.com/apache/beam/blob/master/model/pipeline/src/main/proto/beam_runner_api.proto
+ *
+ *
+ * repeated string capabilities = 4;
+ *
+ * @return This builder for chaining.
+ */
+ public Builder clearCapabilities() {
+ capabilities_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+ bitField0_ = (bitField0_ & ~0x00000001);
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ *
+ *
+ * The set of capabilities enumerated in the above Environment proto. See also
+ * https://github.com/apache/beam/blob/master/model/pipeline/src/main/proto/beam_runner_api.proto
+ *
+ *
+ * repeated string capabilities = 4;
+ *
+ * @param value The bytes of the capabilities to add.
+ * @return This builder for chaining.
+ */
+ public Builder addCapabilitiesBytes(com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+ ensureCapabilitiesIsMutable();
+ capabilities_.add(value);
+ onChanged();
+ return this;
+ }
+
@java.lang.Override
public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
return super.setUnknownFields(unknownFields);
diff --git a/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/SdkHarnessContainerImageOrBuilder.java b/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/SdkHarnessContainerImageOrBuilder.java
index b91b64e8..be2710bf 100644
--- a/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/SdkHarnessContainerImageOrBuilder.java
+++ b/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/SdkHarnessContainerImageOrBuilder.java
@@ -91,4 +91,59 @@ public interface SdkHarnessContainerImageOrBuilder
* @return The bytes for environmentId.
*/
com.google.protobuf.ByteString getEnvironmentIdBytes();
+
+ /**
+ *
+ *
+ *
+ * The set of capabilities enumerated in the above Environment proto. See also
+ * https://github.com/apache/beam/blob/master/model/pipeline/src/main/proto/beam_runner_api.proto
+ *
+ *
+ * repeated string capabilities = 4;
+ *
+ * @return A list containing the capabilities.
+ */
+ java.util.List getCapabilitiesList();
+ /**
+ *
+ *
+ *
+ * The set of capabilities enumerated in the above Environment proto. See also
+ * https://github.com/apache/beam/blob/master/model/pipeline/src/main/proto/beam_runner_api.proto
+ *
+ *
+ * repeated string capabilities = 4;
+ *
+ * @return The count of capabilities.
+ */
+ int getCapabilitiesCount();
+ /**
+ *
+ *
+ *
+ * The set of capabilities enumerated in the above Environment proto. See also
+ * https://github.com/apache/beam/blob/master/model/pipeline/src/main/proto/beam_runner_api.proto
+ *
+ *
+ * repeated string capabilities = 4;
+ *
+ * @param index The index of the element to return.
+ * @return The capabilities at the given index.
+ */
+ java.lang.String getCapabilities(int index);
+ /**
+ *
+ *
+ *
+ * The set of capabilities enumerated in the above Environment proto. See also
+ * https://github.com/apache/beam/blob/master/model/pipeline/src/main/proto/beam_runner_api.proto
+ *
+ *
+ * repeated string capabilities = 4;
+ *
+ * @param index The index of the value to return.
+ * @return The bytes of the capabilities at the given index.
+ */
+ com.google.protobuf.ByteString getCapabilitiesBytes(int index);
}
diff --git a/proto-google-cloud-dataflow-v1beta3/src/main/proto/google/dataflow/v1beta3/environment.proto b/proto-google-cloud-dataflow-v1beta3/src/main/proto/google/dataflow/v1beta3/environment.proto
index 26487a52..04ad7d78 100644
--- a/proto-google-cloud-dataflow-v1beta3/src/main/proto/google/dataflow/v1beta3/environment.proto
+++ b/proto-google-cloud-dataflow-v1beta3/src/main/proto/google/dataflow/v1beta3/environment.proto
@@ -415,6 +415,10 @@ message SdkHarnessContainerImage {
// Environment ID for the Beam runner API proto Environment that corresponds
// to the current SDK Harness.
string environment_id = 3;
+
+ // The set of capabilities enumerated in the above Environment proto. See also
+ // https://github.com/apache/beam/blob/master/model/pipeline/src/main/proto/beam_runner_api.proto
+ repeated string capabilities = 4;
}
// Describes one particular pool of Cloud Dataflow workers to be
From ffe496f569c2b5da9deb0c9cf3993019dc27110c Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate
Date: Tue, 29 Mar 2022 19:08:17 +0200
Subject: [PATCH 7/9] build(deps): update dependency
com.google.cloud:google-cloud-shared-config to v1.3.2 (#155)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
[](https://renovatebot.com)
This PR contains the following updates:
| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-shared-config](https://togithub.com/googleapis/java-shared-config) | `1.3.0` -> `1.3.2` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) |
---
### Release Notes
googleapis/java-shared-config
### [`v1.3.2`](https://togithub.com/googleapis/java-shared-config/blob/HEAD/CHANGELOG.md#132-httpsgithubcomgoogleapisjava-shared-configcomparev131v132-2022-03-28)
[Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v1.3.1...v1.3.2)
### [`v1.3.1`](https://togithub.com/googleapis/java-shared-config/blob/HEAD/CHANGELOG.md#131-httpsgithubcomgoogleapisjava-shared-configcomparev130v131-2022-03-25)
[Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v1.3.0...v1.3.1)
---
### Configuration
📅 **Schedule**: At any time (no schedule defined).
🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.
â™» **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.
🔕 **Ignore**: Close this PR and you won't be reminded about this update again.
---
- [ ] If you want to rebase/retry this PR, click this checkbox.
---
This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-dataflow).
---
google-cloud-dataflow-bom/pom.xml | 2 +-
pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/google-cloud-dataflow-bom/pom.xml b/google-cloud-dataflow-bom/pom.xml
index 775d7a7d..7d56b0de 100644
--- a/google-cloud-dataflow-bom/pom.xml
+++ b/google-cloud-dataflow-bom/pom.xml
@@ -8,7 +8,7 @@
com.google.cloud
google-cloud-shared-config
- 1.3.0
+ 1.3.2
Google Dataflow BOM
diff --git a/pom.xml b/pom.xml
index 6d50711a..e8c0fdbc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
com.google.cloud
google-cloud-shared-config
- 1.3.0
+ 1.3.2
From a7ece5d992f3a9af2fa2d019454d9932d6440250 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate
Date: Tue, 29 Mar 2022 20:00:38 +0200
Subject: [PATCH 8/9] deps: update dependency
com.google.cloud:google-cloud-shared-dependencies to v2.9.0 (#156)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
[](https://renovatebot.com)
This PR contains the following updates:
| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [com.google.cloud:google-cloud-shared-dependencies](https://togithub.com/googleapis/java-shared-dependencies) | `2.8.0` -> `2.9.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) |
---
### Release Notes
googleapis/java-shared-dependencies
### [`v2.9.0`](https://togithub.com/googleapis/java-shared-dependencies/blob/HEAD/CHANGELOG.md#290-httpsgithubcomgoogleapisjava-shared-dependenciescomparev280v290-2022-03-28)
[Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v2.8.0...v2.9.0)
##### Dependencies
- guava 31.1 ([#635](https://togithub.com/googleapis/java-shared-dependencies/issues/635)) ([0939b06](https://togithub.com/googleapis/java-shared-dependencies/commit/0939b063a79cd4ffafb49cf04861ce577e35efd6))
- update dependency com.fasterxml.jackson:jackson-bom to v2.13.2 ([#626](https://togithub.com/googleapis/java-shared-dependencies/issues/626)) ([6014663](https://togithub.com/googleapis/java-shared-dependencies/commit/601466339c9631faa88033d1ff1e31582fb67b7b))
- update dependency com.fasterxml.jackson:jackson-bom to v2.13.2.20220324 ([#636](https://togithub.com/googleapis/java-shared-dependencies/issues/636)) ([6c833fa](https://togithub.com/googleapis/java-shared-dependencies/commit/6c833faa7815147013999bfc2bb6935fd8fe6b34))
- update dependency com.google.api-client:google-api-client-bom to v1.33.4 ([#642](https://togithub.com/googleapis/java-shared-dependencies/issues/642)) ([57bd912](https://togithub.com/googleapis/java-shared-dependencies/commit/57bd9124ce8981b7b3b5d0c87b7c1e5f935b7150))
- update dependency com.google.api:api-common to v2.1.5 ([#637](https://togithub.com/googleapis/java-shared-dependencies/issues/637)) ([d3a00fa](https://togithub.com/googleapis/java-shared-dependencies/commit/d3a00fa5ce9908000122d8365fb2f2d0e388494b))
- update dependency com.google.auth:google-auth-library-bom to v1.6.0 ([#631](https://togithub.com/googleapis/java-shared-dependencies/issues/631)) ([53dc7c2](https://togithub.com/googleapis/java-shared-dependencies/commit/53dc7c2fe255a6c7ca059dd414449bf96780f936))
- update dependency com.google.cloud:google-cloud-core-bom to v2.5.11 ([#644](https://togithub.com/googleapis/java-shared-dependencies/issues/644)) ([4331dcc](https://togithub.com/googleapis/java-shared-dependencies/commit/4331dcc331e8377fcc57e5404321611186ca22cb))
- update dependency com.google.http-client:google-http-client-bom to v1.41.5 ([#638](https://togithub.com/googleapis/java-shared-dependencies/issues/638)) ([e007d23](https://togithub.com/googleapis/java-shared-dependencies/commit/e007d2381bd388a1c199fc3f31d0b965f8ae592d))
- update dependency io.grpc:grpc-bom to v1.45.0 ([#630](https://togithub.com/googleapis/java-shared-dependencies/issues/630)) ([20334e3](https://togithub.com/googleapis/java-shared-dependencies/commit/20334e30d256897cd7ef52c646e5c4549cd7ae69))
- update dependency org.threeten:threetenbp to v1.6.0 ([#633](https://togithub.com/googleapis/java-shared-dependencies/issues/633)) ([1a2716d](https://togithub.com/googleapis/java-shared-dependencies/commit/1a2716d22e442c5cd6adea9449756b9ac3ddbf8e))
- update gax.version to v2.13.0 ([#641](https://togithub.com/googleapis/java-shared-dependencies/issues/641)) ([b863746](https://togithub.com/googleapis/java-shared-dependencies/commit/b863746727fadd45c35198f58eb862f47fe14945))
- update google.common-protos.version to v2.8.0 ([#639](https://togithub.com/googleapis/java-shared-dependencies/issues/639)) ([252afba](https://togithub.com/googleapis/java-shared-dependencies/commit/252afba1df8e4cfdf2574d127097b0978b7778c0))
- update google.core.version to v2.5.10 ([#628](https://togithub.com/googleapis/java-shared-dependencies/issues/628)) ([fec6f51](https://togithub.com/googleapis/java-shared-dependencies/commit/fec6f5121384a04a389bad6f6477a9a5ce468016))
- update iam.version to v1.2.10 ([#625](https://togithub.com/googleapis/java-shared-dependencies/issues/625)) ([0d7ca29](https://togithub.com/googleapis/java-shared-dependencies/commit/0d7ca2924bd24abe14883c173156bb4dc5fb90bf))
---
### Configuration
📅 **Schedule**: At any time (no schedule defined).
🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.
â™» **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.
🔕 **Ignore**: Close this PR and you won't be reminded about this update again.
---
- [ ] If you want to rebase/retry this PR, click this checkbox.
---
This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-dataflow).
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index e8c0fdbc..a66841d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,7 +85,7 @@
com.google.cloud
google-cloud-shared-dependencies
- 2.8.0
+ 2.9.0
pom
import
From 180f0f36e78cb3cab4b4f73d31cac17aa30a258f Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
<55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 30 Mar 2022 12:41:08 -0400
Subject: [PATCH 9/9] chore(main): release 0.5.0 (#154)
Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
CHANGELOG.md | 12 ++++++++++++
google-cloud-dataflow-bom/pom.xml | 8 ++++----
google-cloud-dataflow/pom.xml | 4 ++--
grpc-google-cloud-dataflow-v1beta3/pom.xml | 4 ++--
pom.xml | 8 ++++----
proto-google-cloud-dataflow-v1beta3/pom.xml | 4 ++--
versions.txt | 6 +++---
7 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22c5014b..094127cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
# Changelog
+## [0.5.0](https://github.com/googleapis/java-dataflow/compare/v0.4.2...v0.5.0) (2022-03-29)
+
+
+### Features
+
+* Add the ability to plumb environment capabilities through v1beta3 protos. ([#153](https://github.com/googleapis/java-dataflow/issues/153)) ([7dc5018](https://github.com/googleapis/java-dataflow/commit/7dc50180a6eaba28ae4c9cc52d72df9c9ba4a7db))
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.9.0 ([#156](https://github.com/googleapis/java-dataflow/issues/156)) ([a7ece5d](https://github.com/googleapis/java-dataflow/commit/a7ece5d992f3a9af2fa2d019454d9932d6440250))
+
### [0.4.2](https://github.com/googleapis/java-dataflow/compare/v0.4.1...v0.4.2) (2022-03-08)
diff --git a/google-cloud-dataflow-bom/pom.xml b/google-cloud-dataflow-bom/pom.xml
index 7d56b0de..9818ac88 100644
--- a/google-cloud-dataflow-bom/pom.xml
+++ b/google-cloud-dataflow-bom/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.google.cloud
google-cloud-dataflow-bom
- 0.4.3-SNAPSHOT
+ 0.5.0
pom
com.google.cloud
@@ -56,17 +56,17 @@
com.google.cloud
google-cloud-dataflow
- 0.4.3-SNAPSHOT
+ 0.5.0
com.google.api.grpc
grpc-google-cloud-dataflow-v1beta3
- 0.4.3-SNAPSHOT
+ 0.5.0
com.google.api.grpc
proto-google-cloud-dataflow-v1beta3
- 0.4.3-SNAPSHOT
+ 0.5.0