aio-kong 3.6.0__tar.gz → 3.7.1__tar.gz

{aio_kong-3.6.0 → aio_kong-3.7.1}/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2023 Quantmind
+Copyright (c) 2018-2025 Quantmind
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:

{aio_kong-3.6.0 → aio_kong-3.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: aio-kong
-Version: 3.6.0
+Version: 3.7.1
 Summary: Asynchronous Kong Client
 License: BSD-3-Clause
 Author: Luca Sbardella
@@ -16,6 +16,7 @@ Provides-Extra: cli
 Requires-Dist: PyYAML (>=6.0) ; extra == "cli"
 Requires-Dist: aiohttp (>=3.9.5)
 Requires-Dist: click (>=8.1.3) ; extra == "cli"
+Requires-Dist: rich (>=13.7.1) ; extra == "cli"
 Project-URL: Issues, https://github.com/quantmind/aio-kong/issues
 Project-URL: Repository, https://github.com/quantmind/aio-kong
 Description-Content-Type: text/markdown
@@ -109,7 +110,7 @@ pip install aio-kong[cli]
 and to run the cli tool, you can use the following command:
 
 ```
-kongfig --yaml config.yaml
+kongfig --help
 ```
 
 [kong]: https://github.com/Kong/kong

{aio_kong-3.6.0 → aio_kong-3.7.1}/kong/__init__.py

@@ -1,3 +1,3 @@
 """Asynchronous Kong client"""
 
-__version__ = "3.6.0"
+__version__ = "3.7.1"

aio_kong-3.7.1/kong/cli.py

@@ -0,0 +1,203 @@
+import asyncio
+import json
+from typing import Any, cast
+
+import click
+import yaml as _yaml
+from rich.console import Console
+from rich.table import Table
+
+from . import __version__
+from .client import Kong, KongError, default_admin_url
+from .components import KongEntity
+from .consumers import Consumer
+from .utils import local_ip
+
+admin_url = click.option(
+    "--url", default=default_admin_url(), help="Kong Admin URL", show_default=True
+)
+
+as_json = click.option("--json", default=False, is_flag=True, help="Output as JSON")
+
+
+@click.group()
+@click.version_option(version=__version__)
+def kong() -> None:
+    """Kong CLI - Manage Kong Gateway configurations."""
+    pass
+
+
+@kong.command()
+@click.argument(
+    "yaml",
+    type=click.File("r"),
+)
+@click.option(
+    "--clear",
+    default=False,
+    is_flag=True,
+    help="Clear objects not in configuration",
+)
+@admin_url
+def yaml(
+    yaml: click.File,
+    clear: bool,
+    url: str,
+) -> None:
+    "Upload a configuration from a yaml file"
+    asyncio.run(_yml(yaml, clear, url))
+
+
+@kong.command()
+def ip() -> None:
+    "Show local IP address"
+    click.echo(local_ip())
+
+
+@kong.command()
+@admin_url
+@as_json
+def services(url: str, json: bool) -> None:
+    "Display services"
+    asyncio.run(_services(url, as_json=json))
+
+
+@kong.command()
+@click.argument("service")
+@admin_url
+@as_json
+def routes(service: str, url: str, json: bool) -> None:
+    "Display routes for a service"
+    asyncio.run(_routes(service, url, as_json=json))
+
+
+@kong.command()
+@admin_url
+@as_json
+def consumers(url: str, json: bool) -> None:
+    "Display consumers"
+    asyncio.run(_consumers(url, as_json=json))
+
+
+@kong.command()
+@click.argument("consumer")
+@admin_url
+def key_auth(consumer: str, url: str) -> None:
+    "Create or display an authentication key for a consumer"
+    asyncio.run(_auth_key(consumer, url))
+
+
+async def _yml(yaml: Any, clear: bool, url: str) -> None:
+    async with Kong(url=url) as cli:
+        try:
+            result = await cli.apply_json(_yaml.safe_load(yaml), clear=clear)
+            display_json(result)
+        except KongError as exc:
+            raise click.ClickException(str(exc)) from None
+
+
+async def _services(url: str, as_json: bool = False) -> None:
+    async with Kong(url=url) as cli:
+        try:
+            services = await cli.services.get_full_list()
+        except KongError as exc:
+            raise click.ClickException(str(exc)) from None
+        if as_json:
+            display_json(services)
+            return
+        table = Table(title="Services")
+        columns = ["Name", "Host", "Port", "Protocol", "Path", "Tags", "ID"]
+        for column in columns:
+            table.add_column(column)
+        for s in sorted(services, key=lambda s: s.name):
+            table.add_row(*[str_value(s.data, column) for column in columns])
+        console = Console()
+        console.print(table)
+
+
+async def _routes(service: str, url: str, as_json: bool = False) -> None:
+    async with Kong(url=url) as cli:
+        try:
+            svc = await cli.services.get(service)
+            routes = await svc.routes.get_full_list()
+        except KongError as exc:
+            raise click.ClickException(str(exc)) from None
+        if as_json:
+            display_json(routes)
+            return
+        table = Table(title="Services")
+        columns = [
+            "Name",
+            "Hosts",
+            "Protocols",
+            "Path",
+            "Tags",
+            "Strip Path",
+            "Preserve Host",
+            "ID",
+        ]
+        for column in columns:
+            table.add_column(column)
+        for s in sorted(routes, key=lambda s: s.name):
+            table.add_row(*[str_value(s.data, column) for column in columns])
+        console = Console()
+        console.print(table)
+
+
+async def _consumers(url: str, as_json: bool = False) -> None:
+    async with Kong(url=url) as cli:
+        try:
+            consumers = await cli.consumers.get_full_list()
+        except KongError as exc:
+            raise click.ClickException(str(exc)) from None
+        if as_json:
+            display_json(consumers)
+            return
+        table = Table(title="Consumers")
+        columns = ["Username", "ID", "Custom ID", "Tags"]
+        for column in columns:
+            table.add_column(column)
+        for c in sorted(consumers, key=lambda s: s.name):
+            table.add_row(*[str_value(c.data, column) for column in columns])
+        console = Console()
+        console.print(table)
+
+
+async def _auth_key(consumer: str, admin_url: str) -> None:
+    async with Kong(url=admin_url) as cli:
+        try:
+            c = cast(Consumer, await cli.consumers.get(consumer))
+            keys = await c.keyauths.get_list()
+            if keys:
+                key = keys[0]
+            else:
+                key = await c.keyauths.create()
+            display_json(key)
+        except KongError as exc:
+            raise click.ClickException(str(exc)) from None
+
+
+def str_value(data: dict, key: str) -> str:
+    key = key.lower().replace(" ", "_")
+    value = data.get(key)
+    if value is None:
+        return ""
+    elif isinstance(value, bool):
+        return ":white_check_mark:" if value else "[red]:x:"
+    elif isinstance(value, list):
+        return ", ".join(str(v) for v in value)
+    else:
+        return str(value)
+
+
+def display_json(data: Any) -> None:
+    """Display data as JSON."""
+    click.echo(json.dumps(data, indent=2, default=kong_entity))
+
+
+def kong_entity(obj: Any) -> Any:
+    if isinstance(obj, KongEntity):
+        return obj.data
+    raise TypeError(
+        f"Cannot serialize {type(obj).__name__} to JSON"
+    )  # pragma: no cover

{aio_kong-3.6.0 → aio_kong-3.7.1}/kong/client.py

@@ -9,7 +9,7 @@ from aiohttp import ClientResponse, ClientSession
 from . import __version__
 from .acls import Acl, Acls
 from .certificates import Certificate, Certificates
-from .components import KongError, KongResponseError
+from .components import CrudComponent, KongError, KongResponseError
 from .consumers import Consumer, Consumers
 from .plugins import Plugin, Plugins
 from .routes import Route, Routes
@@ -23,22 +23,24 @@ DEFAULT_USER_AGENT = (
 )
 
 
+def default_admin_url() -> str:
+    """Return the default Kong admin URL."""
+    return os.getenv("KONG_ADMIN_URL", os.getenv("KONG_URL", "http://127.0.0.1:8001"))
+
+
 class Kong:
     """Kong client"""
 
-    url: str = os.getenv(
-        "KONG_ADMIN_URL", os.getenv("KONG_URL", "http://127.0.0.1:8001")
-    )
     content_type: str = "application/json, text/*; q=0.5"
 
     def __init__(
         self,
-        url: str = "",
+        url: str | None = None,
         session: ClientSession | None = None,
         request_kwargs: dict | None = None,
         user_agent: str = DEFAULT_USER_AGENT,
     ) -> None:
-        self.url = url or self.url
+        self.url = url or default_admin_url()
         self.session = session
         self.user_agent = user_agent
         self.request_kwargs = request_kwargs or {}
@@ -107,7 +109,7 @@ class Kong:
             if not isinstance(data, list):
                 data = [data]
             o = getattr(self, name)
-            if not o:
+            if not isinstance(o, CrudComponent):
                 raise KongError("Kong object %s not available" % name)
             result[name] = await o.apply_json(data, clear=clear)
         return result

{aio_kong-3.6.0 → aio_kong-3.7.1}/kong/services.py

@@ -3,7 +3,7 @@ from typing import cast
 from .components import UUID, CrudComponent, JsonType, KongError
 from .plugins import KongEntityWithPlugins
 from .routes import Route, Routes
-from .utils import local_ip
+from .utils import local_ip, uid
 
 REMOVE = frozenset(("absent", "remove"))
 LOCAL_HOST = frozenset(("localhost", "127.0.0.1"))
@@ -20,12 +20,16 @@ class Service(KongEntityWithPlugins):
     def host(self) -> str:
         return self.data.get("host", "")
 
+    @property
+    def protocol(self) -> str:
+        return self.data.get("protocol", "")
+
 
 class Services(CrudComponent[Service]):
     """Kong Services"""
 
     async def delete(self, id_: str | UUID) -> bool:
-        srv = cast(Service, self.wrap({"id": id_}))
+        srv = cast(Service, self.wrap({"id": uid(id_)}))
         await srv.routes.delete_all()
         await srv.plugins.delete_all()
         return await super().delete(id_)

{aio_kong-3.6.0 → aio_kong-3.7.1}/pyproject.toml

@@ -1,19 +1,20 @@
 [project]
 name = "aio-kong"
-version = "3.6.0"
+version = "3.7.1"
 description = "Asynchronous Kong Client"
 authors = [{ name = "Luca Sbardella", email = "luca@quantmind.com" }]
 license = "BSD-3-Clause"
 readme = "readme.md"
 requires-python = ">=3.10,<4.0"
 dependencies = [
-    "aiohttp>=3.9.5",
+    "aiohttp >= 3.9.5"
 ]
 
 [project.optional-dependencies]
 cli = [
-    "PyYAML>=6.0",
-    "click>=8.1.3"
+    "PyYAML >= 6.0",
+    "click >= 8.1.3",
+    "rich >= 13.7.1"
 ]
 
 [project.scripts]

{aio_kong-3.6.0 → aio_kong-3.7.1}/readme.md

@@ -87,7 +87,7 @@ pip install aio-kong[cli]
 and to run the cli tool, you can use the following command:
 
 ```
-kongfig --yaml config.yaml
+kongfig --help
 ```
 
 [kong]: https://github.com/Kong/kong

aio_kong-3.6.0/kong/cli.py

@@ -1,69 +0,0 @@
-import asyncio
-import json
-from typing import Any, cast
-
-import click
-import yaml as _yaml
-
-from . import __version__
-from .client import Kong, KongError
-from .consumers import Consumer
-from .utils import local_ip
-
-
-@click.command()
-@click.option("--version", is_flag=True, default=False, help="Display version and exit")
-@click.option("--ip", is_flag=True, default=False, help="Show local IP address")
-@click.option(
-    "--key-auth", help="Create or display an authentication key for a consumer"
-)
-@click.option("--yaml", type=click.File("r"), help="Yaml configuration to upload")
-@click.option(
-    "--clear", default=False, is_flag=True, help="Clear objects not in configuration"
-)
-@click.pass_context
-def kong(
-    ctx: click.Context,
-    version: bool,
-    ip: bool,
-    key_auth: str,
-    yaml: click.File | None,
-    clear: bool,
-) -> None:
-    if version:
-        click.echo(__version__)
-    elif ip:
-        click.echo(local_ip())
-    elif key_auth:
-        _run(_auth_key(key_auth))
-    elif yaml:
-        _run(_yml(yaml, clear))
-    else:
-        click.echo(ctx.get_help())
-
-
-def _run(coro: Any) -> None:
-    asyncio.get_event_loop().run_until_complete(coro)
-
-
-async def _yml(yaml: Any, clear: bool) -> None:
-    async with Kong() as cli:
-        try:
-            result = await cli.apply_json(_yaml.safe_load(yaml), clear=clear)
-            click.echo(json.dumps(result, indent=4))
-        except KongError as exc:
-            raise click.ClickException(str(exc)) from None
-
-
-async def _auth_key(consumer: str) -> None:
-    async with Kong() as cli:
-        try:
-            c = cast(Consumer, await cli.consumers.get(consumer))
-            keys = await c.keyauths.get_list()
-            if keys:
-                key = keys[0]
-            else:
-                key = await c.keyauths.create()
-            click.echo(json.dumps(key.data, indent=4))
-        except KongError as exc:
-            raise click.ClickException(str(exc)) from None