From ab6b73fb1f88131ae657c388f3a30ea4e81b920d Mon Sep 17 00:00:00 2001 From: Sergey Chvalyuk Date: Tue, 9 Aug 2022 21:14:10 +0300 Subject: [PATCH 1/5] increase timeout 1200 -> 2400 Signed-off-by: Sergey Chvalyuk --- .../connectors/source-amazon-ads/acceptance-test-config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/airbyte-integrations/connectors/source-amazon-ads/acceptance-test-config.yml b/airbyte-integrations/connectors/source-amazon-ads/acceptance-test-config.yml index 1e0dbb0302276..b87df3eea52c8 100644 --- a/airbyte-integrations/connectors/source-amazon-ads/acceptance-test-config.yml +++ b/airbyte-integrations/connectors/source-amazon-ads/acceptance-test-config.yml @@ -29,6 +29,7 @@ tests: future_state_path: "integration_tests/abnormal_state.json" cursor_paths: sponsored_products_report_stream: ["1861552880916640", "reportDate"] + timeout_seconds: 2400 full_refresh: - config_path: "secrets/config.json" configured_catalog_path: "integration_tests/configured_catalog.json" From 940c340f6ae84c8510e8297c4859ae4fdbd3d42b Mon Sep 17 00:00:00 2001 From: Sergey Chvalyuk Date: Tue, 9 Aug 2022 18:38:07 +0000 Subject: [PATCH 2/5] primary_key added for SponsoredBrandsVideoReportStream Signed-off-by: Sergey Chvalyuk --- .../streams/report_streams/brands_video_report.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/streams/report_streams/brands_video_report.py b/airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/streams/report_streams/brands_video_report.py index 12dd7017f146b..24eaabe6622a1 100644 --- a/airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/streams/report_streams/brands_video_report.py +++ b/airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/streams/report_streams/brands_video_report.py @@ -73,6 +73,8 @@ class SponsoredBrandsVideoReportStream(ReportStream): https://advertising.amazon.com/API/docs/en-us/reference/sponsored-brands/2/reports """ + primary_key = ["profileId", "recordType", "reportDate", "updatedAt"] + def report_init_endpoint(self, record_type: str) -> str: return f"/v2/hsa/{record_type}/report" From a4065a664f4b05f61f9b931a2126801711b0036c Mon Sep 17 00:00:00 2001 From: Sergey Chvalyuk Date: Tue, 9 Aug 2022 18:46:43 +0000 Subject: [PATCH 3/5] move primary_key to base class ReportStream Signed-off-by: Sergey Chvalyuk --- .../streams/report_streams/brands_video_report.py | 2 -- .../source_amazon_ads/streams/report_streams/products_report.py | 2 -- .../source_amazon_ads/streams/report_streams/report_streams.py | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/streams/report_streams/brands_video_report.py b/airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/streams/report_streams/brands_video_report.py index 24eaabe6622a1..12dd7017f146b 100644 --- a/airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/streams/report_streams/brands_video_report.py +++ b/airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/streams/report_streams/brands_video_report.py @@ -73,8 +73,6 @@ class SponsoredBrandsVideoReportStream(ReportStream): https://advertising.amazon.com/API/docs/en-us/reference/sponsored-brands/2/reports """ - primary_key = ["profileId", "recordType", "reportDate", "updatedAt"] - def report_init_endpoint(self, record_type: str) -> str: return f"/v2/hsa/{record_type}/report" diff --git a/airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/streams/report_streams/products_report.py b/airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/streams/report_streams/products_report.py index 9f36e185ee788..ad06f0aae6f0a 100644 --- a/airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/streams/report_streams/products_report.py +++ b/airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/streams/report_streams/products_report.py @@ -248,8 +248,6 @@ class SponsoredProductsReportStream(ReportStream): https://advertising.amazon.com/API/docs/en-us/sponsored-products/2-0/openapi#/Reports """ - primary_key = ["profileId", "recordType", "reportDate", "updatedAt"] - def report_init_endpoint(self, record_type: str) -> str: return f"/v2/sp/{record_type}/report" diff --git a/airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/streams/report_streams/report_streams.py b/airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/streams/report_streams/report_streams.py index 93a2a3f6d2d8c..01814cdd6c78f 100644 --- a/airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/streams/report_streams/report_streams.py +++ b/airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/streams/report_streams/report_streams.py @@ -89,7 +89,7 @@ class ReportStream(BasicAmazonAdsStream, ABC): Common base class for report streams """ - primary_key = None + primary_key = ["profileId", "recordType", "reportDate", "updatedAt"] # Amazon ads updates the data for the next 3 days LOOK_BACK_WINDOW = 3 # (Service limits section) From 900852810ebbe69d850afe282af41fc6487b5683 Mon Sep 17 00:00:00 2001 From: Sergey Chvalyuk Date: Tue, 9 Aug 2022 21:51:07 +0300 Subject: [PATCH 4/5] bump 0.1.12 Signed-off-by: Sergey Chvalyuk --- airbyte-integrations/connectors/source-amazon-ads/Dockerfile | 2 +- docs/integrations/sources/amazon-ads.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/airbyte-integrations/connectors/source-amazon-ads/Dockerfile b/airbyte-integrations/connectors/source-amazon-ads/Dockerfile index dac5a675caec3..b0ebacf5609e1 100644 --- a/airbyte-integrations/connectors/source-amazon-ads/Dockerfile +++ b/airbyte-integrations/connectors/source-amazon-ads/Dockerfile @@ -12,5 +12,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.1.11 +LABEL io.airbyte.version=0.1.12 LABEL io.airbyte.name=airbyte/source-amazon-ads diff --git a/docs/integrations/sources/amazon-ads.md b/docs/integrations/sources/amazon-ads.md index cfb5c0ba21927..8a072bdc3d12b 100644 --- a/docs/integrations/sources/amazon-ads.md +++ b/docs/integrations/sources/amazon-ads.md @@ -90,6 +90,7 @@ Information about expected report generation waiting time you may find [here](ht | Version | Date | Pull Request | Subject | |:--------|:-----------|:-----------------------------------------------------------|:------------------------------------------------------------------------------------------------------------------| +| 0.1.12 | 2022-08-09 | [15469](https://github.com/airbytehq/airbyte/pull/15469) | Define primary_key for all report streams | | 0.1.11 | 2022-07-28 | [15031](https://github.com/airbytehq/airbyte/pull/15031) | Improve report streams date-range generation | | 0.1.10 | 2022-07-26 | [15042](https://github.com/airbytehq/airbyte/pull/15042) | Update `additionalProperties` field to true from schemas | | 0.1.9 | 2022-05-08 | [12541](https://github.com/airbytehq/airbyte/pull/12541) | Improve documentation for Beta | From bac8e3c75d7ccdb1c056f6d6375ce31e59882467 Mon Sep 17 00:00:00 2001 From: Octavia Squidington III Date: Wed, 10 Aug 2022 05:40:24 +0000 Subject: [PATCH 5/5] auto-bump connector version [ci skip] --- .../init/src/main/resources/seed/source_definitions.yaml | 2 +- airbyte-config/init/src/main/resources/seed/source_specs.yaml | 2 +- 2 files changed, 2 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 f474624269c57..8cf4ade42c63e 100644 --- a/airbyte-config/init/src/main/resources/seed/source_definitions.yaml +++ b/airbyte-config/init/src/main/resources/seed/source_definitions.yaml @@ -17,7 +17,7 @@ - name: Amazon Ads sourceDefinitionId: c6b0a29e-1da9-4512-9002-7bfd0cba2246 dockerRepository: airbyte/source-amazon-ads - dockerImageTag: 0.1.11 + dockerImageTag: 0.1.12 documentationUrl: https://docs.airbyte.io/integrations/sources/amazon-ads icon: amazonads.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 efa51da1adb78..ab8c63a93ea9c 100644 --- a/airbyte-config/init/src/main/resources/seed/source_specs.yaml +++ b/airbyte-config/init/src/main/resources/seed/source_specs.yaml @@ -87,7 +87,7 @@ supportsNormalization: false supportsDBT: false supported_destination_sync_modes: [] -- dockerImage: "airbyte/source-amazon-ads:0.1.11" +- dockerImage: "airbyte/source-amazon-ads:0.1.12" spec: documentationUrl: "https://docs.airbyte.com/integrations/sources/amazon-ads" connectionSpecification: