From b547b7a1a363c923c833c94186aef419e814105d Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 2 Feb 2022 05:06:58 +0000 Subject: [PATCH 01/12] chore(main): release 2.3.3-SNAPSHOT (#669) :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-container-bom/pom.xml | 12 ++++++------ google-cloud-container/pom.xml | 4 ++-- grpc-google-cloud-container-v1/pom.xml | 4 ++-- grpc-google-cloud-container-v1beta1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-container-v1/pom.xml | 4 ++-- proto-google-cloud-container-v1beta1/pom.xml | 4 ++-- versions.txt | 10 +++++----- 8 files changed, 27 insertions(+), 27 deletions(-) diff --git a/google-cloud-container-bom/pom.xml b/google-cloud-container-bom/pom.xml index 83fb590f..43316051 100644 --- a/google-cloud-container-bom/pom.xml +++ b/google-cloud-container-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-container-bom - 2.3.2 + 2.3.3-SNAPSHOT pom com.google.cloud @@ -52,27 +52,27 @@ com.google.cloud google-cloud-container - 2.3.2 + 2.3.3-SNAPSHOT com.google.api.grpc grpc-google-cloud-container-v1 - 2.3.2 + 2.3.3-SNAPSHOT com.google.api.grpc grpc-google-cloud-container-v1beta1 - 2.3.2 + 2.3.3-SNAPSHOT com.google.api.grpc proto-google-cloud-container-v1 - 2.3.2 + 2.3.3-SNAPSHOT com.google.api.grpc proto-google-cloud-container-v1beta1 - 2.3.2 + 2.3.3-SNAPSHOT diff --git a/google-cloud-container/pom.xml b/google-cloud-container/pom.xml index 8e3896d3..44513235 100644 --- a/google-cloud-container/pom.xml +++ b/google-cloud-container/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-container - 2.3.2 + 2.3.3-SNAPSHOT jar Google Cloud Container https://github.com/googleapis/java-container @@ -11,7 +11,7 @@ com.google.cloud google-cloud-container-parent - 2.3.2 + 2.3.3-SNAPSHOT google-cloud-container diff --git a/grpc-google-cloud-container-v1/pom.xml b/grpc-google-cloud-container-v1/pom.xml index 8b58ed5d..45c3deb6 100644 --- a/grpc-google-cloud-container-v1/pom.xml +++ b/grpc-google-cloud-container-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-container-v1 - 2.3.2 + 2.3.3-SNAPSHOT grpc-google-cloud-container-v1 GRPC library for grpc-google-cloud-container-v1 com.google.cloud google-cloud-container-parent - 2.3.2 + 2.3.3-SNAPSHOT diff --git a/grpc-google-cloud-container-v1beta1/pom.xml b/grpc-google-cloud-container-v1beta1/pom.xml index a97ad51d..eb3648b6 100644 --- a/grpc-google-cloud-container-v1beta1/pom.xml +++ b/grpc-google-cloud-container-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-container-v1beta1 - 2.3.2 + 2.3.3-SNAPSHOT grpc-google-cloud-container-v1beta1 GRPC library for google-cloud-container com.google.cloud google-cloud-container-parent - 2.3.2 + 2.3.3-SNAPSHOT diff --git a/pom.xml b/pom.xml index 0167fef5..3b2de648 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-container-parent pom - 2.3.2 + 2.3.3-SNAPSHOT Google Cloud Container Parent https://github.com/googleapis/java-container @@ -61,27 +61,27 @@ com.google.api.grpc proto-google-cloud-container-v1 - 2.3.2 + 2.3.3-SNAPSHOT com.google.api.grpc proto-google-cloud-container-v1beta1 - 2.3.2 + 2.3.3-SNAPSHOT com.google.api.grpc grpc-google-cloud-container-v1beta1 - 2.3.2 + 2.3.3-SNAPSHOT com.google.api.grpc grpc-google-cloud-container-v1 - 2.3.2 + 2.3.3-SNAPSHOT com.google.cloud google-cloud-container - 2.3.2 + 2.3.3-SNAPSHOT diff --git a/proto-google-cloud-container-v1/pom.xml b/proto-google-cloud-container-v1/pom.xml index fbbfecfa..ce9b76fe 100644 --- a/proto-google-cloud-container-v1/pom.xml +++ b/proto-google-cloud-container-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-container-v1 - 2.3.2 + 2.3.3-SNAPSHOT proto-google-cloud-container-v1 PROTO library for proto-google-cloud-container-v1 com.google.cloud google-cloud-container-parent - 2.3.2 + 2.3.3-SNAPSHOT diff --git a/proto-google-cloud-container-v1beta1/pom.xml b/proto-google-cloud-container-v1beta1/pom.xml index 5674b664..e98b9b3f 100644 --- a/proto-google-cloud-container-v1beta1/pom.xml +++ b/proto-google-cloud-container-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-container-v1beta1 - 2.3.2 + 2.3.3-SNAPSHOT proto-google-cloud-container-v1beta1 Proto library for google-cloud-container com.google.cloud google-cloud-container-parent - 2.3.2 + 2.3.3-SNAPSHOT diff --git a/versions.txt b/versions.txt index 6157f770..fe8f57c9 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -google-cloud-container:2.3.2:2.3.2 -grpc-google-cloud-container-v1:2.3.2:2.3.2 -grpc-google-cloud-container-v1beta1:2.3.2:2.3.2 -proto-google-cloud-container-v1:2.3.2:2.3.2 -proto-google-cloud-container-v1beta1:2.3.2:2.3.2 +google-cloud-container:2.3.2:2.3.3-SNAPSHOT +grpc-google-cloud-container-v1:2.3.2:2.3.3-SNAPSHOT +grpc-google-cloud-container-v1beta1:2.3.2:2.3.3-SNAPSHOT +proto-google-cloud-container-v1:2.3.2:2.3.3-SNAPSHOT +proto-google-cloud-container-v1beta1:2.3.2:2.3.3-SNAPSHOT From 7435ea29df47a2fae5292a74d45c19019aa28fc4 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 2 Feb 2022 21:36:45 +0100 Subject: [PATCH 02/12] chore(deps): update dependency com.google.cloud:google-cloud-container to v2.3.2 (#670) 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-container](https://togithub.com/googleapis/java-container) | `2.3.1` -> `2.3.2` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-container/2.3.2/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-container/2.3.2/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-container/2.3.2/compatibility-slim/2.3.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-container/2.3.2/confidence-slim/2.3.1)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-container ### [`v2.3.2`](https://togithub.com/googleapis/java-container/blob/HEAD/CHANGELOG.md#​232-httpsgithubcomgoogleapisjava-containercomparev231v232-2022-02-01) [Compare Source](https://togithub.com/googleapis/java-container/compare/v2.3.1...v2.3.2)
--- ### 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-container). --- README.md | 6 +++--- samples/install-without-bom/pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index c80467de..ea9d45af 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-container - 2.3.1 + 2.3.2 ``` @@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-container' If you are using Gradle without BOM, add this to your dependencies ```Groovy -implementation 'com.google.cloud:google-cloud-container:2.3.1' +implementation 'com.google.cloud:google-cloud-container:2.3.2' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-container" % "2.3.1" +libraryDependencies += "com.google.cloud" % "google-cloud-container" % "2.3.2" ``` ## Authentication diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 4db26867..1a026b97 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-container - 2.3.1 + 2.3.2 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index ea09b694..425a56fe 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-container - 2.3.1 + 2.3.2 From a595e0967e32236b4e6ed0ec6f241bc6ff20a33b 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:56:43 +0000 Subject: [PATCH 03/12] chore: add kokoro config to run nightly integration test on java11.0.14 (#1347) (#671) --- .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 338e0fcf098a7632ef36d3a2fd6d7c7bf3e94b05 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 7 Feb 2022 22:10:37 +0000 Subject: [PATCH 04/12] chore: enable auto release in java (#1349) (#674) * chore: fix auto-release * chore: remove codecov.yml * chore: update license headers for yaml files Source-Link: https://github.com/googleapis/synthtool/commit/5b777277a01a93e7f10c9279521e807b934e78d4 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:ebc2104854c5b81c6fd72ca79400a2e20e0d510c5e0654fd1a19e5c9be160ca6 --- .github/.OwlBot.lock.yaml | 2 +- .github/workflows/approve-readme.yaml | 15 +++++++++++++++ .github/workflows/auto-release.yaml | 19 +++++++++++++++++-- .github/workflows/ci.yaml | 15 +++++++++++++++ .github/workflows/samples.yaml | 15 +++++++++++++++ .kokoro/build.bat | 15 +++++++++++++++ 6 files changed, 78 insertions(+), 3 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 8807efca..a8ddd81a 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:7c853edc4136ae8f19f9d46d4569d38de2e446db2eea057f32e412bdba255846 + digest: sha256:ebc2104854c5b81c6fd72ca79400a2e20e0d510c5e0654fd1a19e5c9be160ca6 diff --git a/.github/workflows/approve-readme.yaml b/.github/workflows/approve-readme.yaml index c5132427..1bb18232 100644 --- a/.github/workflows/approve-readme.yaml +++ b/.github/workflows/approve-readme.yaml @@ -1,3 +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. on: pull_request: name: auto-merge-readme diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml index 59c7cadd..2ba3082b 100644 --- a/.github/workflows/auto-release.yaml +++ b/.github/workflows/auto-release.yaml @@ -1,3 +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. on: pull_request: name: auto-release @@ -16,8 +31,8 @@ jobs: return; } - // only approve PRs like "chore: release " - if ( !context.payload.pull_request.title.startsWith("chore: release") ) { + // only approve PRs like "chore(main): release " + if ( !context.payload.pull_request.title.startsWith("chore(main): release") ) { return; } diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 05de1f60..6b5e56aa 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,3 +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. on: push: branches: diff --git a/.github/workflows/samples.yaml b/.github/workflows/samples.yaml index c46230a7..d5d964df 100644 --- a/.github/workflows/samples.yaml +++ b/.github/workflows/samples.yaml @@ -1,3 +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. on: pull_request: name: samples diff --git a/.kokoro/build.bat b/.kokoro/build.bat index 05826ad9..cc602c9e 100644 --- a/.kokoro/build.bat +++ b/.kokoro/build.bat @@ -1,3 +1,18 @@ :: 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 From e11fec8261dd866ebd04599af526aa6362b9fdb0 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 8 Feb 2022 00:28:03 +0100 Subject: [PATCH 05/12] build(deps): update dependency org.apache.maven.plugins:maven-project-info-reports-plugin to v3.2.1 (#672) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3b2de648..824a900b 100644 --- a/pom.xml +++ b/pom.xml @@ -132,7 +132,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.1.2 + 3.2.1 From 83dec914c0d9fc9b6c3dd56c8f701391d5b1344f Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 8 Feb 2022 00:58:39 +0000 Subject: [PATCH 06/12] chore: update auto-release script to fix breaking changes in v5 (#1350) (#676) Source-Link: https://github.com/googleapis/synthtool/commit/53a58c23eb4decb3a17fab07388d42799e158b5f Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:3c950ed12391ebaffd1ee66d0374766a1c50144ebe6a7a0042300b2e6bb5856b --- .github/.OwlBot.lock.yaml | 2 +- .github/workflows/auto-release.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index a8ddd81a..9786771c 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:ebc2104854c5b81c6fd72ca79400a2e20e0d510c5e0654fd1a19e5c9be160ca6 + digest: sha256:3c950ed12391ebaffd1ee66d0374766a1c50144ebe6a7a0042300b2e6bb5856b diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml index 2ba3082b..18e23230 100644 --- a/.github/workflows/auto-release.yaml +++ b/.github/workflows/auto-release.yaml @@ -37,7 +37,7 @@ jobs: } // only approve PRs with pom.xml and versions.txt changes - const filesPromise = github.pulls.listFiles.endpoint({ + const filesPromise = github.rest.pulls.listFiles.endpoint({ owner: context.repo.owner, repo: context.repo.repo, pull_number: context.payload.pull_request.number, @@ -69,7 +69,7 @@ jobs: return; } - const promise = github.pulls.list.endpoint({ + const promise = github.rest.pulls.list.endpoint({ owner: context.repo.owner, repo: context.repo.repo, state: 'open' @@ -86,7 +86,7 @@ jobs: } // approve release PR - await github.pulls.createReview({ + await github.rest.pulls.createReview({ owner: context.repo.owner, repo: context.repo.repo, body: 'Rubber stamped release!', @@ -95,7 +95,7 @@ jobs: }); // attach kokoro:force-run and automerge labels - await github.issues.addLabels({ + await github.rest.issues.addLabels({ owner: context.repo.owner, repo: context.repo.repo, issue_number: context.payload.pull_request.number, From 2a700e53bc52008339189a9449056e5d257e66cf Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 8 Feb 2022 15:07:29 +0100 Subject: [PATCH 07/12] build(deps): update dependency com.google.cloud:google-cloud-shared-config to v1.2.7 (#677) --- google-cloud-container-bom/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/google-cloud-container-bom/pom.xml b/google-cloud-container-bom/pom.xml index 43316051..8932a4d8 100644 --- a/google-cloud-container-bom/pom.xml +++ b/google-cloud-container-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud google-cloud-shared-config - 1.2.6 + 1.2.7 Google Cloud container BOM diff --git a/pom.xml b/pom.xml index 824a900b..f0d9f912 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.2.6 + 1.2.7 From 68457d7f34c5c6b64d0a636411537cd0831be3cb Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 8 Feb 2022 22:39:50 +0100 Subject: [PATCH 08/12] chore(deps): update dependency com.google.cloud:libraries-bom to v24.3.0 (#678) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(deps): update dependency com.google.cloud:libraries-bom to v24.3.0 * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot --- README.md | 4 ++-- samples/snippets/pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ea9d45af..a051efe2 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file com.google.cloud libraries-bom - 24.2.0 + 24.3.0 pom import @@ -49,7 +49,7 @@ If you are using Maven without BOM, add this to your dependencies: If you are using Gradle 5.x or later, add this to your dependencies ```Groovy -implementation platform('com.google.cloud:libraries-bom:24.2.0') +implementation platform('com.google.cloud:libraries-bom:24.3.0') implementation 'com.google.cloud:google-cloud-container' ``` diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 7064c3df..3114bcc6 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 24.2.0 + 24.3.0 pom import From 6c35fd1f75525a9587e5f4d33386940c4d0fb970 Mon Sep 17 00:00:00 2001 From: Christine Kim <35876108+ckim328@users.noreply.github.com> Date: Fri, 11 Feb 2022 12:23:43 -0500 Subject: [PATCH 09/12] cleanup: update test beforeAll (#675) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Created Util to delete old clusters * changed method to private * Remove white space * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot --- .../cloud/container/v1/it/ITSystemTest.java | 1 + .../google/cloud/container/v1/it/Util.java | 53 +++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 google-cloud-container/src/test/java/com/google/cloud/container/v1/it/Util.java diff --git a/google-cloud-container/src/test/java/com/google/cloud/container/v1/it/ITSystemTest.java b/google-cloud-container/src/test/java/com/google/cloud/container/v1/it/ITSystemTest.java index 84e1a8ab..ec3a71cb 100644 --- a/google-cloud-container/src/test/java/com/google/cloud/container/v1/it/ITSystemTest.java +++ b/google-cloud-container/src/test/java/com/google/cloud/container/v1/it/ITSystemTest.java @@ -61,6 +61,7 @@ public class ITSystemTest { @BeforeClass public static void beforeClass() throws Exception { client = ClusterManagerClient.create(); + Util.cleanUpExistingInstanceCluster(PROJECT_ID, ZONE, client); /** create node pool* */ NodePool nodePool = diff --git a/google-cloud-container/src/test/java/com/google/cloud/container/v1/it/Util.java b/google-cloud-container/src/test/java/com/google/cloud/container/v1/it/Util.java new file mode 100644 index 00000000..426bd42f --- /dev/null +++ b/google-cloud-container/src/test/java/com/google/cloud/container/v1/it/Util.java @@ -0,0 +1,53 @@ +/* + * 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. + */ + +package com.google.cloud.container.v1.it; + +import com.google.cloud.container.v1.ClusterManagerClient; +import com.google.container.v1.Cluster; +import com.google.container.v1.ListClustersResponse; +import java.io.IOException; +import java.time.Instant; +import java.time.OffsetDateTime; +import java.time.temporal.ChronoUnit; +import java.util.List; +import java.util.concurrent.ExecutionException; + +public class Util { + // Cleans existing test resources if any. + private static final int DELETION_THRESHOLD_TIME_HOURS = 24; + + /** tear down any clusters that are older than 24 hours * */ + public static void cleanUpExistingInstanceCluster( + String projectId, String zone, ClusterManagerClient client) + throws IOException, ExecutionException, InterruptedException { + + ListClustersResponse clustersResponse = client.listClusters(projectId, zone); + List clusters = clustersResponse.getClustersList(); + + for (Cluster cluster : clusters) { + if (isCreatedBeforeThresholdTime(cluster.getCreateTime())) { + client.deleteCluster(projectId, zone, cluster.getName()); + } + } + } + + private static boolean isCreatedBeforeThresholdTime(String timestamp) { + return OffsetDateTime.parse(timestamp) + .toInstant() + .isBefore(Instant.now().minus(DELETION_THRESHOLD_TIME_HOURS, ChronoUnit.HOURS)); + } +} From c6b62b0b17717ab7af2b50701a6c3b53fdc480d7 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 11 Feb 2022 22:26:31 +0100 Subject: [PATCH 10/12] deps: update actions/github-script action to v6 (#680) 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 | Type | Update | Change | |---|---|---|---| | [actions/github-script](https://togithub.com/actions/github-script) | action | major | `v5` -> `v6` | --- ### Release Notes
actions/github-script ### [`v6`](https://togithub.com/actions/github-script/compare/v5...v6) [Compare Source](https://togithub.com/actions/github-script/compare/v5...v6)
--- ### 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-container). From 6457b2cce9aeb760326d74be06fd66d079117f0f Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 11 Feb 2022 22:34:58 +0100 Subject: [PATCH 11/12] build(deps): update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.3.2 (#679) 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.apache.maven.plugins:maven-javadoc-plugin](https://maven.apache.org/plugins/) ([source](https://togithub.com/apache/maven-javadoc-plugin)) | `3.3.1` -> `3.3.2` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-javadoc-plugin/3.3.2/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-javadoc-plugin/3.3.2/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-javadoc-plugin/3.3.2/compatibility-slim/3.3.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-javadoc-plugin/3.3.2/confidence-slim/3.3.1)](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-container). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f0d9f912..d6d2818c 100644 --- a/pom.xml +++ b/pom.xml @@ -159,7 +159,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.1 + 3.3.2 html From 42dd2a6af6b2256639d6019aba4f5fe27a1222ea Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 11 Feb 2022 21:54:55 +0000 Subject: [PATCH 12/12] chore(main): release 2.3.3 (#681) :robot: I have created a release *beep* *boop* --- ### [2.3.3](https://github.com/googleapis/java-container/compare/v2.3.2...v2.3.3) (2022-02-11) ### Dependencies * update actions/github-script action to v6 ([#680](https://github.com/googleapis/java-container/issues/680)) ([c6b62b0](https://github.com/googleapis/java-container/commit/c6b62b0b17717ab7af2b50701a6c3b53fdc480d7)) --- 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 | 7 +++++++ google-cloud-container-bom/pom.xml | 12 ++++++------ google-cloud-container/pom.xml | 4 ++-- grpc-google-cloud-container-v1/pom.xml | 4 ++-- grpc-google-cloud-container-v1beta1/pom.xml | 4 ++-- pom.xml | 12 ++++++------ proto-google-cloud-container-v1/pom.xml | 4 ++-- proto-google-cloud-container-v1beta1/pom.xml | 4 ++-- versions.txt | 10 +++++----- 9 files changed, 34 insertions(+), 27 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a6217e57..b48812fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [2.3.3](https://github.com/googleapis/java-container/compare/v2.3.2...v2.3.3) (2022-02-11) + + +### Dependencies + +* update actions/github-script action to v6 ([#680](https://github.com/googleapis/java-container/issues/680)) ([c6b62b0](https://github.com/googleapis/java-container/commit/c6b62b0b17717ab7af2b50701a6c3b53fdc480d7)) + ### [2.3.2](https://github.com/googleapis/java-container/compare/v2.3.1...v2.3.2) (2022-02-01) diff --git a/google-cloud-container-bom/pom.xml b/google-cloud-container-bom/pom.xml index 8932a4d8..ed888209 100644 --- a/google-cloud-container-bom/pom.xml +++ b/google-cloud-container-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-container-bom - 2.3.3-SNAPSHOT + 2.3.3 pom com.google.cloud @@ -52,27 +52,27 @@ com.google.cloud google-cloud-container - 2.3.3-SNAPSHOT + 2.3.3 com.google.api.grpc grpc-google-cloud-container-v1 - 2.3.3-SNAPSHOT + 2.3.3 com.google.api.grpc grpc-google-cloud-container-v1beta1 - 2.3.3-SNAPSHOT + 2.3.3 com.google.api.grpc proto-google-cloud-container-v1 - 2.3.3-SNAPSHOT + 2.3.3 com.google.api.grpc proto-google-cloud-container-v1beta1 - 2.3.3-SNAPSHOT + 2.3.3 diff --git a/google-cloud-container/pom.xml b/google-cloud-container/pom.xml index 44513235..7adb3ce9 100644 --- a/google-cloud-container/pom.xml +++ b/google-cloud-container/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-container - 2.3.3-SNAPSHOT + 2.3.3 jar Google Cloud Container https://github.com/googleapis/java-container @@ -11,7 +11,7 @@ com.google.cloud google-cloud-container-parent - 2.3.3-SNAPSHOT + 2.3.3 google-cloud-container diff --git a/grpc-google-cloud-container-v1/pom.xml b/grpc-google-cloud-container-v1/pom.xml index 45c3deb6..f10a23ac 100644 --- a/grpc-google-cloud-container-v1/pom.xml +++ b/grpc-google-cloud-container-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-container-v1 - 2.3.3-SNAPSHOT + 2.3.3 grpc-google-cloud-container-v1 GRPC library for grpc-google-cloud-container-v1 com.google.cloud google-cloud-container-parent - 2.3.3-SNAPSHOT + 2.3.3 diff --git a/grpc-google-cloud-container-v1beta1/pom.xml b/grpc-google-cloud-container-v1beta1/pom.xml index eb3648b6..1232c9e8 100644 --- a/grpc-google-cloud-container-v1beta1/pom.xml +++ b/grpc-google-cloud-container-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-container-v1beta1 - 2.3.3-SNAPSHOT + 2.3.3 grpc-google-cloud-container-v1beta1 GRPC library for google-cloud-container com.google.cloud google-cloud-container-parent - 2.3.3-SNAPSHOT + 2.3.3 diff --git a/pom.xml b/pom.xml index d6d2818c..b1e03aa4 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-container-parent pom - 2.3.3-SNAPSHOT + 2.3.3 Google Cloud Container Parent https://github.com/googleapis/java-container @@ -61,27 +61,27 @@ com.google.api.grpc proto-google-cloud-container-v1 - 2.3.3-SNAPSHOT + 2.3.3 com.google.api.grpc proto-google-cloud-container-v1beta1 - 2.3.3-SNAPSHOT + 2.3.3 com.google.api.grpc grpc-google-cloud-container-v1beta1 - 2.3.3-SNAPSHOT + 2.3.3 com.google.api.grpc grpc-google-cloud-container-v1 - 2.3.3-SNAPSHOT + 2.3.3 com.google.cloud google-cloud-container - 2.3.3-SNAPSHOT + 2.3.3 diff --git a/proto-google-cloud-container-v1/pom.xml b/proto-google-cloud-container-v1/pom.xml index ce9b76fe..ae013b13 100644 --- a/proto-google-cloud-container-v1/pom.xml +++ b/proto-google-cloud-container-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-container-v1 - 2.3.3-SNAPSHOT + 2.3.3 proto-google-cloud-container-v1 PROTO library for proto-google-cloud-container-v1 com.google.cloud google-cloud-container-parent - 2.3.3-SNAPSHOT + 2.3.3 diff --git a/proto-google-cloud-container-v1beta1/pom.xml b/proto-google-cloud-container-v1beta1/pom.xml index e98b9b3f..3bcd0219 100644 --- a/proto-google-cloud-container-v1beta1/pom.xml +++ b/proto-google-cloud-container-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-container-v1beta1 - 2.3.3-SNAPSHOT + 2.3.3 proto-google-cloud-container-v1beta1 Proto library for google-cloud-container com.google.cloud google-cloud-container-parent - 2.3.3-SNAPSHOT + 2.3.3 diff --git a/versions.txt b/versions.txt index fe8f57c9..19b711aa 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -google-cloud-container:2.3.2:2.3.3-SNAPSHOT -grpc-google-cloud-container-v1:2.3.2:2.3.3-SNAPSHOT -grpc-google-cloud-container-v1beta1:2.3.2:2.3.3-SNAPSHOT -proto-google-cloud-container-v1:2.3.2:2.3.3-SNAPSHOT -proto-google-cloud-container-v1beta1:2.3.2:2.3.3-SNAPSHOT +google-cloud-container:2.3.3:2.3.3 +grpc-google-cloud-container-v1:2.3.3:2.3.3 +grpc-google-cloud-container-v1beta1:2.3.3:2.3.3 +proto-google-cloud-container-v1:2.3.3:2.3.3 +proto-google-cloud-container-v1beta1:2.3.3:2.3.3