reverse-diagrams 1.2.2__py3-none-any.whl → 1.3.1__py3-none-any.whl

{reverse_diagrams-1.2.2.dist-info → reverse_diagrams-1.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: reverse_diagrams
-Version: 1.2.2
+Version: 1.3.1
 Summary: Continuous Documentation Tool - Documentation as Code Tool -   This package create reverse diagrams  based on your current state in your cloud environment using diagrams library
 Project-URL: Homepage, https://github.com/velez94/reverse_diagrams
 Project-URL: Bug Tracker, https://github.com/velez94/reverse_diagrams/issues
@@ -26,6 +26,7 @@ Requires-Dist: boto3>=1.26.44
 Requires-Dist: colorama>=0.4.4
 Requires-Dist: diagrams>=0.23.4
 Requires-Dist: emoji>=2.2.0
+Requires-Dist: inquirer>=3.1.4
 Requires-Dist: rich>=13.7.0
 Description-Content-Type: text/markdown
 
@@ -39,10 +40,12 @@ Description-Content-Type: text/markdown
 - [Use](#use)
   - [Subcommands](#subcommands)
     - [watch](#watch)
-  - [Service supported](#service-supported)
-      - [AWS Organizations](#aws-organizations)
-      - [Identity and Access Manager Center (SSO)](#identity-and-access-manager-center-sso)
-  - [Additional Commands](#additional-commands)
+- [Service supported](#service-supported)
+  - [AWS Organizations](#aws-organizations)
+  - [Identity and Access Manager Center (SSO)](#identity-and-access-manager-center-sso)
+- [Additional Commands](#additional-commands)
+  - [watch](#watch-1)
+    - [Options](#options)
     - [Combine the options](#combine-the-options)
   - [Extras](#extras)
     - [Enable autocomplete](#enable-autocomplete)
@@ -53,10 +56,11 @@ Description-Content-Type: text/markdown
 
 > Continuous Documentation Tool - Documentation as Code Tool
 
-This package create reverse diagrams  based on your current state in your cloud environment.
+This package create diagrams and help to audit your services from your shell.
+
 # Requirement
 
-AWS programmatic access using AWS CLI. :arrow_right: [Configuring the AWS CLI](https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-configure.html)
+AWS programmatic access using AWS CLI.  [Configuring the AWS CLI](https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-configure.html)
 
 
 # Install 
@@ -169,19 +173,47 @@ Create view of diagrams in console based on kind of diagram and json file.:
                         diagrams/json/account_assignments.json.jso
 ```
 
-## Service supported
+# Service supported
 
-#### AWS Organizations
+## AWS Organizations
 
 ```commandline
 reverse_diagrams -p my-profile -o -r us-east-2
 ```
-#### Identity and Access Manager Center (SSO)
+## Identity and Access Manager Center (SSO)
 
 ```commandline
 reverse_diagrams -p my-profile -i -r us-east-2
 ```
-## Additional Commands
+# Additional Commands
+
+## watch
+You can watch the configuration and summary in your shell based on json files generated previously.
+
+### Options
+
+```commandline
+$ reverse_diagrams watch -h 
+usage: reverse_diagrams watch [-h] [-wo WATCH_GRAPH_ORGANIZATION] [-wi WATCH_GRAPH_IDENTITY] [-wa WATCH_GRAPH_ACCOUNTS_ASSIGNMENTS]
+
+Create view of diagrams in console based on kind of diagram and json file.
+
+options:
+  -h, --help            show this help message and exit
+
+Create view of diagrams in console based on kind of diagram and json file.:
+  -wo WATCH_GRAPH_ORGANIZATION, --watch_graph_organization WATCH_GRAPH_ORGANIZATION
+                        Set if you want to see graph for your organization structure summary. For example: reverse_diagrams watch watch -wo diagrams/json/organizations.json
+  -wi WATCH_GRAPH_IDENTITY, --watch_graph_identity WATCH_GRAPH_IDENTITY
+                        Set if you want to see graph for your groups and users. For example: reverse_diagrams watch watch -wi diagrams/json/groups.json
+  -wa WATCH_GRAPH_ACCOUNTS_ASSIGNMENTS, --watch_graph_accounts_assignments WATCH_GRAPH_ACCOUNTS_ASSIGNMENTS
+                        Set if you want to see graph for your IAM Center- Accounts assignments. For example: reverse_diagrams watch watch -wa diagrams/json/account_assignments.json
+
+```
+
+For example, to watch account assignments: 
+
+![view Acoount assigments](docs/images/show_console_view.gif)
 
 ### Combine the options
 

{reverse_diagrams-1.2.2.dist-info → reverse_diagrams-1.3.1.dist-info}/RECORD

@@ -1,9 +1,9 @@
 src/__init__.py,sha256=lOE8TAJF_WdxgxEBxVz9t8dC3s3t2c21VWYPrzfznkE,17
-src/reverse_diagrams.py,sha256=qFAEVbkLhpvttslCkSjCjlDF8Hu9u6NabGYledUeyD0,4236
-src/version.py,sha256=IjzCpUToK2ceTC9HDaPGKdRVJBSBX5GpUi-2XqbbVsY,48
+src/reverse_diagrams.py,sha256=dVkz429-8MtDAfQFxVhchuuVrH8D-IcYyTBgRnw65cA,4208
+src/version.py,sha256=lyd6uObU7M31dNBuGYnxL9c0wbRwaQfFrSpXL3QGeKs,48
 src/aws/__init__.py,sha256=lOE8TAJF_WdxgxEBxVz9t8dC3s3t2c21VWYPrzfznkE,17
-src/aws/describe_identity_store.py,sha256=y96MJUiPImyJBZMqcL7iomLxoCuKLdW-D8k7fJ0GaEM,15289
-src/aws/describe_organization.py,sha256=9k0LTTI31b1jiJ8id-VfnYmCNt1WAENCVRBCVahcKO4,13828
+src/aws/describe_identity_store.py,sha256=oqw7KfwQFGySnQz-qAuJDCpRoJLTpN2eiyamXiln6x0,15364
+src/aws/describe_organization.py,sha256=_FEikrnsP1HaXhfglaQwHfOR1KGdDtF6gc5DAPcXsRs,13962
 src/aws/describe_sso.py,sha256=z65RnoxJDVSMPB1TRJAxi8S8-DllwmaxxXaZ4uicSzU,4915
 src/banner/__init__.py,sha256=lOE8TAJF_WdxgxEBxVz9t8dC3s3t2c21VWYPrzfznkE,17
 src/banner/banner.py,sha256=XREWjVLp1-PHVdfBSoADgw0LvRpYU5u7NPaUraL9Els,3893
@@ -11,12 +11,11 @@ src/dgms/__init__.py,sha256=lOE8TAJF_WdxgxEBxVz9t8dC3s3t2c21VWYPrzfznkE,17
 src/dgms/graph_mapper.py,sha256=xutxzxLCIGSBfHCAF-BnWXN21bjzusA43ZhKtXUir2E,7714
 src/dgms/graph_template.py,sha256=IOEmTk9A0xqEhtdNnaFrVDJlBF0ggW0WpxosW4nbcQo,1217
 src/reports/__init__.py,sha256=lOE8TAJF_WdxgxEBxVz9t8dC3s3t2c21VWYPrzfznkE,17
-src/reports/console_view.py,sha256=V3k2iz3ITJFv3Q1FkLavJvqOOXi_EgkuTUrWVADyF-c,3020
-src/reports/organizations_complete_state.json,sha256=nP30DTrwlm5aw6YZB03CiLyK9snjTgdH1ZjZRq3bXVI,2628
+src/reports/console_view.py,sha256=1_ET53Bn_vKlLmqr0Sih5szP5kNFCQRH4A8tXJgip2Y,5832
 src/reports/save_results.py,sha256=g-UphsQ_tfDhvNH3QNV7j68TWWvy44vbbjaNyn4KWhU,719
 src/reports/tes.py,sha256=c6TdxhAedfHjPrqaRw0nucdCEQOM9xKsgw35IOIDdYs,17691
-reverse_diagrams-1.2.2.dist-info/METADATA,sha256=vCNaELVCiVz2mD5TxTYHCXYUDXX4Ze1prk22Y6bkg7s,8106
-reverse_diagrams-1.2.2.dist-info/WHEEL,sha256=TJPnKdtrSue7xZ_AVGkp9YXcvDrobsjBds1du3Nx6dc,87
-reverse_diagrams-1.2.2.dist-info/entry_points.txt,sha256=VZNkrc7qUDbddTCH3pGd83EhUT3PHTx9MzpAk6bb6qc,63
-reverse_diagrams-1.2.2.dist-info/licenses/LICENSE,sha256=o6nDaQ7M9xbR0L7HSJ3A-1JbBPoZro_zhVPO4-M5CAQ,571
-reverse_diagrams-1.2.2.dist-info/RECORD,,
+reverse_diagrams-1.3.1.dist-info/METADATA,sha256=xOmutWsxQYayFL0MQOw80RD9phB-eP4sGo812soczRk,9542
+reverse_diagrams-1.3.1.dist-info/WHEEL,sha256=TJPnKdtrSue7xZ_AVGkp9YXcvDrobsjBds1du3Nx6dc,87
+reverse_diagrams-1.3.1.dist-info/entry_points.txt,sha256=VZNkrc7qUDbddTCH3pGd83EhUT3PHTx9MzpAk6bb6qc,63
+reverse_diagrams-1.3.1.dist-info/licenses/LICENSE,sha256=o6nDaQ7M9xbR0L7HSJ3A-1JbBPoZro_zhVPO4-M5CAQ,571
+reverse_diagrams-1.3.1.dist-info/RECORD,,

src/aws/describe_identity_store.py

@@ -15,6 +15,10 @@ from ..dgms.graph_template import (
     graph_template_sso,
     graph_template_sso_complete,
 )
+from ..reports.console_view import (
+    create_account_assignments_view,
+    create_group_console_view,
+)
 from ..reports.save_results import save_results
 from .describe_organization import list_accounts
 from .describe_sso import (
@@ -24,7 +28,6 @@ from .describe_sso import (
     list_instances,
     list_permissions_set,
 )
-from ..reports.console_view import create_console_view, create_account_assignments_view
 
 
 def list_groups_pag(identity_store_id, region, next_token: str = None):
@@ -59,8 +62,7 @@ def list_groups(identity_store_id, region):
     identity_client = client("identitystore", region_name=region)
 
     groups = identity_client.list_groups(
-        IdentityStoreId=identity_store_id,
-        MaxResults=20
+        IdentityStoreId=identity_store_id, MaxResults=20
     )
 
     logging.info(groups)
@@ -278,7 +280,7 @@ def extend_account_assignments(accounts_list, permissions_sets, store_arn, regio
     for p, y in zip(
         permissions_sets,
         track(
-            range(len(permissions_sets) ),
+            range(len(permissions_sets)),
             description="Getting account assignments ...",
         ),
     ):
@@ -314,7 +316,7 @@ def add_users_and_groups_assign(
     for a, y in zip(
         account_assignments_list,
         track(
-            range(len(account_assignments_list) ),
+            range(len(account_assignments_list)),
             description="Create user and groups assignments ...",
         ),
     ):
@@ -483,8 +485,10 @@ def graph_identity_center(diagrams_path, region, auto):
             print(Fore.RED + "❌ Error creating diagrams")
             print(command)
 
-        create_console_view(file_path=f"{json_path}/groups.json")
-        create_account_assignments_view(file_path=f"{json_path}/account_assignments.json")
+        create_group_console_view(groups=d_groups)  # (f"{json_path}/groups.json")
+        create_account_assignments_view(
+            assign=f_accounts
+        )  # load_json(f"{json_path}/account_assignments.json"))
     else:
         print(
             Fore.YELLOW

src/aws/describe_organization.py

@@ -242,80 +242,93 @@ def search_ou_map(map_ou: dict, ou_id, level=0, tree="."):
     return None
 
 
-def init_org_complete(root_id, org, list_ous, ):
+def init_org_complete(
+    root_id,
+    org,
+    list_ous,
+):
+    """
+    Init organization dictionary.
+
+    :param root_id:
+    :param org:
+    :param list_ous:
+    :return:
+    """
     organizations_complete = {
         "rootId": root_id,
-        "masterAccountId": org['MasterAccountId'],
+        "masterAccountId": org["MasterAccountId"],
         "noOutAccounts": [],
-        "organizationalUnits": {}
+        "organizationalUnits": {},
     }
-
     # Iterate in ous for getting ous tree
     for a, i in zip(list_ous, range(len(list_ous))):
-
         for p in a["Parents"]:
             if p["Type"] == "ROOT":
-                organizations_complete["organizationalUnits"][a['Name']] = {
-                    "Id": a['Id'],
-                    "Name": a['Name'],
+                organizations_complete["organizationalUnits"][a["Name"]] = {
+                    "Id": a["Id"],
+                    "Name": a["Name"],
                     "accounts": {},
-                    "nestedOus": {}}
+                    "nestedOus": {},
+                }
     return organizations_complete
 
 
 # create organization complete map
-def map_organizations_complete(organizations_complete: dict,
-                               list_ous, llist_accounts,
-                               reference_outs_list,
-                               ):
+def map_organizations_complete(
+    organizations_complete: dict,
+    list_ous,
+    llist_accounts,
+    reference_outs_list,
+):
     """
     Create complete mapper file.
 
-
     :param reference_outs_list:
     :param organizations_complete:
     :param list_ous:
     :param llist_accounts:
     :return:
     """
-
     # Iterate in ous for getting ous tree
     for a, i in zip(list_ous, range(len(list_ous))):
-
         for p in a["Parents"]:
-
             if p["Type"] == "ORGANIZATIONAL_UNIT":
-
-                o = find_ou_name(reference_outs_list, p['Id'])
+                o = find_ou_name(reference_outs_list, p["Id"])
 
                 if o not in organizations_complete["organizationalUnits"].keys():
-                    p = search_ou_map(organizations_complete["organizationalUnits"], ou_id=o)
+                    p = search_ou_map(
+                        organizations_complete["organizationalUnits"], ou_id=o
+                    )
                     o = p["Name"]
 
                 organizations_complete["organizationalUnits"][o]["nestedOus"][
-                    find_ou_name(reference_outs_list, a['Id'])] = {
-
-                    "Id": a['Id'],
-                    "Name": a['Name'],
-                    "accounts": [],
-                    "nestedOus": {}
-
-                }
+                    find_ou_name(reference_outs_list, a["Id"])
+                ] = {"Id": a["Id"], "Name": a["Name"], "accounts": [], "nestedOus": {}}
                 # print(organizations_complete["organizationalUnits"][o]["nestedOus"])
-                if len(organizations_complete["organizationalUnits"][o]["nestedOus"]) > 0:
-                    new_list_ous = organizations_complete["organizationalUnits"][o]["nestedOus"]
+                if (
+                    len(organizations_complete["organizationalUnits"][o]["nestedOus"])
+                    > 0
+                ):
+                    new_list_ous = organizations_complete["organizationalUnits"][o][
+                        "nestedOus"
+                    ]
 
                     new_list_ous = plop_dict_out(ous_list=list_ous, ou=new_list_ous)
                     organizations_complete = map_organizations_complete(
                         organizations_complete=organizations_complete,
                         list_ous=new_list_ous,
                         llist_accounts=llist_accounts,
-                        reference_outs_list=reference_outs_list)
+                        reference_outs_list=reference_outs_list,
+                    )
 
     return organizations_complete
 
 
-def plop_dict_out(ous_list: list, ou, ):
+def plop_dict_out(
+    ous_list: list,
+    ou,
+):
     """
     Clean list.
 
@@ -324,7 +337,6 @@ def plop_dict_out(ous_list: list, ou, ):
     :return:
     """
     for o in ou.keys():
-
         # for c in ou.keys():
         for unit in ous_list:
             if unit["Id"] == ou[o]["Id"]:
@@ -348,18 +360,16 @@ def set_accounts_tree(llist_accounts, organizations_complete, list_ous):
         for p in c["parents"]:
             if p["Type"] == "ROOT":
                 organizations_complete["noOutAccounts"].append(
-                    {
-                        "account": c["account"],
-                        "name": c['name']
-                    }
+                    {"account": c["account"], "name": c["name"]}
                 )
 
             for o, j in zip(list_ous, range(len(list_ous))):
                 if p["Id"] == o["Id"] and p["Type"] == "ORGANIZATIONAL_UNIT":
-                    organizations_complete["organizationalUnits"][find_ou_name(list_ous, o['Id'])]["accounts"][
-                        c['name']] = {
+                    organizations_complete["organizationalUnits"][
+                        find_ou_name(list_ous, o["Id"])
+                    ]["accounts"][c["name"]] = {
                         "account": c["account"],
-                        "name": c['name']
+                        "name": c["name"],
                     }
 
     return organizations_complete
@@ -391,8 +401,7 @@ def graph_organizations(diagrams_path, region, auto):
     logging.debug(roots)
 
     print(
-        Fore.BLUE
-        + emoji.emojize(":sparkle: List Organizational Units " + Fore.RESET)
+        Fore.BLUE + emoji.emojize(":sparkle: List Organizational Units " + Fore.RESET)
     )
     logging.debug("The Organizational Units list ")
     ous = list_organizational_units(parent_id=roots[0]["Id"], region=region)
@@ -432,12 +441,20 @@ def graph_organizations(diagrams_path, region, auto):
     file_name = "organizations_complete.json"
     # view in console
     organizations_complete_f = map_organizations_complete(
-        organizations_complete=init_org_complete(org=organization, root_id=roots[0]["Id"],
-                                                 list_ous=i_ous),
-        llist_accounts=i_accounts, list_ous=i_ous, reference_outs_list=i_ous.copy()
+        organizations_complete=init_org_complete(
+            org=organization, root_id=roots[0]["Id"], list_ous=i_ous
+        ),
+        llist_accounts=i_accounts,
+        list_ous=i_ous,
+        reference_outs_list=i_ous.copy(),
+    )
+    organizations_complete_f = (
+        set_accounts_tree(
+            llist_accounts=i_accounts,
+            organizations_complete=organizations_complete_f,
+            list_ous=i_ous,
+        ),
     )
-    organizations_complete_f = set_accounts_tree(llist_accounts=i_accounts,
-                                                 organizations_complete=organizations_complete_f, list_ous=i_ous),
 
     save_results(results=organizations_complete_f, filename=f"{json_path}/{file_name}")
 

src/reports/console_view.py

@@ -1,9 +1,10 @@
+"""Create Console View."""
 import json
-from rich.console import Console
+
+import inquirer
 from rich.columns import Columns
+from rich.console import Console
 from rich.panel import Panel
-from colorama import Fore
-from rich.progress import track
 
 
 # load json file from path function
@@ -14,7 +15,7 @@ def load_json(path):
     :param path:
     :return:
     """
-    with open(path, 'r') as f:
+    with open(path, "r") as f:
         return json.load(f)
 
 
@@ -28,7 +29,7 @@ def get_members(group):
     members_groups = {}
     for m in group:
         members_groups[group[m]["group_name"]] = []
-        for mm in group[m]['members']:
+        for mm in group[m]["members"]:
             members_groups[group[m]["group_name"]].append(mm["MemberId"]["UserName"])
 
     return members_groups
@@ -48,23 +49,56 @@ def pretty_members(members):
     return string
 
 
-def create_console_view(file_path="diagrams/json/groups.json"):
+def create_group_console_view(groups):
     """
     Create tree.
 
-    :param file_path:
+    :param groups:
     :return:
     """
-    try:
-        c = load_json(file_path)
-        members = get_members(c)
-        console = Console()
-        c = [Panel(f"[b][green]{group}[/b]\n[yellow]{pretty_members(members[group])}", expand=True) for group in c]
-        console.print(Columns(c))
-    except FileNotFoundError:
+    members = get_members(groups)
+    console = Console()
+    c = [
+        Panel(
+            f"[b][green]{group}[/b]\n[yellow]{pretty_members(members[group])}",
+            expand=True,
+        )
+        for group in groups
+    ]
+    console.print(Columns(c))
+
+
+def single_create_group_assignments_view(members, group_name):
+    """
+    Create tree.
+
+    :param group_name:
+    :param members:
+    :return:
+    """
+    console = Console()
+    c = [Panel(f"[b]{group_name}[/b]\n[blue]{pretty_members(members)}", expand=True)]
+    console.print(Columns(c))
+
 
-        print(f"{Fore.RED}File not found. {Fore.RESET}")
-        raise
+def create_string_account_assignment(account_assignment):
+    """
+    Create string account assignment.
+
+    :param account_assignment:
+    :return:
+    """
+    string = ""
+    if (
+        account_assignment["PrincipalType"] == "GROUP"
+        and "GroupName" in account_assignment.keys()
+    ):
+        string += f"GroupName: {account_assignment['GroupName']}\n"
+    elif account_assignment["PrincipalType"] == "USER":
+        string += f"UserName: {account_assignment['UserName']}\n"
+    if "PermissionSetName" in account_assignment.keys():
+        string += f"PermissionSetName: {account_assignment['PermissionSetName']}\n\n"
+    return string
 
 
 # get account  assignments
@@ -76,39 +110,119 @@ def pretty_account_assignments(accounts: dict):
     :return:
     """
     string = ""
+    if isinstance(accounts, dict):
+        for a in accounts.keys():
+            for c in accounts[a]:
+                string += create_string_account_assignment(account_assignment=c)
+    elif isinstance(accounts, list):
+        for c in accounts:
+            string += create_string_account_assignment(account_assignment=c)
+    return string
 
-    for a in accounts.keys():
-        for c in accounts[a]:
 
-            if c['PrincipalType'] == "GROUP" and "GroupName" in c.keys():
-                string += f"GroupName: {c['GroupName']}\n"
-            elif c['PrincipalType'] == "USER":
-                string += f"UserName: {c['UserName']}\n"
-            if "PermissionSetName" in c.keys():
-                string += f"PermissionSetName: {c['PermissionSetName']}\n\n"
+def single_create_account_assignments_view(assign, account_name):
+    """
+    Create tree.
+
+    :param account_name:
+    :param assign:
+    :return:
+    """
+    console = Console()
+    c = [
+        Panel(
+            f"[b]{account_name}[/b]\n[blue]{pretty_account_assignments(assign)}",
+            expand=True,
+        )
+    ]
+    console.print(Columns(c))
 
-    return string
 
+def create_console_view_from_input(assign):
+    """
+    Ask print single account.
 
-def create_account_assignments_view(file_path="diagrams/json/account_assignments.json"):
+    :param assign:
+    :return:
+    """
+    # execute while the user decide to leave
+    con = "yes"
+    while con == "yes":
+        questions = [
+            inquirer.List(
+                "account",
+                message="Which account do you want to see?",
+                choices=list(assign.keys()),
+            ),
+        ]
+        answers = inquirer.prompt(questions)
+        single_create_account_assignments_view(
+            assign[answers["account"]], account_name=answers["account"]
+        )
+        # execute while the user decide to leave
+        continue_ = [
+            inquirer.List(
+                name="ans",
+                message="Do you want to watch another account ?",
+                choices=["yes", "no"],
+            )
+        ]
+        continue_ans = inquirer.prompt(continue_)
+        con = continue_ans["ans"]
+
+
+def ask_control(case):
+    """
+    Ask control.
+
+    :type case: object
+    :param case:
+    :return:
+    """
+    control_ = [
+        inquirer.List(
+            name="ans",
+            message=f"Do you want to watch all {case}?",
+            choices=["all", "one-at-time"],
+        )
+    ]
+    control_ans = inquirer.prompt(control_)
+    control = control_ans["ans"]
+    return control
+
+
+def create_account_assignments_view(assign):
     """
     Create tree.
 
-    :param file_path:
+    :param assign:
     :return:
     """
-    assign = load_json(file_path)
+    control = ask_control(case="account assignments or account by account")
+    if control == "one-at-time":
+        create_console_view_from_input(assign=assign)
+    else:
+        console = Console()
+        c = [
+            Panel(
+                f"[b]{account}[/b]\n[blue]{pretty_account_assignments(assign)}",
+                expand=True,
+            )
+            for account in assign
+        ]
+        console.print(Columns(c))
 
-    console = Console()
-    c = [Panel(f"[b]{account}[/b]\n[blue]{pretty_account_assignments(assign)}", expand=True) for account in assign]
-    console.print(Columns(c))
 
+# create console view based on user input using inquirer
 
 # pretty for organizations
 
-def watch_on_demand(args, ):
+
+def watch_on_demand(
+    args,
+):
     """
-    Watch on demand graphs in cosole.
+    Watch on demand graphs in console.
 
     :param args:
     :return:
@@ -117,8 +231,8 @@ def watch_on_demand(args, ):
         # create_console_view(file_path=f"{diagrams_path}/json/organizations.json")
         print("Not available jet")
     if args.watch_graph_accounts_assignments:
-        create_account_assignments_view(file_path=args.watch_graph_accounts_assignments)
+        assign = load_json(args.watch_graph_accounts_assignments)
+        create_account_assignments_view(assign=assign)
     if args.watch_graph_identity:
-        create_console_view(file_path=args.watch_graph_identity)
-
-
+        c = load_json(args.watch_graph_identity)
+        create_group_console_view(groups=c)

src/reverse_diagrams.py

@@ -8,8 +8,8 @@ from boto3 import setup_default_session
 from .aws.describe_identity_store import graph_identity_center
 from .aws.describe_organization import graph_organizations
 from .banner.banner import get_version
-from .version import __version__
 from .reports.console_view import watch_on_demand
+from .version import __version__
 
 
 def main() -> int:
@@ -22,7 +22,7 @@ def main() -> int:
     parser = argparse.ArgumentParser(
         prog="reverse_diagrams",
         description="Create architecture diagram, inspect and audit your AWS services from your current state.",
-        epilog="Thanks for using %(prog)s!"
+        epilog="Thanks for using %(prog)s!",
     )
 
     parser.add_argument(
@@ -66,7 +66,7 @@ def main() -> int:
         name="watch",
         description="Create view of diagrams in console based on kind of diagram and json file.",
         help="Create pretty console view: \n"
-             "For example: %(prog)s watch -wi diagrams/json/account_assignments.json ",
+        "For example: %(prog)s watch -wi diagrams/json/account_assignments.json ",
     )
     # Add idp options
     watch_group = watch_parser.add_argument_group(
@@ -76,22 +76,19 @@ def main() -> int:
         "-wo",
         "--watch_graph_organization",
         help="Set if you want to see graph for your organization structure summary.\n"
-             "For example: %(prog)s watch  -wo diagrams/json/organizations.json",
-
+        "For example: %(prog)s watch  -wo diagrams/json/organizations.json",
     )
     watch_group.add_argument(
         "-wi",
         "--watch_graph_identity",
         help="Set if you want to see graph for your groups and users. \n"
-             "For example: %(prog)s watch  -wi diagrams/json/groups.json",
-
+        "For example: %(prog)s watch  -wi diagrams/json/groups.json",
     )
     watch_group.add_argument(
         "-wa",
         "--watch_graph_accounts_assignments",
         help="Set if you want to see graph for your IAM Center- Accounts assignments. \n"
-             "For example: %(prog)s watch  -wa diagrams/json/account_assignments.json.json",
-
+        "For example: %(prog)s watch  -wa diagrams/json/account_assignments.json",
     )
 
     parser.add_argument("-v", "--version", help="Show version", action="store_true")
@@ -126,7 +123,6 @@ def main() -> int:
             diagrams_path=diagrams_path, region=region, auto=args.auto_create
         )
     if args.commands == "watch":
-
         watch_on_demand(args=args)
 
     if args.version:

src/version.py

@@ -1,2 +1,2 @@
 """Set version file."""
-__version__ = "1.2.2"
+__version__ = "1.3.1"

src/reports/organizations_complete_state.json

@@ -1,93 +0,0 @@
-{
-    "rootId": "r-w3ow",
-    "masterAccountId": "029921763173",
-    "noOutAccounts": [
-        {
-            "account": "029921763173",
-            "name": "Alejandro Velez"
-        }
-    ],
-    "organizationalUnits": {
-        "Research": {
-            "Id": "ou-w3ow-oegm0al0",
-            "Name": "Research",
-            "accounts": {},
-            "nestedOus": {}
-        },
-        "Dev": {
-            "Id": "ou-w3ow-k24p2opx",
-            "Name": "Dev",
-            "accounts": {
-                "LabVelCT": {
-                    "account": "994261317734",
-                    "name": "LabVelCT"
-                },
-                "Dev": {
-                    "account": "571340586587",
-                    "name": "Dev"
-                }
-            },
-            "nestedOus": {}
-        },
-        "Core": {
-            "Id": "ou-w3ow-93hiq3zr",
-            "Name": "Core",
-            "accounts": {
-                "Log archive": {
-                    "account": "884478634998",
-                    "name": "Log archive"
-                },
-                "Audit": {
-                    "account": "895882538541",
-                    "name": "Audit"
-                }
-            },
-            "nestedOus": {}
-        },
-        "Custom": {
-            "Id": "ou-w3ow-5qsqi8b5",
-            "Name": "Custom",
-            "accounts": {
-                "Prod": {
-                    "account": "582441254763",
-                    "name": "Prod"
-                }
-            },
-            "nestedOus": {
-                "NetstedOU": {
-                    "Id": "ou-w3ow-i9xzgb9x",
-                    "Name": "NetstedOU",
-                    "accounts": [],
-                    "nestedOus": {}
-                },
-                "NetstedOU2": {
-                    "Id": "ou-w3ow-i9xzgxxx",
-                    "Name": "NetstedOU2",
-                    "accounts": [],
-                    "nestedOus": {}
-                },
-                "NetstedOU3": {
-                    "Id": "ou-w3ow-i9xzgxx3",
-                    "Name": "NetstedOU3",
-                    "accounts": [],
-                    "nestedOus": {}
-                }
-            }
-        },
-        "Shared": {
-            "Id": "ou-w3ow-w7dzhzcz",
-            "Name": "Shared",
-            "accounts": {
-                "DevSecOps": {
-                    "account": "105171185823",
-                    "name": "DevSecOps"
-                },
-                "SharedServices": {
-                    "account": "155794986228",
-                    "name": "SharedServices"
-                }
-            },
-            "nestedOus": {}
-        }
-    }
-}