From 81670cf688249d7ffd1a910b0c1a9bba4540c63c Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Mon, 1 Nov 2021 11:04:13 -0400 Subject: [PATCH] chore: migrate to owlbot (#718) --- .github/.OwlBot.lock.yaml | 3 ++ .github/.OwlBot.yaml | 37 +++++++++++++++++++ README.md | 12 +++---- google-cloud-monitoring-bom/pom.xml | 5 ++- google-cloud-monitoring/pom.xml | 2 +- owlbot.py | 43 ++++++++++++++++++++++ pom.xml | 4 +-- synth.py | 56 ----------------------------- versions.txt | 4 +-- 9 files changed, 96 insertions(+), 70 deletions(-) create mode 100644 .github/.OwlBot.lock.yaml create mode 100644 .github/.OwlBot.yaml create mode 100644 owlbot.py delete mode 100644 synth.py diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml new file mode 100644 index 00000000..effbdc70 --- /dev/null +++ b/.github/.OwlBot.lock.yaml @@ -0,0 +1,3 @@ +docker: + digest: sha256:a3ac08d167454718ff057b97a1950d3cb5e16fc39fb3f355d90276285a6cac75 + image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest diff --git a/.github/.OwlBot.yaml b/.github/.OwlBot.yaml new file mode 100644 index 00000000..8a101dcb --- /dev/null +++ b/.github/.OwlBot.yaml @@ -0,0 +1,37 @@ +# 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/cloud-devrel-public-resources/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-monitoring/src/test/java/com/google/cloud/monitoring/v3/ITVPCServiceControlTest.java" +- "/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/AlertPolicyConditionName.java" +- "/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/DroppedLabelsOuterClass.java" +- "/proto-google-cloud-monitoring-v3/src/main/java/google/monitoring/v3/DroppedLabelsOuterClass.java" + + +deep-copy-regex: +- source: "/google/monitoring/(v.*)/.*-java/proto-google-.*/src" + dest: "/owl-bot-staging/$1/proto-google-cloud-monitoring-$1/src" +- source: "/google/monitoring/(v.*)/.*-java/grpc-google-.*/src" + dest: "/owl-bot-staging/$1/grpc-google-cloud-monitoring-$1/src" +- source: "/google/monitoring/(v.*)/.*-java/gapic-google-.*/src" + dest: "/owl-bot-staging/$1/google-cloud-monitoring/src" diff --git a/README.md b/README.md index f26c26a9..04f91a41 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 - 23.0.0 + 24.0.0 pom import @@ -42,7 +42,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-monitoring - 3.0.5-SNAPSHOT + 3.1.1-SNAPSHOT ``` @@ -50,20 +50,20 @@ 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:23.1.0') +implementation platform('com.google.cloud:libraries-bom:24.0.0') implementation 'com.google.cloud:google-cloud-monitoring' ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -implementation 'com.google.cloud:google-cloud-monitoring:3.0.7' +implementation 'com.google.cloud:google-cloud-monitoring:3.1.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-monitoring" % "3.0.7" +libraryDependencies += "com.google.cloud" % "google-cloud-monitoring" % "3.1.0" ``` ## Authentication @@ -215,7 +215,7 @@ Java 11 | [![Kokoro CI][kokoro-badge-image-5]][kokoro-badge-link-5] Java is a registered trademark of Oracle and/or its affiliates. [product-docs]: https://cloud.google.com/monitoring/docs -[javadocs]: https://googleapis.dev/java/google-cloud-monitoring/latest/ +[javadocs]: https://cloud.google.com/java/docs/reference/google-cloud-monitoring/latest/history [kokoro-badge-image-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-monitoring/java7.svg [kokoro-badge-link-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-monitoring/java7.html [kokoro-badge-image-2]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-monitoring/java8.svg diff --git a/google-cloud-monitoring-bom/pom.xml b/google-cloud-monitoring-bom/pom.xml index 5fb22cfb..ab97937d 100644 --- a/google-cloud-monitoring-bom/pom.xml +++ b/google-cloud-monitoring-bom/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 com.google.cloud @@ -49,7 +49,6 @@ - com.google.cloud google-cloud-monitoring @@ -79,4 +78,4 @@ - \ No newline at end of file + diff --git a/google-cloud-monitoring/pom.xml b/google-cloud-monitoring/pom.xml index be4142a0..b755e744 100644 --- a/google-cloud-monitoring/pom.xml +++ b/google-cloud-monitoring/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 com.google.cloud diff --git a/owlbot.py b/owlbot.py new file mode 100644 index 00000000..f9c5e127 --- /dev/null +++ b/owlbot.py @@ -0,0 +1,43 @@ +# 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 + +def fix_resource(client, version, name): + s.replace( + [f'owl-bot-staging/{version}/google-cloud-monitoring/**/{version}/{client}.java'], + f'import com.google.monitoring.{version}.{name}', + 'import com.google.api.resourcenames.ResourceName', + ) + + s.replace( + [f'owl-bot-staging/{version}/google-cloud-monitoring/**/{version}/{client}.java'], + name, + 'ResourceName', + ) +version='v3' +for library in s.get_staging_dirs(): + # put any special-case replacements here + fix_resource('AlertPolicyServiceClient', version, 'FolderName') + fix_resource('GroupServiceClient', version, 'FolderName') + fix_resource('MetricServiceClient', version, 'FolderName') + fix_resource('NotificationChannelServiceClient', version, 'FolderName') + fix_resource('ServiceMonitoringServiceClient', version, 'FolderName') + fix_resource('UptimeCheckServiceClient', version, 'FolderName') + + s.move(library) + +s.remove_staging_dirs() +java.common_templates() diff --git a/pom.xml b/pom.xml index fcbb8e0a..c9e0fd8b 100644 --- a/pom.xml +++ b/pom.xml @@ -109,9 +109,9 @@ - proto-google-cloud-monitoring-v3 - grpc-google-cloud-monitoring-v3 google-cloud-monitoring + grpc-google-cloud-monitoring-v3 + proto-google-cloud-monitoring-v3 google-cloud-monitoring-bom diff --git a/synth.py b/synth.py deleted file mode 100644 index ee3152e8..00000000 --- a/synth.py +++ /dev/null @@ -1,56 +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.languages.java as java - -AUTOSYNTH_MULTIPLE_COMMITS = True - -service = 'monitoring' -versions = ['v3'] - -def fix_resource(client, version, name): - s.replace( - [f'google-cloud-monitoring/**/{version}/{client}.java'], - f'import com.google.monitoring.{version}.{name}', - 'import com.google.api.resourcenames.ResourceName', - ) - - s.replace( - [f'google-cloud-monitoring/**/{version}/{client}.java'], - name, - 'ResourceName', - ) - -for version in versions: - java.bazel_library( - service=service, - version=version, - proto_path=f'google/{service}/{version}', - bazel_target=f'//google/{service}/{version}:google-cloud-{service}-{version}-java', - ) - fix_resource('AlertPolicyServiceClient', version, 'FolderName') - fix_resource('GroupServiceClient', version, 'FolderName') - fix_resource('MetricServiceClient', version, 'FolderName') - fix_resource('NotificationChannelServiceClient', version, 'FolderName') - fix_resource('ServiceMonitoringServiceClient', version, 'FolderName') - fix_resource('UptimeCheckServiceClient', version, 'FolderName') - - 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() diff --git a/versions.txt b/versions.txt index 1d978dad..fb84ebd3 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -proto-google-cloud-monitoring-v3:3.1.0:3.1.1-SNAPSHOT +google-cloud-monitoring:3.1.0:3.1.1-SNAPSHOT grpc-google-cloud-monitoring-v3:3.1.0:3.1.1-SNAPSHOT -google-cloud-monitoring:3.1.0:3.1.1-SNAPSHOT \ No newline at end of file +proto-google-cloud-monitoring-v3:3.1.0:3.1.1-SNAPSHOT