From 17fe1dfeef1534b270e4765277cb8d7b42c4a9c4 Mon Sep 17 00:00:00 2001 From: Oyvind Albrigtsen Date: Fri, 5 Apr 2019 09:15:40 +0200 Subject: [PATCH] gcp-vpc-move-route/gcp-vpc-move-vip: fix Python 3 encoding issue --- heartbeat/gcp-vpc-move-route.in | 2 +- heartbeat/gcp-vpc-move-vip.in | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/heartbeat/gcp-vpc-move-route.in b/heartbeat/gcp-vpc-move-route.in index 591b97b1c..7dd47150d 100644 --- a/heartbeat/gcp-vpc-move-route.in +++ b/heartbeat/gcp-vpc-move-route.in @@ -193,7 +193,7 @@ def get_metadata(metadata_key, params=None, timeout=None): url = '%s?%s' % (metadata_url, params) request = urlrequest.Request(url, headers=METADATA_HEADERS) request_opener = urlrequest.build_opener(urlrequest.ProxyHandler({})) - return request_opener.open(request, timeout=timeout * 1.1).read() + return request_opener.open(request, timeout=timeout * 1.1).read().decode("utf-8") def validate(ctx): diff --git a/heartbeat/gcp-vpc-move-vip.in b/heartbeat/gcp-vpc-move-vip.in index bd6cf86cd..953d61ed7 100755 --- a/heartbeat/gcp-vpc-move-vip.in +++ b/heartbeat/gcp-vpc-move-vip.in @@ -106,7 +106,7 @@ def get_metadata(metadata_key, params=None, timeout=None): url = '%s?%s' % (metadata_url, params) request = urlrequest.Request(url, headers=METADATA_HEADERS) request_opener = urlrequest.build_opener(urlrequest.ProxyHandler({})) - return request_opener.open(request, timeout=timeout * 1.1).read() + return request_opener.open(request, timeout=timeout * 1.1).read().decode("utf-8") def get_instance(project, zone, instance): @@ -162,7 +162,7 @@ def get_alias(project, zone, instance): def get_localhost_alias(): net_iface = get_metadata('instance/network-interfaces', {'recursive': True}) - net_iface = json.loads(net_iface.decode('utf-8')) + net_iface = json.loads(net_iface) try: return net_iface[0]['ipAliases'][0] except (KeyError, IndexError):