Skip to content

Commit

Permalink
fix: regenerate pb2 files for compatibility with protobuf 5.x (#234)
Browse files Browse the repository at this point in the history 
* 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>
  • Loading branch information
@parthea @gcf-owl-bot
parthea and gcf-owl-bot[bot] authored Jun 19, 2024
1 parent 17c6cea commit 058e375
Show file tree
Hide file tree
Showing 69 changed files with 750 additions and 2,818 deletions.
14 changes: 6 additions & 8 deletions packages/googleapis-common-protos/google/api/annotations_pb2.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,8 @@
"""Generated protocol buffer code."""
from google.protobuf import descriptor as _descriptor
from google.protobuf import descriptor_pool as _descriptor_pool
from google.protobuf import message as _message
from google.protobuf import reflection as _reflection
from google.protobuf import symbol_database as _symbol_database
from google.protobuf.internal import builder as _builder

# @@protoc_insertion_point(imports)

Expand All @@ -36,13 +35,12 @@
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'
)


HTTP_FIELD_NUMBER = 72295728
http = DESCRIPTOR.extensions_by_name["http"]

_globals = globals()
_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
_builder.BuildTopDescriptorsAndMessages(
DESCRIPTOR, "google.api.annotations_pb2", _globals
)
if _descriptor._USE_C_DESCRIPTORS == False:
google_dot_protobuf_dot_descriptor__pb2.MethodOptions.RegisterExtension(http)

DESCRIPTOR._options = None
DESCRIPTOR._serialized_options = b"\n\016com.google.apiB\020AnnotationsProtoP\001ZAgoogle.golang.org/genproto/googleapis/api/annotations;annotations\242\002\004GAPI"
# @@protoc_insertion_point(module_scope)
104 changes: 16 additions & 88 deletions packages/googleapis-common-protos/google/api/auth_pb2.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,8 @@
"""Generated protocol buffer code."""
from google.protobuf import descriptor as _descriptor
from google.protobuf import descriptor_pool as _descriptor_pool
from google.protobuf import message as _message
from google.protobuf import reflection as _reflection
from google.protobuf import symbol_database as _symbol_database
from google.protobuf.internal import builder as _builder

# @@protoc_insertion_point(imports)

Expand All @@ -32,93 +31,22 @@
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'
)


_AUTHENTICATION = DESCRIPTOR.message_types_by_name["Authentication"]
_AUTHENTICATIONRULE = DESCRIPTOR.message_types_by_name["AuthenticationRule"]
_JWTLOCATION = DESCRIPTOR.message_types_by_name["JwtLocation"]
_AUTHPROVIDER = DESCRIPTOR.message_types_by_name["AuthProvider"]
_OAUTHREQUIREMENTS = DESCRIPTOR.message_types_by_name["OAuthRequirements"]
_AUTHREQUIREMENT = DESCRIPTOR.message_types_by_name["AuthRequirement"]
Authentication = _reflection.GeneratedProtocolMessageType(
"Authentication",
(_message.Message,),
{
"DESCRIPTOR": _AUTHENTICATION,
"__module__": "google.api.auth_pb2"
# @@protoc_insertion_point(class_scope:google.api.Authentication)
},
)
_sym_db.RegisterMessage(Authentication)

AuthenticationRule = _reflection.GeneratedProtocolMessageType(
"AuthenticationRule",
(_message.Message,),
{
"DESCRIPTOR": _AUTHENTICATIONRULE,
"__module__": "google.api.auth_pb2"
# @@protoc_insertion_point(class_scope:google.api.AuthenticationRule)
},
)
_sym_db.RegisterMessage(AuthenticationRule)

JwtLocation = _reflection.GeneratedProtocolMessageType(
"JwtLocation",
(_message.Message,),
{
"DESCRIPTOR": _JWTLOCATION,
"__module__": "google.api.auth_pb2"
# @@protoc_insertion_point(class_scope:google.api.JwtLocation)
},
)
_sym_db.RegisterMessage(JwtLocation)

AuthProvider = _reflection.GeneratedProtocolMessageType(
"AuthProvider",
(_message.Message,),
{
"DESCRIPTOR": _AUTHPROVIDER,
"__module__": "google.api.auth_pb2"
# @@protoc_insertion_point(class_scope:google.api.AuthProvider)
},
)
_sym_db.RegisterMessage(AuthProvider)

OAuthRequirements = _reflection.GeneratedProtocolMessageType(
"OAuthRequirements",
(_message.Message,),
{
"DESCRIPTOR": _OAUTHREQUIREMENTS,
"__module__": "google.api.auth_pb2"
# @@protoc_insertion_point(class_scope:google.api.OAuthRequirements)
},
)
_sym_db.RegisterMessage(OAuthRequirements)

AuthRequirement = _reflection.GeneratedProtocolMessageType(
"AuthRequirement",
(_message.Message,),
{
"DESCRIPTOR": _AUTHREQUIREMENT,
"__module__": "google.api.auth_pb2"
# @@protoc_insertion_point(class_scope:google.api.AuthRequirement)
},
)
_sym_db.RegisterMessage(AuthRequirement)

_globals = globals()
_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, "google.api.auth_pb2", _globals)
if _descriptor._USE_C_DESCRIPTORS == False:

DESCRIPTOR._options = None
DESCRIPTOR._serialized_options = b"\n\016com.google.apiB\tAuthProtoP\001ZEgoogle.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig\242\002\004GAPI"
_AUTHENTICATION._serialized_start = 37
_AUTHENTICATION._serialized_end = 145
_AUTHENTICATIONRULE._serialized_start = 148
_AUTHENTICATIONRULE._serialized_end = 317
_JWTLOCATION._serialized_start = 319
_JWTLOCATION._serialized_end = 413
_AUTHPROVIDER._serialized_start = 416
_AUTHPROVIDER._serialized_end = 570
_OAUTHREQUIREMENTS._serialized_start = 572
_OAUTHREQUIREMENTS._serialized_end = 617
_AUTHREQUIREMENT._serialized_start = 619
_AUTHREQUIREMENT._serialized_end = 676
_globals["_AUTHENTICATION"]._serialized_start = 37
_globals["_AUTHENTICATION"]._serialized_end = 145
_globals["_AUTHENTICATIONRULE"]._serialized_start = 148
_globals["_AUTHENTICATIONRULE"]._serialized_end = 317
_globals["_JWTLOCATION"]._serialized_start = 319
_globals["_JWTLOCATION"]._serialized_end = 413
_globals["_AUTHPROVIDER"]._serialized_start = 416
_globals["_AUTHPROVIDER"]._serialized_end = 570
_globals["_OAUTHREQUIREMENTS"]._serialized_start = 572
_globals["_OAUTHREQUIREMENTS"]._serialized_end = 617
_globals["_AUTHREQUIREMENT"]._serialized_start = 619
_globals["_AUTHREQUIREMENT"]._serialized_end = 676
# @@protoc_insertion_point(module_scope)
62 changes: 12 additions & 50 deletions packages/googleapis-common-protos/google/api/backend_pb2.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,8 @@
"""Generated protocol buffer code."""
from google.protobuf import descriptor as _descriptor
from google.protobuf import descriptor_pool as _descriptor_pool
from google.protobuf import message as _message
from google.protobuf import reflection as _reflection
from google.protobuf import symbol_database as _symbol_database
from google.protobuf.internal import builder as _builder

# @@protoc_insertion_point(imports)

Expand All @@ -32,59 +31,22 @@
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'
)


_BACKEND = DESCRIPTOR.message_types_by_name["Backend"]
_BACKENDRULE = DESCRIPTOR.message_types_by_name["BackendRule"]
_BACKENDRULE_OVERRIDESBYREQUESTPROTOCOLENTRY = _BACKENDRULE.nested_types_by_name[
"OverridesByRequestProtocolEntry"
]
_BACKENDRULE_PATHTRANSLATION = _BACKENDRULE.enum_types_by_name["PathTranslation"]
Backend = _reflection.GeneratedProtocolMessageType(
"Backend",
(_message.Message,),
{
"DESCRIPTOR": _BACKEND,
"__module__": "google.api.backend_pb2"
# @@protoc_insertion_point(class_scope:google.api.Backend)
},
)
_sym_db.RegisterMessage(Backend)

BackendRule = _reflection.GeneratedProtocolMessageType(
"BackendRule",
(_message.Message,),
{
"OverridesByRequestProtocolEntry": _reflection.GeneratedProtocolMessageType(
"OverridesByRequestProtocolEntry",
(_message.Message,),
{
"DESCRIPTOR": _BACKENDRULE_OVERRIDESBYREQUESTPROTOCOLENTRY,
"__module__": "google.api.backend_pb2"
# @@protoc_insertion_point(class_scope:google.api.BackendRule.OverridesByRequestProtocolEntry)
},
),
"DESCRIPTOR": _BACKENDRULE,
"__module__": "google.api.backend_pb2"
# @@protoc_insertion_point(class_scope:google.api.BackendRule)
},
)
_sym_db.RegisterMessage(BackendRule)
_sym_db.RegisterMessage(BackendRule.OverridesByRequestProtocolEntry)

_globals = globals()
_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, "google.api.backend_pb2", _globals)
if _descriptor._USE_C_DESCRIPTORS == False:

DESCRIPTOR._options = None
DESCRIPTOR._serialized_options = b"\n\016com.google.apiB\014BackendProtoP\001ZEgoogle.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig\242\002\004GAPI"
_BACKENDRULE_OVERRIDESBYREQUESTPROTOCOLENTRY._options = None
_BACKENDRULE_OVERRIDESBYREQUESTPROTOCOLENTRY._serialized_options = b"8\001"
_BACKENDRULE.fields_by_name["min_deadline"]._options = None
_BACKENDRULE.fields_by_name["min_deadline"]._serialized_options = b"\030\001"
_BACKEND._serialized_start = 40
_BACKEND._serialized_end = 89
_BACKENDRULE._serialized_start = 92
_BACKENDRULE._serialized_end = 654
_BACKENDRULE_OVERRIDESBYREQUESTPROTOCOLENTRY._serialized_start = 443
_BACKENDRULE_OVERRIDESBYREQUESTPROTOCOLENTRY._serialized_end = 533
_BACKENDRULE_PATHTRANSLATION._serialized_start = 535
_BACKENDRULE_PATHTRANSLATION._serialized_end = 636
_globals["_BACKEND"]._serialized_start = 40
_globals["_BACKEND"]._serialized_end = 89
_globals["_BACKENDRULE"]._serialized_start = 92
_globals["_BACKENDRULE"]._serialized_end = 654
_globals["_BACKENDRULE_OVERRIDESBYREQUESTPROTOCOLENTRY"]._serialized_start = 443
_globals["_BACKENDRULE_OVERRIDESBYREQUESTPROTOCOLENTRY"]._serialized_end = 533
_globals["_BACKENDRULE_PATHTRANSLATION"]._serialized_start = 535
_globals["_BACKENDRULE_PATHTRANSLATION"]._serialized_end = 636
# @@protoc_insertion_point(module_scope)
39 changes: 8 additions & 31 deletions packages/googleapis-common-protos/google/api/billing_pb2.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,8 @@
"""Generated protocol buffer code."""
from google.protobuf import descriptor as _descriptor
from google.protobuf import descriptor_pool as _descriptor_pool
from google.protobuf import message as _message
from google.protobuf import reflection as _reflection
from google.protobuf import symbol_database as _symbol_database
from google.protobuf.internal import builder as _builder

# @@protoc_insertion_point(imports)

Expand All @@ -32,36 +31,14 @@
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'
)


_BILLING = DESCRIPTOR.message_types_by_name["Billing"]
_BILLING_BILLINGDESTINATION = _BILLING.nested_types_by_name["BillingDestination"]
Billing = _reflection.GeneratedProtocolMessageType(
"Billing",
(_message.Message,),
{
"BillingDestination": _reflection.GeneratedProtocolMessageType(
"BillingDestination",
(_message.Message,),
{
"DESCRIPTOR": _BILLING_BILLINGDESTINATION,
"__module__": "google.api.billing_pb2"
# @@protoc_insertion_point(class_scope:google.api.Billing.BillingDestination)
},
),
"DESCRIPTOR": _BILLING,
"__module__": "google.api.billing_pb2"
# @@protoc_insertion_point(class_scope:google.api.Billing)
},
)
_sym_db.RegisterMessage(Billing)
_sym_db.RegisterMessage(Billing.BillingDestination)

_globals = globals()
_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, "google.api.billing_pb2", _globals)
if _descriptor._USE_C_DESCRIPTORS == False:

DESCRIPTOR._options = None
DESCRIPTOR._serialized_options = b"\n\016com.google.apiB\014BillingProtoP\001ZEgoogle.golang.org/genproto/googleapis/api/serviceconfig;serviceconfig\242\002\004GAPI"
_BILLING._serialized_start = 41
_BILLING._serialized_end = 188
_BILLING_BILLINGDESTINATION._serialized_start = 123
_BILLING_BILLINGDESTINATION._serialized_end = 188
_globals["_BILLING"]._serialized_start = 41
_globals["_BILLING"]._serialized_end = 188
_globals["_BILLING_BILLINGDESTINATION"]._serialized_start = 123
_globals["_BILLING_BILLINGDESTINATION"]._serialized_end = 188
# @@protoc_insertion_point(module_scope)
Loading

0 comments on commit 058e375

Please sign in to comment.