From 6a304f4d9b3f22567c4c9aabc5fd8d95f024499f Mon Sep 17 00:00:00 2001 From: Shi Zhang Date: Fri, 12 Jun 2020 15:54:32 -0400 Subject: [PATCH 1/6] Add create example for POST check. --- .../api/v3/uptime-check-client/snippets.py | 88 ++++++++++++++++--- .../v3/uptime-check-client/snippets_test.py | 22 +++-- 2 files changed, 89 insertions(+), 21 deletions(-) diff --git a/monitoring/api/v3/uptime-check-client/snippets.py b/monitoring/api/v3/uptime-check-client/snippets.py index 78c4a5f6394..774e2196b89 100644 --- a/monitoring/api/v3/uptime-check-client/snippets.py +++ b/monitoring/api/v3/uptime-check-client/snippets.py @@ -22,14 +22,16 @@ import tabulate -# [START monitoring_uptime_check_create] -def create_uptime_check_config(project_name, host_name=None, +# [START monitoring_uptime_check_create_get] +def create_uptime_check_config_get(project_name, host_name=None, display_name=None): config = monitoring_v3.types.uptime_pb2.UptimeCheckConfig() config.display_name = display_name or 'New uptime check' config.monitored_resource.type = 'uptime_url' config.monitored_resource.labels.update( {'host': host_name or 'example.com'}) + config.http_check.request_method = monitoring_v3.enums.UptimeCheckConfig.HttpCheck.RequestMethod.GET + # config.http_check.body = 'foo=bar' config.http_check.path = '/' config.http_check.port = 80 config.timeout.seconds = 10 @@ -39,12 +41,36 @@ def create_uptime_check_config(project_name, host_name=None, new_config = client.create_uptime_check_config(project_name, config) pprint.pprint(new_config) return new_config -# [END monitoring_uptime_check_create] +# [END monitoring_uptime_check_create_get] +# [START monitoring_uptime_check_create_post] +def create_uptime_check_config_post(project_name, host_name=None, + display_name=None): + config = monitoring_v3.types.uptime_pb2.UptimeCheckConfig() + config.display_name = display_name or 'New uptime check' + config.monitored_resource.type = 'uptime_url' + config.monitored_resource.labels.update( + {'host': host_name or 'example.com'}) + config.http_check.request_method = monitoring_v3.enums.UptimeCheckConfig.HttpCheck.RequestMethod.POST + config.http_check.content_type = monitoring_v3.enums.UptimeCheckConfig.HttpCheck.ContentType.URL_ENCODED + config.http_check.body = 'foo=bar' + config.http_check.path = '/' + config.http_check.port = 80 + config.timeout.seconds = 10 + config.period.seconds = 300 + client = monitoring_v3.UptimeCheckServiceClient() + new_config = client.create_uptime_check_config(project_name, config) + pprint.pprint(new_config) + return new_config +# [END monitoring_uptime_check_create_post] + # [START monitoring_uptime_check_update] def update_uptime_check_config(config_name, new_display_name=None, - new_http_check_path=None): + new_http_check_path=None, + new_request_method=None, + new_content_type=None, + new_body=None): client = monitoring_v3.UptimeCheckServiceClient() config = client.get_uptime_check_config(config_name) field_mask = monitoring_v3.types.FieldMask() @@ -54,6 +80,15 @@ def update_uptime_check_config(config_name, new_display_name=None, if new_http_check_path: field_mask.paths.append('http_check.path') config.http_check.path = new_http_check_path + if new_request_method: + field_mask.paths.append('http_check.request_method') + config.http_check.request_method = monitoring_v3.enums.UptimeCheckConfig.HttpCheck.RequestMethod.POST + if new_content_type: + field_mask.paths.append('http_check.content_type') + config.http_check.content_type = monitoring_v3.enums.UptimeCheckConfig.HttpCheck.ContentType.URL_ENCODED + if new_body: + field_mask.paths.append('http_check.body') + config.http_check.body = 'foo=bar' client.update_uptime_check_config(config, field_mask) # [END monitoring_uptime_check_update] @@ -138,15 +173,28 @@ def project_name(): help=list_uptime_check_ips.__doc__ ) - create_uptime_check_config_parser = subparsers.add_parser( - 'create-uptime-check', - help=create_uptime_check_config.__doc__ + create_uptime_check_config_get_parser = subparsers.add_parser( + 'create-uptime-check-get', + help=create_uptime_check_config_get.__doc__ + ) + create_uptime_check_config_get_parser.add_argument( + '-d', '--display_name', + required=False, + ) + create_uptime_check_config_get_parser.add_argument( + '-o', '--host_name', + required=False, + ) + + create_uptime_check_config_post_parser = subparsers.add_parser( + 'create-uptime-check-post', + help=create_uptime_check_config_post.__doc__ ) - create_uptime_check_config_parser.add_argument( + create_uptime_check_config_post_parser.add_argument( '-d', '--display_name', required=False, ) - create_uptime_check_config_parser.add_argument( + create_uptime_check_config_post_parser.add_argument( '-o', '--host_name', required=False, ) @@ -185,6 +233,18 @@ def project_name(): '-p', '--uptime_check_path', required=False, ) + update_uptime_check_config_parser.add_argument( + '-r_m', '--request_method', + required=False, + ) + update_uptime_check_config_parser.add_argument( + '-c_t', '--content_type', + required=False, + ) + update_uptime_check_config_parser.add_argument( + '-b', '--body', + required=False, + ) args = parser.parse_args() @@ -194,8 +254,11 @@ def project_name(): elif args.command == 'list-uptime-check-ips': list_uptime_check_ips() - elif args.command == 'create-uptime-check': - create_uptime_check_config(project_name(), args.host_name, + elif args.command == 'create-uptime-check-get': + create_uptime_check_config_get(project_name(), args.host_name, + args.display_name) + elif args.command == 'create-uptime-check-post': + create_uptime_check_config_post(project_name(), args.host_name, args.display_name) elif args.command == 'get-uptime-check-config': @@ -207,7 +270,8 @@ def project_name(): elif args.command == 'update-uptime-check-config': if not args.display_name and not args.uptime_check_path: print('Nothing to update. Pass --display_name or ' - '--uptime_check_path.') + '--uptime_check_path or --request_method or ' + '--content_type or --body.') else: update_uptime_check_config(args.name, args.display_name, args.uptime_check_path) diff --git a/monitoring/api/v3/uptime-check-client/snippets_test.py b/monitoring/api/v3/uptime-check-client/snippets_test.py index 1411607c37c..41abb6b5537 100644 --- a/monitoring/api/v3/uptime-check-client/snippets_test.py +++ b/monitoring/api/v3/uptime-check-client/snippets_test.py @@ -36,15 +36,19 @@ def __init__(self): self.project_name = snippets.project_name() def __enter__(self): - # Create an uptime check config. - self.config = snippets.create_uptime_check_config( + print('test'); + # Create an uptime check config (GET request). + self.config_get = snippets.create_uptime_check_config_get( self.project_name, display_name=random_name(10)) + # Create an uptime check config (POST request). + self.config_post = snippets.create_uptime_check_config_post( + self.project_name, display_name=random_name(10)) return self def __exit__(self, type, value, traceback): # Delete the config. - snippets.delete_uptime_check_config(self.config.name) - + snippets.delete_uptime_check_config(self.config_get.name) + snippets.delete_uptime_check_config(self.config_post.name) @pytest.fixture(scope='session') def uptime(): @@ -64,24 +68,24 @@ def test_update_uptime_config(capsys): new_uptime_check_path = '/' + random_name(10) with UptimeFixture() as fixture: snippets.update_uptime_check_config( - fixture.config.name, new_display_name, new_uptime_check_path) + fixture.config_get.name, new_display_name, new_uptime_check_path) out, _ = capsys.readouterr() - snippets.get_uptime_check_config(fixture.config.name) + snippets.get_uptime_check_config(fixture.config_get.name) out, _ = capsys.readouterr() assert new_display_name in out assert new_uptime_check_path in out def test_get_uptime_check_config(capsys, uptime): - snippets.get_uptime_check_config(uptime.config.name) + snippets.get_uptime_check_config(uptime.config_get.name) out, _ = capsys.readouterr() - assert uptime.config.display_name in out + assert uptime.config_get.display_name in out def test_list_uptime_check_configs(capsys, uptime): snippets.list_uptime_check_configs(uptime.project_name) out, _ = capsys.readouterr() - assert uptime.config.display_name in out + assert uptime.config_get.display_name in out def test_list_uptime_check_ips(capsys): From 36ee94d3caecd40cf90d1c4816a75c3dffce650a Mon Sep 17 00:00:00 2001 From: Shi Zhang Date: Fri, 12 Jun 2020 16:03:51 -0400 Subject: [PATCH 2/6] Small fixes for POST check stuff. --- .../api/v3/uptime-check-client/snippets.py | 28 +------------------ 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/monitoring/api/v3/uptime-check-client/snippets.py b/monitoring/api/v3/uptime-check-client/snippets.py index 774e2196b89..8378f600410 100644 --- a/monitoring/api/v3/uptime-check-client/snippets.py +++ b/monitoring/api/v3/uptime-check-client/snippets.py @@ -31,7 +31,6 @@ def create_uptime_check_config_get(project_name, host_name=None, config.monitored_resource.labels.update( {'host': host_name or 'example.com'}) config.http_check.request_method = monitoring_v3.enums.UptimeCheckConfig.HttpCheck.RequestMethod.GET - # config.http_check.body = 'foo=bar' config.http_check.path = '/' config.http_check.port = 80 config.timeout.seconds = 10 @@ -68,9 +67,6 @@ def create_uptime_check_config_post(project_name, host_name=None, # [START monitoring_uptime_check_update] def update_uptime_check_config(config_name, new_display_name=None, new_http_check_path=None, - new_request_method=None, - new_content_type=None, - new_body=None): client = monitoring_v3.UptimeCheckServiceClient() config = client.get_uptime_check_config(config_name) field_mask = monitoring_v3.types.FieldMask() @@ -80,15 +76,6 @@ def update_uptime_check_config(config_name, new_display_name=None, if new_http_check_path: field_mask.paths.append('http_check.path') config.http_check.path = new_http_check_path - if new_request_method: - field_mask.paths.append('http_check.request_method') - config.http_check.request_method = monitoring_v3.enums.UptimeCheckConfig.HttpCheck.RequestMethod.POST - if new_content_type: - field_mask.paths.append('http_check.content_type') - config.http_check.content_type = monitoring_v3.enums.UptimeCheckConfig.HttpCheck.ContentType.URL_ENCODED - if new_body: - field_mask.paths.append('http_check.body') - config.http_check.body = 'foo=bar' client.update_uptime_check_config(config, field_mask) # [END monitoring_uptime_check_update] @@ -233,18 +220,6 @@ def project_name(): '-p', '--uptime_check_path', required=False, ) - update_uptime_check_config_parser.add_argument( - '-r_m', '--request_method', - required=False, - ) - update_uptime_check_config_parser.add_argument( - '-c_t', '--content_type', - required=False, - ) - update_uptime_check_config_parser.add_argument( - '-b', '--body', - required=False, - ) args = parser.parse_args() @@ -270,8 +245,7 @@ def project_name(): elif args.command == 'update-uptime-check-config': if not args.display_name and not args.uptime_check_path: print('Nothing to update. Pass --display_name or ' - '--uptime_check_path or --request_method or ' - '--content_type or --body.') + '--uptime_check_path.') else: update_uptime_check_config(args.name, args.display_name, args.uptime_check_path) From d87f945d6237d9a00e7eabf441c0f7708cf626e1 Mon Sep 17 00:00:00 2001 From: Shi Zhang Date: Fri, 12 Jun 2020 16:18:58 -0400 Subject: [PATCH 3/6] Have create example be one tag block --- monitoring/api/v3/uptime-check-client/snippets.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/monitoring/api/v3/uptime-check-client/snippets.py b/monitoring/api/v3/uptime-check-client/snippets.py index 8378f600410..a63295f31e4 100644 --- a/monitoring/api/v3/uptime-check-client/snippets.py +++ b/monitoring/api/v3/uptime-check-client/snippets.py @@ -22,7 +22,7 @@ import tabulate -# [START monitoring_uptime_check_create_get] +# [START monitoring_uptime_check_create] def create_uptime_check_config_get(project_name, host_name=None, display_name=None): config = monitoring_v3.types.uptime_pb2.UptimeCheckConfig() @@ -40,9 +40,7 @@ def create_uptime_check_config_get(project_name, host_name=None, new_config = client.create_uptime_check_config(project_name, config) pprint.pprint(new_config) return new_config -# [END monitoring_uptime_check_create_get] -# [START monitoring_uptime_check_create_post] def create_uptime_check_config_post(project_name, host_name=None, display_name=None): config = monitoring_v3.types.uptime_pb2.UptimeCheckConfig() @@ -62,7 +60,7 @@ def create_uptime_check_config_post(project_name, host_name=None, new_config = client.create_uptime_check_config(project_name, config) pprint.pprint(new_config) return new_config -# [END monitoring_uptime_check_create_post] +# [END monitoring_uptime_check_create] # [START monitoring_uptime_check_update] def update_uptime_check_config(config_name, new_display_name=None, From f14c32c2aefebc050dc43bada978dcdf093f5fca Mon Sep 17 00:00:00 2001 From: Shi Zhang Date: Sat, 13 Jun 2020 10:42:16 -0400 Subject: [PATCH 4/6] Syntax fixes --- monitoring/api/v3/uptime-check-client/snippets.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/monitoring/api/v3/uptime-check-client/snippets.py b/monitoring/api/v3/uptime-check-client/snippets.py index a63295f31e4..66c1dccbfba 100644 --- a/monitoring/api/v3/uptime-check-client/snippets.py +++ b/monitoring/api/v3/uptime-check-client/snippets.py @@ -26,7 +26,7 @@ def create_uptime_check_config_get(project_name, host_name=None, display_name=None): config = monitoring_v3.types.uptime_pb2.UptimeCheckConfig() - config.display_name = display_name or 'New uptime check' + config.display_name = display_name or 'New GET uptime check' config.monitored_resource.type = 'uptime_url' config.monitored_resource.labels.update( {'host': host_name or 'example.com'}) @@ -44,13 +44,13 @@ def create_uptime_check_config_get(project_name, host_name=None, def create_uptime_check_config_post(project_name, host_name=None, display_name=None): config = monitoring_v3.types.uptime_pb2.UptimeCheckConfig() - config.display_name = display_name or 'New uptime check' + config.display_name = display_name or 'New POST uptime check' config.monitored_resource.type = 'uptime_url' config.monitored_resource.labels.update( {'host': host_name or 'example.com'}) config.http_check.request_method = monitoring_v3.enums.UptimeCheckConfig.HttpCheck.RequestMethod.POST config.http_check.content_type = monitoring_v3.enums.UptimeCheckConfig.HttpCheck.ContentType.URL_ENCODED - config.http_check.body = 'foo=bar' + config.http_check.body = 'foo=bar'.encode('utf-8') config.http_check.path = '/' config.http_check.port = 80 config.timeout.seconds = 10 @@ -64,7 +64,7 @@ def create_uptime_check_config_post(project_name, host_name=None, # [START monitoring_uptime_check_update] def update_uptime_check_config(config_name, new_display_name=None, - new_http_check_path=None, + new_http_check_path=None): client = monitoring_v3.UptimeCheckServiceClient() config = client.get_uptime_check_config(config_name) field_mask = monitoring_v3.types.FieldMask() @@ -108,6 +108,8 @@ def get_uptime_check_config(config_name): # [START monitoring_uptime_check_delete] +# `config_name` is the `name` field of an UptimeCheckConfig. +# See https://cloud.google.com/monitoring/api/ref_v3/rest/v3/projects.uptimeCheckConfigs#UptimeCheckConfig. def delete_uptime_check_config(config_name): client = monitoring_v3.UptimeCheckServiceClient() client.delete_uptime_check_config(config_name) From 1dbf1f6637479f07f22d3a31a6504a4ccd8c42b1 Mon Sep 17 00:00:00 2001 From: Shi Zhang Date: Sat, 20 Jun 2020 18:21:33 -0400 Subject: [PATCH 5/6] Small fixes. --- monitoring/api/v3/uptime-check-client/snippets_test.py | 1 - 1 file changed, 1 deletion(-) diff --git a/monitoring/api/v3/uptime-check-client/snippets_test.py b/monitoring/api/v3/uptime-check-client/snippets_test.py index 41abb6b5537..2bb9db60966 100644 --- a/monitoring/api/v3/uptime-check-client/snippets_test.py +++ b/monitoring/api/v3/uptime-check-client/snippets_test.py @@ -36,7 +36,6 @@ def __init__(self): self.project_name = snippets.project_name() def __enter__(self): - print('test'); # Create an uptime check config (GET request). self.config_get = snippets.create_uptime_check_config_get( self.project_name, display_name=random_name(10)) From 8fc2c613cc66a882c464e542f4426e59434a6428 Mon Sep 17 00:00:00 2001 From: Shi Zhang Date: Wed, 1 Jul 2020 19:34:12 -0400 Subject: [PATCH 6/6] Ran black linter. --- .../api/v3/uptime-check-client/snippets.py | 170 +++++++++--------- .../v3/uptime-check-client/snippets_test.py | 23 +-- 2 files changed, 101 insertions(+), 92 deletions(-) diff --git a/monitoring/api/v3/uptime-check-client/snippets.py b/monitoring/api/v3/uptime-check-client/snippets.py index 1ef2b8d7f18..dcde3b58650 100644 --- a/monitoring/api/v3/uptime-check-client/snippets.py +++ b/monitoring/api/v3/uptime-check-client/snippets.py @@ -23,15 +23,15 @@ # [START monitoring_uptime_check_create] -def create_uptime_check_config_get(project_name, host_name=None, - display_name=None): +def create_uptime_check_config_get(project_name, host_name=None, display_name=None): config = monitoring_v3.types.uptime_pb2.UptimeCheckConfig() - config.display_name = display_name or 'New GET uptime check' - config.monitored_resource.type = 'uptime_url' - config.monitored_resource.labels.update( - {'host': host_name or 'example.com'}) - config.http_check.request_method = monitoring_v3.enums.UptimeCheckConfig.HttpCheck.RequestMethod.GET - config.http_check.path = '/' + config.display_name = display_name or "New GET uptime check" + config.monitored_resource.type = "uptime_url" + config.monitored_resource.labels.update({"host": host_name or "example.com"}) + config.http_check.request_method = ( + monitoring_v3.enums.UptimeCheckConfig.HttpCheck.RequestMethod.GET + ) + config.http_check.path = "/" config.http_check.port = 80 config.timeout.seconds = 10 config.period.seconds = 300 @@ -41,17 +41,20 @@ def create_uptime_check_config_get(project_name, host_name=None, pprint.pprint(new_config) return new_config -def create_uptime_check_config_post(project_name, host_name=None, - display_name=None): + +def create_uptime_check_config_post(project_name, host_name=None, display_name=None): config = monitoring_v3.types.uptime_pb2.UptimeCheckConfig() - config.display_name = display_name or 'New POST uptime check' - config.monitored_resource.type = 'uptime_url' - config.monitored_resource.labels.update( - {'host': host_name or 'example.com'}) - config.http_check.request_method = monitoring_v3.enums.UptimeCheckConfig.HttpCheck.RequestMethod.POST - config.http_check.content_type = monitoring_v3.enums.UptimeCheckConfig.HttpCheck.ContentType.URL_ENCODED - config.http_check.body = 'foo=bar'.encode('utf-8') - config.http_check.path = '/' + config.display_name = display_name or "New POST uptime check" + config.monitored_resource.type = "uptime_url" + config.monitored_resource.labels.update({"host": host_name or "example.com"}) + config.http_check.request_method = ( + monitoring_v3.enums.UptimeCheckConfig.HttpCheck.RequestMethod.POST + ) + config.http_check.content_type = ( + monitoring_v3.enums.UptimeCheckConfig.HttpCheck.ContentType.URL_ENCODED + ) + config.http_check.body = "foo=bar".encode("utf-8") + config.http_check.path = "/" config.http_check.port = 80 config.timeout.seconds = 10 config.period.seconds = 300 @@ -60,21 +63,26 @@ def create_uptime_check_config_post(project_name, host_name=None, new_config = client.create_uptime_check_config(project_name, config) pprint.pprint(new_config) return new_config + + # [END monitoring_uptime_check_create] - + # [START monitoring_uptime_check_update] -def update_uptime_check_config(config_name, new_display_name=None, - new_http_check_path=None): +def update_uptime_check_config( + config_name, new_display_name=None, new_http_check_path=None +): client = monitoring_v3.UptimeCheckServiceClient() config = client.get_uptime_check_config(config_name) field_mask = monitoring_v3.types.FieldMask() if new_display_name: - field_mask.paths.append('display_name') + field_mask.paths.append("display_name") config.display_name = new_display_name if new_http_check_path: - field_mask.paths.append('http_check.path') + field_mask.paths.append("http_check.path") config.http_check.path = new_http_check_path client.update_uptime_check_config(config, field_mask) + + # [END monitoring_uptime_check_update] @@ -85,6 +93,8 @@ def list_uptime_check_configs(project_name): for config in configs: pprint.pprint(config) + + # [END monitoring_uptime_check_list_configs] @@ -92,10 +102,14 @@ def list_uptime_check_configs(project_name): def list_uptime_check_ips(): client = monitoring_v3.UptimeCheckServiceClient() ips = client.list_uptime_check_ips() - print(tabulate.tabulate( - [(ip.region, ip.location, ip.ip_address) for ip in ips], - ('region', 'location', 'ip_address') - )) + print( + tabulate.tabulate( + [(ip.region, ip.location, ip.ip_address) for ip in ips], + ("region", "location", "ip_address"), + ) + ) + + # [END monitoring_uptime_check_list_ips] @@ -104,6 +118,8 @@ def get_uptime_check_config(config_name): client = monitoring_v3.UptimeCheckServiceClient() config = client.get_uptime_check_config(config_name) pprint.pprint(config) + + # [END monitoring_uptime_check_get] @@ -113,7 +129,9 @@ def get_uptime_check_config(config_name): def delete_uptime_check_config(config_name): client = monitoring_v3.UptimeCheckServiceClient() client.delete_uptime_check_config(config_name) - print('Deleted ', config_name) + print("Deleted ", config_name) + + # [END monitoring_uptime_check_delete] @@ -130,122 +148,110 @@ def project_id(): Returns: str -- the project name """ - project_id = os.environ['GOOGLE_CLOUD_PROJECT'] + project_id = os.environ["GOOGLE_CLOUD_PROJECT"] if not project_id: raise MissingProjectIdError( - 'Set the environment variable ' + - 'GCLOUD_PROJECT to your Google Cloud Project Id.') + "Set the environment variable " + + "GCLOUD_PROJECT to your Google Cloud Project Id." + ) return project_id def project_name(): - return 'projects/' + project_id() + return "projects/" + project_id() -if __name__ == '__main__': +if __name__ == "__main__": parser = argparse.ArgumentParser( - description='Demonstrates Uptime Check API operations.') + description="Demonstrates Uptime Check API operations." + ) - subparsers = parser.add_subparsers(dest='command') + subparsers = parser.add_subparsers(dest="command") list_uptime_check_configs_parser = subparsers.add_parser( - 'list-uptime-check-configs', - help=list_uptime_check_configs.__doc__ + "list-uptime-check-configs", help=list_uptime_check_configs.__doc__ ) list_uptime_check_ips_parser = subparsers.add_parser( - 'list-uptime-check-ips', - help=list_uptime_check_ips.__doc__ + "list-uptime-check-ips", help=list_uptime_check_ips.__doc__ ) create_uptime_check_config_get_parser = subparsers.add_parser( - 'create-uptime-check-get', - help=create_uptime_check_config_get.__doc__ + "create-uptime-check-get", help=create_uptime_check_config_get.__doc__ ) create_uptime_check_config_get_parser.add_argument( - '-d', '--display_name', - required=False, + "-d", "--display_name", required=False, ) create_uptime_check_config_get_parser.add_argument( - '-o', '--host_name', - required=False, + "-o", "--host_name", required=False, ) create_uptime_check_config_post_parser = subparsers.add_parser( - 'create-uptime-check-post', - help=create_uptime_check_config_post.__doc__ + "create-uptime-check-post", help=create_uptime_check_config_post.__doc__ ) create_uptime_check_config_post_parser.add_argument( - '-d', '--display_name', - required=False, + "-d", "--display_name", required=False, ) create_uptime_check_config_post_parser.add_argument( - '-o', '--host_name', - required=False, + "-o", "--host_name", required=False, ) get_uptime_check_config_parser = subparsers.add_parser( - 'get-uptime-check-config', - help=get_uptime_check_config.__doc__ + "get-uptime-check-config", help=get_uptime_check_config.__doc__ ) get_uptime_check_config_parser.add_argument( - '-m', '--name', - required=True, + "-m", "--name", required=True, ) delete_uptime_check_config_parser = subparsers.add_parser( - 'delete-uptime-check-config', - help=delete_uptime_check_config.__doc__ + "delete-uptime-check-config", help=delete_uptime_check_config.__doc__ ) delete_uptime_check_config_parser.add_argument( - '-m', '--name', - required=True, + "-m", "--name", required=True, ) update_uptime_check_config_parser = subparsers.add_parser( - 'update-uptime-check-config', - help=update_uptime_check_config.__doc__ + "update-uptime-check-config", help=update_uptime_check_config.__doc__ ) update_uptime_check_config_parser.add_argument( - '-m', '--name', - required=True, + "-m", "--name", required=True, ) update_uptime_check_config_parser.add_argument( - '-d', '--display_name', - required=False, + "-d", "--display_name", required=False, ) update_uptime_check_config_parser.add_argument( - '-p', '--uptime_check_path', - required=False, + "-p", "--uptime_check_path", required=False, ) args = parser.parse_args() - if args.command == 'list-uptime-check-configs': + if args.command == "list-uptime-check-configs": list_uptime_check_configs(project_name()) - elif args.command == 'list-uptime-check-ips': + elif args.command == "list-uptime-check-ips": list_uptime_check_ips() - elif args.command == 'create-uptime-check-get': - create_uptime_check_config_get(project_name(), args.host_name, - args.display_name) - elif args.command == 'create-uptime-check-post': - create_uptime_check_config_post(project_name(), args.host_name, - args.display_name) + elif args.command == "create-uptime-check-get": + create_uptime_check_config_get( + project_name(), args.host_name, args.display_name + ) + elif args.command == "create-uptime-check-post": + create_uptime_check_config_post( + project_name(), args.host_name, args.display_name + ) - elif args.command == 'get-uptime-check-config': + elif args.command == "get-uptime-check-config": get_uptime_check_config(args.name) - elif args.command == 'delete-uptime-check-config': + elif args.command == "delete-uptime-check-config": delete_uptime_check_config(args.name) - elif args.command == 'update-uptime-check-config': + elif args.command == "update-uptime-check-config": if not args.display_name and not args.uptime_check_path: - print('Nothing to update. Pass --display_name or ' - '--uptime_check_path.') + print("Nothing to update. Pass --display_name or " "--uptime_check_path.") else: - update_uptime_check_config(args.name, args.display_name, - args.uptime_check_path) + update_uptime_check_config( + args.name, args.display_name, args.uptime_check_path + ) diff --git a/monitoring/api/v3/uptime-check-client/snippets_test.py b/monitoring/api/v3/uptime-check-client/snippets_test.py index 2bb9db60966..1dfe51ffcc6 100644 --- a/monitoring/api/v3/uptime-check-client/snippets_test.py +++ b/monitoring/api/v3/uptime-check-client/snippets_test.py @@ -23,8 +23,7 @@ def random_name(length): - return ''.join( - [random.choice(string.ascii_lowercase) for i in range(length)]) + return "".join([random.choice(string.ascii_lowercase) for i in range(length)]) class UptimeFixture: @@ -36,12 +35,14 @@ def __init__(self): self.project_name = snippets.project_name() def __enter__(self): - # Create an uptime check config (GET request). + # Create an uptime check config (GET request). self.config_get = snippets.create_uptime_check_config_get( - self.project_name, display_name=random_name(10)) - # Create an uptime check config (POST request). + self.project_name, display_name=random_name(10) + ) + # Create an uptime check config (POST request). self.config_post = snippets.create_uptime_check_config_post( - self.project_name, display_name=random_name(10)) + self.project_name, display_name=random_name(10) + ) return self def __exit__(self, type, value, traceback): @@ -49,7 +50,8 @@ def __exit__(self, type, value, traceback): snippets.delete_uptime_check_config(self.config_get.name) snippets.delete_uptime_check_config(self.config_post.name) -@pytest.fixture(scope='session') + +@pytest.fixture(scope="session") def uptime(): with UptimeFixture() as uptime: yield uptime @@ -64,10 +66,11 @@ def test_create_and_delete(capsys): def test_update_uptime_config(capsys): # create and delete happen in uptime fixture. new_display_name = random_name(10) - new_uptime_check_path = '/' + random_name(10) + new_uptime_check_path = "/" + random_name(10) with UptimeFixture() as fixture: snippets.update_uptime_check_config( - fixture.config_get.name, new_display_name, new_uptime_check_path) + fixture.config_get.name, new_display_name, new_uptime_check_path + ) out, _ = capsys.readouterr() snippets.get_uptime_check_config(fixture.config_get.name) out, _ = capsys.readouterr() @@ -90,4 +93,4 @@ def test_list_uptime_check_configs(capsys, uptime): def test_list_uptime_check_ips(capsys): snippets.list_uptime_check_ips() out, _ = capsys.readouterr() - assert 'Singapore' in out + assert "Singapore" in out