airbyte-cdk 6.48.7.post2.dev14899985028__py3-none-any.whl → 6.48.9__py3-none-any.whl

airbyte_cdk/cli/airbyte_cdk/_connector.py

@@ -44,11 +44,14 @@ from types import ModuleType
 
 import rich_click as click
 
-# from airbyte_cdk.test.standard_tests import pytest_hooks
-from airbyte_cdk.cli.airbyte_cdk._util import resolve_connector_name_and_directory
-from airbyte_cdk.test.standard_tests.test_resources import find_connector_root_from_name
 from airbyte_cdk.test.standard_tests.util import create_connector_test_suite
 
+# from airbyte_cdk.test.standard_tests import pytest_hooks
+from airbyte_cdk.utils.connector_paths import (
+    find_connector_root_from_name,
+    resolve_connector_name_and_directory,
+)
+
 click.rich_click.TEXT_MARKUP = "markdown"
 
 pytest: ModuleType | None
@@ -98,15 +101,11 @@ def connector_cli_group() -> None:
 
 
 @connector_cli_group.command()
-@click.option(
-    "--connector-name",
+@click.argument(
+    "connector",
+    required=False,
     type=str,
-    help="Name of the connector to test. Ignored if --connector-directory is provided.",
-)
-@click.option(
-    "--connector-directory",
-    type=click.Path(exists=True, file_okay=False, path_type=Path),
-    help="Path to the connector directory.",
+    metavar="[CONNECTOR]",
 )
 @click.option(
     "--collect-only",
@@ -115,8 +114,7 @@ def connector_cli_group() -> None:
     help="Only collect tests, do not run them.",
 )
 def test(
-    connector_name: str | None = None,
-    connector_directory: Path | None = None,
+    connector: str | Path | None = None,
     *,
     collect_only: bool = False,
 ) -> None:
@@ -124,6 +122,9 @@ def test(
 
     This command runs the standard connector tests for a specific connector.
 
+    [CONNECTOR] can be a connector name (e.g. 'source-pokeapi'), a path to a connector directory, or omitted to use the current working directory.
+    If a string containing '/' is provided, it is treated as a path. Otherwise, it is treated as a connector name.
+
     If no connector name or directory is provided, we will look within the current working
     directory. If the current working directory is not a connector directory (e.g. starting
     with 'source-') and no connector name or path is provided, the process will fail.
@@ -133,10 +134,7 @@ def test(
             "pytest is not installed. Please install pytest to run the connector tests."
         )
     click.echo("Connector test command executed.")
-    connector_name, connector_directory = resolve_connector_name_and_directory(
-        connector_name=connector_name,
-        connector_directory=connector_directory,
-    )
+    connector_name, connector_directory = resolve_connector_name_and_directory(connector)
 
     connector_test_suite = create_connector_test_suite(
         connector_name=connector_name if not connector_directory else None,

airbyte_cdk/cli/airbyte_cdk/_image.py

@@ -10,8 +10,8 @@ from pathlib import Path
 
 import rich_click as click
 
-from airbyte_cdk.cli.airbyte_cdk._util import resolve_connector_name_and_directory
 from airbyte_cdk.models.connector_metadata import MetadataFile
+from airbyte_cdk.utils.connector_paths import resolve_connector_name_and_directory
 from airbyte_cdk.utils.docker import (
     ConnectorImageBuildError,
     build_connector_image,
@@ -28,30 +28,30 @@ def image_cli_group() -> None:
 
 
 @image_cli_group.command()
-@click.option(
-    "--connector-name",
+@click.argument(
+    "connector",
+    required=False,
     type=str,
-    help="Name of the connector to test. Ignored if --connector-directory is provided.",
-)
-@click.option(
-    "--connector-directory",
-    type=click.Path(exists=True, file_okay=False, path_type=Path),
-    help="Path to the connector directory.",
+    metavar="[CONNECTOR]",
 )
 @click.option("--tag", default="dev", help="Tag to apply to the built image (default: dev)")
 @click.option("--no-verify", is_flag=True, help="Skip verification of the built image")
+@click.option(
+    "--dockerfile",
+    type=click.Path(exists=True, file_okay=True, path_type=Path),
+    help="Optional. Override the Dockerfile used for building the image.",
+)
 def build(
-    connector_name: str | None = None,
-    connector_directory: Path | None = None,
+    connector: str | None = None,
     *,
     tag: str = "dev",
     no_verify: bool = False,
+    dockerfile: Path | None = None,
 ) -> None:
     """Build a connector Docker image.
 
-    This command builds a Docker image for a connector, using either
-    the connector's Dockerfile or a base image specified in the metadata.
-    The image is built for both AMD64 and ARM64 architectures.
+    [CONNECTOR] can be a connector name (e.g. 'source-pokeapi'), a path to a connector directory, or omitted to use the current working directory.
+    If a string containing '/' is provided, it is treated as a path. Otherwise, it is treated as a connector name.
     """
     if not verify_docker_installation():
         click.echo(
@@ -59,10 +59,7 @@ def build(
         )
         sys.exit(1)
 
-    connector_name, connector_directory = resolve_connector_name_and_directory(
-        connector_name=connector_name,
-        connector_directory=connector_directory,
-    )
+    connector_name, connector_directory = resolve_connector_name_and_directory(connector)
 
     metadata_file_path: Path = connector_directory / "metadata.yaml"
     try:
@@ -81,6 +78,7 @@ def build(
             metadata=metadata,
             tag=tag,
             no_verify=no_verify,
+            dockerfile_override=dockerfile or None,
         )
     except ConnectorImageBuildError as e:
         click.echo(

airbyte_cdk/cli/airbyte_cdk/_secrets.py

@@ -43,7 +43,7 @@ from click import style
 from rich.console import Console
 from rich.table import Table
 
-from airbyte_cdk.cli.airbyte_cdk._util import (
+from airbyte_cdk.utils.connector_paths import (
     resolve_connector_name,
     resolve_connector_name_and_directory,
 )
@@ -73,15 +73,11 @@ def secrets_cli_group() -> None:
 
 
 @secrets_cli_group.command()
-@click.option(
-    "--connector-name",
+@click.argument(
+    "connector",
+    required=False,
     type=str,
-    help="Name of the connector to fetch secrets for. Ignored if --connector-directory is provided.",
-)
-@click.option(
-    "--connector-directory",
-    type=click.Path(exists=True, file_okay=False, path_type=Path),
-    help="Path to the connector directory.",
+    metavar="[CONNECTOR]",
 )
 @click.option(
     "--gcp-project-id",
@@ -97,8 +93,7 @@ def secrets_cli_group() -> None:
     default=False,
 )
 def fetch(
-    connector_name: str | None = None,
-    connector_directory: Path | None = None,
+    connector: str | Path | None = None,
     gcp_project_id: str = AIRBYTE_INTERNAL_GCP_PROJECT,
     print_ci_secrets_masks: bool = False,
 ) -> None:
@@ -107,6 +102,9 @@ def fetch(
     This command fetches secrets for a connector from Google Secret Manager and writes them
     to the connector's secrets directory.
 
+    [CONNECTOR] can be a connector name (e.g. 'source-pokeapi'), a path to a connector directory, or omitted to use the current working directory.
+    If a string containing '/' is provided, it is treated as a path. Otherwise, it is treated as a connector name.
+
     If no connector name or directory is provided, we will look within the current working
     directory. If the current working directory is not a connector directory (e.g. starting
     with 'source-') and no connector name or path is provided, the process will fail.
@@ -114,17 +112,14 @@ def fetch(
     The `--print-ci-secrets-masks` option will print the GitHub CI mask for the secrets.
     This is useful for masking secrets in CI logs.
 
-    WARNING: This action causes the secrets to be printed in clear text to `STDOUT`. For security
-    reasons, this function will only execute if the `CI` environment variable is set. Otherwise,
-    masks will not be printed.
+    WARNING: The `--print-ci-secrets-masks` option causes the secrets to be printed in clear text to
+    `STDOUT`. For security reasons, this argument will be ignored if the `CI` environment
+    variable is not set.
     """
     click.echo("Fetching secrets...", err=True)
 
     client = _get_gsm_secrets_client()
-    connector_name, connector_directory = resolve_connector_name_and_directory(
-        connector_name=connector_name,
-        connector_directory=connector_directory,
-    )
+    connector_name, connector_directory = resolve_connector_name_and_directory(connector)
     secrets_dir = _get_secrets_dir(
         connector_directory=connector_directory,
         connector_name=connector_name,
@@ -289,21 +284,7 @@ def _get_secrets_dir(
     connector_name: str,
     ensure_exists: bool = True,
 ) -> Path:
-    try:
-        connector_name, connector_directory = resolve_connector_name_and_directory(
-            connector_name=connector_name,
-            connector_directory=connector_directory,
-        )
-    except FileNotFoundError as e:
-        raise FileNotFoundError(
-            f"Could not find connector directory for '{connector_name}'. "
-            "Please provide the --connector-directory option with the path to the connector. "
-            "Note: This command requires either running from within a connector directory, "
-            "being in the airbyte monorepo, or explicitly providing the connector directory path."
-        ) from e
-    except ValueError as e:
-        raise ValueError(str(e))
-
+    _ = connector_name  # Unused, but it may be used in the future for logging
     secrets_dir = connector_directory / "secrets"
     if ensure_exists:
         secrets_dir.mkdir(parents=True, exist_ok=True)

airbyte_cdk/test/entrypoint_wrapper.py

@@ -82,6 +82,10 @@ class EntrypointOutput:
     def state_messages(self) -> List[AirbyteMessage]:
         return self._get_message_by_types([Type.STATE])
 
+    @property
+    def spec_messages(self) -> List[AirbyteMessage]:
+        return self._get_message_by_types([Type.SPEC])
+
     @property
     def connection_status_messages(self) -> List[AirbyteMessage]:
         return self._get_message_by_types([Type.CONNECTION_STATUS])

airbyte_cdk/test/standard_tests/_job_runner.py

@@ -56,12 +56,15 @@ class IConnector(Protocol):
 
 def run_test_job(
     connector: IConnector | type[IConnector] | Callable[[], IConnector],
-    verb: Literal["read", "check", "discover"],
-    test_scenario: ConnectorTestScenario,
+    verb: Literal["spec", "read", "check", "discover"],
     *,
+    test_scenario: ConnectorTestScenario | None = None,
     catalog: ConfiguredAirbyteCatalog | dict[str, Any] | None = None,
 ) -> entrypoint_wrapper.EntrypointOutput:
     """Run a test scenario from provided CLI args and return the result."""
+    # Use default (empty) scenario if not provided:
+    test_scenario = test_scenario or ConnectorTestScenario()
+
     if not connector:
         raise ValueError("Connector is required")
 
@@ -81,14 +84,14 @@ def run_test_job(
         )
 
     args: list[str] = [verb]
-    if test_scenario.config_path:
-        args += ["--config", str(test_scenario.config_path)]
-    elif test_scenario.config_dict:
+    config_dict = test_scenario.get_config_dict(empty_if_missing=True)
+    if config_dict and verb != "spec":
+        # Write the config to a temp json file and pass the path to the file as an argument.
         config_path = (
             Path(tempfile.gettempdir()) / "airbyte-test" / f"temp_config_{uuid.uuid4().hex}.json"
         )
         config_path.parent.mkdir(parents=True, exist_ok=True)
-        config_path.write_text(orjson.dumps(test_scenario.config_dict).decode())
+        config_path.write_text(orjson.dumps(config_dict).decode())
         args += ["--config", str(config_path)]
 
     catalog_path: Path | None = None

airbyte_cdk/test/standard_tests/connector_base.py

@@ -24,7 +24,7 @@ from airbyte_cdk.test.standard_tests._job_runner import IConnector, run_test_job
 from airbyte_cdk.test.standard_tests.models import (
     ConnectorTestScenario,
 )
-from airbyte_cdk.test.standard_tests.test_resources import (
+from airbyte_cdk.utils.connector_paths import (
     ACCEPTANCE_TEST_CONFIG,
     find_connector_root,
 )
@@ -89,7 +89,7 @@ class ConnectorTestSuiteBase(abc.ABC):
     @classmethod
     def create_connector(
         cls,
-        scenario: ConnectorTestScenario,
+        scenario: ConnectorTestScenario | None,
     ) -> IConnector:
         """Instantiate the connector class."""
         connector = cls.connector  # type: ignore
@@ -147,28 +147,35 @@ class ConnectorTestSuiteBase(abc.ABC):
         This has to be a separate function because pytest does not allow
         parametrization of fixtures with arguments from the test class itself.
         """
-        category = "connection"
+        categories = ["connection", "spec"]
         all_tests_config = yaml.safe_load(cls.acceptance_test_config_path.read_text())
         if "acceptance_tests" not in all_tests_config:
             raise ValueError(
                 f"Acceptance tests config not found in {cls.acceptance_test_config_path}."
                 f" Found only: {str(all_tests_config)}."
             )
-        if category not in all_tests_config["acceptance_tests"]:
-            return []
-        if "tests" not in all_tests_config["acceptance_tests"][category]:
-            raise ValueError(f"No tests found for category {category}")
-
-        tests_scenarios = [
-            ConnectorTestScenario.model_validate(test)
-            for test in all_tests_config["acceptance_tests"][category]["tests"]
-            if "iam_role" not in test["config_path"]
-        ]
+
+        test_scenarios: list[ConnectorTestScenario] = []
+        for category in categories:
+            if (
+                category not in all_tests_config["acceptance_tests"]
+                or "tests" not in all_tests_config["acceptance_tests"][category]
+            ):
+                continue
+
+            test_scenarios.extend(
+                [
+                    ConnectorTestScenario.model_validate(test)
+                    for test in all_tests_config["acceptance_tests"][category]["tests"]
+                    if "config_path" in test and "iam_role" not in test["config_path"]
+                ]
+            )
+
         connector_root = cls.get_connector_root_dir().absolute()
-        for test in tests_scenarios:
+        for test in test_scenarios:
             if test.config_path:
                 test.config_path = connector_root / test.config_path
             if test.configured_catalog_path:
                 test.configured_catalog_path = connector_root / test.configured_catalog_path
 
-        return tests_scenarios
+        return test_scenarios

airbyte_cdk/test/standard_tests/declarative_sources.py

@@ -12,7 +12,7 @@ from airbyte_cdk.sources.declarative.concurrent_declarative_source import (
 from airbyte_cdk.test.standard_tests._job_runner import IConnector
 from airbyte_cdk.test.standard_tests.models import ConnectorTestScenario
 from airbyte_cdk.test.standard_tests.source_base import SourceTestSuiteBase
-from airbyte_cdk.test.standard_tests.test_resources import MANIFEST_YAML
+from airbyte_cdk.utils.connector_paths import MANIFEST_YAML
 
 
 def md5_checksum(file_path: Path) -> str:
@@ -64,7 +64,7 @@ class DeclarativeSourceTestSuite(SourceTestSuiteBase):
     @classmethod
     def create_connector(
         cls,
-        scenario: ConnectorTestScenario,
+        scenario: ConnectorTestScenario | None,
     ) -> IConnector:
         """Create a connector scenario for the test suite.
 
@@ -73,9 +73,13 @@ class DeclarativeSourceTestSuite(SourceTestSuiteBase):
 
         Subclasses should not need to override this method.
         """
-        config: dict[str, Any] = scenario.get_config_dict()
-
+        scenario = scenario or ConnectorTestScenario()  # Use default (empty) scenario if None
         manifest_dict = yaml.safe_load(cls.manifest_yaml_path.read_text())
+        config = {
+            "__injected_manifest": manifest_dict,
+        }
+        config.update(scenario.get_config_dict(empty_if_missing=True))
+
         if cls.components_py_path and cls.components_py_path.exists():
             os.environ["AIRBYTE_ENABLE_UNSAFE_CODE"] = "true"
             config["__injected_components_py"] = cls.components_py_path.read_text()

airbyte_cdk/test/standard_tests/models/scenario.py

@@ -43,18 +43,29 @@ class ConnectorTestScenario(BaseModel):
     file_types: AcceptanceTestFileTypes | None = None
     status: Literal["succeed", "failed"] | None = None
 
-    def get_config_dict(self) -> dict[str, Any]:
+    def get_config_dict(
+        self,
+        *,
+        empty_if_missing: bool,
+    ) -> dict[str, Any]:
         """Return the config dictionary.
 
         If a config dictionary has already been loaded, return it. Otherwise, load
         the config file and return the dictionary.
+
+        If `self.config_dict` and `self.config_path` are both `None`:
+        - return an empty dictionary if `empty_if_missing` is True
+        - raise a ValueError if `empty_if_missing` is False
         """
-        if self.config_dict:
+        if self.config_dict is not None:
             return self.config_dict
 
-        if self.config_path:
+        if self.config_path is not None:
             return cast(dict[str, Any], yaml.safe_load(self.config_path.read_text()))
 
+        if empty_if_missing:
+            return {}
+
         raise ValueError("No config dictionary or path provided.")
 
     @property

airbyte_cdk/test/standard_tests/source_base.py

@@ -64,6 +64,30 @@ class SourceTestSuiteBase(ConnectorTestSuiteBase):
             test_scenario=scenario,
         )
 
+    def test_spec(self) -> None:
+        """Standard test for `spec`.
+
+        This test does not require a `scenario` input, since `spec`
+        does not require any inputs.
+
+        We assume `spec` should always succeed and it should always generate
+        a valid `SPEC` message.
+
+        Note: the parsing of messages by type also implicitly validates that
+        the generated `SPEC` message is valid JSON.
+        """
+        result = run_test_job(
+            verb="spec",
+            test_scenario=None,
+            connector=self.create_connector(scenario=None),
+        )
+        # If an error occurs, it will be raised above.
+
+        assert len(result.spec_messages) == 1, (
+            "Expected exactly 1 spec message but got {len(result.spec_messages)}",
+            result.errors,
+        )
+
     def test_basic_read(
         self,
         scenario: ConnectorTestScenario,

airbyte_cdk/test/standard_tests/util.py

@@ -12,7 +12,7 @@ from airbyte_cdk.test.standard_tests.declarative_sources import (
 )
 from airbyte_cdk.test.standard_tests.destination_base import DestinationTestSuiteBase
 from airbyte_cdk.test.standard_tests.source_base import SourceTestSuiteBase
-from airbyte_cdk.test.standard_tests.test_resources import (
+from airbyte_cdk.utils.connector_paths import (
     METADATA_YAML,
     find_connector_root_from_name,
 )

airbyte_cdk/utils/connector_paths.py

@@ -0,0 +1,223 @@
+# Copyright (c) 2025 Airbyte, Inc., all rights reserved.
+"""Resources and utilities for locating Airbyte Connectors."""
+
+from contextlib import suppress
+from pathlib import Path
+
+ACCEPTANCE_TEST_CONFIG = "acceptance-test-config.yml"
+MANIFEST_YAML = "manifest.yaml"
+METADATA_YAML = "metadata.yaml"
+
+
+def resolve_airbyte_repo_root(
+    from_dir: Path,
+) -> Path:
+    """Resolve the Airbyte repository root directory.
+
+    This function will resolve the Airbyte repository root directory based on the
+    current working directory. If the current working directory is not within the
+    Airbyte repository, it will look for the 'airbyte' or 'airbyte-enterprise'
+    directory in the parent directories.
+
+    Sibling directories are also considered, so if the working directory is '~/repos/airbyte-cdk',
+    it will find the 'airbyte' directory in '~/repos/airbyte'. The 'airbyte' directory
+    will be preferred over 'airbyte-enterprise' if both are present as sibling directories and
+    neither is a parent directory.
+
+    If we reach the root of the filesystem without finding the 'airbyte' directory,
+    a FileNotFoundError will be raised.
+
+    Raises:
+        FileNotFoundError: If the Airbyte repository root directory cannot be found.
+    """
+
+    def _is_airbyte_repo_root(path: Path) -> bool:
+        """Check if the given path is the Airbyte repository root."""
+        return all(
+            [
+                (path.name == "airbyte" or path.name == "airbyte-enterprise"),
+                (path / "airbyte-integrations").is_dir(),
+            ]
+        )
+
+    def _find_in_adjacent_dirs(current_dir: Path) -> Path | None:
+        """Check if 'airbyte' or 'airbyte-enterprise' exists as a sibling, parent, or child."""
+        # Check parents
+        parent_dir = current_dir.parent
+        if _is_airbyte_repo_root(parent_dir):
+            return parent_dir
+
+        # Check siblings
+        if _is_airbyte_repo_root(parent_dir / "airbyte"):
+            return parent_dir / "airbyte"
+        if _is_airbyte_repo_root(parent_dir / "airbyte-enterprise"):
+            return parent_dir / "airbyte-enterprise"
+
+        # Check children only if no "airbyte" or "airbyte-enterprise" in parent
+        if not any(
+            [
+                "airbyte" in current_dir.parts,
+                "airbyte-enterprise" in current_dir.parts,
+            ]
+        ):
+            if _is_airbyte_repo_root(current_dir / "airbyte"):
+                return current_dir / "airbyte"
+            if _is_airbyte_repo_root(current_dir / "airbyte-enterprise"):
+                return current_dir / "airbyte-enterprise"
+
+        return None
+
+    current_dir = from_dir.resolve().absolute()
+    while current_dir != current_dir.parent:  # abort when we reach file system root
+        found_dir = _find_in_adjacent_dirs(current_dir)
+        if found_dir:
+            return found_dir
+
+        # Move up one directory
+        current_dir = current_dir.parent
+
+    raise FileNotFoundError(
+        f"Could not find the Airbyte repository root directory. Current directory: {from_dir}"
+    )
+
+
+def resolve_connector_name_and_directory(
+    connector_ref: str | Path | None = None,
+    *,
+    connector_directory: Path | None = None,
+) -> tuple[str, Path]:
+    """Resolve the connector name and directory.
+
+    This function will resolve the connector name and directory based on the provided
+    reference. If no input ref is provided, it will look within the
+    current working directory. If the current working directory is not a connector
+    directory (e.g. starting with 'source-') and no connector name or path is provided,
+    the process will fail.
+    If ref is sent as a string containing "/" or "\\", it will be treated as a path to the
+    connector directory.
+
+    raises:
+        ValueError: If the connector name or directory cannot be resolved.
+        FileNotFoundError: If the connector directory does not exist or cannot be found.
+    """
+    connector_name: str | None = None
+
+    # Resolve connector_ref to connector_name or connector_directory (if provided)
+    if connector_ref:
+        if isinstance(connector_ref, str):
+            if "/" in connector_ref or "\\" in connector_ref:
+                # If the connector name is a path, treat it as a directory
+                connector_directory = Path(connector_ref)
+            else:
+                # Otherwise, treat it as a connector name
+                connector_name = connector_ref
+        elif isinstance(connector_ref, Path):
+            connector_directory = connector_ref
+        else:
+            raise ValueError(
+                "connector_ref must be a string or Path. "
+                f"Received type '{type(connector_ref).__name__}': {connector_ref!r}",
+            )
+
+    if not connector_directory:
+        if connector_name:
+            connector_directory = find_connector_root_from_name(connector_name)
+        else:
+            cwd = Path().resolve().absolute()
+            if cwd.name.startswith("source-") or cwd.name.startswith("destination-"):
+                connector_directory = cwd
+            else:
+                raise ValueError(
+                    "The 'connector' input must be provided if not "
+                    "running from a connector directory. "
+                    f"Could not infer connector directory from: {cwd}"
+                )
+
+    if not connector_name:
+        connector_name = connector_directory.name
+
+    if connector_directory:
+        connector_directory = connector_directory.resolve().absolute()
+    elif connector_name:
+        connector_directory = find_connector_root_from_name(connector_name)
+    else:
+        raise ValueError(
+            f"Could not infer connector_name or connector_directory from input ref: {connector_ref}",
+        )
+
+    return connector_name, connector_directory
+
+
+def resolve_connector_name(
+    connector_directory: Path,
+) -> str:
+    """Resolve the connector name.
+
+    This function will resolve the connector name based on the provided connector directory.
+    If the current working directory is not a connector directory
+    (e.g. starting with 'source-'), the process will fail.
+
+    Raises:
+        FileNotFoundError: If the connector directory does not exist or cannot be found.
+    """
+    if not connector_directory:
+        raise FileNotFoundError(
+            "Connector directory does not exist or cannot be found. Please provide a valid "
+            "connector directory."
+        )
+    connector_name = connector_directory.absolute().name
+    if not connector_name.startswith("source-") and not connector_name.startswith("destination-"):
+        raise ValueError(
+            f"Connector directory '{connector_name}' does not look like a valid connector directory. "
+            f"Full path: {connector_directory.absolute()}"
+        )
+    return connector_name
+
+
+def find_connector_root(from_paths: list[Path]) -> Path:
+    """Find the root directory of the connector."""
+    for path in from_paths:
+        # If we reach here, we didn't find the manifest file in any parent directory
+        # Check if the manifest file exists in the current directory
+        for parent in [path, *path.parents]:
+            if (parent / METADATA_YAML).exists():
+                return parent
+            if (parent / MANIFEST_YAML).exists():
+                return parent
+            if (parent / ACCEPTANCE_TEST_CONFIG).exists():
+                return parent
+            if parent.name == "airbyte_cdk":
+                break
+
+    raise FileNotFoundError(
+        "Could not find connector root directory relative to the provided directories: "
+        f"'{str(from_paths)}'."
+    )
+
+
+def find_connector_root_from_name(connector_name: str) -> Path:
+    """Find the root directory of the connector from its name."""
+    with suppress(FileNotFoundError):
+        return find_connector_root([Path(connector_name)])
+
+    # If the connector name is not found, check if we are in the airbyte monorepo
+    # and try to find the connector root from the current directory.
+
+    cwd: Path = Path().absolute()
+
+    try:
+        airbyte_repo_root: Path = resolve_airbyte_repo_root(cwd)
+    except FileNotFoundError as ex:
+        raise FileNotFoundError(
+            "Could not find connector root directory relative and we are not in the airbyte repo."
+        ) from ex
+
+    expected_connector_dir: Path = (
+        airbyte_repo_root / "airbyte-integrations" / "connectors" / connector_name
+    )
+    if not expected_connector_dir.exists():
+        raise FileNotFoundError(
+            f"Could not find connector directory '{expected_connector_dir}' relative to the airbyte repo."
+        )
+
+    return expected_connector_dir

airbyte_cdk/utils/docker.py

@@ -12,14 +12,10 @@ from enum import Enum
 from pathlib import Path
 
 import click
+import requests
 
 from airbyte_cdk.models.connector_metadata import ConnectorLanguage, MetadataFile
-from airbyte_cdk.utils.docker_image_templates import (
-    DOCKERIGNORE_TEMPLATE,
-    JAVA_CONNECTOR_DOCKERFILE_TEMPLATE,
-    MANIFEST_ONLY_DOCKERFILE_TEMPLATE,
-    PYTHON_CONNECTOR_DOCKERFILE_TEMPLATE,
-)
+from airbyte_cdk.utils.connector_paths import resolve_airbyte_repo_root
 
 
 @dataclass(kw_only=True)
@@ -145,6 +141,7 @@ def build_connector_image(
     tag: str,
     primary_arch: ArchEnum = ArchEnum.ARM64,  # Assume MacBook M series by default
     no_verify: bool = False,
+    dockerfile_override: Path | None = None,
 ) -> None:
     """Build a connector Docker image.
 
@@ -167,10 +164,36 @@ def build_connector_image(
         ConnectorImageBuildError: If the image build or tag operation fails.
     """
     connector_kebab_name = connector_name
-    connector_snake_name = connector_kebab_name.replace("-", "_")
 
-    dockerfile_path = connector_directory / "build" / "docker" / "Dockerfile"
-    dockerignore_path = connector_directory / "build" / "docker" / "Dockerfile.dockerignore"
+    if dockerfile_override:
+        dockerfile_path = dockerfile_override
+    else:
+        dockerfile_path = connector_directory / "build" / "docker" / "Dockerfile"
+        dockerignore_path = connector_directory / "build" / "docker" / "Dockerfile.dockerignore"
+        try:
+            dockerfile_text, dockerignore_text = get_dockerfile_templates(
+                metadata=metadata,
+                connector_directory=connector_directory,
+            )
+        except FileNotFoundError:
+            # If the Dockerfile and .dockerignore are not found in the connector directory,
+            # download the templates from the Airbyte repo. This is a fallback
+            # in case the Airbyte repo not checked out locally.
+            try:
+                dockerfile_text, dockerignore_text = _download_dockerfile_defs(
+                    connector_language=metadata.data.language,
+                )
+            except requests.HTTPError as e:
+                raise ConnectorImageBuildError(
+                    build_args=[],
+                    error_text=(
+                        "Could not locate local dockerfile templates and "
+                        f"failed to download Dockerfile templates from github: {e}"
+                    ),
+                ) from e
+
+        dockerfile_path.write_text(dockerfile_text)
+        dockerignore_path.write_text(dockerignore_text)
 
     extra_build_script: str = ""
     build_customization_path = connector_directory / "build_customization.py"
@@ -185,14 +208,9 @@ def build_connector_image(
         )
 
     base_image = metadata.data.connectorBuildOptions.baseImage
-
-    dockerfile_path.write_text(get_dockerfile_template(metadata))
-    dockerignore_path.write_text(DOCKERIGNORE_TEMPLATE)
-
     build_args: dict[str, str | None] = {
         "BASE_IMAGE": base_image,
-        "CONNECTOR_SNAKE_NAME": connector_snake_name,
-        "CONNECTOR_KEBAB_NAME": connector_kebab_name,
+        "CONNECTOR_NAME": connector_kebab_name,
         "EXTRA_BUILD_SCRIPT": extra_build_script,
     }
 
@@ -246,31 +264,100 @@ def build_connector_image(
         sys.exit(0)
 
 
-def get_dockerfile_template(
+def _download_dockerfile_defs(
+    connector_language: ConnectorLanguage,
+) -> tuple[str, str]:
+    """Download the Dockerfile and .dockerignore templates for the specified connector language.
+
+    We use the requests library to download from the master branch hosted on GitHub.
+
+    Args:
+        connector_language: The language of the connector.
+
+    Returns:
+        A tuple containing the Dockerfile and .dockerignore templates as strings.
+
+    Raises:
+        ValueError: If the connector language is not supported.
+        requests.HTTPError: If the download fails.
+    """
+    print("Downloading Dockerfile and .dockerignore templates from GitHub...")
+    # Map ConnectorLanguage to template directory
+    language_to_template_suffix = {
+        ConnectorLanguage.PYTHON: "python-connector",
+        ConnectorLanguage.JAVA: "java-connector",
+        ConnectorLanguage.MANIFEST_ONLY: "manifest-only-connector",
+    }
+
+    if connector_language not in language_to_template_suffix:
+        raise ValueError(f"Unsupported connector language: {connector_language}")
+
+    template_suffix = language_to_template_suffix[connector_language]
+    base_url = f"https://github.com/airbytehq/airbyte/raw/master/docker-images/"
+
+    dockerfile_url = f"{base_url}/Dockerfile.{template_suffix}"
+    dockerignore_url = f"{base_url}/Dockerfile.{template_suffix}.dockerignore"
+
+    dockerfile_resp = requests.get(dockerfile_url)
+    dockerfile_resp.raise_for_status()
+    dockerfile_text = dockerfile_resp.text
+
+    dockerignore_resp = requests.get(dockerignore_url)
+    dockerignore_resp.raise_for_status()
+    dockerignore_text = dockerignore_resp.text
+
+    return dockerfile_text, dockerignore_text
+
+
+def get_dockerfile_templates(
     metadata: MetadataFile,
-) -> str:
+    connector_directory: Path,
+) -> tuple[str, str]:
     """Get the Dockerfile template for the connector.
 
     Args:
         metadata: The metadata of the connector.
         connector_name: The name of the connector.
 
+    Raises:
+        ValueError: If the connector language is not supported.
+        FileNotFoundError: If the Dockerfile or .dockerignore is not found.
+
     Returns:
-        The Dockerfile template as a string.
+        A tuple containing the Dockerfile and .dockerignore templates as strings.
     """
-    if metadata.data.language == ConnectorLanguage.PYTHON:
-        return PYTHON_CONNECTOR_DOCKERFILE_TEMPLATE
-
-    if metadata.data.language == ConnectorLanguage.MANIFEST_ONLY:
-        return MANIFEST_ONLY_DOCKERFILE_TEMPLATE
-
-    if metadata.data.language == ConnectorLanguage.JAVA:
-        return JAVA_CONNECTOR_DOCKERFILE_TEMPLATE
+    if metadata.data.language not in [
+        ConnectorLanguage.PYTHON,
+        ConnectorLanguage.MANIFEST_ONLY,
+        ConnectorLanguage.JAVA,
+    ]:
+        raise ValueError(
+            f"Unsupported connector language: {metadata.data.language}. "
+            "Please check the connector's metadata file."
+        )
 
-    raise ValueError(
-        f"Unsupported connector language: {metadata.data.language}. "
-        "Please check the connector's metadata file."
+    airbyte_repo_root = resolve_airbyte_repo_root(
+        from_dir=connector_directory,
+    )
+    # airbyte_repo_root successfully resolved
+    dockerfile_path = (
+        airbyte_repo_root / "docker-images" / f"Dockerfile.{metadata.data.language.value}-connector"
     )
+    dockerignore_path = (
+        airbyte_repo_root
+        / "docker-images"
+        / f"Dockerfile.{metadata.data.language.value}-connector.dockerignore"
+    )
+    if not dockerfile_path.exists():
+        raise FileNotFoundError(
+            f"Dockerfile for {metadata.data.language.value} connector not found at {dockerfile_path}"
+        )
+    if not dockerignore_path.exists():
+        raise FileNotFoundError(
+            f".dockerignore for {metadata.data.language.value} connector not found at {dockerignore_path}"
+        )
+
+    return dockerfile_path.read_text(), dockerignore_path.read_text()
 
 
 def run_docker_command(

{airbyte_cdk-6.48.7.post2.dev14899985028.dist-info → airbyte_cdk-6.48.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: airbyte-cdk
-Version: 6.48.7.post2.dev14899985028
+Version: 6.48.9
 Summary: A framework for writing Airbyte Connectors.
 Home-page: https://airbyte.com
 License: MIT

{airbyte_cdk-6.48.7.post2.dev14899985028.dist-info → airbyte_cdk-6.48.9.dist-info}/RECORD

@@ -1,11 +1,10 @@
 airbyte_cdk/__init__.py,sha256=52uncJvDQNHvwKxaqzXgnMYTptIl65LDJr2fvlk8-DU,11707
 airbyte_cdk/cli/__init__.py,sha256=CXsai3MYMLZ_sqi2vPAIVcKDun8VRqlv0cKffBI0iSY,346
 airbyte_cdk/cli/airbyte_cdk/__init__.py,sha256=8IoEcbdYr7CMAh97Xut5__uHH9vV4LKUtSBNTk3qEWY,2031
-airbyte_cdk/cli/airbyte_cdk/_connector.py,sha256=wXwt7tbO-9qFYDDK4P8wbKJX43kbeoRZvK5SNX-Wnfs,5300
-airbyte_cdk/cli/airbyte_cdk/_image.py,sha256=F0XtvR2CyFi1EPIUBiEnDia9NfCuM7T_itdNj9yyb2E,2907
+airbyte_cdk/cli/airbyte_cdk/_connector.py,sha256=drKb_EXJOFX-cSeLwJB8WXE-lesOL0dx2ziWSmW3Jkg,5187
+airbyte_cdk/cli/airbyte_cdk/_image.py,sha256=AkBEZrRYXEwvhW7hPOPRWeYEZutzi2PIzjpl7_yaE8I,2890
 airbyte_cdk/cli/airbyte_cdk/_manifest.py,sha256=aFdeeWgek7oXR3YfZPxk7kBZ64Blmsr0dAXN6BVGiIA,482
-airbyte_cdk/cli/airbyte_cdk/_secrets.py,sha256=iRA8435sYDcWe6IBv4VAo-3yTIAFqySbDvmUsgpEInA,14712
-airbyte_cdk/cli/airbyte_cdk/_util.py,sha256=bnzBIAIvuukbOwYwHXay33yAkyyOVJw24xNjNXsPG74,2732
+airbyte_cdk/cli/airbyte_cdk/_secrets.py,sha256=u8-G44SoVg19FCWjcNDT0brFUZa6g_-He58Nd-VuZHI,13991
 airbyte_cdk/cli/airbyte_cdk/_version.py,sha256=ohZNIktLFk91sdzqFW5idaNrZAPX2dIRnz---_fcKOE,352
 airbyte_cdk/cli/source_declarative_manifest/__init__.py,sha256=-0ST722Nj65bgRokzpzPkD1NBBW5CytEHFUe38cB86Q,91
 airbyte_cdk/cli/source_declarative_manifest/_run.py,sha256=9qtbjt-I_stGWzWX6yVUKO_eE-Ga7g-uTuibML9qLBs,8330
@@ -366,7 +365,7 @@ airbyte_cdk/sql/shared/sql_processor.py,sha256=1CwfC3fp9dWnHBpKtly7vGduf9ho_Mahi
 airbyte_cdk/sql/types.py,sha256=XEIhRAo_ASd0kVLBkdLf5bHiRhNple-IJrC9TibcDdY,5880
 airbyte_cdk/test/__init__.py,sha256=f_XdkOg4_63QT2k3BbKY34209lppwgw-svzfZstQEq4,199
 airbyte_cdk/test/catalog_builder.py,sha256=-y05Cz1x0Dlk6oE9LSKhCozssV2gYBNtMdV5YYOPOtk,3015
-airbyte_cdk/test/entrypoint_wrapper.py,sha256=TyUmVJyIuGelAv6y8Wy_BnwqIRw_drjfZWKlroljCuQ,9951
+airbyte_cdk/test/entrypoint_wrapper.py,sha256=UsuvbgXDki00-hgpQgTeoSTr_Sxv6UXYfymHM0jhGwg,10074
 airbyte_cdk/test/mock_http/__init__.py,sha256=jE5kC6CQ0OXkTqKhciDnNVZHesBFVIA2YvkdFGwva7k,322
 airbyte_cdk/test/mock_http/matcher.py,sha256=4Qj8UnJKZIs-eodshryce3SN1Ayc8GZpBETmP6hTEyc,1446
 airbyte_cdk/test/mock_http/mocker.py,sha256=XgsjMtVoeMpRELPyALgrkHFauH9H5irxrz1Kcxh2yFY,8013
@@ -374,16 +373,15 @@ airbyte_cdk/test/mock_http/request.py,sha256=tdB8cqk2vLgCDTOKffBKsM06llYs4ZecgtH
 airbyte_cdk/test/mock_http/response.py,sha256=s4-cQQqTtmeej0pQDWqmG0vUWpHS-93lIWMpW3zSVyU,662
 airbyte_cdk/test/mock_http/response_builder.py,sha256=F-v7ebftqGj7YVIMLKdodmU9U8Dq8aIyllWGo2NGwHc,8331
 airbyte_cdk/test/standard_tests/__init__.py,sha256=YS2bghoGmQ-4GNIbe6RuEmvV-V1kpM1OyxTpebrs0Ig,1338
-airbyte_cdk/test/standard_tests/_job_runner.py,sha256=d2JkwxJilYIJNmyVH946YMn8x1pnP3JaNT865V8vZzQ,5820
-airbyte_cdk/test/standard_tests/connector_base.py,sha256=WXzlfv8b7AsfEssfTm7dOg3KH114qXqHN2SLdPAvYwE,6800
-airbyte_cdk/test/standard_tests/declarative_sources.py,sha256=PQschGGdVgduPfkEYHwNPAz7kxbhKZYAoSmxryqJ5yc,3223
+airbyte_cdk/test/standard_tests/_job_runner.py,sha256=k-gwwXtIJbh0BwH71uTST9LLx246RrnZMchACz-vIS8,6014
+airbyte_cdk/test/standard_tests/connector_base.py,sha256=NMA0x8CA1tQYRhSv1x9lBxkveGfqaRHHt7ggxKAXgfA,6970
+airbyte_cdk/test/standard_tests/declarative_sources.py,sha256=vzpW507HUPtYgP5VEK1MAR_mt1Gq2nk40sjNhKie5yM,3402
 airbyte_cdk/test/standard_tests/destination_base.py,sha256=MARZip2mdo_PzGvzf2VBTAfrP4tbjrJYgeJUApnAArA,731
 airbyte_cdk/test/standard_tests/models/__init__.py,sha256=bS25WlzQwPNxpU5DHtUDZo1DuXd0LkEv9qesNhY1jkY,135
-airbyte_cdk/test/standard_tests/models/scenario.py,sha256=loOfIeKWbzhqyY3JiLU-sE7RKDAsvz3SLpI9APeTPiw,2378
+airbyte_cdk/test/standard_tests/models/scenario.py,sha256=kvuc5oIH-TA3TS7xtiz1RQ8tcY_WC0aI6-TsDQAqhUA,2710
 airbyte_cdk/test/standard_tests/pytest_hooks.py,sha256=4OMy2jNQThS8y7Tyj8MiMy2-SWjoefD4lGo-zQmCUfU,1886
-airbyte_cdk/test/standard_tests/source_base.py,sha256=B30Jduz5n7Z8oM3y9RF6B5upTZN3am6rFod6mqgIizo,5235
-airbyte_cdk/test/standard_tests/test_resources.py,sha256=fYYMRa50L_kUqXwr_aj9FuHhfcVEf4WLGocoRT1bnZI,2448
-airbyte_cdk/test/standard_tests/util.py,sha256=eeRP_WFEaIs4x-JnpQ7wWIA938zdDyDhvOeeAf0AnOs,2933
+airbyte_cdk/test/standard_tests/source_base.py,sha256=cprlvFIRy0xqsLwAC38I9zWlxC2-PJapdje9kRGjTek,6047
+airbyte_cdk/test/standard_tests/util.py,sha256=JrTXxLpcMvRJhnJDVzY8Y-TmcWhW7GGfNOnbS3v0pR4,2920
 airbyte_cdk/test/state_builder.py,sha256=kLPql9lNzUJaBg5YYRLJlY_Hy5JLHJDVyKPMZMoYM44,946
 airbyte_cdk/test/utils/__init__.py,sha256=Hu-1XT2KDoYjDF7-_ziDwv5bY3PueGjANOCbzeOegDg,57
 airbyte_cdk/test/utils/data.py,sha256=CkCR1_-rujWNmPXFR1IXTMwx1rAl06wAyIKWpDcN02w,820
@@ -393,11 +391,11 @@ airbyte_cdk/test/utils/reading.py,sha256=SOTDYlps6Te9KumfTJ3vVDSm9EUXhvKtE8aD7gv
 airbyte_cdk/utils/__init__.py,sha256=qhnC02DbS35OY8oB_tkYHwZzHed2FZeBM__G8IOgckY,347
 airbyte_cdk/utils/airbyte_secrets_utils.py,sha256=wEtRnl5KRhN6eLJwrDrC4FJjyqt_4vkA1F65mdl8c24,3142
 airbyte_cdk/utils/analytics_message.py,sha256=bi3uugQ2NjecnwTnz63iD5D1M8ZR8mXPbdtt6w5cC4s,653
+airbyte_cdk/utils/connector_paths.py,sha256=3yIa3855Cf3EQiiQ6ILMovsjf8UcPsdAuQGfryOhYgE,8675
 airbyte_cdk/utils/constants.py,sha256=QzCi7j5SqpI5I06uRvQ8FC73JVJi7rXaRnR3E_gro5c,108
 airbyte_cdk/utils/datetime_format_inferrer.py,sha256=Ne2cpk7Tx3eZDEW2Q3O7jnNOY9g-w-AUMt3Ltvwg1tY,3989
 airbyte_cdk/utils/datetime_helpers.py,sha256=8mqzZ67Or2PBp7tLtrhh6XFv4wFzYsjCL_DOQJRaftI,17751
-airbyte_cdk/utils/docker.py,sha256=kM8DmRsA5a4_kJmZYwlAIaSjHeTfkVV-Gmp10ADkh80,11062
-airbyte_cdk/utils/docker_image_templates.py,sha256=X8f_aRgt_x8yIbrTfsSWw_oIERu65a8hNttcgXA7hlw,3417
+airbyte_cdk/utils/docker.py,sha256=NS35XgIc6FbFg9IxzDazHrxqmzmi9fjA46qdDfTQ4e0,14585
 airbyte_cdk/utils/event_timing.py,sha256=aiuFmPU80buLlNdKq4fDTEqqhEIelHPF6AalFGwY8as,2557
 airbyte_cdk/utils/is_cloud_environment.py,sha256=DayV32Irh-SdnJ0MnjvstwCJ66_l5oEsd8l85rZtHoc,574
 airbyte_cdk/utils/mapping_helpers.py,sha256=nWjOpnz_5QE9tY9-GtSWMPvYQL95kDD6k8KwwjUmrh0,6526
@@ -409,9 +407,9 @@ airbyte_cdk/utils/slice_hasher.py,sha256=EDxgROHDbfG-QKQb59m7h_7crN1tRiawdf5uU7G
 airbyte_cdk/utils/spec_schema_transformations.py,sha256=-5HTuNsnDBAhj-oLeQXwpTGA0HdcjFOf2zTEMUTTg_Y,816
 airbyte_cdk/utils/stream_status_utils.py,sha256=ZmBoiy5HVbUEHAMrUONxZvxnvfV9CesmQJLDTAIWnWw,1171
 airbyte_cdk/utils/traced_exception.py,sha256=C8uIBuCL_E4WnBAOPSxBicD06JAldoN9fGsQDp463OY,6292
-airbyte_cdk-6.48.7.post2.dev14899985028.dist-info/LICENSE.txt,sha256=Wfe61S4BaGPj404v8lrAbvhjYR68SHlkzeYrg3_bbuM,1051
-airbyte_cdk-6.48.7.post2.dev14899985028.dist-info/LICENSE_SHORT,sha256=aqF6D1NcESmpn-cqsxBtszTEnHKnlsp8L4x9wAh3Nxg,55
-airbyte_cdk-6.48.7.post2.dev14899985028.dist-info/METADATA,sha256=g78XypWk60LikFsBy2VCCPA6OIMx1UC-pqGoknnOUuc,6364
-airbyte_cdk-6.48.7.post2.dev14899985028.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-airbyte_cdk-6.48.7.post2.dev14899985028.dist-info/entry_points.txt,sha256=AKWbEkHfpzzk9nF9tqBUaw1MbvTM4mGtEzmZQm0ZWvM,139
-airbyte_cdk-6.48.7.post2.dev14899985028.dist-info/RECORD,,
+airbyte_cdk-6.48.9.dist-info/LICENSE.txt,sha256=Wfe61S4BaGPj404v8lrAbvhjYR68SHlkzeYrg3_bbuM,1051
+airbyte_cdk-6.48.9.dist-info/LICENSE_SHORT,sha256=aqF6D1NcESmpn-cqsxBtszTEnHKnlsp8L4x9wAh3Nxg,55
+airbyte_cdk-6.48.9.dist-info/METADATA,sha256=gTA6WrjXLh_UFtrwmxoS5Ci4swMfmFMrnUta4edFt9A,6343
+airbyte_cdk-6.48.9.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+airbyte_cdk-6.48.9.dist-info/entry_points.txt,sha256=AKWbEkHfpzzk9nF9tqBUaw1MbvTM4mGtEzmZQm0ZWvM,139
+airbyte_cdk-6.48.9.dist-info/RECORD,,

airbyte_cdk/cli/airbyte_cdk/_util.py

@@ -1,69 +0,0 @@
-"""Common utilities for Airbyte CDK CLI."""
-
-from pathlib import Path
-
-from airbyte_cdk.test.standard_tests.test_resources import find_connector_root_from_name
-
-
-def resolve_connector_name_and_directory(
-    connector_name: str | None = None,
-    connector_directory: Path | None = None,
-) -> tuple[str, Path]:
-    """Resolve the connector name and directory.
-
-    This function will resolve the connector name and directory based on the provided
-    arguments. If no connector name or directory is provided, it will look within the
-    current working directory. If the current working directory is not a connector
-    directory (e.g. starting with 'source-') and no connector name or path is provided,
-    the process will fail.
-    """
-    if not connector_directory:
-        if connector_name:
-            connector_directory = find_connector_root_from_name(connector_name)
-        else:
-            cwd = Path().resolve().absolute()
-            if cwd.name.startswith("source-") or cwd.name.startswith("destination-"):
-                connector_directory = cwd
-            else:
-                raise ValueError(
-                    "Either connector_name or connector_directory must be provided if not "
-                    "running from a connector directory."
-                )
-
-    if not connector_name:
-        connector_name = connector_directory.name
-
-    if connector_directory:
-        connector_directory = connector_directory.resolve().absolute()
-    elif connector_name:
-        connector_directory = find_connector_root_from_name(connector_name)
-    else:
-        raise ValueError("Either connector_name or connector_directory must be provided.")
-
-    return connector_name, connector_directory
-
-
-def resolve_connector_name(
-    connector_directory: Path,
-) -> str:
-    """Resolve the connector name.
-
-    This function will resolve the connector name based on the provided connector directory.
-    If the current working directory is not a connector directory
-    (e.g. starting with 'source-'), the process will fail.
-
-    Raises:
-        FileNotFoundError: If the connector directory does not exist or cannot be found.
-    """
-    if not connector_directory:
-        raise FileNotFoundError(
-            "Connector directory does not exist or cannot be found. Please provide a valid "
-            "connector directory."
-        )
-    connector_name = connector_directory.absolute().name
-    if not connector_name.startswith("source-") and not connector_name.startswith("destination-"):
-        raise ValueError(
-            f"Connector directory '{connector_name}' does not look like a valid connector directory. "
-            f"Full path: {connector_directory.absolute()}"
-        )
-    return connector_name

airbyte_cdk/test/standard_tests/test_resources.py

@@ -1,69 +0,0 @@
-# Copyright (c) 2025 Airbyte, Inc., all rights reserved.
-"""Resources for Airbyte CDK tests."""
-
-from contextlib import suppress
-from pathlib import Path
-
-ACCEPTANCE_TEST_CONFIG = "acceptance-test-config.yml"
-MANIFEST_YAML = "manifest.yaml"
-METADATA_YAML = "metadata.yaml"
-
-
-def find_connector_root(from_paths: list[Path]) -> Path:
-    """Find the root directory of the connector."""
-    for path in from_paths:
-        # If we reach here, we didn't find the manifest file in any parent directory
-        # Check if the manifest file exists in the current directory
-        for parent in [path, *path.parents]:
-            if (parent / METADATA_YAML).exists():
-                return parent
-            if (parent / MANIFEST_YAML).exists():
-                return parent
-            if (parent / ACCEPTANCE_TEST_CONFIG).exists():
-                return parent
-            if parent.name == "airbyte_cdk":
-                break
-
-    raise FileNotFoundError(
-        "Could not find connector root directory relative to the provided directories: "
-        f"'{str(from_paths)}'."
-    )
-
-
-def find_connector_root_from_name(connector_name: str) -> Path:
-    """Find the root directory of the connector from its name."""
-    with suppress(FileNotFoundError):
-        return find_connector_root([Path(connector_name)])
-
-    # If the connector name is not found, check if we are in the airbyte monorepo
-    # and try to find the connector root from the current directory.
-
-    cwd: Path = Path().absolute()
-
-    if "airbyte" not in cwd.parts:
-        raise FileNotFoundError(
-            "Could not find connector root directory relative and we are not in the airbyte repo. "
-            f"Current directory: {cwd} "
-        )
-
-    # Find the connector root from the current directory
-
-    airbyte_repo_root: Path
-    for parent in [cwd, *cwd.parents]:
-        if parent.name == "airbyte":
-            airbyte_repo_root = parent
-            break
-    else:
-        raise FileNotFoundError(
-            "Could not find connector root directory relative and we are not in the airbyte repo."
-        )
-
-    expected_connector_dir: Path = (
-        airbyte_repo_root / "airbyte-integrations" / "connectors" / connector_name
-    )
-    if not expected_connector_dir.exists():
-        raise FileNotFoundError(
-            f"Could not find connector directory '{expected_connector_dir}' relative to the airbyte repo."
-        )
-
-    return expected_connector_dir

airbyte_cdk/utils/docker_image_templates.py

@@ -1,136 +0,0 @@
-# Copyright (c) 2025 Airbyte, Inc., all rights reserved.
-"""A collection of Dockerfile templates for building Airbyte connectors.
-
-The templates are designed to be used with the Airbyte CDK and can be customized
-for different connectors and architectures.
-
-These templates are used to generate connector images.
-"""
-
-##############################
-## GLOBAL DOCKERIGNORE FILE ##
-##############################
-
-DOCKERIGNORE_TEMPLATE: str = "\n".join(
-    [
-        "# This file is auto-generated. Do not edit.",
-        "*,"  # Ignore everything not explicitly allowed below
-        "build/",
-        "!build/distributions/*.tar",
-        ".venv/",
-        "secrets/",
-        "!setup.py",
-        "!pyproject.toml",
-        "!poetry.lock",
-        "!poetry.toml",
-        "!components.py",
-        "!requirements.txt",
-        "!README.md",
-        "!metadata.yaml",
-        "!build_customization.py",
-        "!source_*",
-        "!destination_*",
-    ]
-)
-
-###########################
-# PYTHON CONNECTOR IMAGE ##
-###########################
-
-PYTHON_CONNECTOR_DOCKERFILE_TEMPLATE = r"""
-# syntax=docker/dockerfile:1
-# check=skip=all
-ARG BASE_IMAGE
-
-FROM ${BASE_IMAGE} AS builder
-ARG BASE_IMAGE
-ARG CONNECTOR_SNAKE_NAME
-ARG CONNECTOR_KEBAB_NAME
-ARG EXTRA_PREREQS_SCRIPT=""
-
-WORKDIR /airbyte/integration_code
-
-COPY . ./
-
-# Conditionally copy and execute the extra build script if provided
-RUN if [ -n "${EXTRA_PREREQS_SCRIPT}" ]; then \
-        cp ${EXTRA_PREREQS_SCRIPT} ./extra_prereqs_script && \
-        ./extra_prereqs_script; \
-    fi
-
-# TODO: Pre-install uv on the base image to speed up the build.
-#       (uv is still faster even with the extra step.)
-RUN pip install --no-cache-dir uv
-RUN python -m uv pip install --no-cache-dir .
-
-FROM ${BASE_IMAGE}
-ARG CONNECTOR_SNAKE_NAME
-ARG CONNECTOR_KEBAB_NAME
-ARG BASE_IMAGE
-
-WORKDIR /airbyte/integration_code
-
-COPY --from=builder /usr/local /usr/local
-COPY --chmod=755 <<EOT /entrypoint.sh
-#!/usr/bin/env bash
-set -e
-
-${CONNECTOR_KEBAB_NAME} "\$\@"
-EOT
-
-ENV AIRBYTE_ENTRYPOINT="/entrypoint.sh"
-ENTRYPOINT ["/entrypoint.sh"]
-"""
-
-##################################
-# MANIFEST-ONLY CONNECTOR IMAGE ##
-##################################
-
-MANIFEST_ONLY_DOCKERFILE_TEMPLATE = """
-ARG BASE_IMAGE
-ARG CONNECTOR_SNAKE_NAME
-ARG CONNECTOR_KEBAB_NAME
-
-FROM ${BASE_IMAGE}
-
-WORKDIR /airbyte/integration_code
-
-COPY . ./
-
-ENV AIRBYTE_ENTRYPOINT="python ./main.py"
-ENTRYPOINT ["python", "./main.py"]
-"""
-
-#########################
-# JAVA CONNECTOR IMAGE ##
-#########################
-
-JAVA_CONNECTOR_DOCKERFILE_TEMPLATE = """
-# Java connector Dockerfile for Airbyte
-
-# Build arguments
-ARG BASE_IMAGE
-
-# Base image - using Amazon Corretto (Amazon's distribution of OpenJDK)
-FROM ${BASE_IMAGE}
-ARG CONNECTOR_KEBAB_NAME
-
-# Set permissions for downloaded files
-RUN chmod +x /airbyte/base.sh /airbyte/javabase.sh && \
-    chown airbyte:airbyte /airbyte/base.sh /airbyte/javabase.sh /airbyte/dd-java-agent.jar
-
-ENV AIRBYTE_ENTRYPOINT="/airbyte/base.sh"
-ENV APPLICATION="${CONNECTOR_KEBAB_NAME}"
-
-# Add the connector TAR file and extract it
-COPY ./build/distributions/${CONNECTOR_KEBAB_NAME}.tar /tmp/${CONNECTOR_KEBAB_NAME}.tar
-RUN tar xf /tmp/${CONNECTOR_KEBAB_NAME}.tar --strip-components=1 -C /airbyte && \
-    rm -rf /tmp/${CONNECTOR_KEBAB_NAME}.tar && \
-    chown -R airbyte:airbyte /airbyte
-
-# Set the non-root user
-USER airbyte
-
-# Set entrypoint
-ENTRYPOINT ["/airbyte/base.sh"]
-"""