feat: Add the ability to plumb environment capabilities through v1bet…

…a3 protos. (#153) * feat: Add the ability to plumb environment capabilities through v1beta3 protos. PiperOrigin-RevId: 434899727 Source-Link: googleapis/googleapis@392ae91 Source-Link: googleapis/googleapis-gen@febf173 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZmViZjE3MzE3MjQ4M2ZjZWJkNTY2OGRkMzJmM2Q3MzUyYTQ0MjBjZSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
googleapis · Mar 17, 2022 · 7dc5018 · 7dc5018
1 parent 22a0e9e
commit 7dc5018
Show file tree

Hide file tree

Showing 4 changed files with 408 additions and 56 deletions.
diff --git a/...le-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/EnvironmentProto.java b/...le-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);