From 8aa27a28885cbe7feb3e97c315df24084e44d86a Mon Sep 17 00:00:00 2001 From: ohmayr Date: Wed, 12 Aug 2026 09:36:46 -0700 Subject: [PATCH] =?UTF-8?q?Revert=20"fix(generator):=20use=20flat=5Fref=5F?= =?UTF-8?q?types=20in=20test=20templates=20and=20delete=20remov=E2=80=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 395f764737bd976593b9b034130012522c44344c. --- .../unit/gapic/%name_%version/%sub/test_%service.py.j2 | 2 +- .../unit/gapic/%name_%version/%sub/test_%service.py.j2 | 2 +- .../asset/tests/unit/gapic/asset_v1/test_asset_service.py | 1 + .../eventarc/tests/unit/gapic/eventarc_v1/test_eventarc.py | 3 +++ .../tests/unit/gapic/logging_v2/test_logging_service_v2.py | 6 ++++++ .../tests/unit/gapic/logging_v2/test_metrics_service_v2.py | 3 +++ .../tests/unit/gapic/logging_v2/test_logging_service_v2.py | 6 ++++++ .../tests/unit/gapic/logging_v2/test_metrics_service_v2.py | 3 +++ .../redis/tests/unit/gapic/redis_v1/test_cloud_redis.py | 3 +++ .../tests/unit/gapic/redis_v1/test_cloud_redis.py | 3 +++ .../test_storage_batch_operations.py | 1 + 11 files changed, 31 insertions(+), 2 deletions(-) diff --git a/packages/gapic-generator/gapic/ads-templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2 b/packages/gapic-generator/gapic/ads-templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2 index 5a4135d03e20..815dbdbefabe 100644 --- a/packages/gapic-generator/gapic/ads-templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2 +++ b/packages/gapic-generator/gapic/ads-templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2 @@ -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.flat_ref_types +{% for ref_type in method.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 }} diff --git a/packages/gapic-generator/gapic/templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2 b/packages/gapic-generator/gapic/templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2 index 4a40be1c80a5..68e754caf287 100644 --- a/packages/gapic-generator/gapic/templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2 +++ b/packages/gapic-generator/gapic/templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2 @@ -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.flat_ref_types +{% for ref_type in method.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 %} diff --git a/packages/gapic-generator/tests/integration/goldens/asset/tests/unit/gapic/asset_v1/test_asset_service.py b/packages/gapic-generator/tests/integration/goldens/asset/tests/unit/gapic/asset_v1/test_asset_service.py index d11e9ab4594c..e86b23c549e4 100755 --- a/packages/gapic-generator/tests/integration/goldens/asset/tests/unit/gapic/asset_v1/test_asset_service.py +++ b/packages/gapic-generator/tests/integration/goldens/asset/tests/unit/gapic/asset_v1/test_asset_service.py @@ -62,6 +62,7 @@ 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 diff --git a/packages/gapic-generator/tests/integration/goldens/eventarc/tests/unit/gapic/eventarc_v1/test_eventarc.py b/packages/gapic-generator/tests/integration/goldens/eventarc/tests/unit/gapic/eventarc_v1/test_eventarc.py index 7d3e259be19a..3720a1a84418 100755 --- a/packages/gapic-generator/tests/integration/goldens/eventarc/tests/unit/gapic/eventarc_v1/test_eventarc.py +++ b/packages/gapic-generator/tests/integration/goldens/eventarc/tests/unit/gapic/eventarc_v1/test_eventarc.py @@ -71,6 +71,7 @@ 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 @@ -83,8 +84,10 @@ 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 diff --git a/packages/gapic-generator/tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_logging_service_v2.py b/packages/gapic-generator/tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_logging_service_v2.py index 7ae37ba069aa..e1a950c64f4c 100755 --- a/packages/gapic-generator/tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_logging_service_v2.py +++ b/packages/gapic-generator/tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_logging_service_v2.py @@ -53,6 +53,12 @@ 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 diff --git a/packages/gapic-generator/tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_metrics_service_v2.py b/packages/gapic-generator/tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_metrics_service_v2.py index ee3b7e7f1005..e2db5c8a9a2a 100755 --- a/packages/gapic-generator/tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_metrics_service_v2.py +++ b/packages/gapic-generator/tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_metrics_service_v2.py @@ -51,8 +51,11 @@ 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 diff --git a/packages/gapic-generator/tests/integration/goldens/logging_internal/tests/unit/gapic/logging_v2/test_logging_service_v2.py b/packages/gapic-generator/tests/integration/goldens/logging_internal/tests/unit/gapic/logging_v2/test_logging_service_v2.py index 7ae37ba069aa..e1a950c64f4c 100755 --- a/packages/gapic-generator/tests/integration/goldens/logging_internal/tests/unit/gapic/logging_v2/test_logging_service_v2.py +++ b/packages/gapic-generator/tests/integration/goldens/logging_internal/tests/unit/gapic/logging_v2/test_logging_service_v2.py @@ -53,6 +53,12 @@ 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 diff --git a/packages/gapic-generator/tests/integration/goldens/logging_internal/tests/unit/gapic/logging_v2/test_metrics_service_v2.py b/packages/gapic-generator/tests/integration/goldens/logging_internal/tests/unit/gapic/logging_v2/test_metrics_service_v2.py index 01e7a1f9c9ff..5cb0ed20e2b1 100755 --- a/packages/gapic-generator/tests/integration/goldens/logging_internal/tests/unit/gapic/logging_v2/test_metrics_service_v2.py +++ b/packages/gapic-generator/tests/integration/goldens/logging_internal/tests/unit/gapic/logging_v2/test_metrics_service_v2.py @@ -51,8 +51,11 @@ 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 diff --git a/packages/gapic-generator/tests/integration/goldens/redis/tests/unit/gapic/redis_v1/test_cloud_redis.py b/packages/gapic-generator/tests/integration/goldens/redis/tests/unit/gapic/redis_v1/test_cloud_redis.py index 4b9551493b1f..6bd8b8b5009c 100755 --- a/packages/gapic-generator/tests/integration/goldens/redis/tests/unit/gapic/redis_v1/test_cloud_redis.py +++ b/packages/gapic-generator/tests/integration/goldens/redis/tests/unit/gapic/redis_v1/test_cloud_redis.py @@ -69,9 +69,12 @@ 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 diff --git a/packages/gapic-generator/tests/integration/goldens/redis_selective/tests/unit/gapic/redis_v1/test_cloud_redis.py b/packages/gapic-generator/tests/integration/goldens/redis_selective/tests/unit/gapic/redis_v1/test_cloud_redis.py index bebb9731a541..44a69d3d2277 100755 --- a/packages/gapic-generator/tests/integration/goldens/redis_selective/tests/unit/gapic/redis_v1/test_cloud_redis.py +++ b/packages/gapic-generator/tests/integration/goldens/redis_selective/tests/unit/gapic/redis_v1/test_cloud_redis.py @@ -69,9 +69,12 @@ 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 diff --git a/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/tests/unit/gapic/storagebatchoperations_v1/test_storage_batch_operations.py b/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/tests/unit/gapic/storagebatchoperations_v1/test_storage_batch_operations.py index 8086a2abdf4e..91d1b992fe18 100755 --- a/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/tests/unit/gapic/storagebatchoperations_v1/test_storage_batch_operations.py +++ b/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/tests/unit/gapic/storagebatchoperations_v1/test_storage_batch_operations.py @@ -65,6 +65,7 @@ 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