CATs: share files from setup container to host (#41609)

airbytehq · Jul 10, 2024 · 14b24a3 · 14b24a3
1 parent 9306447
commit 14b24a3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/airbyte-integrations/bases/connector-acceptance-test/connector_acceptance_test/conftest.py b/airbyte-integrations/bases/connector-acceptance-test/connector_acceptance_test/conftest.py
@@ -220,13 +220,15 @@ async def setup_and_teardown(
     client_container: dagger.Container,
     connector_config: SecretDict,
     client_container_config: Optional[ClientContainerConfig],
+    base_path: Path,
 ):
     if client_container:
         logging.info("Running setup")
         setup_teardown_container = await client_container_runner.do_setup(
             client_container,
             client_container_config.setup_command,
             connector_config,
+            base_path,
         )
         logging.info(f"Setup stdout: {await setup_teardown_container.stdout()}")
     yield None

diff --git a/...ases/connector-acceptance-test/connector_acceptance_test/utils/client_container_runner.py b/...ases/connector-acceptance-test/connector_acceptance_test/utils/client_container_runner.py
@@ -11,6 +11,7 @@
 import dagger
 from connector_acceptance_test.utils import SecretDict
 
+IN_CONTAINER_CONNECTOR_PATH = Path("/connector")
 IN_CONTAINER_CONFIG_PATH = Path("/tmp/config.json")
 IN_CONTAINER_OUTPUT_PATH = Path("/tmp/output.txt")
 
@@ -27,7 +28,7 @@ async def _build_container(dagger_client: dagger.Client, dockerfile_path: Path)
 async def _build_client_container(dagger_client: dagger.Client, connector_path: Path, dockerfile_path: Path) -> dagger.Container:
     container = await _build_container(dagger_client, dockerfile_path)
     return container.with_mounted_directory(
-        "/connector", dagger_client.host().directory(str(connector_path), exclude=get_default_excluded_files())
+        str(IN_CONTAINER_CONNECTOR_PATH), dagger_client.host().directory(str(connector_path), exclude=get_default_excluded_files())
     )
 
 
@@ -60,8 +61,10 @@ async def get_client_container(dagger_client: dagger.Client, connector_path: Pat
     return await _build_client_container(dagger_client, connector_path, dockerfile_path)
 
 
-async def do_setup(container: dagger.Container, command: List[str], connector_config: SecretDict):
-    return await _run_with_config(container, command, connector_config)
+async def do_setup(container: dagger.Container, command: List[str], connector_config: SecretDict, connector_path: Path):
+    container = await _run_with_config(container, command, connector_config)
+    await container.directory(str(IN_CONTAINER_CONNECTOR_PATH)).export(str(connector_path))
+    return container
 
 
 async def do_teardown(container: dagger.Container, command: List[str]):