🐛 Source Linkedin Ads: Fix issue where Accounts stream did not correctly handle provided account IDs

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

@@ -12,6 +12,9 @@ acceptance_tests:
       - config_path: "secrets/config_oauth.json"
         status: "succeed"
         timeout_seconds: 60
+      - config_path: "secrets/config_multiple_account_ids.json"
+        status: "succeed"
+        timeout_seconds: 60
       - config_path: "integration_tests/invalid_config.json"
         status: "failed"
       - config_path: "integration_tests/invalid_config_custom_report.json"

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

@@ -11,7 +11,7 @@ data:
   connectorSubtype: api
   connectorType: source
   definitionId: 137ece28-5434-455c-8f34-69dc3782f451
-  dockerImageTag: 2.1.0
+  dockerImageTag: 2.1.1
   dockerRepository: airbyte/source-linkedin-ads
   documentationUrl: https://docs.airbyte.com/integrations/sources/linkedin-ads
   githubIssueLabel: source-linkedin-ads
@@ -26,7 +26,6 @@ data:
   registries:
     cloud:
       enabled: true
-      dockerImageTag: 2.0.0
     oss:
       enabled: true
   releaseStage: generally_available

airbyte-integrations/connectors/source-linkedin-ads/pyproject.toml

@@ -3,7 +3,7 @@ requires = [ "poetry-core>=1.0.0",]
 build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
-version = "2.1.0"
+version = "2.1.1"
 name = "source-linkedin-ads"
 description = "Source implementation for Linkedin Ads."
 authors = [ "Airbyte <[email protected]>",]

airbyte-integrations/connectors/source-linkedin-ads/source_linkedin_ads/streams.py

@@ -6,7 +6,7 @@
 import logging
 from abc import ABC, abstractmethod
 from typing import Any, Dict, Iterable, Mapping, MutableMapping, Optional
-from urllib.parse import urlencode
+from urllib.parse import quote, urlencode
 
 import pendulum
 import requests
@@ -183,12 +183,19 @@ def request_params(
         Override request_params() to have the ability to accept the specific account_ids from user's configuration.
         If we have list of account_ids, we need to make sure that the request_params are encoded correctly,
         We will get HTTP Error 500, if we use standard requests.urlencode methods to parse parameters,
-        so the urlencode(..., safe=":(),") is used instead, to keep the values as they are.
+        so the urlencode(..., safe=":(),%") is used instead, to keep the values as they are.
         """
         params = super().request_params(stream_state, stream_slice, next_page_token)
         if self.accounts:
-            params["search"] = f"(id:(values:List({self.accounts})))"
-        return urlencode(params, safe="():,%")
+            # Construct the URN for each account ID
+            accounts = [f"urn:li:sponsoredAccount:{account_id}" for account_id in self.config.get("account_ids")]
+
+            # Join the URNs into a single string, separated by commas, and URL encode only this part
+            encoded_accounts = quote(",".join(accounts), safe=",")
+
+            # Insert the encoded account IDs into the overall structure, keeping colons and parentheses outside safe
+            params["search"] = f"(id:(values:List({encoded_accounts})))"
+        return urlencode(params, safe=":(),%")
 
 
 class IncrementalLinkedinAdsStream(LinkedinAdsStream):

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

@@ -175,7 +175,7 @@ def test_next_page_token(self, requests_mock, response_json, expected):
         assert expected == result
 
     def test_request_params(self):
-        expected = "pageSize=500&q=search&search=(id:(values:List(1,2)))"
+        expected = "pageSize=500&q=search&search=(id:(values:List(urn%3Ali%3AsponsoredAccount%3A1,urn%3Ali%3AsponsoredAccount%3A2)))"
         result = self.stream.request_params(stream_state={}, stream_slice={"account_id": 123})
         assert expected == result
 

docs/integrations/sources/linkedin-ads.md

@@ -171,7 +171,8 @@ After 5 unsuccessful attempts - the connector will stop the sync operation. In s
 
 | Version | Date       | Pull Request                                             | Subject                                                                                                         |
 |:--------|:-----------|:---------------------------------------------------------|:----------------------------------------------------------------------------------------------------------------|
-| 2.1.0   | 2024-04-30 | [37573](https://github.com/airbytehq/airbyte/pull/37573) | Update API version to `202404`; add cursor-based pagination                                                       |
+| 2.1.1   | 2024-05-07 | [38013](https://github.com/airbytehq/airbyte/pull/38013) | Fix an issue where the `Accounts` stream did not correctly handle provided account IDs                          |
+| 2.1.0   | 2024-04-30 | [37573](https://github.com/airbytehq/airbyte/pull/37573) | Update API version to `202404`; add cursor-based pagination                                                     |
 | 2.0.0   | 2024-04-24 | [37531](https://github.com/airbytehq/airbyte/pull/37531) | Change primary key for Analytics Streams                                                                        |
 | 1.0.1   | 2024-03-28 | [34152](https://github.com/airbytehq/airbyte/pull/34152) | Proceed pagination if return less than expected                                                                 |
 | 1.0.0   | 2024-04-10 | [36927](https://github.com/airbytehq/airbyte/pull/36927) | Update primary key for Analytics Streams                                                                        |