diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml new file mode 100644 index 00000000..b6721276 --- /dev/null +++ b/.github/.OwlBot.lock.yaml @@ -0,0 +1,3 @@ +docker: + image: gcr.io/repo-automation-bots/owlbot-java:latest + digest: sha256:8c50e7bab0ae5ad41ee29420b558542637104500f6256b8fe74282b0cf6144db diff --git a/.github/.OwlBot.yaml b/.github/.OwlBot.yaml new file mode 100644 index 00000000..a6b9bb01 --- /dev/null +++ b/.github/.OwlBot.yaml @@ -0,0 +1,36 @@ +# Copyright 2021 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/repo-automation-bots/owlbot-java:latest" + +deep-remove-regex: +- "/grpc-google-.*/src" +- "/proto-google-.*/src" +- "/google-.*/src" + +deep-preserve-regex: +- "/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java" +- "/google-cloud-tasks/src/test/java/com/google/cloud/tasks/v2beta3/CloudTasksSmokeTest.java" +- "/proto-google-cloud-tasks-v2/src/main/java/com/google/cloud/tasks/v2/ProjectName.java" +- "/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/ProjectName.java" +- "/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/ProjectName.java" + +deep-copy-regex: +- source: "/google/cloud/tasks/(v.*)/.*-java/proto-google-.*/src" + dest: "/owl-bot-staging/$1/proto-google-cloud-tasks-$1/src" +- source: "/google/cloud/tasks/(v.*)/.*-java/grpc-google-.*/src" + dest: "/owl-bot-staging/$1/grpc-google-cloud-tasks-$1/src" +- source: "/google/cloud/tasks/(v.*)/.*-java/gapic-google-.*/src" + dest: "/owl-bot-staging/$1/google-cloud-tasks/src" diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata deleted file mode 100644 index 7cc28a1e..00000000 --- a/.github/readme/synth.metadata/synth.metadata +++ /dev/null @@ -1,18 +0,0 @@ -{ - "sources": [ - { - "git": { - "name": ".", - "remote": "https://github.com/googleapis/java-tasks.git", - "sha": "71af21219d5db0fd500df2a167b71d4179a7068a" - } - }, - { - "git": { - "name": "synthtool", - "remote": "https://github.com/googleapis/synthtool.git", - "sha": "9a238a0623879c3de129a376c6085d4a862f6eb9" - } - } - ] -} \ No newline at end of file diff --git a/.github/readme/synth.py b/.github/readme/synth.py deleted file mode 100644 index 7b48cc28..00000000 --- a/.github/readme/synth.py +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2020 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. - -"""This script is used to synthesize generated the README for this library.""" - -from synthtool.languages import java - -java.custom_templates(["java_library/README.md"]) diff --git a/.github/trusted-contribution.yml b/.github/trusted-contribution.yml index f247d5c7..a0ba1f7d 100644 --- a/.github/trusted-contribution.yml +++ b/.github/trusted-contribution.yml @@ -1,2 +1,3 @@ trustedContributors: -- renovate-bot \ No newline at end of file +- renovate-bot +- gcf-owl-bot[bot] diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d510359d..3becb5c0 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,6 +12,9 @@ jobs: java: [8, 11] steps: - uses: actions/checkout@v2 + - uses: stCarolas/setup-maven@v4 + with: + maven-version: 3.8.1 - uses: actions/setup-java@v1 with: java-version: ${{matrix.java}} @@ -23,6 +26,9 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@v2 + - uses: stCarolas/setup-maven@v4 + with: + maven-version: 3.8.1 - uses: actions/setup-java@v1 with: java-version: 8 @@ -37,6 +43,9 @@ jobs: java: [8, 11] steps: - uses: actions/checkout@v2 + - uses: stCarolas/setup-maven@v4 + with: + maven-version: 3.8.1 - uses: actions/setup-java@v1 with: java-version: ${{matrix.java}} @@ -46,6 +55,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + - uses: stCarolas/setup-maven@v4 + with: + maven-version: 3.8.1 - uses: actions/setup-java@v1 with: java-version: 8 @@ -57,6 +69,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + - uses: stCarolas/setup-maven@v4 + with: + maven-version: 3.8.1 - uses: actions/setup-java@v1 with: java-version: 8 diff --git a/.kokoro/continuous/readme.cfg b/.kokoro/continuous/readme.cfg deleted file mode 100644 index 75ccf8a3..00000000 --- a/.kokoro/continuous/readme.cfg +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 2020 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. - -# Format: //devtools/kokoro/config/proto/build.proto - -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/python-multi" -} - -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/java-tasks/.kokoro/readme.sh" -} - -# Build logs will be here -action { - define_artifacts { - regex: "**/*sponge_log.xml" - regex: "**/*sponge_log.log" - } -} - -# The github token is stored here. -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "yoshi-automation-github-key" - # TODO(theacodes): remove this after secrets have globally propagated - backend_type: FASTCONFIGPUSH - } - } -} - -# Common env vars for all repositories and builds. -env_vars: { - key: "GITHUB_USER" - value: "yoshi-automation" -} -env_vars: { - key: "GITHUB_EMAIL" - value: "yoshi-automation@google.com" -} diff --git a/.kokoro/release/common.sh b/.kokoro/release/common.sh index 6e3f6599..7f78ee41 100755 --- a/.kokoro/release/common.sh +++ b/.kokoro/release/common.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 Google Inc. +# Copyright 2018 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/.kokoro/release/drop.sh b/.kokoro/release/drop.sh index 5c4551ef..742ec1a8 100755 --- a/.kokoro/release/drop.sh +++ b/.kokoro/release/drop.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 Google Inc. +# Copyright 2018 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/.kokoro/release/promote.sh b/.kokoro/release/promote.sh index 1fa95fa5..3cac3d8a 100755 --- a/.kokoro/release/promote.sh +++ b/.kokoro/release/promote.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 Google Inc. +# Copyright 2018 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/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh index c21140d8..a0b05aaf 100755 --- a/.kokoro/release/publish_javadoc.sh +++ b/.kokoro/release/publish_javadoc.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2019 Google Inc. +# Copyright 2019 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/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh index f53aeff5..5f48ae0d 100755 --- a/.kokoro/release/publish_javadoc11.sh +++ b/.kokoro/release/publish_javadoc11.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2021 Google Inc. +# Copyright 2021 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/.kokoro/release/stage.sh b/.kokoro/release/stage.sh index 8a103384..77dc4e8f 100755 --- a/.kokoro/release/stage.sh +++ b/.kokoro/release/stage.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 Google Inc. +# Copyright 2018 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/.kokoro/trampoline.sh b/.kokoro/trampoline.sh index 9da0f839..8b69b793 100644 --- a/.kokoro/trampoline.sh +++ b/.kokoro/trampoline.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 Google Inc. +# Copyright 2018 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/CHANGELOG.md b/CHANGELOG.md index 31ee9982..b368ecf5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [2.0.4](https://www.github.com/googleapis/java-tasks/compare/v2.0.3...v2.0.4) (2021-09-14) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.2.1 ([#524](https://www.github.com/googleapis/java-tasks/issues/524)) ([726e44d](https://www.github.com/googleapis/java-tasks/commit/726e44dea45842e7de25155b21555c9a029c8ab8)) + ### [2.0.3](https://www.github.com/googleapis/java-tasks/compare/v2.0.2...v2.0.3) (2021-09-01) diff --git a/README.md b/README.md index 81b1c8f5..5a39bed4 100644 --- a/README.md +++ b/README.md @@ -19,20 +19,20 @@ If you are using Maven, add this to your pom.xml file: com.google.cloud google-cloud-tasks - 2.0.2 + 2.0.3 ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -implementation 'com.google.cloud:google-cloud-tasks:2.0.2' +implementation 'com.google.cloud:google-cloud-tasks:2.0.3' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-tasks" % "2.0.2" +libraryDependencies += "com.google.cloud" % "google-cloud-tasks" % "2.0.3" ``` ## Authentication diff --git a/google-cloud-tasks-bom/pom.xml b/google-cloud-tasks-bom/pom.xml index 8b1d68a9..a864b20f 100644 --- a/google-cloud-tasks-bom/pom.xml +++ b/google-cloud-tasks-bom/pom.xml @@ -1,14 +1,14 @@ - + 4.0.0 com.google.cloud google-cloud-tasks-bom - 2.0.3 + 2.0.4 pom com.google.cloud google-cloud-shared-config - 1.0.1 + 1.0.2 Google Cloud tasks BOM @@ -49,41 +49,40 @@ - - com.google.api.grpc - proto-google-cloud-tasks-v2beta3 - 0.90.3 + com.google.cloud + google-cloud-tasks + 2.0.4 com.google.api.grpc - proto-google-cloud-tasks-v2beta2 - 0.90.3 + grpc-google-cloud-tasks-v2beta3 + 0.90.4 com.google.api.grpc - grpc-google-cloud-tasks-v2beta3 - 0.90.3 + grpc-google-cloud-tasks-v2beta2 + 0.90.4 com.google.api.grpc - proto-google-cloud-tasks-v2 - 2.0.3 + grpc-google-cloud-tasks-v2 + 2.0.4 com.google.api.grpc - grpc-google-cloud-tasks-v2beta2 - 0.90.3 + proto-google-cloud-tasks-v2beta3 + 0.90.4 com.google.api.grpc - grpc-google-cloud-tasks-v2 - 2.0.3 + proto-google-cloud-tasks-v2beta2 + 0.90.4 - com.google.cloud - google-cloud-tasks - 2.0.3 + com.google.api.grpc + proto-google-cloud-tasks-v2 + 2.0.4 @@ -99,4 +98,4 @@ - \ No newline at end of file + diff --git a/google-cloud-tasks/pom.xml b/google-cloud-tasks/pom.xml index 360cd541..43df518e 100644 --- a/google-cloud-tasks/pom.xml +++ b/google-cloud-tasks/pom.xml @@ -1,9 +1,9 @@ - + 4.0.0 com.google.cloud google-cloud-tasks - 2.0.3 + 2.0.4 jar Google Cloud Tasks https://github.com/googleapis/java-tasks @@ -11,7 +11,7 @@ com.google.cloud google-cloud-tasks-parent - 2.0.3 + 2.0.4 google-cloud-tasks @@ -133,4 +133,4 @@ - \ No newline at end of file + diff --git a/grpc-google-cloud-tasks-v2/pom.xml b/grpc-google-cloud-tasks-v2/pom.xml index 1e49557d..2d14bc1d 100644 --- a/grpc-google-cloud-tasks-v2/pom.xml +++ b/grpc-google-cloud-tasks-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-tasks-v2 - 2.0.3 + 2.0.4 grpc-google-cloud-tasks-v2 GRPC library for grpc-google-cloud-tasks-v2 com.google.cloud google-cloud-tasks-parent - 2.0.3 + 2.0.4 diff --git a/grpc-google-cloud-tasks-v2beta2/pom.xml b/grpc-google-cloud-tasks-v2beta2/pom.xml index 84511560..fcc67d23 100644 --- a/grpc-google-cloud-tasks-v2beta2/pom.xml +++ b/grpc-google-cloud-tasks-v2beta2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-tasks-v2beta2 - 0.90.3 + 0.90.4 grpc-google-cloud-tasks-v2beta2 GRPC library for grpc-google-cloud-tasks-v2beta2 com.google.cloud google-cloud-tasks-parent - 2.0.3 + 2.0.4 diff --git a/grpc-google-cloud-tasks-v2beta3/pom.xml b/grpc-google-cloud-tasks-v2beta3/pom.xml index 0bb6a129..140a5412 100644 --- a/grpc-google-cloud-tasks-v2beta3/pom.xml +++ b/grpc-google-cloud-tasks-v2beta3/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-tasks-v2beta3 - 0.90.3 + 0.90.4 grpc-google-cloud-tasks-v2beta3 GRPC library for grpc-google-cloud-tasks-v2beta3 com.google.cloud google-cloud-tasks-parent - 2.0.3 + 2.0.4 diff --git a/owlbot.py b/owlbot.py new file mode 100644 index 00000000..4e0144e4 --- /dev/null +++ b/owlbot.py @@ -0,0 +1,63 @@ +# Copyright 2021 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 +# +# https://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. + +import synthtool as s +from synthtool.languages import java + + +GET_IAM_POLICY = """ + public final Policy getIamPolicy(QueueName queueName) { + return getIamPolicy((ResourceName) queueName); + } +""" +GET_IAM_POLICY_PREVIOUS = r'(\s+public final Policy getIamPolicy\(GetIamPolicyRequest request\) {\n\s+return .*\n\s+})' + +SET_IAM_POLICY = """ + public final Policy setIamPolicy(QueueName queue, Policy policy) { + return setIamPolicy((ResourceName) queue, policy); + } +""" +SET_IAM_POLICY_PREVIOUS = r'(\s+public final Policy setIamPolicy\(SetIamPolicyRequest request\) {\n\s+return .*\n\s+})' + +TEST_IAM_POLICY = """ + public final TestIamPermissionsResponse testIamPermissions( + QueueName queue, List permissions) { + return testIamPermissions((ResourceName) queue, permissions); + } +""" +TEST_IAM_POLICY_PREVIOUS = r'(\spublic final TestIamPermissionsResponse testIamPermissions\(TestIamPermissionsRequest request\) {\n\s+return .*\n\s+})' + +for library in s.get_staging_dirs(): + # put any special-case replacements here + version = library.parts[len(library.parts) - 1] + service = 'tasks' + s.replace( + f'owl-bot-staging/{version}/google-cloud-{service}/src/main/java/com/google/cloud/tasks/{version}/CloudTasksClient.java', + GET_IAM_POLICY_PREVIOUS, + "\g<1>\n\n" + GET_IAM_POLICY + ) + s.replace( + f'owl-bot-staging/{version}/google-cloud-{service}/src/main/java/com/google/cloud/tasks/{version}/CloudTasksClient.java', + SET_IAM_POLICY_PREVIOUS, + "\g<1>\n\n" + SET_IAM_POLICY + ) + s.replace( + f'owl-bot-staging/{version}/google-cloud-{service}/src/main/java/com/google/cloud/tasks/{version}/CloudTasksClient.java', + TEST_IAM_POLICY_PREVIOUS, + "\g<1>\n\n" + TEST_IAM_POLICY + ) + s.move(library) + +s.remove_staging_dirs() +java.common_templates(excludes=[".kokoro/build.sh"]) diff --git a/pom.xml b/pom.xml index 4218972f..13e08b1b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-tasks-parent pom - 2.0.3 + 2.0.4 Google Cloud Tasks Parent https://github.com/googleapis/java-tasks @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.0.1 + 1.0.2 @@ -61,43 +61,43 @@ com.google.api.grpc proto-google-cloud-tasks-v2beta3 - 0.90.3 + 0.90.4 com.google.api.grpc proto-google-cloud-tasks-v2beta2 - 0.90.3 + 0.90.4 com.google.api.grpc proto-google-cloud-tasks-v2 - 2.0.3 + 2.0.4 com.google.api.grpc grpc-google-cloud-tasks-v2beta3 - 0.90.3 + 0.90.4 com.google.api.grpc grpc-google-cloud-tasks-v2beta2 - 0.90.3 + 0.90.4 com.google.api.grpc grpc-google-cloud-tasks-v2 - 2.0.3 + 2.0.4 com.google.cloud google-cloud-tasks - 2.0.3 + 2.0.4 com.google.cloud google-cloud-shared-dependencies - 2.2.0 + 2.2.1 pom import @@ -129,14 +129,14 @@ - proto-google-cloud-tasks-v2beta3 - proto-google-cloud-tasks-v2beta2 - proto-google-cloud-tasks-v2 + google-cloud-tasks grpc-google-cloud-tasks-v2beta3 grpc-google-cloud-tasks-v2beta2 grpc-google-cloud-tasks-v2 - google-cloud-tasks - google-cloud-tasks-bom + proto-google-cloud-tasks-v2beta3 + proto-google-cloud-tasks-v2beta2 + proto-google-cloud-tasks-v2 + google-cloud-tasks-bom @@ -208,4 +208,4 @@ - \ No newline at end of file + diff --git a/proto-google-cloud-tasks-v2/pom.xml b/proto-google-cloud-tasks-v2/pom.xml index 3968d288..4b206d05 100644 --- a/proto-google-cloud-tasks-v2/pom.xml +++ b/proto-google-cloud-tasks-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-tasks-v2 - 2.0.3 + 2.0.4 proto-google-cloud-tasks-v2 PROTO library for proto-google-cloud-tasks-v2 com.google.cloud google-cloud-tasks-parent - 2.0.3 + 2.0.4 diff --git a/proto-google-cloud-tasks-v2beta2/pom.xml b/proto-google-cloud-tasks-v2beta2/pom.xml index 124d712e..d98ed40b 100644 --- a/proto-google-cloud-tasks-v2beta2/pom.xml +++ b/proto-google-cloud-tasks-v2beta2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-tasks-v2beta2 - 0.90.3 + 0.90.4 proto-google-cloud-tasks-v2beta2 PROTO library for proto-google-cloud-tasks-v2beta2 com.google.cloud google-cloud-tasks-parent - 2.0.3 + 2.0.4 diff --git a/proto-google-cloud-tasks-v2beta3/pom.xml b/proto-google-cloud-tasks-v2beta3/pom.xml index 10e027db..f1834e9d 100644 --- a/proto-google-cloud-tasks-v2beta3/pom.xml +++ b/proto-google-cloud-tasks-v2beta3/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-tasks-v2beta3 - 0.90.3 + 0.90.4 proto-google-cloud-tasks-v2beta3 PROTO library for proto-google-cloud-tasks-v2beta3 com.google.cloud google-cloud-tasks-parent - 2.0.3 + 2.0.4 diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 6c533716..f6f45fc7 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-tasks - 2.0.2 + 2.0.3 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index f8ec79de..88962d4a 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-tasks - 2.0.2 + 2.0.3 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index a5962228..5f197257 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 22.0.0 + 23.0.0 pom import diff --git a/samples/snippets/src/main/java/com/example/task/CreateHttpTaskWithToken.java b/samples/snippets/src/main/java/com/example/task/CreateHttpTaskWithToken.java index a341f680..91cd8c22 100644 --- a/samples/snippets/src/main/java/com/example/task/CreateHttpTaskWithToken.java +++ b/samples/snippets/src/main/java/com/example/task/CreateHttpTaskWithToken.java @@ -34,7 +34,7 @@ public static void main(String[] args) throws IOException { String projectId = "my-project-id"; String locationId = "us-central1"; String queueId = "my-queue"; - String serviceAccountEmail = + String serviceAccountEmail = "java-docs-samples-testing@java-docs-samples-testing.iam.gserviceaccount.com"; createTask(projectId, locationId, queueId, serviceAccountEmail); } diff --git a/samples/snippets/src/main/java/com/example/task/ListQueues.java b/samples/snippets/src/main/java/com/example/task/ListQueues.java index 85fd8c14..2405eeca 100644 --- a/samples/snippets/src/main/java/com/example/task/ListQueues.java +++ b/samples/snippets/src/main/java/com/example/task/ListQueues.java @@ -30,8 +30,7 @@ public static void main(String[] args) throws IOException { } // List queues using the Cloud Tasks client. - public static void listQueues(String projectId, String locationId) - throws IOException { + public static void listQueues(String projectId, String locationId) throws IOException { // Instantiates a client. try (CloudTasksClient client = CloudTasksClient.create()) { diff --git a/samples/snippets/src/test/java/com/example/task/DeleteQueueIT.java b/samples/snippets/src/test/java/com/example/task/DeleteQueueIT.java index 90c3f74b..3bf3ad63 100644 --- a/samples/snippets/src/test/java/com/example/task/DeleteQueueIT.java +++ b/samples/snippets/src/test/java/com/example/task/DeleteQueueIT.java @@ -61,7 +61,7 @@ public void setUp() { bout = new ByteArrayOutputStream(); out = new PrintStream(bout); System.setOut(out); - + try (CloudTasksClient client = CloudTasksClient.create()) { String parent = LocationName.of(PROJECT_ID, LOCATION_ID).toString(); String queuePath = QueueName.of(PROJECT_ID, LOCATION_ID, QUEUE_ID).toString(); diff --git a/samples/snippets/src/test/java/com/example/task/ListQueuesIT.java b/samples/snippets/src/test/java/com/example/task/ListQueuesIT.java index 11e68b8e..287a83ec 100644 --- a/samples/snippets/src/test/java/com/example/task/ListQueuesIT.java +++ b/samples/snippets/src/test/java/com/example/task/ListQueuesIT.java @@ -17,7 +17,6 @@ import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertNotNull; -import com.google.api.gax.rpc.NotFoundException; import com.google.cloud.tasks.v2.CloudTasksClient; import com.google.cloud.tasks.v2.LocationName; import com.google.cloud.tasks.v2.Queue; @@ -61,7 +60,7 @@ public void setUp() { bout = new ByteArrayOutputStream(); out = new PrintStream(bout); System.setOut(out); - + try (CloudTasksClient client = CloudTasksClient.create()) { String parent = LocationName.of(PROJECT_ID, LOCATION_ID).toString(); String queuePath = QueueName.of(PROJECT_ID, LOCATION_ID, QUEUE_ID).toString(); diff --git a/synth.metadata b/synth.metadata index 43c06f38..36fc3f94 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-tasks.git", - "sha": "14bbd43eb57050e51e479a3b0f737c97eb0085c0" + "sha": "92797a8ff7f51115ad333eb6e25b7d0caeb4e3cc" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "9a238a0623879c3de129a376c6085d4a862f6eb9" + "sha": "ad7fd76e17bf9494a3e47ff9cf445f61564432e0" } } ], diff --git a/synth.py b/synth.py deleted file mode 100644 index c46edd15..00000000 --- a/synth.py +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 2018 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. - -"""This script is used to synthesize generated parts of this library.""" - -import synthtool as s -import synthtool.gcp as gcp -import synthtool.languages.java as java - -AUTOSYNTH_MULTIPLE_COMMITS = True - -gapic = gcp.GAPICBazel() - -service = 'tasks' -versions = ['v2beta2', 'v2beta3', 'v2'] -config_pattern = '/google/cloud/tasks/artman_cloudtasks_{version}.yaml' - -GET_IAM_POLICY = """ - public final Policy getIamPolicy(QueueName queueName) { - return getIamPolicy((ResourceName) queueName); - } -""" -GET_IAM_POLICY_PREVIOUS = r'(\s+public final Policy getIamPolicy\(GetIamPolicyRequest request\) {\n\s+return .*\n\s+})' - -SET_IAM_POLICY = """ - public final Policy setIamPolicy(QueueName queue, Policy policy) { - return setIamPolicy((ResourceName) queue, policy); - } -""" -SET_IAM_POLICY_PREVIOUS = r'(\s+public final Policy setIamPolicy\(SetIamPolicyRequest request\) {\n\s+return .*\n\s+})' - -TEST_IAM_POLICY = """ - public final TestIamPermissionsResponse testIamPermissions( - QueueName queue, List permissions) { - return testIamPermissions((ResourceName) queue, permissions); - } -""" -TEST_IAM_POLICY_PREVIOUS = r'(\spublic final TestIamPermissionsResponse testIamPermissions\(TestIamPermissionsRequest request\) {\n\s+return .*\n\s+})' - -for version in versions: - library = gapic.java_library( - service=service, - version=version, - bazel_target=f'//google/cloud/{service}/{version}:google-cloud-{service}-{version}-java', - ) - - library = library / f"google-cloud-{service}-{version}-java" - - package_name = f'com.google.cloud.{service}.{version}' - java.fix_proto_headers(library / f'proto-google-cloud-{service}-{version}-java') - java.fix_grpc_headers(library / f'grpc-google-cloud-{service}-{version}-java', package_name) - - s.replace( - library / f'gapic-google-cloud-{service}-{version}-java/src/**/CloudTasksClient.java', - GET_IAM_POLICY_PREVIOUS, - "\g<1>\n\n" + GET_IAM_POLICY - ) - s.replace( - library / f'gapic-google-cloud-{service}-{version}-java/src/**/CloudTasksClient.java', - SET_IAM_POLICY_PREVIOUS, - "\g<1>\n\n" + SET_IAM_POLICY - ) - s.replace( - library / f'gapic-google-cloud-{service}-{version}-java/src/**/CloudTasksClient.java', - TEST_IAM_POLICY_PREVIOUS, - "\g<1>\n\n" + TEST_IAM_POLICY - ) - - s.copy(library / f'gapic-google-cloud-{service}-{version}-java/src', f'google-cloud-{service}/src') - s.copy(library / f'grpc-google-cloud-{service}-{version}-java/src', f'grpc-google-cloud-{service}-{version}/src') - s.copy(library / f'proto-google-cloud-{service}-{version}-java/src', f'proto-google-cloud-{service}-{version}/src') - - java.format_code(f'google-cloud-{service}/src') - java.format_code(f'grpc-google-cloud-{service}-{version}/src') - java.format_code(f'proto-google-cloud-{service}-{version}/src') - -java.common_templates(excludes=[ - '.kokoro/build.sh', -]) diff --git a/versions.txt b/versions.txt index 445dec74..88a22fa3 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -proto-google-cloud-tasks-v2beta3:0.90.3:0.90.3 -proto-google-cloud-tasks-v2beta2:0.90.3:0.90.3 -proto-google-cloud-tasks-v2:2.0.3:2.0.3 -grpc-google-cloud-tasks-v2beta3:0.90.3:0.90.3 -grpc-google-cloud-tasks-v2beta2:0.90.3:0.90.3 -grpc-google-cloud-tasks-v2:2.0.3:2.0.3 -google-cloud-tasks:2.0.3:2.0.3 \ No newline at end of file +google-cloud-tasks:2.0.4:2.0.4 +grpc-google-cloud-tasks-v2beta3:0.90.4:0.90.4 +grpc-google-cloud-tasks-v2beta2:0.90.4:0.90.4 +grpc-google-cloud-tasks-v2:2.0.4:2.0.4 +proto-google-cloud-tasks-v2beta3:0.90.4:0.90.4 +proto-google-cloud-tasks-v2beta2:0.90.4:0.90.4 +proto-google-cloud-tasks-v2:2.0.4:2.0.4