meshtrade 1.23.1__tar.gz → 1.25.0__tar.gz

{meshtrade-1.23.1 → meshtrade-1.25.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshtrade
-Version: 1.23.1
+Version: 1.25.0
 Summary: Integration SDK for Mesh API Services
 Author-email: Bernard Bussy <bernard@meshtrade.co>
 License: LicenseRef-My-Custom-License

{meshtrade-1.23.1 → meshtrade-1.25.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "meshtrade"
-version = "1.23.1"
+version = "1.25.0"
 authors = [
     { name = "Bernard Bussy", email = "bernard@meshtrade.co" },
 ]

{meshtrade-1.23.1 → meshtrade-1.25.0}/python/src/meshtrade/compliance/client/v1/__init__.py

@@ -55,13 +55,6 @@ from .service_meshpy import (
 #
 # ===================================================================
 
-from .client_roles import (
-    get_client_default_role_index,
-    get_client_default_roles,
-    must_get_client_default_role_index,
-    must_get_client_default_roles,
-)
-
 # ===================================================================
 # MODULE EXPORTS
 # ===================================================================
@@ -91,9 +84,4 @@ __all__ = [
     "TaxResidency",
     "Trust",
     "VerificationStatus",
-    # Manual exports
-    "get_client_default_role_index",
-    "get_client_default_roles",
-    "must_get_client_default_role_index",
-    "must_get_client_default_roles",
 ]

{meshtrade-1.23.1 → meshtrade-1.25.0}/python/src/meshtrade/compliance/client/v1/client_pb2.py

@@ -25,14 +25,13 @@ _sym_db = _symbol_database.Default()
 from buf.validate import validate_pb2 as buf_dot_validate_dot_validate__pb2
 from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2
 from meshtrade.compliance.client.v1 import company_pb2 as meshtrade_dot_compliance_dot_client_dot_v1_dot_company__pb2
-from meshtrade.iam.role.v1 import role_pb2 as meshtrade_dot_iam_dot_role_dot_v1_dot_role__pb2
 from meshtrade.compliance.client.v1 import fund_pb2 as meshtrade_dot_compliance_dot_client_dot_v1_dot_fund__pb2
 from meshtrade.compliance.client.v1 import natural_person_pb2 as meshtrade_dot_compliance_dot_client_dot_v1_dot_natural__person__pb2
 from meshtrade.compliance.client.v1 import trust_pb2 as meshtrade_dot_compliance_dot_client_dot_v1_dot_trust__pb2
 from meshtrade.compliance.client.v1 import verification_status_pb2 as meshtrade_dot_compliance_dot_client_dot_v1_dot_verification__status__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n+meshtrade/compliance/client/v1/client.proto\x12\x1emeshtrade.compliance.client.v1\x1a\x1b\x62uf/validate/validate.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a,meshtrade/compliance/client/v1/company.proto\x1a meshtrade/iam/role/v1/role.proto\x1a)meshtrade/compliance/client/v1/fund.proto\x1a\x33meshtrade/compliance/client/v1/natural_person.proto\x1a*meshtrade/compliance/client/v1/trust.proto\x1a\x38meshtrade/compliance/client/v1/verification_status.proto\"\xec\t\n\x06\x43lient\x12\xbe\x01\n\x04name\x18\x01 \x01(\tB\xa9\x01\xbaH\xa5\x01\xba\x01\xa1\x01\n\x14name.format.optional\x12\x34name must be empty or in the format clients/{ULIDv2}\x1aSsize(this) == 0 || this.matches(\'^clients/[0123456789ABCDEFGHJKMNPQRSTVWXYZ]{26}$\')R\x04name\x12R\n\x05owner\x18\x02 \x01(\tB<\xbaH9r42/^groups/[0123456789ABCDEFGHJKMNPQRSTVWXYZ]{26}$\x98\x01!\xc8\x01\x01R\x05owner\x12\x30\n\x0c\x64isplay_name\x18\x03 \x01(\tB\r\xbaH\nr\x05\x10\x01\x18\xff\x01\xc8\x01\x01R\x0b\x64isplayName\x12V\n\x0enatural_person\x18\x04 \x01(\x0b\x32-.meshtrade.compliance.client.v1.NaturalPersonH\x00R\rnaturalPerson\x12\x43\n\x07\x63ompany\x18\x05 \x01(\x0b\x32\'.meshtrade.compliance.client.v1.CompanyH\x00R\x07\x63ompany\x12:\n\x04\x66und\x18\x06 \x01(\x0b\x32$.meshtrade.compliance.client.v1.FundH\x00R\x04\x66und\x12=\n\x05trust\x18\x07 \x01(\x0b\x32%.meshtrade.compliance.client.v1.TrustH\x00R\x05trust\x12p\n\x13verification_status\x18\x08 \x01(\x0e\x32\x32.meshtrade.compliance.client.v1.VerificationStatusB\x0b\xbaH\x08\x82\x01\x02\x10\x01\xc8\x01\x01R\x12verificationStatus\x12\x85\x02\n\x16verification_authority\x18\t \x01(\tB\xcd\x01\xbaH\xc9\x01\xba\x01\xc5\x01\n&verification_authority.format.optional\x12\x46verification_authority must be empty or in the format clients/{ULIDv2}\x1aSsize(this) == 0 || this.matches(\'^clients/[0123456789ABCDEFGHJKMNPQRSTVWXYZ]{26}$\')R\x15verificationAuthority\x12G\n\x11verification_date\x18\n \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x10verificationDate\x12P\n\x16next_verification_date\x18\x0b \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x14nextVerificationDate\x12\x43\n\x05roles\x18\x0c \x03(\x0e\x32\x1b.meshtrade.iam.role.v1.RoleB\x10\xbaH\r\x92\x01\x07\"\x05\x82\x01\x02\x10\x01\xc8\x01\x01R\x05roles:\x19\xb2\xb5\x18\x15\n\x13\x83\x89z\xc1\x8d\xb7\x01\xc3\x8d\xb7\x01\xc5\x8d\xb7\x01\xc7\x8d\xb7\x01\x42\x0e\n\x0clegal_personBc\n%co.meshtrade.api.compliance.client.v1Z:github.com/meshtrade/api/go/compliance/client/v1;client_v1b\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n+meshtrade/compliance/client/v1/client.proto\x12\x1emeshtrade.compliance.client.v1\x1a\x1b\x62uf/validate/validate.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a,meshtrade/compliance/client/v1/company.proto\x1a)meshtrade/compliance/client/v1/fund.proto\x1a\x33meshtrade/compliance/client/v1/natural_person.proto\x1a*meshtrade/compliance/client/v1/trust.proto\x1a\x38meshtrade/compliance/client/v1/verification_status.proto\"\x8c\t\n\x06\x43lient\x12\xbe\x01\n\x04name\x18\x01 \x01(\tB\xa9\x01\xbaH\xa5\x01\xba\x01\xa1\x01\n\x14name.format.optional\x12\x34name must be empty or in the format clients/{ULIDv2}\x1aSsize(this) == 0 || this.matches(\'^clients/[0123456789ABCDEFGHJKMNPQRSTVWXYZ]{26}$\')R\x04name\x12R\n\x05owner\x18\x02 \x01(\tB<\xbaH9r42/^groups/[0123456789ABCDEFGHJKMNPQRSTVWXYZ]{26}$\x98\x01!\xc8\x01\x01R\x05owner\x12\x30\n\x0c\x64isplay_name\x18\x03 \x01(\tB\r\xbaH\nr\x05\x10\x01\x18\xff\x01\xc8\x01\x01R\x0b\x64isplayName\x12V\n\x0enatural_person\x18\x04 \x01(\x0b\x32-.meshtrade.compliance.client.v1.NaturalPersonH\x00R\rnaturalPerson\x12\x43\n\x07\x63ompany\x18\x05 \x01(\x0b\x32\'.meshtrade.compliance.client.v1.CompanyH\x00R\x07\x63ompany\x12:\n\x04\x66und\x18\x06 \x01(\x0b\x32$.meshtrade.compliance.client.v1.FundH\x00R\x04\x66und\x12=\n\x05trust\x18\x07 \x01(\x0b\x32%.meshtrade.compliance.client.v1.TrustH\x00R\x05trust\x12p\n\x13verification_status\x18\x08 \x01(\x0e\x32\x32.meshtrade.compliance.client.v1.VerificationStatusB\x0b\xbaH\x08\x82\x01\x02\x10\x01\xc8\x01\x01R\x12verificationStatus\x12\x85\x02\n\x16verification_authority\x18\t \x01(\tB\xcd\x01\xbaH\xc9\x01\xba\x01\xc5\x01\n&verification_authority.format.optional\x12\x46verification_authority must be empty or in the format clients/{ULIDv2}\x1aSsize(this) == 0 || this.matches(\'^clients/[0123456789ABCDEFGHJKMNPQRSTVWXYZ]{26}$\')R\x15verificationAuthority\x12G\n\x11verification_date\x18\n \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x10verificationDate\x12P\n\x16next_verification_date\x18\x0b \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x14nextVerificationDateB\x0e\n\x0clegal_personBc\n%co.meshtrade.api.compliance.client.v1Z:github.com/meshtrade/api/go/compliance/client/v1;client_v1b\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -50,10 +49,6 @@ if not _descriptor._USE_C_DESCRIPTORS:
   _globals['_CLIENT'].fields_by_name['verification_status']._serialized_options = b'\272H\010\202\001\002\020\001\310\001\001'
   _globals['_CLIENT'].fields_by_name['verification_authority']._loaded_options = None
   _globals['_CLIENT'].fields_by_name['verification_authority']._serialized_options = b'\272H\311\001\272\001\305\001\n&verification_authority.format.optional\022Fverification_authority must be empty or in the format clients/{ULIDv2}\032Ssize(this) == 0 || this.matches(\'^clients/[0123456789ABCDEFGHJKMNPQRSTVWXYZ]{26}$\')'
-  _globals['_CLIENT'].fields_by_name['roles']._loaded_options = None
-  _globals['_CLIENT'].fields_by_name['roles']._serialized_options = b'\272H\r\222\001\007\"\005\202\001\002\020\001\310\001\001'
-  _globals['_CLIENT']._loaded_options = None
-  _globals['_CLIENT']._serialized_options = b'\262\265\030\025\n\023\203\211z\301\215\267\001\303\215\267\001\305\215\267\001\307\215\267\001'
-  _globals['_CLIENT']._serialized_start=420
-  _globals['_CLIENT']._serialized_end=1680
+  _globals['_CLIENT']._serialized_start=386
+  _globals['_CLIENT']._serialized_end=1550
 # @@protoc_insertion_point(module_scope)

{meshtrade-1.23.1 → meshtrade-1.25.0}/python/src/meshtrade/compliance/client/v1/client_pb2.pyi

@@ -3,21 +3,19 @@ import datetime
 from buf.validate import validate_pb2 as _validate_pb2
 from google.protobuf import timestamp_pb2 as _timestamp_pb2
 from meshtrade.compliance.client.v1 import company_pb2 as _company_pb2
-from meshtrade.iam.role.v1 import role_pb2 as _role_pb2
 from meshtrade.compliance.client.v1 import fund_pb2 as _fund_pb2
 from meshtrade.compliance.client.v1 import natural_person_pb2 as _natural_person_pb2
 from meshtrade.compliance.client.v1 import trust_pb2 as _trust_pb2
 from meshtrade.compliance.client.v1 import verification_status_pb2 as _verification_status_pb2
-from google.protobuf.internal import containers as _containers
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message
-from collections.abc import Iterable as _Iterable, Mapping as _Mapping
+from collections.abc import Mapping as _Mapping
 from typing import ClassVar as _ClassVar, Optional as _Optional, Union as _Union
 
 DESCRIPTOR: _descriptor.FileDescriptor
 
 class Client(_message.Message):
-    __slots__ = ("name", "owner", "display_name", "natural_person", "company", "fund", "trust", "verification_status", "verification_authority", "verification_date", "next_verification_date", "roles")
+    __slots__ = ("name", "owner", "display_name", "natural_person", "company", "fund", "trust", "verification_status", "verification_authority", "verification_date", "next_verification_date")
     NAME_FIELD_NUMBER: _ClassVar[int]
     OWNER_FIELD_NUMBER: _ClassVar[int]
     DISPLAY_NAME_FIELD_NUMBER: _ClassVar[int]
@@ -29,7 +27,6 @@ class Client(_message.Message):
     VERIFICATION_AUTHORITY_FIELD_NUMBER: _ClassVar[int]
     VERIFICATION_DATE_FIELD_NUMBER: _ClassVar[int]
     NEXT_VERIFICATION_DATE_FIELD_NUMBER: _ClassVar[int]
-    ROLES_FIELD_NUMBER: _ClassVar[int]
     name: str
     owner: str
     display_name: str
@@ -41,5 +38,4 @@ class Client(_message.Message):
     verification_authority: str
     verification_date: _timestamp_pb2.Timestamp
     next_verification_date: _timestamp_pb2.Timestamp
-    roles: _containers.RepeatedScalarFieldContainer[_role_pb2.Role]
-    def __init__(self, name: _Optional[str] = ..., owner: _Optional[str] = ..., display_name: _Optional[str] = ..., natural_person: _Optional[_Union[_natural_person_pb2.NaturalPerson, _Mapping]] = ..., company: _Optional[_Union[_company_pb2.Company, _Mapping]] = ..., fund: _Optional[_Union[_fund_pb2.Fund, _Mapping]] = ..., trust: _Optional[_Union[_trust_pb2.Trust, _Mapping]] = ..., verification_status: _Optional[_Union[_verification_status_pb2.VerificationStatus, str]] = ..., verification_authority: _Optional[str] = ..., verification_date: _Optional[_Union[datetime.datetime, _timestamp_pb2.Timestamp, _Mapping]] = ..., next_verification_date: _Optional[_Union[datetime.datetime, _timestamp_pb2.Timestamp, _Mapping]] = ..., roles: _Optional[_Iterable[_Union[_role_pb2.Role, str]]] = ...) -> None: ...
+    def __init__(self, name: _Optional[str] = ..., owner: _Optional[str] = ..., display_name: _Optional[str] = ..., natural_person: _Optional[_Union[_natural_person_pb2.NaturalPerson, _Mapping]] = ..., company: _Optional[_Union[_company_pb2.Company, _Mapping]] = ..., fund: _Optional[_Union[_fund_pb2.Fund, _Mapping]] = ..., trust: _Optional[_Union[_trust_pb2.Trust, _Mapping]] = ..., verification_status: _Optional[_Union[_verification_status_pb2.VerificationStatus, str]] = ..., verification_authority: _Optional[str] = ..., verification_date: _Optional[_Union[datetime.datetime, _timestamp_pb2.Timestamp, _Mapping]] = ..., next_verification_date: _Optional[_Union[datetime.datetime, _timestamp_pb2.Timestamp, _Mapping]] = ...) -> None: ...

{meshtrade-1.23.1 → meshtrade-1.25.0}/python/src/meshtrade/iam/api_user/v1/__init__.py

@@ -17,14 +17,14 @@ from .api_credentials_pb2 import APICredentials
 from .api_user_pb2 import APIUser, APIUserAction, APIUserState
 from .service_pb2 import (
     ActivateApiUserRequest,
-    AssignRoleToAPIUserRequest,
+    AssignRolesToAPIUserRequest,
     CreateApiUserRequest,
     DeactivateApiUserRequest,
     GetApiUserByKeyHashRequest,
     GetApiUserRequest,
     ListApiUsersRequest,
     ListApiUsersResponse,
-    RevokeRoleFromAPIUserRequest,
+    RevokeRolesFromAPIUserRequest,
     SearchApiUsersRequest,
     SearchApiUsersResponse,
 )
@@ -82,14 +82,14 @@ __all__ = [
     "ApiUserService",
     "ApiUserServiceGRPCClient",
     "ApiUserServiceGRPCClientInterface",
-    "AssignRoleToAPIUserRequest",
+    "AssignRolesToAPIUserRequest",
     "CreateApiUserRequest",
     "DeactivateApiUserRequest",
     "GetApiUserByKeyHashRequest",
     "GetApiUserRequest",
     "ListApiUsersRequest",
     "ListApiUsersResponse",
-    "RevokeRoleFromAPIUserRequest",
+    "RevokeRolesFromAPIUserRequest",
     "SearchApiUsersRequest",
     "SearchApiUsersResponse",
     # Manual exports

{meshtrade-1.23.1 → meshtrade-1.25.0}/python/src/meshtrade/iam/api_user/v1/api_user_pb2.py

@@ -25,7 +25,7 @@ _sym_db = _symbol_database.Default()
 from buf.validate import validate_pb2 as buf_dot_validate_dot_validate__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n(meshtrade/iam/api_user/v1/api_user.proto\x12\x19meshtrade.iam.api_user.v1\x1a\x1b\x62uf/validate/validate.proto\"\x97\x06\n\x07\x41PIUser\x12\xc2\x01\n\x04name\x18\x01 \x01(\tB\xad\x01\xbaH\xa9\x01\xba\x01\xa5\x01\n\x14name.format.optional\x12\x36name must be empty or in the format api_users/{ULIDv2}\x1aUsize(this) == 0 || this.matches(\'^api_users/[0123456789ABCDEFGHJKMNPQRSTVWXYZ]{26}$\')R\x04name\x12R\n\x05owner\x18\x02 \x01(\tB<\xbaH9r42/^groups/[0123456789ABCDEFGHJKMNPQRSTVWXYZ]{26}$\x98\x01!\xc8\x01\x01R\x05owner\x12\xb4\x01\n\x0c\x64isplay_name\x18\x04 \x01(\tB\x90\x01\xbaH\x8c\x01r\x05\x10\x01\x18\xff\x01\xba\x01\x7f\n\x15\x64isplay_name.required\x12\x41\x64isplay name is required and must be between 1 and 255 characters\x1a#size(this) > 0 && size(this) <= 255\xc8\x01\x01R\x0b\x64isplayName\x12\xbe\x01\n\x05state\x18\x05 \x01(\x0e\x32\'.meshtrade.iam.api_user.v1.APIUserStateB\x7f\xbaH|\x82\x01\x02\x10\x01\xba\x01t\n\x0bstate.valid\x12/state must be a valid APIUserState if specified\x1a\x34int(this) == 0 || (int(this) >= 1 && int(this) <= 2)R\x05state\x12\x62\n\x05roles\x18\x06 \x03(\tBL\xbaHI\x92\x01\x46\"DrB2=^groups/[0123456789ABCDEFGHJKMNPQRSTVWXYZ]{26}/[1-9][0-9]{6}$\x98\x01)R\x05roles\x12\x17\n\x07\x61pi_key\x18\x07 \x01(\tR\x06\x61piKey*f\n\x0c\x41PIUserState\x12\x1e\n\x1a\x41PI_USER_STATE_UNSPECIFIED\x10\x00\x12\x19\n\x15\x41PI_USER_STATE_ACTIVE\x10\x01\x12\x1b\n\x17\x41PI_USER_STATE_INACTIVE\x10\x02*\xa6\x01\n\rAPIUserAction\x12\x1f\n\x1b\x41PI_USER_ACTION_UNSPECIFIED\x10\x00\x12\x1c\n\x18\x41PI_USER_ACTION_ACTIVATE\x10\x01\x12\x1e\n\x1a\x41PI_USER_ACTION_DEACTIVATE\x10\x02\x12\x1a\n\x16\x41PI_USER_ACTION_CREATE\x10\x03\x12\x1a\n\x16\x41PI_USER_ACTION_UPDATE\x10\x04\x42[\n co.meshtrade.api.iam.api_user.v1Z7github.com/meshtrade/api/go/iam/api_user/v1;api_user_v1b\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n(meshtrade/iam/api_user/v1/api_user.proto\x12\x19meshtrade.iam.api_user.v1\x1a\x1b\x62uf/validate/validate.proto\"\xa0\x06\n\x07\x41PIUser\x12\xc2\x01\n\x04name\x18\x01 \x01(\tB\xad\x01\xbaH\xa9\x01\xba\x01\xa5\x01\n\x14name.format.optional\x12\x36name must be empty or in the format api_users/{ULIDv2}\x1aUsize(this) == 0 || this.matches(\'^api_users/[0123456789ABCDEFGHJKMNPQRSTVWXYZ]{26}$\')R\x04name\x12R\n\x05owner\x18\x02 \x01(\tB<\xbaH9r42/^groups/[0123456789ABCDEFGHJKMNPQRSTVWXYZ]{26}$\x98\x01!\xc8\x01\x01R\x05owner\x12\xb4\x01\n\x0c\x64isplay_name\x18\x03 \x01(\tB\x90\x01\xbaH\x8c\x01r\x05\x10\x01\x18\xff\x01\xba\x01\x7f\n\x15\x64isplay_name.required\x12\x41\x64isplay name is required and must be between 1 and 255 characters\x1a#size(this) > 0 && size(this) <= 255\xc8\x01\x01R\x0b\x64isplayName\x12\xbe\x01\n\x05state\x18\x04 \x01(\x0e\x32\'.meshtrade.iam.api_user.v1.APIUserStateB\x7f\xbaH|\x82\x01\x02\x10\x01\xba\x01t\n\x0bstate.valid\x12/state must be a valid APIUserState if specified\x1a\x34int(this) == 0 || (int(this) >= 1 && int(this) <= 2)R\x05state\x12k\n\x05roles\x18\x05 \x03(\tBU\xbaHR\x92\x01O\"MrK\x10/\x18\x30\x32\x45^groups/[0123456789ABCDEFGHJKMNPQRSTVWXYZ]{26}/roles/[1-9][0-9]{6,7}$R\x05roles\x12\x17\n\x07\x61pi_key\x18\x06 \x01(\tR\x06\x61piKey*f\n\x0c\x41PIUserState\x12\x1e\n\x1a\x41PI_USER_STATE_UNSPECIFIED\x10\x00\x12\x19\n\x15\x41PI_USER_STATE_ACTIVE\x10\x01\x12\x1b\n\x17\x41PI_USER_STATE_INACTIVE\x10\x02*\xa6\x01\n\rAPIUserAction\x12\x1f\n\x1b\x41PI_USER_ACTION_UNSPECIFIED\x10\x00\x12\x1c\n\x18\x41PI_USER_ACTION_ACTIVATE\x10\x01\x12\x1e\n\x1a\x41PI_USER_ACTION_DEACTIVATE\x10\x02\x12\x1a\n\x16\x41PI_USER_ACTION_CREATE\x10\x03\x12\x1a\n\x16\x41PI_USER_ACTION_UPDATE\x10\x04\x42[\n co.meshtrade.api.iam.api_user.v1Z7github.com/meshtrade/api/go/iam/api_user/v1;api_user_v1b\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -42,11 +42,11 @@ if not _descriptor._USE_C_DESCRIPTORS:
   _globals['_APIUSER'].fields_by_name['state']._loaded_options = None
   _globals['_APIUSER'].fields_by_name['state']._serialized_options = b'\272H|\202\001\002\020\001\272\001t\n\013state.valid\022/state must be a valid APIUserState if specified\0324int(this) == 0 || (int(this) >= 1 && int(this) <= 2)'
   _globals['_APIUSER'].fields_by_name['roles']._loaded_options = None
-  _globals['_APIUSER'].fields_by_name['roles']._serialized_options = b'\272HI\222\001F\"DrB2=^groups/[0123456789ABCDEFGHJKMNPQRSTVWXYZ]{26}/[1-9][0-9]{6}$\230\001)'
-  _globals['_APIUSERSTATE']._serialized_start=894
-  _globals['_APIUSERSTATE']._serialized_end=996
-  _globals['_APIUSERACTION']._serialized_start=999
-  _globals['_APIUSERACTION']._serialized_end=1165
+  _globals['_APIUSER'].fields_by_name['roles']._serialized_options = b'\272HR\222\001O\"MrK\020/\03002E^groups/[0123456789ABCDEFGHJKMNPQRSTVWXYZ]{26}/roles/[1-9][0-9]{6,7}$'
+  _globals['_APIUSERSTATE']._serialized_start=903
+  _globals['_APIUSERSTATE']._serialized_end=1005
+  _globals['_APIUSERACTION']._serialized_start=1008
+  _globals['_APIUSERACTION']._serialized_end=1174
   _globals['_APIUSER']._serialized_start=101
-  _globals['_APIUSER']._serialized_end=892
+  _globals['_APIUSER']._serialized_end=901
 # @@protoc_insertion_point(module_scope)

{meshtrade-1.23.1 → meshtrade-1.25.0}/python/src/meshtrade/iam/api_user/v1/service_meshpy.py

@@ -20,14 +20,14 @@ from .api_user_pb2 import APIUser
 from meshtrade.common.service_options import ServiceOptions
 from .service_pb2 import (
 ActivateApiUserRequest,
-AssignRoleToAPIUserRequest,
+AssignRolesToAPIUserRequest,
 CreateApiUserRequest,
 DeactivateApiUserRequest,
 GetApiUserByKeyHashRequest,
 GetApiUserRequest,
 ListApiUsersRequest,
 ListApiUsersResponse,
-RevokeRoleFromAPIUserRequest,
+RevokeRolesFromAPIUserRequest,
 SearchApiUsersRequest,
 SearchApiUsersResponse,
 )
@@ -172,37 +172,37 @@ class ApiUserService(BaseGRPCClient):
         """
         return self._execute_method("CreateApiUser", request, timeout)
 
-    def assign_role_to_apiuser(self, request: AssignRoleToAPIUserRequest, timeout: Optional[timedelta] = None) -> APIUser:
-        """AssignRoleToAPIUser method.
+    def assign_roles_to_apiuser(self, request: AssignRolesToAPIUserRequest, timeout: Optional[timedelta] = None) -> APIUser:
+        """AssignRolesToAPIUser method.
 
         Args:
-            request: The AssignRoleToAPIUser request message
+            request: The AssignRolesToAPIUser request message
             timeout: Optional timeout override for this call
 
         Returns:
-            The AssignRoleToAPIUser response message
+            The AssignRolesToAPIUser response message
 
         Raises:
             grpc.RpcError: If the gRPC call fails
             ValueError: If authentication credentials are missing
         """
-        return self._execute_method("AssignRoleToAPIUser", request, timeout)
+        return self._execute_method("AssignRolesToAPIUser", request, timeout)
 
-    def revoke_role_from_apiuser(self, request: RevokeRoleFromAPIUserRequest, timeout: Optional[timedelta] = None) -> APIUser:
-        """RevokeRoleFromAPIUser method.
+    def revoke_roles_from_apiuser(self, request: RevokeRolesFromAPIUserRequest, timeout: Optional[timedelta] = None) -> APIUser:
+        """RevokeRolesFromAPIUser method.
 
         Args:
-            request: The RevokeRoleFromAPIUser request message
+            request: The RevokeRolesFromAPIUser request message
             timeout: Optional timeout override for this call
 
         Returns:
-            The RevokeRoleFromAPIUser response message
+            The RevokeRolesFromAPIUser response message
 
         Raises:
             grpc.RpcError: If the gRPC call fails
             ValueError: If authentication credentials are missing
         """
-        return self._execute_method("RevokeRoleFromAPIUser", request, timeout)
+        return self._execute_method("RevokeRolesFromAPIUser", request, timeout)
 
     def list_api_users(self, request: ListApiUsersRequest, timeout: Optional[timedelta] = None) -> ListApiUsersResponse:
         """ListApiUsers method.

meshtrade-1.25.0/python/src/meshtrade/iam/api_user/v1/service_pb2.py

@@ -0,0 +1,99 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: meshtrade/iam/api_user/v1/service.proto
+# Protobuf Python Version: 6.31.1
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import runtime_version as _runtime_version
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+_runtime_version.ValidateProtobufRuntimeVersion(
+    _runtime_version.Domain.PUBLIC,
+    6,
+    31,
+    1,
+    '',
+    'meshtrade/iam/api_user/v1/service.proto'
+)
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from buf.validate import validate_pb2 as buf_dot_validate_dot_validate__pb2
+from meshtrade.iam.api_user.v1 import api_user_pb2 as meshtrade_dot_iam_dot_api__user_dot_v1_dot_api__user__pb2
+from meshtrade.iam.role.v1 import role_pb2 as meshtrade_dot_iam_dot_role_dot_v1_dot_role__pb2
+from meshtrade.option.v1 import method_type_pb2 as meshtrade_dot_option_dot_v1_dot_method__type__pb2
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\'meshtrade/iam/api_user/v1/service.proto\x12\x19meshtrade.iam.api_user.v1\x1a\x1b\x62uf/validate/validate.proto\x1a(meshtrade/iam/api_user/v1/api_user.proto\x1a meshtrade/iam/role/v1/role.proto\x1a%meshtrade/option/v1/method_type.proto\"h\n\x11GetApiUserRequest\x12S\n\x04name\x18\x01 \x01(\tB?\xbaH<r722^api_users/[0123456789ABCDEFGHJKMNPQRSTVWXYZ]{26}$\x98\x01$\xc8\x01\x01R\x04name\"Z\n\x1aGetApiUserByKeyHashRequest\x12<\n\x08key_hash\x18\x01 \x01(\tB!\xbaH\x1er\x19\x32\x14^[A-Za-z0-9+/]{43}=$\x98\x01,\xc8\x01\x01R\x07keyHash\"]\n\x14\x43reateApiUserRequest\x12\x45\n\x08\x61pi_user\x18\x01 \x01(\x0b\x32\".meshtrade.iam.api_user.v1.APIUserB\x06\xbaH\x03\xc8\x01\x01R\x07\x61piUser\"\xe2\x01\n\x1b\x41ssignRolesToAPIUserRequest\x12S\n\x04name\x18\x01 \x01(\tB?\xbaH<r722^api_users/[0123456789ABCDEFGHJKMNPQRSTVWXYZ]{26}$\x98\x01$\xc8\x01\x01R\x04name\x12n\n\x05roles\x18\x02 \x03(\tBX\xbaHU\x92\x01O\"MrK\x10/\x18\x30\x32\x45^groups/[0123456789ABCDEFGHJKMNPQRSTVWXYZ]{26}/roles/[1-9][0-9]{6,7}$\xc8\x01\x01R\x05roles\"\xe4\x01\n\x1dRevokeRolesFromAPIUserRequest\x12S\n\x04name\x18\x01 \x01(\tB?\xbaH<r722^api_users/[0123456789ABCDEFGHJKMNPQRSTVWXYZ]{26}$\x98\x01$\xc8\x01\x01R\x04name\x12n\n\x05roles\x18\x02 \x03(\tBX\xbaHU\x92\x01O\"MrK\x10/\x18\x30\x32\x45^groups/[0123456789ABCDEFGHJKMNPQRSTVWXYZ]{26}/roles/[1-9][0-9]{6,7}$\xc8\x01\x01R\x05roles\"\x15\n\x13ListApiUsersRequest\"W\n\x14ListApiUsersResponse\x12?\n\tapi_users\x18\x01 \x03(\x0b\x32\".meshtrade.iam.api_user.v1.APIUserR\x08\x61piUsers\":\n\x15SearchApiUsersRequest\x12!\n\x0c\x64isplay_name\x18\x01 \x01(\tR\x0b\x64isplayName\"Y\n\x16SearchApiUsersResponse\x12?\n\tapi_users\x18\x01 \x03(\x0b\x32\".meshtrade.iam.api_user.v1.APIUserR\x08\x61piUsers\"m\n\x16\x41\x63tivateApiUserRequest\x12S\n\x04name\x18\x01 \x01(\tB?\xbaH<r722^api_users/[0123456789ABCDEFGHJKMNPQRSTVWXYZ]{26}$\x98\x01$\xc8\x01\x01R\x04name\"o\n\x18\x44\x65\x61\x63tivateApiUserRequest\x12S\n\x04name\x18\x01 \x01(\tB?\xbaH<r722^api_users/[0123456789ABCDEFGHJKMNPQRSTVWXYZ]{26}$\x98\x01$\xc8\x01\x01R\x04name2\xce\t\n\x0e\x41piUserService\x12z\n\nGetApiUser\x12,.meshtrade.iam.api_user.v1.GetApiUserRequest\x1a\".meshtrade.iam.api_user.v1.APIUser\"\x1a\xa0\xb5\x18\x01\xaa\xb5\x18\x12\n\x10\xc0\x8d\xb7\x01\xc1\x8d\xb7\x01\xc2\x8d\xb7\x01\xc3\x8d\xb7\x01\x12x\n\rCreateApiUser\x12/.meshtrade.iam.api_user.v1.CreateApiUserRequest\x1a\".meshtrade.iam.api_user.v1.APIUser\"\x12\xa0\xb5\x18\x02\xaa\xb5\x18\n\n\x08\xc0\x8d\xb7\x01\xc2\x8d\xb7\x01\x12\x86\x01\n\x14\x41ssignRolesToAPIUser\x12\x36.meshtrade.iam.api_user.v1.AssignRolesToAPIUserRequest\x1a\".meshtrade.iam.api_user.v1.APIUser\"\x12\xa0\xb5\x18\x02\xaa\xb5\x18\n\n\x08\xc0\x8d\xb7\x01\xc2\x8d\xb7\x01\x12\x8a\x01\n\x16RevokeRolesFromAPIUser\x12\x38.meshtrade.iam.api_user.v1.RevokeRolesFromAPIUserRequest\x1a\".meshtrade.iam.api_user.v1.APIUser\"\x12\xa0\xb5\x18\x02\xaa\xb5\x18\n\n\x08\xc0\x8d\xb7\x01\xc2\x8d\xb7\x01\x12\x8b\x01\n\x0cListApiUsers\x12..meshtrade.iam.api_user.v1.ListApiUsersRequest\x1a/.meshtrade.iam.api_user.v1.ListApiUsersResponse\"\x1a\xa0\xb5\x18\x01\xaa\xb5\x18\x12\n\x10\xc0\x8d\xb7\x01\xc1\x8d\xb7\x01\xc2\x8d\xb7\x01\xc3\x8d\xb7\x01\x12\x91\x01\n\x0eSearchApiUsers\x12\x30.meshtrade.iam.api_user.v1.SearchApiUsersRequest\x1a\x31.meshtrade.iam.api_user.v1.SearchApiUsersResponse\"\x1a\xa0\xb5\x18\x01\xaa\xb5\x18\x12\n\x10\xc0\x8d\xb7\x01\xc1\x8d\xb7\x01\xc2\x8d\xb7\x01\xc3\x8d\xb7\x01\x12|\n\x0f\x41\x63tivateApiUser\x12\x31.meshtrade.iam.api_user.v1.ActivateApiUserRequest\x1a\".meshtrade.iam.api_user.v1.APIUser\"\x12\xa0\xb5\x18\x02\xaa\xb5\x18\n\n\x08\xc0\x8d\xb7\x01\xc2\x8d\xb7\x01\x12\x80\x01\n\x11\x44\x65\x61\x63tivateApiUser\x12\x33.meshtrade.iam.api_user.v1.DeactivateApiUserRequest\x1a\".meshtrade.iam.api_user.v1.APIUser\"\x12\xa0\xb5\x18\x02\xaa\xb5\x18\n\n\x08\xc0\x8d\xb7\x01\xc2\x8d\xb7\x01\x12\x8c\x01\n\x13GetApiUserByKeyHash\x12\x35.meshtrade.iam.api_user.v1.GetApiUserByKeyHashRequest\x1a\".meshtrade.iam.api_user.v1.APIUser\"\x1a\xa0\xb5\x18\x01\xaa\xb5\x18\x12\n\x10\xc0\x8d\xb7\x01\xc1\x8d\xb7\x01\xc2\x8d\xb7\x01\xc3\x8d\xb7\x01\x42[\n co.meshtrade.api.iam.api_user.v1Z7github.com/meshtrade/api/go/iam/api_user/v1;api_user_v1b\x06proto3')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtrade.iam.api_user.v1.service_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  _globals['DESCRIPTOR']._loaded_options = None
+  _globals['DESCRIPTOR']._serialized_options = b'\n co.meshtrade.api.iam.api_user.v1Z7github.com/meshtrade/api/go/iam/api_user/v1;api_user_v1'
+  _globals['_GETAPIUSERREQUEST'].fields_by_name['name']._loaded_options = None
+  _globals['_GETAPIUSERREQUEST'].fields_by_name['name']._serialized_options = b'\272H<r722^api_users/[0123456789ABCDEFGHJKMNPQRSTVWXYZ]{26}$\230\001$\310\001\001'
+  _globals['_GETAPIUSERBYKEYHASHREQUEST'].fields_by_name['key_hash']._loaded_options = None
+  _globals['_GETAPIUSERBYKEYHASHREQUEST'].fields_by_name['key_hash']._serialized_options = b'\272H\036r\0312\024^[A-Za-z0-9+/]{43}=$\230\001,\310\001\001'
+  _globals['_CREATEAPIUSERREQUEST'].fields_by_name['api_user']._loaded_options = None
+  _globals['_CREATEAPIUSERREQUEST'].fields_by_name['api_user']._serialized_options = b'\272H\003\310\001\001'
+  _globals['_ASSIGNROLESTOAPIUSERREQUEST'].fields_by_name['name']._loaded_options = None
+  _globals['_ASSIGNROLESTOAPIUSERREQUEST'].fields_by_name['name']._serialized_options = b'\272H<r722^api_users/[0123456789ABCDEFGHJKMNPQRSTVWXYZ]{26}$\230\001$\310\001\001'
+  _globals['_ASSIGNROLESTOAPIUSERREQUEST'].fields_by_name['roles']._loaded_options = None
+  _globals['_ASSIGNROLESTOAPIUSERREQUEST'].fields_by_name['roles']._serialized_options = b'\272HU\222\001O\"MrK\020/\03002E^groups/[0123456789ABCDEFGHJKMNPQRSTVWXYZ]{26}/roles/[1-9][0-9]{6,7}$\310\001\001'
+  _globals['_REVOKEROLESFROMAPIUSERREQUEST'].fields_by_name['name']._loaded_options = None
+  _globals['_REVOKEROLESFROMAPIUSERREQUEST'].fields_by_name['name']._serialized_options = b'\272H<r722^api_users/[0123456789ABCDEFGHJKMNPQRSTVWXYZ]{26}$\230\001$\310\001\001'
+  _globals['_REVOKEROLESFROMAPIUSERREQUEST'].fields_by_name['roles']._loaded_options = None
+  _globals['_REVOKEROLESFROMAPIUSERREQUEST'].fields_by_name['roles']._serialized_options = b'\272HU\222\001O\"MrK\020/\03002E^groups/[0123456789ABCDEFGHJKMNPQRSTVWXYZ]{26}/roles/[1-9][0-9]{6,7}$\310\001\001'
+  _globals['_ACTIVATEAPIUSERREQUEST'].fields_by_name['name']._loaded_options = None
+  _globals['_ACTIVATEAPIUSERREQUEST'].fields_by_name['name']._serialized_options = b'\272H<r722^api_users/[0123456789ABCDEFGHJKMNPQRSTVWXYZ]{26}$\230\001$\310\001\001'
+  _globals['_DEACTIVATEAPIUSERREQUEST'].fields_by_name['name']._loaded_options = None
+  _globals['_DEACTIVATEAPIUSERREQUEST'].fields_by_name['name']._serialized_options = b'\272H<r722^api_users/[0123456789ABCDEFGHJKMNPQRSTVWXYZ]{26}$\230\001$\310\001\001'
+  _globals['_APIUSERSERVICE'].methods_by_name['GetApiUser']._loaded_options = None
+  _globals['_APIUSERSERVICE'].methods_by_name['GetApiUser']._serialized_options = b'\240\265\030\001\252\265\030\022\n\020\300\215\267\001\301\215\267\001\302\215\267\001\303\215\267\001'
+  _globals['_APIUSERSERVICE'].methods_by_name['CreateApiUser']._loaded_options = None
+  _globals['_APIUSERSERVICE'].methods_by_name['CreateApiUser']._serialized_options = b'\240\265\030\002\252\265\030\n\n\010\300\215\267\001\302\215\267\001'
+  _globals['_APIUSERSERVICE'].methods_by_name['AssignRolesToAPIUser']._loaded_options = None
+  _globals['_APIUSERSERVICE'].methods_by_name['AssignRolesToAPIUser']._serialized_options = b'\240\265\030\002\252\265\030\n\n\010\300\215\267\001\302\215\267\001'
+  _globals['_APIUSERSERVICE'].methods_by_name['RevokeRolesFromAPIUser']._loaded_options = None
+  _globals['_APIUSERSERVICE'].methods_by_name['RevokeRolesFromAPIUser']._serialized_options = b'\240\265\030\002\252\265\030\n\n\010\300\215\267\001\302\215\267\001'
+  _globals['_APIUSERSERVICE'].methods_by_name['ListApiUsers']._loaded_options = None
+  _globals['_APIUSERSERVICE'].methods_by_name['ListApiUsers']._serialized_options = b'\240\265\030\001\252\265\030\022\n\020\300\215\267\001\301\215\267\001\302\215\267\001\303\215\267\001'
+  _globals['_APIUSERSERVICE'].methods_by_name['SearchApiUsers']._loaded_options = None
+  _globals['_APIUSERSERVICE'].methods_by_name['SearchApiUsers']._serialized_options = b'\240\265\030\001\252\265\030\022\n\020\300\215\267\001\301\215\267\001\302\215\267\001\303\215\267\001'
+  _globals['_APIUSERSERVICE'].methods_by_name['ActivateApiUser']._loaded_options = None
+  _globals['_APIUSERSERVICE'].methods_by_name['ActivateApiUser']._serialized_options = b'\240\265\030\002\252\265\030\n\n\010\300\215\267\001\302\215\267\001'
+  _globals['_APIUSERSERVICE'].methods_by_name['DeactivateApiUser']._loaded_options = None
+  _globals['_APIUSERSERVICE'].methods_by_name['DeactivateApiUser']._serialized_options = b'\240\265\030\002\252\265\030\n\n\010\300\215\267\001\302\215\267\001'
+  _globals['_APIUSERSERVICE'].methods_by_name['GetApiUserByKeyHash']._loaded_options = None
+  _globals['_APIUSERSERVICE'].methods_by_name['GetApiUserByKeyHash']._serialized_options = b'\240\265\030\001\252\265\030\022\n\020\300\215\267\001\301\215\267\001\302\215\267\001\303\215\267\001'
+  _globals['_GETAPIUSERREQUEST']._serialized_start=214
+  _globals['_GETAPIUSERREQUEST']._serialized_end=318
+  _globals['_GETAPIUSERBYKEYHASHREQUEST']._serialized_start=320
+  _globals['_GETAPIUSERBYKEYHASHREQUEST']._serialized_end=410
+  _globals['_CREATEAPIUSERREQUEST']._serialized_start=412
+  _globals['_CREATEAPIUSERREQUEST']._serialized_end=505
+  _globals['_ASSIGNROLESTOAPIUSERREQUEST']._serialized_start=508
+  _globals['_ASSIGNROLESTOAPIUSERREQUEST']._serialized_end=734
+  _globals['_REVOKEROLESFROMAPIUSERREQUEST']._serialized_start=737
+  _globals['_REVOKEROLESFROMAPIUSERREQUEST']._serialized_end=965
+  _globals['_LISTAPIUSERSREQUEST']._serialized_start=967
+  _globals['_LISTAPIUSERSREQUEST']._serialized_end=988
+  _globals['_LISTAPIUSERSRESPONSE']._serialized_start=990
+  _globals['_LISTAPIUSERSRESPONSE']._serialized_end=1077
+  _globals['_SEARCHAPIUSERSREQUEST']._serialized_start=1079
+  _globals['_SEARCHAPIUSERSREQUEST']._serialized_end=1137
+  _globals['_SEARCHAPIUSERSRESPONSE']._serialized_start=1139
+  _globals['_SEARCHAPIUSERSRESPONSE']._serialized_end=1228
+  _globals['_ACTIVATEAPIUSERREQUEST']._serialized_start=1230
+  _globals['_ACTIVATEAPIUSERREQUEST']._serialized_end=1339
+  _globals['_DEACTIVATEAPIUSERREQUEST']._serialized_start=1341
+  _globals['_DEACTIVATEAPIUSERREQUEST']._serialized_end=1452
+  _globals['_APIUSERSERVICE']._serialized_start=1455
+  _globals['_APIUSERSERVICE']._serialized_end=2685
+# @@protoc_insertion_point(module_scope)

{meshtrade-1.23.1 → meshtrade-1.25.0}/python/src/meshtrade/iam/api_user/v1/service_pb2.pyi

@@ -28,21 +28,21 @@ class CreateApiUserRequest(_message.Message):
     api_user: _api_user_pb2.APIUser
     def __init__(self, api_user: _Optional[_Union[_api_user_pb2.APIUser, _Mapping]] = ...) -> None: ...
 
-class AssignRoleToAPIUserRequest(_message.Message):
-    __slots__ = ("name", "role")
+class AssignRolesToAPIUserRequest(_message.Message):
+    __slots__ = ("name", "roles")
     NAME_FIELD_NUMBER: _ClassVar[int]
-    ROLE_FIELD_NUMBER: _ClassVar[int]
+    ROLES_FIELD_NUMBER: _ClassVar[int]
     name: str
-    role: str
-    def __init__(self, name: _Optional[str] = ..., role: _Optional[str] = ...) -> None: ...
+    roles: _containers.RepeatedScalarFieldContainer[str]
+    def __init__(self, name: _Optional[str] = ..., roles: _Optional[_Iterable[str]] = ...) -> None: ...
 
-class RevokeRoleFromAPIUserRequest(_message.Message):
-    __slots__ = ("name", "role")
+class RevokeRolesFromAPIUserRequest(_message.Message):
+    __slots__ = ("name", "roles")
     NAME_FIELD_NUMBER: _ClassVar[int]
-    ROLE_FIELD_NUMBER: _ClassVar[int]
+    ROLES_FIELD_NUMBER: _ClassVar[int]
     name: str
-    role: str
-    def __init__(self, name: _Optional[str] = ..., role: _Optional[str] = ...) -> None: ...
+    roles: _containers.RepeatedScalarFieldContainer[str]
+    def __init__(self, name: _Optional[str] = ..., roles: _Optional[_Iterable[str]] = ...) -> None: ...
 
 class ListApiUsersRequest(_message.Message):
     __slots__ = ()

{meshtrade-1.23.1 → meshtrade-1.25.0}/python/src/meshtrade/iam/api_user/v1/service_pb2_grpc.py

@@ -37,14 +37,14 @@ class ApiUserServiceStub(object):
                 request_serializer=meshtrade_dot_iam_dot_api__user_dot_v1_dot_service__pb2.CreateApiUserRequest.SerializeToString,
                 response_deserializer=meshtrade_dot_iam_dot_api__user_dot_v1_dot_api__user__pb2.APIUser.FromString,
                 _registered_method=True)
-        self.AssignRoleToAPIUser = channel.unary_unary(
-                '/meshtrade.iam.api_user.v1.ApiUserService/AssignRoleToAPIUser',
-                request_serializer=meshtrade_dot_iam_dot_api__user_dot_v1_dot_service__pb2.AssignRoleToAPIUserRequest.SerializeToString,
+        self.AssignRolesToAPIUser = channel.unary_unary(
+                '/meshtrade.iam.api_user.v1.ApiUserService/AssignRolesToAPIUser',
+                request_serializer=meshtrade_dot_iam_dot_api__user_dot_v1_dot_service__pb2.AssignRolesToAPIUserRequest.SerializeToString,
                 response_deserializer=meshtrade_dot_iam_dot_api__user_dot_v1_dot_api__user__pb2.APIUser.FromString,
                 _registered_method=True)
-        self.RevokeRoleFromAPIUser = channel.unary_unary(
-                '/meshtrade.iam.api_user.v1.ApiUserService/RevokeRoleFromAPIUser',
-                request_serializer=meshtrade_dot_iam_dot_api__user_dot_v1_dot_service__pb2.RevokeRoleFromAPIUserRequest.SerializeToString,
+        self.RevokeRolesFromAPIUser = channel.unary_unary(
+                '/meshtrade.iam.api_user.v1.ApiUserService/RevokeRolesFromAPIUser',
+                request_serializer=meshtrade_dot_iam_dot_api__user_dot_v1_dot_service__pb2.RevokeRolesFromAPIUserRequest.SerializeToString,
                 response_deserializer=meshtrade_dot_iam_dot_api__user_dot_v1_dot_api__user__pb2.APIUser.FromString,
                 _registered_method=True)
         self.ListApiUsers = channel.unary_unary(
@@ -109,9 +109,9 @@ class ApiUserServiceServicer(object):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
-    def AssignRoleToAPIUser(self, request, context):
+    def AssignRolesToAPIUser(self, request, context):
         """
-        Assigns a role to an existing api user within the authenticated group context.
+        Assign roles to an existing api user within the authenticated group context.
 
         The role assignment enables the api user to perform operations according
         to the permissions associated with that role within the group hierarchy.
@@ -120,9 +120,9 @@ class ApiUserServiceServicer(object):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
-    def RevokeRoleFromAPIUser(self, request, context):
+    def RevokeRolesFromAPIUser(self, request, context):
         """
-        Revokes a role from an existing API user within the authenticated group context.
+        Revoke roles from an existing API user within the authenticated group context.
 
         The role revocation removes the permissions associated with that role from
         the API user within the group hierarchy. The API user will no longer be able
@@ -200,14 +200,14 @@ def add_ApiUserServiceServicer_to_server(servicer, server):
                     request_deserializer=meshtrade_dot_iam_dot_api__user_dot_v1_dot_service__pb2.CreateApiUserRequest.FromString,
                     response_serializer=meshtrade_dot_iam_dot_api__user_dot_v1_dot_api__user__pb2.APIUser.SerializeToString,
             ),
-            'AssignRoleToAPIUser': grpc.unary_unary_rpc_method_handler(
-                    servicer.AssignRoleToAPIUser,
-                    request_deserializer=meshtrade_dot_iam_dot_api__user_dot_v1_dot_service__pb2.AssignRoleToAPIUserRequest.FromString,
+            'AssignRolesToAPIUser': grpc.unary_unary_rpc_method_handler(
+                    servicer.AssignRolesToAPIUser,
+                    request_deserializer=meshtrade_dot_iam_dot_api__user_dot_v1_dot_service__pb2.AssignRolesToAPIUserRequest.FromString,
                     response_serializer=meshtrade_dot_iam_dot_api__user_dot_v1_dot_api__user__pb2.APIUser.SerializeToString,
             ),
-            'RevokeRoleFromAPIUser': grpc.unary_unary_rpc_method_handler(
-                    servicer.RevokeRoleFromAPIUser,
-                    request_deserializer=meshtrade_dot_iam_dot_api__user_dot_v1_dot_service__pb2.RevokeRoleFromAPIUserRequest.FromString,
+            'RevokeRolesFromAPIUser': grpc.unary_unary_rpc_method_handler(
+                    servicer.RevokeRolesFromAPIUser,
+                    request_deserializer=meshtrade_dot_iam_dot_api__user_dot_v1_dot_service__pb2.RevokeRolesFromAPIUserRequest.FromString,
                     response_serializer=meshtrade_dot_iam_dot_api__user_dot_v1_dot_api__user__pb2.APIUser.SerializeToString,
             ),
             'ListApiUsers': grpc.unary_unary_rpc_method_handler(
@@ -313,7 +313,7 @@ class ApiUserService(object):
             _registered_method=True)
 
     @staticmethod
-    def AssignRoleToAPIUser(request,
+    def AssignRolesToAPIUser(request,
             target,
             options=(),
             channel_credentials=None,
@@ -326,8 +326,8 @@ class ApiUserService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/meshtrade.iam.api_user.v1.ApiUserService/AssignRoleToAPIUser',
-            meshtrade_dot_iam_dot_api__user_dot_v1_dot_service__pb2.AssignRoleToAPIUserRequest.SerializeToString,
+            '/meshtrade.iam.api_user.v1.ApiUserService/AssignRolesToAPIUser',
+            meshtrade_dot_iam_dot_api__user_dot_v1_dot_service__pb2.AssignRolesToAPIUserRequest.SerializeToString,
             meshtrade_dot_iam_dot_api__user_dot_v1_dot_api__user__pb2.APIUser.FromString,
             options,
             channel_credentials,
@@ -340,7 +340,7 @@ class ApiUserService(object):
             _registered_method=True)
 
     @staticmethod
-    def RevokeRoleFromAPIUser(request,
+    def RevokeRolesFromAPIUser(request,
             target,
             options=(),
             channel_credentials=None,
@@ -353,8 +353,8 @@ class ApiUserService(object):
         return grpc.experimental.unary_unary(
             request,
             target,
-            '/meshtrade.iam.api_user.v1.ApiUserService/RevokeRoleFromAPIUser',
-            meshtrade_dot_iam_dot_api__user_dot_v1_dot_service__pb2.RevokeRoleFromAPIUserRequest.SerializeToString,
+            '/meshtrade.iam.api_user.v1.ApiUserService/RevokeRolesFromAPIUser',
+            meshtrade_dot_iam_dot_api__user_dot_v1_dot_service__pb2.RevokeRolesFromAPIUserRequest.SerializeToString,
             meshtrade_dot_iam_dot_api__user_dot_v1_dot_api__user__pb2.APIUser.FromString,
             options,
             channel_credentials,

{meshtrade-1.23.1 → meshtrade-1.25.0}/python/src/meshtrade/iam/role/v1/role.py

@@ -1,7 +1,7 @@
 """Role utility functions for Mesh API.
 
 This module provides helper functions for working with Role enums and their resource names.
-All functions use the 3-part integer format: groups/{groupID}/{roleNumber}
+All functions use the 4-part integer format: groups/{groupID}/roles/{roleNumber}
 for cross-language compatibility.
 """
 
@@ -47,7 +47,7 @@ def role_is_valid_and_specified(role: Role) -> bool:
 def role_full_resource_name_from_group_id(role: Role, group_id: str) -> str:
     """Generate full resource name from role and group ID.
 
-    Format: groups/{group_id}/{role_int}
+    Format: groups/{group_id}/roles/{role_int}
 
     Args:
         role: Role enum value (integer)
@@ -58,9 +58,9 @@ def role_full_resource_name_from_group_id(role: Role, group_id: str) -> str:
 
     Example:
         >>> role_full_resource_name_from_group_id(Role.ROLE_IAM_ADMIN, "01DD32GZ7R0000000000000001")
-        'groups/01DD32GZ7R0000000000000001/3000000'
+        'groups/01DD32GZ7R0000000000000001/roles/3000000'
     """
-    return f"groups/{group_id}/{int(role)}"
+    return f"groups/{group_id}/roles/{int(role)}"
 
 
 def role_full_resource_name_from_group(role: Role, group: str) -> str:
@@ -78,7 +78,7 @@ def role_full_resource_name_from_group(role: Role, group: str) -> str:
 
     Example:
         >>> role_full_resource_name_from_group(Role.ROLE_IAM_ADMIN, "groups/01DD32GZ7R0000000000000001")
-        'groups/01DD32GZ7R0000000000000001/3000000'
+        'groups/01DD32GZ7R0000000000000001/roles/3000000'
     """
     if not group.startswith("groups/"):
         raise ValueError(f"invalid group format, expected groups/{{groupID}}, got: {group}")
@@ -94,13 +94,13 @@ def role_from_full_resource_name(full_resource_name: str) -> Role:
     """Extract Role from full resource name.
 
     Args:
-        full_resource_name: Full resource name (e.g., "groups/{id}/{role_int}")
+        full_resource_name: Full resource name (e.g., "groups/{id}/roles/{role_int}")
 
     Returns:
         Role enum value (integer), or ROLE_UNSPECIFIED if parsing fails
 
     Example:
-        >>> role_from_full_resource_name("groups/01DD32GZ7R0000000000000001/3000000")
+        >>> role_from_full_resource_name("groups/01DD32GZ7R0000000000000001/roles/3000000")
         3000000
         >>> role_from_full_resource_name("invalid/format")
         0
@@ -118,7 +118,7 @@ def role_from_full_resource_name(full_resource_name: str) -> Role:
 def parse_role_parts(role_full_resource_name: str) -> tuple[str, int]:
     """Parse full resource name into group ID and Role.
 
-    Expected format: groups/{group_id}/{role_int}
+    Expected format: groups/{group_id}/roles/{role_int}
 
     Args:
         role_full_resource_name: Full resource name
@@ -130,21 +130,21 @@ def parse_role_parts(role_full_resource_name: str) -> tuple[str, int]:
         ValueError: If format is invalid or role number cannot be parsed
 
     Example:
-        >>> parse_role_parts("groups/01DD32GZ7R0000000000000001/3000000")
+        >>> parse_role_parts("groups/01DD32GZ7R0000000000000001/roles/3000000")
         ('01DD32GZ7R0000000000000001', 3000000)
     """
     parts = role_full_resource_name.split("/")
-    if len(parts) != 3 or parts[0] != "groups":
-        raise ValueError(f"invalid role format, expected groups/{{groupID}}/{{role}}, got {role_full_resource_name}")
+    if len(parts) != 4 or parts[0] != "groups" or parts[2] != "roles":
+        raise ValueError(f"invalid role format, expected groups/{{groupID}}/roles/{{role}}, got {role_full_resource_name}")
 
     group_id = parts[1]
     if not group_id:
         raise ValueError("group ID cannot be empty")
 
     try:
-        role_int = int(parts[2])
+        role_int = int(parts[3])
     except ValueError as e:
-        raise ValueError(f"error parsing role enum value '{parts[2]}'") from e
+        raise ValueError(f"error parsing role enum value '{parts[3]}'") from e
 
     if role_int < 0:
         raise ValueError(f"invalid role number in full resource name: {role_full_resource_name}")
@@ -168,7 +168,7 @@ def must_parse_role_parts(role_full_resource_name: str) -> tuple[str, int]:
         ValueError: If format is invalid
 
     Example:
-        >>> must_parse_role_parts("groups/01DD32GZ7R0000000000000001/3000000")
+        >>> must_parse_role_parts("groups/01DD32GZ7R0000000000000001/roles/3000000")
         ('01DD32GZ7R0000000000000001', 3000000)
     """
     return parse_role_parts(role_full_resource_name)