From c577e446338bee72751d9ca1e1068228e5f7bd3e Mon Sep 17 00:00:00 2001 From: "Roman Yermilov [GL]" <86300758+roman-yermilov-gl@users.noreply.github.com> Date: Mon, 8 May 2023 11:06:17 +0400 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Source=20Amazon=20Ads:=20add=20avai?= =?UTF-8?q?lability=20strategy=20for=20basic=20streams=20(#25792)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Source Amazon Ads: add availability strategy for basic streams * auto-bump connector version * Source Amazon Ads: update metadata.yaml --------- Co-authored-by: Octavia Squidington III --- .../init-oss/src/main/resources/seed/oss_catalog.json | 2 +- .../init-oss/src/main/resources/seed/source_definitions.yaml | 2 +- .../init-oss/src/main/resources/seed/source_specs.yaml | 2 +- airbyte-integrations/connectors/source-amazon-ads/Dockerfile | 2 +- .../connectors/source-amazon-ads/metadata.yaml | 2 +- .../source-amazon-ads/source_amazon_ads/streams/common.py | 5 ----- .../streams/report_streams/report_streams.py | 5 +++++ docs/integrations/sources/amazon-ads.md | 1 + 8 files changed, 11 insertions(+), 10 deletions(-) diff --git a/airbyte-config-oss/init-oss/src/main/resources/seed/oss_catalog.json b/airbyte-config-oss/init-oss/src/main/resources/seed/oss_catalog.json index 2d264fce93ac1..d5050c3c77201 100644 --- a/airbyte-config-oss/init-oss/src/main/resources/seed/oss_catalog.json +++ b/airbyte-config-oss/init-oss/src/main/resources/seed/oss_catalog.json @@ -8688,7 +8688,7 @@ "sourceDefinitionId": "c6b0a29e-1da9-4512-9002-7bfd0cba2246", "name": "Amazon Ads", "dockerRepository": "airbyte/source-amazon-ads", - "dockerImageTag": "1.0.3", + "dockerImageTag": "1.0.4", "documentationUrl": "https://docs.airbyte.com/integrations/sources/amazon-ads", "icon": "amazonads.svg", "sourceType": "api", diff --git a/airbyte-config-oss/init-oss/src/main/resources/seed/source_definitions.yaml b/airbyte-config-oss/init-oss/src/main/resources/seed/source_definitions.yaml index 170e0234df7a2..00a0ad28486ed 100644 --- a/airbyte-config-oss/init-oss/src/main/resources/seed/source_definitions.yaml +++ b/airbyte-config-oss/init-oss/src/main/resources/seed/source_definitions.yaml @@ -73,7 +73,7 @@ - name: Amazon Ads sourceDefinitionId: c6b0a29e-1da9-4512-9002-7bfd0cba2246 dockerRepository: airbyte/source-amazon-ads - dockerImageTag: 1.0.3 + dockerImageTag: 1.0.4 documentationUrl: https://docs.airbyte.com/integrations/sources/amazon-ads icon: amazonads.svg sourceType: api diff --git a/airbyte-config-oss/init-oss/src/main/resources/seed/source_specs.yaml b/airbyte-config-oss/init-oss/src/main/resources/seed/source_specs.yaml index b032f7af2f4bf..e20b3f11302ed 100644 --- a/airbyte-config-oss/init-oss/src/main/resources/seed/source_specs.yaml +++ b/airbyte-config-oss/init-oss/src/main/resources/seed/source_specs.yaml @@ -852,7 +852,7 @@ supportsNormalization: false supportsDBT: false supported_destination_sync_modes: [] -- dockerImage: "airbyte/source-amazon-ads:1.0.3" +- dockerImage: "airbyte/source-amazon-ads:1.0.4" spec: documentationUrl: "https://docs.airbyte.com/integrations/sources/amazon-ads" connectionSpecification: diff --git a/airbyte-integrations/connectors/source-amazon-ads/Dockerfile b/airbyte-integrations/connectors/source-amazon-ads/Dockerfile index c46a26c59a1a8..d19c826f06d66 100644 --- a/airbyte-integrations/connectors/source-amazon-ads/Dockerfile +++ b/airbyte-integrations/connectors/source-amazon-ads/Dockerfile @@ -14,5 +14,5 @@ ENTRYPOINT ["python", "/airbyte/integration_code/main.py"] -LABEL io.airbyte.version=1.0.3 +LABEL io.airbyte.version=1.0.4 LABEL io.airbyte.name=airbyte/source-amazon-ads diff --git a/airbyte-integrations/connectors/source-amazon-ads/metadata.yaml b/airbyte-integrations/connectors/source-amazon-ads/metadata.yaml index 6547dfe40a533..6e49accdc3677 100644 --- a/airbyte-integrations/connectors/source-amazon-ads/metadata.yaml +++ b/airbyte-integrations/connectors/source-amazon-ads/metadata.yaml @@ -8,7 +8,7 @@ data: connectorSubtype: api connectorType: source definitionId: c6b0a29e-1da9-4512-9002-7bfd0cba2246 - dockerImageTag: 1.0.3 + dockerImageTag: 1.0.4 dockerRepository: airbyte/source-amazon-ads githubIssueLabel: source-amazon-ads icon: amazonads.svg diff --git a/airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/streams/common.py b/airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/streams/common.py index c07dbf773b716..46c428b75ee5b 100644 --- a/airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/streams/common.py +++ b/airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/streams/common.py @@ -7,7 +7,6 @@ from typing import Any, Iterable, List, Mapping, MutableMapping, Optional import requests -from airbyte_cdk.sources.streams.availability_strategy import AvailabilityStrategy from airbyte_cdk.sources.streams.core import Stream from airbyte_cdk.sources.streams.http import HttpStream from airbyte_cdk.sources.utils.schema_helpers import expand_refs @@ -91,10 +90,6 @@ def get_json_schema(self): expand_refs(schema) return schema - @property - def availability_strategy(self) -> Optional["AvailabilityStrategy"]: - return None - # Basic full refresh stream class AmazonAdsStream(HttpStream, BasicAmazonAdsStream): 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 d1653ba7df0cc..047a8a75e497a 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 @@ -18,6 +18,7 @@ import pendulum import requests from airbyte_cdk.models import SyncMode +from airbyte_cdk.sources.streams.availability_strategy import AvailabilityStrategy from airbyte_cdk.sources.streams.http.auth import Oauth2Authenticator from pendulum import Date from pydantic import BaseModel @@ -132,6 +133,10 @@ def __init__(self, config: Mapping[str, Any], profiles: List[Profile], authentic def model(self) -> CatalogModel: return self._model + @property + def availability_strategy(self) -> Optional["AvailabilityStrategy"]: + return None + def read_records( self, sync_mode: SyncMode, diff --git a/docs/integrations/sources/amazon-ads.md b/docs/integrations/sources/amazon-ads.md index 3f7948daa5dfd..2aee129a06471 100644 --- a/docs/integrations/sources/amazon-ads.md +++ b/docs/integrations/sources/amazon-ads.md @@ -94,6 +94,7 @@ Information about expected report generation waiting time you may find [here](ht | Version | Date | Pull Request | Subject | |:--------|:-----------|:---------------------------------------------------------|:----------------------------------------------------------------------------------------------------------------| +| 1.0.4 | 2023-05-04 | [00000](https://github.com/airbytehq/airbyte/pull/00000) | Add availability strategy for basic streams (not including report streams) | | 1.0.3 | 2023-04-13 | [25146](https://github.com/airbytehq/airbyte/pull/25146) | Validate pk for reports when expected pk is not returned | | 1.0.2 | 2023-02-03 | [22355](https://github.com/airbytehq/airbyte/pull/22355) | Migrate `products_report` stream to API v3 | | 1.0.1 | 2022-11-01 | [18677](https://github.com/airbytehq/airbyte/pull/18677) | Add optional config report_record_types |