From 59ff4e9b838bd827a99739ebf52c010051718d8f Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 31 Mar 2022 10:45:09 -0700 Subject: [PATCH] feat: Add the ability to plumb environment capabilities through v1beta3 protos. (#5137) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix!: Use http binding with location field as primary http bindings Changing HTTP bindings and/or their order might be a breaking change for libraries. PiperOrigin-RevId: 430239565 Source-Link: https://github.com/googleapis/googleapis/commit/71fe7ff3f97d992e18d9390c61bd7fabf3d70eef Source-Link: https://github.com/googleapis/googleapis-gen/commit/1f496cc36dd77921e45a278114bbc2198cc8352a Copy-Tag: eyJwIjoiRGF0YWZsb3cvLk93bEJvdC55YW1sIiwiaCI6IjFmNDk2Y2MzNmRkNzc5MjFlNDVhMjc4MTE0YmJjMjE5OGNjODM1MmEifQ== * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * feat: Add the ability to plumb environment capabilities through v1beta3 protos. PiperOrigin-RevId: 434899727 Source-Link: https://github.com/googleapis/googleapis/commit/392ae91765566c9a32512b9b889fac1d7000acf9 Source-Link: https://github.com/googleapis/googleapis-gen/commit/febf173172483fcebd5668dd32f3d7352a4420ce Copy-Tag: eyJwIjoiRGF0YWZsb3cvLk93bEJvdC55YW1sIiwiaCI6ImZlYmYxNzMxNzI0ODNmY2ViZDU2NjhkZDMyZjNkNzM1MmE0NDIwY2UifQ== * 🦉 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 --- Dataflow/metadata/V1Beta3/Environment.php | Bin 4663 -> 4686 bytes Dataflow/metadata/V1Beta3/Jobs.php | Bin 9122 -> 9123 bytes Dataflow/metadata/V1Beta3/Messages.php | Bin 3096 -> 3096 bytes Dataflow/metadata/V1Beta3/Metrics.php | Bin 4645 -> 4645 bytes Dataflow/metadata/V1Beta3/Snapshots.php | Bin 3089 -> 3091 bytes Dataflow/metadata/V1Beta3/Templates.php | Bin 8213 -> 8213 bytes Dataflow/src/V1beta3/Job.php | 1 - .../src/V1beta3/SdkHarnessContainerImage.php | 38 ++++++++++++++++++ .../jobs_v1_beta3_rest_client_config.php | 20 ++++----- .../messages_v1_beta3_rest_client_config.php | 4 +- .../metrics_v1_beta3_rest_client_config.php | 4 +- .../snapshots_v1_beta3_rest_client_config.php | 12 +++--- .../templates_service_rest_client_config.php | 12 +++--- 13 files changed, 64 insertions(+), 27 deletions(-) diff --git a/Dataflow/metadata/V1Beta3/Environment.php b/Dataflow/metadata/V1Beta3/Environment.php index 6eb60d0042d5cecf12953934c544af020faff076..d8b39d231684eab15dac8ab887e7e0d66fccdb0e 100644 GIT binary patch delta 47 zcmdn4a!zGKCllk3&0S2t*_b*QC%17Hi3o{s@gye}Bqn9%WR_&67E7=wFmL|G>Bs>9 Dn$Zu{ delta 31 ncmX@7vR!3ECllkt&0S2t*_eyCBqs0Wm6*JcGh#D8mpumn#Ka2U diff --git a/Dataflow/metadata/V1Beta3/Jobs.php b/Dataflow/metadata/V1Beta3/Jobs.php index bf0438cd6b210e5e51bfb524f0b56297aa5c42d5..0f3b111b454a8044ad55a582975d30b4885c239f 100644 GIT binary patch delta 128 zcmZ4FzSw=kT^UBx$q9<4Tvp6k`AJbR>PiYguFPZ$*l$<V)FP3j%WHbUApf!1cA~#EvkCHo* MX1X1 diff --git a/Dataflow/metadata/V1Beta3/Metrics.php b/Dataflow/metadata/V1Beta3/Metrics.php index 064367dc020da08280154d0f931018603a78e1c3..47491a4e066a68e64ab56e4c6690a4a5a98d2c19 100644 GIT binary patch delta 28 kcmZ3gvQ%ZmBVIp;wlh1L=0R_4zf8bOD3Thz>@=t!nQ4Nxq VypGeJ8KFUR@^nt|&0<`C83B@BANK$N diff --git a/Dataflow/metadata/V1Beta3/Templates.php b/Dataflow/metadata/V1Beta3/Templates.php index 7eb6dd99b39336a8e9b4648bff379ab876841734..476548baf099eca7cf2351eec155432e2447d164 100644 GIT binary patch delta 77 zcmbR0Fx6qhSINnWQg$p+T1u*uFUZPF{w>8dIaaE1vZ8b-OO&IM4pdNia+!1qqaBcE VIN4K%mnBMDNE4=hbFj=IW&jYd8XEur delta 97 zcmbR0Fx6qhS4l?I$rog01WHnK3vv=mQj4t^wW92mtbl@slLe%?CdW!OGU|YoOb(V- kW{C<@a)e4LPcD-#VblamdCKszL^%lA!E|j7mN~=>04google.dataflow.v1beta3.Job */ diff --git a/Dataflow/src/V1beta3/SdkHarnessContainerImage.php b/Dataflow/src/V1beta3/SdkHarnessContainerImage.php index 7d4638867c5..acdf9f0819a 100644 --- a/Dataflow/src/V1beta3/SdkHarnessContainerImage.php +++ b/Dataflow/src/V1beta3/SdkHarnessContainerImage.php @@ -38,6 +38,13 @@ class SdkHarnessContainerImage extends \Google\Protobuf\Internal\Message * Generated from protobuf field string environment_id = 3; */ private $environment_id = ''; + /** + * 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 + * + * Generated from protobuf field repeated string capabilities = 4; + */ + private $capabilities; /** * Constructor. @@ -56,6 +63,9 @@ class SdkHarnessContainerImage extends \Google\Protobuf\Internal\Message * @type string $environment_id * Environment ID for the Beam runner API proto Environment that corresponds * to the current SDK Harness. + * @type string[]|\Google\Protobuf\Internal\RepeatedField $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 * } */ public function __construct($data = NULL) { @@ -151,5 +161,33 @@ public function setEnvironmentId($var) 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 + * + * Generated from protobuf field repeated string capabilities = 4; + * @return \Google\Protobuf\Internal\RepeatedField + */ + public function getCapabilities() + { + return $this->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 + * + * Generated from protobuf field repeated string capabilities = 4; + * @param string[]|\Google\Protobuf\Internal\RepeatedField $var + * @return $this + */ + public function setCapabilities($var) + { + $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::STRING); + $this->capabilities = $arr; + + return $this; + } + } diff --git a/Dataflow/src/V1beta3/resources/jobs_v1_beta3_rest_client_config.php b/Dataflow/src/V1beta3/resources/jobs_v1_beta3_rest_client_config.php index 8714c06915e..a2703167fed 100644 --- a/Dataflow/src/V1beta3/resources/jobs_v1_beta3_rest_client_config.php +++ b/Dataflow/src/V1beta3/resources/jobs_v1_beta3_rest_client_config.php @@ -16,12 +16,12 @@ ], 'CreateJob' => [ 'method' => 'post', - 'uriTemplate' => '/v1b3/projects/{project_id}/jobs', + 'uriTemplate' => '/v1b3/projects/{project_id}/locations/{location}/jobs', 'body' => 'job', 'additionalBindings' => [ [ 'method' => 'post', - 'uriTemplate' => '/v1b3/projects/{project_id}/locations/{location}/jobs', + 'uriTemplate' => '/v1b3/projects/{project_id}/jobs', 'body' => 'job', ], ], @@ -40,11 +40,11 @@ ], 'GetJob' => [ 'method' => 'get', - 'uriTemplate' => '/v1b3/projects/{project_id}/jobs/{job_id}', + 'uriTemplate' => '/v1b3/projects/{project_id}/locations/{location}/jobs/{job_id}', 'additionalBindings' => [ [ 'method' => 'get', - 'uriTemplate' => '/v1b3/projects/{project_id}/locations/{location}/jobs/{job_id}', + 'uriTemplate' => '/v1b3/projects/{project_id}/jobs/{job_id}', ], ], 'placeholders' => [ @@ -67,11 +67,11 @@ ], 'ListJobs' => [ 'method' => 'get', - 'uriTemplate' => '/v1b3/projects/{project_id}/jobs', + 'uriTemplate' => '/v1b3/projects/{project_id}/locations/{location}/jobs', 'additionalBindings' => [ [ 'method' => 'get', - 'uriTemplate' => '/v1b3/projects/{project_id}/locations/{location}/jobs', + 'uriTemplate' => '/v1b3/projects/{project_id}/jobs', ], ], 'placeholders' => [ @@ -89,12 +89,12 @@ ], 'SnapshotJob' => [ 'method' => 'post', - 'uriTemplate' => '/v1b3/projects/{project_id}/jobs/{job_id}:snapshot', + 'uriTemplate' => '/v1b3/projects/{project_id}/locations/{location}/jobs/{job_id}:snapshot', 'body' => '*', 'additionalBindings' => [ [ 'method' => 'post', - 'uriTemplate' => '/v1b3/projects/{project_id}/locations/{location}/jobs/{job_id}:snapshot', + 'uriTemplate' => '/v1b3/projects/{project_id}/jobs/{job_id}:snapshot', 'body' => '*', ], ], @@ -118,12 +118,12 @@ ], 'UpdateJob' => [ 'method' => 'put', - 'uriTemplate' => '/v1b3/projects/{project_id}/jobs/{job_id}', + 'uriTemplate' => '/v1b3/projects/{project_id}/locations/{location}/jobs/{job_id}', 'body' => 'job', 'additionalBindings' => [ [ 'method' => 'put', - 'uriTemplate' => '/v1b3/projects/{project_id}/locations/{location}/jobs/{job_id}', + 'uriTemplate' => '/v1b3/projects/{project_id}/jobs/{job_id}', 'body' => 'job', ], ], diff --git a/Dataflow/src/V1beta3/resources/messages_v1_beta3_rest_client_config.php b/Dataflow/src/V1beta3/resources/messages_v1_beta3_rest_client_config.php index 4dbaaa8646d..3ce2653db7b 100644 --- a/Dataflow/src/V1beta3/resources/messages_v1_beta3_rest_client_config.php +++ b/Dataflow/src/V1beta3/resources/messages_v1_beta3_rest_client_config.php @@ -5,11 +5,11 @@ 'google.dataflow.v1beta3.MessagesV1Beta3' => [ 'ListJobMessages' => [ 'method' => 'get', - 'uriTemplate' => '/v1b3/projects/{project_id}/jobs/{job_id}/messages', + 'uriTemplate' => '/v1b3/projects/{project_id}/locations/{location}/jobs/{job_id}/messages', 'additionalBindings' => [ [ 'method' => 'get', - 'uriTemplate' => '/v1b3/projects/{project_id}/locations/{location}/jobs/{job_id}/messages', + 'uriTemplate' => '/v1b3/projects/{project_id}/jobs/{job_id}/messages', ], ], 'placeholders' => [ diff --git a/Dataflow/src/V1beta3/resources/metrics_v1_beta3_rest_client_config.php b/Dataflow/src/V1beta3/resources/metrics_v1_beta3_rest_client_config.php index 5a1f03e59b9..28120e7fada 100644 --- a/Dataflow/src/V1beta3/resources/metrics_v1_beta3_rest_client_config.php +++ b/Dataflow/src/V1beta3/resources/metrics_v1_beta3_rest_client_config.php @@ -26,11 +26,11 @@ ], 'GetJobMetrics' => [ 'method' => 'get', - 'uriTemplate' => '/v1b3/projects/{project_id}/jobs/{job_id}/metrics', + 'uriTemplate' => '/v1b3/projects/{project_id}/locations/{location}/jobs/{job_id}/metrics', 'additionalBindings' => [ [ 'method' => 'get', - 'uriTemplate' => '/v1b3/projects/{project_id}/locations/{location}/jobs/{job_id}/metrics', + 'uriTemplate' => '/v1b3/projects/{project_id}/jobs/{job_id}/metrics', ], ], 'placeholders' => [ diff --git a/Dataflow/src/V1beta3/resources/snapshots_v1_beta3_rest_client_config.php b/Dataflow/src/V1beta3/resources/snapshots_v1_beta3_rest_client_config.php index 52637dcf2f2..14108f53ebe 100644 --- a/Dataflow/src/V1beta3/resources/snapshots_v1_beta3_rest_client_config.php +++ b/Dataflow/src/V1beta3/resources/snapshots_v1_beta3_rest_client_config.php @@ -5,11 +5,11 @@ 'google.dataflow.v1beta3.SnapshotsV1Beta3' => [ 'DeleteSnapshot' => [ 'method' => 'delete', - 'uriTemplate' => '/v1b3/projects/{project_id}/snapshots', + 'uriTemplate' => '/v1b3/projects/{project_id}/locations/{location}/snapshots/{snapshot_id}', 'additionalBindings' => [ [ 'method' => 'delete', - 'uriTemplate' => '/v1b3/projects/{project_id}/locations/{location}/snapshots/{snapshot_id}', + 'uriTemplate' => '/v1b3/projects/{project_id}/snapshots', ], ], 'placeholders' => [ @@ -32,11 +32,11 @@ ], 'GetSnapshot' => [ 'method' => 'get', - 'uriTemplate' => '/v1b3/projects/{project_id}/snapshots/{snapshot_id}', + 'uriTemplate' => '/v1b3/projects/{project_id}/locations/{location}/snapshots/{snapshot_id}', 'additionalBindings' => [ [ 'method' => 'get', - 'uriTemplate' => '/v1b3/projects/{project_id}/locations/{location}/snapshots/{snapshot_id}', + 'uriTemplate' => '/v1b3/projects/{project_id}/snapshots/{snapshot_id}', ], ], 'placeholders' => [ @@ -59,7 +59,7 @@ ], 'ListSnapshots' => [ 'method' => 'get', - 'uriTemplate' => '/v1b3/projects/{project_id}/snapshots', + 'uriTemplate' => '/v1b3/projects/{project_id}/locations/{location}/jobs/{job_id}/snapshots', 'additionalBindings' => [ [ 'method' => 'get', @@ -67,7 +67,7 @@ ], [ 'method' => 'get', - 'uriTemplate' => '/v1b3/projects/{project_id}/locations/{location}/jobs/{job_id}/snapshots', + 'uriTemplate' => '/v1b3/projects/{project_id}/snapshots', ], ], 'placeholders' => [ diff --git a/Dataflow/src/V1beta3/resources/templates_service_rest_client_config.php b/Dataflow/src/V1beta3/resources/templates_service_rest_client_config.php index b4e443cfbe8..7b3c0135859 100644 --- a/Dataflow/src/V1beta3/resources/templates_service_rest_client_config.php +++ b/Dataflow/src/V1beta3/resources/templates_service_rest_client_config.php @@ -5,12 +5,12 @@ 'google.dataflow.v1beta3.TemplatesService' => [ 'CreateJobFromTemplate' => [ 'method' => 'post', - 'uriTemplate' => '/v1b3/projects/{project_id}/templates', + 'uriTemplate' => '/v1b3/projects/{project_id}/locations/{location}/templates', 'body' => '*', 'additionalBindings' => [ [ 'method' => 'post', - 'uriTemplate' => '/v1b3/projects/{project_id}/locations/{location}/templates', + 'uriTemplate' => '/v1b3/projects/{project_id}/templates', 'body' => '*', ], ], @@ -29,11 +29,11 @@ ], 'GetTemplate' => [ 'method' => 'get', - 'uriTemplate' => '/v1b3/projects/{project_id}/templates:get', + 'uriTemplate' => '/v1b3/projects/{project_id}/locations/{location}/templates:get', 'additionalBindings' => [ [ 'method' => 'get', - 'uriTemplate' => '/v1b3/projects/{project_id}/locations/{location}/templates:get', + 'uriTemplate' => '/v1b3/projects/{project_id}/templates:get', ], ], 'placeholders' => [ @@ -51,12 +51,12 @@ ], 'LaunchTemplate' => [ 'method' => 'post', - 'uriTemplate' => '/v1b3/projects/{project_id}/templates:launch', + 'uriTemplate' => '/v1b3/projects/{project_id}/locations/{location}/templates:launch', 'body' => 'launch_parameters', 'additionalBindings' => [ [ 'method' => 'post', - 'uriTemplate' => '/v1b3/projects/{project_id}/locations/{location}/templates:launch', + 'uriTemplate' => '/v1b3/projects/{project_id}/templates:launch', 'body' => 'launch_parameters', ], ],