pull in refactoring from downstream pr

Author: aaronsteers

airbyte_cdk/cli/airbyte_cdk/_connector.py

@@ -45,6 +45,7 @@
 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
 
@@ -97,12 +98,12 @@ def connector_cli_group() -> None:
 @click.option(
     "--connector-name",
     type=str,
-    # help="Name of the connector to test. Ignored if --connector-directory is provided.",
+    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.",
+    help="Path to the connector directory.",
 )
 @click.option(
     "--collect-only",
@@ -129,23 +130,10 @@ def test(
             "pytest is not installed. Please install pytest to run the connector tests."
         )
     click.echo("Connector test command executed.")
-    if not connector_name and not connector_directory:
-        cwd = Path().resolve().absolute()
-        if cwd.name.startswith("source-") or cwd.name.startswith("destination-"):
-            connector_name = cwd.name
-            connector_directory = cwd
-        else:
-            raise ValueError(
-                "Either connector_name or connector_directory must be provided if not "
-                "running from a connector directory."
-            )
-
-    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.")
+    connector_name, connector_directory = resolve_connector_name_and_directory(
+        connector_name=connector_name,
+        connector_directory=connector_directory,
+    )
 
     connector_test_suite = create_connector_test_suite(
         connector_name=connector_name if not connector_directory else None,

airbyte_cdk/cli/airbyte_cdk/_util.py

@@ -0,0 +1,43 @@
+"""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