Fixed ambiguous error message raised when resolving region from IMDS

aws · Nov 13, 2024 · d627f04 · d627f04
1 parent d67663a
commit d627f04
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/.changes/next-release/bugfix-IMDS-70100.json b/.changes/next-release/bugfix-IMDS-70100.json
@@ -0,0 +1,5 @@
+{
+  "type": "bugfix",
+  "category": "IMDS",
+  "description": "Fixed ambiguous error raised when failing to resolve a region from IMDS."
+}
diff --git a/awscli/utils.py b/awscli/utils.py
@@ -171,9 +171,17 @@ def retrieve_region(self):
             region = self._get_region()
             return region
         except self._RETRIES_EXCEEDED_ERROR_CLS:
-            logger.debug("Max number of attempts exceeded (%s) when "
-                         "attempting to retrieve data from metadata service.",
-                         self._num_attempts)
+            logger.debug(
+                "Max number of attempts exceeded (%s) when "
+                "attempting to retrieve data from metadata service.",
+                self._num_attempts
+            )
+        except BadIMDSRequestError as e:
+            logger.debug(
+                "Failed to retrieve a region from IMDS. "
+                "Region detection may not be supported from this endpoint: "
+                "%s", e.request.url
+            )
         return None
 
     def _get_region(self):