From 56cf42a7a7546aaf5198ec5b15524263830feb3f Mon Sep 17 00:00:00 2001 From: andrewlreeve Date: Wed, 1 Mar 2023 12:39:19 +1300 Subject: [PATCH 1/5] fix: pagination and lookback --- .../sample_files/configured_catalog.json | 14 ++++++++++++++ .../source_woocommerce/manifest.yaml | 3 +-- .../source_woocommerce/spec.yaml | 10 ---------- 3 files changed, 15 insertions(+), 12 deletions(-) create mode 100644 airbyte-integrations/connectors/source-woocommerce/sample_files/configured_catalog.json diff --git a/airbyte-integrations/connectors/source-woocommerce/sample_files/configured_catalog.json b/airbyte-integrations/connectors/source-woocommerce/sample_files/configured_catalog.json new file mode 100644 index 0000000000000..855be85fb0d2d --- /dev/null +++ b/airbyte-integrations/connectors/source-woocommerce/sample_files/configured_catalog.json @@ -0,0 +1,14 @@ +{ + "streams": [ + { + "stream": { + "name": "customers", + "json_schema": {}, + "supported_sync_modes": ["full_refresh", "incremental"] + }, + "sync_mode": "full_refresh", + "destination_sync_mode": "append" + } + ] +} + diff --git a/airbyte-integrations/connectors/source-woocommerce/source_woocommerce/manifest.yaml b/airbyte-integrations/connectors/source-woocommerce/source_woocommerce/manifest.yaml index 1ed0c5a92dae8..ef3140fe15267 100644 --- a/airbyte-integrations/connectors/source-woocommerce/source_woocommerce/manifest.yaml +++ b/airbyte-integrations/connectors/source-woocommerce/source_woocommerce/manifest.yaml @@ -20,7 +20,6 @@ definitions: dates_are_gmt: "true" date_incremental_sync: type: DatetimeBasedCursor - lookback_window: "P{{ config.get('conversion_window_days', 0) }}D" start_datetime: datetime: "{{ format_datetime(config['start_date'], '%Y-%m-%dT%H:%M:%S') }}" datetime_format: "%Y-%m-%dT%H:%M:%S" @@ -48,7 +47,7 @@ definitions: page_token_option: type: RequestOption inject_into: "request_parameter" - field_name: "page" + field_name: "offset" page_size_option: inject_into: "request_parameter" field_name: "per_page" diff --git a/airbyte-integrations/connectors/source-woocommerce/source_woocommerce/spec.yaml b/airbyte-integrations/connectors/source-woocommerce/source_woocommerce/spec.yaml index d5209d20d270d..394c4fffee411 100644 --- a/airbyte-integrations/connectors/source-woocommerce/source_woocommerce/spec.yaml +++ b/airbyte-integrations/connectors/source-woocommerce/source_woocommerce/spec.yaml @@ -35,13 +35,3 @@ connectionSpecification: - "2021-01-01" pattern: "^[0-9]{4}-[0-9]{2}-[0-9]{2}$" order: 3 - conversion_window_days: - type: integer - title: Conversion Window - description: A conversion window is the period of time after an ad interaction (such as an ad click or video view) during which a conversion, such as a purchase, is recorded in Google Ads - order: 4 - minimum: 0 - maximum: 1095 - default: 0 - examples: - - 14 \ No newline at end of file From 54a9d73982fe8555444780a97d2f8ebbffa551af Mon Sep 17 00:00:00 2001 From: andrewlreeve Date: Wed, 1 Mar 2023 12:41:27 +1300 Subject: [PATCH 2/5] chore: fix newline --- .../connectors/source-woocommerce/source_woocommerce/spec.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/airbyte-integrations/connectors/source-woocommerce/source_woocommerce/spec.yaml b/airbyte-integrations/connectors/source-woocommerce/source_woocommerce/spec.yaml index 394c4fffee411..b5d42026dd4ea 100644 --- a/airbyte-integrations/connectors/source-woocommerce/source_woocommerce/spec.yaml +++ b/airbyte-integrations/connectors/source-woocommerce/source_woocommerce/spec.yaml @@ -35,3 +35,4 @@ connectionSpecification: - "2021-01-01" pattern: "^[0-9]{4}-[0-9]{2}-[0-9]{2}$" order: 3 + From c0db8e0140da9d2c9d2d45affd10ca0276a6ad1c Mon Sep 17 00:00:00 2001 From: marcosmarxm Date: Fri, 3 Mar 2023 14:23:40 +0100 Subject: [PATCH 3/5] bump connector version --- airbyte-integrations/connectors/source-woocommerce/Dockerfile | 2 +- docs/integrations/sources/woocommerce.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/airbyte-integrations/connectors/source-woocommerce/Dockerfile b/airbyte-integrations/connectors/source-woocommerce/Dockerfile index d0b8c2b913593..9ba5966e3b350 100644 --- a/airbyte-integrations/connectors/source-woocommerce/Dockerfile +++ b/airbyte-integrations/connectors/source-woocommerce/Dockerfile @@ -34,5 +34,5 @@ COPY source_woocommerce ./source_woocommerce ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py" ENTRYPOINT ["python", "/airbyte/integration_code/main.py"] -LABEL io.airbyte.version=0.2.0 +LABEL io.airbyte.version=0.2.1 LABEL io.airbyte.name=airbyte/source-woocommerce diff --git a/docs/integrations/sources/woocommerce.md b/docs/integrations/sources/woocommerce.md index d65b4223391e4..1d3f38d7ff511 100644 --- a/docs/integrations/sources/woocommerce.md +++ b/docs/integrations/sources/woocommerce.md @@ -99,6 +99,7 @@ Useful links: | Version | Date | Pull Request | Subject | | :------ | :--------- | :------------------------------------------------------- | :----------------------------------------- | +| 0.2.1 | 2023-03-03 | [23599](https://github.com/airbytehq/airbyte/pull/23599) | Fix pagination and removed lookback window | | 0.2.0 | 2022-11-30 | [19903](https://github.com/airbytehq/airbyte/pull/19903) | Migrate to low-code; Certification to Beta | | 0.1.1 | 2021-11-08 | [7499](https://github.com/airbytehq/airbyte/pull/7499) | Remove base-python dependencies | | 0.1.0 | 2021-09-09 | [5955](https://github.com/airbytehq/airbyte/pull/5955) | Initial Release. Source WooCommerce | From 340b904b7cc6cad81f0202f262de6f5c84403b41 Mon Sep 17 00:00:00 2001 From: marcosmarxm Date: Fri, 3 Mar 2023 14:24:34 +0100 Subject: [PATCH 4/5] remove files and eof --- .../sample_files/configured_catalog.json | 14 -------------- .../source_woocommerce/spec.yaml | 1 - 2 files changed, 15 deletions(-) delete mode 100644 airbyte-integrations/connectors/source-woocommerce/sample_files/configured_catalog.json diff --git a/airbyte-integrations/connectors/source-woocommerce/sample_files/configured_catalog.json b/airbyte-integrations/connectors/source-woocommerce/sample_files/configured_catalog.json deleted file mode 100644 index 855be85fb0d2d..0000000000000 --- a/airbyte-integrations/connectors/source-woocommerce/sample_files/configured_catalog.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "streams": [ - { - "stream": { - "name": "customers", - "json_schema": {}, - "supported_sync_modes": ["full_refresh", "incremental"] - }, - "sync_mode": "full_refresh", - "destination_sync_mode": "append" - } - ] -} - diff --git a/airbyte-integrations/connectors/source-woocommerce/source_woocommerce/spec.yaml b/airbyte-integrations/connectors/source-woocommerce/source_woocommerce/spec.yaml index b5d42026dd4ea..394c4fffee411 100644 --- a/airbyte-integrations/connectors/source-woocommerce/source_woocommerce/spec.yaml +++ b/airbyte-integrations/connectors/source-woocommerce/source_woocommerce/spec.yaml @@ -35,4 +35,3 @@ connectionSpecification: - "2021-01-01" pattern: "^[0-9]{4}-[0-9]{2}-[0-9]{2}$" order: 3 - From e8ca19d67150cdfa8db3513abb514b1124aff1c7 Mon Sep 17 00:00:00 2001 From: Octavia Squidington III Date: Fri, 3 Mar 2023 15:06:04 +0000 Subject: [PATCH 5/5] auto-bump connector version --- .../main/resources/seed/source_definitions.yaml | 2 +- .../init/src/main/resources/seed/source_specs.yaml | 14 +------------- connectors.md | 2 +- 3 files changed, 3 insertions(+), 15 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 deda7616bc8ac..edbbf7bee29c1 100644 --- a/airbyte-config/init/src/main/resources/seed/source_definitions.yaml +++ b/airbyte-config/init/src/main/resources/seed/source_definitions.yaml @@ -2124,7 +2124,7 @@ - name: WooCommerce sourceDefinitionId: 2a2552ca-9f78-4c1c-9eb7-4d0dc66d72df dockerRepository: airbyte/source-woocommerce - dockerImageTag: 0.2.1 + dockerImageTag: 0.2.2 documentationUrl: https://docs.airbyte.com/integrations/sources/woocommerce icon: woocommerce.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 8ca17d86eaae6..49af51eb848d5 100644 --- a/airbyte-config/init/src/main/resources/seed/source_specs.yaml +++ b/airbyte-config/init/src/main/resources/seed/source_specs.yaml @@ -16116,7 +16116,7 @@ supportsNormalization: false supportsDBT: false supported_destination_sync_modes: [] -- dockerImage: "airbyte/source-woocommerce:0.2.1" +- dockerImage: "airbyte/source-woocommerce:0.2.2" spec: documentationUrl: "https://docs.airbyte.com/integrations/sources/woocommerce" connectionSpecification: @@ -16157,18 +16157,6 @@ pattern: "^[0-9]{4}-[0-9]{2}-[0-9]{2}$" format: "date" order: 3 - conversion_window_days: - type: "integer" - title: "Conversion Window" - description: "A conversion window is the period of time after an ad interaction\ - \ (such as an ad click or video view) during which a conversion, such\ - \ as a purchase, is recorded in Google Ads" - order: 4 - minimum: 0 - maximum: 1095 - default: 0 - examples: - - 14 supportsNormalization: false supportsDBT: false supported_destination_sync_modes: [] diff --git a/connectors.md b/connectors.md index 996cfcdcdaac2..6459a8091942a 100644 --- a/connectors.md +++ b/connectors.md @@ -252,7 +252,7 @@ | **Webflow** | Webflow icon | Source | airbyte/source-webflow:0.1.2 | alpha | [link](https://docs.airbyte.com/integrations/sources/webflow) | [code](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-webflow) | `ef580275-d9a9-48bb-af5e-db0f5855be04` | | **Whisky Hunter** | Whisky Hunter icon | Source | airbyte/source-whisky-hunter:0.1.0 | alpha | [link](https://docs.airbyte.com/integrations/sources/whisky-hunter) | [code](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-whisky-hunter) | `e65f84c0-7598-458a-bfac-f770c381ff5d` | | **Wikipedia Pageviews** | Wikipedia Pageviews icon | Source | airbyte/source-wikipedia-pageviews:0.1.0 | alpha | [link](https://docs.airbyte.com/integrations/sources/wikipedia-pageviews) | [code](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-wikipedia-pageviews) | `87c58f70-6f7a-4f70-aba5-bab1a458f5ba` | -| **WooCommerce** | WooCommerce icon | Source | airbyte/source-woocommerce:0.2.1 | beta | [link](https://docs.airbyte.com/integrations/sources/woocommerce) | [code](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-woocommerce) | `2a2552ca-9f78-4c1c-9eb7-4d0dc66d72df` | +| **WooCommerce** | WooCommerce icon | Source | airbyte/source-woocommerce:0.2.2 | beta | [link](https://docs.airbyte.com/integrations/sources/woocommerce) | [code](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-woocommerce) | `2a2552ca-9f78-4c1c-9eb7-4d0dc66d72df` | | **WorkRamp** | WorkRamp icon | Source | airbyte/source-workramp:0.1.0 | alpha | [link](https://docs.airbyte.com/integrations/sources/workramp) | [code](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-workramp) | `05b0bce2-4ec4-4534-bb1a-5d0127bd91b7` | | **Workable** | Workable icon | Source | airbyte/source-workable:0.1.0 | alpha | [link](https://docs.airbyte.com/integrations/sources/workable) | [code](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-workable) | `ef3c99c6-9e90-43c8-9517-926cfd978517` | | **Wrike** | Wrike icon | Source | airbyte/source-wrike:0.1.0 | alpha | [link](https://docs.airbyte.com/integrations/sources/wrike) | [code](https://github.com/airbytehq/airbyte/tree/master/airbyte-integrations/connectors/source-wrike) | `9c13f986-a13b-4988-b808-4705badf71c2` |