diff --git a/src/karapace/core/content_type.py b/src/karapace/api/content_type.py similarity index 100% rename from src/karapace/core/content_type.py rename to src/karapace/api/content_type.py diff --git a/src/karapace/api/controller.py b/src/karapace/api/controller.py index fe7a9e904..9257541de 100644 --- a/src/karapace/api/controller.py +++ b/src/karapace/api/controller.py @@ -30,7 +30,7 @@ SubjectSoftDeletedException, VersionNotFoundException, ) -from karapace.core.forward_client import ForwardClient +from karapace.api.forward_client import ForwardClient from karapace.core.protobuf.exception import ProtobufUnresolvedDependencyException from karapace.core.schema_models import ( ParsedTypedSchema, diff --git a/src/karapace/api/factory.py b/src/karapace/api/factory.py index 9b25fcc32..3e28ca1ee 100644 --- a/src/karapace/api/factory.py +++ b/src/karapace/api/factory.py @@ -10,7 +10,7 @@ from karapace import version as karapace_version from karapace.core.auth import AuthenticatorAndAuthorizer from karapace.core.config import Config -from karapace.core.forward_client import ForwardClient +from karapace.api.forward_client import ForwardClient from karapace.core.logging_setup import configure_logging, log_config_without_secrets from karapace.core.statsd import StatsClient from karapace.api.container import SchemaRegistryContainer diff --git a/src/karapace/core/forward_client.py b/src/karapace/api/forward_client.py similarity index 100% rename from src/karapace/core/forward_client.py rename to src/karapace/api/forward_client.py diff --git a/src/karapace/api/middlewares/__init__.py b/src/karapace/api/middlewares/__init__.py index 8a65eeea0..4eb742b35 100644 --- a/src/karapace/api/middlewares/__init__.py +++ b/src/karapace/api/middlewares/__init__.py @@ -6,7 +6,7 @@ from collections.abc import Awaitable, Callable from fastapi import FastAPI, HTTPException, Request, Response from fastapi.responses import JSONResponse -from karapace.core.content_type import check_schema_headers +from karapace.api.content_type import check_schema_headers from karapace.api.telemetry.middleware import setup_telemetry_middleware diff --git a/src/karapace/api/routers/config.py b/src/karapace/api/routers/config.py index 37422e7b1..6a31373f0 100644 --- a/src/karapace/api/routers/config.py +++ b/src/karapace/api/routers/config.py @@ -6,7 +6,7 @@ from dependency_injector.wiring import inject, Provide from fastapi import APIRouter, Depends, Request from karapace.core.auth import AuthenticatorAndAuthorizer, Operation, User -from karapace.core.forward_client import ForwardClient +from karapace.api.forward_client import ForwardClient from karapace.core.typing import Subject from karapace.api.container import SchemaRegistryContainer from karapace.api.controller import KarapaceSchemaRegistryController diff --git a/src/karapace/api/routers/master_availability.py b/src/karapace/api/routers/master_availability.py index 533a44f9e..d961b417b 100644 --- a/src/karapace/api/routers/master_availability.py +++ b/src/karapace/api/routers/master_availability.py @@ -6,7 +6,7 @@ from dependency_injector.wiring import inject, Provide from fastapi import APIRouter, Depends, Request, Response from karapace.core.config import Config -from karapace.core.forward_client import ForwardClient +from karapace.api.forward_client import ForwardClient from pydantic import BaseModel from karapace.api.container import SchemaRegistryContainer from karapace.core.schema_registry import KarapaceSchemaRegistry diff --git a/src/karapace/api/routers/subjects.py b/src/karapace/api/routers/subjects.py index 14d1c6f5a..300d42657 100644 --- a/src/karapace/api/routers/subjects.py +++ b/src/karapace/api/routers/subjects.py @@ -6,7 +6,7 @@ from dependency_injector.wiring import inject, Provide from fastapi import APIRouter, Depends, Request from karapace.core.auth import AuthenticatorAndAuthorizer, Operation, User -from karapace.core.forward_client import ForwardClient +from karapace.api.forward_client import ForwardClient from karapace.core.typing import Subject from karapace.api.container import SchemaRegistryContainer from karapace.api.controller import KarapaceSchemaRegistryController diff --git a/src/karapace/core/container.py b/src/karapace/core/container.py index cd0195fc8..144cdffde 100644 --- a/src/karapace/core/container.py +++ b/src/karapace/core/container.py @@ -6,7 +6,7 @@ from dependency_injector import containers, providers from karapace.core.auth import get_authorizer, HTTPAuthorizer, NoAuthAndAuthz from karapace.core.config import Config -from karapace.core.forward_client import ForwardClient +from karapace.api.forward_client import ForwardClient from karapace.core.instrumentation.prometheus import PrometheusInstrumentation from karapace.core.statsd import StatsClient diff --git a/tests/unit/api/test_forwarding.py b/tests/unit/api/test_forwarding.py index 450111cb4..4d5ea1550 100644 --- a/tests/unit/api/test_forwarding.py +++ b/tests/unit/api/test_forwarding.py @@ -7,7 +7,7 @@ from fastapi import Request from fastapi.exceptions import HTTPException -from karapace.core.forward_client import ForwardClient +from karapace.api.forward_client import ForwardClient from karapace.core.typing import PrimaryInfo from karapace.api.controller import KarapaceSchemaRegistryController from karapace.core.schema_registry import KarapaceSchemaRegistry diff --git a/tests/unit/test_forwarding_client.py b/tests/unit/test_forwarding_client.py index 2b2dbdea9..2df140b25 100644 --- a/tests/unit/test_forwarding_client.py +++ b/tests/unit/test_forwarding_client.py @@ -10,7 +10,7 @@ from dataclasses import dataclass from fastapi import Request from fastapi.datastructures import Headers -from karapace.core.forward_client import ForwardClient +from karapace.api.forward_client import ForwardClient from pydantic import BaseModel from starlette.datastructures import MutableHeaders from tests.base_testcase import BaseTestCase @@ -32,7 +32,7 @@ class ContentTypeTestCase(BaseTestCase): @pytest.fixture(name="forward_client") def fixture_forward_client() -> ForwardClient: - with patch("karapace.core.forward_client.aiohttp") as mocked_aiohttp: + with patch("karapace.api.forward_client.aiohttp") as mocked_aiohttp: mocked_aiohttp.ClientSession.return_value = Mock( spec=aiohttp.ClientSession, headers={"User-Agent": ForwardClient.USER_AGENT} )