tidy up

Author: aaronsteers

airbyte_cdk/cli/airbyte_cdk/_connector.py

@@ -182,6 +182,7 @@ def test(
         pytest_args.append("--collect-only")
 
     if use_docker_image:
+        click.echo(f"Using Docker-based test runner...")
         pytest_args.append("--use-docker-image")
         if isinstance(use_docker_image, str):
             pytest_args.append(

airbyte_cdk/cli/airbyte_cdk/_image.py

@@ -43,7 +43,6 @@ def image_cli_group() -> None:
 )
 def build(
     connector: str | None = None,
-    connector_directory: Path | None = None,
     *,
     tag: str = "dev",
     no_verify: bool = False,

airbyte_cdk/test/standard_tests/connector_base.py

@@ -156,6 +156,7 @@ def create_docker_connector(
     def test_check(
         self,
         scenario: ConnectorTestScenario,
+        *,
         use_docker_image: str | bool,
     ) -> None:
         """Run `connection` acceptance tests."""

airbyte_cdk/test/standard_tests/declarative_sources.py

@@ -65,6 +65,7 @@ def components_py_path(cls) -> Path | None:
     def create_connector(
         cls,
         scenario: ConnectorTestScenario,
+        *,
         use_docker_image: str | bool,
     ) -> IConnector:
         """Create a connector scenario for the test suite.

airbyte_cdk/test/standard_tests/source_base.py

@@ -32,6 +32,7 @@ class SourceTestSuiteBase(ConnectorTestSuiteBase):
     def test_check(
         self,
         scenario: ConnectorTestScenario,
+        *,
         use_docker_image: str | bool,
     ) -> None:
         """Run standard `check` tests on the connector.
@@ -60,6 +61,7 @@ def test_check(
     def test_discover(
         self,
         scenario: ConnectorTestScenario,
+        *,
         use_docker_image: str | bool,
     ) -> None:
         """Standard test for `discover`."""
@@ -75,6 +77,7 @@ def test_discover(
     def test_basic_read(
         self,
         scenario: ConnectorTestScenario,
+        *,
         use_docker_image: str | bool,
     ) -> None:
         """Run standard `read` test on the connector.
@@ -122,6 +125,7 @@ def test_basic_read(
     def test_fail_read_with_bad_catalog(
         self,
         scenario: ConnectorTestScenario,
+        *,
         use_docker_image: str | bool,
     ) -> None:
         """Standard test for `read` when passed a bad catalog file."""

airbyte_cdk/utils/docker.py

@@ -16,11 +16,6 @@
 
 from airbyte_cdk.models.connector_metadata import ConnectorLanguage, MetadataFile
 from airbyte_cdk.utils.connector_paths import resolve_airbyte_repo_root
-from airbyte_cdk.utils.docker_image_templates import (
-    DOCKERIGNORE_TEMPLATE,
-    MANIFEST_ONLY_DOCKERFILE_TEMPLATE,
-    PYTHON_CONNECTOR_DOCKERFILE_TEMPLATE,
-)
 
 
 @dataclass(kw_only=True)