Merge branch 'main' into weboftrust-handle-unknown

commands/weboftrust.py

@@ -5,7 +5,14 @@
 import pyjq
 import urllib.parse
 
-from shared.common import parse_arguments, make_list, query_aws, get_regions, get_saml_providers
+from shared.common import (
+    parse_arguments,
+    make_list,
+    query_aws,
+    get_regions,
+    get_account_by_id,
+    get_saml_providers,
+)
 
 __description__ = "Create Web Of Trust diagram for accounts"
 
@@ -16,6 +23,7 @@
 # - How IAM admins are identified (need to leverage code from find_admins better)
 # - More services and their trust policies.
 
+
 def get_regional_vpc_peerings(region):
     vpc_peerings = query_aws(
         region.account, "ec2-describe-vpc-peering-connections", region
@@ -204,18 +212,24 @@ def get_iam_trusts(account, nodes, connections, connections_to_get):
 
                         found = False
                         for p in get_saml_providers():
-                            if p['name'] in saml_provider_arn.lower():
+                            if p["name"] in saml_provider_arn.lower():
                                 found = True
-                                if p.get('node') != None:
-                                        node = Account(**p['node'])
+                                if p.get("node") != None:
+                                    node = Account(**p["node"])
 
-                                if p.get('assumed'):
+                                if p.get("assumed"):
                                     assume_role_nodes.add(node)
 
                                 break
 
                         if not found:
-                            node = Account( json_blob={"id": "unknown", "name": "saml-unknown", "type": "saml-unknown"})
+                            node = Account(
+                                json_blob={
+                                    "id": "unknown",
+                                    "name": "saml-unknown",
+                                    "type": "saml-unknown",
+                                }
+                            )
                             assume_role_nodes.add(node)
 
                     except (StopIteration, IndexError):