aio-kong 3.7.1__py3-none-any.whl → 3.7.2__py3-none-any.whl

{aio_kong-3.7.1.dist-info → aio_kong-3.7.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: aio-kong
-Version: 3.7.1
+Version: 3.7.2
 Summary: Asynchronous Kong Client
 License: BSD-3-Clause
 Author: Luca Sbardella
@@ -113,5 +113,13 @@ and to run the cli tool, you can use the following command:
 kongfig --help
 ```
 
+
+## Environment variables
+
+The client uses the following environment variables:
+
+* `KONG_ADMIN_URL`: The URL of the Kong admin API. Defaults to `http://127.0.0.1:8001`.
+* `KONG_ADMIN_SSL`: Whether to use SSL validation for the Kong admin API. Defaults to `true`.
+
 [kong]: https://github.com/Kong/kong
 

{aio_kong-3.7.1.dist-info → aio_kong-3.7.2.dist-info}/RECORD

@@ -1,9 +1,9 @@
-kong/__init__.py,sha256=XBw4jTdRI9AISqosZ32-Z6cawhimVjvwj8AmcgCW0rs,54
+kong/__init__.py,sha256=_bttf2nr5Tpq7nT_IWzoyaYbwcnddQgYHfInF1gHjZY,54
 kong/acls.py,sha256=1HR66CKp6SVOmtauXOnj77moLMeHfL7gsfBRwlbJK1U,127
 kong/auths.py,sha256=1aNSQ6Sw5rjh8lbJppH9GOXVMG6KL7-bO4P75MsFKJU,2337
 kong/certificates.py,sha256=7QYS0BLg5QKyjdi1dUDGErXBZHQK4ARv_iYFluXX3RM,275
-kong/cli.py,sha256=9_HiFC2FxhNpCufkg86E00k1nKjorp4O8Bss6ZmLdx8,5649
-kong/client.py,sha256=T8cTcpCMZ4Lm_BFta56sFintV3vqgQFr5_4kwUi7LDc,4010
+kong/cli.py,sha256=7ZUbTH64P_vFmEMgeg3s8RnwK7naFWXlebvpR91x5JA,5934
+kong/client.py,sha256=t06vRnqif86FbYfjKnZOEPyCFs7o56cX40GvEQDd0mg,4383
 kong/components.py,sha256=ZT3bSsfFzKOH-ipXFDFAsMCjWydqqCGsakbhB26CBfM,5471
 kong/consumers.py,sha256=SDR9W6zY3PAIq_iC0EOSKbn0lyTl4C7WbsyM7MA7hLs,2715
 kong/plugins.py,sha256=GmuL-EnrpHeZEzv0bjDvXE0oTtG3DYWpGi0AZHMmY7E,2730
@@ -12,8 +12,8 @@ kong/routes.py,sha256=e1n5hIIirwkAVacbFnJ_C1AwQN_IC10gISyXU8ex-g0,1493
 kong/services.py,sha256=fVArH4m7DfTfgBD7n1OGUArE-P6ZNJUP_zPPM1sBNRo,2616
 kong/snis.py,sha256=QxjHFUtMGvlBcfCdiye5hQ9n8D1PRSQQThqaB-OekLI,716
 kong/utils.py,sha256=Uoe5DRclN-t1DX8AvwgidYn8GMMvLUXVjMgzqs6mUAE,932
-aio_kong-3.7.1.dist-info/LICENSE,sha256=hTYbUZ810IUK9Cr9n0_PpfL7rpjDPSC9_CaS2014bdg,1466
-aio_kong-3.7.1.dist-info/METADATA,sha256=it4SamLtWRNYUoSjVxDoW-b1NAzMRh-Mc1b0r_h5R_s,3249
-aio_kong-3.7.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-aio_kong-3.7.1.dist-info/entry_points.txt,sha256=Wp_emFiShNNMtqwMxwwdo7qQDiLMxYqZwk9sP4YbEp4,41
-aio_kong-3.7.1.dist-info/RECORD,,
+aio_kong-3.7.2.dist-info/LICENSE,sha256=hTYbUZ810IUK9Cr9n0_PpfL7rpjDPSC9_CaS2014bdg,1466
+aio_kong-3.7.2.dist-info/METADATA,sha256=HnqLHnaRRPHtVdJpsQod4e4YirBtzUOnLI1rWYTwDfM,3513
+aio_kong-3.7.2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+aio_kong-3.7.2.dist-info/entry_points.txt,sha256=Wp_emFiShNNMtqwMxwwdo7qQDiLMxYqZwk9sP4YbEp4,41
+aio_kong-3.7.2.dist-info/RECORD,,

kong/__init__.py

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

kong/cli.py

@@ -55,11 +55,12 @@ def ip() -> None:
 
 
 @kong.command()
+@click.option("-d", "--delete", type=str, help="Delete a service by name")
 @admin_url
 @as_json
-def services(url: str, json: bool) -> None:
+def services(delete: str, url: str, json: bool) -> None:
     "Display services"
-    asyncio.run(_services(url, as_json=json))
+    asyncio.run(_services(url, as_json=json, delete=delete))
 
 
 @kong.command()
@@ -96,9 +97,13 @@ async def _yml(yaml: Any, clear: bool, url: str) -> None:
             raise click.ClickException(str(exc)) from None
 
 
-async def _services(url: str, as_json: bool = False) -> None:
+async def _services(url: str, as_json: bool = False, delete: str | None = None) -> None:
     async with Kong(url=url) as cli:
         try:
+            if delete:
+                await cli.services.delete(delete)
+                click.echo(f"Service '{delete}' deleted.")
+                return
             services = await cli.services.get_full_list()
         except KongError as exc:
             raise click.ClickException(str(exc)) from None

kong/client.py

@@ -22,28 +22,41 @@ DEFAULT_USER_AGENT = (
     f"python/{'.'.join(map(str, sys.version_info[:2]))} aio-kong/{__version__}"
 )
 
+KONG_ADMIN_SSL = os.getenv("KONG_ADMIN_SSL", "true").strip().lower() in (
+    "true",
+    "1",
+    "yes",
+)
+
 
 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"))
 
 
+def kong_request_kwargs(request_kwargs: dict | None = None) -> dict:
+    kwargs = request_kwargs or {}
+    if "ssl" not in kwargs and not KONG_ADMIN_SSL:
+        kwargs["ssl"] = False
+    return kwargs
+
+
 class Kong:
     """Kong client"""
 
-    content_type: str = "application/json, text/*; q=0.5"
-
     def __init__(
         self,
         url: str | None = None,
         session: ClientSession | None = None,
         request_kwargs: dict | None = None,
         user_agent: str = DEFAULT_USER_AGENT,
+        content_type: str = "application/json, text/*; q=0.5",
     ) -> None:
         self.url = url or default_admin_url()
         self.session = session
         self.user_agent = user_agent
-        self.request_kwargs = request_kwargs or {}
+        self.content_type = content_type
+        self.request_kwargs = kong_request_kwargs(request_kwargs)
         self.services = Services(self, Service)
         self.routes = Routes(self, Route)
         self.plugins = Plugins(self, Plugin)