aio-kong 3.0.0__tar.gz → 3.3.1__tar.gz

{aio_kong-3.0.0 → aio_kong-3.3.1}/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2022 Quantmind
+Copyright (c) 2023 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.0.0 → aio_kong-3.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aio-kong
-Version: 3.0.0
+Version: 3.3.1
 Summary: Asynchronous Kong Client
 License: BSD-3-Clause
 Author: Luca
@@ -17,9 +17,6 @@ Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
 Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
@@ -37,11 +34,11 @@ Description-Content-Type: text/markdown
 [![PyPI version](https://badge.fury.io/py/aio-kong.svg)](https://badge.fury.io/py/aio-kong)
 [![Python versions](https://img.shields.io/pypi/pyversions/aio-kong.svg)](https://pypi.org/project/aio-kong)
 [![Build](https://github.com/quantmind/aio-kong/workflows/build/badge.svg)](https://github.com/quantmind/aio-kong/actions?query=workflow%3Abuild)
-[![codecov](https://codecov.io/gh/quantmind/aio-kong/branch/master/graph/badge.svg)](https://codecov.io/gh/quantmind/aio-kong)
+[![codecov](https://codecov.io/gh/quantmind/aio-kong/branch/main/graph/badge.svg?token=JF5L0PEkW6)](https://codecov.io/gh/quantmind/aio-kong)
 [![Downloads](https://img.shields.io/pypi/dd/aio-kong.svg)](https://pypi.org/project/aio-kong/)
 
 
-Tested with [kong][] v3.1
+Tested with [kong][] v3.3
 
 ## Installation & Testing
 

{aio_kong-3.0.0 → aio_kong-3.3.1}/kong/__init__.py

@@ -1,3 +1,3 @@
 """Asynchronous Kong client"""
 
-__version__ = "3.0.0"
+__version__ = "3.3.1"

{aio_kong-3.0.0 → aio_kong-3.3.1}/kong/auths.py

@@ -15,7 +15,6 @@ def auth_factory(consumer: Consumer, auth_type: str) -> ConsumerAuth:
 
 
 class ConsumerAuth(CrudComponent):
-
     unique_field: str = ""
 
     @property

{aio_kong-3.0.0 → aio_kong-3.3.1}/kong/client.py

@@ -54,7 +54,7 @@ class Kong:
     __str__ = __repr__
 
     @property
-    def cli(self) -> "Kong":
+    def cli(self) -> Kong:
         return self
 
     async def close(self) -> None:

{aio_kong-3.0.0 → aio_kong-3.3.1}/kong/routes.py

@@ -1,4 +1,3 @@
-from itertools import zip_longest
 from typing import cast
 
 from .components import UUID, CrudComponent, JsonType
@@ -19,26 +18,27 @@ class Routes(CrudComponent):
         await route.plugins.delete_all()
         return await super().delete(id_)
 
-    async def apply_json(self, data: JsonType, clear: bool = True) -> list:
+    async def apply_json(self, data: JsonType, clear: bool = True) -> list[dict]:
         if not isinstance(data, list):
             data = [data]
         routes = await self.get_list()
+        route_map = {r.name: r for r in routes}
         result = []
-        for entry, route in zip_longest(data, routes):
-            if not entry:
-                if route and clear:
-                    await self.delete(route.id)
-                continue
+        for entry in data:
+            name = entry.get("name")
+            route = route_map.pop(name, None) if name else None
             entry = entry.copy()
             plugins = entry.pop("plugins", [])
             as_list("hosts", entry)
             as_list("paths", entry)
             as_list("methods", entry)
-            if not route:
-                entity = await self.create(**entry)
-            else:
-                entity = await self.update(route.id, **entry)
+            if route:
+                await self.delete(route.id)
+            entity = await self.create(**entry)
             route = cast(KongEntityWithPlugins, entity)
             route.data["plugins"] = await route.plugins.apply_json(plugins)
             result.append(route.data)
+        if clear:
+            for route in route_map.values():
+                await self.delete(route.id)
         return result

{aio_kong-3.0.0 → aio_kong-3.3.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aio-kong"
-version = "3.0.0"
+version = "3.3.1"
 description = "Asynchronous Kong Client"
 authors = ["Luca <luca@quantmind.com>"]
 license = "BSD-3-Clause"
@@ -37,20 +37,38 @@ aiohttp = "^3.8.1"
 click = "^8.1.3"
 PyYAML = "^6.0"
 
-[tool.poetry.dev-dependencies]
-black = "^22.6.0"
+[tool.poetry.group.dev.dependencies]
+black = "^23.3.0"
 isort = "^5.10.1"
-mypy = "^0.991"
+mypy = "^1.4.0"
 pytest = "^7.1.2"
 pytest-cov = "^4.0.0"
-flake8 = "^6.0.0"
-flake8-blind-except = "^0.2.0"
-codecov = "^2.1.12"
-coverage = "^6.2"
-python-dotenv = "^0.21.0"
-pytest-asyncio = "^0.20.1"
+python-dotenv = "^1.0.0"
+pytest-asyncio = "^0.21.0"
 types-PyYAML = "^6.0.11"
+ruff = "^0.0.274"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"
+
+
+[tool.pytest.ini_options]
+asyncio_mode = "auto"
+testpaths = [
+    "tests"
+]
+
+
+[tool.isort]
+profile = "black"
+
+[tool.ruff]
+select = ["E", "F"]
+line-length = 88
+
+[tool.mypy]
+disallow_untyped_calls = true
+warn_return_any = false
+disallow_untyped_defs = true
+warn_no_return = true

{aio_kong-3.0.0 → aio_kong-3.3.1}/readme.md

@@ -3,11 +3,11 @@
 [![PyPI version](https://badge.fury.io/py/aio-kong.svg)](https://badge.fury.io/py/aio-kong)
 [![Python versions](https://img.shields.io/pypi/pyversions/aio-kong.svg)](https://pypi.org/project/aio-kong)
 [![Build](https://github.com/quantmind/aio-kong/workflows/build/badge.svg)](https://github.com/quantmind/aio-kong/actions?query=workflow%3Abuild)
-[![codecov](https://codecov.io/gh/quantmind/aio-kong/branch/master/graph/badge.svg)](https://codecov.io/gh/quantmind/aio-kong)
+[![codecov](https://codecov.io/gh/quantmind/aio-kong/branch/main/graph/badge.svg?token=JF5L0PEkW6)](https://codecov.io/gh/quantmind/aio-kong)
 [![Downloads](https://img.shields.io/pypi/dd/aio-kong.svg)](https://pypi.org/project/aio-kong/)
 
 
-Tested with [kong][] v3.1
+Tested with [kong][] v3.3
 
 ## Installation & Testing
 

aio_kong-3.0.0/setup.py

@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-from setuptools import setup
-
-packages = \
-['kong']
-
-package_data = \
-{'': ['*']}
-
-install_requires = \
-['PyYAML>=6.0,<7.0', 'aiohttp>=3.8.1,<4.0.0', 'click>=8.1.3,<9.0.0']
-
-setup_kwargs = {
-    'name': 'aio-kong',
-    'version': '3.0.0',
-    'description': 'Asynchronous Kong Client',
-    'long_description': '# Async Python Client for Kong\n\n[![PyPI version](https://badge.fury.io/py/aio-kong.svg)](https://badge.fury.io/py/aio-kong)\n[![Python versions](https://img.shields.io/pypi/pyversions/aio-kong.svg)](https://pypi.org/project/aio-kong)\n[![Build](https://github.com/quantmind/aio-kong/workflows/build/badge.svg)](https://github.com/quantmind/aio-kong/actions?query=workflow%3Abuild)\n[![codecov](https://codecov.io/gh/quantmind/aio-kong/branch/master/graph/badge.svg)](https://codecov.io/gh/quantmind/aio-kong)\n[![Downloads](https://img.shields.io/pypi/dd/aio-kong.svg)](https://pypi.org/project/aio-kong/)\n\n\nTested with [kong][] v3.1\n\n## Installation & Testing\n\nTo install the package\n\n```\npip install aio-kong\n```\n\nTo run tests, clone and\n\n```\nmake test\n```\n\n:warning: If you don\'t have Kong or postgres running locally, run the services first\n\n```bash\nmake services\n```\n\ntest certificates were generated using the command\n\n```\nopenssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj \'/CN=localhost\'\n```\n\n## Client\n\nThe client can be imported via\n\n```python\nfrom kong.client import Kong\n```\n\nIn a coroutine:\n\n```python\nasync with Kong() as cli:\n    services = await cli.services.get_list()\n    print(json.dumps([s.data for s in services], indent=2))\n```\n\nBy default the url is obtained from the "KONG_ADMIN_URL" environment variable which defaults to http://127.0.0.1:8001.\n\nThe client has handlers for all Kong objects\n\n- [cli.services](./kong/services.py) CRUD operations on services\n- [cli.routes](./kong/routes.py) CRUD operations on routes\n- [cli.plugins](./kong/plugins.py) CRUD operations on plugins\n- [cli.consumers](./kong/consumers.py) CRUD operations on consumers\n- [cli.certificates](./kong/certificates.py) CRUD operations on TLS certificates\n- [cli.snis](./kong/snis.py) CRUD operations on SNIs\n- `cli.acls` To list all ACLs\n\n### Apply a configuration\n\nThe client allow to apply a configuration object to kong:\n\n```python\nawait cli.apply_json(config)\n```\n\n## Command line tool\n\nThe library install the `kongfig` command line tool for uploading kong configuration files.\n\n```\nkongfig --yaml config.yaml\n```\n\n[kong]: https://github.com/Kong/kong\n',
-    'author': 'Luca',
-    'author_email': 'luca@quantmind.com',
-    'maintainer': 'None',
-    'maintainer_email': 'None',
-    'url': 'None',
-    'packages': packages,
-    'package_data': package_data,
-    'install_requires': install_requires,
-    'python_requires': '>=3.10,<4.0',
-}
-
-
-setup(**setup_kwargs)