Skip to content

Commit 8ce4ea6

Browse files
vam-googlevam-google
authored
feat: Switch to string enums for compute (#685)
Also introduce gapic_yaml for java clients to override default LRO configuration (which has too way too long timeouts). Also cleanup regenerate other files (grpc_service_config and service yaml)
1 parent b5274f7 commit 8ce4ea6

10 files changed

Lines changed: 2507 additions & 226 deletions

‎google/cloud/compute/v1/BUILD.bazel‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ exports_files(glob(include = ["*grpc_service_config.json"]))
1010
##############################################################################
1111
load(
1212
"@com_google_disco_to_proto3_converter//rules_gapic:disco_to_proto.bzl",
13+
"gapic_yaml_from_disco",
1314
"grpc_service_config_from_disco",
1415
"proto_from_disco",
1516
)
@@ -41,6 +42,7 @@ _SERVICE_IGNORELIST = [
4142
proto_from_disco(
4243
name = "compute_gen",
4344
src = "compute.v1.json",
45+
enums_as_strings = True,
4446
message_ignorelist = _MESSAGE_IGNORE_LIST,
4547
service_ignorelist = _SERVICE_IGNORELIST,
4648
)
@@ -52,6 +54,13 @@ grpc_service_config_from_disco(
5254
service_ignorelist = _SERVICE_IGNORELIST,
5355
)
5456

57+
gapic_yaml_from_disco(
58+
name = "compute_gapic_gen",
59+
src = "compute.v1.json",
60+
message_ignorelist = _MESSAGE_IGNORE_LIST,
61+
service_ignorelist = _SERVICE_IGNORELIST,
62+
)
63+
5564
##############################################################################
5665
# Common
5766
##############################################################################
@@ -101,6 +110,7 @@ java_proto_library(
101110
java_gapic_library(
102111
name = "compute_java_gapic",
103112
srcs = [":compute_proto_with_info"],
113+
gapic_yaml = "compute_gapic.yaml",
104114
grpc_service_config = ":compute_grpc_service_config.json",
105115
test_deps = [],
106116
transport = "rest",
@@ -120,13 +130,17 @@ java_gapic_test(
120130
"com.google.cloud.compute.v1.DiskTypesClientTest",
121131
"com.google.cloud.compute.v1.DisksClientTest",
122132
"com.google.cloud.compute.v1.ExternalVpnGatewaysClientTest",
133+
"com.google.cloud.compute.v1.FirewallPoliciesClientTest",
123134
"com.google.cloud.compute.v1.FirewallsClientTest",
124135
"com.google.cloud.compute.v1.ForwardingRulesClientTest",
125136
"com.google.cloud.compute.v1.GlobalAddressesClientTest",
126137
"com.google.cloud.compute.v1.GlobalForwardingRulesClientTest",
127138
"com.google.cloud.compute.v1.GlobalNetworkEndpointGroupsClientTest",
128139
"com.google.cloud.compute.v1.GlobalOperationsClientTest",
140+
"com.google.cloud.compute.v1.GlobalOrganizationOperationsClientTest",
141+
"com.google.cloud.compute.v1.GlobalPublicDelegatedPrefixesClientTest",
129142
"com.google.cloud.compute.v1.HealthChecksClientTest",
143+
"com.google.cloud.compute.v1.ImageFamilyViewsClientTest",
130144
"com.google.cloud.compute.v1.ImagesClientTest",
131145
"com.google.cloud.compute.v1.InstanceGroupManagersClientTest",
132146
"com.google.cloud.compute.v1.InstanceGroupsClientTest",
@@ -145,6 +159,8 @@ java_gapic_test(
145159
"com.google.cloud.compute.v1.NodeTypesClientTest",
146160
"com.google.cloud.compute.v1.PacketMirroringsClientTest",
147161
"com.google.cloud.compute.v1.ProjectsClientTest",
162+
"com.google.cloud.compute.v1.PublicAdvertisedPrefixesClientTest",
163+
"com.google.cloud.compute.v1.PublicDelegatedPrefixesClientTest",
148164
"com.google.cloud.compute.v1.RegionAutoscalersClientTest",
149165
"com.google.cloud.compute.v1.RegionBackendServicesClientTest",
150166
"com.google.cloud.compute.v1.RegionCommitmentsClientTest",
@@ -154,6 +170,8 @@ java_gapic_test(
154170
"com.google.cloud.compute.v1.RegionHealthChecksClientTest",
155171
"com.google.cloud.compute.v1.RegionInstanceGroupManagersClientTest",
156172
"com.google.cloud.compute.v1.RegionInstanceGroupsClientTest",
173+
"com.google.cloud.compute.v1.RegionInstancesClientTest",
174+
"com.google.cloud.compute.v1.RegionNetworkEndpointGroupsClientTest",
157175
"com.google.cloud.compute.v1.RegionNotificationEndpointsClientTest",
158176
"com.google.cloud.compute.v1.RegionOperationsClientTest",
159177
"com.google.cloud.compute.v1.RegionSslCertificatesClientTest",
@@ -166,10 +184,12 @@ java_gapic_test(
166184
"com.google.cloud.compute.v1.RoutersClientTest",
167185
"com.google.cloud.compute.v1.RoutesClientTest",
168186
"com.google.cloud.compute.v1.SecurityPoliciesClientTest",
187+
"com.google.cloud.compute.v1.ServiceAttachmentsClientTest",
169188
"com.google.cloud.compute.v1.SnapshotsClientTest",
170189
"com.google.cloud.compute.v1.SslCertificatesClientTest",
171190
"com.google.cloud.compute.v1.SslPoliciesClientTest",
172191
"com.google.cloud.compute.v1.SubnetworksClientTest",
192+
"com.google.cloud.compute.v1.TargetGrpcProxiesClientTest",
173193
"com.google.cloud.compute.v1.TargetHttpProxiesClientTest",
174194
"com.google.cloud.compute.v1.TargetHttpsProxiesClientTest",
175195
"com.google.cloud.compute.v1.TargetInstancesClientTest",

0 commit comments

Comments
 (0)