diff --git a/google/identity/accesscontextmanager/type/device_resources_pb2.py b/google/identity/accesscontextmanager/type/device_resources_pb2.py index c4c3687..82ff78a 100644 --- a/google/identity/accesscontextmanager/type/device_resources_pb2.py +++ b/google/identity/accesscontextmanager/type/device_resources_pb2.py @@ -17,9 +17,11 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # source: google/identity/accesscontextmanager/type/device_resources.proto """Generated protocol buffer code.""" -from google.protobuf.internal import builder as _builder +from google.protobuf.internal import enum_type_wrapper 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) @@ -34,12 +36,29 @@ b"\n@google/identity/accesscontextmanager/type/device_resources.proto\x12)google.identity.accesscontextmanager.type\x1a\x1cgoogle/api/annotations.proto*p\n\x16\x44\x65viceEncryptionStatus\x12\x1a\n\x16\x45NCRYPTION_UNSPECIFIED\x10\x00\x12\x1a\n\x16\x45NCRYPTION_UNSUPPORTED\x10\x01\x12\x0f\n\x0bUNENCRYPTED\x10\x02\x12\r\n\tENCRYPTED\x10\x03*\x82\x01\n\x06OsType\x12\x12\n\x0eOS_UNSPECIFIED\x10\x00\x12\x0f\n\x0b\x44\x45SKTOP_MAC\x10\x01\x12\x13\n\x0f\x44\x45SKTOP_WINDOWS\x10\x02\x12\x11\n\rDESKTOP_LINUX\x10\x03\x12\x15\n\x11\x44\x45SKTOP_CHROME_OS\x10\x06\x12\x0b\n\x07\x41NDROID\x10\x04\x12\x07\n\x03IOS\x10\x05*V\n\x15\x44\x65viceManagementLevel\x12\x1a\n\x16MANAGEMENT_UNSPECIFIED\x10\x00\x12\x08\n\x04NONE\x10\x01\x12\t\n\x05\x42\x41SIC\x10\x02\x12\x0c\n\x08\x43OMPLETE\x10\x03\x42\x92\x02\n-com.google.identity.accesscontextmanager.typeB\tTypeProtoP\x01ZMgoogle.golang.org/genproto/googleapis/identity/accesscontextmanager/type;type\xaa\x02)Google.Identity.AccessContextManager.Type\xca\x02)Google\\Identity\\AccessContextManager\\Type\xea\x02,Google::Identity::AccessContextManager::Typeb\x06proto3" ) -_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) -_builder.BuildTopDescriptorsAndMessages( - DESCRIPTOR, - "google.identity.accesscontextmanager.type.device_resources_pb2", - globals(), -) +_DEVICEENCRYPTIONSTATUS = DESCRIPTOR.enum_types_by_name["DeviceEncryptionStatus"] +DeviceEncryptionStatus = enum_type_wrapper.EnumTypeWrapper(_DEVICEENCRYPTIONSTATUS) +_OSTYPE = DESCRIPTOR.enum_types_by_name["OsType"] +OsType = enum_type_wrapper.EnumTypeWrapper(_OSTYPE) +_DEVICEMANAGEMENTLEVEL = DESCRIPTOR.enum_types_by_name["DeviceManagementLevel"] +DeviceManagementLevel = enum_type_wrapper.EnumTypeWrapper(_DEVICEMANAGEMENTLEVEL) +ENCRYPTION_UNSPECIFIED = 0 +ENCRYPTION_UNSUPPORTED = 1 +UNENCRYPTED = 2 +ENCRYPTED = 3 +OS_UNSPECIFIED = 0 +DESKTOP_MAC = 1 +DESKTOP_WINDOWS = 2 +DESKTOP_LINUX = 3 +DESKTOP_CHROME_OS = 6 +ANDROID = 4 +IOS = 5 +MANAGEMENT_UNSPECIFIED = 0 +NONE = 1 +BASIC = 2 +COMPLETE = 3 + + if _descriptor._USE_C_DESCRIPTORS == False: DESCRIPTOR._options = None diff --git a/google/identity/accesscontextmanager/v1/access_level_pb2.py b/google/identity/accesscontextmanager/v1/access_level_pb2.py index 048446a..88e96cc 100644 --- a/google/identity/accesscontextmanager/v1/access_level_pb2.py +++ b/google/identity/accesscontextmanager/v1/access_level_pb2.py @@ -17,9 +17,10 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # source: google/identity/accesscontextmanager/v1/access_level.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) @@ -39,10 +40,82 @@ b'\n:google/identity/accesscontextmanager/v1/access_level.proto\x12\'google.identity.accesscontextmanager.v1\x1a@google/identity/accesscontextmanager/type/device_resources.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x16google/type/expr.proto\x1a\x1cgoogle/api/annotations.proto"\xb8\x02\n\x0b\x41\x63\x63\x65ssLevel\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05title\x18\x02 \x01(\t\x12\x13\n\x0b\x64\x65scription\x18\x03 \x01(\t\x12\x44\n\x05\x62\x61sic\x18\x04 \x01(\x0b\x32\x33.google.identity.accesscontextmanager.v1.BasicLevelH\x00\x12\x46\n\x06\x63ustom\x18\x05 \x01(\x0b\x32\x34.google.identity.accesscontextmanager.v1.CustomLevelH\x00\x12/\n\x0b\x63reate_time\x18\x06 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12/\n\x0bupdate_time\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.TimestampB\x07\n\x05level"\xef\x01\n\nBasicLevel\x12\x46\n\nconditions\x18\x01 \x03(\x0b\x32\x32.google.identity.accesscontextmanager.v1.Condition\x12j\n\x12\x63ombining_function\x18\x02 \x01(\x0e\x32N.google.identity.accesscontextmanager.v1.BasicLevel.ConditionCombiningFunction"-\n\x1a\x43onditionCombiningFunction\x12\x07\n\x03\x41ND\x10\x00\x12\x06\n\x02OR\x10\x01"\xc3\x01\n\tCondition\x12\x16\n\x0eip_subnetworks\x18\x01 \x03(\t\x12L\n\rdevice_policy\x18\x02 \x01(\x0b\x32\x35.google.identity.accesscontextmanager.v1.DevicePolicy\x12\x1e\n\x16required_access_levels\x18\x03 \x03(\t\x12\x0e\n\x06negate\x18\x05 \x01(\x08\x12\x0f\n\x07members\x18\x06 \x03(\t\x12\x0f\n\x07regions\x18\x07 \x03(\t".\n\x0b\x43ustomLevel\x12\x1f\n\x04\x65xpr\x18\x01 \x01(\x0b\x32\x11.google.type.Expr"\x89\x03\n\x0c\x44\x65vicePolicy\x12\x1a\n\x12require_screenlock\x18\x01 \x01(\x08\x12\x66\n\x1b\x61llowed_encryption_statuses\x18\x02 \x03(\x0e\x32\x41.google.identity.accesscontextmanager.type.DeviceEncryptionStatus\x12M\n\x0eos_constraints\x18\x03 \x03(\x0b\x32\x35.google.identity.accesscontextmanager.v1.OsConstraint\x12j\n allowed_device_management_levels\x18\x06 \x03(\x0e\x32@.google.identity.accesscontextmanager.type.DeviceManagementLevel\x12\x1e\n\x16require_admin_approval\x18\x07 \x01(\x08\x12\x1a\n\x12require_corp_owned\x18\x08 \x01(\x08"\x8f\x01\n\x0cOsConstraint\x12\x42\n\x07os_type\x18\x01 \x01(\x0e\x32\x31.google.identity.accesscontextmanager.type.OsType\x12\x17\n\x0fminimum_version\x18\x02 \x01(\t\x12"\n\x1arequire_verified_chrome_os\x18\x03 \x01(\x08\x42\xa6\x02\n+com.google.identity.accesscontextmanager.v1B\x10\x41\x63\x63\x65ssLevelProtoP\x01Z[google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1;accesscontextmanager\xa2\x02\x04GACM\xaa\x02\'Google.Identity.AccessContextManager.V1\xca\x02\'Google\\Identity\\AccessContextManager\\V1\xea\x02*Google::Identity::AccessContextManager::V1b\x06proto3' ) -_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) -_builder.BuildTopDescriptorsAndMessages( - DESCRIPTOR, "google.identity.accesscontextmanager.v1.access_level_pb2", globals() + +_ACCESSLEVEL = DESCRIPTOR.message_types_by_name["AccessLevel"] +_BASICLEVEL = DESCRIPTOR.message_types_by_name["BasicLevel"] +_CONDITION = DESCRIPTOR.message_types_by_name["Condition"] +_CUSTOMLEVEL = DESCRIPTOR.message_types_by_name["CustomLevel"] +_DEVICEPOLICY = DESCRIPTOR.message_types_by_name["DevicePolicy"] +_OSCONSTRAINT = DESCRIPTOR.message_types_by_name["OsConstraint"] +_BASICLEVEL_CONDITIONCOMBININGFUNCTION = _BASICLEVEL.enum_types_by_name[ + "ConditionCombiningFunction" +] +AccessLevel = _reflection.GeneratedProtocolMessageType( + "AccessLevel", + (_message.Message,), + { + "DESCRIPTOR": _ACCESSLEVEL, + "__module__": "google.identity.accesscontextmanager.v1.access_level_pb2" + # @@protoc_insertion_point(class_scope:google.identity.accesscontextmanager.v1.AccessLevel) + }, +) +_sym_db.RegisterMessage(AccessLevel) + +BasicLevel = _reflection.GeneratedProtocolMessageType( + "BasicLevel", + (_message.Message,), + { + "DESCRIPTOR": _BASICLEVEL, + "__module__": "google.identity.accesscontextmanager.v1.access_level_pb2" + # @@protoc_insertion_point(class_scope:google.identity.accesscontextmanager.v1.BasicLevel) + }, +) +_sym_db.RegisterMessage(BasicLevel) + +Condition = _reflection.GeneratedProtocolMessageType( + "Condition", + (_message.Message,), + { + "DESCRIPTOR": _CONDITION, + "__module__": "google.identity.accesscontextmanager.v1.access_level_pb2" + # @@protoc_insertion_point(class_scope:google.identity.accesscontextmanager.v1.Condition) + }, +) +_sym_db.RegisterMessage(Condition) + +CustomLevel = _reflection.GeneratedProtocolMessageType( + "CustomLevel", + (_message.Message,), + { + "DESCRIPTOR": _CUSTOMLEVEL, + "__module__": "google.identity.accesscontextmanager.v1.access_level_pb2" + # @@protoc_insertion_point(class_scope:google.identity.accesscontextmanager.v1.CustomLevel) + }, +) +_sym_db.RegisterMessage(CustomLevel) + +DevicePolicy = _reflection.GeneratedProtocolMessageType( + "DevicePolicy", + (_message.Message,), + { + "DESCRIPTOR": _DEVICEPOLICY, + "__module__": "google.identity.accesscontextmanager.v1.access_level_pb2" + # @@protoc_insertion_point(class_scope:google.identity.accesscontextmanager.v1.DevicePolicy) + }, ) +_sym_db.RegisterMessage(DevicePolicy) + +OsConstraint = _reflection.GeneratedProtocolMessageType( + "OsConstraint", + (_message.Message,), + { + "DESCRIPTOR": _OSCONSTRAINT, + "__module__": "google.identity.accesscontextmanager.v1.access_level_pb2" + # @@protoc_insertion_point(class_scope:google.identity.accesscontextmanager.v1.OsConstraint) + }, +) +_sym_db.RegisterMessage(OsConstraint) + if _descriptor._USE_C_DESCRIPTORS == False: DESCRIPTOR._options = None diff --git a/google/identity/accesscontextmanager/v1/access_policy_pb2.py b/google/identity/accesscontextmanager/v1/access_policy_pb2.py index 01fb703..90e0776 100644 --- a/google/identity/accesscontextmanager/v1/access_policy_pb2.py +++ b/google/identity/accesscontextmanager/v1/access_policy_pb2.py @@ -17,9 +17,10 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # source: google/identity/accesscontextmanager/v1/access_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) @@ -35,10 +36,19 @@ b"\n;google/identity/accesscontextmanager/v1/access_policy.proto\x12'google.identity.accesscontextmanager.v1\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1cgoogle/api/annotations.proto\"\xab\x01\n\x0c\x41\x63\x63\x65ssPolicy\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0e\n\x06parent\x18\x02 \x01(\t\x12\r\n\x05title\x18\x03 \x01(\t\x12/\n\x0b\x63reate_time\x18\x04 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12/\n\x0bupdate_time\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x0c\n\x04\x65tag\x18\x06 \x01(\tB\xa1\x02\n+com.google.identity.accesscontextmanager.v1B\x0bPolicyProtoP\x01Z[google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1;accesscontextmanager\xa2\x02\x04GACM\xaa\x02'Google.Identity.AccessContextManager.V1\xca\x02'Google\\Identity\\AccessContextManager\\V1\xea\x02*Google::Identity::AccessContextManager::V1b\x06proto3" ) -_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) -_builder.BuildTopDescriptorsAndMessages( - DESCRIPTOR, "google.identity.accesscontextmanager.v1.access_policy_pb2", globals() + +_ACCESSPOLICY = DESCRIPTOR.message_types_by_name["AccessPolicy"] +AccessPolicy = _reflection.GeneratedProtocolMessageType( + "AccessPolicy", + (_message.Message,), + { + "DESCRIPTOR": _ACCESSPOLICY, + "__module__": "google.identity.accesscontextmanager.v1.access_policy_pb2" + # @@protoc_insertion_point(class_scope:google.identity.accesscontextmanager.v1.AccessPolicy) + }, ) +_sym_db.RegisterMessage(AccessPolicy) + if _descriptor._USE_C_DESCRIPTORS == False: DESCRIPTOR._options = None diff --git a/google/identity/accesscontextmanager/v1/service_perimeter_pb2.py b/google/identity/accesscontextmanager/v1/service_perimeter_pb2.py index 4fad67a..7635d8f 100644 --- a/google/identity/accesscontextmanager/v1/service_perimeter_pb2.py +++ b/google/identity/accesscontextmanager/v1/service_perimeter_pb2.py @@ -17,9 +17,10 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # source: google/identity/accesscontextmanager/v1/service_perimeter.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) @@ -35,12 +36,45 @@ b"\n?google/identity/accesscontextmanager/v1/service_perimeter.proto\x12'google.identity.accesscontextmanager.v1\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1cgoogle/api/annotations.proto\"\x92\x04\n\x10ServicePerimeter\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05title\x18\x02 \x01(\t\x12\x13\n\x0b\x64\x65scription\x18\x03 \x01(\t\x12/\n\x0b\x63reate_time\x18\x04 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12/\n\x0bupdate_time\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12_\n\x0eperimeter_type\x18\x06 \x01(\x0e\x32G.google.identity.accesscontextmanager.v1.ServicePerimeter.PerimeterType\x12O\n\x06status\x18\x07 \x01(\x0b\x32?.google.identity.accesscontextmanager.v1.ServicePerimeterConfig\x12M\n\x04spec\x18\x08 \x01(\x0b\x32?.google.identity.accesscontextmanager.v1.ServicePerimeterConfig\x12!\n\x19use_explicit_dry_run_spec\x18\t \x01(\x08\"F\n\rPerimeterType\x12\x1a\n\x16PERIMETER_TYPE_REGULAR\x10\x00\x12\x19\n\x15PERIMETER_TYPE_BRIDGE\x10\x01\"\xa6\x02\n\x16ServicePerimeterConfig\x12\x11\n\tresources\x18\x01 \x03(\t\x12\x15\n\raccess_levels\x18\x02 \x03(\t\x12\x1b\n\x13restricted_services\x18\x04 \x03(\t\x12v\n\x17vpc_accessible_services\x18\n \x01(\x0b\x32U.google.identity.accesscontextmanager.v1.ServicePerimeterConfig.VpcAccessibleServices\x1aM\n\x15VpcAccessibleServices\x12\x1a\n\x12\x65nable_restriction\x18\x01 \x01(\x08\x12\x18\n\x10\x61llowed_services\x18\x02 \x03(\tB\xab\x02\n+com.google.identity.accesscontextmanager.v1B\x15ServicePerimeterProtoP\x01Z[google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1;accesscontextmanager\xa2\x02\x04GACM\xaa\x02'Google.Identity.AccessContextManager.V1\xca\x02'Google\\Identity\\AccessContextManager\\V1\xea\x02*Google::Identity::AccessContextManager::V1b\x06proto3" ) -_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) -_builder.BuildTopDescriptorsAndMessages( - DESCRIPTOR, - "google.identity.accesscontextmanager.v1.service_perimeter_pb2", - globals(), + +_SERVICEPERIMETER = DESCRIPTOR.message_types_by_name["ServicePerimeter"] +_SERVICEPERIMETERCONFIG = DESCRIPTOR.message_types_by_name["ServicePerimeterConfig"] +_SERVICEPERIMETERCONFIG_VPCACCESSIBLESERVICES = ( + _SERVICEPERIMETERCONFIG.nested_types_by_name["VpcAccessibleServices"] +) +_SERVICEPERIMETER_PERIMETERTYPE = _SERVICEPERIMETER.enum_types_by_name["PerimeterType"] +ServicePerimeter = _reflection.GeneratedProtocolMessageType( + "ServicePerimeter", + (_message.Message,), + { + "DESCRIPTOR": _SERVICEPERIMETER, + "__module__": "google.identity.accesscontextmanager.v1.service_perimeter_pb2" + # @@protoc_insertion_point(class_scope:google.identity.accesscontextmanager.v1.ServicePerimeter) + }, ) +_sym_db.RegisterMessage(ServicePerimeter) + +ServicePerimeterConfig = _reflection.GeneratedProtocolMessageType( + "ServicePerimeterConfig", + (_message.Message,), + { + "VpcAccessibleServices": _reflection.GeneratedProtocolMessageType( + "VpcAccessibleServices", + (_message.Message,), + { + "DESCRIPTOR": _SERVICEPERIMETERCONFIG_VPCACCESSIBLESERVICES, + "__module__": "google.identity.accesscontextmanager.v1.service_perimeter_pb2" + # @@protoc_insertion_point(class_scope:google.identity.accesscontextmanager.v1.ServicePerimeterConfig.VpcAccessibleServices) + }, + ), + "DESCRIPTOR": _SERVICEPERIMETERCONFIG, + "__module__": "google.identity.accesscontextmanager.v1.service_perimeter_pb2" + # @@protoc_insertion_point(class_scope:google.identity.accesscontextmanager.v1.ServicePerimeterConfig) + }, +) +_sym_db.RegisterMessage(ServicePerimeterConfig) +_sym_db.RegisterMessage(ServicePerimeterConfig.VpcAccessibleServices) + if _descriptor._USE_C_DESCRIPTORS == False: DESCRIPTOR._options = None diff --git a/noxfile.py b/noxfile.py index 80cc0f0..a741df2 100644 --- a/noxfile.py +++ b/noxfile.py @@ -28,6 +28,12 @@ ISORT_VERSION = "isort==5.10.1" LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] +# 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" + DEFAULT_PYTHON_VERSION = "3.8" UNIT_TEST_PYTHON_VERSIONS = ["3.7", "3.8", "3.9", "3.10"] @@ -253,7 +259,7 @@ def generate_protos(session): If a new subdirectory is added, you will need to create more `__init__.py` files. """ - session.install("grpcio-tools") + session.install(GRPCIO_TOOLS_VERSION) protos = [str(p) for p in (pathlib.Path(".").glob("google/**/*.proto"))] session.run( diff --git a/setup.py b/setup.py index acdd90d..2bf1eda 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ release_status = "Development Status :: 4 - Beta" dependencies = [ "google-api-core[grpc] >= 1.32.0, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*", - "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", ] # Setup boilerplate below this line. diff --git a/testing/constraints-3.7.txt b/testing/constraints-3.7.txt index e933c9d..c467c64 100644 --- a/testing/constraints-3.7.txt +++ b/testing/constraints-3.7.txt @@ -5,5 +5,5 @@ # # e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev", # Then this file should have foo==1.14.0 -protobuf==3.20.2 +protobuf==3.19.5 google-api-core==1.32.0