From b828340bac47b9d3e8ea5b894310678fb6273d13 Mon Sep 17 00:00:00 2001 From: Blake Li Date: Tue, 9 Aug 2022 16:30:21 -0400 Subject: [PATCH 1/4] fix: fix samples and samples tests for UptimeCheck. --- .../com/example/monitoring/UptimeSample.java | 29 +++++++++---------- .../java/com/example/monitoring/UptimeIT.java | 11 ++++--- 2 files changed, 20 insertions(+), 20 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..a6aa5a32 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; @@ -96,8 +95,8 @@ public static void main(String... args) throws IOException { throw new RuntimeException("Exception parsing command line arguments.", pe); } - String projectId = - cl.getOptionValue(PROJECT_ID_OPTION.getOpt(), System.getenv("GOOGLE_CLOUD_PROJECT")); + String projectId = "java-docs-samples-testing"; + // cl.getOptionValue(PROJECT_ID_OPTION.getOpt(), System.getenv("GOOGLE_CLOUD_PROJECT")); String command = Optional.of(cl.getArgList()) @@ -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(), "/")); @@ -132,11 +130,11 @@ public static void main(String... args) throws IOException { break; case "get": getUptimeCheckConfig( - projectId, cl.getOptionValue(DISPLAY_NAME_OPTION.getOpt(), "new uptime check")); + 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 +160,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; @@ -172,15 +170,14 @@ private static void createUptimeCheck( // [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); + 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 +228,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 +254,13 @@ 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); + // String fullCheckName = UptimeCheckConfigName.format(projectId, checkId); + 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); + "No uptime check config found with ID " + checkName); } } catch (Exception e) { usage("Exception getting uptime check: " + e.toString()); @@ -273,10 +270,10 @@ 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) + 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..ae890419 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 b5482687f2f420189045d9da2e1122528ebc29e2 Mon Sep 17 00:00:00 2001 From: Blake Li Date: Tue, 9 Aug 2022 16:34:35 -0400 Subject: [PATCH 2/4] fix: revert changes to projectId. --- .../src/main/java/com/example/monitoring/UptimeSample.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 a6aa5a32..4520ad61 100644 --- a/samples/snippets/src/main/java/com/example/monitoring/UptimeSample.java +++ b/samples/snippets/src/main/java/com/example/monitoring/UptimeSample.java @@ -95,8 +95,8 @@ public static void main(String... args) throws IOException { throw new RuntimeException("Exception parsing command line arguments.", pe); } - String projectId = "java-docs-samples-testing"; - // cl.getOptionValue(PROJECT_ID_OPTION.getOpt(), System.getenv("GOOGLE_CLOUD_PROJECT")); + String projectId = + cl.getOptionValue(PROJECT_ID_OPTION.getOpt(), System.getenv("GOOGLE_CLOUD_PROJECT")); String command = Optional.of(cl.getArgList()) From b910481e73b8ce0a8d0db6f17bdd610e5fa026d4 Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Tue, 9 Aug 2022 20:37:01 +0000 Subject: [PATCH 3/4] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot=20po?= =?UTF-8?q?st-processor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --- .../java/com/example/monitoring/UptimeSample.java | 13 +++++-------- .../test/java/com/example/monitoring/UptimeIT.java | 2 +- 2 files changed, 6 insertions(+), 9 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 4520ad61..3b56c9e0 100644 --- a/samples/snippets/src/main/java/com/example/monitoring/UptimeSample.java +++ b/samples/snippets/src/main/java/com/example/monitoring/UptimeSample.java @@ -129,8 +129,7 @@ public static void main(String... args) throws IOException { listUptimeCheckIps(); break; case "get": - getUptimeCheckConfig( - cl.getOptionValue(DISPLAY_NAME_OPTION.getOpt(), "new uptime check")); + getUptimeCheckConfig(cl.getOptionValue(DISPLAY_NAME_OPTION.getOpt(), "new uptime check")); break; case "delete": deleteUptimeCheckConfig( @@ -169,8 +168,8 @@ private static void createUptimeCheck( // [END monitoring_uptime_check_create]] // [START monitoring_uptime_check_update]] - private static void updateUptimeCheck( - String checkName, String hostName, String pathName) throws IOException { + private static void updateUptimeCheck(String checkName, String hostName, String pathName) + throws IOException { UpdateUptimeCheckConfigRequest request = UpdateUptimeCheckConfigRequest.newBuilder() @@ -259,8 +258,7 @@ private static void getUptimeCheckConfig(String checkName) throws IOException { if (config != null) { System.out.println(config.toString()); } else { - System.out.println( - "No uptime check config found with ID " + checkName); + System.out.println("No uptime check config found with ID " + checkName); } } catch (Exception e) { usage("Exception getting uptime check: " + e.toString()); @@ -270,8 +268,7 @@ private static void getUptimeCheckConfig(String checkName) throws IOException { // [END monitoring_uptime_check_get]] // [START monitoring_uptime_check_delete]] - private static void deleteUptimeCheckConfig(String checkName) - throws IOException { + private static void deleteUptimeCheckConfig(String checkName) throws IOException { try (UptimeCheckServiceClient client = UptimeCheckServiceClient.create()) { client.deleteUptimeCheckConfig(checkName); } catch (Exception 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 ae890419..1c48b444 100644 --- a/samples/snippets/src/test/java/com/example/monitoring/UptimeIT.java +++ b/samples/snippets/src/test/java/com/example/monitoring/UptimeIT.java @@ -65,7 +65,7 @@ public void test1_CreateUptimeCheck() throws Exception { UptimeSample.main("create", "-n", config.getDisplayName(), "-o", "test.example.com", "-a", "/"); String actual = bout.toString(); assertThat(actual).contains(config.getDisplayName()); - checkName = actual.split(":")[1].trim(); + checkName = actual.split(":")[1].trim(); } @Test From c0797887dbb2696b069037f3d8fe26bdfa6df978 Mon Sep 17 00:00:00 2001 From: Blake Li Date: Tue, 9 Aug 2022 17:37:54 -0400 Subject: [PATCH 4/4] Update UptimeSample.java --- .../src/main/java/com/example/monitoring/UptimeSample.java | 1 - 1 file changed, 1 deletion(-) 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 3b56c9e0..29f5e82c 100644 --- a/samples/snippets/src/main/java/com/example/monitoring/UptimeSample.java +++ b/samples/snippets/src/main/java/com/example/monitoring/UptimeSample.java @@ -253,7 +253,6 @@ private static void getUptimeCheckConfig(String checkName) throws IOException { // create UptimeCheckServiceClient with retry setting try (UptimeCheckServiceClient client = UptimeCheckServiceClient.create(uptimeCheckServiceSettings)) { - // String fullCheckName = UptimeCheckConfigName.format(projectId, checkId); UptimeCheckConfig config = client.getUptimeCheckConfig(checkName); if (config != null) { System.out.println(config.toString());