fix: address reviewer comments on api-core

Author: hebaalazzeh

packages/google-api-core/google/api_core/gapic_v1/__init__.py

@@ -13,10 +13,6 @@
 # limitations under the License.
 
 from google.api_core.gapic_v1 import (
-    _client_cert,
-    _config_helpers,
-    _method_helpers,
-    _routing,
     client_info,
     config,
     config_async,
@@ -26,14 +22,10 @@
 )
 
 __all__ = [
-    "_client_cert",
     "client_info",
     "config",
     "config_async",
-    "_config_helpers",
     "method",
     "method_async",
-    "_method_helpers",
-    "_routing",
     "routing_header",
 ]

packages/google-api-core/google/api_core/gapic_v1/_client_cert.py

@@ -59,12 +59,12 @@ def get_client_cert_source(
     """Return the client cert source to be used by the client.
 
     Args:
-        provided_cert_source (bytes): The client certificate source provided.
+        provided_cert_source (Callable[[], Tuple[bytes, bytes]]): The client certificate source provided.
         use_cert_flag (bool): A flag indicating whether to use the
             client certificate.
 
     Returns:
-        bytes or None: The client cert source to be used by the client.
+        Callable[[], Tuple[bytes, bytes]] or None: The client cert source to be used by the client.
     """
     client_cert_source = None
     if use_cert_flag:
@@ -76,9 +76,3 @@ def get_client_cert_source(
         ):
             client_cert_source = mtls.default_client_cert_source()
     return client_cert_source
-
-
-# Backward compatibility aliases for private methods
-# Previously, gapic-generator-python generated clients used these methods
-_use_client_cert_effective = use_client_cert_effective
-_get_client_cert_source = get_client_cert_source

packages/google-api-core/google/api_core/gapic_v1/_config_helpers.py

@@ -39,18 +39,11 @@ def read_environment_variables() -> Tuple[bool, str, Optional[str]]:
             ["auto", "never", "always"].
     """
     use_client_cert = use_client_cert_effective()
-    use_mtls_endpoint = os.getenv(
-        "GOOGLE_API_USE_MTLS_ENDPOINT", "auto"
-    ).lower()  # noqa: E501
+    use_mtls_endpoint = os.getenv("GOOGLE_API_USE_MTLS_ENDPOINT", "auto").lower()
     universe_domain_env = os.getenv("GOOGLE_CLOUD_UNIVERSE_DOMAIN")
     if use_mtls_endpoint not in ("auto", "never", "always"):
         raise MutualTLSChannelError(
             "Environment variable `GOOGLE_API_USE_MTLS_ENDPOINT` "
             "must be `never`, `auto` or `always`"
         )
     return use_client_cert, use_mtls_endpoint, universe_domain_env
-
-
-# Backward compatibility aliases for private methods
-# Previously, gapic-generator-python generated clients used these methods
-_read_environment_variables = read_environment_variables

packages/google-api-core/google/api_core/gapic_v1/_method_helpers.py

@@ -20,9 +20,7 @@
 from typing import Any
 
 
-def setup_request_id(
-    request: Any, field_name: str, is_proto3_optional: bool
-) -> None:  # noqa: E501
+def setup_request_id(request: Any, field_name: str, is_proto3_optional: bool) -> None:
     """Populate a UUID4 field in the request if it is not already set.
 
     Args:
@@ -51,8 +49,3 @@ def setup_request_id(
     else:
         if not getattr(request, field_name):
             setattr(request, field_name, str(uuid.uuid4()))
-
-
-# Backward compatibility aliases for private methods
-# Previously, gapic-generator-python generated clients used these methods
-_setup_request_id = setup_request_id

packages/google-api-core/google/api_core/gapic_v1/_routing.py

@@ -79,9 +79,7 @@ def get_api_endpoint(
             )
         return default_mtls_endpoint
     else:
-        return default_endpoint_template.format(
-            UNIVERSE_DOMAIN=universe_domain
-        )  # noqa: E501
+        return default_endpoint_template.format(UNIVERSE_DOMAIN=universe_domain)
 
 
 def get_universe_domain(
@@ -98,9 +96,3 @@ def get_universe_domain(
     if len(universe_domain.strip()) == 0:
         raise ValueError("Universe Domain cannot be an empty string.")
     return universe_domain
-
-
-# Backward compatibility aliases for private methods
-# Previously, gapic-generator-python generated clients used these methods
-_get_default_mtls_endpoint = get_default_mtls_endpoint
-_get_universe_domain = get_universe_domain

packages/google-api-core/tests/unit/gapic/test_method_helpers.py

@@ -13,12 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import pytest
-
-try:
-    import grpc  # noqa: F401
-except ImportError:
-    pytest.skip("No GRPC", allow_module_level=True)
 
 from google.api_core.gapic_v1._method_helpers import setup_request_id