fix(templates): fix setup_request_id import module name and add pragma NO COVER to _compat fallbacks

Author: hebaalazzeh

packages/gapic-generator/gapic/templates/%namespace/%name_%version/%sub/_compat.py.j2

@@ -19,7 +19,7 @@ try:
         get_api_endpoint,
         get_universe_domain,
     )
-except ImportError:
+except ImportError:  # pragma: NO COVER
     # TODO(https://github.com/googleapis/google-cloud-python/issues/17813): Universe domain support was introduced in google-api-core 2.18.0.
     # Remove these fallback definitions when google-api-core >= 2.18.0 becomes the minimum required version in generated client setup dependencies.
     def get_default_mtls_endpoint(api_endpoint: Optional[str]) -> Optional[str]:
@@ -91,7 +91,7 @@ try:
         get_client_cert_source,
         read_environment_variables,
     )
-except ImportError:
+except ImportError:  # pragma: NO COVER
     from google.auth.transport import mtls  # type: ignore
 
     # TODO(https://github.com/googleapis/google-cloud-python/issues/17813): Remove these fallbacks when google-api-core >= 2.18.0 is the minimum required version.
@@ -143,8 +143,8 @@ except ImportError:
 
 
 try:
-    from google.api_core.gapic_v1.requests import setup_request_id  # type: ignore
-except ImportError:
+    from google.api_core.gapic_v1.request import setup_request_id  # type: ignore
+except ImportError:  # pragma: NO COVER
     # TODO(https://github.com/googleapis/google-cloud-python/issues/17813): Request ID setup helper was introduced in google-api-core 2.26.0.
     # Remove this fallback definition when google-api-core >= 2.26.0 becomes the minimum required version in generated client setup dependencies.
     def setup_request_id(request, field_name: str, is_proto3_optional: bool):

packages/gapic-generator/tests/integration/goldens/asset/google/cloud/asset_v1/_compat.py

@@ -32,7 +32,7 @@
         get_api_endpoint,
         get_universe_domain,
     )
-except ImportError:
+except ImportError:  # pragma: NO COVER
     # TODO(https://github.com/googleapis/google-cloud-python/issues/17813): Universe domain support was introduced in google-api-core 2.18.0.
     # Remove these fallback definitions when google-api-core >= 2.18.0 becomes the minimum required version in generated client setup dependencies.
     def get_default_mtls_endpoint(api_endpoint: Optional[str]) -> Optional[str]:
@@ -104,7 +104,7 @@ def get_universe_domain(
         get_client_cert_source,
         read_environment_variables,
     )
-except ImportError:
+except ImportError:  # pragma: NO COVER
     from google.auth.transport import mtls  # type: ignore
 
     # TODO(https://github.com/googleapis/google-cloud-python/issues/17813): Remove these fallbacks when google-api-core >= 2.18.0 is the minimum required version.
@@ -156,8 +156,8 @@ def read_environment_variables() -> Tuple[bool, str, Optional[str]]:
 
 
 try:
-    from google.api_core.gapic_v1.requests import setup_request_id  # type: ignore
-except ImportError:
+    from google.api_core.gapic_v1.request import setup_request_id  # type: ignore
+except ImportError:  # pragma: NO COVER
     # TODO(https://github.com/googleapis/google-cloud-python/issues/17813): Request ID setup helper was introduced in google-api-core 2.26.0.
     # Remove this fallback definition when google-api-core >= 2.26.0 becomes the minimum required version in generated client setup dependencies.
     def setup_request_id(request, field_name: str, is_proto3_optional: bool):

packages/gapic-generator/tests/integration/goldens/credentials/google/iam/credentials_v1/_compat.py

@@ -32,7 +32,7 @@
         get_api_endpoint,
         get_universe_domain,
     )
-except ImportError:
+except ImportError:  # pragma: NO COVER
     # TODO(https://github.com/googleapis/google-cloud-python/issues/17813): Universe domain support was introduced in google-api-core 2.18.0.
     # Remove these fallback definitions when google-api-core >= 2.18.0 becomes the minimum required version in generated client setup dependencies.
     def get_default_mtls_endpoint(api_endpoint: Optional[str]) -> Optional[str]:
@@ -104,7 +104,7 @@ def get_universe_domain(
         get_client_cert_source,
         read_environment_variables,
     )
-except ImportError:
+except ImportError:  # pragma: NO COVER
     from google.auth.transport import mtls  # type: ignore
 
     # TODO(https://github.com/googleapis/google-cloud-python/issues/17813): Remove these fallbacks when google-api-core >= 2.18.0 is the minimum required version.
@@ -156,8 +156,8 @@ def read_environment_variables() -> Tuple[bool, str, Optional[str]]:
 
 
 try:
-    from google.api_core.gapic_v1.requests import setup_request_id  # type: ignore
-except ImportError:
+    from google.api_core.gapic_v1.request import setup_request_id  # type: ignore
+except ImportError:  # pragma: NO COVER
     # TODO(https://github.com/googleapis/google-cloud-python/issues/17813): Request ID setup helper was introduced in google-api-core 2.26.0.
     # Remove this fallback definition when google-api-core >= 2.26.0 becomes the minimum required version in generated client setup dependencies.
     def setup_request_id(request, field_name: str, is_proto3_optional: bool):

packages/gapic-generator/tests/integration/goldens/eventarc/google/cloud/eventarc_v1/_compat.py

@@ -32,7 +32,7 @@
         get_api_endpoint,
         get_universe_domain,
     )
-except ImportError:
+except ImportError:  # pragma: NO COVER
     # TODO(https://github.com/googleapis/google-cloud-python/issues/17813): Universe domain support was introduced in google-api-core 2.18.0.
     # Remove these fallback definitions when google-api-core >= 2.18.0 becomes the minimum required version in generated client setup dependencies.
     def get_default_mtls_endpoint(api_endpoint: Optional[str]) -> Optional[str]:
@@ -104,7 +104,7 @@ def get_universe_domain(
         get_client_cert_source,
         read_environment_variables,
     )
-except ImportError:
+except ImportError:  # pragma: NO COVER
     from google.auth.transport import mtls  # type: ignore
 
     # TODO(https://github.com/googleapis/google-cloud-python/issues/17813): Remove these fallbacks when google-api-core >= 2.18.0 is the minimum required version.
@@ -156,8 +156,8 @@ def read_environment_variables() -> Tuple[bool, str, Optional[str]]:
 
 
 try:
-    from google.api_core.gapic_v1.requests import setup_request_id  # type: ignore
-except ImportError:
+    from google.api_core.gapic_v1.request import setup_request_id  # type: ignore
+except ImportError:  # pragma: NO COVER
     # TODO(https://github.com/googleapis/google-cloud-python/issues/17813): Request ID setup helper was introduced in google-api-core 2.26.0.
     # Remove this fallback definition when google-api-core >= 2.26.0 becomes the minimum required version in generated client setup dependencies.
     def setup_request_id(request, field_name: str, is_proto3_optional: bool):

packages/gapic-generator/tests/integration/goldens/logging/google/cloud/logging_v2/_compat.py

@@ -32,7 +32,7 @@
         get_api_endpoint,
         get_universe_domain,
     )
-except ImportError:
+except ImportError:  # pragma: NO COVER
     # TODO(https://github.com/googleapis/google-cloud-python/issues/17813): Universe domain support was introduced in google-api-core 2.18.0.
     # Remove these fallback definitions when google-api-core >= 2.18.0 becomes the minimum required version in generated client setup dependencies.
     def get_default_mtls_endpoint(api_endpoint: Optional[str]) -> Optional[str]:
@@ -104,7 +104,7 @@ def get_universe_domain(
         get_client_cert_source,
         read_environment_variables,
     )
-except ImportError:
+except ImportError:  # pragma: NO COVER
     from google.auth.transport import mtls  # type: ignore
 
     # TODO(https://github.com/googleapis/google-cloud-python/issues/17813): Remove these fallbacks when google-api-core >= 2.18.0 is the minimum required version.
@@ -156,8 +156,8 @@ def read_environment_variables() -> Tuple[bool, str, Optional[str]]:
 
 
 try:
-    from google.api_core.gapic_v1.requests import setup_request_id  # type: ignore
-except ImportError:
+    from google.api_core.gapic_v1.request import setup_request_id  # type: ignore
+except ImportError:  # pragma: NO COVER
     # TODO(https://github.com/googleapis/google-cloud-python/issues/17813): Request ID setup helper was introduced in google-api-core 2.26.0.
     # Remove this fallback definition when google-api-core >= 2.26.0 becomes the minimum required version in generated client setup dependencies.
     def setup_request_id(request, field_name: str, is_proto3_optional: bool):

packages/gapic-generator/tests/integration/goldens/logging_internal/google/cloud/logging_v2/_compat.py

@@ -32,7 +32,7 @@
         get_api_endpoint,
         get_universe_domain,
     )
-except ImportError:
+except ImportError:  # pragma: NO COVER
     # TODO(https://github.com/googleapis/google-cloud-python/issues/17813): Universe domain support was introduced in google-api-core 2.18.0.
     # Remove these fallback definitions when google-api-core >= 2.18.0 becomes the minimum required version in generated client setup dependencies.
     def get_default_mtls_endpoint(api_endpoint: Optional[str]) -> Optional[str]:
@@ -104,7 +104,7 @@ def get_universe_domain(
         get_client_cert_source,
         read_environment_variables,
     )
-except ImportError:
+except ImportError:  # pragma: NO COVER
     from google.auth.transport import mtls  # type: ignore
 
     # TODO(https://github.com/googleapis/google-cloud-python/issues/17813): Remove these fallbacks when google-api-core >= 2.18.0 is the minimum required version.
@@ -156,8 +156,8 @@ def read_environment_variables() -> Tuple[bool, str, Optional[str]]:
 
 
 try:
-    from google.api_core.gapic_v1.requests import setup_request_id  # type: ignore
-except ImportError:
+    from google.api_core.gapic_v1.request import setup_request_id  # type: ignore
+except ImportError:  # pragma: NO COVER
     # TODO(https://github.com/googleapis/google-cloud-python/issues/17813): Request ID setup helper was introduced in google-api-core 2.26.0.
     # Remove this fallback definition when google-api-core >= 2.26.0 becomes the minimum required version in generated client setup dependencies.
     def setup_request_id(request, field_name: str, is_proto3_optional: bool):

packages/gapic-generator/tests/integration/goldens/redis/google/cloud/redis_v1/_compat.py

@@ -32,7 +32,7 @@
         get_api_endpoint,
         get_universe_domain,
     )
-except ImportError:
+except ImportError:  # pragma: NO COVER
     # TODO(https://github.com/googleapis/google-cloud-python/issues/17813): Universe domain support was introduced in google-api-core 2.18.0.
     # Remove these fallback definitions when google-api-core >= 2.18.0 becomes the minimum required version in generated client setup dependencies.
     def get_default_mtls_endpoint(api_endpoint: Optional[str]) -> Optional[str]:
@@ -104,7 +104,7 @@ def get_universe_domain(
         get_client_cert_source,
         read_environment_variables,
     )
-except ImportError:
+except ImportError:  # pragma: NO COVER
     from google.auth.transport import mtls  # type: ignore
 
     # TODO(https://github.com/googleapis/google-cloud-python/issues/17813): Remove these fallbacks when google-api-core >= 2.18.0 is the minimum required version.
@@ -156,8 +156,8 @@ def read_environment_variables() -> Tuple[bool, str, Optional[str]]:
 
 
 try:
-    from google.api_core.gapic_v1.requests import setup_request_id  # type: ignore
-except ImportError:
+    from google.api_core.gapic_v1.request import setup_request_id  # type: ignore
+except ImportError:  # pragma: NO COVER
     # TODO(https://github.com/googleapis/google-cloud-python/issues/17813): Request ID setup helper was introduced in google-api-core 2.26.0.
     # Remove this fallback definition when google-api-core >= 2.26.0 becomes the minimum required version in generated client setup dependencies.
     def setup_request_id(request, field_name: str, is_proto3_optional: bool):

packages/gapic-generator/tests/integration/goldens/redis_selective/google/cloud/redis_v1/_compat.py

@@ -32,7 +32,7 @@
         get_api_endpoint,
         get_universe_domain,
     )
-except ImportError:
+except ImportError:  # pragma: NO COVER
     # TODO(https://github.com/googleapis/google-cloud-python/issues/17813): Universe domain support was introduced in google-api-core 2.18.0.
     # Remove these fallback definitions when google-api-core >= 2.18.0 becomes the minimum required version in generated client setup dependencies.
     def get_default_mtls_endpoint(api_endpoint: Optional[str]) -> Optional[str]:
@@ -104,7 +104,7 @@ def get_universe_domain(
         get_client_cert_source,
         read_environment_variables,
     )
-except ImportError:
+except ImportError:  # pragma: NO COVER
     from google.auth.transport import mtls  # type: ignore
 
     # TODO(https://github.com/googleapis/google-cloud-python/issues/17813): Remove these fallbacks when google-api-core >= 2.18.0 is the minimum required version.
@@ -156,8 +156,8 @@ def read_environment_variables() -> Tuple[bool, str, Optional[str]]:
 
 
 try:
-    from google.api_core.gapic_v1.requests import setup_request_id  # type: ignore
-except ImportError:
+    from google.api_core.gapic_v1.request import setup_request_id  # type: ignore
+except ImportError:  # pragma: NO COVER
     # TODO(https://github.com/googleapis/google-cloud-python/issues/17813): Request ID setup helper was introduced in google-api-core 2.26.0.
     # Remove this fallback definition when google-api-core >= 2.26.0 becomes the minimum required version in generated client setup dependencies.
     def setup_request_id(request, field_name: str, is_proto3_optional: bool):