prelude-cli-beta 1401__tar.gz → 1403__tar.gz

{prelude_cli_beta-1401/prelude_cli_beta.egg-info → prelude_cli_beta-1403}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: prelude-cli-beta
-Version: 1401
+Version: 1403
 Summary: For interacting with the Prelude SDK
 Home-page: https://github.com/preludeorg
 Author: Prelude Research
@@ -11,7 +11,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: prelude-sdk-beta==1401
+Requires-Dist: prelude-sdk-beta==1403
 Requires-Dist: click>8
 Requires-Dist: rich
 Requires-Dist: python-dateutil

{prelude_cli_beta-1401 → prelude_cli_beta-1403}/prelude_cli_beta/cli.py

@@ -26,8 +26,13 @@ def complete_profile(ctx, param, incomplete):
     show_default=True,
     shell_complete=complete_profile,
 )
-def cli(ctx, profile):
-    ctx.obj = Account.from_keychain(profile=profile)
+@click.option(
+    "--resolve_enums",
+    is_flag=True,
+    help="Resolve enum values to their string representation",
+)
+def cli(ctx, profile, resolve_enums):
+    ctx.obj = Account.from_keychain(profile=profile, resolve_enums=resolve_enums)
     if ctx.invoked_subcommand is None:
         click.echo(ctx.get_help())
 

{prelude_cli_beta-1401 → prelude_cli_beta-1403}/prelude_cli_beta/views/scm.py

@@ -205,7 +205,17 @@ def export(controller, type, output_file, limit, odata_filter, odata_orderby):
         return result, f"Exported data to {output_file}"
 
 
-@scm.command("groups")
+@click.group()
+@click.pass_context
+def group(ctx):
+    """SCM group commands"""
+    ctx.obj = ScmController(account=ctx.obj.account)
+
+
+scm.add_command(group)
+
+
+@group.command("list")
 @click.option("--odata_filter", help="OData filter string", default=None)
 @click.option("--odata_orderby", help="OData orderby string", default=None)
 @click.pass_obj
@@ -218,7 +228,7 @@ def list_partner_groups(controller, odata_filter, odata_orderby):
         )
 
 
-@scm.command("sync-groups")
+@group.command("sync")
 @click.argument(
     "partner",
     type=click.Choice(
@@ -244,7 +254,17 @@ def sync_groups(controller, partner, instance_id, group_ids):
         return result
 
 
-@scm.command("create-threat")
+@click.group()
+@click.pass_context
+def threat(ctx):
+    """SCM threat commands"""
+    ctx.obj = ScmController(account=ctx.obj.account)
+
+
+scm.add_command(threat)
+
+
+@threat.command("create")
 @click.argument("name")
 @click.option(
     "-d", "--description", help="description of the threat", default=None, type=str
@@ -300,7 +320,7 @@ def create_threat(
         )
 
 
-@scm.command("delete-threat")
+@threat.command("delete")
 @click.argument("threat_id")
 @click.confirmation_option(prompt="Are you sure?")
 @click.pass_obj
@@ -311,7 +331,7 @@ def delete_threat(controller, threat_id):
         return controller.delete_threat(id=threat_id)
 
 
-@scm.command("threats")
+@threat.command("list")
 @click.pass_obj
 @pretty_print
 def list_threats(controller):
@@ -320,7 +340,7 @@ def list_threats(controller):
         return controller.list_threats()
 
 
-@scm.command("threat")
+@threat.command("get")
 @click.argument("threat_id")
 @click.pass_obj
 @pretty_print
@@ -357,64 +377,198 @@ def parse_from_partner_advisory(controller, partner, advisory_id):
             partner=Control[partner], advisory_id=advisory_id
         )
 
-@scm.command("list-policy-exceptions")
+
+@click.group()
+@click.pass_context
+def exception(ctx):
+    """SCM exception commands"""
+    ctx.obj = ScmController(account=ctx.obj.account)
+
+
+@click.group()
+@click.pass_context
+def object(ctx):
+    """SCM object exception commands"""
+    ctx.obj = ScmController(account=ctx.obj.account)
+
+
+@click.group()
+@click.pass_context
+def policy(ctx):
+    """SCM policy exception commands"""
+    ctx.obj = ScmController(account=ctx.obj.account)
+
+
+exception.add_command(object)
+exception.add_command(policy)
+scm.add_command(exception)
+
+
+@object.command("list")
+@click.pass_obj
+@pretty_print
+def list_object_exceptions(controller):
+    """List all object exceptions"""
+    with Spinner(description="Fetching object exceptions"):
+        return controller.list_object_exceptions()
+
+
+@object.command("create")
+@click.argument(
+    "category",
+    type=click.Choice(
+        [
+            c.name
+            for c in ControlCategory
+            if c
+            not in [
+                ControlCategory.NONE,
+                ControlCategory.INVALID,
+                ControlCategory.PRIVATE_REPO,
+            ]
+        ],
+        case_sensitive=False,
+    ),
+)
+@click.option(
+    "-f", "--filter", help="OData filter string", default=None, required=True, type=str
+)
+@click.option(
+    "-e",
+    "--expires",
+    help="expiry date (YYYY-MM-DD hh:mm:ss ([+-]hh:mm))",
+    default=None,
+    type=str,
+)
+@click.option("-n", "--name", help="exception name", default=None, type=str)
+@click.pass_obj
+@pretty_print
+def create_object_exception(controller, category, filter, expires, name):
+    """Create object exception"""
+    with Spinner(description=f"Creating object exception"):
+        return controller.create_object_exception(
+            category=ControlCategory[category],
+            filter=filter,
+            name=name,
+            expires=expires,
+        )
+
+
+@object.command("update")
+@click.argument("exception_id", type=str)
+@click.option(
+    "-e",
+    "--expires",
+    help="Expiry Date (YYYY-MM-DD hh:mm:ss ([+-]hh:mm))",
+    default=ScmController.default,
+)
+@click.option("-f", "--filter", help="OData filter string", default=None, type=str)
+@click.option("-n", "--name", help="Exception Name", default=None, type=str)
+@click.pass_obj
+@pretty_print
+def update_object_exception(controller, exception_id, expires, filter, name):
+    """Update object exception"""
+    with Spinner(description=f"Updating object exception"):
+        return controller.update_object_exception(
+            exception_id=exception_id, filter=filter, name=name, expires=expires
+        )
+
+
+@object.command("delete")
+@click.argument("exception_id", type=str)
+@click.confirmation_option(prompt="Are you sure?")
+@click.pass_obj
+@pretty_print
+def delete_object_exception(controller, exception_id):
+    """Delete object exception"""
+    with Spinner(description=f"Delete object exception"):
+        return controller.delete_object_exception(exception_id=exception_id)
+
+
+@policy.command("list")
 @click.pass_obj
 @pretty_print
 def list_policy_exceptions(controller):
     """List all policy exceptions"""
-    with Spinner(description="Querying Policy exceptions"):
+    with Spinner(description="Fetching policy exceptions"):
         return controller.list_policy_exceptions()
 
-@scm.command("update-policy-exception")
+
+@policy.command("create")
 @click.argument(
     "partner",
     type=click.Choice(
         [c.name for c in Control if c != Control.INVALID], case_sensitive=False
     ),
 )
-@click.option("-e", "--expires", help="Expiry Date (YYYY-MM-DD hh:mm:ss ([+-]hh:mm))", default=None, type=str)
 @click.option("-i", "--instance_id", required=True, help="instance ID of the partner")
-@click.option("-p", "--policy_id", required=True, help="ID of the policy to update")
-@click.option("-s", "--settings", required=True, help="Comma separated list of all setting names to be excluded")
+@click.option("-p", "--policy_id", required=True, help="ID of the policy to create")
+@click.option(
+    "-s",
+    "--settings",
+    required=True,
+    help="Comma separated list of all setting names to be excluded",
+)
+@click.option(
+    "-e",
+    "--expires",
+    help="Expiry Date (YYYY-MM-DD hh:mm:ss ([+-]hh:mm))",
+    default=None,
+    type=str,
+)
 @click.pass_obj
 @pretty_print
-def update_policy_exception(controller, partner, expires, instance_id, policy_id, settings):
-    """Update policy exception"""
-    with Spinner(description=f"Updating Policy exception"):
-        return controller.put_policy_exceptions(
+def create_policy_exception(
+    controller, partner, instance_id, policy_id, settings, expires
+):
+    """Create policy exception"""
+    with Spinner(description=f"Creating policy exception"):
+        return controller.create_policy_exceptions(
             partner=Control[partner],
             expires=expires,
             instance_id=instance_id,
             policy_id=policy_id,
-            setting_names=settings.split(",") if settings else None
+            setting_names=settings.split(",") if settings else None,
         )
 
-@scm.command("create-policy-exception")
+
+@policy.command("update")
 @click.argument(
     "partner",
     type=click.Choice(
         [c.name for c in Control if c != Control.INVALID], case_sensitive=False
     ),
 )
-@click.option("-e", "--expires", help="Expiry Date (YYYY-MM-DD hh:mm:ss ([+-]hh:mm))", default=None, type=str)
 @click.option("-i", "--instance_id", required=True, help="instance ID of the partner")
-@click.option("-p", "--policy_id", required=True, help="ID of the policy to create")
-@click.option("-s", "--settings", required=True, help="Comma separated list of all setting names to be excluded")
+@click.option("-p", "--policy_id", required=True, help="ID of the policy to update")
+@click.option(
+    "-e",
+    "--expires",
+    help="Expiry Date (YYYY-MM-DD hh:mm:ss ([+-]hh:mm))",
+    default=ScmController.default,
+)
+@click.option(
+    "-s",
+    "--settings",
+    help="Comma separated list of all setting names to be excluded",
+)
 @click.pass_obj
 @pretty_print
-def create_policy_exception(controller, partner, expires, instance_id, policy_id, settings):
-    """Create policy exception"""
-    with Spinner(description=f"Creating Policy exception"):
-        return controller.put_policy_exceptions(
+def update_policy_exception(
+    controller, partner, instance_id, policy_id, expires, settings
+):
+    """Update policy exception"""
+    with Spinner(description=f"Updating Policy exception"):
+        return controller.update_policy_exception(
             partner=Control[partner],
             expires=expires,
             instance_id=instance_id,
             policy_id=policy_id,
-            setting_names=settings.split(",") if settings else None
+            setting_names=settings.split(",") if settings else None,
         )
 
 
-@scm.command("delete-policy-exception")
+@policy.command("delete")
 @click.argument(
     "partner",
     type=click.Choice(
@@ -427,61 +581,34 @@ def create_policy_exception(controller, partner, expires, instance_id, policy_id
 @click.pass_obj
 @pretty_print
 def delete_policy_exception(controller, partner, instance_id, policy_id):
+    """Delete policy exception"""
+    with Spinner(description=f"Deleting Policy exception"):
+        return controller.delete_policy_exception(
+            instance_id=instance_id, policy_id=policy_id
+        )
+
     """Delete policy exception removes all exceptions in a policy"""
-    with Spinner(description=f"deleting Policy exception"):
+    with Spinner(description=f"Deleting policy exception"):
         return controller.put_policy_exceptions(
             partner=Control[partner],
             expires=None,
             instance_id=instance_id,
             policy_id=policy_id,
-            setting_names=[]
+            setting_names=[],
         )
 
-@scm.command("list-object-exceptions")
-@click.pass_obj
-@pretty_print
-def list_object_exceptions(controller):
-    """List all object exceptions"""
-    with Spinner(description="Querying Object exceptions"):
-        return controller.list_object_exceptions()
 
+@click.group()
+@click.pass_context
+def notification(ctx):
+    """SCM notification commands"""
+    ctx.obj = ScmController(account=ctx.obj.account)
 
-@scm.command("create-object-exception")
-@click.argument("category", type=click.Choice([c.name for c in ControlCategory if c not in [ControlCategory.NONE, ControlCategory.INVALID, ControlCategory.PRIVATE_REPO]], case_sensitive=False))
-@click.option("-n", "--name", help="Exception Name", default=None, type=str)
-@click.option("-f", "--filter", help="OData filter string", default=None, required=True, type=str)
-@click.option("-e", "--expires", help="Expiry Date (YYYY-MM-DD hh:mm:ss ([+-]hh:mm))", default=None, type=str)
-@click.pass_obj
-@pretty_print
-def create_object_exception(controller, category, filter, name, expires):
-    """Create object exception"""
-    with Spinner(description=f"Creating Object exception"):
-        return controller.create_object_exception(category=ControlCategory[category], filter=filter, name=name, expires=expires)
 
-@scm.command("update-object-exception")
-@click.option("-i", "--id", help="ID of the exception to update", default=None, type=str)
-@click.option("-n", "--name", help="Exception Name", default=None, type=str)
-@click.option("-f", "--filter", help="OData filter string", default=None, required=True, type=str)
-@click.option("-e", "--expires", help="Expiry Date (YYYY-MM-DD hh:mm:ss ([+-]hh:mm))", default=None, type=str)
-@click.pass_obj
-@pretty_print
-def update_object_exception(controller, id, filter, name, expires):
-    """Update object exception"""
-    with Spinner(description=f"Updating Object exception"):
-        return controller.update_object_exception(exception_id=id, filter=filter, name=name, expires=expires)
-
-@scm.command("delete-object-exception")
-@click.option("-i", "--id", help="ID of the exception to delete", default=None, type=str)
-@click.confirmation_option(prompt="Are you sure?")
-@click.pass_obj
-@pretty_print
-def delete_object_exception(controller, id):
-    """Delete object exception"""
-    with Spinner(description=f"Delete Object exception"):
-        return controller.delete_object_exception(exception_id=id)
+scm.add_command(notification)
 
 
-@scm.command("notifications")
+@notification.command("list")
 @click.pass_obj
 @pretty_print
 def list_notifications(controller):
@@ -489,7 +616,7 @@ def list_notifications(controller):
         return controller.list_notifications()
 
 
-@scm.command("delete-notification")
+@notification.command("delete")
 @click.argument("notification_id", type=str)
 @click.confirmation_option(prompt="Are you sure?")
 @click.pass_obj
@@ -499,7 +626,7 @@ def delete_notification(controller, notification_id):
         return controller.delete_notification(notification_id)
 
 
-@scm.command("upsert-notification")
+@notification.command("upsert")
 @click.argument(
     "control_category",
     type=click.Choice([c.name for c in ControlCategory], case_sensitive=False),

{prelude_cli_beta-1401 → prelude_cli_beta-1403/prelude_cli_beta.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: prelude-cli-beta
-Version: 1401
+Version: 1403
 Summary: For interacting with the Prelude SDK
 Home-page: https://github.com/preludeorg
 Author: Prelude Research
@@ -11,7 +11,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: prelude-sdk-beta==1401
+Requires-Dist: prelude-sdk-beta==1403
 Requires-Dist: click>8
 Requires-Dist: rich
 Requires-Dist: python-dateutil

{prelude_cli_beta-1401 → prelude_cli_beta-1403}/prelude_cli_beta.egg-info/requires.txt

@@ -1,4 +1,4 @@
-prelude-sdk-beta==1401
+prelude-sdk-beta==1403
 click>8
 rich
 python-dateutil

{prelude_cli_beta-1401 → prelude_cli_beta-1403}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = prelude-cli-beta
-version = 1401
+version = 1403
 author = Prelude Research
 author_email = support@preludesecurity.com
 description = For interacting with the Prelude SDK
@@ -17,7 +17,7 @@ packages = find:
 include_package_data = True
 python_requires = >=3.10
 install_requires = 
-	prelude-sdk-beta == 1401
+	prelude-sdk-beta == 1403
 	click > 8
 	rich
 	python-dateutil