Skip to content

Commit

Permalink
Switch to using vendored-in google ads. (#30410)
Browse files Browse the repository at this point in the history 
We are temporarily switching to vendored-in google ads library
in order to handle the clash of two issues:

* Google ads switching off Google Ads v11 API
* Google provider clinging on to old version of google-ads client
  due to protobuf <4 requirement from other google clients

Strategic solution being worked out in #30067
  • Loading branch information
@potiuk
potiuk committed Apr 1, 2023
1 parent 4b95f3a commit 25048fa
Show file tree
Hide file tree
Showing 579 changed files with 3,242 additions and 3,215 deletions.
6 changes: 3 additions & 3 deletions airflow/providers/google/ads/_vendor/googleads/__init__.py
View file
Expand Up @@ -12,8 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import google.ads.googleads.client
import google.ads.googleads.errors
import google.ads.googleads.util
import airflow.providers.google.ads._vendor.googleads.client
import airflow.providers.google.ads._vendor.googleads.errors
import airflow.providers.google.ads._vendor.googleads.util

VERSION = "20.0.0"
4 changes: 2 additions & 2 deletions airflow/providers/google/ads/_vendor/googleads/client.py
View file
Expand Up @@ -22,8 +22,8 @@
import proto
from proto.enums import ProtoEnumMeta

from google.ads.googleads import config, oauth2, util
from google.ads.googleads.interceptors import (
from airflow.providers.google.ads._vendor.googleads import config, oauth2, util
from airflow.providers.google.ads._vendor.googleads.interceptors import (
MetadataInterceptor,
ExceptionInterceptor,
LoggingInterceptor,
Expand Down
2 changes: 1 addition & 1 deletion airflow/providers/google/ads/_vendor/googleads/interceptors/helpers.py
View file
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

from copy import deepcopy
from google.ads.googleads.util import (
from airflow.providers.google.ads._vendor.googleads.util import (
set_nested_message_field,
get_nested_attr,
convert_proto_plus_to_protobuf,
Expand Down
2 changes: 1 addition & 1 deletion airflow/providers/google/ads/_vendor/googleads/interceptors/interceptor.py
View file
Expand Up @@ -26,7 +26,7 @@
from google.protobuf.message import DecodeError
from grpc import ClientCallDetails, StatusCode, CallCredentials

from google.ads.googleads.errors import GoogleAdsException
from airflow.providers.google.ads._vendor.googleads.errors import GoogleAdsException

_REQUEST_ID_KEY = "request-id"
# Codes that are retried upon by google.api_core.
Expand Down
2 changes: 1 addition & 1 deletion airflow/providers/google/ads/_vendor/googleads/interceptors/logging_interceptor.py
View file
Expand Up @@ -26,7 +26,7 @@

from grpc import UnaryUnaryClientInterceptor, UnaryStreamClientInterceptor

from google.ads.googleads.interceptors import Interceptor, mask_message
from airflow.providers.google.ads._vendor.googleads.interceptors import Interceptor, mask_message
from types import SimpleNamespace


Expand Down
2 changes: 1 addition & 1 deletion airflow/providers/google/ads/_vendor/googleads/interceptors/response_wrappers.py
View file
Expand Up @@ -16,7 +16,7 @@
import grpc
import time

from google.ads.googleads import util
from airflow.providers.google.ads._vendor.googleads import util
from types import SimpleNamespace


Expand Down
2 changes: 1 addition & 1 deletion airflow/providers/google/ads/_vendor/googleads/oauth2.py
View file
Expand Up @@ -21,7 +21,7 @@
from google.oauth2.credentials import Credentials as InstalledAppCredentials
from google.auth.transport.requests import Request

from google.ads.googleads import config
from airflow.providers.google.ads._vendor.googleads import config

_SERVICE_ACCOUNT_SCOPES = ["https://www.googleapis.com/auth/adwords"]
_DEFAULT_TOKEN_URI = "https://accounts.google.com/o/oauth2/token"
Expand Down
3,518 changes: 1,759 additions & 1,759 deletions airflow/providers/google/ads/_vendor/googleads/v12/__init__.py
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions airflow/providers/google/ads/_vendor/googleads/v12/common/types/ad_asset.py
View file
Expand Up @@ -15,11 +15,11 @@
#
import proto # type: ignore

from google.ads.googleads.v12.common.types import asset_policy
from google.ads.googleads.v12.enums.types import (
from airflow.providers.google.ads._vendor.googleads.v12.common.types import asset_policy
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import (
asset_performance_label as gage_asset_performance_label,
)
from google.ads.googleads.v12.enums.types import served_asset_field_type
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import served_asset_field_type


__protobuf__ = proto.module(
Expand Down
14 changes: 7 additions & 7 deletions airflow/providers/google/ads/_vendor/googleads/v12/common/types/ad_type_infos.py
View file
Expand Up @@ -15,15 +15,15 @@
#
import proto # type: ignore

from google.ads.googleads.v12.common.types import ad_asset
from google.ads.googleads.v12.enums.types import call_conversion_reporting_state
from google.ads.googleads.v12.enums.types import display_ad_format_setting
from google.ads.googleads.v12.enums.types import (
from airflow.providers.google.ads._vendor.googleads.v12.common.types import ad_asset
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import call_conversion_reporting_state
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import display_ad_format_setting
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import (
display_upload_product_type as gage_display_upload_product_type,
)
from google.ads.googleads.v12.enums.types import legacy_app_install_ad_app_store
from google.ads.googleads.v12.enums.types import mime_type as gage_mime_type
from google.ads.googleads.v12.enums.types import video_thumbnail
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import legacy_app_install_ad_app_store
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import mime_type as gage_mime_type
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import video_thumbnail


__protobuf__ = proto.module(
Expand Down
6 changes: 3 additions & 3 deletions airflow/providers/google/ads/_vendor/googleads/v12/common/types/asset_policy.py
View file
Expand Up @@ -15,9 +15,9 @@
#
import proto # type: ignore

from google.ads.googleads.v12.common.types import policy
from google.ads.googleads.v12.enums.types import policy_approval_status
from google.ads.googleads.v12.enums.types import policy_review_status
from airflow.providers.google.ads._vendor.googleads.v12.common.types import policy
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import policy_approval_status
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import policy_review_status


__protobuf__ = proto.module(
Expand Down
6 changes: 3 additions & 3 deletions airflow/providers/google/ads/_vendor/googleads/v12/common/types/asset_set_types.py
View file
Expand Up @@ -15,11 +15,11 @@
#
import proto # type: ignore

from google.ads.googleads.v12.enums.types import chain_relationship_type
from google.ads.googleads.v12.enums.types import (
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import chain_relationship_type
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import (
location_ownership_type as gage_location_ownership_type,
)
from google.ads.googleads.v12.enums.types import location_string_filter_type
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import location_string_filter_type


__protobuf__ = proto.module(
Expand Down
32 changes: 16 additions & 16 deletions airflow/providers/google/ads/_vendor/googleads/v12/common/types/asset_types.py
View file
Expand Up @@ -15,32 +15,32 @@
#
import proto # type: ignore

from google.ads.googleads.v12.common.types import criteria
from google.ads.googleads.v12.common.types import feed_common
from google.ads.googleads.v12.enums.types import (
from airflow.providers.google.ads._vendor.googleads.v12.common.types import criteria
from airflow.providers.google.ads._vendor.googleads.v12.common.types import feed_common
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import (
call_conversion_reporting_state as gage_call_conversion_reporting_state,
)
from google.ads.googleads.v12.enums.types import (
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import (
call_to_action_type as gage_call_to_action_type,
)
from google.ads.googleads.v12.enums.types import lead_form_call_to_action_type
from google.ads.googleads.v12.enums.types import lead_form_desired_intent
from google.ads.googleads.v12.enums.types import lead_form_field_user_input_type
from google.ads.googleads.v12.enums.types import (
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import lead_form_call_to_action_type
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import lead_form_desired_intent
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import lead_form_field_user_input_type
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import (
lead_form_post_submit_call_to_action_type,
)
from google.ads.googleads.v12.enums.types import (
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import (
location_ownership_type as gage_location_ownership_type,
)
from google.ads.googleads.v12.enums.types import mime_type as gage_mime_type
from google.ads.googleads.v12.enums.types import mobile_app_vendor
from google.ads.googleads.v12.enums.types import price_extension_price_qualifier
from google.ads.googleads.v12.enums.types import price_extension_price_unit
from google.ads.googleads.v12.enums.types import price_extension_type
from google.ads.googleads.v12.enums.types import (
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import mime_type as gage_mime_type
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import mobile_app_vendor
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import price_extension_price_qualifier
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import price_extension_price_unit
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import price_extension_type
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import (
promotion_extension_discount_modifier,
)
from google.ads.googleads.v12.enums.types import promotion_extension_occasion
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import promotion_extension_occasion


__protobuf__ = proto.module(
Expand Down
2 changes: 1 addition & 1 deletion airflow/providers/google/ads/_vendor/googleads/v12/common/types/asset_usage.py
View file
Expand Up @@ -15,7 +15,7 @@
#
import proto # type: ignore

from google.ads.googleads.v12.enums.types import (
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import (
served_asset_field_type as gage_served_asset_field_type,
)

Expand Down
6 changes: 3 additions & 3 deletions airflow/providers/google/ads/_vendor/googleads/v12/common/types/audiences.py
View file
Expand Up @@ -15,9 +15,9 @@
#
import proto # type: ignore

from google.ads.googleads.v12.enums.types import gender_type
from google.ads.googleads.v12.enums.types import income_range_type
from google.ads.googleads.v12.enums.types import parental_status_type
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import gender_type
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import income_range_type
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import parental_status_type


__protobuf__ = proto.module(
Expand Down
2 changes: 1 addition & 1 deletion airflow/providers/google/ads/_vendor/googleads/v12/common/types/bidding.py
View file
Expand Up @@ -15,7 +15,7 @@
#
import proto # type: ignore

from google.ads.googleads.v12.enums.types import (
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import (
target_impression_share_location,
)

Expand Down
48 changes: 24 additions & 24 deletions airflow/providers/google/ads/_vendor/googleads/v12/common/types/criteria.py
View file
Expand Up @@ -15,36 +15,36 @@
#
import proto # type: ignore

from google.ads.googleads.v12.enums.types import age_range_type
from google.ads.googleads.v12.enums.types import app_payment_model_type
from google.ads.googleads.v12.enums.types import content_label_type
from google.ads.googleads.v12.enums.types import day_of_week as gage_day_of_week
from google.ads.googleads.v12.enums.types import device
from google.ads.googleads.v12.enums.types import gender_type
from google.ads.googleads.v12.enums.types import hotel_date_selection_type
from google.ads.googleads.v12.enums.types import income_range_type
from google.ads.googleads.v12.enums.types import interaction_type
from google.ads.googleads.v12.enums.types import keyword_match_type
from google.ads.googleads.v12.enums.types import listing_group_type
from google.ads.googleads.v12.enums.types import location_group_radius_units
from google.ads.googleads.v12.enums.types import minute_of_hour
from google.ads.googleads.v12.enums.types import parental_status_type
from google.ads.googleads.v12.enums.types import preferred_content_type
from google.ads.googleads.v12.enums.types import product_bidding_category_level
from google.ads.googleads.v12.enums.types import (
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import age_range_type
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import app_payment_model_type
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import content_label_type
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import day_of_week as gage_day_of_week
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import device
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import gender_type
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import hotel_date_selection_type
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import income_range_type
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import interaction_type
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import keyword_match_type
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import listing_group_type
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import location_group_radius_units
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import minute_of_hour
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import parental_status_type
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import preferred_content_type
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import product_bidding_category_level
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import (
product_channel as gage_product_channel,
)
from google.ads.googleads.v12.enums.types import (
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import (
product_channel_exclusivity as gage_product_channel_exclusivity,
)
from google.ads.googleads.v12.enums.types import (
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import (
product_condition as gage_product_condition,
)
from google.ads.googleads.v12.enums.types import product_custom_attribute_index
from google.ads.googleads.v12.enums.types import product_type_level
from google.ads.googleads.v12.enums.types import proximity_radius_units
from google.ads.googleads.v12.enums.types import webpage_condition_operand
from google.ads.googleads.v12.enums.types import webpage_condition_operator
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import product_custom_attribute_index
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import product_type_level
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import proximity_radius_units
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import webpage_condition_operand
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import webpage_condition_operator


__protobuf__ = proto.module(
Expand Down
8 changes: 4 additions & 4 deletions ...roviders/google/ads/_vendor/googleads/v12/common/types/criterion_category_availability.py
View file
Expand Up @@ -15,16 +15,16 @@
#
import proto # type: ignore

from google.ads.googleads.v12.enums.types import (
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import (
advertising_channel_sub_type as gage_advertising_channel_sub_type,
)
from google.ads.googleads.v12.enums.types import (
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import (
advertising_channel_type as gage_advertising_channel_type,
)
from google.ads.googleads.v12.enums.types import (
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import (
criterion_category_channel_availability_mode,
)
from google.ads.googleads.v12.enums.types import (
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import (
criterion_category_locale_availability_mode,
)

Expand Down
2 changes: 1 addition & 1 deletion airflow/providers/google/ads/_vendor/googleads/v12/common/types/customizer_value.py
View file
Expand Up @@ -15,7 +15,7 @@
#
import proto # type: ignore

from google.ads.googleads.v12.enums.types import customizer_attribute_type
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import customizer_attribute_type


__protobuf__ = proto.module(
Expand Down
2 changes: 1 addition & 1 deletion airflow/providers/google/ads/_vendor/googleads/v12/common/types/dates.py
View file
Expand Up @@ -15,7 +15,7 @@
#
import proto # type: ignore

from google.ads.googleads.v12.enums.types import month_of_year
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import month_of_year


__protobuf__ = proto.module(
Expand Down
18 changes: 9 additions & 9 deletions airflow/providers/google/ads/_vendor/googleads/v12/common/types/extensions.py
View file
Expand Up @@ -15,19 +15,19 @@
#
import proto # type: ignore

from google.ads.googleads.v12.common.types import custom_parameter
from google.ads.googleads.v12.common.types import feed_common
from google.ads.googleads.v12.enums.types import app_store as gage_app_store
from google.ads.googleads.v12.enums.types import (
from airflow.providers.google.ads._vendor.googleads.v12.common.types import custom_parameter
from airflow.providers.google.ads._vendor.googleads.v12.common.types import feed_common
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import app_store as gage_app_store
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import (
call_conversion_reporting_state as gage_call_conversion_reporting_state,
)
from google.ads.googleads.v12.enums.types import price_extension_price_qualifier
from google.ads.googleads.v12.enums.types import price_extension_price_unit
from google.ads.googleads.v12.enums.types import price_extension_type
from google.ads.googleads.v12.enums.types import (
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import price_extension_price_qualifier
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import price_extension_price_unit
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import price_extension_type
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import (
promotion_extension_discount_modifier,
)
from google.ads.googleads.v12.enums.types import promotion_extension_occasion
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import promotion_extension_occasion


__protobuf__ = proto.module(
Expand Down
2 changes: 1 addition & 1 deletion ...roviders/google/ads/_vendor/googleads/v12/common/types/feed_item_set_filter_type_infos.py
View file
Expand Up @@ -15,7 +15,7 @@
#
import proto # type: ignore

from google.ads.googleads.v12.enums.types import (
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import (
feed_item_set_string_filter_type,
)

Expand Down
2 changes: 1 addition & 1 deletion airflow/providers/google/ads/_vendor/googleads/v12/common/types/final_app_url.py
View file
Expand Up @@ -15,7 +15,7 @@
#
import proto # type: ignore

from google.ads.googleads.v12.enums.types import app_url_operating_system_type
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import app_url_operating_system_type


__protobuf__ = proto.module(
Expand Down
6 changes: 3 additions & 3 deletions airflow/providers/google/ads/_vendor/googleads/v12/common/types/frequency_cap.py
View file
Expand Up @@ -15,9 +15,9 @@
#
import proto # type: ignore

from google.ads.googleads.v12.enums.types import frequency_cap_event_type
from google.ads.googleads.v12.enums.types import frequency_cap_level
from google.ads.googleads.v12.enums.types import frequency_cap_time_unit
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import frequency_cap_event_type
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import frequency_cap_level
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import frequency_cap_time_unit


__protobuf__ = proto.module(
Expand Down
12 changes: 6 additions & 6 deletions airflow/providers/google/ads/_vendor/googleads/v12/common/types/keyword_plan_common.py
View file
Expand Up @@ -15,14 +15,14 @@
#
import proto # type: ignore

from google.ads.googleads.v12.common.types import dates
from google.ads.googleads.v12.enums.types import device as gage_device
from google.ads.googleads.v12.enums.types import (
from airflow.providers.google.ads._vendor.googleads.v12.common.types import dates
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import device as gage_device
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import (
keyword_plan_aggregate_metric_type,
)
from google.ads.googleads.v12.enums.types import keyword_plan_competition_level
from google.ads.googleads.v12.enums.types import keyword_plan_concept_group_type
from google.ads.googleads.v12.enums.types import month_of_year
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import keyword_plan_competition_level
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import keyword_plan_concept_group_type
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import month_of_year


__protobuf__ = proto.module(
Expand Down

0 comments on commit 25048fa

Please sign in to comment.