From 683de6b062ef3d891301532e621e4960c4e63636 Mon Sep 17 00:00:00 2001 From: Denys Davydov Date: Fri, 24 Mar 2023 17:53:23 +0200 Subject: [PATCH 1/4] #1713 source Stripe: fix stream slicing --- airbyte-integrations/connectors/source-stripe/Dockerfile | 2 +- .../connectors/source-stripe/source_stripe/streams.py | 4 ++-- docs/integrations/sources/stripe.md | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/airbyte-integrations/connectors/source-stripe/Dockerfile b/airbyte-integrations/connectors/source-stripe/Dockerfile index 6d8642e0a4584..3276940463657 100644 --- a/airbyte-integrations/connectors/source-stripe/Dockerfile +++ b/airbyte-integrations/connectors/source-stripe/Dockerfile @@ -12,5 +12,5 @@ COPY main.py ./ ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py" ENTRYPOINT ["python", "/airbyte/integration_code/main.py"] -LABEL io.airbyte.version=3.0.3 +LABEL io.airbyte.version=3.0.4 LABEL io.airbyte.name=airbyte/source-stripe diff --git a/airbyte-integrations/connectors/source-stripe/source_stripe/streams.py b/airbyte-integrations/connectors/source-stripe/source_stripe/streams.py index 0f2f18c1a93dc..b39e4ad8a0370 100644 --- a/airbyte-integrations/connectors/source-stripe/source_stripe/streams.py +++ b/airbyte-integrations/connectors/source-stripe/source_stripe/streams.py @@ -546,7 +546,7 @@ def __init__(self, *args, **kwargs): def stream_slices( self, *, sync_mode: SyncMode, cursor_field: List[str] = None, stream_state: Mapping[str, Any] = None ) -> Iterable[Optional[Mapping[str, Any]]]: - yield from [None] + yield from [{}] def path(self, **kwargs): return "checkout/sessions" @@ -646,7 +646,7 @@ def path(self, **kwargs): def stream_slices( self, *, sync_mode: SyncMode, cursor_field: List[str] = None, stream_state: Mapping[str, Any] = None ) -> Iterable[Optional[Mapping[str, Any]]]: - yield from [None] + yield from [{}] def request_params(self, **kwargs): params = super().request_params(**kwargs) diff --git a/docs/integrations/sources/stripe.md b/docs/integrations/sources/stripe.md index dbd2cd93f7e56..c271fe3d7e2f9 100644 --- a/docs/integrations/sources/stripe.md +++ b/docs/integrations/sources/stripe.md @@ -82,6 +82,7 @@ The Stripe connector should not run into Stripe API limitations under normal usa | Version | Date | Pull Request | Subject | |:--------|:-----------|:---------------------------------------------------------|:-----------------------------------------------------------------------------------------------------------------------------------------------------| +| 3.0.4 | 2023-03-24 | [00000](https://github.com/airbytehq/airbyte/pull/00000) | Fix stream slices for single sliced streams | | 3.0.3 | 2023-03-17 | [24179](https://github.com/airbytehq/airbyte/pull/24179) | Get customer's attributes safely | | 3.0.2 | 2023-03-13 | [24051](https://github.com/airbytehq/airbyte/pull/24051) | Cache `customers` stream; Do not request transactions of customers with zero balance. | | 3.0.1 | 2023-02-22 | [22898](https://github.com/airbytehq/airbyte/pull/22898) | Add missing column to Subscriptions stream | From 51e01fb4c9a6e27210d46ff37c499b5039863390 Mon Sep 17 00:00:00 2001 From: Denys Davydov Date: Fri, 24 Mar 2023 17:59:33 +0200 Subject: [PATCH 2/4] #1713 source stripe: upd changelog --- docs/integrations/sources/stripe.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/integrations/sources/stripe.md b/docs/integrations/sources/stripe.md index c271fe3d7e2f9..86f4cf4681b48 100644 --- a/docs/integrations/sources/stripe.md +++ b/docs/integrations/sources/stripe.md @@ -82,7 +82,7 @@ The Stripe connector should not run into Stripe API limitations under normal usa | Version | Date | Pull Request | Subject | |:--------|:-----------|:---------------------------------------------------------|:-----------------------------------------------------------------------------------------------------------------------------------------------------| -| 3.0.4 | 2023-03-24 | [00000](https://github.com/airbytehq/airbyte/pull/00000) | Fix stream slices for single sliced streams | +| 3.0.4 | 2023-03-24 | [24471](https://github.com/airbytehq/airbyte/pull/24471) | Fix stream slices for single sliced streams | | 3.0.3 | 2023-03-17 | [24179](https://github.com/airbytehq/airbyte/pull/24179) | Get customer's attributes safely | | 3.0.2 | 2023-03-13 | [24051](https://github.com/airbytehq/airbyte/pull/24051) | Cache `customers` stream; Do not request transactions of customers with zero balance. | | 3.0.1 | 2023-02-22 | [22898](https://github.com/airbytehq/airbyte/pull/22898) | Add missing column to Subscriptions stream | From df60d244f23697e7828d5e7571dceabb556f3573 Mon Sep 17 00:00:00 2001 From: Pedro Lopez Date: Fri, 24 Mar 2023 15:49:12 -0400 Subject: [PATCH 3/4] dont fail on extra cols --- .../connectors/source-stripe/acceptance-test-config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/airbyte-integrations/connectors/source-stripe/acceptance-test-config.yml b/airbyte-integrations/connectors/source-stripe/acceptance-test-config.yml index e717db9ef9af0..c831308bfdf00 100644 --- a/airbyte-integrations/connectors/source-stripe/acceptance-test-config.yml +++ b/airbyte-integrations/connectors/source-stripe/acceptance-test-config.yml @@ -36,6 +36,7 @@ acceptance_tests: extra_fields: no exact_order: no extra_records: yes + fail_on_extra_columns: false ignored_fields: invoices: - name: invoice_pdf From dfc44fa216131326214d51aaace0599b59df8266 Mon Sep 17 00:00:00 2001 From: Octavia Squidington III Date: Fri, 24 Mar 2023 20:23:16 +0000 Subject: [PATCH 4/4] 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.md | 2 +- 3 files changed, 3 insertions(+), 3 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 015843620a4f3..5f57edc5ee155 100644 --- a/airbyte-config/init/src/main/resources/seed/source_definitions.yaml +++ b/airbyte-config/init/src/main/resources/seed/source_definitions.yaml @@ -1976,7 +1976,7 @@ - name: Stripe sourceDefinitionId: e094cb9a-26de-4645-8761-65c0c425d1de dockerRepository: airbyte/source-stripe - dockerImageTag: 3.0.3 + dockerImageTag: 3.0.4 documentationUrl: https://docs.airbyte.com/integrations/sources/stripe icon: stripe.svg sourceType: api 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 a785204631a72..3353825e6300d 100644 --- a/airbyte-config/init/src/main/resources/seed/source_specs.yaml +++ b/airbyte-config/init/src/main/resources/seed/source_specs.yaml @@ -14951,7 +14951,7 @@ supportsNormalization: false supportsDBT: false supported_destination_sync_modes: [] -- dockerImage: "airbyte/source-stripe:3.0.3" +- dockerImage: "airbyte/source-stripe:3.0.4" spec: documentationUrl: "https://docs.airbyte.com/integrations/sources/stripe" connectionSpecification: diff --git a/connectors.md b/connectors.md index 5e6034364f326..038f21d52241a 100644 --- a/connectors.md +++ b/connectors.md @@ -227,7 +227,7 @@ | **Square** | Square icon | Source | airbyte/source-square:0.2.1 | beta | [link](https://docs.airbyte.com/integrations/sources/square) | [code](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-square) | `77225a51-cd15-4a13-af02-65816bd0ecf4` | | **Statuspage** | Statuspage icon | Source | airbyte/source-statuspage:0.1.0 | alpha | [link](https://docs.airbyte.com/integrations/sources/statuspage) | [code](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-statuspage) | `74cbd708-46c3-4512-9c93-abd5c3e9a94d` | | **Strava** | Strava icon | Source | airbyte/source-strava:0.1.4 | beta | [link](https://docs.airbyte.com/integrations/sources/strava) | [code](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-strava) | `7a4327c4-315a-11ec-8d3d-0242ac130003` | -| **Stripe** | Stripe icon | Source | airbyte/source-stripe:3.0.3 | generally_available | [link](https://docs.airbyte.com/integrations/sources/stripe) | [code](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-stripe) | `e094cb9a-26de-4645-8761-65c0c425d1de` | +| **Stripe** | Stripe icon | Source | airbyte/source-stripe:3.0.4 | generally_available | [link](https://docs.airbyte.com/integrations/sources/stripe) | [code](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-stripe) | `e094cb9a-26de-4645-8761-65c0c425d1de` | | **SurveyCTO** | SurveyCTO icon | Source | airbyte/source-surveycto:0.1.0 | alpha | [link](https://docs.airbyte.com/integrations/sources/surveycto) | [code](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-surveycto) | `dd4632f4-15e0-4649-9b71-41719fb1fdee` | | **SurveyMonkey** | SurveyMonkey icon | Source | airbyte/source-surveymonkey:0.1.15 | generally_available | [link](https://docs.airbyte.com/integrations/sources/surveymonkey) | [code](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-surveymonkey) | `badc5925-0485-42be-8caa-b34096cb71b5` | | **SurveySparrow** | SurveySparrow icon | Source | airbyte/source-survey-sparrow:0.2.0 | alpha | [link](https://docs.airbyte.com/integrations/sources/survey-sparrow) | [code](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-survey-sparrow) | `4a4d887b-0f2d-4b33-ab7f-9b01b9072804` |