Refactor BaseException into exception

src/watchmaker/status/providers/aws.py

@@ -51,7 +51,7 @@
             self.region = self.__get_response_from_server(
                 self.metadata_region_url
             )
-        except BaseException as ex:
+        except Exception as ex:  # pylint: disable=broad-exception-caught
             self.logger.error(
                 "Error retrieving id/region from metadata service %s", ex
             )
@@ -69,7 +69,7 @@
             try:
                 self.__tag_aws_instance(key, status)
                 return
-            except BaseException as ex:
+            except Exception as ex:  # pylint: disable=broad-exception-caught
                 logging.error("Exception while tagging aws instance %s", ex)
         self.__error_on_required_status(required)
 

src/watchmaker/status/providers/azure.py

@@ -40,7 +40,7 @@
 
         try:
             self.__set_ids_from_server()
-        except BaseException as ex:
+        except Exception as ex:  # pylint: disable=broad-exception-caught
             self.logger.error(
                 "Error retrieving ids from metadata service %s", ex
             )
@@ -52,7 +52,7 @@
             try:
                 self.__tag_azure_resouce(key, status)
                 return
-            except BaseException as ex:
+            except Exception as ex:  # pylint: disable=broad-exception-caught
                 logging.error("Exception while tagging azure resource %s", ex)
         self.__error_on_required_status(required)
 

src/watchmaker/utils/imds/detect/__init__.py

@@ -25,7 +25,6 @@
 
 def provider(supported_providers=None):
     """Identify and return identifier."""
-    exception_list = []
     results = []
     futures = []
     supported_providers = supported_providers if supported_providers else []
@@ -46,8 +45,8 @@
             results.append(fut.result())
         except InvalidProviderError:
             pass
-        except BaseException as ex:
-            exception_list.append(str(ex))
+        except Exception:  # pylint: disable=broad-exception-caught
+            log.error("Unexpected exception occurred", exc_info=True)
 
     if len(results) > 1:
         raise CloudDetectError("Detected more than one cloud provider")
@@ -64,6 +63,7 @@
     if cloud_provider_instance.identify():
         return cloud_provider_instance
 
+    log.debug("Environment is not %s", cloud_provider_instance.identifier)
     raise InvalidProviderError(
         "Environment is not %s" % cloud_provider_instance.identifier
     )

src/watchmaker/utils/imds/detect/providers/aws_provider.py

@@ -45,7 +45,7 @@
         self.logger.debug("Checking AWS metadata")
         try:
             return self.__is_valid_server()
-        except BaseException as ex:
+        except Exception as ex:  # pylint: disable=broad-exception-caught
             self.logger.error(ex)
             return False
 
@@ -87,7 +87,7 @@
                 },
                 method="PUT",
             )
-        except BaseException as error:
+        except Exception as error:  # pylint: disable=broad-exception-caught
             self.logger.debug("Failed to set IMDSv2 token: %s", error)
         return None
 

src/watchmaker/utils/imds/detect/providers/azure_provider.py

@@ -36,7 +36,7 @@
         self.logger.debug("Checking Azure metadata")
         try:
             return self.__is_valid_server()
-        except BaseException as ex:
+        except Exception as ex:  # pylint: disable=broad-exception-caught
             self.logger.warning("Error while checking server %s", str(ex))
             return False