🐛 Source Amazon Ads: Fix unexpected column for SponsoredProductCampaigns and SponsoredBrandsKeywords

airbyte-integrations/connectors/source-amazon-ads/Dockerfile

@@ -13,5 +13,5 @@ ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
 ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
 
 
-LABEL io.airbyte.version=3.2.0
+LABEL io.airbyte.version=3.2.1
 LABEL io.airbyte.name=airbyte/source-amazon-ads

airbyte-integrations/connectors/source-amazon-ads/acceptance-test-config.yml

@@ -61,5 +61,7 @@ acceptance_tests:
   spec:
     tests:
       - spec_path: integration_tests/spec.json
+        backward_compatibility_tests_config:
+          disable_for_version: "3.2.0"
 connector_image: airbyte/source-amazon-ads:dev
 test_strictness_level: high

airbyte-integrations/connectors/source-amazon-ads/integration_tests/spec.json

@@ -13,6 +13,7 @@
       "client_id": {
         "title": "Client ID",
         "description": "The client ID of your Amazon Ads developer application. See the <a href=\"https://advertising.amazon.com/API/docs/en-us/get-started/generate-api-tokens#retrieve-your-client-id-and-client-secret\">docs</a> for more information.",
+        "airbyte_secret": true,
         "order": 1,
         "type": "string"
       },
@@ -43,7 +44,9 @@
         "description": "The Start date for collecting reports, should not be more than 60 days in the past. In YYYY-MM-DD format",
         "examples": ["2022-10-10", "2022-10-22"],
         "order": 5,
-        "type": "string"
+        "type": "string",
+        "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}$",
+        "format": "date"
       },
       "profiles": {
         "title": "Profile IDs",

airbyte-integrations/connectors/source-amazon-ads/metadata.yaml

@@ -8,7 +8,7 @@ data:
   connectorSubtype: api
   connectorType: source
   definitionId: c6b0a29e-1da9-4512-9002-7bfd0cba2246
-  dockerImageTag: 3.2.0
+  dockerImageTag: 3.2.1
   dockerRepository: airbyte/source-amazon-ads
   githubIssueLabel: source-amazon-ads
   icon: amazonads.svg

airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/schemas/sponsored_brands.py

@@ -52,3 +52,8 @@ class BrandsAdGroup(CatalogModel):
     adGroupId: Decimal
     name: str
     bid: int
+    keywordId: Decimal
+    keywordText: str
+    nativeLanguageKeyword: str
+    matchType: str
+    state: str

airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/schemas/sponsored_products.py

@@ -32,6 +32,7 @@ class ProductCampaign(CatalogModel):
     endDate: str = None
     premiumBidAdjustment: bool
     bidding: Bidding
+    networks: str
 
 
 class ProductAdGroups(CatalogModel):

airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/spec.yaml

@@ -17,6 +17,7 @@ connectionSpecification:
         for more information.
       order: 1
       type: string
+      airbyte_secret: true
     client_secret:
       title: Client Secret
       description:
@@ -51,6 +52,8 @@ connectionSpecification:
       description:
         The Start date for collecting reports, should not be more than
         60 days in the past. In YYYY-MM-DD format
+      pattern: "^[0-9]{4}-[0-9]{2}-[0-9]{2}$"
+      format: date
       examples:
         - "2022-10-10"
         - "2022-10-22"

airbyte-integrations/connectors/source-amazon-ads/unit_tests/test_source.py

@@ -3,6 +3,7 @@
 #
 
 
+import pytest
 import responses
 from airbyte_cdk.models import AirbyteConnectionStatus, AirbyteMessage, ConnectorSpecification, Status, Type
 from jsonschema import Draft4Validator
@@ -64,25 +65,23 @@ def test_check(config_gen):
     assert command_check(source, config_gen(start_date=...)) == AirbyteConnectionStatus(status=Status.SUCCEEDED)
     assert len(responses.calls) == 2
 
-    assert command_check(source, config_gen(start_date="")) == AirbyteConnectionStatus(status=Status.SUCCEEDED)
-    assert len(responses.calls) == 4
+    with pytest.raises(Exception):
+        command_check(source, config_gen(start_date=""))
 
     assert source.check(None, config_gen(start_date="2022-02-20")) == AirbyteConnectionStatus(status=Status.SUCCEEDED)
-    assert len(responses.calls) == 6
+    assert len(responses.calls) == 4
 
     assert command_check(source, config_gen(start_date="2022-20-02")) == AirbyteConnectionStatus(
         status=Status.FAILED, message="'month must be in 1..12'"
     )
-    assert len(responses.calls) == 6
+    assert len(responses.calls) == 4
 
-    assert command_check(source, config_gen(start_date="no date")) == AirbyteConnectionStatus(
-        status=Status.FAILED, message="'String does not match format YYYY-MM-DD'"
-    )
-    assert len(responses.calls) == 6
+    with pytest.raises(Exception):
+        command_check(source, config_gen(start_date="no date"))
 
     assert command_check(source, config_gen(region=...)) == AirbyteConnectionStatus(status=Status.SUCCEEDED)
-    assert len(responses.calls) == 8
-    assert url_strip_query(responses.calls[7].request.url) == "https://advertising-api.amazon.com/v2/profiles"
+    assert len(responses.calls) == 6
+    assert url_strip_query(responses.calls[5].request.url) == "https://advertising-api.amazon.com/v2/profiles"
 
     assert command_check(source, config_gen(look_back_window=...)) == AirbyteConnectionStatus(status=Status.SUCCEEDED)
 

docs/integrations/sources/amazon-ads.md

@@ -109,6 +109,7 @@ Information about expected report generation waiting time you may find [here](ht
 
 | Version | Date       | Pull Request                                             | Subject                                                                                                         |
 |:--------|:-----------|:---------------------------------------------------------|:----------------------------------------------------------------------------------------------------------------|
+| 3.2.1   | 2023-09-22 | [30679](https://github.com/airbytehq/airbyte/pull/30679) | Fix unexpected column for SponsoredProductCampaigns and SponsoredBrandsKeywords                                 |
 | 3.2.0   | 2023-09-18 | [30517](https://github.com/airbytehq/airbyte/pull/30517) | Add suggested streams; fix unexpected column issue                                                              |
 | 3.1.2   | 2023-08-16 | [29233](https://github.com/airbytehq/airbyte/pull/29233) | Add filter for Marketplace IDs                                                                                  |
 | 3.1.1   | 2023-08-28 | [29900](https://github.com/airbytehq/airbyte/pull/29900) | Add 404 handling for no assotiated with bid ad groups                                                           |