diff --git a/deps/github.com/pomerium/enterprise-client b/deps/github.com/pomerium/enterprise-client index 64040ee..87dc037 160000 --- a/deps/github.com/pomerium/enterprise-client +++ b/deps/github.com/pomerium/enterprise-client @@ -1 +1 @@ -Subproject commit 64040ee3436790002cd72306749e73e235265b37 +Subproject commit 87dc037af79fd01f8f3fd3705c5bec1b05829705 diff --git a/src/pomerium/pb/activity_log_pb2.py b/src/pomerium/pb/activity_log_pb2.py index 5014e4d..3a96efa 100644 --- a/src/pomerium/pb/activity_log_pb2.py +++ b/src/pomerium/pb/activity_log_pb2.py @@ -25,7 +25,7 @@ from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x12\x61\x63tivity_log.proto\x12\x12pomerium.dashboard\x1a\x1fgoogle/protobuf/timestamp.proto\"\xf6\x04\n\x10\x41\x63tivityLogEntry\x12\n\n\x02id\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x14 \x01(\t\x12\x15\n\ractivity_type\x18\x02 \x01(\t\x12.\n\ncreated_at\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x17\n\ncluster_id\x18\x15 \x01(\tH\x00\x88\x01\x01\x12\x14\n\x0cnamespace_id\x18\x04 \x01(\t\x12\x16\n\x0enamespace_name\x18\x05 \x01(\t\x12\x0f\n\x07user_id\x18\x06 \x01(\t\x12\x11\n\tuser_name\x18\x07 \x01(\t\x12\x12\n\nuser_email\x18\x08 \x01(\t\x12\x13\n\x0b\x65ntity_type\x18\t \x01(\t\x12\x11\n\tentity_id\x18\n \x01(\t\x12\x13\n\x0b\x65ntity_data\x18\x0b \x01(\t\x12\x46\n\x0c\x64iff_summary\x18\x0c \x01(\x0b\x32\x30.pomerium.dashboard.ActivityLogEntry.DiffSummary\x12\x12\n\ndb_version\x18\r \x01(\x04\x12\x12\n\nsession_id\x18\x0e \x01(\t\x12\x1a\n\x12service_account_id\x18\x0f \x01(\t\x12\x1b\n\x13impersonate_user_id\x18\x10 \x01(\t\x12\x1d\n\x15impersonate_user_name\x18\x11 \x01(\t\x12\x1e\n\x16impersonate_user_email\x18\x12 \x01(\t\x12\x1f\n\x17impersonate_user_groups\x18\x13 \x03(\t\x1a-\n\x0b\x44iffSummary\x12\r\n\x05\x61\x64\x64\x65\x64\x18\x01 \x01(\x03\x12\x0f\n\x07removed\x18\x02 \x01(\x03\x42\r\n\x0b_cluster_id\"(\n\x1aGetActivityLogEntryRequest\x12\n\n\x02id\x18\x01 \x01(\t\"\xb6\x01\n\x1bGetActivityLogEntryResponse\x12\x33\n\x05\x65ntry\x18\x01 \x01(\x0b\x32$.pomerium.dashboard.ActivityLogEntry\x12\x1e\n\x11previous_entry_id\x18\x02 \x01(\tH\x00\x88\x01\x01\x12\x1a\n\rnext_entry_id\x18\x03 \x01(\tH\x01\x88\x01\x01\x42\x14\n\x12_previous_entry_idB\x10\n\x0e_next_entry_id\"\xb9\x07\n\x1dListActivityLogEntriesRequest\x12\x1a\n\ractivity_type\x18\x01 \x01(\tH\x00\x88\x01\x01\x12\x19\n\x0cnamespace_id\x18\x02 \x01(\tH\x01\x88\x01\x01\x12\x14\n\x07user_id\x18\x03 \x01(\tH\x02\x88\x01\x01\x12\x18\n\x0b\x65ntity_type\x18\x04 \x01(\tH\x03\x88\x01\x01\x12\x16\n\tentity_id\x18\x05 \x01(\tH\x04\x88\x01\x01\x12\x12\n\x05query\x18\x06 \x01(\tH\x05\x88\x01\x01\x12\x13\n\x06offset\x18\x07 \x01(\x03H\x06\x88\x01\x01\x12\x12\n\x05limit\x18\x08 \x01(\x03H\x07\x88\x01\x01\x12\x13\n\x0b\x64\x62_versions\x18\t \x03(\x04\x12\x1e\n\x11recurse_namespace\x18\x0b \x01(\x08H\x08\x88\x01\x01\x12J\n\x08\x65ntities\x18\n \x03(\x0b\x32\x38.pomerium.dashboard.ListActivityLogEntriesRequest.Entity\x12I\n\x04sort\x18\x0c \x01(\x0b\x32\x36.pomerium.dashboard.ListActivityLogEntriesRequest.SortH\t\x88\x01\x01\x12Q\n\x0b\x64\x61te_filter\x18\r \x01(\x0b\x32<.pomerium.dashboard.ListActivityLogEntriesRequest.DateFilter\x12U\n\rstring_filter\x18\x0e \x01(\x0b\x32>.pomerium.dashboard.ListActivityLogEntriesRequest.StringFilter\x1a\"\n\x06\x45ntity\x12\x0c\n\x04type\x18\x01 \x01(\t\x12\n\n\x02id\x18\x02 \x01(\t\x1a)\n\x04Sort\x12\x0e\n\x06\x63olumn\x18\x01 \x01(\t\x12\x11\n\tdirection\x18\x02 \x01(\t\x1aH\n\nDateFilter\x12\x10\n\x08operator\x18\x01 \x01(\t\x12(\n\x04\x64\x61te\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x1a\x42\n\x0cStringFilter\x12\x11\n\tfieldName\x18\x01 \x01(\t\x12\x10\n\x08operator\x18\x02 \x01(\t\x12\r\n\x05value\x18\x03 \x01(\tB\x10\n\x0e_activity_typeB\x0f\n\r_namespace_idB\n\n\x08_user_idB\x0e\n\x0c_entity_typeB\x0c\n\n_entity_idB\x08\n\x06_queryB\t\n\x07_offsetB\x08\n\x06_limitB\x14\n\x12_recurse_namespaceB\x07\n\x05_sort\"l\n\x1eListActivityLogEntriesResponse\x12\x35\n\x07\x65ntries\x18\x01 \x03(\x0b\x32$.pomerium.dashboard.ActivityLogEntry\x12\x13\n\x0btotal_count\x18\x02 \x01(\x03\x32\x8d\x02\n\x12\x41\x63tivityLogService\x12v\n\x13GetActivityLogEntry\x12..pomerium.dashboard.GetActivityLogEntryRequest\x1a/.pomerium.dashboard.GetActivityLogEntryResponse\x12\x7f\n\x16ListActivityLogEntries\x12\x31.pomerium.dashboard.ListActivityLogEntriesRequest\x1a\x32.pomerium.dashboard.ListActivityLogEntriesResponseB-Z+github.com/pomerium/pomerium-console/pkg/pbb\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x12\x61\x63tivity_log.proto\x12\x12pomerium.dashboard\x1a\x1fgoogle/protobuf/timestamp.proto\"\xf6\x04\n\x10\x41\x63tivityLogEntry\x12\n\n\x02id\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x14 \x01(\t\x12\x15\n\ractivity_type\x18\x02 \x01(\t\x12.\n\ncreated_at\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x17\n\ncluster_id\x18\x15 \x01(\tH\x00\x88\x01\x01\x12\x14\n\x0cnamespace_id\x18\x04 \x01(\t\x12\x16\n\x0enamespace_name\x18\x05 \x01(\t\x12\x0f\n\x07user_id\x18\x06 \x01(\t\x12\x11\n\tuser_name\x18\x07 \x01(\t\x12\x12\n\nuser_email\x18\x08 \x01(\t\x12\x13\n\x0b\x65ntity_type\x18\t \x01(\t\x12\x11\n\tentity_id\x18\n \x01(\t\x12\x13\n\x0b\x65ntity_data\x18\x0b \x01(\t\x12\x46\n\x0c\x64iff_summary\x18\x0c \x01(\x0b\x32\x30.pomerium.dashboard.ActivityLogEntry.DiffSummary\x12\x12\n\ndb_version\x18\r \x01(\x04\x12\x12\n\nsession_id\x18\x0e \x01(\t\x12\x1a\n\x12service_account_id\x18\x0f \x01(\t\x12\x1b\n\x13impersonate_user_id\x18\x10 \x01(\t\x12\x1d\n\x15impersonate_user_name\x18\x11 \x01(\t\x12\x1e\n\x16impersonate_user_email\x18\x12 \x01(\t\x12\x1f\n\x17impersonate_user_groups\x18\x13 \x03(\t\x1a-\n\x0b\x44iffSummary\x12\r\n\x05\x61\x64\x64\x65\x64\x18\x01 \x01(\x03\x12\x0f\n\x07removed\x18\x02 \x01(\x03\x42\r\n\x0b_cluster_id\"(\n\x1aGetActivityLogEntryRequest\x12\n\n\x02id\x18\x01 \x01(\t\"\xb6\x01\n\x1bGetActivityLogEntryResponse\x12\x33\n\x05\x65ntry\x18\x01 \x01(\x0b\x32$.pomerium.dashboard.ActivityLogEntry\x12\x1e\n\x11previous_entry_id\x18\x02 \x01(\tH\x00\x88\x01\x01\x12\x1a\n\rnext_entry_id\x18\x03 \x01(\tH\x01\x88\x01\x01\x42\x14\n\x12_previous_entry_idB\x10\n\x0e_next_entry_id\"\xb9\x07\n\x1dListActivityLogEntriesRequest\x12\x1a\n\ractivity_type\x18\x01 \x01(\tH\x00\x88\x01\x01\x12\x19\n\x0cnamespace_id\x18\x02 \x01(\tH\x01\x88\x01\x01\x12\x14\n\x07user_id\x18\x03 \x01(\tH\x02\x88\x01\x01\x12\x18\n\x0b\x65ntity_type\x18\x04 \x01(\tH\x03\x88\x01\x01\x12\x16\n\tentity_id\x18\x05 \x01(\tH\x04\x88\x01\x01\x12\x12\n\x05query\x18\x06 \x01(\tH\x05\x88\x01\x01\x12\x13\n\x06offset\x18\x07 \x01(\x03H\x06\x88\x01\x01\x12\x12\n\x05limit\x18\x08 \x01(\x03H\x07\x88\x01\x01\x12\x13\n\x0b\x64\x62_versions\x18\t \x03(\x04\x12\x1e\n\x11recurse_namespace\x18\x0b \x01(\x08H\x08\x88\x01\x01\x12J\n\x08\x65ntities\x18\n \x03(\x0b\x32\x38.pomerium.dashboard.ListActivityLogEntriesRequest.Entity\x12I\n\x04sort\x18\x0c \x01(\x0b\x32\x36.pomerium.dashboard.ListActivityLogEntriesRequest.SortH\t\x88\x01\x01\x12Q\n\x0b\x64\x61te_filter\x18\r \x01(\x0b\x32<.pomerium.dashboard.ListActivityLogEntriesRequest.DateFilter\x12U\n\rstring_filter\x18\x0e \x01(\x0b\x32>.pomerium.dashboard.ListActivityLogEntriesRequest.StringFilter\x1a\"\n\x06\x45ntity\x12\x0c\n\x04type\x18\x01 \x01(\t\x12\n\n\x02id\x18\x02 \x01(\t\x1a)\n\x04Sort\x12\x0e\n\x06\x63olumn\x18\x01 \x01(\t\x12\x11\n\tdirection\x18\x02 \x01(\t\x1aH\n\nDateFilter\x12\x10\n\x08operator\x18\x01 \x01(\t\x12(\n\x04\x64\x61te\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x1a\x42\n\x0cStringFilter\x12\x11\n\tfieldName\x18\x01 \x01(\t\x12\x10\n\x08operator\x18\x02 \x01(\t\x12\r\n\x05value\x18\x03 \x01(\tB\x10\n\x0e_activity_typeB\x0f\n\r_namespace_idB\n\n\x08_user_idB\x0e\n\x0c_entity_typeB\x0c\n\n_entity_idB\x08\n\x06_queryB\t\n\x07_offsetB\x08\n\x06_limitB\x14\n\x12_recurse_namespaceB\x07\n\x05_sort\"l\n\x1eListActivityLogEntriesResponse\x12\x35\n\x07\x65ntries\x18\x01 \x03(\x0b\x32$.pomerium.dashboard.ActivityLogEntry\x12\x13\n\x0btotal_count\x18\x02 \x01(\x03\"\x18\n\x16ListEntityTypesRequest\"/\n\x17ListEntityTypesResponse\x12\x14\n\x0c\x65ntity_types\x18\x01 \x03(\t2\xf9\x02\n\x12\x41\x63tivityLogService\x12v\n\x13GetActivityLogEntry\x12..pomerium.dashboard.GetActivityLogEntryRequest\x1a/.pomerium.dashboard.GetActivityLogEntryResponse\x12\x7f\n\x16ListActivityLogEntries\x12\x31.pomerium.dashboard.ListActivityLogEntriesRequest\x1a\x32.pomerium.dashboard.ListActivityLogEntriesResponse\x12j\n\x0fListEntityTypes\x12*.pomerium.dashboard.ListEntityTypesRequest\x1a+.pomerium.dashboard.ListEntityTypesResponseB-Z+github.com/pomerium/pomerium-console/pkg/pbb\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -53,6 +53,10 @@ _globals['_LISTACTIVITYLOGENTRIESREQUEST_STRINGFILTER']._serialized_end=1750 _globals['_LISTACTIVITYLOGENTRIESRESPONSE']._serialized_start=1891 _globals['_LISTACTIVITYLOGENTRIESRESPONSE']._serialized_end=1999 - _globals['_ACTIVITYLOGSERVICE']._serialized_start=2002 - _globals['_ACTIVITYLOGSERVICE']._serialized_end=2271 + _globals['_LISTENTITYTYPESREQUEST']._serialized_start=2001 + _globals['_LISTENTITYTYPESREQUEST']._serialized_end=2025 + _globals['_LISTENTITYTYPESRESPONSE']._serialized_start=2027 + _globals['_LISTENTITYTYPESRESPONSE']._serialized_end=2074 + _globals['_ACTIVITYLOGSERVICE']._serialized_start=2077 + _globals['_ACTIVITYLOGSERVICE']._serialized_end=2454 # @@protoc_insertion_point(module_scope) diff --git a/src/pomerium/pb/activity_log_pb2.pyi b/src/pomerium/pb/activity_log_pb2.pyi index 311fcea..d304cb6 100644 --- a/src/pomerium/pb/activity_log_pb2.pyi +++ b/src/pomerium/pb/activity_log_pb2.pyi @@ -361,3 +361,29 @@ class ListActivityLogEntriesResponse(google.protobuf.message.Message): def ClearField(self, field_name: typing.Literal["entries", b"entries", "total_count", b"total_count"]) -> None: ... global___ListActivityLogEntriesResponse = ListActivityLogEntriesResponse + +@typing.final +class ListEntityTypesRequest(google.protobuf.message.Message): + DESCRIPTOR: google.protobuf.descriptor.Descriptor + + def __init__( + self, + ) -> None: ... + +global___ListEntityTypesRequest = ListEntityTypesRequest + +@typing.final +class ListEntityTypesResponse(google.protobuf.message.Message): + DESCRIPTOR: google.protobuf.descriptor.Descriptor + + ENTITY_TYPES_FIELD_NUMBER: builtins.int + @property + def entity_types(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[builtins.str]: ... + def __init__( + self, + *, + entity_types: collections.abc.Iterable[builtins.str] | None = ..., + ) -> None: ... + def ClearField(self, field_name: typing.Literal["entity_types", b"entity_types"]) -> None: ... + +global___ListEntityTypesResponse = ListEntityTypesResponse diff --git a/src/pomerium/pb/activity_log_pb2_grpc.py b/src/pomerium/pb/activity_log_pb2_grpc.py index 17f764a..8c431fe 100644 --- a/src/pomerium/pb/activity_log_pb2_grpc.py +++ b/src/pomerium/pb/activity_log_pb2_grpc.py @@ -46,6 +46,11 @@ def __init__(self, channel): request_serializer=activity__log__pb2.ListActivityLogEntriesRequest.SerializeToString, response_deserializer=activity__log__pb2.ListActivityLogEntriesResponse.FromString, _registered_method=True) + self.ListEntityTypes = channel.unary_unary( + '/pomerium.dashboard.ActivityLogService/ListEntityTypes', + request_serializer=activity__log__pb2.ListEntityTypesRequest.SerializeToString, + response_deserializer=activity__log__pb2.ListEntityTypesResponse.FromString, + _registered_method=True) class ActivityLogServiceServicer(object): @@ -68,6 +73,13 @@ def ListActivityLogEntries(self, request, context): context.set_details('Method not implemented!') raise NotImplementedError('Method not implemented!') + def ListEntityTypes(self, request, context): + """Lists all the known entity types. + """ + context.set_code(grpc.StatusCode.UNIMPLEMENTED) + context.set_details('Method not implemented!') + raise NotImplementedError('Method not implemented!') + def add_ActivityLogServiceServicer_to_server(servicer, server): rpc_method_handlers = { @@ -81,6 +93,11 @@ def add_ActivityLogServiceServicer_to_server(servicer, server): request_deserializer=activity__log__pb2.ListActivityLogEntriesRequest.FromString, response_serializer=activity__log__pb2.ListActivityLogEntriesResponse.SerializeToString, ), + 'ListEntityTypes': grpc.unary_unary_rpc_method_handler( + servicer.ListEntityTypes, + request_deserializer=activity__log__pb2.ListEntityTypesRequest.FromString, + response_serializer=activity__log__pb2.ListEntityTypesResponse.SerializeToString, + ), } generic_handler = grpc.method_handlers_generic_handler( 'pomerium.dashboard.ActivityLogService', rpc_method_handlers) @@ -147,3 +164,30 @@ def ListActivityLogEntries(request, timeout, metadata, _registered_method=True) + + @staticmethod + def ListEntityTypes(request, + target, + options=(), + channel_credentials=None, + call_credentials=None, + insecure=False, + compression=None, + wait_for_ready=None, + timeout=None, + metadata=None): + return grpc.experimental.unary_unary( + request, + target, + '/pomerium.dashboard.ActivityLogService/ListEntityTypes', + activity__log__pb2.ListEntityTypesRequest.SerializeToString, + activity__log__pb2.ListEntityTypesResponse.FromString, + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) diff --git a/src/pomerium/pb/activity_log_pb2_grpc.pyi b/src/pomerium/pb/activity_log_pb2_grpc.pyi index 797fcd8..9a5632d 100644 --- a/src/pomerium/pb/activity_log_pb2_grpc.pyi +++ b/src/pomerium/pb/activity_log_pb2_grpc.pyi @@ -37,6 +37,12 @@ class ActivityLogServiceStub: ListActivityLogEntriesRequest """ + ListEntityTypes: grpc.UnaryUnaryMultiCallable[ + activity_log_pb2.ListEntityTypesRequest, + activity_log_pb2.ListEntityTypesResponse, + ] + """Lists all the known entity types.""" + class ActivityLogServiceAsyncStub: """ActivityLogService tracks historical changes to configuration made through Pomerium Enterprise @@ -56,6 +62,12 @@ class ActivityLogServiceAsyncStub: ListActivityLogEntriesRequest """ + ListEntityTypes: grpc.aio.UnaryUnaryMultiCallable[ + activity_log_pb2.ListEntityTypesRequest, + activity_log_pb2.ListEntityTypesResponse, + ] + """Lists all the known entity types.""" + class ActivityLogServiceServicer(metaclass=abc.ABCMeta): """ActivityLogService tracks historical changes to configuration made through Pomerium Enterprise @@ -79,4 +91,12 @@ class ActivityLogServiceServicer(metaclass=abc.ABCMeta): ListActivityLogEntriesRequest """ + @abc.abstractmethod + def ListEntityTypes( + self, + request: activity_log_pb2.ListEntityTypesRequest, + context: _ServicerContext, + ) -> typing.Union[activity_log_pb2.ListEntityTypesResponse, collections.abc.Awaitable[activity_log_pb2.ListEntityTypesResponse]]: + """Lists all the known entity types.""" + def add_ActivityLogServiceServicer_to_server(servicer: ActivityLogServiceServicer, server: typing.Union[grpc.Server, grpc.aio.Server]) -> None: ...