🐛 Source Google Ads: End date should not be in the future (#11513)

Author: edgao

airbyte-config/init/src/main/resources/seed/source_definitions.yaml

@@ -266,7 +266,7 @@
 - name: Google Ads
   sourceDefinitionId: 253487c0-2246-43ba-a21f-5116b20a2c50
   dockerRepository: airbyte/source-google-ads
-  dockerImageTag: 0.1.32
+  dockerImageTag: 0.1.33
   documentationUrl: https://docs.airbyte.io/integrations/sources/google-ads
   icon: google-adwords.svg
   sourceType: api

airbyte-config/init/src/main/resources/seed/source_specs.yaml

@@ -2570,7 +2570,7 @@
     supportsNormalization: false
     supportsDBT: false
     supported_destination_sync_modes: []
-- dockerImage: "airbyte/source-google-ads:0.1.32"
+- dockerImage: "airbyte/source-google-ads:0.1.33"
   spec:
     documentationUrl: "https://docs.airbyte.com/integrations/sources/google-ads"
     connectionSpecification:

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

@@ -13,5 +13,5 @@ RUN pip install .
 
 ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
 
-LABEL io.airbyte.version=0.1.32
+LABEL io.airbyte.version=0.1.33
 LABEL io.airbyte.name=airbyte/source-google-ads

airbyte-integrations/connectors/source-google-ads/source_google_ads/source.py

@@ -11,7 +11,7 @@
 from airbyte_cdk.sources import AbstractSource
 from airbyte_cdk.sources.streams import Stream
 from google.ads.googleads.errors import GoogleAdsException
-from pendulum import timezone
+from pendulum import parse, timezone, today
 from pendulum.tz.timezone import Timezone
 
 from .custom_query_stream import CustomQuery
@@ -51,12 +51,16 @@ def get_credentials(config: Mapping[str, Any]) -> Mapping[str, Any]:
 
     @staticmethod
     def get_incremental_stream_config(google_api: GoogleAds, config: Mapping[str, Any], tz: Union[timezone, str] = "local"):
+        true_end_date = None
+        configured_end_date = config.get("end_date")
+        if configured_end_date is not None:
+            true_end_date = min(today(), parse(configured_end_date)).to_date_string()
         incremental_stream_config = dict(
             api=google_api,
             conversion_window_days=config["conversion_window_days"],
             start_date=config["start_date"],
             time_zone=tz,
-            end_date=config.get("end_date"),
+            end_date=true_end_date,
         )
         return incremental_stream_config
 

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

@@ -5,6 +5,7 @@
 import pytest
 from airbyte_cdk import AirbyteLogger
 from freezegun import freeze_time
+from pendulum import today
 from source_google_ads.custom_query_stream import CustomQuery
 from source_google_ads.google_ads import GoogleAds
 from source_google_ads.source import SourceGoogleAds
@@ -438,3 +439,11 @@ def test_check_connection_should_fail_when_api_call_fails(mocker):
     )
     assert not check_successful
     assert message.startswith("Unable to connect to Google Ads API with the provided credentials")
+
+
+def test_end_date_is_not_in_the_future():
+    source = SourceGoogleAds()
+    config = source.get_incremental_stream_config(
+        None, {"end_date": today().add(days=1).to_date_string(), "conversion_window_days": 14, "start_date": "2020-01-23"}
+    )
+    assert config.get("end_date") == today().to_date_string()

docs/integrations/sources/google-ads.md

@@ -106,6 +106,7 @@ This source is constrained by whatever API limits are set for the Google Ads tha
 
 | Version  | Date       | Pull Request | Subject                                                                                      |
 |:---------|:-----------| :--- |:---------------------------------------------------------------------------------------------|
+| `0.1.33` | 2022-03-29 | [11513](https://github.com/airbytehq/airbyte/pull/11513) | When `end_date` is configured in the future, use today's date instead.                       |
 | `0.1.32` | 2022-03-24 | [11371](https://github.com/airbytehq/airbyte/pull/11371) | Improve how connection check returns error messages                                          |
 | `0.1.31` | 2022-03-23 | [11301](https://github.com/airbytehq/airbyte/pull/11301) | Update docs and spec to clarify usage                                                        |
 | `0.1.30` | 2022-03-23 | [11221](https://github.com/airbytehq/airbyte/pull/11221) | Add `*_labels` streams to fetch the label text rather than their IDs                         |