diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 9786771c..426cf83e 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:3c950ed12391ebaffd1ee66d0374766a1c50144ebe6a7a0042300b2e6bb5856b + digest: sha256:b0b1c1c89570e229b1026372a2b8989ba31495007055b8d30178b7648503eefa diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 81ee871f..c18d840f 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -5,3 +5,6 @@ Thank you for opening a Pull Request! Before submitting your PR, there are a few - [ ] Appropriate docs were updated (if necessary) Fixes # ☕️ + +If you write sample code, please follow the [samples format]( +https://github.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md). diff --git a/.github/workflows/approve-readme.yaml b/.github/workflows/approve-readme.yaml index 1bb18232..f5fc7d51 100644 --- a/.github/workflows/approve-readme.yaml +++ b/.github/workflows/approve-readme.yaml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'googleapis' && github.head_ref == 'autosynth-readme' steps: - - uses: actions/github-script@v5 + - uses: actions/github-script@v6 with: github-token: ${{secrets.YOSHI_APPROVER_TOKEN}} script: | diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml index 18e23230..7a106d00 100644 --- a/.github/workflows/auto-release.yaml +++ b/.github/workflows/auto-release.yaml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest if: contains(github.head_ref, 'release-please') steps: - - uses: actions/github-script@v5 + - uses: actions/github-script@v6 with: github-token: ${{secrets.YOSHI_APPROVER_TOKEN}} debug: true diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6b5e56aa..83ef7f9c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -27,8 +27,8 @@ jobs: matrix: java: [8, 11, 17] steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: distribution: zulu java-version: ${{matrix.java}} @@ -39,8 +39,8 @@ jobs: windows: runs-on: windows-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: distribution: zulu java-version: 8 @@ -54,8 +54,8 @@ jobs: matrix: java: [8, 11, 17] steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: distribution: zulu java-version: ${{matrix.java}} @@ -64,8 +64,8 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: distribution: zulu java-version: 11 @@ -76,8 +76,8 @@ jobs: clirr: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: distribution: zulu java-version: 8 diff --git a/.github/workflows/samples.yaml b/.github/workflows/samples.yaml index d5d964df..912ed8b2 100644 --- a/.github/workflows/samples.yaml +++ b/.github/workflows/samples.yaml @@ -20,9 +20,10 @@ jobs: checkstyle: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: + distribution: zulu java-version: 8 - name: Run checkstyle run: mvn -P lint --quiet --batch-mode checkstyle:check diff --git a/.kokoro/build.bat b/.kokoro/build.bat index cc602c9e..067cf4a4 100644 --- a/.kokoro/build.bat +++ b/.kokoro/build.bat @@ -1,18 +1,18 @@ +:: 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. +:: Github action job to test core java library features on +:: downstream client libraries before they are released. :: See documentation in type-shell-output.bat -# 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. -# Github action job to test core java library features on -# downstream client libraries before they are released. "C:\Program Files\Git\bin\bash.exe" %~dp0build.sh diff --git a/.kokoro/nightly/integration.cfg b/.kokoro/nightly/integration.cfg index e51c7b4c..a2907a25 100644 --- a/.kokoro/nightly/integration.cfg +++ b/.kokoro/nightly/integration.cfg @@ -13,12 +13,12 @@ env_vars: { # TODO: remove this after we've migrated all tests and scripts env_vars: { key: "GCLOUD_PROJECT" - value: "gcloud-devel" + value: "java-docs-samples-testing" } env_vars: { key: "GOOGLE_CLOUD_PROJECT" - value: "gcloud-devel" + value: "java-docs-samples-testing" } env_vars: { diff --git a/CHANGELOG.md b/CHANGELOG.md index 9558975a..22c5014b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +### [0.4.2](https://github.com/googleapis/java-dataflow/compare/v0.4.1...v0.4.2) (2022-03-08) + + +### Bug Fixes + +* Use http binding with location field as primary http bindings ([#138](https://github.com/googleapis/java-dataflow/issues/138)) ([4c727e1](https://github.com/googleapis/java-dataflow/commit/4c727e11eedec5bf7cb5a202340b4d43e4afb031)) + + +### Dependencies + +* update actions/checkout action to v3 ([#143](https://github.com/googleapis/java-dataflow/issues/143)) ([e89292c](https://github.com/googleapis/java-dataflow/commit/e89292ce45ed7b8ed0a78db7c0b72ee5ab7dcc91)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.8.0 ([#145](https://github.com/googleapis/java-dataflow/issues/145)) ([ab6b527](https://github.com/googleapis/java-dataflow/commit/ab6b527ae82546cc9f485e25e460c15efee780b4)) + ### [0.4.1](https://github.com/googleapis/java-dataflow/compare/v0.4.0...v0.4.1) (2022-02-11) diff --git a/README.md b/README.md index b9c70d8c..239fff15 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.4.0' +implementation 'com.google.cloud:google-cloud-dataflow:0.4.1' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-dataflow" % "0.4.0" +libraryDependencies += "com.google.cloud" % "google-cloud-dataflow" % "0.4.1" ``` ## Authentication diff --git a/google-cloud-dataflow-bom/pom.xml b/google-cloud-dataflow-bom/pom.xml index fe59cdc2..1ba84017 100644 --- a/google-cloud-dataflow-bom/pom.xml +++ b/google-cloud-dataflow-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-dataflow-bom - 0.4.1 + 0.4.2 pom com.google.cloud @@ -56,17 +56,17 @@ com.google.cloud google-cloud-dataflow - 0.4.1 + 0.4.2 com.google.api.grpc grpc-google-cloud-dataflow-v1beta3 - 0.4.1 + 0.4.2 com.google.api.grpc proto-google-cloud-dataflow-v1beta3 - 0.4.1 + 0.4.2 diff --git a/google-cloud-dataflow/pom.xml b/google-cloud-dataflow/pom.xml index 11255703..ad2748ea 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.4.1 + 0.4.2 jar Google Dataflow https://github.com/googleapis/java-dataflow @@ -11,7 +11,7 @@ com.google.cloud google-cloud-dataflow-parent - 0.4.1 + 0.4.2 google-cloud-dataflow diff --git a/grpc-google-cloud-dataflow-v1beta3/pom.xml b/grpc-google-cloud-dataflow-v1beta3/pom.xml index 030c8542..3ab1fe8c 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.4.1 + 0.4.2 grpc-google-cloud-dataflow-v1beta3 GRPC library for google-cloud-dataflow com.google.cloud google-cloud-dataflow-parent - 0.4.1 + 0.4.2 diff --git a/pom.xml b/pom.xml index ef77aab7..5aa51efd 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-dataflow-parent pom - 0.4.1 + 0.4.2 Google Dataflow Parent https://github.com/googleapis/java-dataflow @@ -69,23 +69,23 @@ com.google.cloud google-cloud-dataflow - 0.4.1 + 0.4.2 com.google.api.grpc grpc-google-cloud-dataflow-v1beta3 - 0.4.1 + 0.4.2 com.google.api.grpc proto-google-cloud-dataflow-v1beta3 - 0.4.1 + 0.4.2 com.google.cloud google-cloud-shared-dependencies - 2.7.0 + 2.8.0 pom import @@ -121,7 +121,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.1.2 + 3.2.2 diff --git a/proto-google-cloud-dataflow-v1beta3/pom.xml b/proto-google-cloud-dataflow-v1beta3/pom.xml index 2ab7b80e..a95bb301 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.4.1 + 0.4.2 proto-google-cloud-dataflow-v1beta3 Proto library for google-cloud-dataflow com.google.cloud google-cloud-dataflow-parent - 0.4.1 + 0.4.2 diff --git a/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/Job.java b/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/Job.java index cb176942..9a4c08e2 100644 --- a/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/Job.java +++ b/proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/Job.java @@ -23,7 +23,6 @@ * *
  * Defines a job to be run by the Cloud Dataflow service.
- * nextID: 26
  * 
* * Protobuf type {@code google.dataflow.v1beta3.Job} @@ -2324,7 +2323,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build * *
    * Defines a job to be run by the Cloud Dataflow service.
-   * nextID: 26
    * 
* * Protobuf type {@code google.dataflow.v1beta3.Job} 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 1553d4fe..0cddae28 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 @@ -327,24 +327,24 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "_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&." + + "\323\344\223\002e\"5/v1b3/projects/{project_id}/locat" + + "ions/{location}/jobs:\003jobZ\'\" /v1b3/proje" + + "cts/{project_id}/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.Job\"s\202\323\344\223\002m\022>/v1" + + "b3/projects/{project_id}/locations/{loca" + + "tion}/jobs/{job_id}Z+\022)/v1b3/projects/{p" + + "roject_id}/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" + + ">/v1b3/projects/{project_id}/locations/{" + + "location}/jobs/{job_id}:\003jobZ0\032)/v1b3/pr" + + "ojects/{project_id}/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" + + "ListJobsResponse\"a\202\323\344\223\002[\0225/v1b3/projects" + + "/{project_id}/locations/{location}/jobsZ" + + "\"\022 /v1b3/projects/{project_id}/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" @@ -354,10 +354,10 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "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" + + "ta3.Snapshot\"\214\001\202\323\344\223\002\205\001\"G/v1b3/projects/{" + + "project_id}/locations/{location}/jobs/{j" + + "ob_id}:snapshot:\001*Z7\"2/v1b3/projects/{pr" + + "oject_id}/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" 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 f1a65642..8f3b002a 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 @@ -104,10 +104,10 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\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" + + "stJobMessagesResponse\"\205\001\202\323\344\223\002\177\022G/v1b3/pr" + + "ojects/{project_id}/locations/{location}" + + "/jobs/{job_id}/messagesZ4\0222/v1b3/project" + + "s/{project_id}/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" 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 bb5f2dc3..454e3de6 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 @@ -164,9 +164,9 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "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}/" + + "\002}\022F/v1b3/projects/{project_id}/location" + + "s/{location}/jobs/{job_id}/metricsZ3\0221/v" + + "1b3/projects/{project_id}/jobs/{job_id}/" + "metrics\022\327\001\n\026GetJobExecutionDetails\0226.goo" + "gle.dataflow.v1beta3.GetJobExecutionDeta" + "ilsRequest\032,.google.dataflow.v1beta3.Job" 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 205928d5..7f696d30 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 @@ -94,24 +94,24 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "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" + + ".dataflow.v1beta3.Snapshot\"\210\001\202\323\344\223\002\201\001\022H/v" + + "1b3/projects/{project_id}/locations/{loc" + + "ation}/snapshots/{snapshot_id}Z5\0223/v1b3/" + + "projects/{project_id}/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" + + "e\"y\202\323\344\223\002s*H/v1b3/projects/{project_id}/l" + + "ocations/{location}/snapshots/{snapshot_" + + "id}Z\'*%/v1b3/projects/{project_id}/snaps" + + "hots\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" + + "\202\323\344\223\002\261\001\022H/v1b3/projects/{project_id}/loc" + + "ations/{location}/jobs/{job_id}/snapshot" + + "sZ<\022:/v1b3/projects/{project_id}/locatio" + + "ns/{location}/snapshotsZ\'\022%/v1b3/project" + + "s/{project_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" 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 9e65bf89..831a9ec5 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 @@ -295,22 +295,22 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\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" + + "ow.v1beta3.Job\"q\202\323\344\223\002k\":/v1b3/projects/{" + + "project_id}/locations/{location}/templat" + + "es:\001*Z*\"%/v1b3/projects/{project_id}/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" + + "ponse\"\240\001\202\323\344\223\002\231\001\"A/v1b3/projects/{project" + + "_id}/locations/{location}/templates:laun" + + "ch:\021launch_parametersZA\",/v1b3/projects/" + + "{project_id}/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" + + "\223\002m\022>/v1b3/projects/{project_id}/locatio" + + "ns/{location}/templates:getZ+\022)/v1b3/pro" + + "jects/{project_id}/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://" 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 17df58bf..3e4b5cfa 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 @@ -51,10 +51,10 @@ service JobsV1Beta3 { // in `us-central1`. rpc CreateJob(CreateJobRequest) returns (Job) { option (google.api.http) = { - post: "/v1b3/projects/{project_id}/jobs" + post: "/v1b3/projects/{project_id}/locations/{location}/jobs" body: "job" additional_bindings { - post: "/v1b3/projects/{project_id}/locations/{location}/jobs" + post: "/v1b3/projects/{project_id}/jobs" body: "job" } }; @@ -69,9 +69,9 @@ service JobsV1Beta3 { // jobs that are running in `us-central1`. rpc GetJob(GetJobRequest) returns (Job) { option (google.api.http) = { - get: "/v1b3/projects/{project_id}/jobs/{job_id}" + get: "/v1b3/projects/{project_id}/locations/{location}/jobs/{job_id}" additional_bindings { - get: "/v1b3/projects/{project_id}/locations/{location}/jobs/{job_id}" + get: "/v1b3/projects/{project_id}/jobs/{job_id}" } }; } @@ -85,10 +85,10 @@ service JobsV1Beta3 { // 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}" + put: "/v1b3/projects/{project_id}/locations/{location}/jobs/{job_id}" body: "job" additional_bindings { - put: "/v1b3/projects/{project_id}/locations/{location}/jobs/{job_id}" + put: "/v1b3/projects/{project_id}/jobs/{job_id}" body: "job" } }; @@ -104,9 +104,9 @@ service JobsV1Beta3 { // jobs that are running in `us-central1`. rpc ListJobs(ListJobsRequest) returns (ListJobsResponse) { option (google.api.http) = { - get: "/v1b3/projects/{project_id}/jobs" + get: "/v1b3/projects/{project_id}/locations/{location}/jobs" additional_bindings { - get: "/v1b3/projects/{project_id}/locations/{location}/jobs" + get: "/v1b3/projects/{project_id}/jobs" } }; } @@ -125,10 +125,10 @@ 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" + post: "/v1b3/projects/{project_id}/locations/{location}/jobs/{job_id}:snapshot" body: "*" additional_bindings { - post: "/v1b3/projects/{project_id}/locations/{location}/jobs/{job_id}:snapshot" + post: "/v1b3/projects/{project_id}/jobs/{job_id}:snapshot" body: "*" } }; @@ -136,7 +136,6 @@ service JobsV1Beta3 { } // Defines a job to be run by the Cloud Dataflow service. -// nextID: 26 message Job { // The unique ID of this job. // 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 a1099a21..f8d151ec 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 @@ -48,9 +48,9 @@ service MessagesV1Beta3 { // 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" + get: "/v1b3/projects/{project_id}/locations/{location}/jobs/{job_id}/messages" additional_bindings { - get: "/v1b3/projects/{project_id}/locations/{location}/jobs/{job_id}/messages" + get: "/v1b3/projects/{project_id}/jobs/{job_id}/messages" } }; } 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 fc2bf521..823eeb7a 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 @@ -48,9 +48,9 @@ service MetricsV1Beta3 { // 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" + get: "/v1b3/projects/{project_id}/locations/{location}/jobs/{job_id}/metrics" additional_bindings { - get: "/v1b3/projects/{project_id}/locations/{location}/jobs/{job_id}/metrics" + get: "/v1b3/projects/{project_id}/jobs/{job_id}/metrics" } }; } 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 0b49b932..0868db8d 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 @@ -41,9 +41,9 @@ service SnapshotsV1Beta3 { // Gets information about a snapshot. rpc GetSnapshot(GetSnapshotRequest) returns (Snapshot) { option (google.api.http) = { - get: "/v1b3/projects/{project_id}/snapshots/{snapshot_id}" + get: "/v1b3/projects/{project_id}/locations/{location}/snapshots/{snapshot_id}" additional_bindings { - get: "/v1b3/projects/{project_id}/locations/{location}/snapshots/{snapshot_id}" + get: "/v1b3/projects/{project_id}/snapshots/{snapshot_id}" } }; } @@ -51,9 +51,9 @@ service SnapshotsV1Beta3 { // Deletes a snapshot. rpc DeleteSnapshot(DeleteSnapshotRequest) returns (DeleteSnapshotResponse) { option (google.api.http) = { - delete: "/v1b3/projects/{project_id}/snapshots" + delete: "/v1b3/projects/{project_id}/locations/{location}/snapshots/{snapshot_id}" additional_bindings { - delete: "/v1b3/projects/{project_id}/locations/{location}/snapshots/{snapshot_id}" + delete: "/v1b3/projects/{project_id}/snapshots" } }; } @@ -61,12 +61,12 @@ service SnapshotsV1Beta3 { // Lists snapshots. rpc ListSnapshots(ListSnapshotsRequest) returns (ListSnapshotsResponse) { option (google.api.http) = { - get: "/v1b3/projects/{project_id}/snapshots" + get: "/v1b3/projects/{project_id}/locations/{location}/jobs/{job_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" + get: "/v1b3/projects/{project_id}/snapshots" } }; } 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 ae6b08b1..064e3a8a 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 @@ -42,10 +42,10 @@ 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" + post: "/v1b3/projects/{project_id}/locations/{location}/templates" body: "*" additional_bindings { - post: "/v1b3/projects/{project_id}/locations/{location}/templates" + post: "/v1b3/projects/{project_id}/templates" body: "*" } }; @@ -54,10 +54,10 @@ service TemplatesService { // Launch a template. rpc LaunchTemplate(LaunchTemplateRequest) returns (LaunchTemplateResponse) { option (google.api.http) = { - post: "/v1b3/projects/{project_id}/templates:launch" + post: "/v1b3/projects/{project_id}/locations/{location}/templates:launch" body: "launch_parameters" additional_bindings { - post: "/v1b3/projects/{project_id}/locations/{location}/templates:launch" + post: "/v1b3/projects/{project_id}/templates:launch" body: "launch_parameters" } }; @@ -66,9 +66,9 @@ service TemplatesService { // Get the template associated with a template. rpc GetTemplate(GetTemplateRequest) returns (GetTemplateResponse) { option (google.api.http) = { - get: "/v1b3/projects/{project_id}/templates:get" + get: "/v1b3/projects/{project_id}/locations/{location}/templates:get" additional_bindings { - get: "/v1b3/projects/{project_id}/locations/{location}/templates:get" + get: "/v1b3/projects/{project_id}/templates:get" } }; } diff --git a/samples/pom.xml b/samples/pom.xml index 1a7e6822..4d3518b2 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -46,7 +46,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.8 + 1.6.11 true diff --git a/versions.txt b/versions.txt index d4e792d3..f4593150 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-dataflow:0.4.1:0.4.1 -grpc-google-cloud-dataflow-v1beta3:0.4.1:0.4.1 -proto-google-cloud-dataflow-v1beta3:0.4.1:0.4.1 +google-cloud-dataflow:0.4.2:0.4.2 +grpc-google-cloud-dataflow-v1beta3:0.4.2:0.4.2 +proto-google-cloud-dataflow-v1beta3:0.4.2:0.4.2