diff --git a/airbyte-config/init/src/main/resources/config/STANDARD_SOURCE_DEFINITION/253487c0-2246-43ba-a21f-5116b20a2c50.json b/airbyte-config/init/src/main/resources/config/STANDARD_SOURCE_DEFINITION/253487c0-2246-43ba-a21f-5116b20a2c50.json index 35477f0bf384..e834b166cb63 100644 --- a/airbyte-config/init/src/main/resources/config/STANDARD_SOURCE_DEFINITION/253487c0-2246-43ba-a21f-5116b20a2c50.json +++ b/airbyte-config/init/src/main/resources/config/STANDARD_SOURCE_DEFINITION/253487c0-2246-43ba-a21f-5116b20a2c50.json @@ -2,6 +2,6 @@ "sourceDefinitionId": "253487c0-2246-43ba-a21f-5116b20a2c50", "name": "Google Ads", "dockerRepository": "blotout/source-google-ads", - "dockerImageTag": "0.1.43", + "dockerImageTag": "2.9", "documentationUrl": "https://hub.docker.com/r/airbyte/source-google-ads" } diff --git a/airbyte-config/init/src/main/resources/seed/source_definitions.yaml b/airbyte-config/init/src/main/resources/seed/source_definitions.yaml index d7726f055bd9..e41c7b1d929e 100644 --- a/airbyte-config/init/src/main/resources/seed/source_definitions.yaml +++ b/airbyte-config/init/src/main/resources/seed/source_definitions.yaml @@ -191,7 +191,7 @@ - name: Google Ads sourceDefinitionId: 253487c0-2246-43ba-a21f-5116b20a2c50 dockerRepository: blotout/source-google-ads - dockerImageTag: 0.1.43 + dockerImageTag: 2.9 documentationUrl: https://docs.airbyte.io/integrations/sources/google-ads sourceType: api - name: Google Analytics @@ -507,7 +507,7 @@ - name: Shopify sourceDefinitionId: 9da77001-af33-4bcd-be46-6252bf9342b9 dockerRepository: blotout/source-shopify - dockerImageTag: 0.1.28 + dockerImageTag: 0.1.30 documentationUrl: https://docs.airbyte.io/integrations/sources/shopify sourceType: api - name: Short.io diff --git a/airbyte-config/init/src/main/resources/seed/source_specs.yaml b/airbyte-config/init/src/main/resources/seed/source_specs.yaml index af3ad02ed311..1744c8d6615b 100644 --- a/airbyte-config/init/src/main/resources/seed/source_specs.yaml +++ b/airbyte-config/init/src/main/resources/seed/source_specs.yaml @@ -1740,7 +1740,7 @@ supportsNormalization: false supportsDBT: false supported_destination_sync_modes: [] -- dockerImage: "blotout/source-google-ads:0.1.43" +- dockerImage: "blotout/source-google-ads:2.9" spec: documentationUrl: "https://docs.airbyte.com/integrations/sources/google-ads" connectionSpecification: diff --git a/airbyte-integrations/connectors/source-google-ads/Dockerfile b/airbyte-integrations/connectors/source-google-ads/Dockerfile index e38d7306c33f..87df0246a7ea 100644 --- a/airbyte-integrations/connectors/source-google-ads/Dockerfile +++ b/airbyte-integrations/connectors/source-google-ads/Dockerfile @@ -13,5 +13,5 @@ COPY main.py ./ ENTRYPOINT ["python", "/airbyte/integration_code/main.py"] -LABEL io.airbyte.version=0.1.43 -LABEL io.airbyte.name=airbyte/source-google-ads +LABEL io.airbyte.version=2.9 +LABEL io.airbyte.name=blotout/source-google-ads diff --git a/airbyte-integrations/connectors/source-google-ads/setup.py b/airbyte-integrations/connectors/source-google-ads/setup.py index 59237952ce38..3f7b48918b50 100644 --- a/airbyte-integrations/connectors/source-google-ads/setup.py +++ b/airbyte-integrations/connectors/source-google-ads/setup.py @@ -7,7 +7,7 @@ # pin protobuf==3.20.0 as other versions may cause problems on different architectures # (see https://github.com/airbytehq/airbyte/issues/13580) -MAIN_REQUIREMENTS = ["airbyte-cdk~=0.1", "google-ads==17.0.0", "protobuf==3.20.0", "pendulum"] +MAIN_REQUIREMENTS = ["airbyte-cdk~=0.1", "google-ads==20.0.0", "protobuf==4.21.5", "pendulum"] TEST_REQUIREMENTS = ["pytest~=6.1", "pytest-mock", "freezegun", "requests-mock"] diff --git a/airbyte-integrations/connectors/source-google-ads/source_google_ads/google_ads.py b/airbyte-integrations/connectors/source-google-ads/source_google_ads/google_ads.py index 74417089069b..8cbfc8ba811f 100644 --- a/airbyte-integrations/connectors/source-google-ads/source_google_ads/google_ads.py +++ b/airbyte-integrations/connectors/source-google-ads/source_google_ads/google_ads.py @@ -8,7 +8,7 @@ import pendulum from google.ads.googleads.client import GoogleAdsClient -from google.ads.googleads.v11.services.types.google_ads_service import GoogleAdsRow, SearchGoogleAdsResponse +from google.ads.googleads.v13.services.types.google_ads_service import GoogleAdsRow, SearchGoogleAdsResponse from proto.marshal.collections import Repeated, RepeatedComposite REPORT_MAPPING = { @@ -30,7 +30,7 @@ "geographic_report": "geographic_view", "keyword_report": "keyword_view", } -API_VERSION = "v11" +API_VERSION = "v13" class GoogleAds: diff --git a/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/ad_group_ad_report.json b/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/ad_group_ad_report.json index 6ab5d2c66eae..65b8218331aa 100644 --- a/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/ad_group_ad_report.json +++ b/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/ad_group_ad_report.json @@ -222,15 +222,6 @@ "ad_group_ad.ad.legacy_responsive_display_ad.format_setting": { "type": ["null", "string"] }, - "ad_group_ad.ad.gmail_ad.header_image": { - "type": ["null", "string"] - }, - "ad_group_ad.ad.gmail_ad.teaser.logo_image": { - "type": ["null", "string"] - }, - "ad_group_ad.ad.gmail_ad.marketing_image": { - "type": ["null", "string"] - }, "metrics.gmail_forwards": { "type": ["null", "integer"] }, @@ -240,15 +231,6 @@ "metrics.gmail_secondary_clicks": { "type": ["null", "integer"] }, - "ad_group_ad.ad.gmail_ad.teaser.business_name": { - "type": ["null", "string"] - }, - "ad_group_ad.ad.gmail_ad.teaser.description": { - "type": ["null", "string"] - }, - "ad_group_ad.ad.gmail_ad.teaser.headline": { - "type": ["null", "string"] - }, "ad_group_ad.ad.text_ad.headline": { "type": ["null", "string"] }, @@ -294,18 +276,6 @@ "ad_group_ad.ad.legacy_responsive_display_ad.main_color": { "type": ["null", "string"] }, - "ad_group_ad.ad.gmail_ad.marketing_image_display_call_to_action.text": { - "type": ["null", "string"] - }, - "ad_group_ad.ad.gmail_ad.marketing_image_display_call_to_action.text_color": { - "type": ["null", "string"] - }, - "ad_group_ad.ad.gmail_ad.marketing_image_headline": { - "type": ["null", "string"] - }, - "ad_group_ad.ad.gmail_ad.marketing_image_description": { - "type": ["null", "string"] - }, "segments.month": { "type": ["null", "string"] }, diff --git a/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/ad_group_ads.json b/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/ad_group_ads.json index a06960e32e3d..58b73e318ec8 100644 --- a/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/ad_group_ads.json +++ b/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/ad_group_ads.json @@ -164,51 +164,6 @@ "type": "string" } }, - "ad_group_ad.ad.gmail_ad.header_image": { - "type": ["null", "string"] - }, - "ad_group_ad.ad.gmail_ad.marketing_image": { - "type": ["null", "string"] - }, - "ad_group_ad.ad.gmail_ad.marketing_image_description": { - "type": ["null", "string"] - }, - "ad_group_ad.ad.gmail_ad.marketing_image_display_call_to_action.text": { - "type": ["null", "string"] - }, - "ad_group_ad.ad.gmail_ad.marketing_image_display_call_to_action.text_color": { - "type": ["null", "string"] - }, - "ad_group_ad.ad.gmail_ad.marketing_image_display_call_to_action.url_collection_id": { - "type": ["null", "string"] - }, - "ad_group_ad.ad.gmail_ad.marketing_image_headline": { - "type": ["null", "string"] - }, - "ad_group_ad.ad.gmail_ad.product_images": { - "type": ["null", "array"], - "items": { - "type": "string" - } - }, - "ad_group_ad.ad.gmail_ad.product_videos": { - "type": ["null", "array"], - "items": { - "type": "string" - } - }, - "ad_group_ad.ad.gmail_ad.teaser.business_name": { - "type": ["null", "string"] - }, - "ad_group_ad.ad.gmail_ad.teaser.description": { - "type": ["null", "string"] - }, - "ad_group_ad.ad.gmail_ad.teaser.headline": { - "type": ["null", "string"] - }, - "ad_group_ad.ad.gmail_ad.teaser.logo_image": { - "type": ["null", "string"] - }, "ad_group_ad.ad.hotel_ad": { "type": ["null", "string"] }, diff --git a/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/campaigns.json b/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/campaigns.json index 329bf21a1ec1..accc1e8fbab3 100644 --- a/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/campaigns.json +++ b/airbyte-integrations/connectors/source-google-ads/source_google_ads/schemas/campaigns.json @@ -188,9 +188,6 @@ "campaign.target_cpa.target_cpa_micros": { "type": ["null", "integer"] }, - "campaign.target_cpm": { - "type": ["null", "string"] - }, "campaign.target_impression_share.cpc_bid_ceiling_micros": { "type": ["null", "integer"] },