Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

馃帀 Source Amazon Ads: increase report_wait_timeout 30 -> 60 minutes #16453

Merged
merged 9 commits into from
Sep 10, 2022
Merged

馃帀 Source Amazon Ads: increase report_wait_timeout 30 -> 60 minutes #16453

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2729fe4
increse report_wait_timeout 30 -> 60 minutes
grubberr Sep 8, 2022
7a8e3dc
30, 60 -> 45
grubberr Sep 8, 2022
b1ccbc3
Merge branch 'master' into grubberr/alpha-beta-209-source-amazon-ads
grubberr Sep 8, 2022
5350bf0
45 -> 60
grubberr Sep 8, 2022
e445ea1
amazon-ads.md updated
grubberr Sep 8, 2022
19db280
Merge branch 'master' into grubberr/alpha-beta-209-source-amazon-ads
grubberr Sep 9, 2022
eeafc60
fix unit_tests
grubberr Sep 9, 2022
8eb91bb
30 -> 60
grubberr Sep 9, 2022
2fb3037
auto-bump connector version [ci skip]
octavia-squidington-iii Sep 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/source-amazon-ads/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions airbyte-integrations/connectors/source-amazon-ads/integration_tests/spec.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
6 changes: 3 additions & 3 deletions airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/spec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 60 minutes.
default: 60
examples:
- 30
- 60
- 120
order: 5
type: integer
Expand Down
2 changes: 1 addition & 1 deletion ...s/connectors/source-amazon-ads/source_amazon_ads/streams/report_streams/report_streams.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
12 changes: 6 additions & 6 deletions airbyte-integrations/connectors/source-amazon-ads/unit_tests/test_report_streams.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
),
Expand All @@ -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,
),
Expand Down
1 change: 1 addition & 0 deletions docs/integrations/sources/amazon-ads.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -> 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." |
Expand Down