Updated code for Asphalt 5

Author: agronholm

.pre-commit-config.yaml

@@ -5,7 +5,7 @@
 # * Run "pre-commit install".
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.6.0
     hooks:
       - id: check-toml
       - id: check-yaml
@@ -16,14 +16,14 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.3.5
+    rev: v0.4.8
     hooks:
       - id: ruff
         args: [--fix, --show-fixes]
       - id: ruff-format
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.9.0
+    rev: v1.10.0
     hooks:
       - id: mypy
         additional_dependencies:

pyproject.toml

@@ -60,13 +60,13 @@ local_scheme = "dirty-tag"
 [tool.ruff.lint]
 extend-select = [
     "ASYNC",        # flake8-async
-    "W",            # pycodestyle warnings
     "G",            # flake8-logging-format
     "I",            # isort
     "ISC",          # flake8-implicit-str-concat
     "PGH",          # pygrep-hooks
     "RUF100",       # unused noqa (yesqa)
     "UP",           # pyupgrade
+    "W",            # pycodestyle warnings
 ]
 
 [tool.ruff.lint.isort]

tests/test_admin_client.py

@@ -4,7 +4,7 @@
 
 import pytest
 from aiokafka.admin import AIOKafkaAdminClient
-from asphalt.core import Context, add_resource, get_resource_nowait
+from asphalt.core import Context, add_resource, get_resource_nowait, start_component
 
 from asphalt.kafka import KafkaAdminComponent
 
@@ -23,14 +23,17 @@ async def test_default_settings() -> None:
 )
 async def test_existing_resource(lookup: bool) -> None:
     client = AIOKafkaAdminClient()
-    component = KafkaAdminComponent(
-        existing_resource="default" if lookup else client, resource_name="alt"
-    )
     async with Context():
         if lookup:
             add_resource(client)
 
-        await component.start()
+        await start_component(
+            KafkaAdminComponent,
+            {
+                "existing_resource": "default" if lookup else client,
+                "resource_name": "alt",
+            },
+        )
         assert get_resource_nowait(AIOKafkaAdminClient, "alt") is client
 
 
@@ -47,11 +50,13 @@ async def test_existing_resource_conflict() -> None:
 )
 async def test_ssl_context(lookup: bool) -> None:
     ssl_context = ssl.create_default_context()
-    component = KafkaAdminComponent(ssl_context="default" if lookup else ssl_context)
     async with Context():
         if lookup:
             add_resource(ssl_context)
 
-        await component.start()
+        await start_component(
+            KafkaAdminComponent,
+            {"ssl_context": "default" if lookup else ssl_context},
+        )
         client = get_resource_nowait(AIOKafkaAdminClient)
         assert client._client._ssl_context is ssl_context

tests/test_consumer.py

@@ -4,7 +4,7 @@
 
 import pytest
 from aiokafka import AIOKafkaConsumer
-from asphalt.core import Context, add_resource, get_resource_nowait
+from asphalt.core import Context, add_resource, get_resource_nowait, start_component
 
 from asphalt.kafka import KafkaConsumerComponent
 
@@ -23,14 +23,17 @@ async def test_default_settings() -> None:
 )
 async def test_existing_resource(lookup: bool) -> None:
     consumer = AIOKafkaConsumer()
-    component = KafkaConsumerComponent(
-        existing_resource="default" if lookup else consumer, resource_name="alt"
-    )
     async with Context():
         if lookup:
             add_resource(consumer)
 
-        await component.start()
+        await start_component(
+            KafkaConsumerComponent,
+            {
+                "existing_resource": "default" if lookup else consumer,
+                "resource_name": "alt",
+            },
+        )
         assert get_resource_nowait(AIOKafkaConsumer, "alt") is consumer
 
 
@@ -47,11 +50,13 @@ async def test_existing_resource_conflict() -> None:
 )
 async def test_ssl_context(lookup: bool) -> None:
     ssl_context = ssl.create_default_context()
-    component = KafkaConsumerComponent(ssl_context="default" if lookup else ssl_context)
     async with Context():
         if lookup:
             add_resource(ssl_context)
 
-        await component.start()
+        await start_component(
+            KafkaConsumerComponent,
+            {"ssl_context": "default" if lookup else ssl_context},
+        )
         consumer = get_resource_nowait(AIOKafkaConsumer)
         assert consumer._client._ssl_context is ssl_context

tests/test_producer.py

@@ -4,7 +4,7 @@
 
 import pytest
 from aiokafka import AIOKafkaProducer
-from asphalt.core import Context, add_resource, get_resource_nowait
+from asphalt.core import Context, add_resource, get_resource_nowait, start_component
 
 from asphalt.kafka import KafkaProducerComponent
 
@@ -23,14 +23,17 @@ async def test_default_settings() -> None:
 )
 async def test_existing_resource(lookup: bool) -> None:
     producer = AIOKafkaProducer()
-    component = KafkaProducerComponent(
-        existing_resource="default" if lookup else producer, resource_name="alt"
-    )
     async with Context():
         if lookup:
             add_resource(producer)
 
-        await component.start()
+        await start_component(
+            KafkaProducerComponent,
+            {
+                "existing_resource": "default" if lookup else producer,
+                "resource_name": "alt",
+            },
+        )
         assert get_resource_nowait(AIOKafkaProducer, "alt") is producer
 
 
@@ -47,11 +50,13 @@ async def test_existing_resource_conflict() -> None:
 )
 async def test_ssl_context(lookup: bool) -> None:
     ssl_context = ssl.create_default_context()
-    component = KafkaProducerComponent(ssl_context="default" if lookup else ssl_context)
     async with Context():
         if lookup:
             add_resource(ssl_context)
 
-        await component.start()
+        await start_component(
+            KafkaProducerComponent,
+            {"ssl_context": "default" if lookup else ssl_context},
+        )
         producer = get_resource_nowait(AIOKafkaProducer)
         assert producer.client._ssl_context is ssl_context