Skip to content

Commit 058e375

Browse files
partheagcf-owl-bot[bot]
parthea
and
gcf-owl-bot[bot]
authored
fix: regenerate pb2 files for compatibility with protobuf 5.x (#234)
* fix: regenerate pb2 files for compatibility with protobuf 5.x * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * regenerate with grpcio-tools==1.59.0 * add cpp implementation to presubmits * add comment * update comment * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * Fix cpp build * remove remote system tests to speed up build times * fix build * clean up * clean up * fix build * add missing files * refactor to free up build resources * fix build * fix build * fix build * add file --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent 17c6cea commit 058e375

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+750
-2818
lines changed

‎packages/googleapis-common-protos/google/api/annotations_pb2.py‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@
1919
"""Generated protocol buffer code."""
2020
from google.protobuf import descriptor as _descriptor
2121
from google.protobuf import descriptor_pool as _descriptor_pool
22-
from google.protobuf import message as _message
23-
from google.protobuf import reflection as _reflection
2422
from google.protobuf import symbol_database as _symbol_database
23+
from google.protobuf.internal import builder as _builder
2524

2625
# @@protoc_insertion_point(imports)
2726

@@ -36,13 +35,12 @@
3635
b'\n\x1cgoogle/api/annotations.proto\x12\ngoogle.api\x1a\x15google/api/http.proto\x1a google/protobuf/descriptor.proto:E\n\x04http\x12\x1e.google.protobuf.MethodOptions\x18\xb0\xca\xbc" \x01(\x0b\x32\x14.google.api.HttpRuleBn\n\x0e\x63om.google.apiB\x10\x41nnotationsProtoP\x01ZAgoogle.golang.org/genproto/googleapis/api/annotations;annotations\xa2\x02\x04GAPIb\x06proto3'
3736
)
3837

39-
40-
HTTP_FIELD_NUMBER = 72295728
41-
http = DESCRIPTOR.extensions_by_name["http"]
42-
38+
_globals = globals()
39+
_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
40+
_builder.BuildTopDescriptorsAndMessages(
41+
DESCRIPTOR, "google.api.annotations_pb2", _globals
42+
)
4343
if _descriptor._USE_C_DESCRIPTORS == False:
44-
google_dot_protobuf_dot_descriptor__pb2.MethodOptions.RegisterExtension(http)
45-
4644
DESCRIPTOR._options = None
4745
DESCRIPTOR._serialized_options = b"\n\016com.google.apiB\020AnnotationsProtoP\001ZAgoogle.golang.org/genproto/googleapis/api/annotations;annotations\242\002\004GAPI"
4846
# @@protoc_insertion_point(module_scope)

‎packages/googleapis-common-protos/google/api/auth_pb2.py‎

Lines changed: 16 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@
1919
"""Generated protocol buffer code."""
2020
from google.protobuf import descriptor as _descriptor
2121
from google.protobuf import descriptor_pool as _descriptor_pool
22-
from google.protobuf import message as _message
23-
from google.protobuf import reflection as _reflection
2422
from google.protobuf import symbol_database as _symbol_database
23+
from google.protobuf.internal import builder as _builder
2524

2625
# @@protoc_insertion_point(imports)
2726

@@ -32,93 +31,22 @@
3231
b'\n\x15google/api/auth.proto\x12\ngoogle.api"l\n\x0e\x41uthentication\x12-\n\x05rules\x18\x03 \x03(\x0b\x32\x1e.google.api.AuthenticationRule\x12+\n\tproviders\x18\x04 \x03(\x0b\x32\x18.google.api.AuthProvider"\xa9\x01\n\x12\x41uthenticationRule\x12\x10\n\x08selector\x18\x01 \x01(\t\x12,\n\x05oauth\x18\x02 \x01(\x0b\x32\x1d.google.api.OAuthRequirements\x12 \n\x18\x61llow_without_credential\x18\x05 \x01(\x08\x12\x31\n\x0crequirements\x18\x07 \x03(\x0b\x32\x1b.google.api.AuthRequirement"^\n\x0bJwtLocation\x12\x10\n\x06header\x18\x01 \x01(\tH\x00\x12\x0f\n\x05query\x18\x02 \x01(\tH\x00\x12\x10\n\x06\x63ookie\x18\x04 \x01(\tH\x00\x12\x14\n\x0cvalue_prefix\x18\x03 \x01(\tB\x04\n\x02in"\x9a\x01\n\x0c\x41uthProvider\x12\n\n\x02id\x18\x01 \x01(\t\x12\x0e\n\x06issuer\x18\x02 \x01(\t\x12\x10\n\x08jwks_uri\x18\x03 \x01(\t\x12\x11\n\taudiences\x18\x04 \x01(\t\x12\x19\n\x11\x61uthorization_url\x18\x05 \x01(\t\x12.\n\rjwt_locations\x18\x06 \x03(\x0b\x32\x17.google.api.JwtLocation"-\n\x11OAuthRequirements\x12\x18\n\x10\x63\x61nonical_scopes\x18\x01 \x01(\t"9\n\x0f\x41uthRequirement\x12\x13\n\x0bprovider_id\x18\x01 \x01(\t\x12\x11\n\taudiences\x18\x02 \x01(\tBk\n\x0e\x63om.google.apiB\tAuthProtoP\x01ZEgoogle.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig\xa2\x02\x04GAPIb\x06proto3'
3332
)
3433

35-
36-
_AUTHENTICATION = DESCRIPTOR.message_types_by_name["Authentication"]
37-
_AUTHENTICATIONRULE = DESCRIPTOR.message_types_by_name["AuthenticationRule"]
38-
_JWTLOCATION = DESCRIPTOR.message_types_by_name["JwtLocation"]
39-
_AUTHPROVIDER = DESCRIPTOR.message_types_by_name["AuthProvider"]
40-
_OAUTHREQUIREMENTS = DESCRIPTOR.message_types_by_name["OAuthRequirements"]
41-
_AUTHREQUIREMENT = DESCRIPTOR.message_types_by_name["AuthRequirement"]
42-
Authentication = _reflection.GeneratedProtocolMessageType(
43-
"Authentication",
44-
(_message.Message,),
45-
{
46-
"DESCRIPTOR": _AUTHENTICATION,
47-
"__module__": "google.api.auth_pb2"
48-
# @@protoc_insertion_point(class_scope:google.api.Authentication)
49-
},
50-
)
51-
_sym_db.RegisterMessage(Authentication)
52-
53-
AuthenticationRule = _reflection.GeneratedProtocolMessageType(
54-
"AuthenticationRule",
55-
(_message.Message,),
56-
{
57-
"DESCRIPTOR": _AUTHENTICATIONRULE,
58-
"__module__": "google.api.auth_pb2"
59-
# @@protoc_insertion_point(class_scope:google.api.AuthenticationRule)
60-
},
61-
)
62-
_sym_db.RegisterMessage(AuthenticationRule)
63-
64-
JwtLocation = _reflection.GeneratedProtocolMessageType(
65-
"JwtLocation",
66-
(_message.Message,),
67-
{
68-
"DESCRIPTOR": _JWTLOCATION,
69-
"__module__": "google.api.auth_pb2"
70-
# @@protoc_insertion_point(class_scope:google.api.JwtLocation)
71-
},
72-
)
73-
_sym_db.RegisterMessage(JwtLocation)
74-
75-
AuthProvider = _reflection.GeneratedProtocolMessageType(
76-
"AuthProvider",
77-
(_message.Message,),
78-
{
79-
"DESCRIPTOR": _AUTHPROVIDER,
80-
"__module__": "google.api.auth_pb2"
81-
# @@protoc_insertion_point(class_scope:google.api.AuthProvider)
82-
},
83-
)
84-
_sym_db.RegisterMessage(AuthProvider)
85-
86-
OAuthRequirements = _reflection.GeneratedProtocolMessageType(
87-
"OAuthRequirements",
88-
(_message.Message,),
89-
{
90-
"DESCRIPTOR": _OAUTHREQUIREMENTS,
91-
"__module__": "google.api.auth_pb2"
92-
# @@protoc_insertion_point(class_scope:google.api.OAuthRequirements)
93-
},
94-
)
95-
_sym_db.RegisterMessage(OAuthRequirements)
96-
97-
AuthRequirement = _reflection.GeneratedProtocolMessageType(
98-
"AuthRequirement",
99-
(_message.Message,),
100-
{
101-
"DESCRIPTOR": _AUTHREQUIREMENT,
102-
"__module__": "google.api.auth_pb2"
103-
# @@protoc_insertion_point(class_scope:google.api.AuthRequirement)
104-
},
105-
)
106-
_sym_db.RegisterMessage(AuthRequirement)
107-
34+
_globals = globals()
35+
_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
36+
_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, "google.api.auth_pb2", _globals)
10837
if _descriptor._USE_C_DESCRIPTORS == False:
109-
11038
DESCRIPTOR._options = None
11139
DESCRIPTOR._serialized_options = b"\n\016com.google.apiB\tAuthProtoP\001ZEgoogle.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig\242\002\004GAPI"
112-
_AUTHENTICATION._serialized_start = 37
113-
_AUTHENTICATION._serialized_end = 145
114-
_AUTHENTICATIONRULE._serialized_start = 148
115-
_AUTHENTICATIONRULE._serialized_end = 317
116-
_JWTLOCATION._serialized_start = 319
117-
_JWTLOCATION._serialized_end = 413
118-
_AUTHPROVIDER._serialized_start = 416
119-
_AUTHPROVIDER._serialized_end = 570
120-
_OAUTHREQUIREMENTS._serialized_start = 572
121-
_OAUTHREQUIREMENTS._serialized_end = 617
122-
_AUTHREQUIREMENT._serialized_start = 619
123-
_AUTHREQUIREMENT._serialized_end = 676
40+
_globals["_AUTHENTICATION"]._serialized_start = 37
41+
_globals["_AUTHENTICATION"]._serialized_end = 145
42+
_globals["_AUTHENTICATIONRULE"]._serialized_start = 148
43+
_globals["_AUTHENTICATIONRULE"]._serialized_end = 317
44+
_globals["_JWTLOCATION"]._serialized_start = 319
45+
_globals["_JWTLOCATION"]._serialized_end = 413
46+
_globals["_AUTHPROVIDER"]._serialized_start = 416
47+
_globals["_AUTHPROVIDER"]._serialized_end = 570
48+
_globals["_OAUTHREQUIREMENTS"]._serialized_start = 572
49+
_globals["_OAUTHREQUIREMENTS"]._serialized_end = 617
50+
_globals["_AUTHREQUIREMENT"]._serialized_start = 619
51+
_globals["_AUTHREQUIREMENT"]._serialized_end = 676
12452
# @@protoc_insertion_point(module_scope)

‎packages/googleapis-common-protos/google/api/backend_pb2.py‎

Lines changed: 12 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@
1919
"""Generated protocol buffer code."""
2020
from google.protobuf import descriptor as _descriptor
2121
from google.protobuf import descriptor_pool as _descriptor_pool
22-
from google.protobuf import message as _message
23-
from google.protobuf import reflection as _reflection
2422
from google.protobuf import symbol_database as _symbol_database
23+
from google.protobuf.internal import builder as _builder
2524

2625
# @@protoc_insertion_point(imports)
2726

@@ -32,59 +31,22 @@
3231
b'\n\x18google/api/backend.proto\x12\ngoogle.api"1\n\x07\x42\x61\x63kend\x12&\n\x05rules\x18\x01 \x03(\x0b\x32\x17.google.api.BackendRule"\xb2\x04\n\x0b\x42\x61\x63kendRule\x12\x10\n\x08selector\x18\x01 \x01(\t\x12\x0f\n\x07\x61\x64\x64ress\x18\x02 \x01(\t\x12\x10\n\x08\x64\x65\x61\x64line\x18\x03 \x01(\x01\x12\x18\n\x0cmin_deadline\x18\x04 \x01(\x01\x42\x02\x18\x01\x12\x1a\n\x12operation_deadline\x18\x05 \x01(\x01\x12\x41\n\x10path_translation\x18\x06 \x01(\x0e\x32\'.google.api.BackendRule.PathTranslation\x12\x16\n\x0cjwt_audience\x18\x07 \x01(\tH\x00\x12\x16\n\x0c\x64isable_auth\x18\x08 \x01(\x08H\x00\x12\x10\n\x08protocol\x18\t \x01(\t\x12^\n\x1doverrides_by_request_protocol\x18\n \x03(\x0b\x32\x37.google.api.BackendRule.OverridesByRequestProtocolEntry\x1aZ\n\x1fOverridesByRequestProtocolEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12&\n\x05value\x18\x02 \x01(\x0b\x32\x17.google.api.BackendRule:\x02\x38\x01"e\n\x0fPathTranslation\x12 \n\x1cPATH_TRANSLATION_UNSPECIFIED\x10\x00\x12\x14\n\x10\x43ONSTANT_ADDRESS\x10\x01\x12\x1a\n\x16\x41PPEND_PATH_TO_ADDRESS\x10\x02\x42\x10\n\x0e\x61uthenticationBn\n\x0e\x63om.google.apiB\x0c\x42\x61\x63kendProtoP\x01ZEgoogle.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig\xa2\x02\x04GAPIb\x06proto3'
3332
)
3433

35-
36-
_BACKEND = DESCRIPTOR.message_types_by_name["Backend"]
37-
_BACKENDRULE = DESCRIPTOR.message_types_by_name["BackendRule"]
38-
_BACKENDRULE_OVERRIDESBYREQUESTPROTOCOLENTRY = _BACKENDRULE.nested_types_by_name[
39-
"OverridesByRequestProtocolEntry"
40-
]
41-
_BACKENDRULE_PATHTRANSLATION = _BACKENDRULE.enum_types_by_name["PathTranslation"]
42-
Backend = _reflection.GeneratedProtocolMessageType(
43-
"Backend",
44-
(_message.Message,),
45-
{
46-
"DESCRIPTOR": _BACKEND,
47-
"__module__": "google.api.backend_pb2"
48-
# @@protoc_insertion_point(class_scope:google.api.Backend)
49-
},
50-
)
51-
_sym_db.RegisterMessage(Backend)
52-
53-
BackendRule = _reflection.GeneratedProtocolMessageType(
54-
"BackendRule",
55-
(_message.Message,),
56-
{
57-
"OverridesByRequestProtocolEntry": _reflection.GeneratedProtocolMessageType(
58-
"OverridesByRequestProtocolEntry",
59-
(_message.Message,),
60-
{
61-
"DESCRIPTOR": _BACKENDRULE_OVERRIDESBYREQUESTPROTOCOLENTRY,
62-
"__module__": "google.api.backend_pb2"
63-
# @@protoc_insertion_point(class_scope:google.api.BackendRule.OverridesByRequestProtocolEntry)
64-
},
65-
),
66-
"DESCRIPTOR": _BACKENDRULE,
67-
"__module__": "google.api.backend_pb2"
68-
# @@protoc_insertion_point(class_scope:google.api.BackendRule)
69-
},
70-
)
71-
_sym_db.RegisterMessage(BackendRule)
72-
_sym_db.RegisterMessage(BackendRule.OverridesByRequestProtocolEntry)
73-
34+
_globals = globals()
35+
_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
36+
_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, "google.api.backend_pb2", _globals)
7437
if _descriptor._USE_C_DESCRIPTORS == False:
75-
7638
DESCRIPTOR._options = None
7739
DESCRIPTOR._serialized_options = b"\n\016com.google.apiB\014BackendProtoP\001ZEgoogle.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig\242\002\004GAPI"
7840
_BACKENDRULE_OVERRIDESBYREQUESTPROTOCOLENTRY._options = None
7941
_BACKENDRULE_OVERRIDESBYREQUESTPROTOCOLENTRY._serialized_options = b"8\001"
8042
_BACKENDRULE.fields_by_name["min_deadline"]._options = None
8143
_BACKENDRULE.fields_by_name["min_deadline"]._serialized_options = b"\030\001"
82-
_BACKEND._serialized_start = 40
83-
_BACKEND._serialized_end = 89
84-
_BACKENDRULE._serialized_start = 92
85-
_BACKENDRULE._serialized_end = 654
86-
_BACKENDRULE_OVERRIDESBYREQUESTPROTOCOLENTRY._serialized_start = 443
87-
_BACKENDRULE_OVERRIDESBYREQUESTPROTOCOLENTRY._serialized_end = 533
88-
_BACKENDRULE_PATHTRANSLATION._serialized_start = 535
89-
_BACKENDRULE_PATHTRANSLATION._serialized_end = 636
44+
_globals["_BACKEND"]._serialized_start = 40
45+
_globals["_BACKEND"]._serialized_end = 89
46+
_globals["_BACKENDRULE"]._serialized_start = 92
47+
_globals["_BACKENDRULE"]._serialized_end = 654
48+
_globals["_BACKENDRULE_OVERRIDESBYREQUESTPROTOCOLENTRY"]._serialized_start = 443
49+
_globals["_BACKENDRULE_OVERRIDESBYREQUESTPROTOCOLENTRY"]._serialized_end = 533
50+
_globals["_BACKENDRULE_PATHTRANSLATION"]._serialized_start = 535
51+
_globals["_BACKENDRULE_PATHTRANSLATION"]._serialized_end = 636
9052
# @@protoc_insertion_point(module_scope)

‎packages/googleapis-common-protos/google/api/billing_pb2.py‎

Lines changed: 8 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@
1919
"""Generated protocol buffer code."""
2020
from google.protobuf import descriptor as _descriptor
2121
from google.protobuf import descriptor_pool as _descriptor_pool
22-
from google.protobuf import message as _message
23-
from google.protobuf import reflection as _reflection
2422
from google.protobuf import symbol_database as _symbol_database
23+
from google.protobuf.internal import builder as _builder
2524

2625
# @@protoc_insertion_point(imports)
2726

@@ -32,36 +31,14 @@
3231
b'\n\x18google/api/billing.proto\x12\ngoogle.api"\x93\x01\n\x07\x42illing\x12\x45\n\x15\x63onsumer_destinations\x18\x08 \x03(\x0b\x32&.google.api.Billing.BillingDestination\x1a\x41\n\x12\x42illingDestination\x12\x1a\n\x12monitored_resource\x18\x01 \x01(\t\x12\x0f\n\x07metrics\x18\x02 \x03(\tBn\n\x0e\x63om.google.apiB\x0c\x42illingProtoP\x01ZEgoogle.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig\xa2\x02\x04GAPIb\x06proto3'
3332
)
3433

35-
36-
_BILLING = DESCRIPTOR.message_types_by_name["Billing"]
37-
_BILLING_BILLINGDESTINATION = _BILLING.nested_types_by_name["BillingDestination"]
38-
Billing = _reflection.GeneratedProtocolMessageType(
39-
"Billing",
40-
(_message.Message,),
41-
{
42-
"BillingDestination": _reflection.GeneratedProtocolMessageType(
43-
"BillingDestination",
44-
(_message.Message,),
45-
{
46-
"DESCRIPTOR": _BILLING_BILLINGDESTINATION,
47-
"__module__": "google.api.billing_pb2"
48-
# @@protoc_insertion_point(class_scope:google.api.Billing.BillingDestination)
49-
},
50-
),
51-
"DESCRIPTOR": _BILLING,
52-
"__module__": "google.api.billing_pb2"
53-
# @@protoc_insertion_point(class_scope:google.api.Billing)
54-
},
55-
)
56-
_sym_db.RegisterMessage(Billing)
57-
_sym_db.RegisterMessage(Billing.BillingDestination)
58-
34+
_globals = globals()
35+
_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
36+
_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, "google.api.billing_pb2", _globals)
5937
if _descriptor._USE_C_DESCRIPTORS == False:
60-
6138
DESCRIPTOR._options = None
6239
DESCRIPTOR._serialized_options = b"\n\016com.google.apiB\014BillingProtoP\001ZEgoogle.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig\242\002\004GAPI"
63-
_BILLING._serialized_start = 41
64-
_BILLING._serialized_end = 188
65-
_BILLING_BILLINGDESTINATION._serialized_start = 123
66-
_BILLING_BILLINGDESTINATION._serialized_end = 188
40+
_globals["_BILLING"]._serialized_start = 41
41+
_globals["_BILLING"]._serialized_end = 188
42+
_globals["_BILLING_BILLINGDESTINATION"]._serialized_start = 123
43+
_globals["_BILLING_BILLINGDESTINATION"]._serialized_end = 188
6744
# @@protoc_insertion_point(module_scope)

0 commit comments

Comments
 (0)