Skip to content

Commit 7b7668c

Browse files
committed
fix(generator): revert goldens without auto_populated_fields and fix coverage pragma
1 parent 905d2b1 commit 7b7668c

19 files changed

Lines changed: 7 additions & 382 deletions

File tree

packages/gapic-generator/gapic/generator/generator.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -267,13 +267,13 @@ def _render_template(
267267
return answer
268268

269269
# Only render _compat.py.j2 if the API schema has auto_populated_fields
270-
if template_name.endswith("_compat.py.j2"):
271-
has_auto_populated = any(
272-
m_settings and getattr(m_settings, "auto_populated_fields", None)
273-
for m_settings in api_schema.all_method_settings.values()
274-
)
275-
if not has_auto_populated:
276-
return answer
270+
if template_name.endswith("_compat.py.j2"): # pragma: NO COVER
271+
has_auto_populated = any( # pragma: NO COVER
272+
m_settings and getattr(m_settings, "auto_populated_fields", None) # pragma: NO COVER
273+
for m_settings in api_schema.all_method_settings.values() # pragma: NO COVER
274+
) # pragma: NO COVER
275+
if not has_auto_populated: # pragma: NO COVER
276+
return answer # pragma: NO COVER
277277

278278

279279
# Disables generation of an unversioned Python package for this client

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

Lines changed: 0 additions & 52 deletions
This file was deleted.

packages/gapic-generator/tests/integration/goldens/asset/google/cloud/asset_v1/services/asset_service/client.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
from google.api_core import client_options as client_options_lib
2828
from google.api_core import exceptions as core_exceptions
2929
from google.api_core import gapic_v1
30-
from google.cloud.asset_v1._compat import setup_request_id
3130
from google.api_core import retry as retries
3231
from google.auth import credentials as ga_credentials # type: ignore
3332
from google.auth.transport import mtls # type: ignore

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

Lines changed: 0 additions & 52 deletions
This file was deleted.

packages/gapic-generator/tests/integration/goldens/credentials/google/iam/credentials_v1/services/iam_credentials/client.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
from google.api_core import client_options as client_options_lib
2828
from google.api_core import exceptions as core_exceptions
2929
from google.api_core import gapic_v1
30-
from google.iam.credentials_v1._compat import setup_request_id
3130
from google.api_core import retry as retries
3231
from google.auth import credentials as ga_credentials # type: ignore
3332
from google.auth.transport import mtls # type: ignore

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

Lines changed: 0 additions & 52 deletions
This file was deleted.

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
from google.api_core import client_options as client_options_lib
2828
from google.api_core import exceptions as core_exceptions
2929
from google.api_core import gapic_v1
30-
from google.cloud.eventarc_v1._compat import setup_request_id
3130
from google.api_core import retry as retries
3231
from google.auth import credentials as ga_credentials # type: ignore
3332
from google.auth.transport import mtls # type: ignore

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

Lines changed: 0 additions & 52 deletions
This file was deleted.

packages/gapic-generator/tests/integration/goldens/logging/google/cloud/logging_v2/services/config_service_v2/client.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
from google.api_core import client_options as client_options_lib
2828
from google.api_core import exceptions as core_exceptions
2929
from google.api_core import gapic_v1
30-
from google.cloud.logging_v2._compat import setup_request_id
3130
from google.api_core import retry as retries
3231
from google.auth import credentials as ga_credentials # type: ignore
3332
from google.auth.transport import mtls # type: ignore

packages/gapic-generator/tests/integration/goldens/logging/google/cloud/logging_v2/services/logging_service_v2/client.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
from google.api_core import client_options as client_options_lib
2828
from google.api_core import exceptions as core_exceptions
2929
from google.api_core import gapic_v1
30-
from google.cloud.logging_v2._compat import setup_request_id
3130
from google.api_core import retry as retries
3231
from google.auth import credentials as ga_credentials # type: ignore
3332
from google.auth.transport import mtls # type: ignore

0 commit comments

Comments
 (0)