From 70bedf6249e19b8ef9c9bd7615a01e4bd2dfbcd0 Mon Sep 17 00:00:00 2001 From: Vaughan Hilts Date: Thu, 26 Mar 2020 13:17:27 -0400 Subject: [PATCH 1/2] feat: Show the transport exception that happened when accessing the Compute Engine APIs and bump it to warning --- google/auth/compute_engine/_metadata.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/google/auth/compute_engine/_metadata.py b/google/auth/compute_engine/_metadata.py index 2861192d0..e1f59d992 100644 --- a/google/auth/compute_engine/_metadata.py +++ b/google/auth/compute_engine/_metadata.py @@ -88,11 +88,12 @@ def ping(request, timeout=_METADATA_DEFAULT_TIMEOUT, retry_count=3): and metadata_flavor == _METADATA_FLAVOR_VALUE ) - except exceptions.TransportError: - _LOGGER.info( - "Compute Engine Metadata server unavailable on" "attempt %s of %s", + except exceptions.TransportError as e: + _LOGGER.warning( + "Compute Engine Metadata server unavailable on" "attempt %s of %s. Reason: %s", retries + 1, retry_count, + e ) retries += 1 @@ -137,11 +138,12 @@ def get(request, path, root=_METADATA_ROOT, recursive=False, retry_count=5): response = request(url=url, method="GET", headers=_METADATA_HEADERS) break - except exceptions.TransportError: - _LOGGER.info( - "Compute Engine Metadata server unavailable on" "attempt %s of %s", + except exceptions.TransportError as e: + _LOGGER.warning( + "Compute Engine Metadata server unavailable on" "attempt %s of %s. Reason: %s", retries + 1, retry_count, + e ) retries += 1 else: From 47b32faa68ba1ad2291a1e1309696fb42d3ab354 Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Tue, 21 Jul 2020 15:18:42 -0400 Subject: [PATCH 2/2] fix: blacken to appease lint --- google/auth/compute_engine/_metadata.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/google/auth/compute_engine/_metadata.py b/google/auth/compute_engine/_metadata.py index e1f59d992..9ec238d35 100644 --- a/google/auth/compute_engine/_metadata.py +++ b/google/auth/compute_engine/_metadata.py @@ -90,10 +90,11 @@ def ping(request, timeout=_METADATA_DEFAULT_TIMEOUT, retry_count=3): except exceptions.TransportError as e: _LOGGER.warning( - "Compute Engine Metadata server unavailable on" "attempt %s of %s. Reason: %s", + "Compute Engine Metadata server unavailable on" + "attempt %s of %s. Reason: %s", retries + 1, retry_count, - e + e, ) retries += 1 @@ -140,10 +141,11 @@ def get(request, path, root=_METADATA_ROOT, recursive=False, retry_count=5): except exceptions.TransportError as e: _LOGGER.warning( - "Compute Engine Metadata server unavailable on" "attempt %s of %s. Reason: %s", + "Compute Engine Metadata server unavailable on" + "attempt %s of %s. Reason: %s", retries + 1, retry_count, - e + e, ) retries += 1 else: