cacholong-cloud-cli 1.0.0__tar.gz → 1.2.0__tar.gz

{cacholong_cloud_cli-1.0.0 → cacholong_cloud_cli-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cacholong-cloud-cli
-Version: 1.0.0
+Version: 1.2.0
 Summary: Cacholong CLI, manage cloud environments at Cacholong!
 License: MIT
 Author: Matthijs Möhlmann

{cacholong_cloud_cli-1.0.0 → cacholong_cloud_cli-1.2.0}/cacholong_cli/cli.py

@@ -17,6 +17,7 @@ from cacholong_cli.commands import (
     mail_forwards,
     products,
     purchases,
+    users,
 )
 from cacholong_cli.common import OutputFormat
 from xdg import BaseDirectory
@@ -57,6 +58,7 @@ app.add_typer(mail_domains.app, name="mail-domains", help="Manage mail domains")
 app.add_typer(mail_forwards.app, name="mail-forwards", help="Manage mail forwards")
 app.add_typer(products.app, name="products", help="Manage products")
 app.add_typer(purchases.app, name="purchases", help="Manage purchases")
+app.add_typer(users.app, name="users", help="")
 
 
 # Handle version

{cacholong_cloud_cli-1.0.0 → cacholong_cloud_cli-1.2.0}/cacholong_cli/commands/accounts.py

@@ -39,6 +39,9 @@ async def list(
     account_account_relation: Annotated[
         Optional[str], typer.Option(help="Parent account relationship type")
     ] = None,
+    company: Annotated[
+        Optional[UUID], typer.Option(help="The company associated with this account")
+    ] = None,
     created_at: Annotated[
         Optional[datetime],
         typer.Option(help="Timestamp when the account was created (exact match)"),
@@ -87,23 +90,25 @@ async def list(
         Optional[datetime],
         typer.Option(help="Timestamp when the account was last updated (less than)"),
     ] = None,
-    company: Annotated[
-        Optional[UUID], typer.Option(help="The company associated with this account")
-    ] = None,
 ):
 
     # Build modifier
     modifier = []
+
     if name is not None:
         modifier.append(Filter(name=name))
+
     if description is not None:
         modifier.append(Filter(description=description))
+
     if account_type is not None:
         modifier.append(Filter(query_str="filter[account_type]=" + str(account_type)))
+
     if account_account_id is not None:
         modifier.append(
             Filter(query_str="filter[account_account_id]=" + str(account_account_id))
         )
+
     if account_account_relation is not None:
         modifier.append(
             Filter(
@@ -111,6 +116,10 @@ async def list(
                 + str(account_account_relation)
             )
         )
+
+    if company is not None:
+        modifier.append(Filter(company=str(company)))
+
     if created_at is not None:
         modifier.append(
             Filter(
@@ -161,6 +170,7 @@ async def list(
                 + "Z"
             )
         )
+
     if updated_at is not None:
         modifier.append(
             Filter(
@@ -211,15 +221,15 @@ async def list(
                 + "Z"
             )
         )
-    if company is not None:
-        modifier.append(Filter(company=str(company)))
 
     # Table definition
     tabledef: TableDef = [
         {"header": Column("Id", no_wrap=True), "column": "id"},
+        {"header": "Name", "column": "name"},
         {"header": "Created", "column": "created_at"},
         {"header": "Updated", "column": "updated_at"},
     ]
+
     async with Connection() as conn:
         await list_resources(ctx, AccountBase(conn, api_schema), tabledef, modifier)
 
@@ -238,3 +248,184 @@ async def show(
             show_resource(ctx, model)
     except DocumentError as e:
         await print_document_error(e)
+
+
+@app.async_command(name="list-user-roles", help="List all user-roles for an account")
+async def list_user_roles(
+    ctx: typer.Context,
+    account_id: Annotated[UUID, typer.Argument(help="Parent resource ID")],
+    account: Annotated[Optional[UUID], typer.Option(help="The account")] = None,
+    user: Annotated[Optional[UUID], typer.Option(help="The user")] = None,
+    role: Annotated[Optional[UUID], typer.Option(help="The role")] = None,
+    created_at: Annotated[
+        Optional[datetime], typer.Option(help="Timestamp when created (exact match)")
+    ] = None,
+    created_at_gte: Annotated[
+        Optional[datetime],
+        typer.Option(help="Timestamp when created (greater than or equal)"),
+    ] = None,
+    created_at_lte: Annotated[
+        Optional[datetime],
+        typer.Option(help="Timestamp when created (less than or equal)"),
+    ] = None,
+    created_at_gt: Annotated[
+        Optional[datetime], typer.Option(help="Timestamp when created (greater than)")
+    ] = None,
+    created_at_lt: Annotated[
+        Optional[datetime], typer.Option(help="Timestamp when created (less than)")
+    ] = None,
+    updated_at: Annotated[
+        Optional[datetime],
+        typer.Option(help="Timestamp when last updated (exact match)"),
+    ] = None,
+    updated_at_gte: Annotated[
+        Optional[datetime],
+        typer.Option(help="Timestamp when last updated (greater than or equal)"),
+    ] = None,
+    updated_at_lte: Annotated[
+        Optional[datetime],
+        typer.Option(help="Timestamp when last updated (less than or equal)"),
+    ] = None,
+    updated_at_gt: Annotated[
+        Optional[datetime],
+        typer.Option(help="Timestamp when last updated (greater than)"),
+    ] = None,
+    updated_at_lt: Annotated[
+        Optional[datetime], typer.Option(help="Timestamp when last updated (less than)")
+    ] = None,
+):
+    """List all user-roles for an account"""
+    try:
+        async with Connection() as conn:
+            # Fetch parent resource
+            parent_ctrl = AccountBase(conn, api_schema)
+            parent_model = await parent_ctrl.fetch(account_id)
+
+            # Build modifier for filtering and includes
+            modifier = []
+
+            if account is not None:
+                modifier.append(Filter(account=str(account)))
+
+            if user is not None:
+                modifier.append(Filter(user=str(user)))
+
+            if role is not None:
+                modifier.append(Filter(role=str(role)))
+
+            if created_at is not None:
+                modifier.append(
+                    Filter(
+                        query_str="filter[created_at]="
+                        + created_at.astimezone(timezone.utc)
+                        .replace(tzinfo=None)
+                        .isoformat(timespec="milliseconds")
+                        + "Z"
+                    )
+                )
+            if created_at_gte is not None:
+                modifier.append(
+                    Filter(
+                        query_str="filter[created_at_gte]="
+                        + created_at_gte.astimezone(timezone.utc)
+                        .replace(tzinfo=None)
+                        .isoformat(timespec="milliseconds")
+                        + "Z"
+                    )
+                )
+            if created_at_lte is not None:
+                modifier.append(
+                    Filter(
+                        query_str="filter[created_at_lte]="
+                        + created_at_lte.astimezone(timezone.utc)
+                        .replace(tzinfo=None)
+                        .isoformat(timespec="milliseconds")
+                        + "Z"
+                    )
+                )
+            if created_at_gt is not None:
+                modifier.append(
+                    Filter(
+                        query_str="filter[created_at_gt]="
+                        + created_at_gt.astimezone(timezone.utc)
+                        .replace(tzinfo=None)
+                        .isoformat(timespec="milliseconds")
+                        + "Z"
+                    )
+                )
+            if created_at_lt is not None:
+                modifier.append(
+                    Filter(
+                        query_str="filter[created_at_lt]="
+                        + created_at_lt.astimezone(timezone.utc)
+                        .replace(tzinfo=None)
+                        .isoformat(timespec="milliseconds")
+                        + "Z"
+                    )
+                )
+
+            if updated_at is not None:
+                modifier.append(
+                    Filter(
+                        query_str="filter[updated_at]="
+                        + updated_at.astimezone(timezone.utc)
+                        .replace(tzinfo=None)
+                        .isoformat(timespec="milliseconds")
+                        + "Z"
+                    )
+                )
+            if updated_at_gte is not None:
+                modifier.append(
+                    Filter(
+                        query_str="filter[updated_at_gte]="
+                        + updated_at_gte.astimezone(timezone.utc)
+                        .replace(tzinfo=None)
+                        .isoformat(timespec="milliseconds")
+                        + "Z"
+                    )
+                )
+            if updated_at_lte is not None:
+                modifier.append(
+                    Filter(
+                        query_str="filter[updated_at_lte]="
+                        + updated_at_lte.astimezone(timezone.utc)
+                        .replace(tzinfo=None)
+                        .isoformat(timespec="milliseconds")
+                        + "Z"
+                    )
+                )
+            if updated_at_gt is not None:
+                modifier.append(
+                    Filter(
+                        query_str="filter[updated_at_gt]="
+                        + updated_at_gt.astimezone(timezone.utc)
+                        .replace(tzinfo=None)
+                        .isoformat(timespec="milliseconds")
+                        + "Z"
+                    )
+                )
+            if updated_at_lt is not None:
+                modifier.append(
+                    Filter(
+                        query_str="filter[updated_at_lt]="
+                        + updated_at_lt.astimezone(timezone.utc)
+                        .replace(tzinfo=None)
+                        .isoformat(timespec="milliseconds")
+                        + "Z"
+                    )
+                )
+
+            # Table definition
+            tabledef: TableDef = [
+                {"header": Column("Id", no_wrap=True), "column": "id"},
+                {"header": "Id", "column": "id"},
+                {"header": "Created", "column": "created_at"},
+                {"header": "Updated", "column": "updated_at"},
+            ]
+
+            # List related resources
+            await list_relation_resources(
+                ctx, parent_model, "user-roles", tabledef, modifier
+            )
+    except DocumentError as e:
+        await print_document_error(e)

{cacholong_cloud_cli-1.0.0 → cacholong_cloud_cli-1.2.0}/cacholong_cli/commands/addresses.py

@@ -60,6 +60,12 @@ async def list(
     country: Annotated[
         Optional[str], typer.Option(help="Must contain two uppercase letters (A-Z).")
     ] = None,
+    user: Annotated[
+        Optional[UUID], typer.Option(help="The user associated with this address.")
+    ] = None,
+    company: Annotated[
+        Optional[UUID], typer.Option(help="The company associated with this address.")
+    ] = None,
     created_at: Annotated[
         Optional[datetime],
         typer.Option(help="Timestamp when the address was created. (exact match)"),
@@ -110,12 +116,6 @@ async def list(
         Optional[datetime],
         typer.Option(help="Timestamp when the address was last updated. (less than)"),
     ] = None,
-    user: Annotated[
-        Optional[UUID], typer.Option(help="The user associated with this address.")
-    ] = None,
-    company: Annotated[
-        Optional[UUID], typer.Option(help="The company associated with this address.")
-    ] = None,
 ):
     # Validate mutually exclusive required parameters
     _require_one_of_group = [user, company]
@@ -127,20 +127,34 @@ async def list(
 
     # Build modifier
     modifier = []
+
     if street is not None:
         modifier.append(Filter(street=street))
+
     if number is not None:
         modifier.append(Filter(number=number))
+
     if suffix is not None:
         modifier.append(Filter(suffix=suffix))
+
     if zipcode is not None:
         modifier.append(Filter(zipcode=zipcode))
+
     if city is not None:
         modifier.append(Filter(city=city))
+
     if state is not None:
         modifier.append(Filter(state=state))
+
     if country is not None:
         modifier.append(Filter(country=country))
+
+    if user is not None:
+        modifier.append(Filter(user=str(user)))
+
+    if company is not None:
+        modifier.append(Filter(company=str(company)))
+
     if created_at is not None:
         modifier.append(
             Filter(
@@ -191,6 +205,7 @@ async def list(
                 + "Z"
             )
         )
+
     if updated_at is not None:
         modifier.append(
             Filter(
@@ -241,24 +256,32 @@ async def list(
                 + "Z"
             )
         )
-    if user is not None:
-        modifier.append(Filter(user=str(user)))
-    if company is not None:
-        modifier.append(Filter(company=str(company)))
+
     modifier.append(Inclusion("company"))
     modifier.append(Inclusion("user"))
 
     # Table definition
     tabledef: TableDef = [
         {"header": Column("Id", no_wrap=True), "column": "id"},
-        {"header": "Company", "column": "company", "nested_column": "name"},
-        {"header": "User", "column": "user", "nested_column": "name"},
+        {
+            "header": "Company",
+            "column": "company",
+            "column_kebab": "company",
+            "nested_column": "name",
+        },
+        {
+            "header": "User",
+            "column": "user",
+            "column_kebab": "user",
+            "nested_column": "name",
+        },
         {"header": "Street", "column": "street"},
         {"header": "Number", "column": "number"},
         {"header": "City", "column": "city"},
         {"header": "Created", "column": "created_at"},
         {"header": "Updated", "column": "updated_at"},
     ]
+
     async with Connection() as conn:
         await list_resources(ctx, AddressShow(conn, api_schema), tabledef, modifier)
 
@@ -300,6 +323,12 @@ async def create(
     country: Annotated[
         str, typer.Option(help="Must contain two uppercase letters (A-Z).")
     ],
+    user: Annotated[
+        UUID, typer.Option(help="The user to associate with this address.")
+    ],
+    company: Annotated[
+        UUID, typer.Option(help="The company to associate with this address.")
+    ],
     suffix: Annotated[
         Optional[str],
         typer.Option(
@@ -312,12 +341,6 @@ async def create(
             help="Can contain any letter (combined with accent) from any language, any kind of hyphen or dash, single or alternative quote or space."
         ),
     ] = None,
-    user: Annotated[
-        Optional[UUID], typer.Option(help="The user to associate with this address.")
-    ] = None,
-    company: Annotated[
-        Optional[UUID], typer.Option(help="The company to associate with this address.")
-    ] = None,
 ):
     # Validate mutually exclusive required parameters
     _require_one_of_group = [user, company]
@@ -338,6 +361,7 @@ async def create(
         async with Connection() as conn:
             ctrl = ctrl_class(conn, api_schema)
             model = ctrl.create()
+
             model["street"] = street
             model["number"] = number
             if suffix is not None:
@@ -347,10 +371,12 @@ async def create(
             if state is not None:
                 model["state"] = state
             model["country"] = country
+
             if user is not None:
                 model["user"] = ResourceTuple(user, "users")
             if company is not None:
                 model["company"] = ResourceTuple(company, "companies")
+
             await ctrl.store(model, ctx.obj["create_issue"])  # type: ignore[arg-type]
 
             show_resource(ctx, model)
@@ -399,6 +425,7 @@ async def update(
         async with Connection() as conn:
             ctrl = AddressShow(conn, api_schema)
             model = await ctrl.fetch(address_id)
+
             if street is not None:
                 model["street"] = street
             if number is not None:
@@ -413,6 +440,7 @@ async def update(
                 model["state"] = state
             if country is not None:
                 model["country"] = country
+
             await ctrl.update(model)
 
             show_resource(ctx, model)

{cacholong_cloud_cli-1.0.0 → cacholong_cloud_cli-1.2.0}/cacholong_cli/commands/companies.py

@@ -68,6 +68,7 @@ async def update(
         async with Connection() as conn:
             ctrl = CompanyBase(conn, api_schema)
             model = await ctrl.fetch(company_id)
+
             if name is not None:
                 model["name"] = name
             if kvknr is not None:
@@ -80,6 +81,7 @@ async def update(
                 model["email_invoice"] = email_invoice
             if vat_number is not None:
                 model["vat_number"] = vat_number
+
             await ctrl.update(model)
 
             show_resource(ctx, model)
@@ -123,6 +125,12 @@ async def list_addresses(
     country: Annotated[
         Optional[str], typer.Option(help="Must contain two uppercase letters (A-Z).")
     ] = None,
+    user: Annotated[
+        Optional[UUID], typer.Option(help="The user associated with this address.")
+    ] = None,
+    company: Annotated[
+        Optional[UUID], typer.Option(help="The company associated with this address.")
+    ] = None,
     created_at: Annotated[
         Optional[datetime],
         typer.Option(help="Timestamp when the address was created. (exact match)"),
@@ -173,12 +181,6 @@ async def list_addresses(
         Optional[datetime],
         typer.Option(help="Timestamp when the address was last updated. (less than)"),
     ] = None,
-    user: Annotated[
-        Optional[UUID], typer.Option(help="The user associated with this address.")
-    ] = None,
-    company: Annotated[
-        Optional[UUID], typer.Option(help="The company associated with this address.")
-    ] = None,
 ):
     """List all addresses for a company"""
     try:
@@ -189,20 +191,34 @@ async def list_addresses(
 
             # Build modifier for filtering and includes
             modifier = []
+
             if street is not None:
                 modifier.append(Filter(street=street))
+
             if number is not None:
                 modifier.append(Filter(number=number))
+
             if suffix is not None:
                 modifier.append(Filter(suffix=suffix))
+
             if zipcode is not None:
                 modifier.append(Filter(zipcode=zipcode))
+
             if city is not None:
                 modifier.append(Filter(city=city))
+
             if state is not None:
                 modifier.append(Filter(state=state))
+
             if country is not None:
                 modifier.append(Filter(country=country))
+
+            if user is not None:
+                modifier.append(Filter(user=str(user)))
+
+            if company is not None:
+                modifier.append(Filter(company=str(company)))
+
             if created_at is not None:
                 modifier.append(
                     Filter(
@@ -253,6 +269,7 @@ async def list_addresses(
                         + "Z"
                     )
                 )
+
             if updated_at is not None:
                 modifier.append(
                     Filter(
@@ -303,10 +320,6 @@ async def list_addresses(
                         + "Z"
                     )
                 )
-            if user is not None:
-                modifier.append(Filter(user=str(user)))
-            if company is not None:
-                modifier.append(Filter(company=str(company)))
 
             # Table definition
             tabledef: TableDef = [

{cacholong_cloud_cli-1.0.0 → cacholong_cloud_cli-1.2.0}/cacholong_cli/commands/dns_records.py

@@ -57,6 +57,12 @@ async def list(
         Optional[str],
         typer.Option(help="Priority (required for MX and SRV records only)"),
     ] = None,
+    dns_zone: Annotated[
+        Optional[UUID], typer.Option(help="DNS zone that owns this record")
+    ] = None,
+    dns_template: Annotated[
+        Optional[UUID], typer.Option(help="DNS template that owns this record")
+    ] = None,
     created_at: Annotated[
         Optional[datetime],
         typer.Option(help="When this record was created (exact match)"),
@@ -97,12 +103,6 @@ async def list(
         Optional[datetime],
         typer.Option(help="When this record was last updated (less than)"),
     ] = None,
-    dns_zone: Annotated[
-        Optional[UUID], typer.Option(help="DNS zone that owns this record")
-    ] = None,
-    dns_template: Annotated[
-        Optional[UUID], typer.Option(help="DNS template that owns this record")
-    ] = None,
 ):
     # Validate mutually exclusive required parameters
     _require_one_of_group = [dns_zone, dns_template]
@@ -116,20 +116,33 @@ async def list(
 
     # Build modifier
     modifier = []
+
     if status is not None:
         modifier.append(Filter(status=status))
+
     if dns_record_type is not None:
         modifier.append(
             Filter(query_str="filter[dns_record_type]=" + str(dns_record_type))
         )
+
     if name is not None:
         modifier.append(Filter(name=name))
+
     if content is not None:
         modifier.append(Filter(content=content))
+
     if ttl is not None:
         modifier.append(Filter(ttl=ttl))
+
     if priority is not None:
         modifier.append(Filter(priority=priority))
+
+    if dns_zone is not None:
+        modifier.append(Filter(query_str="filter[dns-zone]=" + str(dns_zone)))
+
+    if dns_template is not None:
+        modifier.append(Filter(query_str="filter[dns-template]=" + str(dns_template)))
+
     if created_at is not None:
         modifier.append(
             Filter(
@@ -180,6 +193,7 @@ async def list(
                 + "Z"
             )
         )
+
     if updated_at is not None:
         modifier.append(
             Filter(
@@ -230,10 +244,6 @@ async def list(
                 + "Z"
             )
         )
-    if dns_zone is not None:
-        modifier.append(Filter(query_str="filter[dns-zone]=" + str(dns_zone)))
-    if dns_template is not None:
-        modifier.append(Filter(query_str="filter[dns-template]=" + str(dns_template)))
 
     # Table definition
     tabledef: TableDef = [
@@ -246,6 +256,7 @@ async def list(
         {"header": "Created", "column": "created_at"},
         {"header": "Updated", "column": "updated_at"},
     ]
+
     async with Connection() as conn:
         await list_resources(ctx, DnsRecordBase(conn, api_schema), tabledef, modifier)
 
@@ -280,6 +291,10 @@ async def create(
         str,
         typer.Option(help="Record content (IP address, hostname, text value, etc.)"),
     ],
+    dns_zone: Annotated[UUID, typer.Option(help="DNS zone that will own this record")],
+    dns_template: Annotated[
+        UUID, typer.Option(help="DNS template that will own this record")
+    ],
     ttl: Annotated[
         Optional[int],
         typer.Option(
@@ -290,12 +305,6 @@ async def create(
         Optional[int],
         typer.Option(help="Priority (required for MX and SRV records only)"),
     ] = None,
-    dns_zone: Annotated[
-        Optional[UUID], typer.Option(help="DNS zone that will own this record")
-    ] = None,
-    dns_template: Annotated[
-        Optional[UUID], typer.Option(help="DNS template that will own this record")
-    ] = None,
 ):
     # Validate mutually exclusive required parameters
     _require_one_of_group = [dns_zone, dns_template]
@@ -318,6 +327,7 @@ async def create(
         async with Connection() as conn:
             ctrl = ctrl_class(conn, api_schema)
             model = ctrl.create()
+
             model["dns_record_type"] = dns_record_type
             model["name"] = name
             model["content"] = content
@@ -325,10 +335,12 @@ async def create(
                 model["ttl"] = ttl
             if priority is not None:
                 model["priority"] = priority
+
             if dns_zone is not None:
                 model["dns-zone"] = ResourceTuple(dns_zone, "dns-zones")
             if dns_template is not None:
                 model["dns-template"] = ResourceTuple(dns_template, "dns-templates")
+
             await ctrl.store(model, ctx.obj["create_issue"])  # type: ignore[arg-type]
 
             show_resource(ctx, model)
@@ -370,6 +382,7 @@ async def update(
         async with Connection() as conn:
             ctrl = DnsRecordBase(conn, api_schema)
             model = await ctrl.fetch(dns_record_id)
+
             if dns_record_type is not None:
                 model["dns_record_type"] = dns_record_type
             if name is not None:
@@ -380,6 +393,7 @@ async def update(
                 model["ttl"] = ttl
             if priority is not None:
                 model["priority"] = priority
+
             await ctrl.update(model)
 
             show_resource(ctx, model)