Fix config so that login_customer_id=None doesn't raise an error.

Author: BenRKarl

google/ads/googleads/config.py

@@ -21,7 +21,6 @@
 from typing import Any, Callable, List, Tuple, TypeVar, Union
 import yaml
 
-
 _logger = logging.getLogger(__name__)
 
 
@@ -96,7 +95,9 @@ def parser_wrapper(*args: Any, **kwargs: Any) -> Any:
         parsed_config: dict[str, Any] = convert_login_customer_id_to_str(
             config_dict
         )
-        parsed_config: dict[str, Any] = convert_linked_customer_id_to_str(parsed_config)
+        parsed_config: dict[str, Any] = convert_linked_customer_id_to_str(
+            parsed_config
+        )
 
         config_keys: List[str] = parsed_config.keys()
 
@@ -106,7 +107,9 @@ def parser_wrapper(*args: Any, **kwargs: Any) -> Any:
             # that needs to be returned by this method.
             if type(logging_config) is not dict:
                 try:
-                    parsed_config["logging"]: dict[str, Any] = json.loads(logging_config)
+                    parsed_config["logging"]: dict[str, Any] = json.loads(
+                        logging_config
+                    )
                     # The logger is configured here in case deprecation warnings
                     # need to be logged further down in this method. The logger
                     # is otherwise configured by the GoogleAdsClient class.
@@ -159,7 +162,9 @@ def parser_wrapper(*args: Any, **kwargs: Any) -> Any:
             # the string "False" is truthy and can easily be incorrectly
             # converted to the boolean True.
             value: Union[str, bool] = parsed_config.get("use_proto_plus", False)
-            parsed_config["use_proto_plus"]: bool = disambiguate_string_bool(value)
+            parsed_config["use_proto_plus"]: bool = disambiguate_string_bool(
+                value
+            )
 
         if "use_application_default_credentials" in config_keys:
             # When loaded from YAML, YAML string or a dict, this value is
@@ -168,8 +173,12 @@ def parser_wrapper(*args: Any, **kwargs: Any) -> Any:
             # variable we need to manually change it to the bool False because
             # the string "False" is truthy and can easily be incorrectly
             # converted to the boolean True.
-            value: Union[str, bool] = parsed_config.get("use_application_default_credentials", False)
-            parsed_config["use_application_default_credentials"]: bool = disambiguate_string_bool(value)
+            value: Union[str, bool] = parsed_config.get(
+                "use_application_default_credentials", False
+            )
+            parsed_config["use_application_default_credentials"]: bool = (
+                disambiguate_string_bool(value)
+            )
 
         return parsed_config
 
@@ -205,10 +214,16 @@ def validate_dict(config_data: dict[str, Any]) -> None:
             "found. The required fields are: {}".format(str(_REQUIRED_KEYS))
         )
 
-    if "login_customer_id" in config_data:
+    if (
+        "login_customer_id" in config_data
+        and config_data["login_customer_id"] is not None
+    ):
         validate_login_customer_id(str(config_data["login_customer_id"]))
 
-    if "linked_customer_id" in config_data:
+    if (
+        "linked_customer_id" in config_data
+        and config_data["linked_customer_id"] is not None
+    ):
         validate_linked_customer_id(str(config_data["linked_customer_id"]))
 
 
@@ -380,7 +395,7 @@ def get_oauth2_required_service_account_keys() -> tuple[str, ...]:
 
 
 def convert_login_customer_id_to_str(
-    config_data: dict[str, Any]
+    config_data: dict[str, Any],
 ) -> dict[str, Any]:
     """Parses a config dict's login_customer_id attr value to a str.
 
@@ -403,7 +418,7 @@ def convert_login_customer_id_to_str(
 
 
 def convert_linked_customer_id_to_str(
-    config_data: dict[str, Any]
+    config_data: dict[str, Any],
 ) -> dict[str, Any]:
     """Parses a config dict's linked_customer_id attr value to a str.