Skip to content

Commit 25048fa

Browse files
potiukpotiuk
authored
Switch to using vendored-in google ads. (#30410)
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
1 parent 4b95f3a commit 25048fa

579 files changed

Lines changed: 3242 additions & 3215 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎airflow/providers/google/ads/_vendor/googleads/__init__.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
import google.ads.googleads.client
16-
import google.ads.googleads.errors
17-
import google.ads.googleads.util
15+
import airflow.providers.google.ads._vendor.googleads.client
16+
import airflow.providers.google.ads._vendor.googleads.errors
17+
import airflow.providers.google.ads._vendor.googleads.util
1818

1919
VERSION = "20.0.0"

‎airflow/providers/google/ads/_vendor/googleads/client.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import proto
2323
from proto.enums import ProtoEnumMeta
2424

25-
from google.ads.googleads import config, oauth2, util
26-
from google.ads.googleads.interceptors import (
25+
from airflow.providers.google.ads._vendor.googleads import config, oauth2, util
26+
from airflow.providers.google.ads._vendor.googleads.interceptors import (
2727
MetadataInterceptor,
2828
ExceptionInterceptor,
2929
LoggingInterceptor,

‎airflow/providers/google/ads/_vendor/googleads/interceptors/helpers.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
from copy import deepcopy
16-
from google.ads.googleads.util import (
16+
from airflow.providers.google.ads._vendor.googleads.util import (
1717
set_nested_message_field,
1818
get_nested_attr,
1919
convert_proto_plus_to_protobuf,

‎airflow/providers/google/ads/_vendor/googleads/interceptors/interceptor.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
from google.protobuf.message import DecodeError
2727
from grpc import ClientCallDetails, StatusCode, CallCredentials
2828

29-
from google.ads.googleads.errors import GoogleAdsException
29+
from airflow.providers.google.ads._vendor.googleads.errors import GoogleAdsException
3030

3131
_REQUEST_ID_KEY = "request-id"
3232
# Codes that are retried upon by google.api_core.

‎airflow/providers/google/ads/_vendor/googleads/interceptors/logging_interceptor.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
from grpc import UnaryUnaryClientInterceptor, UnaryStreamClientInterceptor
2828

29-
from google.ads.googleads.interceptors import Interceptor, mask_message
29+
from airflow.providers.google.ads._vendor.googleads.interceptors import Interceptor, mask_message
3030
from types import SimpleNamespace
3131

3232

‎airflow/providers/google/ads/_vendor/googleads/interceptors/response_wrappers.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import grpc
1717
import time
1818

19-
from google.ads.googleads import util
19+
from airflow.providers.google.ads._vendor.googleads import util
2020
from types import SimpleNamespace
2121

2222

‎airflow/providers/google/ads/_vendor/googleads/oauth2.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from google.oauth2.credentials import Credentials as InstalledAppCredentials
2222
from google.auth.transport.requests import Request
2323

24-
from google.ads.googleads import config
24+
from airflow.providers.google.ads._vendor.googleads import config
2525

2626
_SERVICE_ACCOUNT_SCOPES = ["https://www.googleapis.com/auth/adwords"]
2727
_DEFAULT_TOKEN_URI = "https://accounts.google.com/o/oauth2/token"

‎airflow/providers/google/ads/_vendor/googleads/v12/__init__.py‎

Lines changed: 1759 additions & 1759 deletions
Large diffs are not rendered by default.

‎airflow/providers/google/ads/_vendor/googleads/v12/common/types/ad_asset.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
#
1616
import proto # type: ignore
1717

18-
from google.ads.googleads.v12.common.types import asset_policy
19-
from google.ads.googleads.v12.enums.types import (
18+
from airflow.providers.google.ads._vendor.googleads.v12.common.types import asset_policy
19+
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import (
2020
asset_performance_label as gage_asset_performance_label,
2121
)
22-
from google.ads.googleads.v12.enums.types import served_asset_field_type
22+
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import served_asset_field_type
2323

2424

2525
__protobuf__ = proto.module(

‎airflow/providers/google/ads/_vendor/googleads/v12/common/types/ad_type_infos.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
#
1616
import proto # type: ignore
1717

18-
from google.ads.googleads.v12.common.types import ad_asset
19-
from google.ads.googleads.v12.enums.types import call_conversion_reporting_state
20-
from google.ads.googleads.v12.enums.types import display_ad_format_setting
21-
from google.ads.googleads.v12.enums.types import (
18+
from airflow.providers.google.ads._vendor.googleads.v12.common.types import ad_asset
19+
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import call_conversion_reporting_state
20+
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import display_ad_format_setting
21+
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import (
2222
display_upload_product_type as gage_display_upload_product_type,
2323
)
24-
from google.ads.googleads.v12.enums.types import legacy_app_install_ad_app_store
25-
from google.ads.googleads.v12.enums.types import mime_type as gage_mime_type
26-
from google.ads.googleads.v12.enums.types import video_thumbnail
24+
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import legacy_app_install_ad_app_store
25+
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import mime_type as gage_mime_type
26+
from airflow.providers.google.ads._vendor.googleads.v12.enums.types import video_thumbnail
2727

2828

2929
__protobuf__ = proto.module(

0 commit comments

Comments
 (0)