better-error-handling-no-credentials

gabrielsoltz · Mar 17, 2024 · 197057b · 197057b
1 parent 7328725
commit 197057b
Showing 1 changed file with 17 additions and 9 deletions.
diff --git a/lib/context/context.py b/lib/context/context.py
@@ -303,12 +303,20 @@ def get_account_organizations(self):
         except ClientError as err:
             organizations = False
             if not err.response["Error"]["Code"] == "AWSOrganizationsNotInUseException":
-                self.logger.warning(
+                self.logger.error(
                     "Failed to describe_organization: %s, for resource: %s - %s",
                     self.resource_account_id,
                     self.resource_arn,
                     err,
                 )
+        except Exception as err:
+            organizations = False
+            self.logger.error(
+                "Failed to describe_organization: %s, for resource: %s - %s",
+                self.resource_account_id,
+                self.resource_arn,
+                err,
+            )
         return organizations
 
     def get_account_organizations_details(self):
@@ -410,21 +418,21 @@ def get_account_alternate_contact(self, alternate_contact_type="SECURITY"):
                 alternate_contact = account_client.get_alternate_contact(
                     AlternateContactType=alternate_contact_type
                 ).get("AlternateContact")
-            except (NoCredentialsError, ClientError, EndpointConnectionError) as err:
+            except (ClientError, EndpointConnectionError) as err:
                 if err.response["Error"]["Code"] == "ResourceNotFoundException":
                     self.logger.info(
                         "No alternate contact found for account %s (%s) - %s",
                         self.resource_account_id,
                         self.resource_arn,
                         err,
                     )
-                else:
-                    self.logger.warning(
-                        "Failed to get_alternate_contact for account %s (%s) - %s",
-                        self.resource_account_id,
-                        self.resource_arn,
-                        err,
-                    )
+            except Exception as err:
+                self.logger.error(
+                    "Failed to get_alternate_contact for account %s (%s) - %s",
+                    self.resource_account_id,
+                    self.resource_arn,
+                    err,
+                )
         return alternate_contact
 
     def get_account_alias(self):