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

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

@@ -1,14 +1,17 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: cacholong-cloud-cli
-Version: 0.3.3
+Version: 1.0.0
 Summary: Cacholong CLI, manage cloud environments at Cacholong!
+License: MIT
 Author: Matthijs Möhlmann
 Author-email: matthijs@cacholong.nl
 Requires-Python: >=3.11,<4.0
+Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: aiodns (>=3.5.0,<4.0.0)
 Requires-Dist: aiofiles (>=23.2.1,<24.0.0)
 Requires-Dist: aiohttp (>=3.0)
@@ -28,6 +31,14 @@ The API client library for managing various resources.
 
 ## Getting started
 
+To install this package you need to take a few steps before this works correctly
+1. Create an virtual environment: python3 -m venv <directory>
+2. Activate the environment: <directory>/bin/activate
+3. Now install the package: pip install cacholong-cloud-cli
+4. Or upgrade the package: pip install cacholong-cloud-cli --upgrade
+
+Now you can use the command `ccloud` on the system. Please note, make sure to activate the virtual environment before running the command `ccloud`.
+
 You will need an API-token. This token can be created using our panel at https://cp.cacholong.eu/#/user/settings/api. You can create an api token within your profile under API.
 
 When running the command `ccloud` for the first time it will ask you for an API-token.
@@ -87,7 +98,7 @@ from cacholong_sdk import DnsZone, DnsZoneModel, DnsRecord, DnsRecordModel
 
 async def main():
     async with connection('https://api.cacholong.eu/api/v1/', 'YOUR-API-TOKEN') as api:
-        searchfilter = Filter(domain=sys.argv[1])
+        searchfilter = Filter(account="UUID_OF_ACCOUNT")
         DnsZoneCtrl = DnsZone(api)
         async for zone in DnsZoneCtrl.fetch_all(searchfilter):
             print(zone["domain"])
@@ -96,22 +107,69 @@ async def main():
 asyncio.run(main())
 ```
 
-## Suggestions for a good README
-Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information.
+### Create a DNS-record
+```python
+import asyncio
 
-## Support
-Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc.
+from cacholong_sdk.connection import connection
+from cacholong_sdk import ResourceTuple, Inclusion, Filter
+from cacholong_sdk import DnsZone, DnsZoneModel, DnsRecord, DnsRecordModel
+
+async def main():
+    async with connection('https://api.cacholong.eu/api/v1/', 'YOUR-API-TOKEN') as api:
+        DnsRecordCtrl = DnsRecord(api)
+
+        dns_record = DNSRecordCtrl.create()
+        dns_record["dns-zone"] = ResourceTuple("UUID_DNS_ZONE", "dns-zones")
+        dns_record["name"] = "localhost.example.nl"
+        dns_record["dns_record_type"] = "A"
+        dns_record["content"] = "127.0.0.1"
+        dns_record["ttl"] = 300
+        await DNSRecordCtrl.store(dns_record)
+
+# Execute main function
+asyncio.run(main())
+```
+
+### Update a DNS-record
+```python
+import asyncio
+
+from cacholong_sdk.connection import connection
+from cacholong_sdk import ResourceTuple, Inclusion, Filter
+from cacholong_sdk import DnsZone, DnsZoneModel, DnsRecord, DnsRecordModel
+
+async def main():
+    async with connection('https://api.cacholong.eu/api/v1/', 'YOUR-API-TOKEN') as api:
+        DnsRecordCtrl = DnsRecord(api)
+
+        dns_record = await DnsRecordCtrl.fetch("UUID_OF_DNS_RECORD")
+        dns_record["content"] = "127.0.0.1"
+
+        # Be careful: the above change will be applied automatically
+
+# Execute main function
+asyncio.run(main())
+```
+
+### Delete a DNS-record
+```python
+import asyncio
 
-## Roadmap
-If you have ideas for releases in the future, it is a good idea to list them in the README.
+from cacholong_sdk.connection import connection
+from cacholong_sdk import ResourceTuple, Inclusion, Filter
+from cacholong_sdk import DnsZone, DnsZoneModel, DnsRecord, DnsRecordModel
 
-## Contributing
-State if you are open to contributions and what your requirements are for accepting them.
+async def main():
+    async with connection('https://api.cacholong.eu/api/v1/', 'YOUR-API-TOKEN') as api:
+        DnsRecordCtrl = DnsRecord(api)
 
-For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self.
+        await DnsRecordCtrl.destroy("UUID_OF_DNS_RECORD")
 
-You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser.
+# Execute main function
+asyncio.run(main())
+```
 
-## License
-For open source projects, say how it is licensed.
+## Support
+Questions, feedback, or suggestions? Send us an email at [ccloud-support@cacholong.nl].
 

cacholong_cloud_cli-1.0.0/README.md

@@ -0,0 +1,149 @@
+# CLI frontend
+
+The API client library for managing various resources.
+
+[Client Library Documentation](https://docs.cacholong.eu/api/)
+
+## Getting started
+
+To install this package you need to take a few steps before this works correctly
+1. Create an virtual environment: python3 -m venv <directory>
+2. Activate the environment: <directory>/bin/activate
+3. Now install the package: pip install cacholong-cloud-cli
+4. Or upgrade the package: pip install cacholong-cloud-cli --upgrade
+
+Now you can use the command `ccloud` on the system. Please note, make sure to activate the virtual environment before running the command `ccloud`.
+
+You will need an API-token. This token can be created using our panel at https://cp.cacholong.eu/#/user/settings/api. You can create an api token within your profile under API.
+
+When running the command `ccloud` for the first time it will ask you for an API-token.
+
+After that you will be able to run the following command:
+```bash
+ccloud accounts list
+```
+
+This will give you an overview of accounts where you have access to.
+
+## Usage
+
+Overview of the possibilities:
+```bash
+ccloud --help
+```
+
+To fetch an overview of the dns-zones for an account:
+```bash
+ccloud dns-zones list --account <account uuid>
+```
+
+Creating a DNS-record:
+```bash
+ccloud dns-records create --dns-zone <dns-zone uuid> \
+    --name localhost.example.com \
+    --dns-record-type A \
+    --content 127.0.0.1 \
+    --ttl 300
+```
+
+Updating a DNS-record:
+```bash
+ccloud dns-records update <dns-record uuid> \
+    --content 127.0.0.1
+```
+
+Deleting a DNS-record:
+```bash
+ccloud dns-records delete <dns-record uuid>
+```
+
+Every command includes an option --help which will give an overview of the possibilities.
+
+## Advanced usage
+
+Its also possible to create your own command line utility to handle various parts. Here are the same examples as above but now using python.
+
+### Fetching DNS-zones
+```python
+import asyncio
+
+from cacholong_sdk.connection import connection
+from cacholong_sdk import ResourceTuple, Inclusion, Filter
+from cacholong_sdk import DnsZone, DnsZoneModel, DnsRecord, DnsRecordModel
+
+async def main():
+    async with connection('https://api.cacholong.eu/api/v1/', 'YOUR-API-TOKEN') as api:
+        searchfilter = Filter(account="UUID_OF_ACCOUNT")
+        DnsZoneCtrl = DnsZone(api)
+        async for zone in DnsZoneCtrl.fetch_all(searchfilter):
+            print(zone["domain"])
+
+# Execute main function
+asyncio.run(main())
+```
+
+### Create a DNS-record
+```python
+import asyncio
+
+from cacholong_sdk.connection import connection
+from cacholong_sdk import ResourceTuple, Inclusion, Filter
+from cacholong_sdk import DnsZone, DnsZoneModel, DnsRecord, DnsRecordModel
+
+async def main():
+    async with connection('https://api.cacholong.eu/api/v1/', 'YOUR-API-TOKEN') as api:
+        DnsRecordCtrl = DnsRecord(api)
+
+        dns_record = DNSRecordCtrl.create()
+        dns_record["dns-zone"] = ResourceTuple("UUID_DNS_ZONE", "dns-zones")
+        dns_record["name"] = "localhost.example.nl"
+        dns_record["dns_record_type"] = "A"
+        dns_record["content"] = "127.0.0.1"
+        dns_record["ttl"] = 300
+        await DNSRecordCtrl.store(dns_record)
+
+# Execute main function
+asyncio.run(main())
+```
+
+### Update a DNS-record
+```python
+import asyncio
+
+from cacholong_sdk.connection import connection
+from cacholong_sdk import ResourceTuple, Inclusion, Filter
+from cacholong_sdk import DnsZone, DnsZoneModel, DnsRecord, DnsRecordModel
+
+async def main():
+    async with connection('https://api.cacholong.eu/api/v1/', 'YOUR-API-TOKEN') as api:
+        DnsRecordCtrl = DnsRecord(api)
+
+        dns_record = await DnsRecordCtrl.fetch("UUID_OF_DNS_RECORD")
+        dns_record["content"] = "127.0.0.1"
+
+        # Be careful: the above change will be applied automatically
+
+# Execute main function
+asyncio.run(main())
+```
+
+### Delete a DNS-record
+```python
+import asyncio
+
+from cacholong_sdk.connection import connection
+from cacholong_sdk import ResourceTuple, Inclusion, Filter
+from cacholong_sdk import DnsZone, DnsZoneModel, DnsRecord, DnsRecordModel
+
+async def main():
+    async with connection('https://api.cacholong.eu/api/v1/', 'YOUR-API-TOKEN') as api:
+        DnsRecordCtrl = DnsRecord(api)
+
+        await DnsRecordCtrl.destroy("UUID_OF_DNS_RECORD")
+
+# Execute main function
+asyncio.run(main())
+```
+
+## Support
+Questions, feedback, or suggestions? Send us an email at [ccloud-support@cacholong.nl].

{cacholong_cloud_cli-0.3.3 → cacholong_cloud_cli-1.0.0}/cacholong_cli/AsyncTyper.py

@@ -1,14 +1,17 @@
 from asyncio import run
 from functools import wraps
+from typing import Callable, Any
 
 import typer
 
 
 class AsyncTyper(typer.Typer):
-    def async_command(self, *args, **kwargs):
-        def decorator(async_func):
+    def async_command(
+        self, *args: Any, **kwargs: Any
+    ) -> Callable[[Callable], Callable]:
+        def decorator(async_func: Callable) -> Callable:
             @wraps(async_func)
-            def sync_func(*_args, **_kwargs):
+            def sync_func(*_args: Any, **_kwargs: Any) -> Any:
                 return run(async_func(*_args, **_kwargs))
 
             self.command(*args, **kwargs)(sync_func)

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

@@ -11,13 +11,16 @@ from cacholong_cli.commands import (
     dns_records,
     dns_templates,
     dns_zones,
+    mail_addresses,
+    mail_address_aliases,
+    mail_domains,
+    mail_forwards,
     products,
     purchases,
 )
 from cacholong_cli.common import OutputFormat
 from xdg import BaseDirectory
 
-
 # Version of our CLI
 __version__ = importlib.metadata.version("cacholong-cloud-cli")
 
@@ -44,6 +47,14 @@ app.add_typer(companies.app, name="companies", help="Manage companies")
 app.add_typer(dns_records.app, name="dns-records", help="Manage DNS records")
 app.add_typer(dns_templates.app, name="dns-templates", help="Manage DNS templates")
 app.add_typer(dns_zones.app, name="dns-zones", help="Manage DNS zones")
+app.add_typer(mail_addresses.app, name="mail-addresses", help="Manage mail addresses")
+app.add_typer(
+    mail_address_aliases.app,
+    name="mail-address-aliases",
+    help="Manage mail address aliases",
+)
+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")
 

cacholong_cloud_cli-1.0.0/cacholong_cli/commands/accounts.py

@@ -0,0 +1,240 @@
+import asyncio
+import typer
+from typing import List, Optional, Dict, Any, Union, Type
+from typing_extensions import Annotated
+from rich.table import Column
+from uuid import UUID
+from datetime import datetime, date, timezone
+from cacholong_cli.AsyncTyper import AsyncTyper
+from cacholong_cli.common import (
+    list_resources,
+    list_relation_resources,
+    show_resource,
+    print_document_error,
+    TableDef,
+)
+from cacholong_cli.connection import Connection
+from cacholong_sdk import Filter, Inclusion, DocumentError, ResourceTuple
+from cacholong_sdk import AccountBase, AccountBaseModel
+
+from cacholong_sdk.api_schema import api_schema
+
+# Create typer object
+app = AsyncTyper()
+
+
+@app.async_command(help="Get accounts")
+async def list(
+    ctx: typer.Context,
+    name: Annotated[Optional[str], typer.Option(help="The unique account name")] = None,
+    description: Annotated[
+        Optional[str], typer.Option(help="Optional description of the account")
+    ] = None,
+    account_type: Annotated[
+        Optional[str], typer.Option(help="The account type")
+    ] = None,
+    account_account_id: Annotated[
+        Optional[str], typer.Option(help="Parent account ID")
+    ] = None,
+    account_account_relation: Annotated[
+        Optional[str], typer.Option(help="Parent account relationship type")
+    ] = None,
+    created_at: Annotated[
+        Optional[datetime],
+        typer.Option(help="Timestamp when the account was created (exact match)"),
+    ] = None,
+    created_at_gte: Annotated[
+        Optional[datetime],
+        typer.Option(
+            help="Timestamp when the account was created (greater than or equal)"
+        ),
+    ] = None,
+    created_at_lte: Annotated[
+        Optional[datetime],
+        typer.Option(
+            help="Timestamp when the account was created (less than or equal)"
+        ),
+    ] = None,
+    created_at_gt: Annotated[
+        Optional[datetime],
+        typer.Option(help="Timestamp when the account was created (greater than)"),
+    ] = None,
+    created_at_lt: Annotated[
+        Optional[datetime],
+        typer.Option(help="Timestamp when the account was created (less than)"),
+    ] = None,
+    updated_at: Annotated[
+        Optional[datetime],
+        typer.Option(help="Timestamp when the account was last updated (exact match)"),
+    ] = None,
+    updated_at_gte: Annotated[
+        Optional[datetime],
+        typer.Option(
+            help="Timestamp when the account was last updated (greater than or equal)"
+        ),
+    ] = None,
+    updated_at_lte: Annotated[
+        Optional[datetime],
+        typer.Option(
+            help="Timestamp when the account was last updated (less than or equal)"
+        ),
+    ] = None,
+    updated_at_gt: Annotated[
+        Optional[datetime],
+        typer.Option(help="Timestamp when the account was last updated (greater than)"),
+    ] = None,
+    updated_at_lt: Annotated[
+        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(
+                query_str="filter[account_account_relation]="
+                + str(account_account_relation)
+            )
+        )
+    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"
+            )
+        )
+    if company is not None:
+        modifier.append(Filter(company=str(company)))
+
+    # Table definition
+    tabledef: TableDef = [
+        {"header": Column("Id", no_wrap=True), "column": "id"},
+        {"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)
+
+
+@app.async_command(help="Get account with account id")
+async def show(
+    ctx: typer.Context,
+    account_id: Annotated[UUID, typer.Argument(help="Resource ID to show")],
+):
+    # Show resource
+    try:
+        async with Connection() as conn:
+            ctrl = AccountBase(conn, api_schema)
+            model = await ctrl.fetch(account_id)
+
+            show_resource(ctx, model)
+    except DocumentError as e:
+        await print_document_error(e)