From 2729fe4ee650e5eec92fa80a1edbf4e3a9521997 Mon Sep 17 00:00:00 2001 From: Sergey Chvalyuk Date: Thu, 8 Sep 2022 20:19:30 +0300 Subject: [PATCH 1/7] increse report_wait_timeout 30 -> 60 minutes Signed-off-by: Sergey Chvalyuk --- airbyte-integrations/connectors/source-amazon-ads/Dockerfile | 2 +- .../source_amazon_ads/streams/report_streams/report_streams.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/airbyte-integrations/connectors/source-amazon-ads/Dockerfile b/airbyte-integrations/connectors/source-amazon-ads/Dockerfile index ab4778154832..39932ddaaacc 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.19 +LABEL io.airbyte.version=0.1.20 LABEL io.airbyte.name=airbyte/source-amazon-ads 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 35c8fab7d269..e4e1bfb031a0 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 @@ -103,7 +103,7 @@ def __init__(self, config: Mapping[str, Any], profiles: List[Profile], authentic self._authenticator = authenticator self._session = requests.Session() self._model = self._generate_model() - self.report_wait_timeout = config.get("report_wait_timeout", 30) + self.report_wait_timeout = config.get("report_wait_timeout", 60) self.report_generation_maximum_retries = config.get("report_generation_max_retries", 5) self._start_date: Optional[Date] = config.get("start_date") super().__init__(config, profiles) From 7a8e3dcc2bf484995a619f4da3b0a249ca9ed66e Mon Sep 17 00:00:00 2001 From: Sergey Chvalyuk Date: Thu, 8 Sep 2022 20:26:56 +0300 Subject: [PATCH 2/7] 30, 60 -> 45 Signed-off-by: Sergey Chvalyuk --- .../source-amazon-ads/source_amazon_ads/spec.yaml | 6 +++--- .../streams/report_streams/report_streams.py | 2 +- docs/integrations/sources/amazon-ads.md | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/spec.yaml b/airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/spec.yaml index c0d2af11b0a1..581b0adec45b 100644 --- a/airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/spec.yaml +++ b/airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/spec.yaml @@ -48,10 +48,10 @@ connectionSpecification: order: 4 report_wait_timeout: title: Report Wait Timeout * - description: Timeout duration in minutes for Reports. Default is 30 minutes. - default: 30 + description: Timeout duration in minutes for Reports. Default is 45 minutes. + default: 45 examples: - - 30 + - 45 - 120 order: 5 type: integer 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 e4e1bfb031a0..b3454ba59b27 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 @@ -103,7 +103,7 @@ def __init__(self, config: Mapping[str, Any], profiles: List[Profile], authentic self._authenticator = authenticator self._session = requests.Session() self._model = self._generate_model() - self.report_wait_timeout = config.get("report_wait_timeout", 60) + self.report_wait_timeout = config.get("report_wait_timeout", 45) self.report_generation_maximum_retries = config.get("report_generation_max_retries", 5) self._start_date: Optional[Date] = config.get("start_date") super().__init__(config, profiles) diff --git a/docs/integrations/sources/amazon-ads.md b/docs/integrations/sources/amazon-ads.md index 3f19f9795a57..47b00d5f3727 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.20 | 2022-09-08 | [16453](https://github.com/airbytehq/airbyte/pull/16453) | Increase `report_wait_timeout` 30 -> 45 minutes | | 0.1.19 | 2022-08-31 | [16191](https://github.com/airbytehq/airbyte/pull/16191) | Improved connector's input configuration validation | | 0.1.18 | 2022-08-25 | [15951](https://github.com/airbytehq/airbyte/pull/15951) | Skip API error "Tactic T00020 is not supported for report API in marketplace A1C3SOZRARQ6R3." | | 0.1.17 | 2022-08-24 | [15921](https://github.com/airbytehq/airbyte/pull/15921) | Skip API error "Report date is too far in the past." | From 5350bf0e5005a4d39788dde80d9c42272b0bfe21 Mon Sep 17 00:00:00 2001 From: Sergey Chvalyuk Date: Thu, 8 Sep 2022 22:05:51 +0300 Subject: [PATCH 3/7] 45 -> 60 Signed-off-by: Sergey Chvalyuk --- .../source-amazon-ads/source_amazon_ads/spec.yaml | 6 +++--- .../streams/report_streams/report_streams.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/spec.yaml b/airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/spec.yaml index 581b0adec45b..622295763e6d 100644 --- a/airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/spec.yaml +++ b/airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/spec.yaml @@ -48,10 +48,10 @@ connectionSpecification: order: 4 report_wait_timeout: title: Report Wait Timeout * - description: Timeout duration in minutes for Reports. Default is 45 minutes. - default: 45 + description: Timeout duration in minutes for Reports. Default is 60 minutes. + default: 60 examples: - - 45 + - 60 - 120 order: 5 type: integer 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 b3454ba59b27..e4e1bfb031a0 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 @@ -103,7 +103,7 @@ def __init__(self, config: Mapping[str, Any], profiles: List[Profile], authentic self._authenticator = authenticator self._session = requests.Session() self._model = self._generate_model() - self.report_wait_timeout = config.get("report_wait_timeout", 45) + self.report_wait_timeout = config.get("report_wait_timeout", 60) self.report_generation_maximum_retries = config.get("report_generation_max_retries", 5) self._start_date: Optional[Date] = config.get("start_date") super().__init__(config, profiles) From e445ea1b5fe271548a1f6fe43978334b3a9f37ff Mon Sep 17 00:00:00 2001 From: Sergey Chvalyuk Date: Thu, 8 Sep 2022 22:06:35 +0300 Subject: [PATCH 4/7] amazon-ads.md updated Signed-off-by: Sergey Chvalyuk --- docs/integrations/sources/amazon-ads.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/integrations/sources/amazon-ads.md b/docs/integrations/sources/amazon-ads.md index 47b00d5f3727..2f1c399c3568 100644 --- a/docs/integrations/sources/amazon-ads.md +++ b/docs/integrations/sources/amazon-ads.md @@ -90,7 +90,7 @@ Information about expected report generation waiting time you may find [here](ht | Version | Date | Pull Request | Subject | |:--------|:-----------|:-----------------------------------------------------------|:------------------------------------------------------------------------------------------------------------------| -| 0.1.20 | 2022-09-08 | [16453](https://github.com/airbytehq/airbyte/pull/16453) | Increase `report_wait_timeout` 30 -> 45 minutes | +| 0.1.20 | 2022-09-08 | [16453](https://github.com/airbytehq/airbyte/pull/16453) | Increase `report_wait_timeout` 30 -> 60 minutes | | 0.1.19 | 2022-08-31 | [16191](https://github.com/airbytehq/airbyte/pull/16191) | Improved connector's input configuration validation | | 0.1.18 | 2022-08-25 | [15951](https://github.com/airbytehq/airbyte/pull/15951) | Skip API error "Tactic T00020 is not supported for report API in marketplace A1C3SOZRARQ6R3." | | 0.1.17 | 2022-08-24 | [15921](https://github.com/airbytehq/airbyte/pull/15921) | Skip API error "Report date is too far in the past." | From eeafc60a5dd3c20ae51d3c75b8ff7fd5b452cb9e Mon Sep 17 00:00:00 2001 From: Sergey Chvalyuk Date: Fri, 9 Sep 2022 14:58:39 +0300 Subject: [PATCH 5/7] fix unit_tests Signed-off-by: Sergey Chvalyuk --- .../unit_tests/test_report_streams.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/airbyte-integrations/connectors/source-amazon-ads/unit_tests/test_report_streams.py b/airbyte-integrations/connectors/source-amazon-ads/unit_tests/test_report_streams.py index 985f79f66552..6fc2b3d41951 100644 --- a/airbyte-integrations/connectors/source-amazon-ads/unit_tests/test_report_streams.py +++ b/airbyte-integrations/connectors/source-amazon-ads/unit_tests/test_report_streams.py @@ -241,7 +241,7 @@ def test_display_report_stream_init_too_many_requests(mocker, config): ), ( [ - (lambda x: x > 5, None, "2021-01-02 03:34:05"), + (lambda x: x > 5, None, "2021-01-02 04:04:05"), ], ReportGenerationInProgress, ), @@ -256,11 +256,11 @@ def test_display_report_stream_init_too_many_requests(mocker, config): ( [ (lambda x: True, "FAILURE", None), - (lambda x: x >= 10, None, "2021-01-02 03:34:05"), - (lambda x: x >= 15, None, "2021-01-02 04:04:05"), - (lambda x: x >= 20, None, "2021-01-02 04:34:05"), - (lambda x: x >= 25, None, "2021-01-02 05:04:05"), - (lambda x: x >= 30, None, "2021-01-02 05:34:05"), + (lambda x: x >= 10, None, "2021-01-02 04:04:05"), + (lambda x: x >= 15, None, "2021-01-02 05:04:05"), + (lambda x: x >= 20, None, "2021-01-02 06:04:05"), + (lambda x: x >= 25, None, "2021-01-02 07:04:05"), + (lambda x: x >= 30, None, "2021-01-02 08:04:05"), ], ReportGenerationFailure, ), From 8eb91bb0590862430ef2cf5492965998ab2c9568 Mon Sep 17 00:00:00 2001 From: Sergey Chvalyuk Date: Fri, 9 Sep 2022 16:50:38 +0300 Subject: [PATCH 6/7] 30 -> 60 Signed-off-by: Sergey Chvalyuk --- .../source-amazon-ads/integration_tests/spec.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/airbyte-integrations/connectors/source-amazon-ads/integration_tests/spec.json b/airbyte-integrations/connectors/source-amazon-ads/integration_tests/spec.json index cf6970808b69..ced7dc7ea367 100644 --- a/airbyte-integrations/connectors/source-amazon-ads/integration_tests/spec.json +++ b/airbyte-integrations/connectors/source-amazon-ads/integration_tests/spec.json @@ -40,9 +40,9 @@ }, "report_wait_timeout": { "title": "Report Wait Timeout *", - "description": "Timeout duration in minutes for Reports. Default is 30 minutes.", - "default": 30, - "examples": [30, 120], + "description": "Timeout duration in minutes for Reports. Default is 60 minutes.", + "default": 60, + "examples": [60, 120], "order": 5, "type": "integer" }, From 2fb30371fa529448aae8e7209b67b47e8560a5b9 Mon Sep 17 00:00:00 2001 From: Octavia Squidington III Date: Sat, 10 Sep 2022 10:40:51 +0000 Subject: [PATCH 7/7] auto-bump connector version [ci skip] --- .../init/src/main/resources/seed/source_definitions.yaml | 2 +- .../init/src/main/resources/seed/source_specs.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 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 3c81fd7399f4..d940917005d6 100644 --- a/airbyte-config/init/src/main/resources/seed/source_definitions.yaml +++ b/airbyte-config/init/src/main/resources/seed/source_definitions.yaml @@ -25,7 +25,7 @@ - name: Amazon Ads sourceDefinitionId: c6b0a29e-1da9-4512-9002-7bfd0cba2246 dockerRepository: airbyte/source-amazon-ads - dockerImageTag: 0.1.19 + dockerImageTag: 0.1.20 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 339019442f7f..b8a2309d6bfc 100644 --- a/airbyte-config/init/src/main/resources/seed/source_specs.yaml +++ b/airbyte-config/init/src/main/resources/seed/source_specs.yaml @@ -492,7 +492,7 @@ supportsNormalization: false supportsDBT: false supported_destination_sync_modes: [] -- dockerImage: "airbyte/source-amazon-ads:0.1.19" +- dockerImage: "airbyte/source-amazon-ads:0.1.20" spec: documentationUrl: "https://docs.airbyte.com/integrations/sources/amazon-ads" connectionSpecification: @@ -539,10 +539,10 @@ order: 4 report_wait_timeout: title: "Report Wait Timeout *" - description: "Timeout duration in minutes for Reports. Default is 30 minutes." - default: 30 + description: "Timeout duration in minutes for Reports. Default is 60 minutes." + default: 60 examples: - - 30 + - 60 - 120 order: 5 type: "integer"