From ce90eb365a038a7a8d35009bfb076e2df2f282f8 Mon Sep 17 00:00:00 2001 From: Artem Inzhyyants Date: Wed, 21 Dec 2022 00:10:24 +0100 Subject: [PATCH 1/3] Source File: increase timeout OC 1197 --- .../connectors/source-file/source_file/client.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/airbyte-integrations/connectors/source-file/source_file/client.py b/airbyte-integrations/connectors/source-file/source_file/client.py index 43ec43001208..be28657c8e5b 100644 --- a/airbyte-integrations/connectors/source-file/source_file/client.py +++ b/airbyte-integrations/connectors/source-file/source_file/client.py @@ -27,6 +27,7 @@ from .utils import backoff_handler +SSH_TIMEOUT = 60 class ConfigurationError(Exception): """Client mis-configured""" @@ -116,7 +117,7 @@ def _open(self): except ValueError as err: raise ValueError(f"{_port_value} is not a valid integer for the port") from err # Explicitly turn off ssh keys stored in ~/.ssh - transport_params = {"connect_kwargs": {"look_for_keys": False}} + transport_params = {"connect_kwargs": {"look_for_keys": False}, "timeout": SSH_TIMEOUT} if "password" in self._provider: password = self._provider["password"] uri = f"{storage}{user}:{password}@{host}:{port}/{url}" From 326e0847283afd82173d125a76bb084ceaff75d8 Mon Sep 17 00:00:00 2001 From: Artem Inzhyyants Date: Wed, 21 Dec 2022 13:36:44 +0100 Subject: [PATCH 2/3] Source File: docs update; bump version --- airbyte-integrations/connectors/source-file-secure/Dockerfile | 2 +- airbyte-integrations/connectors/source-file/Dockerfile | 2 +- docs/integrations/sources/file.md | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/airbyte-integrations/connectors/source-file-secure/Dockerfile b/airbyte-integrations/connectors/source-file-secure/Dockerfile index afac736853b6..69335fdec330 100644 --- a/airbyte-integrations/connectors/source-file-secure/Dockerfile +++ b/airbyte-integrations/connectors/source-file-secure/Dockerfile @@ -9,5 +9,5 @@ RUN pip install . ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py" ENTRYPOINT ["python", "/airbyte/integration_code/main.py"] -LABEL io.airbyte.version=0.2.31 +LABEL io.airbyte.version=0.2.32 LABEL io.airbyte.name=airbyte/source-file-secure diff --git a/airbyte-integrations/connectors/source-file/Dockerfile b/airbyte-integrations/connectors/source-file/Dockerfile index d959925310af..4fc731577150 100644 --- a/airbyte-integrations/connectors/source-file/Dockerfile +++ b/airbyte-integrations/connectors/source-file/Dockerfile @@ -17,5 +17,5 @@ COPY source_file ./source_file ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py" ENTRYPOINT ["python", "/airbyte/integration_code/main.py"] -LABEL io.airbyte.version=0.2.31 +LABEL io.airbyte.version=0.2.32 LABEL io.airbyte.name=airbyte/source-file diff --git a/docs/integrations/sources/file.md b/docs/integrations/sources/file.md index 8b5d56626cd2..49fcb5f480b9 100644 --- a/docs/integrations/sources/file.md +++ b/docs/integrations/sources/file.md @@ -138,7 +138,8 @@ In order to read large files from a remote location, this connector uses the [sm ## Changelog | Version | Date | Pull Request | Subject | -| :------ | :--------- | :------------------------------------------------------- | :------------------------------------------------------- | +|:--------|:-----------| :------------------------------------------------------- |:---------------------------------------------------------| +| 0.2.32 | 2022-12-21 | [20740](https://github.com/airbytehq/airbyte/pull/20740) | Source File: increase SSH timeout to 60s | | 0.2.31 | 2022-11-17 | [19567](https://github.com/airbytehq/airbyte/pull/19567) | Source File: bump 0.2.31 | | 0.2.30 | 2022-11-10 | [19222](https://github.com/airbytehq/airbyte/pull/19222) | Use AirbyteConnectionStatus for "check" command | | 0.2.29 | 2022-11-08 | [18587](https://github.com/airbytehq/airbyte/pull/18587) | Fix pandas read_csv header none issue. | From f4b69758f8dcfeba91ccf1d9b79a44da089b7beb Mon Sep 17 00:00:00 2001 From: Octavia Squidington III Date: Wed, 21 Dec 2022 19:43:22 +0000 Subject: [PATCH 3/3] auto-bump connector version --- .../init/src/main/resources/seed/source_definitions.yaml | 2 +- airbyte-config/init/src/main/resources/seed/source_specs.yaml | 2 +- .../connectors/source-file/source_file/client.py | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/airbyte-config/init/src/main/resources/seed/source_definitions.yaml b/airbyte-config/init/src/main/resources/seed/source_definitions.yaml index 279d2d493b69..26c4c500ed4a 100644 --- a/airbyte-config/init/src/main/resources/seed/source_definitions.yaml +++ b/airbyte-config/init/src/main/resources/seed/source_definitions.yaml @@ -489,7 +489,7 @@ - name: File sourceDefinitionId: 778daa7c-feaf-4db6-96f3-70fd645acc77 dockerRepository: airbyte/source-file - dockerImageTag: 0.2.31 + dockerImageTag: 0.2.32 documentationUrl: https://docs.airbyte.com/integrations/sources/file icon: file.svg sourceType: file diff --git a/airbyte-config/init/src/main/resources/seed/source_specs.yaml b/airbyte-config/init/src/main/resources/seed/source_specs.yaml index cfcdd1e7fe84..e45e96420691 100644 --- a/airbyte-config/init/src/main/resources/seed/source_specs.yaml +++ b/airbyte-config/init/src/main/resources/seed/source_specs.yaml @@ -4032,7 +4032,7 @@ supportsNormalization: false supportsDBT: false supported_destination_sync_modes: [] -- dockerImage: "airbyte/source-file:0.2.31" +- dockerImage: "airbyte/source-file:0.2.32" spec: documentationUrl: "https://docs.airbyte.com/integrations/sources/file" connectionSpecification: diff --git a/airbyte-integrations/connectors/source-file/source_file/client.py b/airbyte-integrations/connectors/source-file/source_file/client.py index be28657c8e5b..2e306461b01f 100644 --- a/airbyte-integrations/connectors/source-file/source_file/client.py +++ b/airbyte-integrations/connectors/source-file/source_file/client.py @@ -29,6 +29,7 @@ SSH_TIMEOUT = 60 + class ConfigurationError(Exception): """Client mis-configured"""