From 7143f96d3e5b4f7f96f184b6367c45980dbb4140 Mon Sep 17 00:00:00 2001 From: Blake Li Date: Wed, 10 Aug 2022 01:52:43 +0000 Subject: [PATCH 1/4] fix: fix samples and samples tests for UptimeCheck. (#909) --- .../com/example/monitoring/UptimeSample.java | 29 +++++++------------ .../java/com/example/monitoring/UptimeIT.java | 11 ++++--- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/samples/snippets/src/main/java/com/example/monitoring/UptimeSample.java b/samples/snippets/src/main/java/com/example/monitoring/UptimeSample.java index 1f4d5cc1..29f5e82c 100644 --- a/samples/snippets/src/main/java/com/example/monitoring/UptimeSample.java +++ b/samples/snippets/src/main/java/com/example/monitoring/UptimeSample.java @@ -29,7 +29,6 @@ import com.google.monitoring.v3.UpdateUptimeCheckConfigRequest; import com.google.monitoring.v3.UptimeCheckConfig; import com.google.monitoring.v3.UptimeCheckConfig.HttpCheck; -import com.google.monitoring.v3.UptimeCheckConfigName; import com.google.monitoring.v3.UptimeCheckIp; import com.google.protobuf.Duration; import com.google.protobuf.FieldMask; @@ -119,7 +118,6 @@ public static void main(String... args) throws IOException { break; case "update": updateUptimeCheck( - projectId, cl.getOptionValue(DISPLAY_NAME_OPTION.getOpt(), "new uptime check"), cl.getOptionValue(HOST_NAME_OPTION.getOpt(), "example.com"), cl.getOptionValue(PATH_NAME_OPTION.getOpt(), "/")); @@ -131,12 +129,11 @@ public static void main(String... args) throws IOException { listUptimeCheckIps(); break; case "get": - getUptimeCheckConfig( - projectId, cl.getOptionValue(DISPLAY_NAME_OPTION.getOpt(), "new uptime check")); + getUptimeCheckConfig(cl.getOptionValue(DISPLAY_NAME_OPTION.getOpt(), "new uptime check")); break; case "delete": deleteUptimeCheckConfig( - projectId, cl.getOptionValue(DISPLAY_NAME_OPTION.getOpt(), "new uptime check")); + cl.getOptionValue(DISPLAY_NAME_OPTION.getOpt(), "new uptime check")); break; default: usage(null); @@ -162,7 +159,7 @@ private static void createUptimeCheck( .build(); try (UptimeCheckServiceClient client = UptimeCheckServiceClient.create()) { UptimeCheckConfig config = client.createUptimeCheckConfig(request); - System.out.println("Uptime check created: " + config.getDisplayName()); + System.out.println("Uptime check created: " + config.getName()); } catch (Exception e) { usage("Exception creating uptime check: " + e.toString()); throw e; @@ -171,16 +168,15 @@ private static void createUptimeCheck( // [END monitoring_uptime_check_create]] // [START monitoring_uptime_check_update]] - private static void updateUptimeCheck( - String projectId, String displayName, String hostName, String pathName) throws IOException { - String fullCheckName = UptimeCheckConfigName.format(projectId, displayName); + private static void updateUptimeCheck(String checkName, String hostName, String pathName) + throws IOException { UpdateUptimeCheckConfigRequest request = UpdateUptimeCheckConfigRequest.newBuilder() .setUpdateMask(FieldMask.newBuilder().addPaths("http_check.path")) .setUptimeCheckConfig( UptimeCheckConfig.newBuilder() - .setName(fullCheckName) + .setName(checkName) .setMonitoredResource( MonitoredResource.newBuilder() .setType("uptime_url") @@ -231,7 +227,7 @@ private static void listUptimeCheckIps() throws IOException { // [END monitoring_uptime_check_list_ips]] // [START monitoring_uptime_check_get]] - private static void getUptimeCheckConfig(String projectId, String checkName) throws IOException { + private static void getUptimeCheckConfig(String checkName) throws IOException { // Create UptimeCheckServiceSettings instance for add retry mechanism UptimeCheckServiceSettings.Builder uptimeCheckServiceSettingsBuilder = UptimeCheckServiceSettings.newBuilder(); @@ -257,13 +253,11 @@ private static void getUptimeCheckConfig(String projectId, String checkName) thr // create UptimeCheckServiceClient with retry setting try (UptimeCheckServiceClient client = UptimeCheckServiceClient.create(uptimeCheckServiceSettings)) { - String fullCheckName = UptimeCheckConfigName.format(projectId, checkName); - UptimeCheckConfig config = client.getUptimeCheckConfig(fullCheckName); + UptimeCheckConfig config = client.getUptimeCheckConfig(checkName); if (config != null) { System.out.println(config.toString()); } else { - System.out.println( - "No uptime check config found with name " + checkName + " in project " + projectId); + System.out.println("No uptime check config found with ID " + checkName); } } catch (Exception e) { usage("Exception getting uptime check: " + e.toString()); @@ -273,10 +267,9 @@ private static void getUptimeCheckConfig(String projectId, String checkName) thr // [END monitoring_uptime_check_get]] // [START monitoring_uptime_check_delete]] - private static void deleteUptimeCheckConfig(String projectId, String checkName) - throws IOException { + private static void deleteUptimeCheckConfig(String checkName) throws IOException { try (UptimeCheckServiceClient client = UptimeCheckServiceClient.create()) { - client.deleteUptimeCheckConfig(UptimeCheckConfigName.format(projectId, checkName)); + client.deleteUptimeCheckConfig(checkName); } catch (Exception e) { usage("Exception deleting uptime check: " + e.toString()); throw e; diff --git a/samples/snippets/src/test/java/com/example/monitoring/UptimeIT.java b/samples/snippets/src/test/java/com/example/monitoring/UptimeIT.java index 0b90506f..1c48b444 100644 --- a/samples/snippets/src/test/java/com/example/monitoring/UptimeIT.java +++ b/samples/snippets/src/test/java/com/example/monitoring/UptimeIT.java @@ -38,6 +38,7 @@ public class UptimeIT { private ByteArrayOutputStream bout; private PrintStream out; private PrintStream originalPrintStream; + private static String checkName; private static UptimeCheckConfig config = UptimeCheckConfig.newBuilder() @@ -62,18 +63,20 @@ public void tearDown() { @Test public void test1_CreateUptimeCheck() throws Exception { UptimeSample.main("create", "-n", config.getDisplayName(), "-o", "test.example.com", "-a", "/"); - assertThat(bout.toString()).contains("Uptime check created: " + config.getDisplayName()); + String actual = bout.toString(); + assertThat(actual).contains(config.getDisplayName()); + checkName = actual.split(":")[1].trim(); } @Test public void test2_UpdateUptimeCheck() throws Exception { - UptimeSample.main("update", "-n", config.getDisplayName(), "-a", "/updated"); + UptimeSample.main("update", "-n", checkName, "-a", "/updated"); assertThat(bout.toString()).contains("/updated"); } @Test public void test2_GetUptimeCheck() throws Exception { - UptimeSample.main("get", "-n", config.getDisplayName()); + UptimeSample.main("get", "-n", checkName); assertThat(bout.toString()).contains(config.getDisplayName()); } @@ -96,6 +99,6 @@ public void test2_ListUptimeIps() throws Exception { @Test public void test3_DeleteUptimeCheck() throws Exception { - UptimeSample.main("delete", "-n", config.getDisplayName()); + UptimeSample.main("delete", "-n", checkName); } } From fb080dbac9a11563d3b21b1defe34720bbcd2f91 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Thu, 11 Aug 2022 13:40:13 -0400 Subject: [PATCH 2/4] fix: google-auth-library-oauth2-http is runtime scope (#911) Fixing https://github.com/googleapis/java-monitoring/commit/204e76cecb14a75fd27a74abe498dcd45bced6e1 --- README.md | 4 ++-- google-cloud-monitoring/pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index eb607628..63fec2c7 100644 --- a/README.md +++ b/README.md @@ -57,13 +57,13 @@ 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.3.6' +implementation 'com.google.cloud:google-cloud-monitoring:3.4.0' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-monitoring" % "3.3.6" +libraryDependencies += "com.google.cloud" % "google-cloud-monitoring" % "3.4.0" ``` ## Authentication diff --git a/google-cloud-monitoring/pom.xml b/google-cloud-monitoring/pom.xml index 3eb1afbf..0a79975a 100644 --- a/google-cloud-monitoring/pom.xml +++ b/google-cloud-monitoring/pom.xml @@ -79,7 +79,7 @@ com.google.auth google-auth-library-oauth2-http - test + runtime From c75f8612240e79affe874a37b954ef0cbbe9d1f9 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 11 Aug 2022 19:26:19 +0000 Subject: [PATCH 3/4] chore(main): release 3.4.1-SNAPSHOT (#907) :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-monitoring-bom/pom.xml | 8 ++++---- google-cloud-monitoring/pom.xml | 4 ++-- grpc-google-cloud-monitoring-v3/pom.xml | 4 ++-- pom.xml | 8 ++++---- proto-google-cloud-monitoring-v3/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 6 +++--- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/google-cloud-monitoring-bom/pom.xml b/google-cloud-monitoring-bom/pom.xml index 81fc3b69..5fae8032 100644 --- a/google-cloud-monitoring-bom/pom.xml +++ b/google-cloud-monitoring-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-monitoring-bom - 3.4.0 + 3.4.1-SNAPSHOT pom com.google.cloud @@ -52,17 +52,17 @@ com.google.cloud google-cloud-monitoring - 3.4.0 + 3.4.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-monitoring-v3 - 3.4.0 + 3.4.1-SNAPSHOT com.google.api.grpc proto-google-cloud-monitoring-v3 - 3.4.0 + 3.4.1-SNAPSHOT diff --git a/google-cloud-monitoring/pom.xml b/google-cloud-monitoring/pom.xml index 0a79975a..8ec843b4 100644 --- a/google-cloud-monitoring/pom.xml +++ b/google-cloud-monitoring/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-monitoring - 3.4.0 + 3.4.1-SNAPSHOT jar Google Cloud Monitoring https://github.com/googleapis/java-monitoring @@ -11,7 +11,7 @@ com.google.cloud google-cloud-monitoring-parent - 3.4.0 + 3.4.1-SNAPSHOT google-cloud-monitoring diff --git a/grpc-google-cloud-monitoring-v3/pom.xml b/grpc-google-cloud-monitoring-v3/pom.xml index 816ed146..83e67632 100644 --- a/grpc-google-cloud-monitoring-v3/pom.xml +++ b/grpc-google-cloud-monitoring-v3/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-monitoring-v3 - 3.4.0 + 3.4.1-SNAPSHOT grpc-google-cloud-monitoring-v3 GRPC library for grpc-google-cloud-monitoring-v3 com.google.cloud google-cloud-monitoring-parent - 3.4.0 + 3.4.1-SNAPSHOT diff --git a/pom.xml b/pom.xml index e57783de..3d3cc36f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-monitoring-parent pom - 3.4.0 + 3.4.1-SNAPSHOT Google Cloud Monitoring Parent https://github.com/googleapis/java-monitoring @@ -61,17 +61,17 @@ com.google.api.grpc proto-google-cloud-monitoring-v3 - 3.4.0 + 3.4.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-monitoring-v3 - 3.4.0 + 3.4.1-SNAPSHOT com.google.cloud google-cloud-monitoring - 3.4.0 + 3.4.1-SNAPSHOT diff --git a/proto-google-cloud-monitoring-v3/pom.xml b/proto-google-cloud-monitoring-v3/pom.xml index b2b5cda9..43b4c9f4 100644 --- a/proto-google-cloud-monitoring-v3/pom.xml +++ b/proto-google-cloud-monitoring-v3/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-monitoring-v3 - 3.4.0 + 3.4.1-SNAPSHOT proto-google-cloud-monitoring-v3 PROTO library for proto-google-cloud-monitoring-v3 com.google.cloud google-cloud-monitoring-parent - 3.4.0 + 3.4.1-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 03db03ab..e0e6eb79 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-monitoring - 3.4.0 + 3.4.1-SNAPSHOT diff --git a/versions.txt b/versions.txt index e6327389..1cf3b3c4 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-monitoring:3.4.0:3.4.0 -grpc-google-cloud-monitoring-v3:3.4.0:3.4.0 -proto-google-cloud-monitoring-v3:3.4.0:3.4.0 +google-cloud-monitoring:3.4.0:3.4.1-SNAPSHOT +grpc-google-cloud-monitoring-v3:3.4.0:3.4.1-SNAPSHOT +proto-google-cloud-monitoring-v3:3.4.0:3.4.1-SNAPSHOT From f7872794d6c1343960c023b265e386fb832f345b Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 11 Aug 2022 20:48:16 +0000 Subject: [PATCH 4/4] chore(main): release 3.4.1 (#912) :robot: I have created a release *beep* *boop* --- ## [3.4.1](https://github.com/googleapis/java-monitoring/compare/v3.4.0...v3.4.1) (2022-08-11) ### Bug Fixes * fix samples and samples tests for UptimeCheck. ([#909](https://github.com/googleapis/java-monitoring/issues/909)) ([7143f96](https://github.com/googleapis/java-monitoring/commit/7143f96d3e5b4f7f96f184b6367c45980dbb4140)) * google-auth-library-oauth2-http is runtime scope ([#911](https://github.com/googleapis/java-monitoring/issues/911)) ([fb080db](https://github.com/googleapis/java-monitoring/commit/fb080dbac9a11563d3b21b1defe34720bbcd2f91)) --- 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 | 8 ++++++++ README.md | 2 +- google-cloud-monitoring-bom/pom.xml | 8 ++++---- google-cloud-monitoring/pom.xml | 4 ++-- grpc-google-cloud-monitoring-v3/pom.xml | 4 ++-- pom.xml | 8 ++++---- proto-google-cloud-monitoring-v3/pom.xml | 4 ++-- samples/install-without-bom/pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- versions.txt | 6 +++--- 10 files changed, 28 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f5ffafdd..e119977c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [3.4.1](https://github.com/googleapis/java-monitoring/compare/v3.4.0...v3.4.1) (2022-08-11) + + +### Bug Fixes + +* fix samples and samples tests for UptimeCheck. ([#909](https://github.com/googleapis/java-monitoring/issues/909)) ([7143f96](https://github.com/googleapis/java-monitoring/commit/7143f96d3e5b4f7f96f184b6367c45980dbb4140)) +* google-auth-library-oauth2-http is runtime scope ([#911](https://github.com/googleapis/java-monitoring/issues/911)) ([fb080db](https://github.com/googleapis/java-monitoring/commit/fb080dbac9a11563d3b21b1defe34720bbcd2f91)) + ## [3.4.0](https://github.com/googleapis/java-monitoring/compare/v3.3.6...v3.4.0) (2022-08-06) diff --git a/README.md b/README.md index 63fec2c7..845c7ca5 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-monitoring - 3.4.0 + 3.4.1 ``` diff --git a/google-cloud-monitoring-bom/pom.xml b/google-cloud-monitoring-bom/pom.xml index 5fae8032..52eeddae 100644 --- a/google-cloud-monitoring-bom/pom.xml +++ b/google-cloud-monitoring-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-monitoring-bom - 3.4.1-SNAPSHOT + 3.4.1 pom com.google.cloud @@ -52,17 +52,17 @@ com.google.cloud google-cloud-monitoring - 3.4.1-SNAPSHOT + 3.4.1 com.google.api.grpc grpc-google-cloud-monitoring-v3 - 3.4.1-SNAPSHOT + 3.4.1 com.google.api.grpc proto-google-cloud-monitoring-v3 - 3.4.1-SNAPSHOT + 3.4.1 diff --git a/google-cloud-monitoring/pom.xml b/google-cloud-monitoring/pom.xml index 8ec843b4..6e6b6aff 100644 --- a/google-cloud-monitoring/pom.xml +++ b/google-cloud-monitoring/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-monitoring - 3.4.1-SNAPSHOT + 3.4.1 jar Google Cloud Monitoring https://github.com/googleapis/java-monitoring @@ -11,7 +11,7 @@ com.google.cloud google-cloud-monitoring-parent - 3.4.1-SNAPSHOT + 3.4.1 google-cloud-monitoring diff --git a/grpc-google-cloud-monitoring-v3/pom.xml b/grpc-google-cloud-monitoring-v3/pom.xml index 83e67632..c79c003f 100644 --- a/grpc-google-cloud-monitoring-v3/pom.xml +++ b/grpc-google-cloud-monitoring-v3/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-monitoring-v3 - 3.4.1-SNAPSHOT + 3.4.1 grpc-google-cloud-monitoring-v3 GRPC library for grpc-google-cloud-monitoring-v3 com.google.cloud google-cloud-monitoring-parent - 3.4.1-SNAPSHOT + 3.4.1 diff --git a/pom.xml b/pom.xml index 3d3cc36f..56000ad6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-monitoring-parent pom - 3.4.1-SNAPSHOT + 3.4.1 Google Cloud Monitoring Parent https://github.com/googleapis/java-monitoring @@ -61,17 +61,17 @@ com.google.api.grpc proto-google-cloud-monitoring-v3 - 3.4.1-SNAPSHOT + 3.4.1 com.google.api.grpc grpc-google-cloud-monitoring-v3 - 3.4.1-SNAPSHOT + 3.4.1 com.google.cloud google-cloud-monitoring - 3.4.1-SNAPSHOT + 3.4.1 diff --git a/proto-google-cloud-monitoring-v3/pom.xml b/proto-google-cloud-monitoring-v3/pom.xml index 43b4c9f4..6882cbb6 100644 --- a/proto-google-cloud-monitoring-v3/pom.xml +++ b/proto-google-cloud-monitoring-v3/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-monitoring-v3 - 3.4.1-SNAPSHOT + 3.4.1 proto-google-cloud-monitoring-v3 PROTO library for proto-google-cloud-monitoring-v3 com.google.cloud google-cloud-monitoring-parent - 3.4.1-SNAPSHOT + 3.4.1 diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 08ed5d35..c748e9fc 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-monitoring - 3.4.0 + 3.4.1 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index e0e6eb79..7b0d5c27 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-monitoring - 3.4.1-SNAPSHOT + 3.4.1 diff --git a/versions.txt b/versions.txt index 1cf3b3c4..a00b233d 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-monitoring:3.4.0:3.4.1-SNAPSHOT -grpc-google-cloud-monitoring-v3:3.4.0:3.4.1-SNAPSHOT -proto-google-cloud-monitoring-v3:3.4.0:3.4.1-SNAPSHOT +google-cloud-monitoring:3.4.1:3.4.1 +grpc-google-cloud-monitoring-v3:3.4.1:3.4.1 +proto-google-cloud-monitoring-v3:3.4.1:3.4.1