Skip to content
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.

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

fix(deps): require protobuf>=3.19.5 #23

Merged
merged 2 commits into from
Oct 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
59 changes: 55 additions & 4 deletions google/iam/v1/iam_policy_pb2.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
# source: google/iam/v1/iam_policy.proto
"""Generated protocol buffer code."""
from google.protobuf.internal import builder as _builder
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

# @@protoc_insertion_point(imports)
Expand All @@ -40,10 +41,60 @@
b'\n\x1egoogle/iam/v1/iam_policy.proto\x12\rgoogle.iam.v1\x1a\x1cgoogle/api/annotations.proto\x1a\x17google/api/client.proto\x1a\x1fgoogle/api/field_behavior.proto\x1a\x19google/api/resource.proto\x1a\x1bgoogle/iam/v1/options.proto\x1a\x1agoogle/iam/v1/policy.proto\x1a google/protobuf/field_mask.proto"\x8f\x01\n\x13SetIamPolicyRequest\x12\x1b\n\x08resource\x18\x01 \x01(\tB\t\xe0\x41\x02\xfa\x41\x03\n\x01*\x12*\n\x06policy\x18\x02 \x01(\x0b\x32\x15.google.iam.v1.PolicyB\x03\xe0\x41\x02\x12/\n\x0bupdate_mask\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.FieldMask"d\n\x13GetIamPolicyRequest\x12\x1b\n\x08resource\x18\x01 \x01(\tB\t\xe0\x41\x02\xfa\x41\x03\n\x01*\x12\x30\n\x07options\x18\x02 \x01(\x0b\x32\x1f.google.iam.v1.GetPolicyOptions"R\n\x19TestIamPermissionsRequest\x12\x1b\n\x08resource\x18\x01 \x01(\tB\t\xe0\x41\x02\xfa\x41\x03\n\x01*\x12\x18\n\x0bpermissions\x18\x02 \x03(\tB\x03\xe0\x41\x02"1\n\x1aTestIamPermissionsResponse\x12\x13\n\x0bpermissions\x18\x01 \x03(\t2\xb4\x03\n\tIAMPolicy\x12t\n\x0cSetIamPolicy\x12".google.iam.v1.SetIamPolicyRequest\x1a\x15.google.iam.v1.Policy")\x82\xd3\xe4\x93\x02#"\x1e/v1/{resource=**}:setIamPolicy:\x01*\x12t\n\x0cGetIamPolicy\x12".google.iam.v1.GetIamPolicyRequest\x1a\x15.google.iam.v1.Policy")\x82\xd3\xe4\x93\x02#"\x1e/v1/{resource=**}:getIamPolicy:\x01*\x12\x9a\x01\n\x12TestIamPermissions\x12(.google.iam.v1.TestIamPermissionsRequest\x1a).google.iam.v1.TestIamPermissionsResponse"/\x82\xd3\xe4\x93\x02)"$/v1/{resource=**}:testIamPermissions:\x01*\x1a\x1e\xca\x41\x1biam-meta-api.googleapis.comB\x86\x01\n\x11\x63om.google.iam.v1B\x0eIamPolicyProtoP\x01Z0google.golang.org/genproto/googleapis/iam/v1;iam\xf8\x01\x01\xaa\x02\x13Google.Cloud.Iam.V1\xca\x02\x13Google\\Cloud\\Iam\\V1b\x06proto3'
)

_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
_builder.BuildTopDescriptorsAndMessages(
DESCRIPTOR, "google.iam.v1.iam_policy_pb2", globals()

_SETIAMPOLICYREQUEST = DESCRIPTOR.message_types_by_name["SetIamPolicyRequest"]
_GETIAMPOLICYREQUEST = DESCRIPTOR.message_types_by_name["GetIamPolicyRequest"]
_TESTIAMPERMISSIONSREQUEST = DESCRIPTOR.message_types_by_name[
"TestIamPermissionsRequest"
]
_TESTIAMPERMISSIONSRESPONSE = DESCRIPTOR.message_types_by_name[
"TestIamPermissionsResponse"
]
SetIamPolicyRequest = _reflection.GeneratedProtocolMessageType(
"SetIamPolicyRequest",
(_message.Message,),
{
"DESCRIPTOR": _SETIAMPOLICYREQUEST,
"__module__": "google.iam.v1.iam_policy_pb2"
# @@protoc_insertion_point(class_scope:google.iam.v1.SetIamPolicyRequest)
},
)
_sym_db.RegisterMessage(SetIamPolicyRequest)

GetIamPolicyRequest = _reflection.GeneratedProtocolMessageType(
"GetIamPolicyRequest",
(_message.Message,),
{
"DESCRIPTOR": _GETIAMPOLICYREQUEST,
"__module__": "google.iam.v1.iam_policy_pb2"
# @@protoc_insertion_point(class_scope:google.iam.v1.GetIamPolicyRequest)
},
)
_sym_db.RegisterMessage(GetIamPolicyRequest)

TestIamPermissionsRequest = _reflection.GeneratedProtocolMessageType(
"TestIamPermissionsRequest",
(_message.Message,),
{
"DESCRIPTOR": _TESTIAMPERMISSIONSREQUEST,
"__module__": "google.iam.v1.iam_policy_pb2"
# @@protoc_insertion_point(class_scope:google.iam.v1.TestIamPermissionsRequest)
},
)
_sym_db.RegisterMessage(TestIamPermissionsRequest)

TestIamPermissionsResponse = _reflection.GeneratedProtocolMessageType(
"TestIamPermissionsResponse",
(_message.Message,),
{
"DESCRIPTOR": _TESTIAMPERMISSIONSRESPONSE,
"__module__": "google.iam.v1.iam_policy_pb2"
# @@protoc_insertion_point(class_scope:google.iam.v1.TestIamPermissionsResponse)
},
)
_sym_db.RegisterMessage(TestIamPermissionsResponse)

_IAMPOLICY = DESCRIPTOR.services_by_name["IAMPolicy"]
if _descriptor._USE_C_DESCRIPTORS == False:

DESCRIPTOR._options = None
Expand Down
18 changes: 14 additions & 4 deletions google/iam/v1/logging/audit_data_pb2.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
# source: google/iam/v1/logging/audit_data.proto
"""Generated protocol buffer code."""
from google.protobuf.internal import builder as _builder
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

# @@protoc_insertion_point(imports)
Expand All @@ -34,10 +35,19 @@
b'\n&google/iam/v1/logging/audit_data.proto\x12\x15google.iam.v1.logging\x1a\x1agoogle/iam/v1/policy.proto"=\n\tAuditData\x12\x30\n\x0cpolicy_delta\x18\x02 \x01(\x0b\x32\x1a.google.iam.v1.PolicyDeltaB\x89\x01\n\x19\x63om.google.iam.v1.loggingB\x0e\x41uditDataProtoP\x01Z<google.golang.org/genproto/googleapis/iam/v1/logging;logging\xaa\x02\x1bGoogle.Cloud.Iam.V1.Loggingb\x06proto3'
)

_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
_builder.BuildTopDescriptorsAndMessages(
DESCRIPTOR, "google.iam.v1.logging.audit_data_pb2", globals()

_AUDITDATA = DESCRIPTOR.message_types_by_name["AuditData"]
AuditData = _reflection.GeneratedProtocolMessageType(
"AuditData",
(_message.Message,),
{
"DESCRIPTOR": _AUDITDATA,
"__module__": "google.iam.v1.logging.audit_data_pb2"
# @@protoc_insertion_point(class_scope:google.iam.v1.logging.AuditData)
},
)
_sym_db.RegisterMessage(AuditData)

if _descriptor._USE_C_DESCRIPTORS == False:

DESCRIPTOR._options = None
Expand Down
18 changes: 14 additions & 4 deletions google/iam/v1/options_pb2.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
# source: google/iam/v1/options.proto
"""Generated protocol buffer code."""
from google.protobuf.internal import builder as _builder
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

# @@protoc_insertion_point(imports)
Expand All @@ -31,10 +32,19 @@
b'\n\x1bgoogle/iam/v1/options.proto\x12\rgoogle.iam.v1"4\n\x10GetPolicyOptions\x12 \n\x18requested_policy_version\x18\x01 \x01(\x05\x42\x84\x01\n\x11\x63om.google.iam.v1B\x0cOptionsProtoP\x01Z0google.golang.org/genproto/googleapis/iam/v1;iam\xf8\x01\x01\xaa\x02\x13Google.Cloud.Iam.V1\xca\x02\x13Google\\Cloud\\Iam\\V1b\x06proto3'
)

_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
_builder.BuildTopDescriptorsAndMessages(
DESCRIPTOR, "google.iam.v1.options_pb2", globals()

_GETPOLICYOPTIONS = DESCRIPTOR.message_types_by_name["GetPolicyOptions"]
GetPolicyOptions = _reflection.GeneratedProtocolMessageType(
"GetPolicyOptions",
(_message.Message,),
{
"DESCRIPTOR": _GETPOLICYOPTIONS,
"__module__": "google.iam.v1.options_pb2"
# @@protoc_insertion_point(class_scope:google.iam.v1.GetPolicyOptions)
},
)
_sym_db.RegisterMessage(GetPolicyOptions)

if _descriptor._USE_C_DESCRIPTORS == False:

DESCRIPTOR._options = None
Expand Down
93 changes: 89 additions & 4 deletions google/iam/v1/policy_pb2.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@
# Generated by the protocol buffer compiler. DO NOT EDIT!
# source: google/iam/v1/policy.proto
"""Generated protocol buffer code."""
from google.protobuf.internal import builder as _builder
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

# @@protoc_insertion_point(imports)
Expand All @@ -34,10 +35,94 @@
b'\n\x1agoogle/iam/v1/policy.proto\x12\rgoogle.iam.v1\x1a\x16google/type/expr.proto"\x84\x01\n\x06Policy\x12\x0f\n\x07version\x18\x01 \x01(\x05\x12(\n\x08\x62indings\x18\x04 \x03(\x0b\x32\x16.google.iam.v1.Binding\x12\x31\n\raudit_configs\x18\x06 \x03(\x0b\x32\x1a.google.iam.v1.AuditConfig\x12\x0c\n\x04\x65tag\x18\x03 \x01(\x0c"N\n\x07\x42inding\x12\x0c\n\x04role\x18\x01 \x01(\t\x12\x0f\n\x07members\x18\x02 \x03(\t\x12$\n\tcondition\x18\x03 \x01(\x0b\x32\x11.google.type.Expr"X\n\x0b\x41uditConfig\x12\x0f\n\x07service\x18\x01 \x01(\t\x12\x38\n\x11\x61udit_log_configs\x18\x03 \x03(\x0b\x32\x1d.google.iam.v1.AuditLogConfig"\xb7\x01\n\x0e\x41uditLogConfig\x12\x37\n\x08log_type\x18\x01 \x01(\x0e\x32%.google.iam.v1.AuditLogConfig.LogType\x12\x18\n\x10\x65xempted_members\x18\x02 \x03(\t"R\n\x07LogType\x12\x18\n\x14LOG_TYPE_UNSPECIFIED\x10\x00\x12\x0e\n\nADMIN_READ\x10\x01\x12\x0e\n\nDATA_WRITE\x10\x02\x12\r\n\tDATA_READ\x10\x03"\x80\x01\n\x0bPolicyDelta\x12\x33\n\x0e\x62inding_deltas\x18\x01 \x03(\x0b\x32\x1b.google.iam.v1.BindingDelta\x12<\n\x13\x61udit_config_deltas\x18\x02 \x03(\x0b\x32\x1f.google.iam.v1.AuditConfigDelta"\xbd\x01\n\x0c\x42indingDelta\x12\x32\n\x06\x61\x63tion\x18\x01 \x01(\x0e\x32".google.iam.v1.BindingDelta.Action\x12\x0c\n\x04role\x18\x02 \x01(\t\x12\x0e\n\x06member\x18\x03 \x01(\t\x12$\n\tcondition\x18\x04 \x01(\x0b\x32\x11.google.type.Expr"5\n\x06\x41\x63tion\x12\x16\n\x12\x41\x43TION_UNSPECIFIED\x10\x00\x12\x07\n\x03\x41\x44\x44\x10\x01\x12\n\n\x06REMOVE\x10\x02"\xbd\x01\n\x10\x41uditConfigDelta\x12\x36\n\x06\x61\x63tion\x18\x01 \x01(\x0e\x32&.google.iam.v1.AuditConfigDelta.Action\x12\x0f\n\x07service\x18\x02 \x01(\t\x12\x17\n\x0f\x65xempted_member\x18\x03 \x01(\t\x12\x10\n\x08log_type\x18\x04 \x01(\t"5\n\x06\x41\x63tion\x12\x16\n\x12\x41\x43TION_UNSPECIFIED\x10\x00\x12\x07\n\x03\x41\x44\x44\x10\x01\x12\n\n\x06REMOVE\x10\x02\x42\x83\x01\n\x11\x63om.google.iam.v1B\x0bPolicyProtoP\x01Z0google.golang.org/genproto/googleapis/iam/v1;iam\xf8\x01\x01\xaa\x02\x13Google.Cloud.Iam.V1\xca\x02\x13Google\\Cloud\\Iam\\V1b\x06proto3'
)

_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
_builder.BuildTopDescriptorsAndMessages(
DESCRIPTOR, "google.iam.v1.policy_pb2", globals()

_POLICY = DESCRIPTOR.message_types_by_name["Policy"]
_BINDING = DESCRIPTOR.message_types_by_name["Binding"]
_AUDITCONFIG = DESCRIPTOR.message_types_by_name["AuditConfig"]
_AUDITLOGCONFIG = DESCRIPTOR.message_types_by_name["AuditLogConfig"]
_POLICYDELTA = DESCRIPTOR.message_types_by_name["PolicyDelta"]
_BINDINGDELTA = DESCRIPTOR.message_types_by_name["BindingDelta"]
_AUDITCONFIGDELTA = DESCRIPTOR.message_types_by_name["AuditConfigDelta"]
_AUDITLOGCONFIG_LOGTYPE = _AUDITLOGCONFIG.enum_types_by_name["LogType"]
_BINDINGDELTA_ACTION = _BINDINGDELTA.enum_types_by_name["Action"]
_AUDITCONFIGDELTA_ACTION = _AUDITCONFIGDELTA.enum_types_by_name["Action"]
Policy = _reflection.GeneratedProtocolMessageType(
"Policy",
(_message.Message,),
{
"DESCRIPTOR": _POLICY,
"__module__": "google.iam.v1.policy_pb2"
# @@protoc_insertion_point(class_scope:google.iam.v1.Policy)
},
)
_sym_db.RegisterMessage(Policy)

Binding = _reflection.GeneratedProtocolMessageType(
"Binding",
(_message.Message,),
{
"DESCRIPTOR": _BINDING,
"__module__": "google.iam.v1.policy_pb2"
# @@protoc_insertion_point(class_scope:google.iam.v1.Binding)
},
)
_sym_db.RegisterMessage(Binding)

AuditConfig = _reflection.GeneratedProtocolMessageType(
"AuditConfig",
(_message.Message,),
{
"DESCRIPTOR": _AUDITCONFIG,
"__module__": "google.iam.v1.policy_pb2"
# @@protoc_insertion_point(class_scope:google.iam.v1.AuditConfig)
},
)
_sym_db.RegisterMessage(AuditConfig)

AuditLogConfig = _reflection.GeneratedProtocolMessageType(
"AuditLogConfig",
(_message.Message,),
{
"DESCRIPTOR": _AUDITLOGCONFIG,
"__module__": "google.iam.v1.policy_pb2"
# @@protoc_insertion_point(class_scope:google.iam.v1.AuditLogConfig)
},
)
_sym_db.RegisterMessage(AuditLogConfig)

PolicyDelta = _reflection.GeneratedProtocolMessageType(
"PolicyDelta",
(_message.Message,),
{
"DESCRIPTOR": _POLICYDELTA,
"__module__": "google.iam.v1.policy_pb2"
# @@protoc_insertion_point(class_scope:google.iam.v1.PolicyDelta)
},
)
_sym_db.RegisterMessage(PolicyDelta)

BindingDelta = _reflection.GeneratedProtocolMessageType(
"BindingDelta",
(_message.Message,),
{
"DESCRIPTOR": _BINDINGDELTA,
"__module__": "google.iam.v1.policy_pb2"
# @@protoc_insertion_point(class_scope:google.iam.v1.BindingDelta)
},
)
_sym_db.RegisterMessage(BindingDelta)

AuditConfigDelta = _reflection.GeneratedProtocolMessageType(
"AuditConfigDelta",
(_message.Message,),
{
"DESCRIPTOR": _AUDITCONFIGDELTA,
"__module__": "google.iam.v1.policy_pb2"
# @@protoc_insertion_point(class_scope:google.iam.v1.AuditConfigDelta)
},
)
_sym_db.RegisterMessage(AuditConfigDelta)

if _descriptor._USE_C_DESCRIPTORS == False:

DESCRIPTOR._options = None
Expand Down
7 changes: 6 additions & 1 deletion noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@

BLACK_VERSION = "black==22.3.0"

# NOTE: Pin the version of grpcio-tools to 1.48.2 for compatibility with
# Protobuf 3.19.5. Please ensure that the minimum required version of
# protobuf in setup.py is compatible with the pb2 files generated
# by grpcio-tools before changing the pinned version below.
GRPCIO_TOOLS_VERSION = "grpcio-tools==1.48.2"

CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute()

Expand Down Expand Up @@ -206,7 +211,7 @@ def generate_protos(session):
files.
"""

session.install("grpcio-tools")
session.install(GRPCIO_TOOLS_VERSION)
protos = [str(p) for p in (Path(".").glob("google/**/*.proto"))]
session.run(
"python", "-m", "grpc_tools.protoc", "--proto_path=.", "--python_out=.", *protos
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
dependencies = [
"grpcio>=1.44.0, <2.0.0dev",
"googleapis-common-protos[grpc]>=1.56.0, <2.0.0dev",
"protobuf >= 3.20.2, <5.0.0dev",
"protobuf>=3.19.5,<5.0.0dev,!=3.20.0,!=3.20.1,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
]

package_root = os.path.abspath(os.path.dirname(__file__))
Expand Down