✨Source Amazon Ads: Add filter for Marketplace ID

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.0.0
+LABEL io.airbyte.version=3.0.1
 LABEL io.airbyte.name=airbyte/source-amazon-ads

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

@@ -47,13 +47,22 @@
       },
       "profiles": {
         "title": "Profile IDs",
-        "description": "Profile IDs you want to fetch data for. See <a href=\"https://advertising.amazon.com/API/docs/en-us/concepts/authorization/profiles\">docs</a> for more details.",
+        "description": "Profile IDs you want to fetch data for. See <a href=\"https://advertising.amazon.com/API/docs/en-us/concepts/authorization/profiles\">docs</a> for more details. Note: If Profile IDs are also selected, profiles will be filtered if they meet either criteria.",
         "order": 6,
         "type": "array",
         "items": {
           "type": "integer"
         }
       },
+      "marketplace_ids": {
+        "title": "Marketplace IDs",
+        "description": "Marketplace IDs you want to fetch data for. Note: If Profile IDs are also selected, profiles will be filtered if they meet either criteria.",
+        "order": 7,
+        "type": "array",
+        "items": {
+          "type": "string"
+        }
+      },
       "state_filter": {
         "title": "State Filter",
         "description": "Reflects the state of the Display, Product, and Brand Campaign streams as enabled, paused, or archived. If you do not populate this field, it will be ignored completely.",
@@ -63,14 +72,14 @@
         },
         "type": "array",
         "uniqueItems": true,
-        "order": 7
+        "order": 8
       },
       "look_back_window": {
         "title": "Look Back Window",
         "description": "The amount of days to go back in time to get the updated data from Amazon Ads",
         "default": 3,
         "examples": [3, 10],
-        "order": 8,
+        "order": 9,
         "type": "integer"
       },
       "report_record_types": {
@@ -91,7 +100,7 @@
         },
         "type": "array",
         "uniqueItems": true,
-        "order": 9
+        "order": 10
       }
     },
     "required": ["client_id", "client_secret", "refresh_token"],

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.0.0
+  dockerImageTag: 3.0.1
   dockerRepository: airbyte/source-amazon-ads
   githubIssueLabel: source-amazon-ads
   icon: amazonads.svg

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

@@ -80,6 +80,7 @@ def check_connection(self, logger: logging.Logger, config: Mapping[str, Any]) ->
         # It doesnt support pagination so there is no sense of reading single
         # record, it would fetch all the data anyway.
         Profiles(config, authenticator=self._make_authenticator(config)).get_all_profiles()
+
         return True, None
 
     def streams(self, config: Mapping[str, Any]) -> List[Stream]:
@@ -140,6 +141,16 @@ def _make_authenticator(config: Mapping[str, Any]):
 
     @staticmethod
     def _choose_profiles(config: Mapping[str, Any], profiles: List[Profile]):
-        if not config.get("profiles"):
+        filtered_profiles = []
+        if config.get("profiles"):
+            for profile in list(filter(lambda profile: profile.profileId in config["profiles"], profiles)):
+                filtered_profiles.append(profile)
+        if config.get("marketplace_ids"):
+            for profile in list(filter(lambda profile: profile.profileId in config["marketplace_ids"], profiles)):
+                if profile not in filtered_profiles:
+                    filtered_profiles.append(profile)
+
+        if config.get("profiles") or config.get("marketplace_ids"):
+            return filtered_profiles
+        else:
             return profiles
-        return list(filter(lambda profile: profile.profileId in config["profiles"], profiles))

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

@@ -59,12 +59,18 @@ connectionSpecification:
     profiles:
       title: Profile IDs
       description:
-        Profile IDs you want to fetch data for. See <a href="https://advertising.amazon.com/API/docs/en-us/concepts/authorization/profiles">docs</a>
-        for more details.
+        'Profile IDs you want to fetch data for. See <a href="https://advertising.amazon.com/API/docs/en-us/concepts/authorization/profiles">docs</a> for more details. Note: If Profile IDs are also selected, profiles will be filtered if they meet either criteria.'
       order: 6
       type: array
       items:
         type: integer
+    marketplace_ids:
+      title: Marketplace IDs
+      description: "Marketplace IDs you want to fetch data for. Note: If Profile IDs are also selected, profiles will be filtered if they meet either criteria."
+      order: 7
+      type: array
+      items:
+        type: string
     state_filter:
       title: State Filter
       description: Reflects the state of the Display, Product, and Brand Campaign streams as enabled, paused, or archived. If you do not populate this field, it will be ignored completely.
@@ -76,7 +82,7 @@ connectionSpecification:
           - archived
       type: array
       uniqueItems: true
-      order: 7
+      order: 8
     look_back_window:
       title: "Look Back Window"
       description: "The amount of days to go back in time to get the updated data from Amazon Ads"
@@ -85,7 +91,7 @@ connectionSpecification:
       - 10
       type: "integer"
       default: 3
-      order: 8
+      order: 9
     report_record_types:
       title: Report Record Types
       description:
@@ -107,7 +113,7 @@ connectionSpecification:
           - targets
       type: array
       uniqueItems: true
-      order: 9
+      order: 10
   required:
     - client_id
     - client_secret

docs/integrations/sources/amazon-ads.md

@@ -9,6 +9,7 @@ This page contains the setup guide and reference information for the Amazon Ads
 * Region
 * Start Date (Optional)
 * Profile IDs (Optional)
+* Marketplace IDs (Optional)
 
 ## Setup guide
 ### Step 1: Set up Amazon Ads
@@ -103,6 +104,7 @@ Information about expected report generation waiting time you may find [here](ht
 
 | Version | Date       | Pull Request                                             | Subject                                                                                                         |
 |:--------|:-----------|:---------------------------------------------------------|:----------------------------------------------------------------------------------------------------------------|
+| 3.0.1   | 2023-08-08 | [29233](https://github.com/airbytehq/airbyte/pull/29233) | Add filter for Marketplace IDs |
 | 3.0.0   | 2023-07-24 | [27868](https://github.com/airbytehq/airbyte/pull/27868) | Fix attribution report stream schemas                                                                           |
 | 2.3.1   | 2023-07-11 | [28155](https://github.com/airbytehq/airbyte/pull/28155) | Bugfix: validation error when record values are missing                                                         |
 | 2.3.0   | 2023-07-06 | [28002](https://github.com/airbytehq/airbyte/pull/28002) | Add sponsored_product_ad_group_suggested_keywords, sponsored_product_ad_group_bid_recommendations streams       |