From fb0cf9794267d9aaa8f494fdea80934bb269d352 Mon Sep 17 00:00:00 2001 From: Catherine Noll Date: Sun, 6 Aug 2023 06:04:38 -0400 Subject: [PATCH] Version bump & formatting --- airbyte-integrations/connectors/source-s3/Dockerfile | 2 +- airbyte-integrations/connectors/source-s3/metadata.yaml | 2 +- .../source-s3/source_s3/source_files_abstract/stream.py | 1 - .../connectors/source-s3/source_s3/v4/main.py | 4 ++-- .../connectors/source-s3/unit_tests/v4/test_cursor.py | 4 ++-- docs/integrations/sources/s3.md | 1 + 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/airbyte-integrations/connectors/source-s3/Dockerfile b/airbyte-integrations/connectors/source-s3/Dockerfile index 22ee871210b50..17ec2e8392ba2 100644 --- a/airbyte-integrations/connectors/source-s3/Dockerfile +++ b/airbyte-integrations/connectors/source-s3/Dockerfile @@ -17,5 +17,5 @@ COPY source_s3 ./source_s3 ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py" ENTRYPOINT ["python", "/airbyte/integration_code/main.py"] -LABEL io.airbyte.version=3.1.2 +LABEL io.airbyte.version=3.1.3 LABEL io.airbyte.name=airbyte/source-s3 diff --git a/airbyte-integrations/connectors/source-s3/metadata.yaml b/airbyte-integrations/connectors/source-s3/metadata.yaml index f2f064365fc86..7a5ee19179a0a 100644 --- a/airbyte-integrations/connectors/source-s3/metadata.yaml +++ b/airbyte-integrations/connectors/source-s3/metadata.yaml @@ -5,7 +5,7 @@ data: connectorSubtype: file connectorType: source definitionId: 69589781-7828-43c5-9f63-8925b1c1ccc2 - dockerImageTag: 3.1.2 + dockerImageTag: 3.1.3 dockerRepository: airbyte/source-s3 githubIssueLabel: source-s3 icon: s3.svg diff --git a/airbyte-integrations/connectors/source-s3/source_s3/source_files_abstract/stream.py b/airbyte-integrations/connectors/source-s3/source_s3/source_files_abstract/stream.py index f5d9de0025412..1ac411fb21ad6 100644 --- a/airbyte-integrations/connectors/source-s3/source_s3/source_files_abstract/stream.py +++ b/airbyte-integrations/connectors/source-s3/source_s3/source_files_abstract/stream.py @@ -418,7 +418,6 @@ def stream_slices( yield from super().stream_slices(sync_mode=sync_mode, cursor_field=cursor_field, stream_state=stream_state) else: - # logic here is to bundle all files with exact same last modified timestamp together in each slice prev_file_last_mod: datetime = None # init variable to hold previous iterations last modified grouped_files_by_time: List[Dict[str, Any]] = [] diff --git a/airbyte-integrations/connectors/source-s3/source_s3/v4/main.py b/airbyte-integrations/connectors/source-s3/source_s3/v4/main.py index b64d0b6b891fc..78becc8bde804 100644 --- a/airbyte-integrations/connectors/source-s3/source_s3/v4/main.py +++ b/airbyte-integrations/connectors/source-s3/source_s3/v4/main.py @@ -26,10 +26,10 @@ def get_source(args: List[str]): type=TraceType.ERROR, emitted_at=int(datetime.now().timestamp() * 1000), error=AirbyteErrorTraceMessage( - message=f"Error starting the sync. This could be due to an invalid configuration or catalog. Please contact Support for assistance.", + message="Error starting the sync. This could be due to an invalid configuration or catalog. Please contact Support for assistance.", stack_trace=traceback.format_exc(), ), - ) + ), ).json() ) return None diff --git a/airbyte-integrations/connectors/source-s3/unit_tests/v4/test_cursor.py b/airbyte-integrations/connectors/source-s3/unit_tests/v4/test_cursor.py index e85fea548c52d..42bf260dc391b 100644 --- a/airbyte-integrations/connectors/source-s3/unit_tests/v4/test_cursor.py +++ b/airbyte-integrations/connectors/source-s3/unit_tests/v4/test_cursor.py @@ -2,9 +2,9 @@ # Copyright (c) 2023 Airbyte, Inc., all rights reserved. # -import pytest -from typing import MutableMapping, Any +from typing import Any, MutableMapping +import pytest from source_s3.v4.cursor import Cursor diff --git a/docs/integrations/sources/s3.md b/docs/integrations/sources/s3.md index c9214a918177b..244966409752b 100644 --- a/docs/integrations/sources/s3.md +++ b/docs/integrations/sources/s3.md @@ -282,6 +282,7 @@ Be cautious when raising this value too high, as it may result in Out Of Memory | Version | Date | Pull Request | Subject | |:--------|:-----------| :-------------------------------------------------------------------------------------------------------------- |:---------------------------------------------------------------------------------------------------------------------| +| 3.1.3 | 2023-08-05 | [29028](https://github.com/airbytehq/airbyte/pull/29028) | Update v3 & v4 connector to handle either state message | | 3.1.2 | 2023-07-29 | [28786](https://github.com/airbytehq/airbyte/pull/28786) | Add a codepath for using the file-based CDK | | 3.1.1 | 2023-07-26 | [28730](https://github.com/airbytehq/airbyte/pull/28730) | Add human readable error message and improve validation for encoding field when it empty | | 3.1.0 | 2023-06-26 | [27725](https://github.com/airbytehq/airbyte/pull/27725) | License Update: Elv2 |