From 273604a2b4ac2b29f376c9ce71a1f6987bb08b4c Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 7 Jan 2022 18:40:19 +0000 Subject: [PATCH 01/15] chore: release 0.3.4-SNAPSHOT (#106) :robot: I have created a release \*beep\* \*boop\* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- 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 +++--- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/google-cloud-dataflow-bom/pom.xml b/google-cloud-dataflow-bom/pom.xml index 3565654c..df280eb5 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.3.3 + 0.3.4-SNAPSHOT pom com.google.cloud @@ -56,17 +56,17 @@ com.google.cloud google-cloud-dataflow - 0.3.3 + 0.3.4-SNAPSHOT com.google.api.grpc grpc-google-cloud-dataflow-v1beta3 - 0.3.3 + 0.3.4-SNAPSHOT com.google.api.grpc proto-google-cloud-dataflow-v1beta3 - 0.3.3 + 0.3.4-SNAPSHOT diff --git a/google-cloud-dataflow/pom.xml b/google-cloud-dataflow/pom.xml index dea26824..fd3f7039 100644 --- a/google-cloud-dataflow/pom.xml +++ b/google-cloud-dataflow/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-dataflow - 0.3.3 + 0.3.4-SNAPSHOT jar Google Dataflow https://github.com/googleapis/java-dataflow @@ -11,7 +11,7 @@ com.google.cloud google-cloud-dataflow-parent - 0.3.3 + 0.3.4-SNAPSHOT google-cloud-dataflow diff --git a/grpc-google-cloud-dataflow-v1beta3/pom.xml b/grpc-google-cloud-dataflow-v1beta3/pom.xml index 5ca3b993..e7e343b0 100644 --- a/grpc-google-cloud-dataflow-v1beta3/pom.xml +++ b/grpc-google-cloud-dataflow-v1beta3/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-dataflow-v1beta3 - 0.3.3 + 0.3.4-SNAPSHOT grpc-google-cloud-dataflow-v1beta3 GRPC library for google-cloud-dataflow com.google.cloud google-cloud-dataflow-parent - 0.3.3 + 0.3.4-SNAPSHOT diff --git a/pom.xml b/pom.xml index b99a3b5f..ffcf89bb 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-dataflow-parent pom - 0.3.3 + 0.3.4-SNAPSHOT Google Dataflow Parent https://github.com/googleapis/java-dataflow @@ -69,17 +69,17 @@ com.google.cloud google-cloud-dataflow - 0.3.3 + 0.3.4-SNAPSHOT com.google.api.grpc grpc-google-cloud-dataflow-v1beta3 - 0.3.3 + 0.3.4-SNAPSHOT com.google.api.grpc proto-google-cloud-dataflow-v1beta3 - 0.3.3 + 0.3.4-SNAPSHOT diff --git a/proto-google-cloud-dataflow-v1beta3/pom.xml b/proto-google-cloud-dataflow-v1beta3/pom.xml index 7da6c0bd..36b72264 100644 --- a/proto-google-cloud-dataflow-v1beta3/pom.xml +++ b/proto-google-cloud-dataflow-v1beta3/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-dataflow-v1beta3 - 0.3.3 + 0.3.4-SNAPSHOT proto-google-cloud-dataflow-v1beta3 Proto library for google-cloud-dataflow com.google.cloud google-cloud-dataflow-parent - 0.3.3 + 0.3.4-SNAPSHOT diff --git a/versions.txt b/versions.txt index 6107cbf7..902b3aa3 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-dataflow:0.3.3:0.3.3 -grpc-google-cloud-dataflow-v1beta3:0.3.3:0.3.3 -proto-google-cloud-dataflow-v1beta3:0.3.3:0.3.3 +google-cloud-dataflow:0.3.3:0.3.4-SNAPSHOT +grpc-google-cloud-dataflow-v1beta3:0.3.3:0.3.4-SNAPSHOT +proto-google-cloud-dataflow-v1beta3:0.3.3:0.3.4-SNAPSHOT From 6a91594f2be49929718509693de43ec6e6fa609a Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 10 Jan 2022 20:28:18 +0000 Subject: [PATCH 02/15] chore(owlbot-java): disable re-writing clirr file in owlbot java post-processor (#1320) (#108) --- .github/.OwlBot.lock.yaml | 2 +- README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 731a0eb4..20c6ee3c 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:491a007c6bd6e77f9e9b1bebcd6cdf08a4a4ef2c228c123d9696845204cb685d + digest: sha256:efbfc5e9ff713005a037941f8ebcc0c69cc630e3ad934675ee26868705a30897 diff --git a/README.md b/README.md index 4438b217..563ed83b 100644 --- a/README.md +++ b/README.md @@ -30,13 +30,13 @@ If you are using Maven, add this to your pom.xml file: If you are using Gradle without BOM, add this to your dependencies ```Groovy -implementation 'com.google.cloud:google-cloud-dataflow:0.3.2' +implementation 'com.google.cloud:google-cloud-dataflow:0.3.3' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-dataflow" % "0.3.2" +libraryDependencies += "com.google.cloud" % "google-cloud-dataflow" % "0.3.3" ``` ## Authentication From 201ed98184dd0a5b979ff86bcb40f40c90556410 Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Mon, 10 Jan 2022 19:00:39 -0500 Subject: [PATCH 03/15] chore: change name to api_shortname in .repo-metadata.json (#109) --- .repo-metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.repo-metadata.json b/.repo-metadata.json index 44236c6a..713992dd 100644 --- a/.repo-metadata.json +++ b/.repo-metadata.json @@ -1,5 +1,5 @@ { - "name": "dataflow", + "api_shortname": "dataflow", "name_pretty": "Dataflow", "product_documentation": "https://cloud.google.com/dataflow/docs", "api_description": "is a managed service for executing a wide variety of data processing patterns.", From 863037aaaef8872f67a9fb68a97a1e9ea66a0020 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 13 Jan 2022 19:54:20 +0000 Subject: [PATCH 04/15] chore(java): update variable name to api_shortname in README template (#1323) (#110) --- .github/.OwlBot.lock.yaml | 2 +- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 20c6ee3c..dddb13b8 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:efbfc5e9ff713005a037941f8ebcc0c69cc630e3ad934675ee26868705a30897 + digest: sha256:7f737996c88586c499f7b0c25294c760f9f5eec092289a0e08d2d3f42a069ebb diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index a9145097..2c8e450b 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -21,7 +21,7 @@ If you are still having issues, please include as much information as possible: General, Core, and Other are also allowed as types 2. OS type and version: 3. Java version: -4. dataflow version(s): +4. version(s): #### Steps to reproduce From 30283e61ddd9713932b9dd84bb132fb81621a416 Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Thu, 13 Jan 2022 17:36:16 -0500 Subject: [PATCH 05/15] chore: update release-level in .repo-metadata.json (#114) --- .repo-metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.repo-metadata.json b/.repo-metadata.json index 713992dd..87e6d9fd 100644 --- a/.repo-metadata.json +++ b/.repo-metadata.json @@ -4,7 +4,7 @@ "product_documentation": "https://cloud.google.com/dataflow/docs", "api_description": "is a managed service for executing a wide variety of data processing patterns.", "client_documentation": "https://cloud.google.com/java/docs/reference/google-cloud-dataflow/latest/history", - "release_level": "beta", + "release_level": "preview", "transport": "grpc", "language": "java", "repo": "googleapis/java-dataflow", From 0add14b5caeba0f89d6a3c43546bdb8689b42db9 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 17 Jan 2022 19:24:25 +0100 Subject: [PATCH 06/15] chore(deps): update dependency com.google.cloud:google-cloud-dataflow to v0.3.3 (#107) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-dataflow](https://togithub.com/googleapis/java-dataflow) | `0.3.2` -> `0.3.3` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-dataflow/0.3.3/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-dataflow/0.3.3/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-dataflow/0.3.3/compatibility-slim/0.3.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-dataflow/0.3.3/confidence-slim/0.3.2)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-dataflow ### [`v0.3.3`](https://togithub.com/googleapis/java-dataflow/blob/HEAD/CHANGELOG.md#​033-httpswwwgithubcomgoogleapisjava-dataflowcomparev032v033-2022-01-07) [Compare Source](https://togithub.com/googleapis/java-dataflow/compare/v0.3.2...v0.3.3)
--- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Renovate will not automatically rebase this PR, because other commits have been found. 🔕 **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). --- README.md | 2 +- samples/install-without-bom/pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- samples/snippets/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 563ed83b..6005e21a 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ If you are using Maven, add this to your pom.xml file: com.google.cloud google-cloud-dataflow - 0.3.2 + 0.3.3 ``` diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index eca574d6..a0a09fb1 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-dataflow - 0.3.2 + 0.3.3 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 6745ef47..6b6b5ce1 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-dataflow - 0.3.2 + 0.3.3 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index ebb0e056..70069b1b 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-dataflow - 0.3.2 + 0.3.3 From e4dd513c8fc2605c37e0a9abb63593a64763032d Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 17 Jan 2022 21:08:31 +0000 Subject: [PATCH 07/15] chore(java): update release_type choices to stable and preview (#1331) (#115) --- .github/.OwlBot.lock.yaml | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index dddb13b8..dcdda8c6 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:7f737996c88586c499f7b0c25294c760f9f5eec092289a0e08d2d3f42a069ebb + digest: sha256:9669c169d0582f13d6b2d319a43a78fc49f296a883aa48519bd0e5c7d34087c4 diff --git a/README.md b/README.md index 6005e21a..aa09fa51 100644 --- a/README.md +++ b/README.md @@ -176,7 +176,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-4]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-dataflow/java8-win.html [kokoro-badge-image-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-dataflow/java11.svg [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-dataflow/java11.html -[stability-image]: https://img.shields.io/badge/stability-beta-yellow +[stability-image]: https://img.shields.io/badge/stability-preview-yellow [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-dataflow.svg [maven-version-link]: https://search.maven.org/search?q=g:com.google.cloud%20AND%20a:google-cloud-dataflow&core=gav [authentication]: https://github.com/googleapis/google-cloud-java#authentication From aa3746a745b8fdc3ce7417eb3349cfe4b29ed8f3 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 18 Jan 2022 20:12:13 +0100 Subject: [PATCH 08/15] build(deps): update dependency org.codehaus.mojo:build-helper-maven-plugin to v3.3.0 (#105) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.codehaus.mojo:build-helper-maven-plugin](http://www.mojohaus.org/build-helper-maven-plugin/) ([source](https://togithub.com/mojohaus/build-helper-maven-plugin)) | `3.2.0` -> `3.3.0` | [![age](https://badges.renovateapi.com/packages/maven/org.codehaus.mojo:build-helper-maven-plugin/3.3.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.codehaus.mojo:build-helper-maven-plugin/3.3.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.codehaus.mojo:build-helper-maven-plugin/3.3.0/compatibility-slim/3.2.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.codehaus.mojo:build-helper-maven-plugin/3.3.0/confidence-slim/3.2.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### 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). --- samples/install-without-bom/pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index a0a09fb1..2860b801 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -53,7 +53,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.2.0 + 3.3.0 add-snippets-source diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 6b6b5ce1..fceb1469 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -52,7 +52,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.2.0 + 3.3.0 add-snippets-source From ad07f2a19764e92af8fc303e41245c1a9c596f49 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 19 Jan 2022 19:46:17 +0100 Subject: [PATCH 09/15] build(deps): update dependency com.google.cloud:google-cloud-shared-config to v1.2.5 (#111) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](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.2.4` -> `1.2.5` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.5/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.5/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.5/compatibility-slim/1.2.4)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.5/confidence-slim/1.2.4)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-shared-config ### [`v1.2.5`](https://togithub.com/googleapis/java-shared-config/blob/HEAD/CHANGELOG.md#​125-httpsgithubcomgoogleapisjava-shared-configcomparev124v125-2022-01-11) [Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v1.2.4...v1.2.5)
--- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Renovate will not automatically rebase this PR, because other commits have been found. 🔕 **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 df280eb5..c8b6c5c0 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.2.4 + 1.2.5 Google Dataflow BOM diff --git a/pom.xml b/pom.xml index ffcf89bb..d5b70022 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.2.4 + 1.2.5 From b36793768c069d43448f166c2c26ef45d5e18060 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 26 Jan 2022 00:14:21 +0100 Subject: [PATCH 10/15] build(deps): update dependency com.google.cloud:google-cloud-shared-config to v1.2.6 (#116) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](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.2.5` -> `1.2.6` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.6/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.6/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.6/compatibility-slim/1.2.5)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-config/1.2.6/confidence-slim/1.2.5)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-shared-config ### [`v1.2.6`](https://togithub.com/googleapis/java-shared-config/blob/HEAD/CHANGELOG.md#​126-httpsgithubcomgoogleapisjava-shared-configcomparev125v126-2022-01-19) [Compare Source](https://togithub.com/googleapis/java-shared-config/compare/v1.2.5...v1.2.6)
--- ### 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 c8b6c5c0..3f52158f 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.2.5 + 1.2.6 Google Dataflow BOM diff --git a/pom.xml b/pom.xml index d5b70022..03e99749 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.2.5 + 1.2.6 From 011e75f067dc2b86fc2b3eb3725acf7d4e7376f2 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 1 Feb 2022 05:32:36 +0100 Subject: [PATCH 11/15] deps: update dependency com.google.cloud:google-cloud-shared-dependencies to v2.7.0 (#120) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](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.6.0` -> `2.7.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.7.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.7.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.7.0/compatibility-slim/2.6.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.7.0/confidence-slim/2.6.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-shared-dependencies ### [`v2.7.0`](https://togithub.com/googleapis/java-shared-dependencies/blob/HEAD/CHANGELOG.md#​270-httpsgithubcomgoogleapisjava-shared-dependenciescomparev260v270-2022-01-28) [Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v2.6.0...v2.7.0) ##### Dependencies - update dependency com.fasterxml.jackson:jackson-bom to v2.13.1 ([#​555](https://togithub.com/googleapis/java-shared-dependencies/issues/555)) ([67b5663](https://togithub.com/googleapis/java-shared-dependencies/commit/67b56635509215fd132b2ffbcaed995a6de93879)) - update dependency com.google.api-client:google-api-client-bom to v1.33.1 ([#​580](https://togithub.com/googleapis/java-shared-dependencies/issues/580)) ([895dba2](https://togithub.com/googleapis/java-shared-dependencies/commit/895dba2afef6c295b0e21a4ccd27feee1b6af8e2)) - update dependency com.google.api:api-common to v2.1.3 ([#​587](https://togithub.com/googleapis/java-shared-dependencies/issues/587)) ([5dbbce8](https://togithub.com/googleapis/java-shared-dependencies/commit/5dbbce80baa045818757912e6db4f222c12b75f6)) - update dependency com.google.auth:google-auth-library-bom to v1.4.0 ([#​578](https://togithub.com/googleapis/java-shared-dependencies/issues/578)) ([c274c62](https://togithub.com/googleapis/java-shared-dependencies/commit/c274c62905192bcc48c82104bf50cbeaa1894c2b)) - update dependency com.google.errorprone:error_prone_annotations to v2.11.0 ([#​582](https://togithub.com/googleapis/java-shared-dependencies/issues/582)) ([314da38](https://togithub.com/googleapis/java-shared-dependencies/commit/314da38c9f12cf425b5d1be8297e9f2a78d13948)) - update dependency com.google.http-client:google-http-client-bom to v1.41.2 ([#​579](https://togithub.com/googleapis/java-shared-dependencies/issues/579)) ([c8df06d](https://togithub.com/googleapis/java-shared-dependencies/commit/c8df06ddb3f4a975e928bbdd9dfae293e81efa39)) - update dependency com.google.oauth-client:google-oauth-client-bom to v1.33.0 ([#​576](https://togithub.com/googleapis/java-shared-dependencies/issues/576)) ([3315988](https://togithub.com/googleapis/java-shared-dependencies/commit/3315988059ca0223f078b0f760960674bfa8c04a)) - update dependency com.google.protobuf:protobuf-bom to v3.19.3 ([#​571](https://togithub.com/googleapis/java-shared-dependencies/issues/571)) ([c1931e1](https://togithub.com/googleapis/java-shared-dependencies/commit/c1931e1c4611ca3d1e2afac1c9e983cf1ec4a7de)) - update dependency io.grpc:grpc-bom to v1.44.0 ([#​586](https://togithub.com/googleapis/java-shared-dependencies/issues/586)) ([52c47b7](https://togithub.com/googleapis/java-shared-dependencies/commit/52c47b7425af438ba1a82dac87f9002353a6a87a)) - update dependency org.checkerframework:checker-qual to v3.21.1 ([#​554](https://togithub.com/googleapis/java-shared-dependencies/issues/554)) ([81bbb91](https://togithub.com/googleapis/java-shared-dependencies/commit/81bbb91774ab67161371bfd0dfd143de89dee4c9)) - update gax.version to v2.11.0 ([#​581](https://togithub.com/googleapis/java-shared-dependencies/issues/581)) ([1899612](https://togithub.com/googleapis/java-shared-dependencies/commit/189961226f84cdd4e283780d2c7d4a4dffc3e00c)) - update gax.version to v2.9.0 ([#​573](https://togithub.com/googleapis/java-shared-dependencies/issues/573)) ([ee5e38e](https://togithub.com/googleapis/java-shared-dependencies/commit/ee5e38efea574eeb2b5803192da98ba1ce1c8e6e)) - update google.common-protos.version to v2.7.2 ([#​588](https://togithub.com/googleapis/java-shared-dependencies/issues/588)) ([caac0e6](https://togithub.com/googleapis/java-shared-dependencies/commit/caac0e68e336b801becb6322b5b81fce1824ad8a)) - update google.core.version to v2.4.0 ([#​589](https://togithub.com/googleapis/java-shared-dependencies/issues/589)) ([6a292e3](https://togithub.com/googleapis/java-shared-dependencies/commit/6a292e3530a06d6b228f3154ed4e979ef68d7aeb)) - update iam.version to v1.2.1 ([#​569](https://togithub.com/googleapis/java-shared-dependencies/issues/569)) ([62dd270](https://togithub.com/googleapis/java-shared-dependencies/commit/62dd2705b257c4bb539bfe619234f38d0e13b138)) - update opencensus.version to v0.30.0 ([#​552](https://togithub.com/googleapis/java-shared-dependencies/issues/552)) ([ebae62e](https://togithub.com/googleapis/java-shared-dependencies/commit/ebae62eca75234db4fd571f42b8ed0f6ce1bd1f7)) - update opencensus.version to v0.31.0 ([#​585](https://togithub.com/googleapis/java-shared-dependencies/issues/585)) ([021b066](https://togithub.com/googleapis/java-shared-dependencies/commit/021b066a833af1629c89fcca593d16b9786ee0bf))
--- ### 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 03e99749..8f3a4ae2 100644 --- a/pom.xml +++ b/pom.xml @@ -85,7 +85,7 @@ com.google.cloud google-cloud-shared-dependencies - 2.6.0 + 2.7.0 pom import From 9d22aabd9b4285502d8fb916b103733ade4dcb4a Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 2 Feb 2022 05:08:51 +0000 Subject: [PATCH 12/15] deps(java): update actions/github-script action to v5 (#1339) (#117) --- .github/.OwlBot.lock.yaml | 15 ++++++++++++++- .github/workflows/approve-readme.yaml | 2 +- .github/workflows/auto-release.yaml | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index dcdda8c6..be3b9bde 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,16 @@ +# Copyright 2022 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:9669c169d0582f13d6b2d319a43a78fc49f296a883aa48519bd0e5c7d34087c4 + digest: sha256:7062473f423f339256346ddbee3d81fb1de6b784fabc2a4d959d7df2c720e375 diff --git a/.github/workflows/approve-readme.yaml b/.github/workflows/approve-readme.yaml index 7513acae..c5132427 100644 --- a/.github/workflows/approve-readme.yaml +++ b/.github/workflows/approve-readme.yaml @@ -6,7 +6,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'googleapis' && github.head_ref == 'autosynth-readme' steps: - - uses: actions/github-script@v3 + - uses: actions/github-script@v5 with: github-token: ${{secrets.YOSHI_APPROVER_TOKEN}} script: | diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml index 9b4fd4d8..59c7cadd 100644 --- a/.github/workflows/auto-release.yaml +++ b/.github/workflows/auto-release.yaml @@ -6,7 +6,7 @@ jobs: runs-on: ubuntu-latest if: contains(github.head_ref, 'release-please') steps: - - uses: actions/github-script@v3 + - uses: actions/github-script@v5 with: github-token: ${{secrets.YOSHI_APPROVER_TOKEN}} debug: true From cdd4a8ab32813ea81cf08c7216e7e9ab89fc1b07 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 3 Feb 2022 05:12:26 +0000 Subject: [PATCH 13/15] feat: new parameters in FlexTemplateRuntimeEnvironment fix: added google.api.http annotations to RPCs (#122) - [ ] Regenerate this pull request now. Committer: @alexander-fenster PiperOrigin-RevId: 425662603 Source-Link: https://github.com/googleapis/googleapis/commit/9d0fe5458cb4c812700190cf600722359f125f15 Source-Link: https://github.com/googleapis/googleapis-gen/commit/f427d78e78dcbc2bd7991af2833108f1dd2bc13e Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZjQyN2Q3OGU3OGRjYmMyYmQ3OTkxYWYyODMzMTA4ZjFkZDJiYzEzZSJ9 --- .../google/dataflow/v1beta3/package-info.java | 4 +- .../stub/GrpcFlexTemplatesServiceStub.java | 8 + .../v1beta3/stub/GrpcJobsV1Beta3Stub.java | 45 ++ .../v1beta3/stub/GrpcMessagesV1Beta3Stub.java | 9 + .../v1beta3/stub/GrpcMetricsV1Beta3Stub.java | 26 + .../stub/GrpcSnapshotsV1Beta3Stub.java | 25 + .../stub/GrpcTemplatesServiceStub.java | 22 + .../dataflow/v1beta3/AutoscalingEvent.java | 21 +- .../v1beta3/AutoscalingEventOrBuilder.java | 6 +- .../dataflow/v1beta3/BigTableIODetails.java | 4 +- .../FlexTemplateRuntimeEnvironment.java | 727 ++++++++++++++++++ ...exTemplateRuntimeEnvironmentOrBuilder.java | 110 +++ .../google/dataflow/v1beta3/JobMetadata.java | 92 +-- .../v1beta3/JobMetadataOrBuilder.java | 20 +- .../google/dataflow/v1beta3/JobsProto.java | 91 ++- .../dataflow/v1beta3/MessagesProto.java | 44 +- .../google/dataflow/v1beta3/MetricsProto.java | 63 +- .../dataflow/v1beta3/RuntimeEnvironment.java | 39 +- .../v1beta3/RuntimeEnvironmentOrBuilder.java | 12 +- .../com/google/dataflow/v1beta3/Snapshot.java | 46 +- .../dataflow/v1beta3/SnapshotOrBuilder.java | 10 +- .../dataflow/v1beta3/SnapshotsProto.java | 64 +- .../dataflow/v1beta3/TemplatesProto.java | 280 +++---- .../google/dataflow/v1beta3/environment.proto | 2 +- .../proto/google/dataflow/v1beta3/jobs.proto | 163 ++-- .../google/dataflow/v1beta3/messages.proto | 61 +- .../google/dataflow/v1beta3/metrics.proto | 58 +- .../google/dataflow/v1beta3/snapshots.proto | 51 +- .../google/dataflow/v1beta3/streaming.proto | 2 +- .../google/dataflow/v1beta3/templates.proto | 120 ++- 30 files changed, 1698 insertions(+), 527 deletions(-) diff --git a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/package-info.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/package-info.java index 5f16cb39..8bc0e7a0 100644 --- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/package-info.java +++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/package-info.java @@ -15,7 +15,9 @@ */ /** - * The interfaces provided are listed below, along with usage samples. + * A client to Dataflow API + * + *

The interfaces provided are listed below, along with usage samples. * *

======================= JobsV1Beta3Client ======================= * diff --git a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcFlexTemplatesServiceStub.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcFlexTemplatesServiceStub.java index ddea2246..ec2f172d 100644 --- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcFlexTemplatesServiceStub.java +++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcFlexTemplatesServiceStub.java @@ -23,6 +23,7 @@ import com.google.api.gax.grpc.GrpcStubCallableFactory; import com.google.api.gax.rpc.ClientContext; import com.google.api.gax.rpc.UnaryCallable; +import com.google.common.collect.ImmutableMap; import com.google.dataflow.v1beta3.LaunchFlexTemplateRequest; import com.google.dataflow.v1beta3.LaunchFlexTemplateResponse; import com.google.longrunning.stub.GrpcOperationsStub; @@ -103,6 +104,13 @@ protected GrpcFlexTemplatesServiceStub( launchFlexTemplateTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(launchFlexTemplateMethodDescriptor) + .setParamsExtractor( + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("location", String.valueOf(request.getLocation())); + params.put("project_id", String.valueOf(request.getProjectId())); + return params.build(); + }) .build(); this.launchFlexTemplateCallable = diff --git a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcJobsV1Beta3Stub.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcJobsV1Beta3Stub.java index e0bc628f..32ff2688 100644 --- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcJobsV1Beta3Stub.java +++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcJobsV1Beta3Stub.java @@ -26,6 +26,7 @@ import com.google.api.gax.grpc.GrpcStubCallableFactory; import com.google.api.gax.rpc.ClientContext; import com.google.api.gax.rpc.UnaryCallable; +import com.google.common.collect.ImmutableMap; import com.google.dataflow.v1beta3.CheckActiveJobsRequest; import com.google.dataflow.v1beta3.CheckActiveJobsResponse; import com.google.dataflow.v1beta3.CreateJobRequest; @@ -170,22 +171,58 @@ protected GrpcJobsV1Beta3Stub( GrpcCallSettings createJobTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(createJobMethodDescriptor) + .setParamsExtractor( + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("location", String.valueOf(request.getLocation())); + params.put("project_id", String.valueOf(request.getProjectId())); + return params.build(); + }) .build(); GrpcCallSettings getJobTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getJobMethodDescriptor) + .setParamsExtractor( + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("job_id", String.valueOf(request.getJobId())); + params.put("location", String.valueOf(request.getLocation())); + params.put("project_id", String.valueOf(request.getProjectId())); + return params.build(); + }) .build(); GrpcCallSettings updateJobTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updateJobMethodDescriptor) + .setParamsExtractor( + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("job_id", String.valueOf(request.getJobId())); + params.put("location", String.valueOf(request.getLocation())); + params.put("project_id", String.valueOf(request.getProjectId())); + return params.build(); + }) .build(); GrpcCallSettings listJobsTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(listJobsMethodDescriptor) + .setParamsExtractor( + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("location", String.valueOf(request.getLocation())); + params.put("project_id", String.valueOf(request.getProjectId())); + return params.build(); + }) .build(); GrpcCallSettings aggregatedListJobsTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(aggregatedListJobsMethodDescriptor) + .setParamsExtractor( + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("project_id", String.valueOf(request.getProjectId())); + return params.build(); + }) .build(); GrpcCallSettings checkActiveJobsTransportSettings = @@ -195,6 +232,14 @@ protected GrpcJobsV1Beta3Stub( GrpcCallSettings snapshotJobTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(snapshotJobMethodDescriptor) + .setParamsExtractor( + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("job_id", String.valueOf(request.getJobId())); + params.put("location", String.valueOf(request.getLocation())); + params.put("project_id", String.valueOf(request.getProjectId())); + return params.build(); + }) .build(); this.createJobCallable = diff --git a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcMessagesV1Beta3Stub.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcMessagesV1Beta3Stub.java index 8d0894f0..8ccfdc80 100644 --- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcMessagesV1Beta3Stub.java +++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcMessagesV1Beta3Stub.java @@ -25,6 +25,7 @@ import com.google.api.gax.grpc.GrpcStubCallableFactory; import com.google.api.gax.rpc.ClientContext; import com.google.api.gax.rpc.UnaryCallable; +import com.google.common.collect.ImmutableMap; import com.google.dataflow.v1beta3.ListJobMessagesRequest; import com.google.dataflow.v1beta3.ListJobMessagesResponse; import com.google.longrunning.stub.GrpcOperationsStub; @@ -107,6 +108,14 @@ protected GrpcMessagesV1Beta3Stub( listJobMessagesTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(listJobMessagesMethodDescriptor) + .setParamsExtractor( + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("job_id", String.valueOf(request.getJobId())); + params.put("location", String.valueOf(request.getLocation())); + params.put("project_id", String.valueOf(request.getProjectId())); + return params.build(); + }) .build(); this.listJobMessagesCallable = diff --git a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcMetricsV1Beta3Stub.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcMetricsV1Beta3Stub.java index adc3c968..ff4ecc8f 100644 --- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcMetricsV1Beta3Stub.java +++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcMetricsV1Beta3Stub.java @@ -26,6 +26,7 @@ import com.google.api.gax.grpc.GrpcStubCallableFactory; import com.google.api.gax.rpc.ClientContext; import com.google.api.gax.rpc.UnaryCallable; +import com.google.common.collect.ImmutableMap; import com.google.dataflow.v1beta3.GetJobExecutionDetailsRequest; import com.google.dataflow.v1beta3.GetJobMetricsRequest; import com.google.dataflow.v1beta3.GetStageExecutionDetailsRequest; @@ -138,16 +139,41 @@ protected GrpcMetricsV1Beta3Stub( GrpcCallSettings getJobMetricsTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getJobMetricsMethodDescriptor) + .setParamsExtractor( + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("job_id", String.valueOf(request.getJobId())); + params.put("location", String.valueOf(request.getLocation())); + params.put("project_id", String.valueOf(request.getProjectId())); + return params.build(); + }) .build(); GrpcCallSettings getJobExecutionDetailsTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getJobExecutionDetailsMethodDescriptor) + .setParamsExtractor( + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("job_id", String.valueOf(request.getJobId())); + params.put("location", String.valueOf(request.getLocation())); + params.put("project_id", String.valueOf(request.getProjectId())); + return params.build(); + }) .build(); GrpcCallSettings getStageExecutionDetailsTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getStageExecutionDetailsMethodDescriptor) + .setParamsExtractor( + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("job_id", String.valueOf(request.getJobId())); + params.put("location", String.valueOf(request.getLocation())); + params.put("project_id", String.valueOf(request.getProjectId())); + params.put("stage_id", String.valueOf(request.getStageId())); + return params.build(); + }) .build(); this.getJobMetricsCallable = diff --git a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcSnapshotsV1Beta3Stub.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcSnapshotsV1Beta3Stub.java index 65ec375b..5d2c2877 100644 --- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcSnapshotsV1Beta3Stub.java +++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcSnapshotsV1Beta3Stub.java @@ -23,6 +23,7 @@ import com.google.api.gax.grpc.GrpcStubCallableFactory; import com.google.api.gax.rpc.ClientContext; import com.google.api.gax.rpc.UnaryCallable; +import com.google.common.collect.ImmutableMap; import com.google.dataflow.v1beta3.DeleteSnapshotRequest; import com.google.dataflow.v1beta3.DeleteSnapshotResponse; import com.google.dataflow.v1beta3.GetSnapshotRequest; @@ -126,15 +127,39 @@ protected GrpcSnapshotsV1Beta3Stub( GrpcCallSettings getSnapshotTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getSnapshotMethodDescriptor) + .setParamsExtractor( + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("location", String.valueOf(request.getLocation())); + params.put("project_id", String.valueOf(request.getProjectId())); + params.put("snapshot_id", String.valueOf(request.getSnapshotId())); + return params.build(); + }) .build(); GrpcCallSettings deleteSnapshotTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteSnapshotMethodDescriptor) + .setParamsExtractor( + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("location", String.valueOf(request.getLocation())); + params.put("project_id", String.valueOf(request.getProjectId())); + params.put("snapshot_id", String.valueOf(request.getSnapshotId())); + return params.build(); + }) .build(); GrpcCallSettings listSnapshotsTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(listSnapshotsMethodDescriptor) + .setParamsExtractor( + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("job_id", String.valueOf(request.getJobId())); + params.put("location", String.valueOf(request.getLocation())); + params.put("project_id", String.valueOf(request.getProjectId())); + return params.build(); + }) .build(); this.getSnapshotCallable = diff --git a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcTemplatesServiceStub.java b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcTemplatesServiceStub.java index 1ece4373..6654d70a 100644 --- a/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcTemplatesServiceStub.java +++ b/google-cloud-dataflow/src/main/java/com/google/dataflow/v1beta3/stub/GrpcTemplatesServiceStub.java @@ -23,6 +23,7 @@ import com.google.api.gax.grpc.GrpcStubCallableFactory; import com.google.api.gax.rpc.ClientContext; import com.google.api.gax.rpc.UnaryCallable; +import com.google.common.collect.ImmutableMap; import com.google.dataflow.v1beta3.CreateJobFromTemplateRequest; import com.google.dataflow.v1beta3.GetTemplateRequest; import com.google.dataflow.v1beta3.GetTemplateResponse; @@ -127,15 +128,36 @@ protected GrpcTemplatesServiceStub( GrpcCallSettings createJobFromTemplateTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(createJobFromTemplateMethodDescriptor) + .setParamsExtractor( + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("location", String.valueOf(request.getLocation())); + params.put("project_id", String.valueOf(request.getProjectId())); + return params.build(); + }) .build(); GrpcCallSettings launchTemplateTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(launchTemplateMethodDescriptor) + .setParamsExtractor( + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("location", String.valueOf(request.getLocation())); + params.put("project_id", String.valueOf(request.getProjectId())); + return params.build(); + }) .build(); GrpcCallSettings getTemplateTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getTemplateMethodDescriptor) + .setParamsExtractor( + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("location", String.valueOf(request.getLocation())); + params.put("project_id", String.valueOf(request.getProjectId())); + return params.build(); + }) .build(); this.createJobFromTemplateCallable = diff --git a/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/AutoscalingEvent.java b/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/AutoscalingEvent.java index 0da84785..6c988480 100644 --- a/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/AutoscalingEvent.java +++ b/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/AutoscalingEvent.java @@ -567,8 +567,7 @@ public com.google.protobuf.TimestampOrBuilder getTimeOrBuilder() { * * *

-   * A short and friendly name for the worker pool this event refers to,
-   * populated from the value of PoolStageRelation::user_pool_name.
+   * A short and friendly name for the worker pool this event refers to.
    * 
* * string worker_pool = 7; @@ -591,8 +590,7 @@ public java.lang.String getWorkerPool() { * * *
-   * A short and friendly name for the worker pool this event refers to,
-   * populated from the value of PoolStageRelation::user_pool_name.
+   * A short and friendly name for the worker pool this event refers to.
    * 
* * string worker_pool = 7; @@ -1628,8 +1626,7 @@ public com.google.protobuf.TimestampOrBuilder getTimeOrBuilder() { * * *
-     * A short and friendly name for the worker pool this event refers to,
-     * populated from the value of PoolStageRelation::user_pool_name.
+     * A short and friendly name for the worker pool this event refers to.
      * 
* * string worker_pool = 7; @@ -1651,8 +1648,7 @@ public java.lang.String getWorkerPool() { * * *
-     * A short and friendly name for the worker pool this event refers to,
-     * populated from the value of PoolStageRelation::user_pool_name.
+     * A short and friendly name for the worker pool this event refers to.
      * 
* * string worker_pool = 7; @@ -1674,8 +1670,7 @@ public com.google.protobuf.ByteString getWorkerPoolBytes() { * * *
-     * A short and friendly name for the worker pool this event refers to,
-     * populated from the value of PoolStageRelation::user_pool_name.
+     * A short and friendly name for the worker pool this event refers to.
      * 
* * string worker_pool = 7; @@ -1696,8 +1691,7 @@ public Builder setWorkerPool(java.lang.String value) { * * *
-     * A short and friendly name for the worker pool this event refers to,
-     * populated from the value of PoolStageRelation::user_pool_name.
+     * A short and friendly name for the worker pool this event refers to.
      * 
* * string worker_pool = 7; @@ -1714,8 +1708,7 @@ public Builder clearWorkerPool() { * * *
-     * A short and friendly name for the worker pool this event refers to,
-     * populated from the value of PoolStageRelation::user_pool_name.
+     * A short and friendly name for the worker pool this event refers to.
      * 
* * string worker_pool = 7; diff --git a/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/AutoscalingEventOrBuilder.java b/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/AutoscalingEventOrBuilder.java index 8a3d0d3f..9bde11f0 100644 --- a/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/AutoscalingEventOrBuilder.java +++ b/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/AutoscalingEventOrBuilder.java @@ -157,8 +157,7 @@ public interface AutoscalingEventOrBuilder * * *
-   * A short and friendly name for the worker pool this event refers to,
-   * populated from the value of PoolStageRelation::user_pool_name.
+   * A short and friendly name for the worker pool this event refers to.
    * 
* * string worker_pool = 7; @@ -170,8 +169,7 @@ public interface AutoscalingEventOrBuilder * * *
-   * A short and friendly name for the worker pool this event refers to,
-   * populated from the value of PoolStageRelation::user_pool_name.
+   * A short and friendly name for the worker pool this event refers to.
    * 
* * string worker_pool = 7; diff --git a/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/BigTableIODetails.java b/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/BigTableIODetails.java index af67bd4e..a1b38b17 100644 --- a/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/BigTableIODetails.java +++ b/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/BigTableIODetails.java @@ -22,7 +22,7 @@ * * *
- * Metadata for a Cloud BigTable connector used by the job.
+ * Metadata for a Cloud Bigtable connector used by the job.
  * 
* * Protobuf type {@code google.dataflow.v1beta3.BigTableIODetails} @@ -455,7 +455,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build * * *
-   * Metadata for a Cloud BigTable connector used by the job.
+   * Metadata for a Cloud Bigtable connector used by the job.
    * 
* * Protobuf type {@code google.dataflow.v1beta3.BigTableIODetails} diff --git a/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/FlexTemplateRuntimeEnvironment.java b/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/FlexTemplateRuntimeEnvironment.java index 85a9e5ad..62079147 100644 --- a/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/FlexTemplateRuntimeEnvironment.java +++ b/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/FlexTemplateRuntimeEnvironment.java @@ -53,6 +53,9 @@ private FlexTemplateRuntimeEnvironment() { flexrsGoal_ = 0; stagingLocation_ = ""; sdkContainerImage_ = ""; + autoscalingAlgorithm_ = 0; + saveHeapDumpsToGcsPath_ = ""; + launcherMachineType_ = ""; } @java.lang.Override @@ -219,6 +222,37 @@ private FlexTemplateRuntimeEnvironment( sdkContainerImage_ = s; break; } + case 160: + { + diskSizeGb_ = input.readInt32(); + break; + } + case 168: + { + int rawValue = input.readEnum(); + + autoscalingAlgorithm_ = rawValue; + break; + } + case 176: + { + dumpHeapOnOom_ = input.readBool(); + break; + } + case 186: + { + java.lang.String s = input.readStringRequireUtf8(); + + saveHeapDumpsToGcsPath_ = s; + break; + } + case 194: + { + java.lang.String s = input.readStringRequireUtf8(); + + launcherMachineType_ = s; + break; + } default: { if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { @@ -1173,6 +1207,185 @@ public com.google.protobuf.ByteString getSdkContainerImageBytes() { } } + public static final int DISK_SIZE_GB_FIELD_NUMBER = 20; + private int diskSizeGb_; + /** + * + * + *
+   * Worker disk size, in gigabytes.
+   * 
+ * + * int32 disk_size_gb = 20; + * + * @return The diskSizeGb. + */ + @java.lang.Override + public int getDiskSizeGb() { + return diskSizeGb_; + } + + public static final int AUTOSCALING_ALGORITHM_FIELD_NUMBER = 21; + private int autoscalingAlgorithm_; + /** + * + * + *
+   * The algorithm to use for autoscaling
+   * 
+ * + * .google.dataflow.v1beta3.AutoscalingAlgorithm autoscaling_algorithm = 21; + * + * @return The enum numeric value on the wire for autoscalingAlgorithm. + */ + @java.lang.Override + public int getAutoscalingAlgorithmValue() { + return autoscalingAlgorithm_; + } + /** + * + * + *
+   * The algorithm to use for autoscaling
+   * 
+ * + * .google.dataflow.v1beta3.AutoscalingAlgorithm autoscaling_algorithm = 21; + * + * @return The autoscalingAlgorithm. + */ + @java.lang.Override + public com.google.dataflow.v1beta3.AutoscalingAlgorithm getAutoscalingAlgorithm() { + @SuppressWarnings("deprecation") + com.google.dataflow.v1beta3.AutoscalingAlgorithm result = + com.google.dataflow.v1beta3.AutoscalingAlgorithm.valueOf(autoscalingAlgorithm_); + return result == null ? com.google.dataflow.v1beta3.AutoscalingAlgorithm.UNRECOGNIZED : result; + } + + public static final int DUMP_HEAP_ON_OOM_FIELD_NUMBER = 22; + private boolean dumpHeapOnOom_; + /** + * + * + *
+   * If true, save a heap dump before killing a thread or process which is GC
+   * thrashing or out of memory. The location of the heap file will either be
+   * echoed back to the user, or the user will be given the opportunity to
+   * download the heap file.
+   * 
+ * + * bool dump_heap_on_oom = 22; + * + * @return The dumpHeapOnOom. + */ + @java.lang.Override + public boolean getDumpHeapOnOom() { + return dumpHeapOnOom_; + } + + public static final int SAVE_HEAP_DUMPS_TO_GCS_PATH_FIELD_NUMBER = 23; + private volatile java.lang.Object saveHeapDumpsToGcsPath_; + /** + * + * + *
+   * Cloud Storage bucket (directory) to upload heap dumps to the given
+   * location. Enabling this implies that heap dumps should be generated on OOM
+   * (dump_heap_on_oom is set to true).
+   * 
+ * + * string save_heap_dumps_to_gcs_path = 23; + * + * @return The saveHeapDumpsToGcsPath. + */ + @java.lang.Override + public java.lang.String getSaveHeapDumpsToGcsPath() { + java.lang.Object ref = saveHeapDumpsToGcsPath_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + saveHeapDumpsToGcsPath_ = s; + return s; + } + } + /** + * + * + *
+   * Cloud Storage bucket (directory) to upload heap dumps to the given
+   * location. Enabling this implies that heap dumps should be generated on OOM
+   * (dump_heap_on_oom is set to true).
+   * 
+ * + * string save_heap_dumps_to_gcs_path = 23; + * + * @return The bytes for saveHeapDumpsToGcsPath. + */ + @java.lang.Override + public com.google.protobuf.ByteString getSaveHeapDumpsToGcsPathBytes() { + java.lang.Object ref = saveHeapDumpsToGcsPath_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + saveHeapDumpsToGcsPath_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int LAUNCHER_MACHINE_TYPE_FIELD_NUMBER = 24; + private volatile java.lang.Object launcherMachineType_; + /** + * + * + *
+   * The machine type to use for launching the job. The default is
+   * n1-standard-1.
+   * 
+ * + * string launcher_machine_type = 24; + * + * @return The launcherMachineType. + */ + @java.lang.Override + public java.lang.String getLauncherMachineType() { + java.lang.Object ref = launcherMachineType_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + launcherMachineType_ = s; + return s; + } + } + /** + * + * + *
+   * The machine type to use for launching the job. The default is
+   * n1-standard-1.
+   * 
+ * + * string launcher_machine_type = 24; + * + * @return The bytes for launcherMachineType. + */ + @java.lang.Override + public com.google.protobuf.ByteString getLauncherMachineTypeBytes() { + java.lang.Object ref = launcherMachineType_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + launcherMachineType_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + private byte memoizedIsInitialized = -1; @java.lang.Override @@ -1247,6 +1460,23 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(sdkContainerImage_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 18, sdkContainerImage_); } + if (diskSizeGb_ != 0) { + output.writeInt32(20, diskSizeGb_); + } + if (autoscalingAlgorithm_ + != com.google.dataflow.v1beta3.AutoscalingAlgorithm.AUTOSCALING_ALGORITHM_UNKNOWN + .getNumber()) { + output.writeEnum(21, autoscalingAlgorithm_); + } + if (dumpHeapOnOom_ != false) { + output.writeBool(22, dumpHeapOnOom_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(saveHeapDumpsToGcsPath_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 23, saveHeapDumpsToGcsPath_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(launcherMachineType_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 24, launcherMachineType_); + } unknownFields.writeTo(output); } @@ -1325,6 +1555,23 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(sdkContainerImage_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(18, sdkContainerImage_); } + if (diskSizeGb_ != 0) { + size += com.google.protobuf.CodedOutputStream.computeInt32Size(20, diskSizeGb_); + } + if (autoscalingAlgorithm_ + != com.google.dataflow.v1beta3.AutoscalingAlgorithm.AUTOSCALING_ALGORITHM_UNKNOWN + .getNumber()) { + size += com.google.protobuf.CodedOutputStream.computeEnumSize(21, autoscalingAlgorithm_); + } + if (dumpHeapOnOom_ != false) { + size += com.google.protobuf.CodedOutputStream.computeBoolSize(22, dumpHeapOnOom_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(saveHeapDumpsToGcsPath_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(23, saveHeapDumpsToGcsPath_); + } + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(launcherMachineType_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(24, launcherMachineType_); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -1360,6 +1607,11 @@ public boolean equals(final java.lang.Object obj) { if (flexrsGoal_ != other.flexrsGoal_) return false; if (!getStagingLocation().equals(other.getStagingLocation())) return false; if (!getSdkContainerImage().equals(other.getSdkContainerImage())) return false; + if (getDiskSizeGb() != other.getDiskSizeGb()) return false; + if (autoscalingAlgorithm_ != other.autoscalingAlgorithm_) return false; + if (getDumpHeapOnOom() != other.getDumpHeapOnOom()) return false; + if (!getSaveHeapDumpsToGcsPath().equals(other.getSaveHeapDumpsToGcsPath())) return false; + if (!getLauncherMachineType().equals(other.getLauncherMachineType())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -1411,6 +1663,16 @@ public int hashCode() { hash = (53 * hash) + getStagingLocation().hashCode(); hash = (37 * hash) + SDK_CONTAINER_IMAGE_FIELD_NUMBER; hash = (53 * hash) + getSdkContainerImage().hashCode(); + hash = (37 * hash) + DISK_SIZE_GB_FIELD_NUMBER; + hash = (53 * hash) + getDiskSizeGb(); + hash = (37 * hash) + AUTOSCALING_ALGORITHM_FIELD_NUMBER; + hash = (53 * hash) + autoscalingAlgorithm_; + hash = (37 * hash) + DUMP_HEAP_ON_OOM_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getDumpHeapOnOom()); + hash = (37 * hash) + SAVE_HEAP_DUMPS_TO_GCS_PATH_FIELD_NUMBER; + hash = (53 * hash) + getSaveHeapDumpsToGcsPath().hashCode(); + hash = (37 * hash) + LAUNCHER_MACHINE_TYPE_FIELD_NUMBER; + hash = (53 * hash) + getLauncherMachineType().hashCode(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -1612,6 +1874,16 @@ public Builder clear() { sdkContainerImage_ = ""; + diskSizeGb_ = 0; + + autoscalingAlgorithm_ = 0; + + dumpHeapOnOom_ = false; + + saveHeapDumpsToGcsPath_ = ""; + + launcherMachineType_ = ""; + return this; } @@ -1663,6 +1935,11 @@ public com.google.dataflow.v1beta3.FlexTemplateRuntimeEnvironment buildPartial() result.flexrsGoal_ = flexrsGoal_; result.stagingLocation_ = stagingLocation_; result.sdkContainerImage_ = sdkContainerImage_; + result.diskSizeGb_ = diskSizeGb_; + result.autoscalingAlgorithm_ = autoscalingAlgorithm_; + result.dumpHeapOnOom_ = dumpHeapOnOom_; + result.saveHeapDumpsToGcsPath_ = saveHeapDumpsToGcsPath_; + result.launcherMachineType_ = launcherMachineType_; onBuilt(); return result; } @@ -1783,6 +2060,23 @@ public Builder mergeFrom(com.google.dataflow.v1beta3.FlexTemplateRuntimeEnvironm sdkContainerImage_ = other.sdkContainerImage_; onChanged(); } + if (other.getDiskSizeGb() != 0) { + setDiskSizeGb(other.getDiskSizeGb()); + } + if (other.autoscalingAlgorithm_ != 0) { + setAutoscalingAlgorithmValue(other.getAutoscalingAlgorithmValue()); + } + if (other.getDumpHeapOnOom() != false) { + setDumpHeapOnOom(other.getDumpHeapOnOom()); + } + if (!other.getSaveHeapDumpsToGcsPath().isEmpty()) { + saveHeapDumpsToGcsPath_ = other.saveHeapDumpsToGcsPath_; + onChanged(); + } + if (!other.getLauncherMachineType().isEmpty()) { + launcherMachineType_ = other.launcherMachineType_; + onChanged(); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -3825,6 +4119,439 @@ public Builder setSdkContainerImageBytes(com.google.protobuf.ByteString value) { return this; } + private int diskSizeGb_; + /** + * + * + *
+     * Worker disk size, in gigabytes.
+     * 
+ * + * int32 disk_size_gb = 20; + * + * @return The diskSizeGb. + */ + @java.lang.Override + public int getDiskSizeGb() { + return diskSizeGb_; + } + /** + * + * + *
+     * Worker disk size, in gigabytes.
+     * 
+ * + * int32 disk_size_gb = 20; + * + * @param value The diskSizeGb to set. + * @return This builder for chaining. + */ + public Builder setDiskSizeGb(int value) { + + diskSizeGb_ = value; + onChanged(); + return this; + } + /** + * + * + *
+     * Worker disk size, in gigabytes.
+     * 
+ * + * int32 disk_size_gb = 20; + * + * @return This builder for chaining. + */ + public Builder clearDiskSizeGb() { + + diskSizeGb_ = 0; + onChanged(); + return this; + } + + private int autoscalingAlgorithm_ = 0; + /** + * + * + *
+     * The algorithm to use for autoscaling
+     * 
+ * + * .google.dataflow.v1beta3.AutoscalingAlgorithm autoscaling_algorithm = 21; + * + * @return The enum numeric value on the wire for autoscalingAlgorithm. + */ + @java.lang.Override + public int getAutoscalingAlgorithmValue() { + return autoscalingAlgorithm_; + } + /** + * + * + *
+     * The algorithm to use for autoscaling
+     * 
+ * + * .google.dataflow.v1beta3.AutoscalingAlgorithm autoscaling_algorithm = 21; + * + * @param value The enum numeric value on the wire for autoscalingAlgorithm to set. + * @return This builder for chaining. + */ + public Builder setAutoscalingAlgorithmValue(int value) { + + autoscalingAlgorithm_ = value; + onChanged(); + return this; + } + /** + * + * + *
+     * The algorithm to use for autoscaling
+     * 
+ * + * .google.dataflow.v1beta3.AutoscalingAlgorithm autoscaling_algorithm = 21; + * + * @return The autoscalingAlgorithm. + */ + @java.lang.Override + public com.google.dataflow.v1beta3.AutoscalingAlgorithm getAutoscalingAlgorithm() { + @SuppressWarnings("deprecation") + com.google.dataflow.v1beta3.AutoscalingAlgorithm result = + com.google.dataflow.v1beta3.AutoscalingAlgorithm.valueOf(autoscalingAlgorithm_); + return result == null + ? com.google.dataflow.v1beta3.AutoscalingAlgorithm.UNRECOGNIZED + : result; + } + /** + * + * + *
+     * The algorithm to use for autoscaling
+     * 
+ * + * .google.dataflow.v1beta3.AutoscalingAlgorithm autoscaling_algorithm = 21; + * + * @param value The autoscalingAlgorithm to set. + * @return This builder for chaining. + */ + public Builder setAutoscalingAlgorithm(com.google.dataflow.v1beta3.AutoscalingAlgorithm value) { + if (value == null) { + throw new NullPointerException(); + } + + autoscalingAlgorithm_ = value.getNumber(); + onChanged(); + return this; + } + /** + * + * + *
+     * The algorithm to use for autoscaling
+     * 
+ * + * .google.dataflow.v1beta3.AutoscalingAlgorithm autoscaling_algorithm = 21; + * + * @return This builder for chaining. + */ + public Builder clearAutoscalingAlgorithm() { + + autoscalingAlgorithm_ = 0; + onChanged(); + return this; + } + + private boolean dumpHeapOnOom_; + /** + * + * + *
+     * If true, save a heap dump before killing a thread or process which is GC
+     * thrashing or out of memory. The location of the heap file will either be
+     * echoed back to the user, or the user will be given the opportunity to
+     * download the heap file.
+     * 
+ * + * bool dump_heap_on_oom = 22; + * + * @return The dumpHeapOnOom. + */ + @java.lang.Override + public boolean getDumpHeapOnOom() { + return dumpHeapOnOom_; + } + /** + * + * + *
+     * If true, save a heap dump before killing a thread or process which is GC
+     * thrashing or out of memory. The location of the heap file will either be
+     * echoed back to the user, or the user will be given the opportunity to
+     * download the heap file.
+     * 
+ * + * bool dump_heap_on_oom = 22; + * + * @param value The dumpHeapOnOom to set. + * @return This builder for chaining. + */ + public Builder setDumpHeapOnOom(boolean value) { + + dumpHeapOnOom_ = value; + onChanged(); + return this; + } + /** + * + * + *
+     * If true, save a heap dump before killing a thread or process which is GC
+     * thrashing or out of memory. The location of the heap file will either be
+     * echoed back to the user, or the user will be given the opportunity to
+     * download the heap file.
+     * 
+ * + * bool dump_heap_on_oom = 22; + * + * @return This builder for chaining. + */ + public Builder clearDumpHeapOnOom() { + + dumpHeapOnOom_ = false; + onChanged(); + return this; + } + + private java.lang.Object saveHeapDumpsToGcsPath_ = ""; + /** + * + * + *
+     * Cloud Storage bucket (directory) to upload heap dumps to the given
+     * location. Enabling this implies that heap dumps should be generated on OOM
+     * (dump_heap_on_oom is set to true).
+     * 
+ * + * string save_heap_dumps_to_gcs_path = 23; + * + * @return The saveHeapDumpsToGcsPath. + */ + public java.lang.String getSaveHeapDumpsToGcsPath() { + java.lang.Object ref = saveHeapDumpsToGcsPath_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + saveHeapDumpsToGcsPath_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * + * + *
+     * Cloud Storage bucket (directory) to upload heap dumps to the given
+     * location. Enabling this implies that heap dumps should be generated on OOM
+     * (dump_heap_on_oom is set to true).
+     * 
+ * + * string save_heap_dumps_to_gcs_path = 23; + * + * @return The bytes for saveHeapDumpsToGcsPath. + */ + public com.google.protobuf.ByteString getSaveHeapDumpsToGcsPathBytes() { + java.lang.Object ref = saveHeapDumpsToGcsPath_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + saveHeapDumpsToGcsPath_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * + * + *
+     * Cloud Storage bucket (directory) to upload heap dumps to the given
+     * location. Enabling this implies that heap dumps should be generated on OOM
+     * (dump_heap_on_oom is set to true).
+     * 
+ * + * string save_heap_dumps_to_gcs_path = 23; + * + * @param value The saveHeapDumpsToGcsPath to set. + * @return This builder for chaining. + */ + public Builder setSaveHeapDumpsToGcsPath(java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + saveHeapDumpsToGcsPath_ = value; + onChanged(); + return this; + } + /** + * + * + *
+     * Cloud Storage bucket (directory) to upload heap dumps to the given
+     * location. Enabling this implies that heap dumps should be generated on OOM
+     * (dump_heap_on_oom is set to true).
+     * 
+ * + * string save_heap_dumps_to_gcs_path = 23; + * + * @return This builder for chaining. + */ + public Builder clearSaveHeapDumpsToGcsPath() { + + saveHeapDumpsToGcsPath_ = getDefaultInstance().getSaveHeapDumpsToGcsPath(); + onChanged(); + return this; + } + /** + * + * + *
+     * Cloud Storage bucket (directory) to upload heap dumps to the given
+     * location. Enabling this implies that heap dumps should be generated on OOM
+     * (dump_heap_on_oom is set to true).
+     * 
+ * + * string save_heap_dumps_to_gcs_path = 23; + * + * @param value The bytes for saveHeapDumpsToGcsPath to set. + * @return This builder for chaining. + */ + public Builder setSaveHeapDumpsToGcsPathBytes(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + saveHeapDumpsToGcsPath_ = value; + onChanged(); + return this; + } + + private java.lang.Object launcherMachineType_ = ""; + /** + * + * + *
+     * The machine type to use for launching the job. The default is
+     * n1-standard-1.
+     * 
+ * + * string launcher_machine_type = 24; + * + * @return The launcherMachineType. + */ + public java.lang.String getLauncherMachineType() { + java.lang.Object ref = launcherMachineType_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + launcherMachineType_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * + * + *
+     * The machine type to use for launching the job. The default is
+     * n1-standard-1.
+     * 
+ * + * string launcher_machine_type = 24; + * + * @return The bytes for launcherMachineType. + */ + public com.google.protobuf.ByteString getLauncherMachineTypeBytes() { + java.lang.Object ref = launcherMachineType_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + launcherMachineType_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * + * + *
+     * The machine type to use for launching the job. The default is
+     * n1-standard-1.
+     * 
+ * + * string launcher_machine_type = 24; + * + * @param value The launcherMachineType to set. + * @return This builder for chaining. + */ + public Builder setLauncherMachineType(java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + launcherMachineType_ = value; + onChanged(); + return this; + } + /** + * + * + *
+     * The machine type to use for launching the job. The default is
+     * n1-standard-1.
+     * 
+ * + * string launcher_machine_type = 24; + * + * @return This builder for chaining. + */ + public Builder clearLauncherMachineType() { + + launcherMachineType_ = getDefaultInstance().getLauncherMachineType(); + onChanged(); + return this; + } + /** + * + * + *
+     * The machine type to use for launching the job. The default is
+     * n1-standard-1.
+     * 
+ * + * string launcher_machine_type = 24; + * + * @param value The bytes for launcherMachineType to set. + * @return This builder for chaining. + */ + public Builder setLauncherMachineTypeBytes(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + launcherMachineType_ = 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/FlexTemplateRuntimeEnvironmentOrBuilder.java b/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/FlexTemplateRuntimeEnvironmentOrBuilder.java index 4d301bb9..0d8edd91 100644 --- a/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/FlexTemplateRuntimeEnvironmentOrBuilder.java +++ b/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/FlexTemplateRuntimeEnvironmentOrBuilder.java @@ -570,4 +570,114 @@ java.lang.String getAdditionalUserLabelsOrDefault( * @return The bytes for sdkContainerImage. */ com.google.protobuf.ByteString getSdkContainerImageBytes(); + + /** + * + * + *
+   * Worker disk size, in gigabytes.
+   * 
+ * + * int32 disk_size_gb = 20; + * + * @return The diskSizeGb. + */ + int getDiskSizeGb(); + + /** + * + * + *
+   * The algorithm to use for autoscaling
+   * 
+ * + * .google.dataflow.v1beta3.AutoscalingAlgorithm autoscaling_algorithm = 21; + * + * @return The enum numeric value on the wire for autoscalingAlgorithm. + */ + int getAutoscalingAlgorithmValue(); + /** + * + * + *
+   * The algorithm to use for autoscaling
+   * 
+ * + * .google.dataflow.v1beta3.AutoscalingAlgorithm autoscaling_algorithm = 21; + * + * @return The autoscalingAlgorithm. + */ + com.google.dataflow.v1beta3.AutoscalingAlgorithm getAutoscalingAlgorithm(); + + /** + * + * + *
+   * If true, save a heap dump before killing a thread or process which is GC
+   * thrashing or out of memory. The location of the heap file will either be
+   * echoed back to the user, or the user will be given the opportunity to
+   * download the heap file.
+   * 
+ * + * bool dump_heap_on_oom = 22; + * + * @return The dumpHeapOnOom. + */ + boolean getDumpHeapOnOom(); + + /** + * + * + *
+   * Cloud Storage bucket (directory) to upload heap dumps to the given
+   * location. Enabling this implies that heap dumps should be generated on OOM
+   * (dump_heap_on_oom is set to true).
+   * 
+ * + * string save_heap_dumps_to_gcs_path = 23; + * + * @return The saveHeapDumpsToGcsPath. + */ + java.lang.String getSaveHeapDumpsToGcsPath(); + /** + * + * + *
+   * Cloud Storage bucket (directory) to upload heap dumps to the given
+   * location. Enabling this implies that heap dumps should be generated on OOM
+   * (dump_heap_on_oom is set to true).
+   * 
+ * + * string save_heap_dumps_to_gcs_path = 23; + * + * @return The bytes for saveHeapDumpsToGcsPath. + */ + com.google.protobuf.ByteString getSaveHeapDumpsToGcsPathBytes(); + + /** + * + * + *
+   * The machine type to use for launching the job. The default is
+   * n1-standard-1.
+   * 
+ * + * string launcher_machine_type = 24; + * + * @return The launcherMachineType. + */ + java.lang.String getLauncherMachineType(); + /** + * + * + *
+   * The machine type to use for launching the job. The default is
+   * n1-standard-1.
+   * 
+ * + * string launcher_machine_type = 24; + * + * @return The bytes for launcherMachineType. + */ + com.google.protobuf.ByteString getLauncherMachineTypeBytes(); } diff --git a/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/JobMetadata.java b/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/JobMetadata.java index e17cec01..ebf9a259 100644 --- a/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/JobMetadata.java +++ b/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/JobMetadata.java @@ -410,7 +410,7 @@ public com.google.dataflow.v1beta3.BigQueryIODetailsOrBuilder getBigqueryDetails * * *
-   * Identification of a Cloud BigTable source used in the Dataflow job.
+   * Identification of a Cloud Bigtable source used in the Dataflow job.
    * 
* * repeated .google.dataflow.v1beta3.BigTableIODetails big_table_details = 4; @@ -423,7 +423,7 @@ public java.util.List getBigTable * * *
-   * Identification of a Cloud BigTable source used in the Dataflow job.
+   * Identification of a Cloud Bigtable source used in the Dataflow job.
    * 
* * repeated .google.dataflow.v1beta3.BigTableIODetails big_table_details = 4; @@ -437,7 +437,7 @@ public java.util.List getBigTable * * *
-   * Identification of a Cloud BigTable source used in the Dataflow job.
+   * Identification of a Cloud Bigtable source used in the Dataflow job.
    * 
* * repeated .google.dataflow.v1beta3.BigTableIODetails big_table_details = 4; @@ -450,7 +450,7 @@ public int getBigTableDetailsCount() { * * *
-   * Identification of a Cloud BigTable source used in the Dataflow job.
+   * Identification of a Cloud Bigtable source used in the Dataflow job.
    * 
* * repeated .google.dataflow.v1beta3.BigTableIODetails big_table_details = 4; @@ -463,7 +463,7 @@ public com.google.dataflow.v1beta3.BigTableIODetails getBigTableDetails(int inde * * *
-   * Identification of a Cloud BigTable source used in the Dataflow job.
+   * Identification of a Cloud Bigtable source used in the Dataflow job.
    * 
* * repeated .google.dataflow.v1beta3.BigTableIODetails big_table_details = 4; @@ -480,7 +480,7 @@ public com.google.dataflow.v1beta3.BigTableIODetailsOrBuilder getBigTableDetails * * *
-   * Identification of a PubSub source used in the Dataflow job.
+   * Identification of a Pub/Sub source used in the Dataflow job.
    * 
* * repeated .google.dataflow.v1beta3.PubSubIODetails pubsub_details = 5; @@ -493,7 +493,7 @@ public java.util.List getPubsubDeta * * *
-   * Identification of a PubSub source used in the Dataflow job.
+   * Identification of a Pub/Sub source used in the Dataflow job.
    * 
* * repeated .google.dataflow.v1beta3.PubSubIODetails pubsub_details = 5; @@ -507,7 +507,7 @@ public java.util.List getPubsubDeta * * *
-   * Identification of a PubSub source used in the Dataflow job.
+   * Identification of a Pub/Sub source used in the Dataflow job.
    * 
* * repeated .google.dataflow.v1beta3.PubSubIODetails pubsub_details = 5; @@ -520,7 +520,7 @@ public int getPubsubDetailsCount() { * * *
-   * Identification of a PubSub source used in the Dataflow job.
+   * Identification of a Pub/Sub source used in the Dataflow job.
    * 
* * repeated .google.dataflow.v1beta3.PubSubIODetails pubsub_details = 5; @@ -533,7 +533,7 @@ public com.google.dataflow.v1beta3.PubSubIODetails getPubsubDetails(int index) { * * *
-   * Identification of a PubSub source used in the Dataflow job.
+   * Identification of a Pub/Sub source used in the Dataflow job.
    * 
* * repeated .google.dataflow.v1beta3.PubSubIODetails pubsub_details = 5; @@ -2264,7 +2264,7 @@ private void ensureBigTableDetailsIsMutable() { * * *
-     * Identification of a Cloud BigTable source used in the Dataflow job.
+     * Identification of a Cloud Bigtable source used in the Dataflow job.
      * 
* * repeated .google.dataflow.v1beta3.BigTableIODetails big_table_details = 4; @@ -2280,7 +2280,7 @@ public java.util.List getBigTable * * *
-     * Identification of a Cloud BigTable source used in the Dataflow job.
+     * Identification of a Cloud Bigtable source used in the Dataflow job.
      * 
* * repeated .google.dataflow.v1beta3.BigTableIODetails big_table_details = 4; @@ -2296,7 +2296,7 @@ public int getBigTableDetailsCount() { * * *
-     * Identification of a Cloud BigTable source used in the Dataflow job.
+     * Identification of a Cloud Bigtable source used in the Dataflow job.
      * 
* * repeated .google.dataflow.v1beta3.BigTableIODetails big_table_details = 4; @@ -2312,7 +2312,7 @@ public com.google.dataflow.v1beta3.BigTableIODetails getBigTableDetails(int inde * * *
-     * Identification of a Cloud BigTable source used in the Dataflow job.
+     * Identification of a Cloud Bigtable source used in the Dataflow job.
      * 
* * repeated .google.dataflow.v1beta3.BigTableIODetails big_table_details = 4; @@ -2335,7 +2335,7 @@ public Builder setBigTableDetails( * * *
-     * Identification of a Cloud BigTable source used in the Dataflow job.
+     * Identification of a Cloud Bigtable source used in the Dataflow job.
      * 
* * repeated .google.dataflow.v1beta3.BigTableIODetails big_table_details = 4; @@ -2355,7 +2355,7 @@ public Builder setBigTableDetails( * * *
-     * Identification of a Cloud BigTable source used in the Dataflow job.
+     * Identification of a Cloud Bigtable source used in the Dataflow job.
      * 
* * repeated .google.dataflow.v1beta3.BigTableIODetails big_table_details = 4; @@ -2377,7 +2377,7 @@ public Builder addBigTableDetails(com.google.dataflow.v1beta3.BigTableIODetails * * *
-     * Identification of a Cloud BigTable source used in the Dataflow job.
+     * Identification of a Cloud Bigtable source used in the Dataflow job.
      * 
* * repeated .google.dataflow.v1beta3.BigTableIODetails big_table_details = 4; @@ -2400,7 +2400,7 @@ public Builder addBigTableDetails( * * *
-     * Identification of a Cloud BigTable source used in the Dataflow job.
+     * Identification of a Cloud Bigtable source used in the Dataflow job.
      * 
* * repeated .google.dataflow.v1beta3.BigTableIODetails big_table_details = 4; @@ -2420,7 +2420,7 @@ public Builder addBigTableDetails( * * *
-     * Identification of a Cloud BigTable source used in the Dataflow job.
+     * Identification of a Cloud Bigtable source used in the Dataflow job.
      * 
* * repeated .google.dataflow.v1beta3.BigTableIODetails big_table_details = 4; @@ -2440,7 +2440,7 @@ public Builder addBigTableDetails( * * *
-     * Identification of a Cloud BigTable source used in the Dataflow job.
+     * Identification of a Cloud Bigtable source used in the Dataflow job.
      * 
* * repeated .google.dataflow.v1beta3.BigTableIODetails big_table_details = 4; @@ -2460,7 +2460,7 @@ public Builder addAllBigTableDetails( * * *
-     * Identification of a Cloud BigTable source used in the Dataflow job.
+     * Identification of a Cloud Bigtable source used in the Dataflow job.
      * 
* * repeated .google.dataflow.v1beta3.BigTableIODetails big_table_details = 4; @@ -2479,7 +2479,7 @@ public Builder clearBigTableDetails() { * * *
-     * Identification of a Cloud BigTable source used in the Dataflow job.
+     * Identification of a Cloud Bigtable source used in the Dataflow job.
      * 
* * repeated .google.dataflow.v1beta3.BigTableIODetails big_table_details = 4; @@ -2498,7 +2498,7 @@ public Builder removeBigTableDetails(int index) { * * *
-     * Identification of a Cloud BigTable source used in the Dataflow job.
+     * Identification of a Cloud Bigtable source used in the Dataflow job.
      * 
* * repeated .google.dataflow.v1beta3.BigTableIODetails big_table_details = 4; @@ -2511,7 +2511,7 @@ public com.google.dataflow.v1beta3.BigTableIODetails.Builder getBigTableDetailsB * * *
-     * Identification of a Cloud BigTable source used in the Dataflow job.
+     * Identification of a Cloud Bigtable source used in the Dataflow job.
      * 
* * repeated .google.dataflow.v1beta3.BigTableIODetails big_table_details = 4; @@ -2528,7 +2528,7 @@ public com.google.dataflow.v1beta3.BigTableIODetailsOrBuilder getBigTableDetails * * *
-     * Identification of a Cloud BigTable source used in the Dataflow job.
+     * Identification of a Cloud Bigtable source used in the Dataflow job.
      * 
* * repeated .google.dataflow.v1beta3.BigTableIODetails big_table_details = 4; @@ -2545,7 +2545,7 @@ public com.google.dataflow.v1beta3.BigTableIODetailsOrBuilder getBigTableDetails * * *
-     * Identification of a Cloud BigTable source used in the Dataflow job.
+     * Identification of a Cloud Bigtable source used in the Dataflow job.
      * 
* * repeated .google.dataflow.v1beta3.BigTableIODetails big_table_details = 4; @@ -2558,7 +2558,7 @@ public com.google.dataflow.v1beta3.BigTableIODetails.Builder addBigTableDetailsB * * *
-     * Identification of a Cloud BigTable source used in the Dataflow job.
+     * Identification of a Cloud Bigtable source used in the Dataflow job.
      * 
* * repeated .google.dataflow.v1beta3.BigTableIODetails big_table_details = 4; @@ -2572,7 +2572,7 @@ public com.google.dataflow.v1beta3.BigTableIODetails.Builder addBigTableDetailsB * * *
-     * Identification of a Cloud BigTable source used in the Dataflow job.
+     * Identification of a Cloud Bigtable source used in the Dataflow job.
      * 
* * repeated .google.dataflow.v1beta3.BigTableIODetails big_table_details = 4; @@ -2623,7 +2623,7 @@ private void ensurePubsubDetailsIsMutable() { * * *
-     * Identification of a PubSub source used in the Dataflow job.
+     * Identification of a Pub/Sub source used in the Dataflow job.
      * 
* * repeated .google.dataflow.v1beta3.PubSubIODetails pubsub_details = 5; @@ -2639,7 +2639,7 @@ public java.util.List getPubsubDeta * * *
-     * Identification of a PubSub source used in the Dataflow job.
+     * Identification of a Pub/Sub source used in the Dataflow job.
      * 
* * repeated .google.dataflow.v1beta3.PubSubIODetails pubsub_details = 5; @@ -2655,7 +2655,7 @@ public int getPubsubDetailsCount() { * * *
-     * Identification of a PubSub source used in the Dataflow job.
+     * Identification of a Pub/Sub source used in the Dataflow job.
      * 
* * repeated .google.dataflow.v1beta3.PubSubIODetails pubsub_details = 5; @@ -2671,7 +2671,7 @@ public com.google.dataflow.v1beta3.PubSubIODetails getPubsubDetails(int index) { * * *
-     * Identification of a PubSub source used in the Dataflow job.
+     * Identification of a Pub/Sub source used in the Dataflow job.
      * 
* * repeated .google.dataflow.v1beta3.PubSubIODetails pubsub_details = 5; @@ -2693,7 +2693,7 @@ public Builder setPubsubDetails(int index, com.google.dataflow.v1beta3.PubSubIOD * * *
-     * Identification of a PubSub source used in the Dataflow job.
+     * Identification of a Pub/Sub source used in the Dataflow job.
      * 
* * repeated .google.dataflow.v1beta3.PubSubIODetails pubsub_details = 5; @@ -2713,7 +2713,7 @@ public Builder setPubsubDetails( * * *
-     * Identification of a PubSub source used in the Dataflow job.
+     * Identification of a Pub/Sub source used in the Dataflow job.
      * 
* * repeated .google.dataflow.v1beta3.PubSubIODetails pubsub_details = 5; @@ -2735,7 +2735,7 @@ public Builder addPubsubDetails(com.google.dataflow.v1beta3.PubSubIODetails valu * * *
-     * Identification of a PubSub source used in the Dataflow job.
+     * Identification of a Pub/Sub source used in the Dataflow job.
      * 
* * repeated .google.dataflow.v1beta3.PubSubIODetails pubsub_details = 5; @@ -2757,7 +2757,7 @@ public Builder addPubsubDetails(int index, com.google.dataflow.v1beta3.PubSubIOD * * *
-     * Identification of a PubSub source used in the Dataflow job.
+     * Identification of a Pub/Sub source used in the Dataflow job.
      * 
* * repeated .google.dataflow.v1beta3.PubSubIODetails pubsub_details = 5; @@ -2777,7 +2777,7 @@ public Builder addPubsubDetails( * * *
-     * Identification of a PubSub source used in the Dataflow job.
+     * Identification of a Pub/Sub source used in the Dataflow job.
      * 
* * repeated .google.dataflow.v1beta3.PubSubIODetails pubsub_details = 5; @@ -2797,7 +2797,7 @@ public Builder addPubsubDetails( * * *
-     * Identification of a PubSub source used in the Dataflow job.
+     * Identification of a Pub/Sub source used in the Dataflow job.
      * 
* * repeated .google.dataflow.v1beta3.PubSubIODetails pubsub_details = 5; @@ -2817,7 +2817,7 @@ public Builder addAllPubsubDetails( * * *
-     * Identification of a PubSub source used in the Dataflow job.
+     * Identification of a Pub/Sub source used in the Dataflow job.
      * 
* * repeated .google.dataflow.v1beta3.PubSubIODetails pubsub_details = 5; @@ -2836,7 +2836,7 @@ public Builder clearPubsubDetails() { * * *
-     * Identification of a PubSub source used in the Dataflow job.
+     * Identification of a Pub/Sub source used in the Dataflow job.
      * 
* * repeated .google.dataflow.v1beta3.PubSubIODetails pubsub_details = 5; @@ -2855,7 +2855,7 @@ public Builder removePubsubDetails(int index) { * * *
-     * Identification of a PubSub source used in the Dataflow job.
+     * Identification of a Pub/Sub source used in the Dataflow job.
      * 
* * repeated .google.dataflow.v1beta3.PubSubIODetails pubsub_details = 5; @@ -2867,7 +2867,7 @@ public com.google.dataflow.v1beta3.PubSubIODetails.Builder getPubsubDetailsBuild * * *
-     * Identification of a PubSub source used in the Dataflow job.
+     * Identification of a Pub/Sub source used in the Dataflow job.
      * 
* * repeated .google.dataflow.v1beta3.PubSubIODetails pubsub_details = 5; @@ -2884,7 +2884,7 @@ public com.google.dataflow.v1beta3.PubSubIODetailsOrBuilder getPubsubDetailsOrBu * * *
-     * Identification of a PubSub source used in the Dataflow job.
+     * Identification of a Pub/Sub source used in the Dataflow job.
      * 
* * repeated .google.dataflow.v1beta3.PubSubIODetails pubsub_details = 5; @@ -2901,7 +2901,7 @@ public com.google.dataflow.v1beta3.PubSubIODetailsOrBuilder getPubsubDetailsOrBu * * *
-     * Identification of a PubSub source used in the Dataflow job.
+     * Identification of a Pub/Sub source used in the Dataflow job.
      * 
* * repeated .google.dataflow.v1beta3.PubSubIODetails pubsub_details = 5; @@ -2914,7 +2914,7 @@ public com.google.dataflow.v1beta3.PubSubIODetails.Builder addPubsubDetailsBuild * * *
-     * Identification of a PubSub source used in the Dataflow job.
+     * Identification of a Pub/Sub source used in the Dataflow job.
      * 
* * repeated .google.dataflow.v1beta3.PubSubIODetails pubsub_details = 5; @@ -2927,7 +2927,7 @@ public com.google.dataflow.v1beta3.PubSubIODetails.Builder addPubsubDetailsBuild * * *
-     * Identification of a PubSub source used in the Dataflow job.
+     * Identification of a Pub/Sub source used in the Dataflow job.
      * 
* * repeated .google.dataflow.v1beta3.PubSubIODetails pubsub_details = 5; diff --git a/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/JobMetadataOrBuilder.java b/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/JobMetadataOrBuilder.java index 2abd1447..8a0e6ca7 100644 --- a/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/JobMetadataOrBuilder.java +++ b/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/JobMetadataOrBuilder.java @@ -166,7 +166,7 @@ public interface JobMetadataOrBuilder * * *
-   * Identification of a Cloud BigTable source used in the Dataflow job.
+   * Identification of a Cloud Bigtable source used in the Dataflow job.
    * 
* * repeated .google.dataflow.v1beta3.BigTableIODetails big_table_details = 4; @@ -176,7 +176,7 @@ public interface JobMetadataOrBuilder * * *
-   * Identification of a Cloud BigTable source used in the Dataflow job.
+   * Identification of a Cloud Bigtable source used in the Dataflow job.
    * 
* * repeated .google.dataflow.v1beta3.BigTableIODetails big_table_details = 4; @@ -186,7 +186,7 @@ public interface JobMetadataOrBuilder * * *
-   * Identification of a Cloud BigTable source used in the Dataflow job.
+   * Identification of a Cloud Bigtable source used in the Dataflow job.
    * 
* * repeated .google.dataflow.v1beta3.BigTableIODetails big_table_details = 4; @@ -196,7 +196,7 @@ public interface JobMetadataOrBuilder * * *
-   * Identification of a Cloud BigTable source used in the Dataflow job.
+   * Identification of a Cloud Bigtable source used in the Dataflow job.
    * 
* * repeated .google.dataflow.v1beta3.BigTableIODetails big_table_details = 4; @@ -207,7 +207,7 @@ public interface JobMetadataOrBuilder * * *
-   * Identification of a Cloud BigTable source used in the Dataflow job.
+   * Identification of a Cloud Bigtable source used in the Dataflow job.
    * 
* * repeated .google.dataflow.v1beta3.BigTableIODetails big_table_details = 4; @@ -218,7 +218,7 @@ public interface JobMetadataOrBuilder * * *
-   * Identification of a PubSub source used in the Dataflow job.
+   * Identification of a Pub/Sub source used in the Dataflow job.
    * 
* * repeated .google.dataflow.v1beta3.PubSubIODetails pubsub_details = 5; @@ -228,7 +228,7 @@ public interface JobMetadataOrBuilder * * *
-   * Identification of a PubSub source used in the Dataflow job.
+   * Identification of a Pub/Sub source used in the Dataflow job.
    * 
* * repeated .google.dataflow.v1beta3.PubSubIODetails pubsub_details = 5; @@ -238,7 +238,7 @@ public interface JobMetadataOrBuilder * * *
-   * Identification of a PubSub source used in the Dataflow job.
+   * Identification of a Pub/Sub source used in the Dataflow job.
    * 
* * repeated .google.dataflow.v1beta3.PubSubIODetails pubsub_details = 5; @@ -248,7 +248,7 @@ public interface JobMetadataOrBuilder * * *
-   * Identification of a PubSub source used in the Dataflow job.
+   * Identification of a Pub/Sub source used in the Dataflow job.
    * 
* * repeated .google.dataflow.v1beta3.PubSubIODetails pubsub_details = 5; @@ -259,7 +259,7 @@ public interface JobMetadataOrBuilder * * *
-   * Identification of a PubSub source used in the Dataflow job.
+   * Identification of a Pub/Sub source used in the Dataflow job.
    * 
* * repeated .google.dataflow.v1beta3.PubSubIODetails pubsub_details = 5; diff --git a/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/JobsProto.java b/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/JobsProto.java index f00f36ec..1553d4fe 100644 --- a/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/JobsProto.java +++ b/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/JobsProto.java @@ -166,12 +166,12 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { java.lang.String[] descriptorData = { "\n\"google/dataflow/v1beta3/jobs.proto\022\027go" + "ogle.dataflow.v1beta3\032\034google/api/annota" - + "tions.proto\032)google/dataflow/v1beta3/env" - + "ironment.proto\032\'google/dataflow/v1beta3/" - + "snapshots.proto\032\036google/protobuf/duratio" - + "n.proto\032\034google/protobuf/struct.proto\032\037g" - + "oogle/protobuf/timestamp.proto\032\027google/a" - + "pi/client.proto\"\256\t\n\003Job\022\n\n\002id\030\001 \001(\t\022\022\n\np" + + "tions.proto\032\027google/api/client.proto\032)go" + + "ogle/dataflow/v1beta3/environment.proto\032" + + "\'google/dataflow/v1beta3/snapshots.proto" + + "\032\036google/protobuf/duration.proto\032\034google" + + "/protobuf/struct.proto\032\037google/protobuf/" + + "timestamp.proto\"\256\t\n\003Job\022\n\n\002id\030\001 \001(\t\022\022\n\np" + "roject_id\030\002 \001(\t\022\014\n\004name\030\003 \001(\t\022.\n\004type\030\004 " + "\001(\0162 .google.dataflow.v1beta3.JobType\0229\n" + "\013environment\030\005 \001(\0132$.google.dataflow.v1b" @@ -324,47 +324,63 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\"\n\036JOB_STATE_RESOURCE_CLEANING_UP\020\014*a\n\007J" + "obView\022\024\n\020JOB_VIEW_UNKNOWN\020\000\022\024\n\020JOB_VIEW" + "_SUMMARY\020\001\022\020\n\014JOB_VIEW_ALL\020\002\022\030\n\024JOB_VIEW" - + "_DESCRIPTION\020\0032\217\007\n\013JobsV1Beta3\022V\n\tCreate" - + "Job\022).google.dataflow.v1beta3.CreateJobR" - + "equest\032\034.google.dataflow.v1beta3.Job\"\000\022P" - + "\n\006GetJob\022&.google.dataflow.v1beta3.GetJo" - + "bRequest\032\034.google.dataflow.v1beta3.Job\"\000" - + "\022V\n\tUpdateJob\022).google.dataflow.v1beta3." - + "UpdateJobRequest\032\034.google.dataflow.v1bet" - + "a3.Job\"\000\022a\n\010ListJobs\022(.google.dataflow.v" - + "1beta3.ListJobsRequest\032).google.dataflow" - + ".v1beta3.ListJobsResponse\"\000\022k\n\022Aggregate" - + "dListJobs\022(.google.dataflow.v1beta3.List" - + "JobsRequest\032).google.dataflow.v1beta3.Li" - + "stJobsResponse\"\000\022v\n\017CheckActiveJobs\022/.go" - + "ogle.dataflow.v1beta3.CheckActiveJobsReq" - + "uest\0320.google.dataflow.v1beta3.CheckActi" - + "veJobsResponse\"\000\022_\n\013SnapshotJob\022+.google" - + ".dataflow.v1beta3.SnapshotJobRequest\032!.g" - + "oogle.dataflow.v1beta3.Snapshot\"\000\032\324\001\312A\027d" - + "ataflow.googleapis.com\322A\266\001https://www.go" - + "ogleapis.com/auth/cloud-platform,https:/" - + "/www.googleapis.com/auth/compute,https:/" - + "/www.googleapis.com/auth/compute.readonl" - + "y,https://www.googleapis.com/auth/userin" - + "fo.emailB\316\001\n\033com.google.dataflow.v1beta3" - + "B\tJobsProtoP\001Z?google.golang.org/genprot" - + "o/googleapis/dataflow/v1beta3;dataflow\252\002" - + "\035Google.Cloud.Dataflow.V1Beta3\312\002\035Google\\" - + "Cloud\\Dataflow\\V1beta3\352\002 Google::Cloud::" - + "Dataflow::V1beta3b\006proto3" + + "_DESCRIPTION\020\0032\221\014\n\013JobsV1Beta3\022\301\001\n\tCreat" + + "eJob\022).google.dataflow.v1beta3.CreateJob" + + "Request\032\034.google.dataflow.v1beta3.Job\"k\202" + + "\323\344\223\002e\" /v1b3/projects/{project_id}/jobs:" + + "\003jobZ<\"5/v1b3/projects/{project_id}/loca" + + "tions/{location}/jobs:\003job\022\303\001\n\006GetJob\022&." + + "google.dataflow.v1beta3.GetJobRequest\032\034." + + "google.dataflow.v1beta3.Job\"s\202\323\344\223\002m\022)/v1" + + "b3/projects/{project_id}/jobs/{job_id}Z@" + + "\022>/v1b3/projects/{project_id}/locations/" + + "{location}/jobs/{job_id}\022\323\001\n\tUpdateJob\022)" + + ".google.dataflow.v1beta3.UpdateJobReques" + + "t\032\034.google.dataflow.v1beta3.Job\"}\202\323\344\223\002w\032" + + ")/v1b3/projects/{project_id}/jobs/{job_i" + + "d}:\003jobZE\032>/v1b3/projects/{project_id}/l" + + "ocations/{location}/jobs/{job_id}:\003job\022\302" + + "\001\n\010ListJobs\022(.google.dataflow.v1beta3.Li" + + "stJobsRequest\032).google.dataflow.v1beta3." + + "ListJobsResponse\"a\202\323\344\223\002[\022 /v1b3/projects" + + "/{project_id}/jobsZ7\0225/v1b3/projects/{pr" + + "oject_id}/locations/{location}/jobs\022\236\001\n\022" + + "AggregatedListJobs\022(.google.dataflow.v1b" + + "eta3.ListJobsRequest\032).google.dataflow.v" + + "1beta3.ListJobsResponse\"3\202\323\344\223\002-\022+/v1b3/p" + + "rojects/{project_id}/jobs:aggregated\022v\n\017" + + "CheckActiveJobs\022/.google.dataflow.v1beta" + + "3.CheckActiveJobsRequest\0320.google.datafl" + + "ow.v1beta3.CheckActiveJobsResponse\"\000\022\354\001\n" + + "\013SnapshotJob\022+.google.dataflow.v1beta3.S" + + "napshotJobRequest\032!.google.dataflow.v1be" + + "ta3.Snapshot\"\214\001\202\323\344\223\002\205\001\"2/v1b3/projects/{" + + "project_id}/jobs/{job_id}:snapshot:\001*ZL\"" + + "G/v1b3/projects/{project_id}/locations/{" + + "location}/jobs/{job_id}:snapshot:\001*\032\324\001\312A" + + "\027dataflow.googleapis.com\322A\266\001https://www." + + "googleapis.com/auth/cloud-platform,https" + + "://www.googleapis.com/auth/compute,https" + + "://www.googleapis.com/auth/compute.reado" + + "nly,https://www.googleapis.com/auth/user" + + "info.emailB\316\001\n\033com.google.dataflow.v1bet" + + "a3B\tJobsProtoP\001Z?google.golang.org/genpr" + + "oto/googleapis/dataflow/v1beta3;dataflow" + + "\252\002\035Google.Cloud.Dataflow.V1Beta3\312\002\035Googl" + + "e\\Cloud\\Dataflow\\V1beta3\352\002 Google::Cloud" + + "::Dataflow::V1beta3b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { com.google.api.AnnotationsProto.getDescriptor(), + com.google.api.ClientProto.getDescriptor(), com.google.dataflow.v1beta3.EnvironmentProto.getDescriptor(), com.google.dataflow.v1beta3.SnapshotsProto.getDescriptor(), com.google.protobuf.DurationProto.getDescriptor(), com.google.protobuf.StructProto.getDescriptor(), com.google.protobuf.TimestampProto.getDescriptor(), - com.google.api.ClientProto.getDescriptor(), }); internal_static_google_dataflow_v1beta3_Job_descriptor = getDescriptor().getMessageTypes().get(0); @@ -680,16 +696,17 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { com.google.protobuf.ExtensionRegistry registry = com.google.protobuf.ExtensionRegistry.newInstance(); registry.add(com.google.api.ClientProto.defaultHost); + registry.add(com.google.api.AnnotationsProto.http); registry.add(com.google.api.ClientProto.oauthScopes); com.google.protobuf.Descriptors.FileDescriptor.internalUpdateFileDescriptor( descriptor, registry); com.google.api.AnnotationsProto.getDescriptor(); + com.google.api.ClientProto.getDescriptor(); com.google.dataflow.v1beta3.EnvironmentProto.getDescriptor(); com.google.dataflow.v1beta3.SnapshotsProto.getDescriptor(); com.google.protobuf.DurationProto.getDescriptor(); com.google.protobuf.StructProto.getDescriptor(); com.google.protobuf.TimestampProto.getDescriptor(); - com.google.api.ClientProto.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/MessagesProto.java b/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/MessagesProto.java index dfa6c3ec..f1a65642 100644 --- a/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/MessagesProto.java +++ b/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/MessagesProto.java @@ -62,9 +62,9 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { java.lang.String[] descriptorData = { "\n&google/dataflow/v1beta3/messages.proto" + "\022\027google.dataflow.v1beta3\032\034google/api/an" - + "notations.proto\032\034google/protobuf/struct." - + "proto\032\037google/protobuf/timestamp.proto\032\027" - + "google/api/client.proto\"\243\001\n\nJobMessage\022\n" + + "notations.proto\032\027google/api/client.proto" + + "\032\034google/protobuf/struct.proto\032\037google/p" + + "rotobuf/timestamp.proto\"\243\001\n\nJobMessage\022\n" + "\n\002id\030\001 \001(\t\022(\n\004time\030\002 \001(\0132\032.google.protob" + "uf.Timestamp\022\024\n\014message_text\030\003 \001(\t\022I\n\022me" + "ssage_importance\030\004 \001(\0162-.google.dataflow" @@ -101,30 +101,33 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\020\000\022\025\n\021JOB_MESSAGE_DEBUG\020\001\022\030\n\024JOB_MESSAGE" + "_DETAILED\020\002\022\025\n\021JOB_MESSAGE_BASIC\020\005\022\027\n\023JO" + "B_MESSAGE_WARNING\020\003\022\025\n\021JOB_MESSAGE_ERROR" - + "\020\0042\340\002\n\017MessagesV1Beta3\022v\n\017ListJobMessage" - + "s\022/.google.dataflow.v1beta3.ListJobMessa" - + "gesRequest\0320.google.dataflow.v1beta3.Lis" - + "tJobMessagesResponse\"\000\032\324\001\312A\027dataflow.goo" - + "gleapis.com\322A\266\001https://www.googleapis.co" - + "m/auth/cloud-platform,https://www.google" - + "apis.com/auth/compute,https://www.google" - + "apis.com/auth/compute.readonly,https://w" - + "ww.googleapis.com/auth/userinfo.emailB\322\001" - + "\n\033com.google.dataflow.v1beta3B\rMessagesP" - + "rotoP\001Z?google.golang.org/genproto/googl" - + "eapis/dataflow/v1beta3;dataflow\252\002\035Google" - + ".Cloud.Dataflow.V1Beta3\312\002\035Google\\Cloud\\D" - + "ataflow\\V1beta3\352\002 Google::Cloud::Dataflo" - + "w::V1beta3b\006proto3" + + "\020\0042\347\003\n\017MessagesV1Beta3\022\374\001\n\017ListJobMessag" + + "es\022/.google.dataflow.v1beta3.ListJobMess" + + "agesRequest\0320.google.dataflow.v1beta3.Li" + + "stJobMessagesResponse\"\205\001\202\323\344\223\002\177\0222/v1b3/pr" + + "ojects/{project_id}/jobs/{job_id}/messag" + + "esZI\022G/v1b3/projects/{project_id}/locati" + + "ons/{location}/jobs/{job_id}/messages\032\324\001" + + "\312A\027dataflow.googleapis.com\322A\266\001https://ww" + + "w.googleapis.com/auth/cloud-platform,htt" + + "ps://www.googleapis.com/auth/compute,htt" + + "ps://www.googleapis.com/auth/compute.rea" + + "donly,https://www.googleapis.com/auth/us" + + "erinfo.emailB\322\001\n\033com.google.dataflow.v1b" + + "eta3B\rMessagesProtoP\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( descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { com.google.api.AnnotationsProto.getDescriptor(), + com.google.api.ClientProto.getDescriptor(), com.google.protobuf.StructProto.getDescriptor(), com.google.protobuf.TimestampProto.getDescriptor(), - com.google.api.ClientProto.getDescriptor(), }); internal_static_google_dataflow_v1beta3_JobMessage_descriptor = getDescriptor().getMessageTypes().get(0); @@ -191,13 +194,14 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { com.google.protobuf.ExtensionRegistry registry = com.google.protobuf.ExtensionRegistry.newInstance(); registry.add(com.google.api.ClientProto.defaultHost); + registry.add(com.google.api.AnnotationsProto.http); registry.add(com.google.api.ClientProto.oauthScopes); com.google.protobuf.Descriptors.FileDescriptor.internalUpdateFileDescriptor( descriptor, registry); com.google.api.AnnotationsProto.getDescriptor(); + com.google.api.ClientProto.getDescriptor(); com.google.protobuf.StructProto.getDescriptor(); com.google.protobuf.TimestampProto.getDescriptor(); - com.google.api.ClientProto.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/MetricsProto.java b/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/MetricsProto.java index 0b197e76..bb5f2dc3 100644 --- a/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/MetricsProto.java +++ b/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/MetricsProto.java @@ -94,9 +94,9 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { java.lang.String[] descriptorData = { "\n%google/dataflow/v1beta3/metrics.proto\022" + "\027google.dataflow.v1beta3\032\034google/api/ann" - + "otations.proto\032\034google/protobuf/struct.p" - + "roto\032\037google/protobuf/timestamp.proto\032\027g" - + "oogle/api/client.proto\"\261\001\n\024MetricStructu" + + "otations.proto\032\027google/api/client.proto\032" + + "\034google/protobuf/struct.proto\032\037google/pr" + + "otobuf/timestamp.proto\"\261\001\n\024MetricStructu" + "redName\022\016\n\006origin\030\001 \001(\t\022\014\n\004name\030\002 \001(\t\022K\n" + "\007context\030\003 \003(\0132:.google.dataflow.v1beta3" + ".MetricStructuredName.ContextEntry\032.\n\014Co" @@ -160,37 +160,45 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\022\037\n\033EXECUTION_STATE_NOT_STARTED\020\001\022\033\n\027EXE" + "CUTION_STATE_RUNNING\020\002\022\035\n\031EXECUTION_STAT" + "E_SUCCEEDED\020\003\022\032\n\026EXECUTION_STATE_FAILED\020" - + "\004\022\035\n\031EXECUTION_STATE_CANCELLED\020\0052\332\004\n\016Met" - + "ricsV1Beta3\022e\n\rGetJobMetrics\022-.google.da" - + "taflow.v1beta3.GetJobMetricsRequest\032#.go" - + "ogle.dataflow.v1beta3.JobMetrics\"\000\022\200\001\n\026G" - + "etJobExecutionDetails\0226.google.dataflow." - + "v1beta3.GetJobExecutionDetailsRequest\032,." - + "google.dataflow.v1beta3.JobExecutionDeta" - + "ils\"\000\022\206\001\n\030GetStageExecutionDetails\0228.goo" - + "gle.dataflow.v1beta3.GetStageExecutionDe" - + "tailsRequest\032..google.dataflow.v1beta3.S" - + "tageExecutionDetails\"\000\032\324\001\312A\027dataflow.goo" - + "gleapis.com\322A\266\001https://www.googleapis.co" - + "m/auth/cloud-platform,https://www.google" - + "apis.com/auth/compute,https://www.google" - + "apis.com/auth/compute.readonly,https://w" - + "ww.googleapis.com/auth/userinfo.emailB\321\001" - + "\n\033com.google.dataflow.v1beta3B\014MetricsPr" - + "otoP\001Z?google.golang.org/genproto/google" - + "apis/dataflow/v1beta3;dataflow\252\002\035Google." - + "Cloud.Dataflow.V1Beta3\312\002\035Google\\Cloud\\Da" - + "taflow\\V1beta3\352\002 Google::Cloud::Dataflow" - + "::V1beta3b\006proto3" + + "\004\022\035\n\031EXECUTION_STATE_CANCELLED\020\0052\237\007\n\016Met" + + "ricsV1Beta3\022\351\001\n\rGetJobMetrics\022-.google.d" + + "ataflow.v1beta3.GetJobMetricsRequest\032#.g" + + "oogle.dataflow.v1beta3.JobMetrics\"\203\001\202\323\344\223" + + "\002}\0221/v1b3/projects/{project_id}/jobs/{jo" + + "b_id}/metricsZH\022F/v1b3/projects/{project" + + "_id}/locations/{location}/jobs/{job_id}/" + + "metrics\022\327\001\n\026GetJobExecutionDetails\0226.goo" + + "gle.dataflow.v1beta3.GetJobExecutionDeta" + + "ilsRequest\032,.google.dataflow.v1beta3.Job" + + "ExecutionDetails\"W\202\323\344\223\002Q\022O/v1b3/projects" + + "/{project_id}/locations/{location}/jobs/" + + "{job_id}/executionDetails\022\357\001\n\030GetStageEx" + + "ecutionDetails\0228.google.dataflow.v1beta3" + + ".GetStageExecutionDetailsRequest\032..googl" + + "e.dataflow.v1beta3.StageExecutionDetails" + + "\"i\202\323\344\223\002c\022a/v1b3/projects/{project_id}/lo" + + "cations/{location}/jobs/{job_id}/stages/" + + "{stage_id}/executionDetails\032\324\001\312A\027dataflo" + + "w.googleapis.com\322A\266\001https://www.googleap" + + "is.com/auth/cloud-platform,https://www.g" + + "oogleapis.com/auth/compute,https://www.g" + + "oogleapis.com/auth/compute.readonly,http" + + "s://www.googleapis.com/auth/userinfo.ema" + + "ilB\321\001\n\033com.google.dataflow.v1beta3B\014Metr" + + "icsProtoP\001Z?google.golang.org/genproto/g" + + "oogleapis/dataflow/v1beta3;dataflow\252\002\035Go" + + "ogle.Cloud.Dataflow.V1Beta3\312\002\035Google\\Clo" + + "ud\\Dataflow\\V1beta3\352\002 Google::Cloud::Dat" + + "aflow::V1beta3b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { com.google.api.AnnotationsProto.getDescriptor(), + com.google.api.ClientProto.getDescriptor(), com.google.protobuf.StructProto.getDescriptor(), com.google.protobuf.TimestampProto.getDescriptor(), - com.google.api.ClientProto.getDescriptor(), }); internal_static_google_dataflow_v1beta3_MetricStructuredName_descriptor = getDescriptor().getMessageTypes().get(0); @@ -328,13 +336,14 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { com.google.protobuf.ExtensionRegistry registry = com.google.protobuf.ExtensionRegistry.newInstance(); registry.add(com.google.api.ClientProto.defaultHost); + registry.add(com.google.api.AnnotationsProto.http); registry.add(com.google.api.ClientProto.oauthScopes); com.google.protobuf.Descriptors.FileDescriptor.internalUpdateFileDescriptor( descriptor, registry); com.google.api.AnnotationsProto.getDescriptor(); + com.google.api.ClientProto.getDescriptor(); com.google.protobuf.StructProto.getDescriptor(); com.google.protobuf.TimestampProto.getDescriptor(); - com.google.api.ClientProto.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/RuntimeEnvironment.java b/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/RuntimeEnvironment.java index 37111a3f..8e302621 100644 --- a/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/RuntimeEnvironment.java +++ b/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/RuntimeEnvironment.java @@ -515,7 +515,8 @@ public com.google.protobuf.ByteString getMachineTypeBytes() { * * *
-   * Additional experiment flags for the job.
+   * Additional experiment flags for the job, specified with the
+   * `--experiments` option.
    * 
* * repeated string additional_experiments = 7; @@ -529,7 +530,8 @@ public com.google.protobuf.ProtocolStringList getAdditionalExperimentsList() { * * *
-   * Additional experiment flags for the job.
+   * Additional experiment flags for the job, specified with the
+   * `--experiments` option.
    * 
* * repeated string additional_experiments = 7; @@ -543,7 +545,8 @@ public int getAdditionalExperimentsCount() { * * *
-   * Additional experiment flags for the job.
+   * Additional experiment flags for the job, specified with the
+   * `--experiments` option.
    * 
* * repeated string additional_experiments = 7; @@ -558,7 +561,8 @@ public java.lang.String getAdditionalExperiments(int index) { * * *
-   * Additional experiment flags for the job.
+   * Additional experiment flags for the job, specified with the
+   * `--experiments` option.
    * 
* * repeated string additional_experiments = 7; @@ -2258,7 +2262,8 @@ private void ensureAdditionalExperimentsIsMutable() { * * *
-     * Additional experiment flags for the job.
+     * Additional experiment flags for the job, specified with the
+     * `--experiments` option.
      * 
* * repeated string additional_experiments = 7; @@ -2272,7 +2277,8 @@ public com.google.protobuf.ProtocolStringList getAdditionalExperimentsList() { * * *
-     * Additional experiment flags for the job.
+     * Additional experiment flags for the job, specified with the
+     * `--experiments` option.
      * 
* * repeated string additional_experiments = 7; @@ -2286,7 +2292,8 @@ public int getAdditionalExperimentsCount() { * * *
-     * Additional experiment flags for the job.
+     * Additional experiment flags for the job, specified with the
+     * `--experiments` option.
      * 
* * repeated string additional_experiments = 7; @@ -2301,7 +2308,8 @@ public java.lang.String getAdditionalExperiments(int index) { * * *
-     * Additional experiment flags for the job.
+     * Additional experiment flags for the job, specified with the
+     * `--experiments` option.
      * 
* * repeated string additional_experiments = 7; @@ -2316,7 +2324,8 @@ public com.google.protobuf.ByteString getAdditionalExperimentsBytes(int index) { * * *
-     * Additional experiment flags for the job.
+     * Additional experiment flags for the job, specified with the
+     * `--experiments` option.
      * 
* * repeated string additional_experiments = 7; @@ -2338,7 +2347,8 @@ public Builder setAdditionalExperiments(int index, java.lang.String value) { * * *
-     * Additional experiment flags for the job.
+     * Additional experiment flags for the job, specified with the
+     * `--experiments` option.
      * 
* * repeated string additional_experiments = 7; @@ -2359,7 +2369,8 @@ public Builder addAdditionalExperiments(java.lang.String value) { * * *
-     * Additional experiment flags for the job.
+     * Additional experiment flags for the job, specified with the
+     * `--experiments` option.
      * 
* * repeated string additional_experiments = 7; @@ -2377,7 +2388,8 @@ public Builder addAllAdditionalExperiments(java.lang.Iterable * * *
-     * Additional experiment flags for the job.
+     * Additional experiment flags for the job, specified with the
+     * `--experiments` option.
      * 
* * repeated string additional_experiments = 7; @@ -2394,7 +2406,8 @@ public Builder clearAdditionalExperiments() { * * *
-     * Additional experiment flags for the job.
+     * Additional experiment flags for the job, specified with the
+     * `--experiments` option.
      * 
* * repeated string additional_experiments = 7; diff --git a/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/RuntimeEnvironmentOrBuilder.java b/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/RuntimeEnvironmentOrBuilder.java index cd871e7a..a81e6964 100644 --- a/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/RuntimeEnvironmentOrBuilder.java +++ b/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/RuntimeEnvironmentOrBuilder.java @@ -178,7 +178,8 @@ public interface RuntimeEnvironmentOrBuilder * * *
-   * Additional experiment flags for the job.
+   * Additional experiment flags for the job, specified with the
+   * `--experiments` option.
    * 
* * repeated string additional_experiments = 7; @@ -190,7 +191,8 @@ public interface RuntimeEnvironmentOrBuilder * * *
-   * Additional experiment flags for the job.
+   * Additional experiment flags for the job, specified with the
+   * `--experiments` option.
    * 
* * repeated string additional_experiments = 7; @@ -202,7 +204,8 @@ public interface RuntimeEnvironmentOrBuilder * * *
-   * Additional experiment flags for the job.
+   * Additional experiment flags for the job, specified with the
+   * `--experiments` option.
    * 
* * repeated string additional_experiments = 7; @@ -215,7 +218,8 @@ public interface RuntimeEnvironmentOrBuilder * * *
-   * Additional experiment flags for the job.
+   * Additional experiment flags for the job, specified with the
+   * `--experiments` option.
    * 
* * repeated string additional_experiments = 7; diff --git a/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/Snapshot.java b/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/Snapshot.java index 5686e72b..7d8087ba 100644 --- a/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/Snapshot.java +++ b/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/Snapshot.java @@ -486,7 +486,7 @@ public com.google.dataflow.v1beta3.SnapshotState getState() { * * *
-   * PubSub snapshot metadata.
+   * Pub/Sub snapshot metadata.
    * 
* * repeated .google.dataflow.v1beta3.PubsubSnapshotMetadata pubsub_metadata = 7; @@ -500,7 +500,7 @@ public com.google.dataflow.v1beta3.SnapshotState getState() { * * *
-   * PubSub snapshot metadata.
+   * Pub/Sub snapshot metadata.
    * 
* * repeated .google.dataflow.v1beta3.PubsubSnapshotMetadata pubsub_metadata = 7; @@ -514,7 +514,7 @@ public com.google.dataflow.v1beta3.SnapshotState getState() { * * *
-   * PubSub snapshot metadata.
+   * Pub/Sub snapshot metadata.
    * 
* * repeated .google.dataflow.v1beta3.PubsubSnapshotMetadata pubsub_metadata = 7; @@ -527,7 +527,7 @@ public int getPubsubMetadataCount() { * * *
-   * PubSub snapshot metadata.
+   * Pub/Sub snapshot metadata.
    * 
* * repeated .google.dataflow.v1beta3.PubsubSnapshotMetadata pubsub_metadata = 7; @@ -540,7 +540,7 @@ public com.google.dataflow.v1beta3.PubsubSnapshotMetadata getPubsubMetadata(int * * *
-   * PubSub snapshot metadata.
+   * Pub/Sub snapshot metadata.
    * 
* * repeated .google.dataflow.v1beta3.PubsubSnapshotMetadata pubsub_metadata = 7; @@ -1982,7 +1982,7 @@ private void ensurePubsubMetadataIsMutable() { * * *
-     * PubSub snapshot metadata.
+     * Pub/Sub snapshot metadata.
      * 
* * repeated .google.dataflow.v1beta3.PubsubSnapshotMetadata pubsub_metadata = 7; @@ -1999,7 +1999,7 @@ private void ensurePubsubMetadataIsMutable() { * * *
-     * PubSub snapshot metadata.
+     * Pub/Sub snapshot metadata.
      * 
* * repeated .google.dataflow.v1beta3.PubsubSnapshotMetadata pubsub_metadata = 7; @@ -2015,7 +2015,7 @@ public int getPubsubMetadataCount() { * * *
-     * PubSub snapshot metadata.
+     * Pub/Sub snapshot metadata.
      * 
* * repeated .google.dataflow.v1beta3.PubsubSnapshotMetadata pubsub_metadata = 7; @@ -2031,7 +2031,7 @@ public com.google.dataflow.v1beta3.PubsubSnapshotMetadata getPubsubMetadata(int * * *
-     * PubSub snapshot metadata.
+     * Pub/Sub snapshot metadata.
      * 
* * repeated .google.dataflow.v1beta3.PubsubSnapshotMetadata pubsub_metadata = 7; @@ -2054,7 +2054,7 @@ public Builder setPubsubMetadata( * * *
-     * PubSub snapshot metadata.
+     * Pub/Sub snapshot metadata.
      * 
* * repeated .google.dataflow.v1beta3.PubsubSnapshotMetadata pubsub_metadata = 7; @@ -2074,7 +2074,7 @@ public Builder setPubsubMetadata( * * *
-     * PubSub snapshot metadata.
+     * Pub/Sub snapshot metadata.
      * 
* * repeated .google.dataflow.v1beta3.PubsubSnapshotMetadata pubsub_metadata = 7; @@ -2096,7 +2096,7 @@ public Builder addPubsubMetadata(com.google.dataflow.v1beta3.PubsubSnapshotMetad * * *
-     * PubSub snapshot metadata.
+     * Pub/Sub snapshot metadata.
      * 
* * repeated .google.dataflow.v1beta3.PubsubSnapshotMetadata pubsub_metadata = 7; @@ -2119,7 +2119,7 @@ public Builder addPubsubMetadata( * * *
-     * PubSub snapshot metadata.
+     * Pub/Sub snapshot metadata.
      * 
* * repeated .google.dataflow.v1beta3.PubsubSnapshotMetadata pubsub_metadata = 7; @@ -2139,7 +2139,7 @@ public Builder addPubsubMetadata( * * *
-     * PubSub snapshot metadata.
+     * Pub/Sub snapshot metadata.
      * 
* * repeated .google.dataflow.v1beta3.PubsubSnapshotMetadata pubsub_metadata = 7; @@ -2159,7 +2159,7 @@ public Builder addPubsubMetadata( * * *
-     * PubSub snapshot metadata.
+     * Pub/Sub snapshot metadata.
      * 
* * repeated .google.dataflow.v1beta3.PubsubSnapshotMetadata pubsub_metadata = 7; @@ -2179,7 +2179,7 @@ public Builder addAllPubsubMetadata( * * *
-     * PubSub snapshot metadata.
+     * Pub/Sub snapshot metadata.
      * 
* * repeated .google.dataflow.v1beta3.PubsubSnapshotMetadata pubsub_metadata = 7; @@ -2198,7 +2198,7 @@ public Builder clearPubsubMetadata() { * * *
-     * PubSub snapshot metadata.
+     * Pub/Sub snapshot metadata.
      * 
* * repeated .google.dataflow.v1beta3.PubsubSnapshotMetadata pubsub_metadata = 7; @@ -2217,7 +2217,7 @@ public Builder removePubsubMetadata(int index) { * * *
-     * PubSub snapshot metadata.
+     * Pub/Sub snapshot metadata.
      * 
* * repeated .google.dataflow.v1beta3.PubsubSnapshotMetadata pubsub_metadata = 7; @@ -2230,7 +2230,7 @@ public com.google.dataflow.v1beta3.PubsubSnapshotMetadata.Builder getPubsubMetad * * *
-     * PubSub snapshot metadata.
+     * Pub/Sub snapshot metadata.
      * 
* * repeated .google.dataflow.v1beta3.PubsubSnapshotMetadata pubsub_metadata = 7; @@ -2247,7 +2247,7 @@ public com.google.dataflow.v1beta3.PubsubSnapshotMetadataOrBuilder getPubsubMeta * * *
-     * PubSub snapshot metadata.
+     * Pub/Sub snapshot metadata.
      * 
* * repeated .google.dataflow.v1beta3.PubsubSnapshotMetadata pubsub_metadata = 7; @@ -2264,7 +2264,7 @@ public com.google.dataflow.v1beta3.PubsubSnapshotMetadataOrBuilder getPubsubMeta * * *
-     * PubSub snapshot metadata.
+     * Pub/Sub snapshot metadata.
      * 
* * repeated .google.dataflow.v1beta3.PubsubSnapshotMetadata pubsub_metadata = 7; @@ -2277,7 +2277,7 @@ public com.google.dataflow.v1beta3.PubsubSnapshotMetadata.Builder addPubsubMetad * * *
-     * PubSub snapshot metadata.
+     * Pub/Sub snapshot metadata.
      * 
* * repeated .google.dataflow.v1beta3.PubsubSnapshotMetadata pubsub_metadata = 7; @@ -2292,7 +2292,7 @@ public com.google.dataflow.v1beta3.PubsubSnapshotMetadata.Builder addPubsubMetad * * *
-     * PubSub snapshot metadata.
+     * Pub/Sub snapshot metadata.
      * 
* * repeated .google.dataflow.v1beta3.PubsubSnapshotMetadata pubsub_metadata = 7; diff --git a/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/SnapshotOrBuilder.java b/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/SnapshotOrBuilder.java index a44559d1..567a5fb2 100644 --- a/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/SnapshotOrBuilder.java +++ b/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/SnapshotOrBuilder.java @@ -197,7 +197,7 @@ public interface SnapshotOrBuilder * * *
-   * PubSub snapshot metadata.
+   * Pub/Sub snapshot metadata.
    * 
* * repeated .google.dataflow.v1beta3.PubsubSnapshotMetadata pubsub_metadata = 7; @@ -207,7 +207,7 @@ public interface SnapshotOrBuilder * * *
-   * PubSub snapshot metadata.
+   * Pub/Sub snapshot metadata.
    * 
* * repeated .google.dataflow.v1beta3.PubsubSnapshotMetadata pubsub_metadata = 7; @@ -217,7 +217,7 @@ public interface SnapshotOrBuilder * * *
-   * PubSub snapshot metadata.
+   * Pub/Sub snapshot metadata.
    * 
* * repeated .google.dataflow.v1beta3.PubsubSnapshotMetadata pubsub_metadata = 7; @@ -227,7 +227,7 @@ public interface SnapshotOrBuilder * * *
-   * PubSub snapshot metadata.
+   * Pub/Sub snapshot metadata.
    * 
* * repeated .google.dataflow.v1beta3.PubsubSnapshotMetadata pubsub_metadata = 7; @@ -238,7 +238,7 @@ public interface SnapshotOrBuilder * * *
-   * PubSub snapshot metadata.
+   * Pub/Sub snapshot metadata.
    * 
* * repeated .google.dataflow.v1beta3.PubsubSnapshotMetadata pubsub_metadata = 7; diff --git a/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/SnapshotsProto.java b/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/SnapshotsProto.java index 5eacac1e..205928d5 100644 --- a/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/SnapshotsProto.java +++ b/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/SnapshotsProto.java @@ -66,9 +66,9 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { java.lang.String[] descriptorData = { "\n\'google/dataflow/v1beta3/snapshots.prot" + "o\022\027google.dataflow.v1beta3\032\034google/api/a" - + "nnotations.proto\032\036google/protobuf/durati" - + "on.proto\032\037google/protobuf/timestamp.prot" - + "o\032\027google/api/client.proto\"t\n\026PubsubSnap" + + "nnotations.proto\032\027google/api/client.prot" + + "o\032\036google/protobuf/duration.proto\032\037googl" + + "e/protobuf/timestamp.proto\"t\n\026PubsubSnap" + "shotMetadata\022\022\n\ntopic_name\030\001 \001(\t\022\025\n\rsnap" + "shot_name\030\002 \001(\t\022/\n\013expire_time\030\003 \001(\0132\032.g" + "oogle.protobuf.Timestamp\"\333\002\n\010Snapshot\022\n\n" @@ -91,36 +91,47 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "s\030\001 \003(\0132!.google.dataflow.v1beta3.Snapsh" + "ot*i\n\rSnapshotState\022\032\n\026UNKNOWN_SNAPSHOT_" + "STATE\020\000\022\013\n\007PENDING\020\001\022\013\n\007RUNNING\020\002\022\t\n\005REA" - + "DY\020\003\022\n\n\006FAILED\020\004\022\013\n\007DELETED\020\0052\261\004\n\020Snapsh" - + "otsV1Beta3\022_\n\013GetSnapshot\022+.google.dataf" - + "low.v1beta3.GetSnapshotRequest\032!.google." - + "dataflow.v1beta3.Snapshot\"\000\022s\n\016DeleteSna" - + "pshot\022..google.dataflow.v1beta3.DeleteSn" - + "apshotRequest\032/.google.dataflow.v1beta3." - + "DeleteSnapshotResponse\"\000\022p\n\rListSnapshot" - + "s\022-.google.dataflow.v1beta3.ListSnapshot" - + "sRequest\032..google.dataflow.v1beta3.ListS" - + "napshotsResponse\"\000\032\324\001\312A\027dataflow.googlea" - + "pis.com\322A\266\001https://www.googleapis.com/au" - + "th/cloud-platform,https://www.googleapis" - + ".com/auth/compute,https://www.googleapis" - + ".com/auth/compute.readonly,https://www.g" - + "oogleapis.com/auth/userinfo.emailB\323\001\n\033co" - + "m.google.dataflow.v1beta3B\016SnapshotsProt" - + "oP\001Z?google.golang.org/genproto/googleap" - + "is/dataflow/v1beta3;dataflow\252\002\035Google.Cl" - + "oud.Dataflow.V1Beta3\312\002\035Google\\Cloud\\Data" - + "flow\\V1beta3\352\002 Google::Cloud::Dataflow::" - + "V1beta3b\006proto3" + + "DY\020\003\022\n\n\006FAILED\020\004\022\013\n\007DELETED\020\0052\357\007\n\020Snapsh" + + "otsV1Beta3\022\350\001\n\013GetSnapshot\022+.google.data" + + "flow.v1beta3.GetSnapshotRequest\032!.google" + + ".dataflow.v1beta3.Snapshot\"\210\001\202\323\344\223\002\201\001\0223/v" + + "1b3/projects/{project_id}/snapshots/{sna" + + "pshot_id}ZJ\022H/v1b3/projects/{project_id}" + + "/locations/{location}/snapshots/{snapsho" + + "t_id}\022\354\001\n\016DeleteSnapshot\022..google.datafl" + + "ow.v1beta3.DeleteSnapshotRequest\032/.googl" + + "e.dataflow.v1beta3.DeleteSnapshotRespons" + + "e\"y\202\323\344\223\002s*%/v1b3/projects/{project_id}/s" + + "napshotsZJ*H/v1b3/projects/{project_id}/" + + "locations/{location}/snapshots/{snapshot" + + "_id}\022\251\002\n\rListSnapshots\022-.google.dataflow" + + ".v1beta3.ListSnapshotsRequest\032..google.d" + + "ataflow.v1beta3.ListSnapshotsResponse\"\270\001" + + "\202\323\344\223\002\261\001\022%/v1b3/projects/{project_id}/sna" + + "pshotsZ<\022:/v1b3/projects/{project_id}/lo" + + "cations/{location}/snapshotsZJ\022H/v1b3/pr" + + "ojects/{project_id}/locations/{location}" + + "/jobs/{job_id}/snapshots\032\324\001\312A\027dataflow.g" + + "oogleapis.com\322A\266\001https://www.googleapis." + + "com/auth/cloud-platform,https://www.goog" + + "leapis.com/auth/compute,https://www.goog" + + "leapis.com/auth/compute.readonly,https:/" + + "/www.googleapis.com/auth/userinfo.emailB" + + "\323\001\n\033com.google.dataflow.v1beta3B\016Snapsho" + + "tsProtoP\001Z?google.golang.org/genproto/go" + + "ogleapis/dataflow/v1beta3;dataflow\252\002\035Goo" + + "gle.Cloud.Dataflow.V1Beta3\312\002\035Google\\Clou" + + "d\\Dataflow\\V1beta3\352\002 Google::Cloud::Data" + + "flow::V1beta3b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { com.google.api.AnnotationsProto.getDescriptor(), + com.google.api.ClientProto.getDescriptor(), com.google.protobuf.DurationProto.getDescriptor(), com.google.protobuf.TimestampProto.getDescriptor(), - com.google.api.ClientProto.getDescriptor(), }); internal_static_google_dataflow_v1beta3_PubsubSnapshotMetadata_descriptor = getDescriptor().getMessageTypes().get(0); @@ -188,13 +199,14 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { com.google.protobuf.ExtensionRegistry registry = com.google.protobuf.ExtensionRegistry.newInstance(); registry.add(com.google.api.ClientProto.defaultHost); + registry.add(com.google.api.AnnotationsProto.http); registry.add(com.google.api.ClientProto.oauthScopes); com.google.protobuf.Descriptors.FileDescriptor.internalUpdateFileDescriptor( descriptor, registry); com.google.api.AnnotationsProto.getDescriptor(); + com.google.api.ClientProto.getDescriptor(); com.google.protobuf.DurationProto.getDescriptor(); com.google.protobuf.TimestampProto.getDescriptor(); - com.google.api.ClientProto.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/TemplatesProto.java b/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/TemplatesProto.java index 448cddbc..9e65bf89 100644 --- a/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/TemplatesProto.java +++ b/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/TemplatesProto.java @@ -150,10 +150,10 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { java.lang.String[] descriptorData = { "\n\'google/dataflow/v1beta3/templates.prot" + "o\022\027google.dataflow.v1beta3\032\034google/api/a" - + "nnotations.proto\032)google/dataflow/v1beta" - + "3/environment.proto\032\"google/dataflow/v1b" - + "eta3/jobs.proto\032\027google/rpc/status.proto" - + "\032\027google/api/client.proto\"G\n\032LaunchFlexT" + + "nnotations.proto\032\027google/api/client.prot" + + "o\032)google/dataflow/v1beta3/environment.p" + + "roto\032\"google/dataflow/v1beta3/jobs.proto" + + "\032\027google/rpc/status.proto\"G\n\032LaunchFlexT" + "emplateResponse\022)\n\003job\030\001 \001(\0132\034.google.da" + "taflow.v1beta3.Job\"\345\001\n\rContainerSpec\022\r\n\005" + "image\030\001 \001(\t\022;\n\010metadata\030\002 \001(\0132).google.d" @@ -179,7 +179,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\001(\t:\0028\001\0324\n\022LaunchOptionsEntry\022\013\n\003key\030\001 \001" + "(\t\022\r\n\005value\030\002 \001(\t:\0028\001\032<\n\032TransformNameMa" + "ppingsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:" - + "\0028\001B\n\n\010template\"\316\005\n\036FlexTemplateRuntimeE" + + "\0028\001B\n\n\010template\"\220\007\n\036FlexTemplateRuntimeE" + "nvironment\022\023\n\013num_workers\030\001 \001(\005\022\023\n\013max_w" + "orkers\030\002 \001(\005\022\014\n\004zone\030\003 \001(\t\022\035\n\025service_ac" + "count_email\030\004 \001(\t\022\025\n\rtemp_location\030\005 \001(\t" @@ -195,138 +195,154 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "ble_streaming_engine\030\017 \001(\010\022H\n\013flexrs_goa" + "l\030\020 \001(\01623.google.dataflow.v1beta3.FlexRe" + "sourceSchedulingGoal\022\030\n\020staging_location" - + "\030\021 \001(\t\022\033\n\023sdk_container_image\030\022 \001(\t\032;\n\031A" - + "dditionalUserLabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n" - + "\005value\030\002 \001(\t:\0028\001\"\250\001\n\031LaunchFlexTemplateR" - + "equest\022\022\n\nproject_id\030\001 \001(\t\022N\n\020launch_par" - + "ameter\030\002 \001(\01324.google.dataflow.v1beta3.L" - + "aunchFlexTemplateParameter\022\020\n\010location\030\003" - + " \001(\t\022\025\n\rvalidate_only\030\004 \001(\010\"\331\004\n\022RuntimeE" - + "nvironment\022\023\n\013num_workers\030\013 \001(\005\022\023\n\013max_w" - + "orkers\030\001 \001(\005\022\014\n\004zone\030\002 \001(\t\022\035\n\025service_ac" - + "count_email\030\003 \001(\t\022\025\n\rtemp_location\030\004 \001(\t" - + "\022\"\n\032bypass_temp_dir_validation\030\005 \001(\010\022\024\n\014" - + "machine_type\030\006 \001(\t\022\036\n\026additional_experim" - + "ents\030\007 \003(\t\022\017\n\007network\030\010 \001(\t\022\022\n\nsubnetwor" - + "k\030\t \001(\t\022e\n\026additional_user_labels\030\n \003(\0132" - + "E.google.dataflow.v1beta3.RuntimeEnviron" - + "ment.AdditionalUserLabelsEntry\022\024\n\014kms_ke" - + "y_name\030\014 \001(\t\022O\n\020ip_configuration\030\016 \001(\01625" - + ".google.dataflow.v1beta3.WorkerIPAddress" - + "Configuration\022\025\n\rworker_region\030\017 \001(\t\022\023\n\013" - + "worker_zone\030\020 \001(\t\022\037\n\027enable_streaming_en" - + "gine\030\021 \001(\010\032;\n\031AdditionalUserLabelsEntry\022" - + "\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\265\002\n\021Para" - + "meterMetadata\022\014\n\004name\030\001 \001(\t\022\r\n\005label\030\002 \001" - + "(\t\022\021\n\thelp_text\030\003 \001(\t\022\023\n\013is_optional\030\004 \001" - + "(\010\022\017\n\007regexes\030\005 \003(\t\022:\n\nparam_type\030\006 \001(\0162" - + "&.google.dataflow.v1beta3.ParameterType\022" - + "W\n\017custom_metadata\030\007 \003(\0132>.google.datafl" - + "ow.v1beta3.ParameterMetadata.CustomMetad" - + "ataEntry\0325\n\023CustomMetadataEntry\022\013\n\003key\030\001" - + " \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"u\n\020TemplateMetad" - + "ata\022\014\n\004name\030\001 \001(\t\022\023\n\013description\030\002 \001(\t\022>" - + "\n\nparameters\030\003 \003(\0132*.google.dataflow.v1b" - + "eta3.ParameterMetadata\"\206\001\n\007SDKInfo\022;\n\010la" - + "nguage\030\001 \001(\0162).google.dataflow.v1beta3.S" - + "DKInfo.Language\022\017\n\007version\030\002 \001(\t\"-\n\010Lang" - + "uage\022\013\n\007UNKNOWN\020\000\022\010\n\004JAVA\020\001\022\n\n\006PYTHON\020\002\"" - + "\205\001\n\017RuntimeMetadata\0222\n\010sdk_info\030\001 \001(\0132 ." - + "google.dataflow.v1beta3.SDKInfo\022>\n\nparam" - + "eters\030\002 \003(\0132*.google.dataflow.v1beta3.Pa" - + "rameterMetadata\"\306\002\n\034CreateJobFromTemplat" - + "eRequest\022\022\n\nproject_id\030\001 \001(\t\022\020\n\010job_name" - + "\030\004 \001(\t\022\022\n\010gcs_path\030\002 \001(\tH\000\022Y\n\nparameters" - + "\030\003 \003(\0132E.google.dataflow.v1beta3.CreateJ" - + "obFromTemplateRequest.ParametersEntry\022@\n" - + "\013environment\030\005 \001(\0132+.google.dataflow.v1b" - + "eta3.RuntimeEnvironment\022\020\n\010location\030\006 \001(" - + "\t\0321\n\017ParametersEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005val" - + "ue\030\002 \001(\t:\0028\001B\n\n\010template\"\305\001\n\022GetTemplate" - + "Request\022\022\n\nproject_id\030\001 \001(\t\022\022\n\010gcs_path\030" - + "\002 \001(\tH\000\022F\n\004view\030\003 \001(\01628.google.dataflow." - + "v1beta3.GetTemplateRequest.TemplateView\022" - + "\020\n\010location\030\004 \001(\t\"!\n\014TemplateView\022\021\n\rMET" - + "ADATA_ONLY\020\000B\n\n\010template\"\277\002\n\023GetTemplate" - + "Response\022\"\n\006status\030\001 \001(\0132\022.google.rpc.St" - + "atus\022;\n\010metadata\030\002 \001(\0132).google.dataflow" - + ".v1beta3.TemplateMetadata\022P\n\rtemplate_ty" - + "pe\030\003 \001(\01629.google.dataflow.v1beta3.GetTe" - + "mplateResponse.TemplateType\022B\n\020runtime_m" - + "etadata\030\004 \001(\0132(.google.dataflow.v1beta3." - + "RuntimeMetadata\"1\n\014TemplateType\022\013\n\007UNKNO" - + "WN\020\000\022\n\n\006LEGACY\020\001\022\010\n\004FLEX\020\002\"\262\003\n\030LaunchTem" - + "plateParameters\022\020\n\010job_name\030\001 \001(\t\022U\n\npar" - + "ameters\030\002 \003(\0132A.google.dataflow.v1beta3." - + "LaunchTemplateParameters.ParametersEntry" - + "\022@\n\013environment\030\003 \001(\0132+.google.dataflow." - + "v1beta3.RuntimeEnvironment\022\016\n\006update\030\004 \001" - + "(\010\022k\n\026transform_name_mapping\030\005 \003(\0132K.goo" - + "gle.dataflow.v1beta3.LaunchTemplateParam" - + "eters.TransformNameMappingEntry\0321\n\017Param" - + "etersEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\002" - + "8\001\032;\n\031TransformNameMappingEntry\022\013\n\003key\030\001" - + " \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\224\002\n\025LaunchTempla" - + "teRequest\022\022\n\nproject_id\030\001 \001(\t\022\025\n\rvalidat" - + "e_only\030\002 \001(\010\022\022\n\010gcs_path\030\003 \001(\tH\000\022P\n\020dyna" - + "mic_template\030\006 \001(\01324.google.dataflow.v1b" - + "eta3.DynamicTemplateLaunchParamsH\000\022L\n\021la" - + "unch_parameters\030\004 \001(\01321.google.dataflow." - + "v1beta3.LaunchTemplateParameters\022\020\n\010loca" - + "tion\030\005 \001(\tB\n\n\010template\"C\n\026LaunchTemplate" - + "Response\022)\n\003job\030\001 \001(\0132\034.google.dataflow." - + "v1beta3.Job\"\276\001\n\031InvalidTemplateParameter" - + "s\022c\n\024parameter_violations\030\001 \003(\0132E.google" - + ".dataflow.v1beta3.InvalidTemplateParamet" - + "ers.ParameterViolation\032<\n\022ParameterViola" - + "tion\022\021\n\tparameter\030\001 \001(\t\022\023\n\013description\030\002" - + " \001(\t\"I\n\033DynamicTemplateLaunchParams\022\020\n\010g" - + "cs_path\030\001 \001(\t\022\030\n\020staging_location\030\002 \001(\t*" - + "\316\001\n\rParameterType\022\013\n\007DEFAULT\020\000\022\010\n\004TEXT\020\001" - + "\022\023\n\017GCS_READ_BUCKET\020\002\022\024\n\020GCS_WRITE_BUCKE" - + "T\020\003\022\021\n\rGCS_READ_FILE\020\004\022\022\n\016GCS_WRITE_FILE" - + "\020\005\022\023\n\017GCS_READ_FOLDER\020\006\022\024\n\020GCS_WRITE_FOL" - + "DER\020\007\022\020\n\014PUBSUB_TOPIC\020\010\022\027\n\023PUBSUB_SUBSCR" - + "IPTION\020\t2\272\004\n\020TemplatesService\022n\n\025CreateJ" - + "obFromTemplate\0225.google.dataflow.v1beta3" - + ".CreateJobFromTemplateRequest\032\034.google.d" - + "ataflow.v1beta3.Job\"\000\022s\n\016LaunchTemplate\022" - + "..google.dataflow.v1beta3.LaunchTemplate" - + "Request\032/.google.dataflow.v1beta3.Launch" - + "TemplateResponse\"\000\022j\n\013GetTemplate\022+.goog" - + "le.dataflow.v1beta3.GetTemplateRequest\032," - + ".google.dataflow.v1beta3.GetTemplateResp" - + "onse\"\000\032\324\001\312A\027dataflow.googleapis.com\322A\266\001h" - + "ttps://www.googleapis.com/auth/cloud-pla" - + "tform,https://www.googleapis.com/auth/co" - + "mpute,https://www.googleapis.com/auth/co" - + "mpute.readonly,https://www.googleapis.co" - + "m/auth/userinfo.email2\356\002\n\024FlexTemplatesS" - + "ervice\022\177\n\022LaunchFlexTemplate\0222.google.da" - + "taflow.v1beta3.LaunchFlexTemplateRequest" - + "\0323.google.dataflow.v1beta3.LaunchFlexTem" - + "plateResponse\"\000\032\324\001\312A\027dataflow.googleapis" - + ".com\322A\266\001https://www.googleapis.com/auth/" - + "cloud-platform,https://www.googleapis.co" - + "m/auth/compute,https://www.googleapis.co" - + "m/auth/compute.readonly,https://www.goog" - + "leapis.com/auth/userinfo.emailB\323\001\n\033com.g" - + "oogle.dataflow.v1beta3B\016TemplatesProtoP\001" - + "Z?google.golang.org/genproto/googleapis/" - + "dataflow/v1beta3;dataflow\252\002\035Google.Cloud" - + ".Dataflow.V1Beta3\312\002\035Google\\Cloud\\Dataflo" - + "w\\V1beta3\352\002 Google::Cloud::Dataflow::V1b" - + "eta3b\006proto3" + + "\030\021 \001(\t\022\033\n\023sdk_container_image\030\022 \001(\t\022\024\n\014d" + + "isk_size_gb\030\024 \001(\005\022L\n\025autoscaling_algorit" + + "hm\030\025 \001(\0162-.google.dataflow.v1beta3.Autos" + + "calingAlgorithm\022\030\n\020dump_heap_on_oom\030\026 \001(" + + "\010\022#\n\033save_heap_dumps_to_gcs_path\030\027 \001(\t\022\035" + + "\n\025launcher_machine_type\030\030 \001(\t\032;\n\031Additio" + + "nalUserLabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value" + + "\030\002 \001(\t:\0028\001\"\250\001\n\031LaunchFlexTemplateRequest" + + "\022\022\n\nproject_id\030\001 \001(\t\022N\n\020launch_parameter" + + "\030\002 \001(\01324.google.dataflow.v1beta3.LaunchF" + + "lexTemplateParameter\022\020\n\010location\030\003 \001(\t\022\025" + + "\n\rvalidate_only\030\004 \001(\010\"\331\004\n\022RuntimeEnviron" + + "ment\022\023\n\013num_workers\030\013 \001(\005\022\023\n\013max_workers" + + "\030\001 \001(\005\022\014\n\004zone\030\002 \001(\t\022\035\n\025service_account_" + + "email\030\003 \001(\t\022\025\n\rtemp_location\030\004 \001(\t\022\"\n\032by" + + "pass_temp_dir_validation\030\005 \001(\010\022\024\n\014machin" + + "e_type\030\006 \001(\t\022\036\n\026additional_experiments\030\007" + + " \003(\t\022\017\n\007network\030\010 \001(\t\022\022\n\nsubnetwork\030\t \001(" + + "\t\022e\n\026additional_user_labels\030\n \003(\0132E.goog" + + "le.dataflow.v1beta3.RuntimeEnvironment.A" + + "dditionalUserLabelsEntry\022\024\n\014kms_key_name" + + "\030\014 \001(\t\022O\n\020ip_configuration\030\016 \001(\01625.googl" + + "e.dataflow.v1beta3.WorkerIPAddressConfig" + + "uration\022\025\n\rworker_region\030\017 \001(\t\022\023\n\013worker" + + "_zone\030\020 \001(\t\022\037\n\027enable_streaming_engine\030\021" + + " \001(\010\032;\n\031AdditionalUserLabelsEntry\022\013\n\003key" + + "\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\265\002\n\021ParameterM" + + "etadata\022\014\n\004name\030\001 \001(\t\022\r\n\005label\030\002 \001(\t\022\021\n\t" + + "help_text\030\003 \001(\t\022\023\n\013is_optional\030\004 \001(\010\022\017\n\007" + + "regexes\030\005 \003(\t\022:\n\nparam_type\030\006 \001(\0162&.goog" + + "le.dataflow.v1beta3.ParameterType\022W\n\017cus" + + "tom_metadata\030\007 \003(\0132>.google.dataflow.v1b" + + "eta3.ParameterMetadata.CustomMetadataEnt" + + "ry\0325\n\023CustomMetadataEntry\022\013\n\003key\030\001 \001(\t\022\r" + + "\n\005value\030\002 \001(\t:\0028\001\"u\n\020TemplateMetadata\022\014\n" + + "\004name\030\001 \001(\t\022\023\n\013description\030\002 \001(\t\022>\n\npara" + + "meters\030\003 \003(\0132*.google.dataflow.v1beta3.P" + + "arameterMetadata\"\206\001\n\007SDKInfo\022;\n\010language" + + "\030\001 \001(\0162).google.dataflow.v1beta3.SDKInfo" + + ".Language\022\017\n\007version\030\002 \001(\t\"-\n\010Language\022\013" + + "\n\007UNKNOWN\020\000\022\010\n\004JAVA\020\001\022\n\n\006PYTHON\020\002\"\205\001\n\017Ru" + + "ntimeMetadata\0222\n\010sdk_info\030\001 \001(\0132 .google" + + ".dataflow.v1beta3.SDKInfo\022>\n\nparameters\030" + + "\002 \003(\0132*.google.dataflow.v1beta3.Paramete" + + "rMetadata\"\306\002\n\034CreateJobFromTemplateReque" + + "st\022\022\n\nproject_id\030\001 \001(\t\022\020\n\010job_name\030\004 \001(\t" + + "\022\022\n\010gcs_path\030\002 \001(\tH\000\022Y\n\nparameters\030\003 \003(\013" + + "2E.google.dataflow.v1beta3.CreateJobFrom" + + "TemplateRequest.ParametersEntry\022@\n\013envir" + + "onment\030\005 \001(\0132+.google.dataflow.v1beta3.R" + + "untimeEnvironment\022\020\n\010location\030\006 \001(\t\0321\n\017P" + + "arametersEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001" + + "(\t:\0028\001B\n\n\010template\"\305\001\n\022GetTemplateReques" + + "t\022\022\n\nproject_id\030\001 \001(\t\022\022\n\010gcs_path\030\002 \001(\tH" + + "\000\022F\n\004view\030\003 \001(\01628.google.dataflow.v1beta" + + "3.GetTemplateRequest.TemplateView\022\020\n\010loc" + + "ation\030\004 \001(\t\"!\n\014TemplateView\022\021\n\rMETADATA_" + + "ONLY\020\000B\n\n\010template\"\277\002\n\023GetTemplateRespon" + + "se\022\"\n\006status\030\001 \001(\0132\022.google.rpc.Status\022;" + + "\n\010metadata\030\002 \001(\0132).google.dataflow.v1bet" + + "a3.TemplateMetadata\022P\n\rtemplate_type\030\003 \001" + + "(\01629.google.dataflow.v1beta3.GetTemplate" + + "Response.TemplateType\022B\n\020runtime_metadat" + + "a\030\004 \001(\0132(.google.dataflow.v1beta3.Runtim" + + "eMetadata\"1\n\014TemplateType\022\013\n\007UNKNOWN\020\000\022\n" + + "\n\006LEGACY\020\001\022\010\n\004FLEX\020\002\"\262\003\n\030LaunchTemplateP" + + "arameters\022\020\n\010job_name\030\001 \001(\t\022U\n\nparameter" + + "s\030\002 \003(\0132A.google.dataflow.v1beta3.Launch" + + "TemplateParameters.ParametersEntry\022@\n\013en" + + "vironment\030\003 \001(\0132+.google.dataflow.v1beta" + + "3.RuntimeEnvironment\022\016\n\006update\030\004 \001(\010\022k\n\026" + + "transform_name_mapping\030\005 \003(\0132K.google.da" + + "taflow.v1beta3.LaunchTemplateParameters." + + "TransformNameMappingEntry\0321\n\017ParametersE" + + "ntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\032;\n\031" + + "TransformNameMappingEntry\022\013\n\003key\030\001 \001(\t\022\r" + + "\n\005value\030\002 \001(\t:\0028\001\"\224\002\n\025LaunchTemplateRequ" + + "est\022\022\n\nproject_id\030\001 \001(\t\022\025\n\rvalidate_only" + + "\030\002 \001(\010\022\022\n\010gcs_path\030\003 \001(\tH\000\022P\n\020dynamic_te" + + "mplate\030\006 \001(\01324.google.dataflow.v1beta3.D" + + "ynamicTemplateLaunchParamsH\000\022L\n\021launch_p" + + "arameters\030\004 \001(\01321.google.dataflow.v1beta" + + "3.LaunchTemplateParameters\022\020\n\010location\030\005" + + " \001(\tB\n\n\010template\"C\n\026LaunchTemplateRespon" + + "se\022)\n\003job\030\001 \001(\0132\034.google.dataflow.v1beta" + + "3.Job\"\276\001\n\031InvalidTemplateParameters\022c\n\024p" + + "arameter_violations\030\001 \003(\0132E.google.dataf" + + "low.v1beta3.InvalidTemplateParameters.Pa" + + "rameterViolation\032<\n\022ParameterViolation\022\021" + + "\n\tparameter\030\001 \001(\t\022\023\n\013description\030\002 \001(\t\"I" + + "\n\033DynamicTemplateLaunchParams\022\020\n\010gcs_pat" + + "h\030\001 \001(\t\022\030\n\020staging_location\030\002 \001(\t*\316\001\n\rPa" + + "rameterType\022\013\n\007DEFAULT\020\000\022\010\n\004TEXT\020\001\022\023\n\017GC" + + "S_READ_BUCKET\020\002\022\024\n\020GCS_WRITE_BUCKET\020\003\022\021\n" + + "\rGCS_READ_FILE\020\004\022\022\n\016GCS_WRITE_FILE\020\005\022\023\n\017" + + "GCS_READ_FOLDER\020\006\022\024\n\020GCS_WRITE_FOLDER\020\007\022" + + "\020\n\014PUBSUB_TOPIC\020\010\022\027\n\023PUBSUB_SUBSCRIPTION" + + "\020\t2\302\007\n\020TemplatesService\022\337\001\n\025CreateJobFro" + + "mTemplate\0225.google.dataflow.v1beta3.Crea" + + "teJobFromTemplateRequest\032\034.google.datafl" + + "ow.v1beta3.Job\"q\202\323\344\223\002k\"%/v1b3/projects/{" + + "project_id}/templates:\001*Z?\":/v1b3/projec" + + "ts/{project_id}/locations/{location}/tem" + + "plates:\001*\022\224\002\n\016LaunchTemplate\022..google.da" + + "taflow.v1beta3.LaunchTemplateRequest\032/.g" + + "oogle.dataflow.v1beta3.LaunchTemplateRes" + + "ponse\"\240\001\202\323\344\223\002\231\001\",/v1b3/projects/{project" + + "_id}/templates:launch:\021launch_parameters" + + "ZV\"A/v1b3/projects/{project_id}/location" + + "s/{location}/templates:launch:\021launch_pa" + + "rameters\022\335\001\n\013GetTemplate\022+.google.datafl" + + "ow.v1beta3.GetTemplateRequest\032,.google.d" + + "ataflow.v1beta3.GetTemplateResponse\"s\202\323\344" + + "\223\002m\022)/v1b3/projects/{project_id}/templat" + + "es:getZ@\022>/v1b3/projects/{project_id}/lo" + + "cations/{location}/templates:get\032\324\001\312A\027da" + + "taflow.googleapis.com\322A\266\001https://www.goo" + + "gleapis.com/auth/cloud-platform,https://" + + "www.googleapis.com/auth/compute,https://" + + "www.googleapis.com/auth/compute.readonly" + + ",https://www.googleapis.com/auth/userinf" + + "o.email2\277\003\n\024FlexTemplatesService\022\317\001\n\022Lau" + + "nchFlexTemplate\0222.google.dataflow.v1beta" + + "3.LaunchFlexTemplateRequest\0323.google.dat" + + "aflow.v1beta3.LaunchFlexTemplateResponse" + + "\"P\202\323\344\223\002J\"E/v1b3/projects/{project_id}/lo" + + "cations/{location}/flexTemplates:launch:" + + "\001*\032\324\001\312A\027dataflow.googleapis.com\322A\266\001https" + + "://www.googleapis.com/auth/cloud-platfor" + + "m,https://www.googleapis.com/auth/comput" + + "e,https://www.googleapis.com/auth/comput" + + "e.readonly,https://www.googleapis.com/au" + + "th/userinfo.emailB\323\001\n\033com.google.dataflo" + + "w.v1beta3B\016TemplatesProtoP\001Z?google.gola" + + "ng.org/genproto/googleapis/dataflow/v1be" + + "ta3;dataflow\252\002\035Google.Cloud.Dataflow.V1B" + + "eta3\312\002\035Google\\Cloud\\Dataflow\\V1beta3\352\002 G" + + "oogle::Cloud::Dataflow::V1beta3b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { com.google.api.AnnotationsProto.getDescriptor(), + com.google.api.ClientProto.getDescriptor(), com.google.dataflow.v1beta3.EnvironmentProto.getDescriptor(), com.google.dataflow.v1beta3.JobsProto.getDescriptor(), com.google.rpc.StatusProto.getDescriptor(), - com.google.api.ClientProto.getDescriptor(), }); internal_static_google_dataflow_v1beta3_LaunchFlexTemplateResponse_descriptor = getDescriptor().getMessageTypes().get(0); @@ -414,6 +430,11 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "FlexrsGoal", "StagingLocation", "SdkContainerImage", + "DiskSizeGb", + "AutoscalingAlgorithm", + "DumpHeapOnOom", + "SaveHeapDumpsToGcsPath", + "LauncherMachineType", }); internal_static_google_dataflow_v1beta3_FlexTemplateRuntimeEnvironment_AdditionalUserLabelsEntry_descriptor = internal_static_google_dataflow_v1beta3_FlexTemplateRuntimeEnvironment_descriptor @@ -627,14 +648,15 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { com.google.protobuf.ExtensionRegistry registry = com.google.protobuf.ExtensionRegistry.newInstance(); registry.add(com.google.api.ClientProto.defaultHost); + registry.add(com.google.api.AnnotationsProto.http); registry.add(com.google.api.ClientProto.oauthScopes); com.google.protobuf.Descriptors.FileDescriptor.internalUpdateFileDescriptor( descriptor, registry); com.google.api.AnnotationsProto.getDescriptor(); + com.google.api.ClientProto.getDescriptor(); com.google.dataflow.v1beta3.EnvironmentProto.getDescriptor(); com.google.dataflow.v1beta3.JobsProto.getDescriptor(); com.google.rpc.StatusProto.getDescriptor(); - com.google.api.ClientProto.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) 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 914a87f0..26487a52 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 @@ -1,4 +1,4 @@ -// Copyright 2021 Google LLC +// Copyright 2022 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-dataflow-v1beta3/src/main/proto/google/dataflow/v1beta3/jobs.proto b/proto-google-cloud-dataflow-v1beta3/src/main/proto/google/dataflow/v1beta3/jobs.proto index 8d6c49a9..17df58bf 100644 --- a/proto-google-cloud-dataflow-v1beta3/src/main/proto/google/dataflow/v1beta3/jobs.proto +++ b/proto-google-cloud-dataflow-v1beta3/src/main/proto/google/dataflow/v1beta3/jobs.proto @@ -1,4 +1,4 @@ -// Copyright 2021 Google LLC +// Copyright 2022 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -17,12 +17,12 @@ syntax = "proto3"; package google.dataflow.v1beta3; import "google/api/annotations.proto"; +import "google/api/client.proto"; import "google/dataflow/v1beta3/environment.proto"; import "google/dataflow/v1beta3/snapshots.proto"; import "google/protobuf/duration.proto"; import "google/protobuf/struct.proto"; import "google/protobuf/timestamp.proto"; -import "google/api/client.proto"; option csharp_namespace = "Google.Cloud.Dataflow.V1Beta3"; option go_package = "google.golang.org/genproto/googleapis/dataflow/v1beta3;dataflow"; @@ -50,6 +50,14 @@ service JobsV1Beta3 { // `projects.jobs.create` is not recommended, as your job will always start // in `us-central1`. rpc CreateJob(CreateJobRequest) returns (Job) { + option (google.api.http) = { + post: "/v1b3/projects/{project_id}/jobs" + body: "job" + additional_bindings { + post: "/v1b3/projects/{project_id}/locations/{location}/jobs" + body: "job" + } + }; } // Gets the state of the specified Cloud Dataflow job. @@ -60,6 +68,12 @@ service JobsV1Beta3 { // `projects.jobs.get` is not recommended, as you can only get the state of // jobs that are running in `us-central1`. rpc GetJob(GetJobRequest) returns (Job) { + option (google.api.http) = { + get: "/v1b3/projects/{project_id}/jobs/{job_id}" + additional_bindings { + get: "/v1b3/projects/{project_id}/locations/{location}/jobs/{job_id}" + } + }; } // Updates the state of an existing Cloud Dataflow job. @@ -70,6 +84,14 @@ service JobsV1Beta3 { // `projects.jobs.update` is not recommended, as you can only update the state // of jobs that are running in `us-central1`. rpc UpdateJob(UpdateJobRequest) returns (Job) { + option (google.api.http) = { + put: "/v1b3/projects/{project_id}/jobs/{job_id}" + body: "job" + additional_bindings { + put: "/v1b3/projects/{project_id}/locations/{location}/jobs/{job_id}" + body: "job" + } + }; } // List the jobs of a project. @@ -81,10 +103,19 @@ service JobsV1Beta3 { // `projects.jobs.list` is not recommended, as you can only get the list of // jobs that are running in `us-central1`. rpc ListJobs(ListJobsRequest) returns (ListJobsResponse) { + option (google.api.http) = { + get: "/v1b3/projects/{project_id}/jobs" + additional_bindings { + get: "/v1b3/projects/{project_id}/locations/{location}/jobs" + } + }; } // List the jobs of a project across all regions. rpc AggregatedListJobs(ListJobsRequest) returns (ListJobsResponse) { + option (google.api.http) = { + get: "/v1b3/projects/{project_id}/jobs:aggregated" + }; } // Check for existence of active jobs in the given project across all regions. @@ -93,6 +124,14 @@ service JobsV1Beta3 { // Snapshot the state of a streaming job. rpc SnapshotJob(SnapshotJobRequest) returns (Snapshot) { + option (google.api.http) = { + post: "/v1b3/projects/{project_id}/jobs/{job_id}:snapshot" + body: "*" + additional_bindings { + post: "/v1b3/projects/{project_id}/locations/{location}/jobs/{job_id}:snapshot" + body: "*" + } + }; } } @@ -277,7 +316,7 @@ message FileIODetails { string file_pattern = 1; } -// Metadata for a Cloud BigTable connector used by the job. +// Metadata for a Cloud Bigtable connector used by the job. message BigTableIODetails { // ProjectId accessed in the connection. string project_id = 1; @@ -359,10 +398,10 @@ message JobMetadata { // Identification of a BigQuery source used in the Dataflow job. repeated BigQueryIODetails bigquery_details = 3; - // Identification of a Cloud BigTable source used in the Dataflow job. + // Identification of a Cloud Bigtable source used in the Dataflow job. repeated BigTableIODetails big_table_details = 4; - // Identification of a PubSub source used in the Dataflow job. + // Identification of a Pub/Sub source used in the Dataflow job. repeated PubSubIODetails pubsub_details = 5; // Identification of a File source used in the Dataflow job. @@ -398,27 +437,6 @@ message PipelineDescription { repeated DisplayData display_data = 3; } -// Description of the type, names/ids, and input/outputs for a transform. -message TransformSummary { - // Type of transform. - KindType kind = 1; - - // SDK generated id of this transform instance. - string id = 2; - - // User provided name for this transform instance. - string name = 3; - - // Transform-specific display data. - repeated DisplayData display_data = 4; - - // User names for all collection outputs to this transform. - repeated string output_collection_name = 5; - - // User names for all collection inputs to this transform. - repeated string input_collection_name = 6; -} - // Type of transform or stage operation. enum KindType { // Unrecognized transform type. @@ -449,6 +467,27 @@ enum KindType { SHUFFLE_KIND = 8; } +// Description of the type, names/ids, and input/outputs for a transform. +message TransformSummary { + // Type of transform. + KindType kind = 1; + + // SDK generated id of this transform instance. + string id = 2; + + // User provided name for this transform instance. + string name = 3; + + // Transform-specific display data. + repeated DisplayData display_data = 4; + + // User names for all collection outputs to this transform. + repeated string output_collection_name = 5; + + // User names for all collection inputs to this transform. + repeated string input_collection_name = 6; +} + // Description of the composing transforms, names/ids, and input/outputs of a // stage of execution. Some composing transforms and sources may have been // generated by the Dataflow service during execution planning. @@ -613,22 +652,6 @@ message Step { google.protobuf.Struct properties = 3; } -// Additional information about how a Cloud Dataflow job will be executed that -// isn't contained in the submitted job. -message JobExecutionInfo { - // A mapping from each stage to the information about that stage. - map stages = 1; -} - -// Contains information about how a particular -// [google.dataflow.v1beta3.Step][google.dataflow.v1beta3.Step] will be executed. -message JobExecutionStageInfo { - // The steps associated with the execution stage. - // Note that stages may have several steps, and that a given step - // might be run by more than one stage. - repeated string step_name = 1; -} - // Describes the overall state of a [google.dataflow.v1beta3.Job][google.dataflow.v1beta3.Job]. enum JobState { // The job's run state isn't specified. @@ -703,6 +726,42 @@ enum JobState { JOB_STATE_RESOURCE_CLEANING_UP = 12; } +// Additional information about how a Cloud Dataflow job will be executed that +// isn't contained in the submitted job. +message JobExecutionInfo { + // A mapping from each stage to the information about that stage. + map stages = 1; +} + +// Contains information about how a particular +// [google.dataflow.v1beta3.Step][google.dataflow.v1beta3.Step] will be executed. +message JobExecutionStageInfo { + // The steps associated with the execution stage. + // Note that stages may have several steps, and that a given step + // might be run by more than one stage. + repeated string step_name = 1; +} + +// Selector for how much information is returned in Job responses. +enum JobView { + // The job view to return isn't specified, or is unknown. + // Responses will contain at least the `JOB_VIEW_SUMMARY` information, + // and may contain additional information. + JOB_VIEW_UNKNOWN = 0; + + // Request summary information only: + // Project ID, Job ID, job name, job type, job status, start/end time, + // and Cloud SDK version details. + JOB_VIEW_SUMMARY = 1; + + // Request all information available for this job. + JOB_VIEW_ALL = 2; + + // Request summary info and limited job description data for steps, labels and + // environment. + JOB_VIEW_DESCRIPTION = 3; +} + // Request to create a Cloud Dataflow job. message CreateJobRequest { // The ID of the Cloud Platform project that the job belongs to. @@ -740,26 +799,6 @@ message GetJobRequest { string location = 4; } -// Selector for how much information is returned in Job responses. -enum JobView { - // The job view to return isn't specified, or is unknown. - // Responses will contain at least the `JOB_VIEW_SUMMARY` information, - // and may contain additional information. - JOB_VIEW_UNKNOWN = 0; - - // Request summary information only: - // Project ID, Job ID, job name, job type, job status, start/end time, - // and Cloud SDK version details. - JOB_VIEW_SUMMARY = 1; - - // Request all information available for this job. - JOB_VIEW_ALL = 2; - - // Request summary info and limited job description data for steps, labels and - // environment. - JOB_VIEW_DESCRIPTION = 3; -} - // Request to update a Cloud Dataflow job. message UpdateJobRequest { // The ID of the Cloud Platform project that the job belongs to. diff --git a/proto-google-cloud-dataflow-v1beta3/src/main/proto/google/dataflow/v1beta3/messages.proto b/proto-google-cloud-dataflow-v1beta3/src/main/proto/google/dataflow/v1beta3/messages.proto index 7bf8d8e7..a1099a21 100644 --- a/proto-google-cloud-dataflow-v1beta3/src/main/proto/google/dataflow/v1beta3/messages.proto +++ b/proto-google-cloud-dataflow-v1beta3/src/main/proto/google/dataflow/v1beta3/messages.proto @@ -1,4 +1,4 @@ -// Copyright 2021 Google LLC +// Copyright 2022 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -17,9 +17,9 @@ syntax = "proto3"; package google.dataflow.v1beta3; import "google/api/annotations.proto"; +import "google/api/client.proto"; import "google/protobuf/struct.proto"; import "google/protobuf/timestamp.proto"; -import "google/api/client.proto"; option csharp_namespace = "Google.Cloud.Dataflow.V1Beta3"; option go_package = "google.golang.org/genproto/googleapis/dataflow/v1beta3;dataflow"; @@ -47,6 +47,12 @@ service MessagesV1Beta3 { // `projects.jobs.messages.list` is not recommended, as you can only request // the status of jobs that are running in `us-central1`. rpc ListJobMessages(ListJobMessagesRequest) returns (ListJobMessagesResponse) { + option (google.api.http) = { + get: "/v1b3/projects/{project_id}/jobs/{job_id}/messages" + additional_bindings { + get: "/v1b3/projects/{project_id}/locations/{location}/jobs/{job_id}/messages" + } + }; } } @@ -65,30 +71,6 @@ message JobMessage { JobMessageImportance message_importance = 4; } -// A rich message format, including a human readable string, a key for -// identifying the message, and structured data associated with the message for -// programmatic consumption. -message StructuredMessage { - // Structured data associated with this message. - message Parameter { - // Key or name for this parameter. - string key = 1; - - // Value for this parameter. - google.protobuf.Value value = 2; - } - - // Human-readable version of message. - string message_text = 1; - - // Identifier for this message type. Used by external systems to - // internationalize or personalize message. - string message_key = 2; - - // The structured data associated with this message. - repeated Parameter parameters = 3; -} - // Indicates the importance of the message. enum JobMessageImportance { // The message importance isn't specified, or is unknown. @@ -128,6 +110,30 @@ enum JobMessageImportance { JOB_MESSAGE_ERROR = 4; } +// A rich message format, including a human readable string, a key for +// identifying the message, and structured data associated with the message for +// programmatic consumption. +message StructuredMessage { + // Structured data associated with this message. + message Parameter { + // Key or name for this parameter. + string key = 1; + + // Value for this parameter. + google.protobuf.Value value = 2; + } + + // Human-readable version of message. + string message_text = 1; + + // Identifier for this message type. Used by external systems to + // internationalize or personalize message. + string message_key = 2; + + // The structured data associated with this message. + repeated Parameter parameters = 3; +} + // A structured message reporting an autoscaling decision made by the Dataflow // service. message AutoscalingEvent { @@ -177,8 +183,7 @@ message AutoscalingEvent { // num_workers value. google.protobuf.Timestamp time = 5; - // A short and friendly name for the worker pool this event refers to, - // populated from the value of PoolStageRelation::user_pool_name. + // A short and friendly name for the worker pool this event refers to. string worker_pool = 7; } diff --git a/proto-google-cloud-dataflow-v1beta3/src/main/proto/google/dataflow/v1beta3/metrics.proto b/proto-google-cloud-dataflow-v1beta3/src/main/proto/google/dataflow/v1beta3/metrics.proto index e90fb24b..fc2bf521 100644 --- a/proto-google-cloud-dataflow-v1beta3/src/main/proto/google/dataflow/v1beta3/metrics.proto +++ b/proto-google-cloud-dataflow-v1beta3/src/main/proto/google/dataflow/v1beta3/metrics.proto @@ -1,4 +1,4 @@ -// Copyright 2021 Google LLC +// Copyright 2022 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -17,9 +17,9 @@ syntax = "proto3"; package google.dataflow.v1beta3; import "google/api/annotations.proto"; +import "google/api/client.proto"; import "google/protobuf/struct.proto"; import "google/protobuf/timestamp.proto"; -import "google/api/client.proto"; option csharp_namespace = "Google.Cloud.Dataflow.V1Beta3"; option go_package = "google.golang.org/genproto/googleapis/dataflow/v1beta3;dataflow"; @@ -47,12 +47,21 @@ service MetricsV1Beta3 { // `projects.jobs.getMetrics` is not recommended, as you can only request the // status of jobs that are running in `us-central1`. rpc GetJobMetrics(GetJobMetricsRequest) returns (JobMetrics) { + option (google.api.http) = { + get: "/v1b3/projects/{project_id}/jobs/{job_id}/metrics" + additional_bindings { + get: "/v1b3/projects/{project_id}/locations/{location}/jobs/{job_id}/metrics" + } + }; } // Request detailed information about the execution status of the job. // // EXPERIMENTAL. This API is subject to change or removal without notice. rpc GetJobExecutionDetails(GetJobExecutionDetailsRequest) returns (JobExecutionDetails) { + option (google.api.http) = { + get: "/v1b3/projects/{project_id}/locations/{location}/jobs/{job_id}/executionDetails" + }; } // Request detailed information about the execution status of a stage of the @@ -60,6 +69,9 @@ service MetricsV1Beta3 { // // EXPERIMENTAL. This API is subject to change or removal without notice. rpc GetStageExecutionDetails(GetStageExecutionDetailsRequest) returns (StageExecutionDetails) { + option (google.api.http) = { + get: "/v1b3/projects/{project_id}/locations/{location}/jobs/{job_id}/stages/{stage_id}/executionDetails" + }; } } @@ -218,6 +230,27 @@ message ProgressTimeseries { repeated Point data_points = 2; } +// The state of some component of job execution. +enum ExecutionState { + // The component state is unknown or unspecified. + EXECUTION_STATE_UNKNOWN = 0; + + // The component is not yet running. + EXECUTION_STATE_NOT_STARTED = 1; + + // The component is currently running. + EXECUTION_STATE_RUNNING = 2; + + // The component succeeded. + EXECUTION_STATE_SUCCEEDED = 3; + + // The component failed. + EXECUTION_STATE_FAILED = 4; + + // Execution of the component was cancelled. + EXECUTION_STATE_CANCELLED = 5; +} + // Information about a particular execution stage of a job. message StageSummary { // ID of this stage @@ -315,27 +348,6 @@ message WorkItemDetails { repeated MetricUpdate metrics = 7; } -// The state of some component of job execution. -enum ExecutionState { - // The component state is unknown or unspecified. - EXECUTION_STATE_UNKNOWN = 0; - - // The component is not yet running. - EXECUTION_STATE_NOT_STARTED = 1; - - // The component is currently running. - EXECUTION_STATE_RUNNING = 2; - - // The component succeeded. - EXECUTION_STATE_SUCCEEDED = 3; - - // The component failed. - EXECUTION_STATE_FAILED = 4; - - // Execution of the component was cancelled. - EXECUTION_STATE_CANCELLED = 5; -} - // Information about a worker message WorkerDetails { // Name of this worker diff --git a/proto-google-cloud-dataflow-v1beta3/src/main/proto/google/dataflow/v1beta3/snapshots.proto b/proto-google-cloud-dataflow-v1beta3/src/main/proto/google/dataflow/v1beta3/snapshots.proto index abde6ee4..0b49b932 100644 --- a/proto-google-cloud-dataflow-v1beta3/src/main/proto/google/dataflow/v1beta3/snapshots.proto +++ b/proto-google-cloud-dataflow-v1beta3/src/main/proto/google/dataflow/v1beta3/snapshots.proto @@ -1,4 +1,4 @@ -// Copyright 2021 Google LLC +// Copyright 2022 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -17,9 +17,9 @@ syntax = "proto3"; package google.dataflow.v1beta3; import "google/api/annotations.proto"; +import "google/api/client.proto"; import "google/protobuf/duration.proto"; import "google/protobuf/timestamp.proto"; -import "google/api/client.proto"; option csharp_namespace = "Google.Cloud.Dataflow.V1Beta3"; option go_package = "google.golang.org/genproto/googleapis/dataflow/v1beta3;dataflow"; @@ -40,29 +40,38 @@ service SnapshotsV1Beta3 { // Gets information about a snapshot. rpc GetSnapshot(GetSnapshotRequest) returns (Snapshot) { + option (google.api.http) = { + get: "/v1b3/projects/{project_id}/snapshots/{snapshot_id}" + additional_bindings { + get: "/v1b3/projects/{project_id}/locations/{location}/snapshots/{snapshot_id}" + } + }; } // Deletes a snapshot. rpc DeleteSnapshot(DeleteSnapshotRequest) returns (DeleteSnapshotResponse) { + option (google.api.http) = { + delete: "/v1b3/projects/{project_id}/snapshots" + additional_bindings { + delete: "/v1b3/projects/{project_id}/locations/{location}/snapshots/{snapshot_id}" + } + }; } // Lists snapshots. rpc ListSnapshots(ListSnapshotsRequest) returns (ListSnapshotsResponse) { + option (google.api.http) = { + get: "/v1b3/projects/{project_id}/snapshots" + additional_bindings { + get: "/v1b3/projects/{project_id}/locations/{location}/snapshots" + } + additional_bindings { + get: "/v1b3/projects/{project_id}/locations/{location}/jobs/{job_id}/snapshots" + } + }; } } -// Represents a Pubsub snapshot. -message PubsubSnapshotMetadata { - // The name of the Pubsub topic. - string topic_name = 1; - - // The name of the Pubsub snapshot. - string snapshot_name = 2; - - // The expire time of the Pubsub snapshot. - google.protobuf.Timestamp expire_time = 3; -} - // Snapshot state. enum SnapshotState { // Unknown state. @@ -85,6 +94,18 @@ enum SnapshotState { DELETED = 5; } +// Represents a Pubsub snapshot. +message PubsubSnapshotMetadata { + // The name of the Pubsub topic. + string topic_name = 1; + + // The name of the Pubsub snapshot. + string snapshot_name = 2; + + // The expire time of the Pubsub snapshot. + google.protobuf.Timestamp expire_time = 3; +} + // Represents a snapshot of a job. message Snapshot { // The unique ID of this snapshot. @@ -105,7 +126,7 @@ message Snapshot { // State of the snapshot. SnapshotState state = 6; - // PubSub snapshot metadata. + // Pub/Sub snapshot metadata. repeated PubsubSnapshotMetadata pubsub_metadata = 7; // User specified description of the snapshot. Maybe empty. diff --git a/proto-google-cloud-dataflow-v1beta3/src/main/proto/google/dataflow/v1beta3/streaming.proto b/proto-google-cloud-dataflow-v1beta3/src/main/proto/google/dataflow/v1beta3/streaming.proto index f20f6ddd..77577ca1 100644 --- a/proto-google-cloud-dataflow-v1beta3/src/main/proto/google/dataflow/v1beta3/streaming.proto +++ b/proto-google-cloud-dataflow-v1beta3/src/main/proto/google/dataflow/v1beta3/streaming.proto @@ -1,4 +1,4 @@ -// Copyright 2021 Google LLC +// Copyright 2022 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/proto-google-cloud-dataflow-v1beta3/src/main/proto/google/dataflow/v1beta3/templates.proto b/proto-google-cloud-dataflow-v1beta3/src/main/proto/google/dataflow/v1beta3/templates.proto index bb9d3f61..ae6b08b1 100644 --- a/proto-google-cloud-dataflow-v1beta3/src/main/proto/google/dataflow/v1beta3/templates.proto +++ b/proto-google-cloud-dataflow-v1beta3/src/main/proto/google/dataflow/v1beta3/templates.proto @@ -1,4 +1,4 @@ -// Copyright 2021 Google LLC +// Copyright 2022 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -17,10 +17,10 @@ syntax = "proto3"; package google.dataflow.v1beta3; import "google/api/annotations.proto"; +import "google/api/client.proto"; import "google/dataflow/v1beta3/environment.proto"; import "google/dataflow/v1beta3/jobs.proto"; import "google/rpc/status.proto"; -import "google/api/client.proto"; option csharp_namespace = "Google.Cloud.Dataflow.V1Beta3"; option go_package = "google.golang.org/genproto/googleapis/dataflow/v1beta3;dataflow"; @@ -41,14 +41,36 @@ service TemplatesService { // Creates a Cloud Dataflow job from a template. rpc CreateJobFromTemplate(CreateJobFromTemplateRequest) returns (Job) { + option (google.api.http) = { + post: "/v1b3/projects/{project_id}/templates" + body: "*" + additional_bindings { + post: "/v1b3/projects/{project_id}/locations/{location}/templates" + body: "*" + } + }; } // Launch a template. rpc LaunchTemplate(LaunchTemplateRequest) returns (LaunchTemplateResponse) { + option (google.api.http) = { + post: "/v1b3/projects/{project_id}/templates:launch" + body: "launch_parameters" + additional_bindings { + post: "/v1b3/projects/{project_id}/locations/{location}/templates:launch" + body: "launch_parameters" + } + }; } // Get the template associated with a template. rpc GetTemplate(GetTemplateRequest) returns (GetTemplateResponse) { + option (google.api.http) = { + get: "/v1b3/projects/{project_id}/templates:get" + additional_bindings { + get: "/v1b3/projects/{project_id}/locations/{location}/templates:get" + } + }; } } @@ -63,6 +85,10 @@ service FlexTemplatesService { // Launch a job with a FlexTemplate. rpc LaunchFlexTemplate(LaunchFlexTemplateRequest) returns (LaunchFlexTemplateResponse) { + option (google.api.http) = { + post: "/v1b3/projects/{project_id}/locations/{location}/flexTemplates:launch" + body: "*" + }; } } @@ -213,6 +239,27 @@ message FlexTemplateRuntimeEnvironment { // Default is the container for the version of the SDK. Note this field is // only valid for portable pipelines. string sdk_container_image = 18; + + // Worker disk size, in gigabytes. + int32 disk_size_gb = 20; + + // The algorithm to use for autoscaling + AutoscalingAlgorithm autoscaling_algorithm = 21; + + // If true, save a heap dump before killing a thread or process which is GC + // thrashing or out of memory. The location of the heap file will either be + // echoed back to the user, or the user will be given the opportunity to + // download the heap file. + bool dump_heap_on_oom = 22; + + // Cloud Storage bucket (directory) to upload heap dumps to the given + // location. Enabling this implies that heap dumps should be generated on OOM + // (dump_heap_on_oom is set to true). + string save_heap_dumps_to_gcs_path = 23; + + // The machine type to use for launching the job. The default is + // n1-standard-1. + string launcher_machine_type = 24; } // A request to launch a Cloud Dataflow job from a FlexTemplate. @@ -263,7 +310,8 @@ message RuntimeEnvironment { // template if not specified. string machine_type = 6; - // Additional experiment flags for the job. + // Additional experiment flags for the job, specified with the + // `--experiments` option. repeated string additional_experiments = 7; // Network to which VMs will be assigned. If empty or unspecified, @@ -338,39 +386,6 @@ message ParameterMetadata { map custom_metadata = 7; } -// Metadata describing a template. -message TemplateMetadata { - // Required. The name of the template. - string name = 1; - - // Optional. A description of the template. - string description = 2; - - // The parameters for the template. - repeated ParameterMetadata parameters = 3; -} - -// SDK Information. -message SDKInfo { - // SDK Language. - enum Language { - // UNKNOWN Language. - UNKNOWN = 0; - - // Java. - JAVA = 1; - - // Python. - PYTHON = 2; - } - - // Required. The SDK Language. - Language language = 1; - - // Optional. The SDK version. - string version = 2; -} - // ParameterType specifies what kind of input we need for this parameter. enum ParameterType { // Default input type. @@ -404,6 +419,39 @@ enum ParameterType { PUBSUB_SUBSCRIPTION = 9; } +// Metadata describing a template. +message TemplateMetadata { + // Required. The name of the template. + string name = 1; + + // Optional. A description of the template. + string description = 2; + + // The parameters for the template. + repeated ParameterMetadata parameters = 3; +} + +// SDK Information. +message SDKInfo { + // SDK Language. + enum Language { + // UNKNOWN Language. + UNKNOWN = 0; + + // Java. + JAVA = 1; + + // Python. + PYTHON = 2; + } + + // Required. The SDK Language. + Language language = 1; + + // Optional. The SDK version. + string version = 2; +} + // RuntimeMetadata describing a runtime environment. message RuntimeMetadata { // SDK Info for the template. From f8c7594c0ee852bbe14e191a81c28d88b1798df6 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 3 Feb 2022 19:54:55 +0000 Subject: [PATCH 14/15] chore: add kokoro config to run nightly integration test on java11.0.14 (#1347) (#123) --- .github/.OwlBot.lock.yaml | 2 +- .kokoro/nightly/java11-integration.cfg | 37 ++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 .kokoro/nightly/java11-integration.cfg diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index be3b9bde..8807efca 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,4 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:7062473f423f339256346ddbee3d81fb1de6b784fabc2a4d959d7df2c720e375 + digest: sha256:7c853edc4136ae8f19f9d46d4569d38de2e446db2eea057f32e412bdba255846 diff --git a/.kokoro/nightly/java11-integration.cfg b/.kokoro/nightly/java11-integration.cfg new file mode 100644 index 00000000..58049cc3 --- /dev/null +++ b/.kokoro/nightly/java11-integration.cfg @@ -0,0 +1,37 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-public-resources/java11014" +} + +env_vars: { + key: "JOB_TYPE" + value: "integration" +} +# TODO: remove this after we've migrated all tests and scripts +env_vars: { + key: "GCLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_CLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "ENABLE_FLAKYBOT" + value: "true" +} + +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "secret_manager/java-it-service-account" +} + +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "java-it-service-account" +} From c0586e0d38d893ecc011c7f7f70376ff9cc5eba9 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 3 Feb 2022 21:06:40 +0000 Subject: [PATCH 15/15] chore(main): release 0.4.0 (#121) :robot: I have created a release *beep* *boop* --- ## [0.4.0](https://github.com/googleapis/java-dataflow/compare/v0.3.3...v0.4.0) (2022-02-03) ### Features * new parameters in FlexTemplateRuntimeEnvironment fix: added google.api.http annotations to RPCs ([#122](https://github.com/googleapis/java-dataflow/issues/122)) ([cdd4a8a](https://github.com/googleapis/java-dataflow/commit/cdd4a8ab32813ea81cf08c7216e7e9ab89fc1b07)) ### Dependencies * **java:** update actions/github-script action to v5 ([#1339](https://github.com/googleapis/java-dataflow/issues/1339)) ([#117](https://github.com/googleapis/java-dataflow/issues/117)) ([9d22aab](https://github.com/googleapis/java-dataflow/commit/9d22aabd9b4285502d8fb916b103733ade4dcb4a)) * update dependency com.google.cloud:google-cloud-shared-dependencies to v2.7.0 ([#120](https://github.com/googleapis/java-dataflow/issues/120)) ([011e75f](https://github.com/googleapis/java-dataflow/commit/011e75f067dc2b86fc2b3eb3725acf7d4e7376f2)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- CHANGELOG.md | 13 +++++++++++++ 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, 30 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c4ca67b..603b7168 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [0.4.0](https://github.com/googleapis/java-dataflow/compare/v0.3.3...v0.4.0) (2022-02-03) + + +### Features + +* new parameters in FlexTemplateRuntimeEnvironment fix: added google.api.http annotations to RPCs ([#122](https://github.com/googleapis/java-dataflow/issues/122)) ([cdd4a8a](https://github.com/googleapis/java-dataflow/commit/cdd4a8ab32813ea81cf08c7216e7e9ab89fc1b07)) + + +### Dependencies + +* **java:** update actions/github-script action to v5 ([#1339](https://github.com/googleapis/java-dataflow/issues/1339)) ([#117](https://github.com/googleapis/java-dataflow/issues/117)) ([9d22aab](https://github.com/googleapis/java-dataflow/commit/9d22aabd9b4285502d8fb916b103733ade4dcb4a)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.7.0 ([#120](https://github.com/googleapis/java-dataflow/issues/120)) ([011e75f](https://github.com/googleapis/java-dataflow/commit/011e75f067dc2b86fc2b3eb3725acf7d4e7376f2)) + ### [0.3.3](https://www.github.com/googleapis/java-dataflow/compare/v0.3.2...v0.3.3) (2022-01-07) diff --git a/google-cloud-dataflow-bom/pom.xml b/google-cloud-dataflow-bom/pom.xml index 3f52158f..7cc34e30 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.3.4-SNAPSHOT + 0.4.0 pom com.google.cloud @@ -56,17 +56,17 @@ com.google.cloud google-cloud-dataflow - 0.3.4-SNAPSHOT + 0.4.0 com.google.api.grpc grpc-google-cloud-dataflow-v1beta3 - 0.3.4-SNAPSHOT + 0.4.0 com.google.api.grpc proto-google-cloud-dataflow-v1beta3 - 0.3.4-SNAPSHOT + 0.4.0
diff --git a/google-cloud-dataflow/pom.xml b/google-cloud-dataflow/pom.xml index fd3f7039..a4e65e76 100644 --- a/google-cloud-dataflow/pom.xml +++ b/google-cloud-dataflow/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-dataflow - 0.3.4-SNAPSHOT + 0.4.0 jar Google Dataflow https://github.com/googleapis/java-dataflow @@ -11,7 +11,7 @@ com.google.cloud google-cloud-dataflow-parent - 0.3.4-SNAPSHOT + 0.4.0 google-cloud-dataflow diff --git a/grpc-google-cloud-dataflow-v1beta3/pom.xml b/grpc-google-cloud-dataflow-v1beta3/pom.xml index e7e343b0..a2d100f1 100644 --- a/grpc-google-cloud-dataflow-v1beta3/pom.xml +++ b/grpc-google-cloud-dataflow-v1beta3/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-dataflow-v1beta3 - 0.3.4-SNAPSHOT + 0.4.0 grpc-google-cloud-dataflow-v1beta3 GRPC library for google-cloud-dataflow com.google.cloud google-cloud-dataflow-parent - 0.3.4-SNAPSHOT + 0.4.0 diff --git a/pom.xml b/pom.xml index 8f3a4ae2..b81efd1a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-dataflow-parent pom - 0.3.4-SNAPSHOT + 0.4.0 Google Dataflow Parent https://github.com/googleapis/java-dataflow @@ -69,17 +69,17 @@ com.google.cloud google-cloud-dataflow - 0.3.4-SNAPSHOT + 0.4.0 com.google.api.grpc grpc-google-cloud-dataflow-v1beta3 - 0.3.4-SNAPSHOT + 0.4.0 com.google.api.grpc proto-google-cloud-dataflow-v1beta3 - 0.3.4-SNAPSHOT + 0.4.0 diff --git a/proto-google-cloud-dataflow-v1beta3/pom.xml b/proto-google-cloud-dataflow-v1beta3/pom.xml index 36b72264..ac6ee613 100644 --- a/proto-google-cloud-dataflow-v1beta3/pom.xml +++ b/proto-google-cloud-dataflow-v1beta3/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-dataflow-v1beta3 - 0.3.4-SNAPSHOT + 0.4.0 proto-google-cloud-dataflow-v1beta3 Proto library for google-cloud-dataflow com.google.cloud google-cloud-dataflow-parent - 0.3.4-SNAPSHOT + 0.4.0 diff --git a/versions.txt b/versions.txt index 902b3aa3..a2315b31 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-dataflow:0.3.3:0.3.4-SNAPSHOT -grpc-google-cloud-dataflow-v1beta3:0.3.3:0.3.4-SNAPSHOT -proto-google-cloud-dataflow-v1beta3:0.3.3:0.3.4-SNAPSHOT +google-cloud-dataflow:0.4.0:0.4.0 +grpc-google-cloud-dataflow-v1beta3:0.4.0:0.4.0 +proto-google-cloud-dataflow-v1beta3:0.4.0:0.4.0