Skip to content

fix(generator): use flat_ref_types in test templates and delete remove-unused-imports #17900

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ohmayr merged 2 commits into from
Jul 27, 2026
Merged

fix(generator): use flat_ref_types in test templates and delete remove-unused-imports #17900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
081abdc
fix(gapic-generator): use flat_ref_types in unit test templates and d…
ohmayr Jul 24, 2026
997b439
update goldens
ohmayr Jul 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 0 additions & 33 deletions .librarian/generator-input/client-post-processing/remove-unused-imports.yaml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...ic-generator/gapic/ads-templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ from google.longrunning import operations_pb2 # type: ignore
{% endif %}
from google.api_core import gapic_v1
{% for method in service.methods.values() %}
{% for ref_type in method.ref_types
{% for ref_type in method.flat_ref_types
if not ((ref_type.ident.python_import.package == ('google', 'api_core') and ref_type.ident.python_import.module == 'operation')
or ref_type.ident.python_import.package == ('google', 'protobuf') and ref_type.ident.python_import.module == 'empty_pb2') %}
{{ ref_type.ident.python_import }}
Expand Down
2 changes: 1 addition & 1 deletion .../gapic-generator/gapic/templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ from google.longrunning import operations_pb2 # type: ignore
{% endif %}
from google.api_core import gapic_v1
{% for method in service.methods.values() %}
{% for ref_type in method.ref_types
{% for ref_type in method.flat_ref_types
if not (ref_type.ident.python_import.package == ('google', 'api_core') and ref_type.ident.python_import.module == 'operation') %}
{{ ref_type.ident.python_import }}
{% endfor %}
Expand Down
1 change: 0 additions & 1 deletion ...generator/tests/integration/goldens/asset/tests/unit/gapic/asset_v1/test_asset_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
from google.oauth2 import service_account
import google.api_core.operation_async as operation_async # type: ignore
import google.auth
import google.protobuf.duration_pb2 as duration_pb2 # type: ignore
import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore
import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore
import google.rpc.status_pb2 as status_pb2 # type: ignore
Expand Down
3 changes: 0 additions & 3 deletions ...enerator/tests/integration/goldens/eventarc/tests/unit/gapic/eventarc_v1/test_eventarc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@
from google.cloud.eventarc_v1.types import logging_config
from google.cloud.eventarc_v1.types import message_bus
from google.cloud.eventarc_v1.types import message_bus as gce_message_bus
from google.cloud.eventarc_v1.types import network_config
from google.cloud.eventarc_v1.types import pipeline
from google.cloud.eventarc_v1.types import pipeline as gce_pipeline
from google.cloud.eventarc_v1.types import trigger
Expand All @@ -84,10 +83,8 @@
from google.oauth2 import service_account
import google.api_core.operation_async as operation_async # type: ignore
import google.auth
import google.protobuf.duration_pb2 as duration_pb2 # type: ignore
import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore
import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore
import google.rpc.code_pb2 as code_pb2 # type: ignore



Expand Down
6 changes: 0 additions & 6 deletions .../tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_logging_service_v2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,6 @@
from google.oauth2 import service_account
import google.api.monitored_resource_pb2 as monitored_resource_pb2 # type: ignore
import google.auth
import google.logging.type.http_request_pb2 as http_request_pb2 # type: ignore
import google.logging.type.log_severity_pb2 as log_severity_pb2 # type: ignore
import google.protobuf.any_pb2 as any_pb2 # type: ignore
import google.protobuf.duration_pb2 as duration_pb2 # type: ignore
import google.protobuf.struct_pb2 as struct_pb2 # type: ignore
import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore



Expand Down
3 changes: 0 additions & 3 deletions .../tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_metrics_service_v2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,8 @@
from google.longrunning import operations_pb2 # type: ignore
from google.oauth2 import service_account
import google.api.distribution_pb2 as distribution_pb2 # type: ignore
import google.api.label_pb2 as label_pb2 # type: ignore
import google.api.launch_stage_pb2 as launch_stage_pb2 # type: ignore
import google.api.metric_pb2 as metric_pb2 # type: ignore
import google.auth
import google.protobuf.duration_pb2 as duration_pb2 # type: ignore
import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore


Expand Down
6 changes: 0 additions & 6 deletions ...tegration/goldens/logging_internal/tests/unit/gapic/logging_v2/test_logging_service_v2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,6 @@
from google.oauth2 import service_account
import google.api.monitored_resource_pb2 as monitored_resource_pb2 # type: ignore
import google.auth
import google.logging.type.http_request_pb2 as http_request_pb2 # type: ignore
import google.logging.type.log_severity_pb2 as log_severity_pb2 # type: ignore
import google.protobuf.any_pb2 as any_pb2 # type: ignore
import google.protobuf.duration_pb2 as duration_pb2 # type: ignore
import google.protobuf.struct_pb2 as struct_pb2 # type: ignore
import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore



Expand Down
3 changes: 0 additions & 3 deletions ...tegration/goldens/logging_internal/tests/unit/gapic/logging_v2/test_metrics_service_v2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,8 @@
from google.longrunning import operations_pb2 # type: ignore
from google.oauth2 import service_account
import google.api.distribution_pb2 as distribution_pb2 # type: ignore
import google.api.label_pb2 as label_pb2 # type: ignore
import google.api.launch_stage_pb2 as launch_stage_pb2 # type: ignore
import google.api.metric_pb2 as metric_pb2 # type: ignore
import google.auth
import google.protobuf.duration_pb2 as duration_pb2 # type: ignore
import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore


Expand Down
3 changes: 0 additions & 3 deletions ...c-generator/tests/integration/goldens/redis/tests/unit/gapic/redis_v1/test_cloud_redis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,9 @@
from google.oauth2 import service_account
import google.api_core.operation_async as operation_async # type: ignore
import google.auth
import google.protobuf.duration_pb2 as duration_pb2 # type: ignore
import google.protobuf.empty_pb2 as empty_pb2 # type: ignore
import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore
import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore
import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore
import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore



Expand Down
3 changes: 0 additions & 3 deletions ...r/tests/integration/goldens/redis_selective/tests/unit/gapic/redis_v1/test_cloud_redis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,9 @@
from google.oauth2 import service_account
import google.api_core.operation_async as operation_async # type: ignore
import google.auth
import google.protobuf.duration_pb2 as duration_pb2 # type: ignore
import google.protobuf.empty_pb2 as empty_pb2 # type: ignore
import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore
import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore
import google.type.dayofweek_pb2 as dayofweek_pb2 # type: ignore
import google.type.timeofday_pb2 as timeofday_pb2 # type: ignore



Expand Down
1 change: 0 additions & 1 deletion ...tchoperations/tests/unit/gapic/storagebatchoperations_v1/test_storage_batch_operations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@
import google.api_core.operation_async as operation_async # type: ignore
import google.auth
import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore
import google.rpc.code_pb2 as code_pb2 # type: ignore



Expand Down
Loading