reverse-diagrams 0.1.10__py3-none-any.whl → 0.2.6__py3-none-any.whl

{reverse_diagrams-0.1.10.dist-info → reverse_diagrams-0.2.6.dist-info}/METADATA

@@ -1,14 +1,13 @@
 Metadata-Version: 2.1
 Name: reverse_diagrams
-Version: 0.1.10
-Summary: Continuous Documentation Tool - Documentation as Code Tool - 
- This package create reverse diagrams  based on your current state in your cloud environment
+Version: 0.2.6
+Summary: Continuous Documentation Tool - Documentation as Code Tool -   This package create reverse diagrams  based on your current state in your cloud environment
 Project-URL: Homepage, https://github.com/velez94/reverse_diagrams
 Project-URL: Bug Tracker, https://github.com/velez94/reverse_diagrams/issues
-Author-email: Alejandro Velez <wilmar.velezl@sophossolutions.com>
+Author-email: Alejandro Velez <avelez@labvel.io>
 License: MIT License
         
-        Copyright (c) [2022] [Alejandro Velez]
+        Copyright (c) [2023] [Alejandro Velez]
         
         Permission is hereby granted, free of charge, to any person obtaining a copy
         of this software and associated documentation files (the "Software"), to deal
@@ -73,8 +72,7 @@ The following are the available options
 
 ```commandline
 $ reverse_diagrams -h 
-
-usage: reverse_diagrams [-h] [-c CLOUD] [-p PROFILE] [-o] [-i] [-v]
+usage: reverse_diagrams [-h] [-c CLOUD] [-p PROFILE] [-od OUTPUT_DIR_PATH] [-r REGION] [-o] [-i] [-v] [-d]
 
 options:
   -h, --help            show this help message and exit
@@ -82,10 +80,15 @@ options:
                         Cloud Provider, aws, gcp, azure
   -p PROFILE, --profile PROFILE
                         AWS cli profile for Access Analyzer Api
+  -od OUTPUT_DIR_PATH, --output_dir_path OUTPUT_DIR_PATH
+                        Name of folder to save the diagrams python code files
+  -r REGION, --region REGION
+                        AWS cli profile for Access Analyzer Api
   -o, --graph_organization
                         Set if you want to create graph for your organization
   -i, --graph_identity  Set if you want to create graph for your IAM Center
   -v, --version         Show version
+  -d, --debug           Debug Mode
 
 ```
 For example: 

reverse_diagrams-0.2.6.dist-info/RECORD

@@ -0,0 +1,17 @@
+src/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+src/reverse_diagrams.py,sha256=FIWMS9anHgfDkDJIUUtb6mnZZ11q3nX8Tlu5OgeFMys,8654
+src/aws/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+src/aws/describe_identity_store.py,sha256=5LRtm1IwMKMRX6vRqxIUzna3VqZkHAWD2HylUHdeB1Y,7246
+src/aws/describe_organization.py,sha256=ki0o3VhtH6mMV6EmZzlKPRfL5SKKVZGweK3NEiChXfY,3053
+src/aws/describe_sso.py,sha256=AOob-7fQk6paWjBT3dBx0Fizb5IhjWp1IIrOIv6s-yQ,1720
+src/banner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+src/banner/banner.py,sha256=D4XgGeWINUEpaQeMNIyuU1gY54bgv4UhantsDRj7TBQ,901
+src/dgms/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+src/dgms/graph_mapper.py,sha256=1YWY4eQPZzDlqahjmgBIQSmvmiCrmAdwZoOdggnI6zE,6259
+src/dgms/graph_template.py,sha256=4twiySM5MFl3oRpLkjTGgdswIwi2ee3lTjPmTx5SmG4,1170
+src/export_report/export_csv.py,sha256=6A3ZpoBnk6l1GVVmpH-_id6vKdd6JGipNCUwURtyIUs,88
+reverse_diagrams-0.2.6.dist-info/METADATA,sha256=FTOqse6qfcxYMrKjh4vIseE3a4QpojRe3jIcZ99Ohik,5395
+reverse_diagrams-0.2.6.dist-info/WHEEL,sha256=TJPnKdtrSue7xZ_AVGkp9YXcvDrobsjBds1du3Nx6dc,87
+reverse_diagrams-0.2.6.dist-info/entry_points.txt,sha256=VZNkrc7qUDbddTCH3pGd83EhUT3PHTx9MzpAk6bb6qc,63
+reverse_diagrams-0.2.6.dist-info/licenses/LICENSE,sha256=IaXsSIrH5zPkhwGm3_eitFhOsUeh8vnvs_ZazfXa4fM,1095
+reverse_diagrams-0.2.6.dist-info/RECORD,,

{reverse_diagrams-0.1.10.dist-info → reverse_diagrams-0.2.6.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.12.2
+Generator: hatchling 1.21.1
 Root-Is-Purelib: true
 Tag: py3-none-any

{reverse_diagrams-0.1.10.dist-info → reverse_diagrams-0.2.6.dist-info}/licenses/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) [2022] [Alejandro Velez]
+Copyright (c) [2023] [Alejandro Velez]
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

src/aws/describe_identity_store.py

@@ -4,13 +4,40 @@ from colorama import Fore
 import logging
 
 
-def list_groups(identity_store_id, client=boto3.client('identitystore', region_name="us-east-2"), ):
-    response = client.list_groups(
+def list_groups_pag(identity_store_id, client=boto3.client('identitystore', region_name="us-east-2"),
+                    next_token: str = None):
+    paginator = client.get_paginator('list_groups')
+    response_iterator = paginator.paginate(
         IdentityStoreId=identity_store_id,
+        PaginationConfig={
+            'MaxItems': 1000,
+            'PageSize': 4,
+            'StartingToken': next_token
+        }
+    )
+    response = response_iterator.build_full_result()
+    logging.info(response_iterator.build_full_result())
+    return response["Groups"]
+
 
+def list_groups(identity_store_id, client=boto3.client('identitystore', region_name="us-east-2"), ):
+    groups = client.list_groups(
+        IdentityStoreId=identity_store_id,
+        MaxResults=20
     )
 
-    return response["Groups"]
+    logging.info(groups)
+    l_groups = groups["Groups"]
+    logging.info(len(groups["Groups"]))
+
+    if len(groups["Groups"]) >= 20:
+        logging.info("Paginating ...")
+        ad_groups = list_groups_pag(identity_store_id=identity_store_id, client=client, next_token=groups["NextToken"])
+        for ad in ad_groups:
+            l_groups.append(ad)
+        logging.info(f"You have {len(l_groups)} Groups")
+
+    return l_groups
 
 
 def list_users(identity_store_id, client=boto3.client('identitystore', region_name="us-east-2"), ):
@@ -22,24 +49,82 @@ def list_users(identity_store_id, client=boto3.client('identitystore', region_na
     return response["Users"]
 
 
+def get_members_pag(identity_store_id, client=boto3.client('identitystore', region_name="us-east-2"),
+                    next_token: str = None):
+    paginator = client.get_paginator('list_group_memberships')
+    response_iterator = paginator.paginate(
+        IdentityStoreId=identity_store_id,
+        PaginationConfig={
+            'MaxItems': 1000,
+            'PageSize': 4,
+            'StartingToken': next_token
+        }
+    )
+    response = response_iterator.build_full_result()
+    logging.info(response_iterator.build_full_result())
+    return response["GroupMemberships"]
+
+
 def get_members(identity_store_id, groups, client=boto3.client('identitystore', region_name="us-east-2")):
     group_members = []
     for g in groups:
         response = client.list_group_memberships(
             IdentityStoreId=identity_store_id,
             GroupId=g["GroupId"],
+            MaxResults=20,
 
         )
+        members = response["GroupMemberships"]
+        logging.info(members)
+
+        logging.info(len(members))
+
+        if len(members) >= 20:
+            logging.info("Paginating ...")
+            ad_members = get_members_pag(identity_store_id=identity_store_id, client=client,
+                                         next_token=response["NextToken"])
+            for ad in ad_members:
+                members.append(ad)
+            logging.info(f"You have {len(ad_members)} Members")
+            print(f"You have {len(ad_members)} Members")
+
         group_members.append(
             {"group_id": g["GroupId"],
              "group_name": g["DisplayName"],
-             "members": response["GroupMemberships"]
+             "members": members
              }
         )
 
     return group_members
 
 
+def list_group_memberships(identitystore_client, group_name, pagination=True):
+    """
+    Lists memberships for a group in an AWS SSO identity store.
+
+    Args:
+        identitystore_client (boto3.client): Boto3 SSO identity store client
+        group_name (str): Name of the group to list memberships for
+        pagination (bool): Whether to enable result pagination (default: True)
+
+    Returns:
+        list: List of member objects
+    """
+
+    params = {'GroupName': group_name}
+    members = []
+
+    if pagination:
+        paginator = identitystore_client.get_paginator('list_group_memberships')
+        for page in paginator.paginate(**params):
+            members.extend(page['Members'])
+    else:
+        response = identitystore_client.list_group_memberships(**params)
+        members.extend(response['Members'])
+
+    return members
+
+
 def complete_group_members(group_members, users_list):
     for m in group_members:
         for u in m["members"]:
@@ -50,6 +135,22 @@ def complete_group_members(group_members, users_list):
     return group_members
 
 
+def l_groups_to_d_groups(l_groups: list = None):
+    """
+
+    :param l_groups:
+    :return:
+    """
+    names = []
+    for a in l_groups:
+        names.append(a['group_name'])
+    logging.info(names)
+
+    d_user_groups = dict(zip(names, l_groups))
+    logging.info(d_user_groups)
+    return d_user_groups
+
+
 def extend_account_assignments(accounts_list, permissions_sets, store_arn,
                                client_sso=boto3.client('identitystore', region_name="us-east-2")):
     account_assignments = []
@@ -69,15 +170,15 @@ def add_users_and_groups_assign(account_assignments_list, user_and_group_list, u
     for a in account_assignments_list:
         for g in user_and_group_list:
             if len(a) > 0 and a['PrincipalType'] == 'GROUP' and g["group_id"] == a['PrincipalId']:
-                print( Fore.YELLOW +
-                    f"Account {a['AccountId']} assign to {a['PrincipalType']} {g['group_name']} with permission set {list_permissions_set_arn_name[a['PermissionSetArn']]} or {a['PermissionSetArn']}" + Fore.RESET)
+                print(Fore.YELLOW +
+                      f"Account {a['AccountId']} assign to {a['PrincipalType']} {g['group_name']} with permission set {list_permissions_set_arn_name[a['PermissionSetArn']]} or {a['PermissionSetArn']}" + Fore.RESET)
 
                 a["GroupName"] = g['group_name']
                 a["PermissionSetName"] = list_permissions_set_arn_name[a['PermissionSetArn']]
         for u in user_list:
             if len(a) > 0 and a['PrincipalType'] == 'USER' and u["UserId"] == a['PrincipalId']:
                 print(Fore.YELLOW +
-                    f"Account {a['AccountId']} assign to {a['PrincipalType']} {u['UserName']} with permission set {a['PermissionSetArn']} or {list_permissions_set_arn_name[a['PermissionSetArn']]}"+ Fore.RESET)
+                      f"Account {a['AccountId']} assign to {a['PrincipalType']} {u['UserName']} with permission set {a['PermissionSetArn']} or {list_permissions_set_arn_name[a['PermissionSetArn']]}" + Fore.RESET)
                 a["UserName"] = u['UserName']
                 a["PermissionSetName"] = list_permissions_set_arn_name[a['PermissionSetArn']]
     logging.debug(f"Account Assignments --> {account_assignments_list}")

src/aws/describe_organization.py

@@ -33,7 +33,7 @@ def list_organizational_units(parent_id, client=boto3.client('organizations'), o
                 ous_next = list_organizational_units(ou["Id"], client=client, org_units=org_units)
                 logging.debug(ous_next)
                 if len(ous_next) > 0:
-                    logging.debug("Find NetsteD")
+                    logging.debug("Find Netsted")
 
     return org_units
 
@@ -76,9 +76,9 @@ def list_accounts(client=boto3.client('organizations')):
     accounts = client.list_accounts(
 
     )
-    print(accounts)
+    logging.info(accounts)
     l_account = accounts["Accounts"]
-    print(len(accounts["Accounts"]))
+    logging.info(len(accounts["Accounts"]))
     if len(accounts["Accounts"]) >= 20:
         logging.info("Paginating ...")
         ad_accounts = list_accounts_pag(client=client, next_token=accounts["NextToken"])

src/banner/banner.py

@@ -1,53 +1,22 @@
 from colorama import Fore
 
 
-banner = """
-\t \t \t \t Reverse Diagrams 
-░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-░░░▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒░░░░░░░░░░
-░▓███████████████████████████████████████████████████████████████████████████▓░░░░░░░░░░░░
-▓████▒▒░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-████▓░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-████▓░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░▓▓
-████▓░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░▓██▓
-████▓░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░█████
-████▓░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░█████
-████▓░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░█████
-████▓░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░█████
-████▓░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░█████
-████▓░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░█████
-████▓░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░█████
-████▓░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░████▓
-████▓░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒░░░░░░█████
-███▓▓░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░▒▓██████████████████▓▓▓██████████▓░░░░█████
-▓▓▓█▓░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░▓██████████████████▓▓██████████████▒░░░█████
-█▓██▓░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░▒█████████████████████████████████▓▒░░░░█████
-████▓░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░▓██████▒░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░█████
-████▓░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░▓██████▒░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░█████
-████▓░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░▓██████▒░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░█████
-████▓░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░▓██████▒░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░█████
-████▓░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░▓██████▒░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░█████
-████▓░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░▓██████▒░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░█████
-████▓░░░░░░░░░░░░░░░░░░░░░░░▒▓▓▓░░░░░░░░░░░░░▓██████▒░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░█████
-████▓░░░░░░░░░░░░░░░░░░▒▒▓████▓░░░░░░░░░░░░░░▓██████▒░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░█████
-████▓░░░░░░░░░░░░░▒▒▓████████▓░░░░░░░░░░░░░░░▓██████▒░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░█████
-████▓░░░░░░░░▒▒▓█████████████████████████▓█▓▓▓██████░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░█████
-████▓░░░░░▓▓████████████████████████████▓▓▓▓███████▓░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░█████
-███▓▓░░░░░░░▒▓▓█████████████████████████▓▓███████▓▒░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░████▓
-███▓▓░░░░░░░░░░░░▒▓▓█████████▓▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░█████
-████▓░░░░░░░░░░░░░░░░░▒▓▓█████▒░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░█████
-████▓░░░░░░░░░░░░░░░░░░░░░░▒▓▓█▒░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░█████
-████▓░░░░░░░░░░░░░░░░░░░░░░░░░░▒░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░█████
-████▓░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░█████
-████▓░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░█████
-████▓░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░█████
-████▓░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░████▓
-██▓░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░█████
-▒░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░█████
-░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░█████
-░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░█████
-░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░▒████▓
-░░░░░░░░░▓█▓▓▓███████████████████████████████████████████████████████████▓█▓▓▓██████████▓░
+banner = """Reverse Diagrams 
+
+ #####   ######  #    #  ######  #####    ####   ######
+ #    #  #       #    #  #       #    #  #       #
+ #    #  #####   #    #  #####   #    #   ####   #####
+ #####   #       #    #  #       #####        #  #
+ #   #   #        #  #   #       #   #   #    #  #
+ #    #  ######    ##    ######  #    #   ####   ######
+
+
+ #####      #      ##     ####   #####     ##    #    #   ####
+ #    #     #     #  #   #    #  #    #   #  #   ##  ##  #
+ #    #     #    #    #  #       #    #  #    #  # ## #   ####
+ #    #     #    ######  #  ###  #####   ######  #    #       #
+ #    #     #    #    #  #    #  #   #   #    #  #    #  #    #
+ #####      #    #    #   ####   #    #  #    #  #    #   ####
 """
 
 

src/dgms/graph_mapper.py

@@ -1,6 +1,8 @@
 import logging
+import os.path
 import re
 
+
 def format_name_string(a_string, action=None):
     """
 
@@ -11,48 +13,61 @@ def format_name_string(a_string, action=None):
     if action == 'split':
         if len(a_string) > 17:
             a_string = a_string[:16] + "\\n" + a_string[16:]
-    elif action== 'format':
+    elif action == 'format':
 
         a_string = re.sub('[-!?@.+]', '', a_string)
         a_string = a_string.replace(" ", '')
     return a_string
 
 
-def create_sso_mapper_complete(template_file, acc_assignments):
+def create_sso_mapper_complete(template_file, acc_assignments, d_groups):
+
     with open(template_file, 'a') as f:
         ident = "        "
 
         for key, value in acc_assignments.items():
-            print(f"\n    with Cluster('Account: {key}'):", file=f)
-            if len(value) > 0:
 
+            if len(value) > 0:
+                print(f"\n    with Cluster('Account: {key}'):", file=f)
                 for m in value:
                     logging.debug(m)
 
                     if "GroupName" in m.keys():
-
                         print(f"\n{ident}with Cluster('Group: {m['GroupName']}'):", file=f)
-                        print(f"\n{ident}{ident}gg_{format_name_string(m['GroupName'], 'format')}=Users(\"{format_name_string(m['GroupName'],'split')}\")\n"
-                              f"{ident}{ident}gg_{format_name_string(m['GroupName'], 'format')} \\\n"
-                              f"{ident}{ident}{ident}- Edge(color=\"brown\", style=\"dotted\") \\\n"
-                              f"{ident}{ident}{ident}- IAMPermissions(\"{format_name_string(m['PermissionSetName'], 'split')}\")",
-                              file=f)
+                        print(
+                            f"\n{ident}{ident}gg_{format_name_string(m['GroupName'], 'format')}=Users(\"{format_name_string(m['GroupName'], 'split')}\")\n"
+                            f"{ident}{ident}gg_{format_name_string(m['GroupName'], 'format')} \\\n"
+                            f"{ident}{ident}{ident}- Edge(color=\"brown\", style=\"dotted\", label=\"Permissions Set\") \\\n"
+                            f"{ident}{ident}{ident}- IAMPermissions(\"{format_name_string(m['PermissionSetName'], 'split')}\")\n"
+                            f"{ident}{ident}mm_{format_name_string(m['GroupName'], 'format')}={create_users_men(d_groups[m['GroupName']]['members'])} \n"  # ['members']}
+                            f"{ident}{ident}gg_{format_name_string(m['GroupName'], 'format')} \\\n"
+                            f"{ident}{ident}{ident}- Edge(color=\"darkgreen\", style=\"dotted\", label=\"Member\") \\\n"
+                            f"{ident}{ident}{ident}- mm_{format_name_string(m['GroupName'], 'format')} \n",
 
-                    if "UserName" in m.keys():
+                            file=f)
 
+                    if "UserName" in m.keys():
                         print(f"\n{ident}with Cluster('User: {m['UserName']}'):", file=f)
                         print(
-                            f"\n{ident}{ident}uu_{format_name_string(m['UserName'], 'format')}=User(\"{format_name_string(m['UserName'],'split')}\")\n"
-                            f"{ident}{ident}uu_{format_name_string(m['UserName'],'format')} \\\n"
+                            f"\n{ident}{ident}uu_{format_name_string(m['UserName'], 'format')}=User(\"{format_name_string(m['UserName'], 'split')}\")\n"
+                            f"{ident}{ident}uu_{format_name_string(m['UserName'], 'format')} \\\n"
                             f"{ident}{ident}{ident}- Edge(color=\"brown\", style=\"dotted\") \\\n"
-                            f"{ident}{ident}{ident}- IAMPermissions(\"{format_name_string(m['PermissionSetName'],'split')}\")",
+                            f"{ident}{ident}{ident}- IAMPermissions(\"{format_name_string(m['PermissionSetName'], 'split')}\")",
                             file=f)
                         # print(f"\n{ident}ou >> uu_{format_name_string(m['UserName'])}\n", file=f)
     f.close()
 
 
-def create_file(template_content, file_name):
-    with open(file_name, 'w') as f:
+def create_file(template_content, file_name, directory_path="."):
+    """
+
+    :param template_content:
+    :param file_name:
+    :param directory_path:
+    :return:
+    """
+    f_path=os.path.join(directory_path, file_name)
+    with open(f_path, 'w') as f:
         f.write(template_content)
     f.close()
 
@@ -75,10 +90,10 @@ def create_mapper(template_file, org, root_id, list_ous, list_accounts):
 
             for p in a["Parents"]:
                 if p['Type'] == 'ROOT':
-                    print(f"\n{ident}oo>> ou_{format_name_string(a['Name'],'format')}", file=f)
+                    print(f"\n{ident}oo>> ou_{format_name_string(a['Name'], 'format')}", file=f)
                 if p['Type'] == 'ORGANIZATIONAL_UNIT':
                     print(
-                        f"\n{ident}ou_{format_name_string(find_ou_name(list_ous, p['Id']),'format')}>> ou_{format_name_string(a['Name'],'format')}",
+                        f"\n{ident}ou_{format_name_string(find_ou_name(list_ous, p['Id']), 'format')}>> ou_{format_name_string(a['Name'], 'format')}",
                         file=f)
 
         for c, i in zip(list_accounts, range(len(list_accounts))):
@@ -90,7 +105,7 @@ def create_mapper(template_file, org, root_id, list_ous, list_accounts):
                 for o, j in zip(list_ous, range(len(list_ous))):
                     if p['Id'] == o["Id"] and p['Type'] == 'ORGANIZATIONAL_UNIT':
                         print(
-                            f"\n{ident}ou_{format_name_string(o['Name'],'format')}>> OrganizationsAccount(\"{c['account']}\\n{format_name_string(c['name'], action='split')}\")",
+                            f"\n{ident}ou_{format_name_string(o['Name'], 'format')}>> OrganizationsAccount(\"{c['account']}\\n{format_name_string(c['name'], action='split')}\")",
                             file=f)
 
         f.close()
@@ -107,10 +122,25 @@ def create_sso_mapper(template_file, group_and_members):
                 users = "["
                 for m in g["members"]:
                     user_name = m["MemberId"]["UserName"]
-                    users += f"User(\"{format_name_string(user_name,'split')}\"),"
+                    users += f"User(\"{format_name_string(user_name, 'split')}\"),"
 
                 users += "]"
                 print(f"\n{ident}{ident}gg_{l}= {users}", file=f)
             else:
                 print(f"\n{ident}gg_{l}= Users(\"{format_name_string(g['group_name'], 'split')}\")", file=f)
 
+
+def create_users_men(members):
+    if len(members) > 0:
+
+        users = "["
+        for m in members:
+            user_name = m["MemberId"]["UserName"]
+            users += f"User(\"{format_name_string(user_name, 'split')}\"),"
+
+        users += "]"
+
+    else:
+        users = "[]"
+
+    return users

src/reverse_diagrams.py

@@ -1,3 +1,5 @@
+import os
+
 import boto3
 import argparse
 import logging
@@ -7,13 +9,13 @@ from datetime import datetime
 from .aws.describe_organization import describe_organization, \
     list_accounts, index_accounts, list_roots, list_organizational_units, index_ous
 from .aws.describe_identity_store import order_accounts_assignments_list, extend_account_assignments, \
-    list_groups, get_members, list_users, complete_group_members, add_users_and_groups_assign
+    list_groups, get_members, list_users, complete_group_members, add_users_and_groups_assign, l_groups_to_d_groups
 from .aws.describe_sso import list_instances, extends_permissions_set, list_permissions_set
 from .dgms.graph_mapper import create_mapper, create_sso_mapper_complete, create_sso_mapper, create_file
 from .dgms.graph_template import graph_template, graph_template_sso, graph_template_sso_complete
 from .banner.banner import get_version
 
-__version__ = "0.1.10"
+__version__ = "0.2.4"
 
 
 def main() -> int:
@@ -21,7 +23,6 @@ def main() -> int:
     Crete architecture diagram from your current state
     :return:
     """
-    print('Date:', datetime.now())
 
     # Initialize parser
     parser = argparse.ArgumentParser()
@@ -29,12 +30,15 @@ def main() -> int:
                         help="Cloud Provider, aws, gcp, azure", default="aws")
     parser.add_argument("-p", "--profile",
                         help="AWS cli profile for Access Analyzer Api", default=None)
+    parser.add_argument("-od", "--output_dir_path",
+                        help="Name of folder to save the diagrams python code files", default=None)
     parser.add_argument("-r", "--region",
                         help="AWS cli profile for Access Analyzer Api", default="us-east-2")
     parser.add_argument("-o", "--graph_organization",
                         help="Set if you want to create graph for your organization", action='store_true')
     parser.add_argument("-i", "--graph_identity",
                         help="Set if you want to create graph for your IAM Center", action='store_true')
+
     parser.add_argument("-v", "--version",
                         help="Show version", action='store_true')
     parser.add_argument("-d", "--debug",
@@ -46,6 +50,11 @@ def main() -> int:
     if args.debug:
         logging.basicConfig(level=logging.DEBUG)
 
+    if args.output_dir_path:
+        diagrams_path = args.output_dir_path
+    else:
+        diagrams_path = "."
+
     if args.cloud == "aws":
         if args.profile:
             profile = args.profile
@@ -57,7 +66,7 @@ def main() -> int:
             region = args.region
 
         if args.graph_organization:
-            create_file(template_content=graph_template, file_name="graph_org.py")
+            create_file(template_content=graph_template, file_name="graph_org.py", directory_path=diagrams_path)
 
             client_org = boto3.client('organizations')
             organization = describe_organization(client_org)
@@ -77,17 +86,21 @@ def main() -> int:
             l_accounts = list_accounts(client_org)
             logging.debug(l_accounts)
             logging.debug("The Account list with parents info")
+            print(Fore.YELLOW + emoji.emojize(
+                f":information:  There are {len(l_accounts)} Accounts in your organization" + Fore.RESET))
             i_accounts = index_accounts(l_accounts)
             logging.debug(i_accounts)
 
             create_mapper(template_file="graph_org.py", org=organization, root_id=roots[0]["Id"], list_ous=ous,
                           list_accounts=i_accounts)
 
-            print(Fore.YELLOW + emoji.emojize( ":sparkles:   Run -> python3 graph_org.py " + Fore.RESET))
+            print(
+                Fore.YELLOW + emoji.emojize(f":sparkles:   Run -> python3 {diagrams_path}/graph_org.py " + Fore.RESET))
 
         if args.graph_identity:
-            create_file(template_content=graph_template_sso, file_name="graph_sso.py")
-            create_file(template_content=graph_template_sso_complete, file_name="graph_sso_complete.py")
+            create_file(template_content=graph_template_sso, file_name="graph_sso.py", directory_path=diagrams_path)
+            create_file(template_content=graph_template_sso_complete, file_name="graph_sso_complete.py",
+                        directory_path=diagrams_path)
 
             client_identity = boto3.client('identitystore', region_name=region)
             client_sso = boto3.client('sso-admin', region_name=region)
@@ -97,9 +110,11 @@ def main() -> int:
             logging.debug(store_instances)
             store_id = store_instances[0]["IdentityStoreId"]
             store_arn = store_instances[0]["InstanceArn"]
-            print(Fore.BLUE + "List groups" + Fore.RESET)
+            print(Fore.BLUE + emoji.emojize(":sparkle: List groups" + Fore.RESET))
             l_groups = list_groups(store_id, client=client_identity)
             logging.debug(l_groups)
+            print(Fore.YELLOW + emoji.emojize(
+                f":information:  There are {len(l_groups)} Groups in your Identity Store" + Fore.RESET))
 
             print(Fore.BLUE + emoji.emojize(":sparkle: Get groups and Users info" + Fore.RESET))
 
@@ -111,6 +126,7 @@ def main() -> int:
             l_users = list_users(store_id, client=client_identity)
             logging.debug(l_users)
             c_users_and_groups = complete_group_members(m_groups, l_users)
+            d_groups = l_groups_to_d_groups(l_groups=c_users_and_groups)
 
             logging.debug(c_users_and_groups)
             # Get Account assingments
@@ -132,9 +148,15 @@ def main() -> int:
             print(Fore.BLUE + emoji.emojize(":sparkle: Getting account assignments, users and groups" + Fore.RESET))
             f_accounts = order_accounts_assignments_list(accounts_dict=l_accounts,
                                                          account_assignments=account_assignments)
-            create_sso_mapper_complete(template_file="graph_sso_complete.py", acc_assignments=f_accounts)
-            create_sso_mapper(template_file="graph_sso.py", group_and_members=c_users_and_groups)
-            print(Fore.YELLOW + emoji.emojize( ":sparkles: Run -> python3 graph_sso_complete.py " + Fore.RESET))
+            f_path= os.path.join(diagrams_path, "graph_sso_complete.py")
+            create_sso_mapper_complete(template_file=f_path,
+                                       acc_assignments=f_accounts,
+                                       d_groups=d_groups)
+
+            f_path = os.path.join(diagrams_path, "graph_sso.py")
+            create_sso_mapper(template_file=f_path, group_and_members=c_users_and_groups)
+            print(Fore.YELLOW + emoji.emojize(
+                f":sparkles:  Run -> python3 {diagrams_path}/graph_sso_complete.py " + Fore.RESET))
     else:
         print(Fore.RED + emoji.emojize(":warning: " + f"The cloud provider {args.cloud} is no available" + Fore.RESET))
     if args.version:

graph_org.py

@@ -1,84 +0,0 @@
-
-from diagrams import Diagram, Cluster
-
-from diagrams.aws.management import Organizations, OrganizationsAccount, OrganizationsOrganizationalUnit
-
-with Diagram("Organizations-State", show=False, direction="TB"):
-    ou = OrganizationsOrganizationalUnit("OU")
-    oa = OrganizationsAccount("Account")
-
-    with Cluster('Organizations'):
-
-        oo = Organizations('o-9tlhkjyoii\n029921763173\nr-w3ow')
-
-        ou_Sandbox= OrganizationsOrganizationalUnit("ou-w3ow-1sumtdvp\nSandbox")
-
-        oo>> ou_Sandbox
-
-        ou_Security= OrganizationsOrganizationalUnit("ou-w3ow-oqvta8tc\nSecurity")
-
-        oo>> ou_Security
-
-        ou_Workloads= OrganizationsOrganizationalUnit("ou-w3ow-1lpmyfug\nWorkloads")
-
-        oo>> ou_Workloads
-
-        ou_Dev= OrganizationsOrganizationalUnit("ou-w3ow-k24p2opx\nDev")
-
-        oo>> ou_Dev
-
-        ou_DevSecOps= OrganizationsOrganizationalUnit("ou-w3ow-b334bby6\nDevSecOps")
-
-        oo>> ou_DevSecOps
-
-        ou_Core= OrganizationsOrganizationalUnit("ou-w3ow-93hiq3zr\nCore")
-
-        oo>> ou_Core
-
-        ou_PolicyStaging= OrganizationsOrganizationalUnit("ou-w3ow-18verpsm\nPolicy Staging")
-
-        oo>> ou_PolicyStaging
-
-        ou_Suspended= OrganizationsOrganizationalUnit("ou-w3ow-7vunsbkd\nSuspended")
-
-        oo>> ou_Suspended
-
-        ou_Shared= OrganizationsOrganizationalUnit("ou-w3ow-w7dzhzcz\nShared")
-
-        oo>> ou_Shared
-
-        ou_Infrastructure= OrganizationsOrganizationalUnit("ou-w3ow-9q06w8rz\nInfrastructure")
-
-        oo>> ou_Infrastructure
-
-        ou_BULab= OrganizationsOrganizationalUnit("ou-w3ow-qa633svy\nBU-Lab")
-
-        ou_Workloads>> ou_BULab
-
-        ou_Prod= OrganizationsOrganizationalUnit("ou-w3ow-4sdr4ejy\nProd")
-
-        ou_BULab>> ou_Prod
-
-        ou_SDLC= OrganizationsOrganizationalUnit("ou-w3ow-vop5vccd\nSDLC")
-
-        ou_BULab>> ou_SDLC
-
-        ou_Core>> OrganizationsAccount("884478634998\nLog archive")
-
-        ou_Security>> OrganizationsAccount("835863553119\nSecOps")
-
-        ou_Prod>> OrganizationsAccount("582441254763\nProd")
-
-        ou_Core>> OrganizationsAccount("895882538541\nSecurityTooling")
-
-        ou_DevSecOps>> OrganizationsAccount("105171185823\nDevSecOps")
-
-        ou_Infrastructure>> OrganizationsAccount("994261317734\nOps")
-
-        ou_Infrastructure>> OrganizationsAccount("155794986228\nSharedServices")
-
-        oo >> OrganizationsAccount("029921763173\nLabVel")
-
-        ou_Security>> OrganizationsAccount("837696987585\nOrganizationMana\nger")
-
-        ou_SDLC>> OrganizationsAccount("571340586587\nDev")

reverse_diagrams-0.1.10.dist-info/RECORD

@@ -1,19 +0,0 @@
-__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-graph_org.py,sha256=pKRj8UT59SdjLYoZZO4t1bcv6_k45yfMQ1sWeJD0-JQ,2529
-src/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-src/reverse_diagrams.py,sha256=CyiXEO93-SILGUXs7FpylFckCm5p_x8Q-1ykyigOUOI,7573
-src/aws/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-src/aws/describe_identity_store.py,sha256=ExOE_H0oXRAY1hRalc29fRXcOl5cnZ88TRh8W_4xzz8,3859
-src/aws/describe_organization.py,sha256=AnYPxmwquJ2OvsH0xu7fOXAWH9mRFIF9ocHWMaK4HyY,3039
-src/aws/describe_sso.py,sha256=AOob-7fQk6paWjBT3dBx0Fizb5IhjWp1IIrOIv6s-yQ,1720
-src/banner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-src/banner/banner.py,sha256=b2YVfSa7ZhuxCT6G_NFl5a7yC6T9cWB4XG_T9aHiwIY,12441
-src/dgms/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-src/dgms/graph_mapper.py,sha256=l4koVIQBgyAV2Pw_smlacAac2lY4_rC00EbaNEbEHlY,5163
-src/dgms/graph_template.py,sha256=4twiySM5MFl3oRpLkjTGgdswIwi2ee3lTjPmTx5SmG4,1170
-src/export_report/export_csv.py,sha256=6A3ZpoBnk6l1GVVmpH-_id6vKdd6JGipNCUwURtyIUs,88
-reverse_diagrams-0.1.10.dist-info/METADATA,sha256=gM4tBIKMB3xJC6juzJkcTw1B16qooDLAKdyPttlHLgU,5112
-reverse_diagrams-0.1.10.dist-info/WHEEL,sha256=hKi7AIIx6qfnsRbr087vpeJnrVUuDokDHZacPPMW7-Y,87
-reverse_diagrams-0.1.10.dist-info/entry_points.txt,sha256=VZNkrc7qUDbddTCH3pGd83EhUT3PHTx9MzpAk6bb6qc,63
-reverse_diagrams-0.1.10.dist-info/licenses/LICENSE,sha256=MM9PkfvzhAUao9B4KNX1DhHSKAhDf_-raLPgZPldwhw,1095
-reverse_diagrams-0.1.10.dist-info/RECORD,,