Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

feat: support multiple resources in PermissionDenied errors (#18062)

p0ny197529d2fdea
diff --git a/backend/api/v1/error.go b/backend/api/v1/error.go
index 1c5cf386b3..0210f28c36 100644
--- a/backend/api/v1/error.go
+++ b/backend/api/v1/error.go
@@ -6,7 +6,7 @@ import (
type queryError struct {
err error
- resource string
+ resources []string
commandType v1pb.QueryResult_PermissionDenied_CommandType
}
diff --git a/backend/api/v1/sql_service.go b/backend/api/v1/sql_service.go
index cb02014f01..4c874db5f7 100644
--- a/backend/api/v1/sql_service.go
+++ b/backend/api/v1/sql_service.go
@@ -244,10 +244,10 @@ func (s *SQLService) Query(ctx context.Context, req *connect.Request[v1pb.QueryR
var qe *queryError
var pe *parserbase.SyntaxError
if errors.As(queryErr, &qe) {
- if qe.resource != "" {
+ if len(qe.resources) > 0 {
results[len(results)-1].DetailedError = &v1pb.QueryResult_PermissionDenied_{
PermissionDenied: &v1pb.QueryResult_PermissionDenied{
- Resource: qe.resource,
+ Resources: qe.resources,
},
}
} else if qe.commandType != v1pb.QueryResult_PermissionDenied_COMMAND_TYPE_UNSPECIFIED {
@@ -1444,6 +1444,7 @@ func (s *SQLService) accessCheck(
}
}
if span.Type == parserbase.Select {
+ var deniedResources []string
for column := range span.SourceColumns {
attributes := map[string]any{
common.CELAttributeRequestTime: time.Now(),
@@ -1496,13 +1497,16 @@ func (s *SQLService) accessCheck(
if table, ok := attributes[common.CELAttributeResourceTableName]; ok && table != "" {
resource = fmt.Sprintf("%s/tables/%s", resource, table)
}
- return &queryError{
- err: connect.NewError(
- connect.CodePermissionDenied,
- errors.Errorf("permission denied to access resource: %s", resource),
- ),
- resource: resource,
- }
+ deniedResources = append(deniedResources, resource)
+ }
+ }
+ if len(deniedResources) > 0 {
+ return &queryError{
+ err: connect.NewError(
+ connect.CodePermissionDenied,
+ errors.Errorf("permission denied to access resources: %v", deniedResources),
+ ),
+ resources: deniedResources,
}
}
}
diff --git a/backend/generated-go/v1/sql_service.pb.go b/backend/generated-go/v1/sql_service.pb.go
index 485b731a2c..749a850481 100644
--- a/backend/generated-go/v1/sql_service.pb.go
+++ b/backend/generated-go/v1/sql_service.pb.go
@@ -2231,16 +2231,16 @@ func (x *QueryResult_SyntaxError) GetStartPosition() *Position {
}
// Permission denied with resource information or disallowed command_type.
-// Either resource or command_type is available.
+// Either resources or command_type is available.
type QueryResult_PermissionDenied struct {
state protoimpl.MessageState `protogen:"open.v1"`
- // Denied to access the resource.
+ // Denied to access the resources.
// Format:
// instances/{instance}/databases/{database}
// instances/{instance}/databases/{database}/schemas/{schema}
// instances/{instance}/databases/{database}/tables/{table}
// instances/{instance}/databases/{database}/schemas/{schema}/tables/{table}
- Resource string `protobuf:"bytes,1,opt,name=resource,proto3" json:"resource,omitempty"`
+ Resources []string `protobuf:"bytes,1,rep,name=resources,proto3" json:"resources,omitempty"`
// Disallowed command_type.
CommandType QueryResult_PermissionDenied_CommandType `protobuf:"varint,2,opt,name=command_type,json=commandType,proto3,enum=bytebase.v1.QueryResult_PermissionDenied_CommandType" json:"command_type,omitempty"`
unknownFields protoimpl.UnknownFields
@@ -2277,11 +2277,11 @@ func (*QueryResult_PermissionDenied) Descriptor() ([]byte, []int) {
return file_v1_sql_service_proto_rawDescGZIP(), []int{5, 2}
}
-func (x *QueryResult_PermissionDenied) GetResource() string {
+func (x *QueryResult_PermissionDenied) GetResources() []string {
if x != nil {
- return x.Resource
+ return x.Resources
}
- return ""
+ return nil
}
func (x *QueryResult_PermissionDenied) GetCommandType() QueryResult_PermissionDenied_CommandType {
@@ -2694,7 +2694,7 @@ const file_v1_sql_service_proto_rawDesc = "" +
"\x12RedisRunCommandsOn\x12%\n" +
"!REDIS_RUN_COMMANDS_ON_UNSPECIFIED\x10\x00\x12\x0f\n" +
"\vSINGLE_NODE\x10\x01\x12\r\n" +
- "\tALL_NODES\x10\x02\"\x83\r\n" +
+ "\tALL_NODES\x10\x02\"\x85\r\n" +
"\vQueryResult\x12!\n" +
"\fcolumn_names\x18\x01 \x03(\tR\vcolumnNames\x12*\n" +
"\x11column_type_names\x18\x02 \x03(\tR\x0fcolumnTypeNames\x12)\n" +
@@ -2733,9 +2733,9 @@ const file_v1_sql_service_proto_rawDesc = "" +
"\x04line\x18\x10 \x01(\x05R\x04line\x12\x18\n" +
"\aroutine\x18\x11 \x01(\tR\aroutine\x1aK\n" +
"\vSyntaxError\x12<\n" +
- "\x0estart_position\x18\x01 \x01(\v2\x15.bytebase.v1.PositionR\rstartPosition\x1a\xda\x01\n" +
- "\x10PermissionDenied\x12\x1a\n" +
- "\bresource\x18\x01 \x01(\tR\bresource\x12X\n" +
+ "\x0estart_position\x18\x01 \x01(\v2\x15.bytebase.v1.PositionR\rstartPosition\x1a\xdc\x01\n" +
+ "\x10PermissionDenied\x12\x1c\n" +
+ "\tresources\x18\x01 \x03(\tR\tresources\x12X\n" +
"\fcommand_type\x18\x02 \x01(\x0e25.bytebase.v1.QueryResult.PermissionDenied.CommandTypeR\vcommandType\"P\n" +
"\vCommandType\x12\x1c\n" +
"\x18COMMAND_TYPE_UNSPECIFIED\x10\x00\x12\a\n" +
diff --git a/backend/generated-go/v1/sql_service_equal.pb.go b/backend/generated-go/v1/sql_service_equal.pb.go
index c0d5ec30f4..f44a11d407 100644
--- a/backend/generated-go/v1/sql_service_equal.pb.go
+++ b/backend/generated-go/v1/sql_service_equal.pb.go
@@ -198,9 +198,14 @@ func (x *QueryResult_PermissionDenied) Equal(y *QueryResult_PermissionDenied) bo
if x == nil || y == nil {
return x == nil && y == nil
}
- if x.Resource != y.Resource {
+ if len(x.Resources) != len(y.Resources) {
return false
}
+ for i := 0; i < len(x.Resources); i++ {
+ if x.Resources[i] != y.Resources[i] {
+ return false
+ }
+ }
if x.CommandType != y.CommandType {
return false
}
diff --git a/frontend/src/components/GrantRequestPanel/GrantRequestPanel.vue b/frontend/src/components/GrantRequestPanel/GrantRequestPanel.vue
index 2f10afc5f5..cf4662bb49 100644
--- a/frontend/src/components/GrantRequestPanel/GrantRequestPanel.vue
+++ b/frontend/src/components/GrantRequestPanel/GrantRequestPanel.vue
@@ -20,7 +20,7 @@
:disable-member-change="true"
:require-reason="project.enforceIssueTitle"
:support-roles="supportRoles"
- :database-resource="databaseResource"
+ :database-resources="databaseResources"
/>
</div>
<template #footer>
@@ -80,12 +80,12 @@ const props = withDefaults(
defineProps<{
projectName: string;
role?: string;
- databaseResource?: DatabaseResource;
+ databaseResources?: DatabaseResource[];
placement?: "left" | "right";
supportRoles?: string[];
}>(),
{
- databaseResource: undefined,
+ databaseResources: () => [],
role: undefined,
placement: "right",
supportRoles: () => [],
diff --git a/frontend/src/components/ProjectMember/AddProjectMember/AddProjectMemberForm.vue b/frontend/src/components/ProjectMember/AddProjectMember/AddProjectMemberForm.vue
index 624a6f2ea8..568bfc01d8 100644
--- a/frontend/src/components/ProjectMember/AddProjectMember/AddProjectMemberForm.vue
+++ b/frontend/src/components/ProjectMember/AddProjectMember/AddProjectMemberForm.vue
@@ -98,13 +98,13 @@ const props = withDefaults(
requireReason?: boolean;
disableMemberChange?: boolean;
supportRoles?: string[];
- databaseResource?: DatabaseResource;
+ databaseResources?: DatabaseResource[];
}>(),
{
disableMemberChange: false,
requireReason: false,
supportRoles: () => [],
- databaseResource: undefined,
+ databaseResources: () => [],
}
);
@@ -127,9 +127,10 @@ const getInitialState = (): LocalState => {
role: props.binding.role,
memberList: props.binding.members,
reason: "",
- databaseResources: props.databaseResource
- ? [{ ...props.databaseResource }]
- : undefined,
+ databaseResources:
+ props.databaseResources && props.databaseResources.length > 0
+ ? props.databaseResources.map((r) => ({ ...r }))
+ : undefined,
};
return defaultState;
@@ -140,13 +141,14 @@ const expirationSelectorRef = ref<InstanceType<typeof ExpirationSelector>>();
watch(
() => state.role,
- () => {
- state.databaseResources = props.databaseResource
- ? [{ ...props.databaseResource }]
- : undefined;
- },
- {
- immediate: true,
+ (newRole, oldRole) => {
+ // Only reset databaseResources when role actually changes, not on initial mount
+ if (oldRole !== undefined) {
+ state.databaseResources =
+ props.databaseResources && props.databaseResources.length > 0
+ ? props.databaseResources.map((r) => ({ ...r }))
+ : undefined;
+ }
}
);
diff --git a/frontend/src/types/proto-es/v1/sql_service_pb.d.ts b/frontend/src/types/proto-es/v1/sql_service_pb.d.ts
index 0bf442f48d..5ad4e89b57 100644
--- a/frontend/src/types/proto-es/v1/sql_service_pb.d.ts
+++ b/frontend/src/types/proto-es/v1/sql_service_pb.d.ts
@@ -435,22 +435,22 @@ export declare const QueryResult_SyntaxErrorSchema: GenMessage<QueryResult_Synta
/**
* Permission denied with resource information or disallowed command_type.
- * Either resource or command_type is available.
+ * Either resources or command_type is available.
*
* @generated from message bytebase.v1.QueryResult.PermissionDenied
*/
export declare type QueryResult_PermissionDenied = Message<"bytebase.v1.QueryResult.PermissionDenied"> & {
/**
- * Denied to access the resource.
+ * Denied to access the resources.
* Format:
* instances/{instance}/databases/{database}
* instances/{instance}/databases/{database}/schemas/{schema}
* instances/{instance}/databases/{database}/tables/{table}
* instances/{instance}/databases/{database}/schemas/{schema}/tables/{table}
*
- * @generated from field: string resource = 1;
+ * @generated from field: repeated string resources = 1;
*/
- resource: string;
+ resources: string[];
/**
* Disallowed command_type.
diff --git a/frontend/src/types/proto-es/v1/sql_service_pb.js b/frontend/src/types/proto-es/v1/sql_service_pb.js
index abba9da86d..a8882c3f29 100644
--- a/frontend/src/types/proto-es/v1/sql_service_pb.js
+++ b/frontend/src/types/proto-es/v1/sql_service_pb.js
@@ -16,7 +16,7 @@ import { file_v1_database_service } from "./database_service_pb";
* Describes the file v1/sql_service.proto.
*/
export const file_v1_sql_service = /*@__PURE__*/
- fileDesc("ChR2MS9zcWxfc2VydmljZS5wcm90bxILYnl0ZWJhc2UudjEisAEKE0FkbWluRXhlY3V0ZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vRGF0YWJhc2USEQoJc3RhdGVtZW50GAMgASgJEg0KBWxpbWl0GAQgASgFEhMKBnNjaGVtYRgGIAEoCUgAiAEBEhYKCWNvbnRhaW5lchgHIAEoCUgBiAEBQgkKB19zY2hlbWFCDAoKX2NvbnRhaW5lckoECAIQAyJBChRBZG1pbkV4ZWN1dGVSZXNwb25zZRIpCgdyZXN1bHRzGAEgAygLMhguYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQihwIKDFF1ZXJ5UmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9EYXRhYmFzZRIRCglzdGF0ZW1lbnQYAyABKAkSDQoFbGltaXQYBCABKAUSGwoOZGF0YV9zb3VyY2VfaWQYBiABKAlCA+BBAhIPCgdleHBsYWluGAcgASgIEhMKBnNjaGVtYRgIIAEoCUgAiAEBEi4KDHF1ZXJ5X29wdGlvbhgJIAEoCzIYLmJ5dGViYXNlLnYxLlF1ZXJ5T3B0aW9uEhYKCWNvbnRhaW5lchgKIAEoCUgBiAEBQgkKB19zY2hlbWFCDAoKX2NvbnRhaW5lckoECAIQAyJACg1RdWVyeVJlc3BvbnNlEikKB3Jlc3VsdHMYASADKAsyGC5ieXRlYmFzZS52MS5RdWVyeVJlc3VsdEoECAIQAyK2AQoLUXVlcnlPcHRpb24SSgoVcmVkaXNfcnVuX2NvbW1hbmRzX29uGAEgASgOMisuYnl0ZWJhc2UudjEuUXVlcnlPcHRpb24uUmVkaXNSdW5Db21tYW5kc09uIlsKElJlZGlzUnVuQ29tbWFuZHNPbhIlCiFSRURJU19SVU5fQ09NTUFORFNfT05fVU5TUEVDSUZJRUQQABIPCgtTSU5HTEVfTk9ERRABEg0KCUFMTF9OT0RFUxACIpQKCgtRdWVyeVJlc3VsdBIUCgxjb2x1bW5fbmFtZXMYASADKAkSGQoRY29sdW1uX3R5cGVfbmFtZXMYAiADKAkSIwoEcm93cxgDIAMoCzIVLmJ5dGViYXNlLnYxLlF1ZXJ5Um93EhIKCnJvd3NfY291bnQYCiABKAMSDQoFZXJyb3IYBiABKAkSKgoHbGF0ZW5jeRgHIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbhIRCglzdGF0ZW1lbnQYCCABKAkSQAoOcG9zdGdyZXNfZXJyb3IYCSABKAsyJi5ieXRlYmFzZS52MS5RdWVyeVJlc3VsdC5Qb3N0Z3Jlc0Vycm9ySAASPAoMc3ludGF4X2Vycm9yGA0gASgLMiQuYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQuU3ludGF4RXJyb3JIABJGChFwZXJtaXNzaW9uX2RlbmllZBgOIAEoCzIpLmJ5dGViYXNlLnYxLlF1ZXJ5UmVzdWx0LlBlcm1pc3Npb25EZW5pZWRIABIyCghtZXNzYWdlcxgMIAMoCzIgLmJ5dGViYXNlLnYxLlF1ZXJ5UmVzdWx0Lk1lc3NhZ2USKgoGbWFza2VkGAQgAygLMhouYnl0ZWJhc2UudjEuTWFza2luZ1JlYXNvbhrOAgoNUG9zdGdyZXNFcnJvchIQCghzZXZlcml0eRgBIAEoCRIMCgRjb2RlGAIgASgJEg8KB21lc3NhZ2UYAyABKAkSDgoGZGV0YWlsGAQgASgJEgwKBGhpbnQYBSABKAkSEAoIcG9zaXRpb24YBiABKAUSGQoRaW50ZXJuYWxfcG9zaXRpb24YByABKAUSFgoOaW50ZXJuYWxfcXVlcnkYCCABKAkSDQoFd2hlcmUYCSABKAkSEwoLc2NoZW1hX25hbWUYCiABKAkSEgoKdGFibGVfbmFtZRgLIAEoCRITCgtjb2x1bW5fbmFtZRgMIAEoCRIWCg5kYXRhX3R5cGVfbmFtZRgNIAEoCRIXCg9jb25zdHJhaW50X25hbWUYDiABKAkSDAoEZmlsZRgPIAEoCRIMCgRsaW5lGBAgASgFEg8KB3JvdXRpbmUYESABKAkaPAoLU3ludGF4RXJyb3ISLQoOc3RhcnRfcG9zaXRpb24YASABKAsyFS5ieXRlYmFzZS52MS5Qb3NpdGlvbhrDAQoQUGVybWlzc2lvbkRlbmllZBIQCghyZXNvdXJjZRgBIAEoCRJLCgxjb21tYW5kX3R5cGUYAiABKA4yNS5ieXRlYmFzZS52MS5RdWVyeVJlc3VsdC5QZXJtaXNzaW9uRGVuaWVkLkNvbW1hbmRUeXBlIlAKC0NvbW1hbmRUeXBlEhwKGENPTU1BTkRfVFlQRV9VTlNQRUNJRklFRBAAEgcKA0RETBABEgcKA0RNTBACEhEKDU5PTl9SRUFEX09OTFkQAxq3AQoHTWVzc2FnZRI1CgVsZXZlbBgBIAEoDjImLmJ5dGViYXNlLnYxLlF1ZXJ5UmVzdWx0Lk1lc3NhZ2UuTGV2ZWwSDwoHY29udGVudBgCIAEoCSJkCgVMZXZlbBIVChFMRVZFTF9VTlNQRUNJRklFRBAAEggKBElORk8QARILCgdXQVJOSU5HEAISCQoFREVCVUcQAxIHCgNMT0cQBBIKCgZOT1RJQ0UQBRINCglFWENFUFRJT04QBkIQCg5kZXRhaWxlZF9lcnJvckoECAsQDCK9AQoNTWFza2luZ1JlYXNvbhIYChBzZW1hbnRpY190eXBlX2lkGAEgASgJEhsKE3NlbWFudGljX3R5cGVfdGl0bGUYAiABKAkSFwoPbWFza2luZ19ydWxlX2lkGAMgASgJEhEKCWFsZ29yaXRobRgEIAEoCRIPCgdjb250ZXh0GAUgASgJEhwKFGNsYXNzaWZpY2F0aW9uX2xldmVsGAYgASgJEhoKEnNlbWFudGljX3R5cGVfaWNvbhgHIAEoCSIxCghRdWVyeVJvdxIlCgZ2YWx1ZXMYASADKAsyFS5ieXRlYmFzZS52MS5Sb3dWYWx1ZSKMBQoIUm93VmFsdWUSMAoKbnVsbF92YWx1ZRgBIAEoDjIaLmdvb2dsZS5wcm90b2J1Zi5OdWxsVmFsdWVIABIUCgpib29sX3ZhbHVlGAIgASgISAASFQoLYnl0ZXNfdmFsdWUYAyABKAxIABIWCgxkb3VibGVfdmFsdWUYBCABKAFIABIVCgtmbG9hdF92YWx1ZRgFIAEoAkgAEhUKC2ludDMyX3ZhbHVlGAYgASgFSAASFQoLaW50NjRfdmFsdWUYByABKANIABIWCgxzdHJpbmdfdmFsdWUYCCABKAlIABIWCgx1aW50MzJfdmFsdWUYCSABKA1IABIWCgx1aW50NjRfdmFsdWUYCiABKARIABItCgt2YWx1ZV92YWx1ZRgLIAEoCzIWLmdvb2dsZS5wcm90b2J1Zi5WYWx1ZUgAEjoKD3RpbWVzdGFtcF92YWx1ZRgMIAEoCzIfLmJ5dGViYXNlLnYxLlJvd1ZhbHVlLlRpbWVzdGFtcEgAEj8KEnRpbWVzdGFtcF90el92YWx1ZRgNIAEoCzIhLmJ5dGViYXNlLnYxLlJvd1ZhbHVlLlRpbWVzdGFtcFRaSAAaUwoJVGltZXN0YW1wEjQKEGdvb2dsZV90aW1lc3RhbXAYASABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEhAKCGFjY3VyYWN5GAIgASgFGnMKC1RpbWVzdGFtcFRaEjQKEGdvb2dsZV90aW1lc3RhbXAYASABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEgwKBHpvbmUYAiABKAkSDgoGb2Zmc2V0GAMgASgFEhAKCGFjY3VyYWN5GAQgASgFQgYKBGtpbmQilQMKBkFkdmljZRIpCgZzdGF0dXMYASABKA4yGS5ieXRlYmFzZS52MS5BZHZpY2UuTGV2ZWwSDAoEY29kZRgCIAEoBRINCgV0aXRsZRgDIAEoCRIPCgdjb250ZW50GAQgASgJEi0KDnN0YXJ0X3Bvc2l0aW9uGAggASgLMhUuYnl0ZWJhc2UudjEuUG9zaXRpb24SKwoMZW5kX3Bvc2l0aW9uGAkgASgLMhUuYnl0ZWJhc2UudjEuUG9zaXRpb24SLwoJcnVsZV90eXBlGAogASgOMhwuYnl0ZWJhc2UudjEuQWR2aWNlLlJ1bGVUeXBlIkoKBUxldmVsEhwKGEFEVklDRV9MRVZFTF9VTlNQRUNJRklFRBAAEgsKB1NVQ0NFU1MQARILCgdXQVJOSU5HEAISCQoFRVJST1IQAyJHCghSdWxlVHlwZRIZChVSVUxFX1RZUEVfVU5TUEVDSUZJRUQQABIQCgxQQVJTRVJfQkFTRUQQARIOCgpBSV9QT1dFUkVEEAJKBAgHEAhKBAgFEAZKBAgGEAci6AEKDUV4cG9ydFJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vRGF0YWJhc2USEQoJc3RhdGVtZW50GAMgASgJEg0KBWxpbWl0GAQgASgFEikKBmZvcm1hdBgFIAEoDjIZLmJ5dGViYXNlLnYxLkV4cG9ydEZvcm1hdBINCgVhZG1pbhgGIAEoCBIQCghwYXNzd29yZBgHIAEoCRIWCg5kYXRhX3NvdXJjZV9pZBgIIAEoCRITCgZzY2hlbWEYCSABKAlIAIgBAUIJCgdfc2NoZW1hSgQIAhADIiEKDkV4cG9ydFJlc3BvbnNlEg8KB2NvbnRlbnQYASABKAwixAIKE0RpZmZNZXRhZGF0YVJlcXVlc3QSOwoPc291cmNlX21ldGFkYXRhGAEgASgLMh0uYnl0ZWJhc2UudjEuRGF0YWJhc2VNZXRhZGF0YUID4EECEjsKD3RhcmdldF9tZXRhZGF0YRgCIAEoCzIdLmJ5dGViYXNlLnYxLkRhdGFiYXNlTWV0YWRhdGFCA+BBAhI0Cg5zb3VyY2VfY2F0YWxvZxgFIAEoCzIcLmJ5dGViYXNlLnYxLkRhdGFiYXNlQ2F0YWxvZxI0Cg50YXJnZXRfY2F0YWxvZxgGIAEoCzIcLmJ5dGViYXNlLnYxLkRhdGFiYXNlQ2F0YWxvZxIjCgZlbmdpbmUYAyABKA4yEy5ieXRlYmFzZS52MS5FbmdpbmUSIgoaY2xhc3NpZmljYXRpb25fZnJvbV9jb25maWcYBCABKAgiJAoURGlmZk1ldGFkYXRhUmVzcG9uc2USDAoEZGlmZhgBIAEoCSJUChtTZWFyY2hRdWVyeUhpc3Rvcmllc1JlcXVlc3QSEQoJcGFnZV9zaXplGAEgASgFEhIKCnBhZ2VfdG9rZW4YAiABKAkSDgoGZmlsdGVyGAMgASgJInAKHFNlYXJjaFF1ZXJ5SGlzdG9yaWVzUmVzcG9uc2USNwoPcXVlcnlfaGlzdG9yaWVzGAEgAygLMhkuYnl0ZWJhc2UudjEuUXVlcnlIaXN0b3J5QgPgQQMSFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJItQCCgxRdWVyeUhpc3RvcnkSEQoEbmFtZRgBIAEoCUID4EEDEhUKCGRhdGFiYXNlGAIgASgJQgPgQQMSFAoHY3JlYXRvchgDIAEoCUID4EEDEjQKC2NyZWF0ZV90aW1lGAQgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEhYKCXN0YXRlbWVudBgFIAEoCUID4EEDEhcKBWVycm9yGAYgASgJQgPgQQNIAIgBARIwCghkdXJhdGlvbhgHIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbkID4EEDEiwKBHR5cGUYCCABKA4yHi5ieXRlYmFzZS52MS5RdWVyeUhpc3RvcnkuVHlwZSIzCgRUeXBlEhQKEFRZUEVfVU5TUEVDSUZJRUQQABIJCgVRVUVSWRABEgoKBkVYUE9SVBACQggKBl9lcnJvciJ7ChNBSUNvbXBsZXRpb25SZXF1ZXN0EjoKCG1lc3NhZ2VzGAEgAygLMiguYnl0ZWJhc2UudjEuQUlDb21wbGV0aW9uUmVxdWVzdC5NZXNzYWdlGigKB01lc3NhZ2USDAoEcm9sZRgBIAEoCRIPCgdjb250ZW50GAIgASgJIpUCChRBSUNvbXBsZXRpb25SZXNwb25zZRI/CgpjYW5kaWRhdGVzGAEgAygLMisuYnl0ZWJhc2UudjEuQUlDb21wbGV0aW9uUmVzcG9uc2UuQ2FuZGlkYXRlGrsBCglDYW5kaWRhdGUSRAoHY29udGVudBgBIAEoCzIzLmJ5dGViYXNlLnYxLkFJQ29tcGxldGlvblJlc3BvbnNlLkNhbmRpZGF0ZS5Db250ZW50GmgKB0NvbnRlbnQSRwoFcGFydHMYASADKAsyOC5ieXRlYmFzZS52MS5BSUNvbXBsZXRpb25SZXNwb25zZS5DYW5kaWRhdGUuQ29udGVudC5QYXJ0GhQKBFBhcnQSDAoEdGV4dBgBIAEoCTK9BwoKU1FMU2VydmljZRKPAQoFUXVlcnkSGS5ieXRlYmFzZS52MS5RdWVyeVJlcXVlc3QaGi5ieXRlYmFzZS52MS5RdWVyeVJlc3BvbnNlIk+K6jAQYmIuZGF0YWJhc2VzLmdldJDqMAGY6jABgtPkkwItOgEqIigvdjEve25hbWU9aW5zdGFuY2VzLyovZGF0YWJhc2VzLyp9OnF1ZXJ5EokBCgxBZG1pbkV4ZWN1dGUSIC5ieXRlYmFzZS52MS5BZG1pbkV4ZWN1dGVSZXF1ZXN0GiEuYnl0ZWJhc2UudjEuQWRtaW5FeGVjdXRlUmVzcG9uc2UiMIrqMAxiYi5zcWwuYWRtaW6Q6jABmOowAYLT5JMCEhIQL3YxOmFkbWluRXhlY3V0ZSgBMAESlQEKFFNlYXJjaFF1ZXJ5SGlzdG9yaWVzEiguYnl0ZWJhc2UudjEuU2VhcmNoUXVlcnlIaXN0b3JpZXNSZXF1ZXN0GikuYnl0ZWJhc2UudjEuU2VhcmNoUXVlcnlIaXN0b3JpZXNSZXNwb25zZSIokOowAoLT5JMCHjoBKiIZL3YxL3F1ZXJ5SGlzdG9yaWVzOnNlYXJjaBL6AQoGRXhwb3J0EhouYnl0ZWJhc2UudjEuRXhwb3J0UmVxdWVzdBobLmJ5dGViYXNlLnYxLkV4cG9ydFJlc3BvbnNlIrYBiuowEGJiLmRhdGFiYXNlcy5nZXSQ6jABmOowAYLT5JMCkwE6ASpaLDoBKiInL3YxL3tuYW1lPXByb2plY3RzLyovcm9sbG91dHMvKn06ZXhwb3J0WjU6ASoiMC92MS97bmFtZT1wcm9qZWN0cy8qL3JvbGxvdXRzLyovc3RhZ2VzLyp9OmV4cG9ydCIpL3YxL3tuYW1lPWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qfTpleHBvcnQSgQEKDERpZmZNZXRhZGF0YRIgLmJ5dGViYXNlLnYxLkRpZmZNZXRhZGF0YVJlcXVlc3QaIS5ieXRlYmFzZS52MS5EaWZmTWV0YWRhdGFSZXNwb25zZSIsgOowAYLT5JMCIjoBKiIdL3YxL3NjaGVtYURlc2lnbjpkaWZmTWV0YWRhdGESeAoMQUlDb21wbGV0aW9uEiAuYnl0ZWJhc2UudjEuQUlDb21wbGV0aW9uUmVxdWVzdBohLmJ5dGViYXNlLnYxLkFJQ29tcGxldGlvblJlc3BvbnNlIiOQ6jACgtPkkwIZOgEqIhQvdjEvc3FsL2FpQ29tcGxldGlvbkKlAQoPY29tLmJ5dGViYXNlLnYxQg9TcWxTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [file_google_api_annotations, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_duration, file_google_protobuf_struct, file_google_protobuf_timestamp, file_v1_annotation, file_v1_common, file_v1_database_catalog_service, file_v1_database_service]);
+ fileDesc("ChR2MS9zcWxfc2VydmljZS5wcm90bxILYnl0ZWJhc2UudjEisAEKE0FkbWluRXhlY3V0ZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vRGF0YWJhc2USEQoJc3RhdGVtZW50GAMgASgJEg0KBWxpbWl0GAQgASgFEhMKBnNjaGVtYRgGIAEoCUgAiAEBEhYKCWNvbnRhaW5lchgHIAEoCUgBiAEBQgkKB19zY2hlbWFCDAoKX2NvbnRhaW5lckoECAIQAyJBChRBZG1pbkV4ZWN1dGVSZXNwb25zZRIpCgdyZXN1bHRzGAEgAygLMhguYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQihwIKDFF1ZXJ5UmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9EYXRhYmFzZRIRCglzdGF0ZW1lbnQYAyABKAkSDQoFbGltaXQYBCABKAUSGwoOZGF0YV9zb3VyY2VfaWQYBiABKAlCA+BBAhIPCgdleHBsYWluGAcgASgIEhMKBnNjaGVtYRgIIAEoCUgAiAEBEi4KDHF1ZXJ5X29wdGlvbhgJIAEoCzIYLmJ5dGViYXNlLnYxLlF1ZXJ5T3B0aW9uEhYKCWNvbnRhaW5lchgKIAEoCUgBiAEBQgkKB19zY2hlbWFCDAoKX2NvbnRhaW5lckoECAIQAyJACg1RdWVyeVJlc3BvbnNlEikKB3Jlc3VsdHMYASADKAsyGC5ieXRlYmFzZS52MS5RdWVyeVJlc3VsdEoECAIQAyK2AQoLUXVlcnlPcHRpb24SSgoVcmVkaXNfcnVuX2NvbW1hbmRzX29uGAEgASgOMisuYnl0ZWJhc2UudjEuUXVlcnlPcHRpb24uUmVkaXNSdW5Db21tYW5kc09uIlsKElJlZGlzUnVuQ29tbWFuZHNPbhIlCiFSRURJU19SVU5fQ09NTUFORFNfT05fVU5TUEVDSUZJRUQQABIPCgtTSU5HTEVfTk9ERRABEg0KCUFMTF9OT0RFUxACIpUKCgtRdWVyeVJlc3VsdBIUCgxjb2x1bW5fbmFtZXMYASADKAkSGQoRY29sdW1uX3R5cGVfbmFtZXMYAiADKAkSIwoEcm93cxgDIAMoCzIVLmJ5dGViYXNlLnYxLlF1ZXJ5Um93EhIKCnJvd3NfY291bnQYCiABKAMSDQoFZXJyb3IYBiABKAkSKgoHbGF0ZW5jeRgHIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbhIRCglzdGF0ZW1lbnQYCCABKAkSQAoOcG9zdGdyZXNfZXJyb3IYCSABKAsyJi5ieXRlYmFzZS52MS5RdWVyeVJlc3VsdC5Qb3N0Z3Jlc0Vycm9ySAASPAoMc3ludGF4X2Vycm9yGA0gASgLMiQuYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQuU3ludGF4RXJyb3JIABJGChFwZXJtaXNzaW9uX2RlbmllZBgOIAEoCzIpLmJ5dGViYXNlLnYxLlF1ZXJ5UmVzdWx0LlBlcm1pc3Npb25EZW5pZWRIABIyCghtZXNzYWdlcxgMIAMoCzIgLmJ5dGViYXNlLnYxLlF1ZXJ5UmVzdWx0Lk1lc3NhZ2USKgoGbWFza2VkGAQgAygLMhouYnl0ZWJhc2UudjEuTWFza2luZ1JlYXNvbhrOAgoNUG9zdGdyZXNFcnJvchIQCghzZXZlcml0eRgBIAEoCRIMCgRjb2RlGAIgASgJEg8KB21lc3NhZ2UYAyABKAkSDgoGZGV0YWlsGAQgASgJEgwKBGhpbnQYBSABKAkSEAoIcG9zaXRpb24YBiABKAUSGQoRaW50ZXJuYWxfcG9zaXRpb24YByABKAUSFgoOaW50ZXJuYWxfcXVlcnkYCCABKAkSDQoFd2hlcmUYCSABKAkSEwoLc2NoZW1hX25hbWUYCiABKAkSEgoKdGFibGVfbmFtZRgLIAEoCRITCgtjb2x1bW5fbmFtZRgMIAEoCRIWCg5kYXRhX3R5cGVfbmFtZRgNIAEoCRIXCg9jb25zdHJhaW50X25hbWUYDiABKAkSDAoEZmlsZRgPIAEoCRIMCgRsaW5lGBAgASgFEg8KB3JvdXRpbmUYESABKAkaPAoLU3ludGF4RXJyb3ISLQoOc3RhcnRfcG9zaXRpb24YASABKAsyFS5ieXRlYmFzZS52MS5Qb3NpdGlvbhrEAQoQUGVybWlzc2lvbkRlbmllZBIRCglyZXNvdXJjZXMYASADKAkSSwoMY29tbWFuZF90eXBlGAIgASgOMjUuYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQuUGVybWlzc2lvbkRlbmllZC5Db21tYW5kVHlwZSJQCgtDb21tYW5kVHlwZRIcChhDT01NQU5EX1RZUEVfVU5TUEVDSUZJRUQQABIHCgNEREwQARIHCgNETUwQAhIRCg1OT05fUkVBRF9PTkxZEAMatwEKB01lc3NhZ2USNQoFbGV2ZWwYASABKA4yJi5ieXRlYmFzZS52MS5RdWVyeVJlc3VsdC5NZXNzYWdlLkxldmVsEg8KB2NvbnRlbnQYAiABKAkiZAoFTGV2ZWwSFQoRTEVWRUxfVU5TUEVDSUZJRUQQABIICgRJTkZPEAESCwoHV0FSTklORxACEgkKBURFQlVHEAMSBwoDTE9HEAQSCgoGTk9USUNFEAUSDQoJRVhDRVBUSU9OEAZCEAoOZGV0YWlsZWRfZXJyb3JKBAgLEAwivQEKDU1hc2tpbmdSZWFzb24SGAoQc2VtYW50aWNfdHlwZV9pZBgBIAEoCRIbChNzZW1hbnRpY190eXBlX3RpdGxlGAIgASgJEhcKD21hc2tpbmdfcnVsZV9pZBgDIAEoCRIRCglhbGdvcml0aG0YBCABKAkSDwoHY29udGV4dBgFIAEoCRIcChRjbGFzc2lmaWNhdGlvbl9sZXZlbBgGIAEoCRIaChJzZW1hbnRpY190eXBlX2ljb24YByABKAkiMQoIUXVlcnlSb3cSJQoGdmFsdWVzGAEgAygLMhUuYnl0ZWJhc2UudjEuUm93VmFsdWUijAUKCFJvd1ZhbHVlEjAKCm51bGxfdmFsdWUYASABKA4yGi5nb29nbGUucHJvdG9idWYuTnVsbFZhbHVlSAASFAoKYm9vbF92YWx1ZRgCIAEoCEgAEhUKC2J5dGVzX3ZhbHVlGAMgASgMSAASFgoMZG91YmxlX3ZhbHVlGAQgASgBSAASFQoLZmxvYXRfdmFsdWUYBSABKAJIABIVCgtpbnQzMl92YWx1ZRgGIAEoBUgAEhUKC2ludDY0X3ZhbHVlGAcgASgDSAASFgoMc3RyaW5nX3ZhbHVlGAggASgJSAASFgoMdWludDMyX3ZhbHVlGAkgASgNSAASFgoMdWludDY0X3ZhbHVlGAogASgESAASLQoLdmFsdWVfdmFsdWUYCyABKAsyFi5nb29nbGUucHJvdG9idWYuVmFsdWVIABI6Cg90aW1lc3RhbXBfdmFsdWUYDCABKAsyHy5ieXRlYmFzZS52MS5Sb3dWYWx1ZS5UaW1lc3RhbXBIABI/ChJ0aW1lc3RhbXBfdHpfdmFsdWUYDSABKAsyIS5ieXRlYmFzZS52MS5Sb3dWYWx1ZS5UaW1lc3RhbXBUWkgAGlMKCVRpbWVzdGFtcBI0ChBnb29nbGVfdGltZXN0YW1wGAEgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIQCghhY2N1cmFjeRgCIAEoBRpzCgtUaW1lc3RhbXBUWhI0ChBnb29nbGVfdGltZXN0YW1wGAEgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIMCgR6b25lGAIgASgJEg4KBm9mZnNldBgDIAEoBRIQCghhY2N1cmFjeRgEIAEoBUIGCgRraW5kIpUDCgZBZHZpY2USKQoGc3RhdHVzGAEgASgOMhkuYnl0ZWJhc2UudjEuQWR2aWNlLkxldmVsEgwKBGNvZGUYAiABKAUSDQoFdGl0bGUYAyABKAkSDwoHY29udGVudBgEIAEoCRItCg5zdGFydF9wb3NpdGlvbhgIIAEoCzIVLmJ5dGViYXNlLnYxLlBvc2l0aW9uEisKDGVuZF9wb3NpdGlvbhgJIAEoCzIVLmJ5dGViYXNlLnYxLlBvc2l0aW9uEi8KCXJ1bGVfdHlwZRgKIAEoDjIcLmJ5dGViYXNlLnYxLkFkdmljZS5SdWxlVHlwZSJKCgVMZXZlbBIcChhBRFZJQ0VfTEVWRUxfVU5TUEVDSUZJRUQQABILCgdTVUNDRVNTEAESCwoHV0FSTklORxACEgkKBUVSUk9SEAMiRwoIUnVsZVR5cGUSGQoVUlVMRV9UWVBFX1VOU1BFQ0lGSUVEEAASEAoMUEFSU0VSX0JBU0VEEAESDgoKQUlfUE9XRVJFRBACSgQIBxAISgQIBRAGSgQIBhAHIugBCg1FeHBvcnRSZXF1ZXN0EisKBG5hbWUYASABKAlCHeBBAvpBFwoVYnl0ZWJhc2UuY29tL0RhdGFiYXNlEhEKCXN0YXRlbWVudBgDIAEoCRINCgVsaW1pdBgEIAEoBRIpCgZmb3JtYXQYBSABKA4yGS5ieXRlYmFzZS52MS5FeHBvcnRGb3JtYXQSDQoFYWRtaW4YBiABKAgSEAoIcGFzc3dvcmQYByABKAkSFgoOZGF0YV9zb3VyY2VfaWQYCCABKAkSEwoGc2NoZW1hGAkgASgJSACIAQFCCQoHX3NjaGVtYUoECAIQAyIhCg5FeHBvcnRSZXNwb25zZRIPCgdjb250ZW50GAEgASgMIsQCChNEaWZmTWV0YWRhdGFSZXF1ZXN0EjsKD3NvdXJjZV9tZXRhZGF0YRgBIAEoCzIdLmJ5dGViYXNlLnYxLkRhdGFiYXNlTWV0YWRhdGFCA+BBAhI7Cg90YXJnZXRfbWV0YWRhdGEYAiABKAsyHS5ieXRlYmFzZS52MS5EYXRhYmFzZU1ldGFkYXRhQgPgQQISNAoOc291cmNlX2NhdGFsb2cYBSABKAsyHC5ieXRlYmFzZS52MS5EYXRhYmFzZUNhdGFsb2cSNAoOdGFyZ2V0X2NhdGFsb2cYBiABKAsyHC5ieXRlYmFzZS52MS5EYXRhYmFzZUNhdGFsb2cSIwoGZW5naW5lGAMgASgOMhMuYnl0ZWJhc2UudjEuRW5naW5lEiIKGmNsYXNzaWZpY2F0aW9uX2Zyb21fY29uZmlnGAQgASgIIiQKFERpZmZNZXRhZGF0YVJlc3BvbnNlEgwKBGRpZmYYASABKAkiVAobU2VhcmNoUXVlcnlIaXN0b3JpZXNSZXF1ZXN0EhEKCXBhZ2Vfc2l6ZRgBIAEoBRISCgpwYWdlX3Rva2VuGAIgASgJEg4KBmZpbHRlchgDIAEoCSJwChxTZWFyY2hRdWVyeUhpc3Rvcmllc1Jlc3BvbnNlEjcKD3F1ZXJ5X2hpc3RvcmllcxgBIAMoCzIZLmJ5dGViYXNlLnYxLlF1ZXJ5SGlzdG9yeUID4EEDEhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSLUAgoMUXVlcnlIaXN0b3J5EhEKBG5hbWUYASABKAlCA+BBAxIVCghkYXRhYmFzZRgCIAEoCUID4EEDEhQKB2NyZWF0b3IYAyABKAlCA+BBAxI0CgtjcmVhdGVfdGltZRgEIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxIWCglzdGF0ZW1lbnQYBSABKAlCA+BBAxIXCgVlcnJvchgGIAEoCUID4EEDSACIAQESMAoIZHVyYXRpb24YByABKAsyGS5nb29nbGUucHJvdG9idWYuRHVyYXRpb25CA+BBAxIsCgR0eXBlGAggASgOMh4uYnl0ZWJhc2UudjEuUXVlcnlIaXN0b3J5LlR5cGUiMwoEVHlwZRIUChBUWVBFX1VOU1BFQ0lGSUVEEAASCQoFUVVFUlkQARIKCgZFWFBPUlQQAkIICgZfZXJyb3IiewoTQUlDb21wbGV0aW9uUmVxdWVzdBI6CghtZXNzYWdlcxgBIAMoCzIoLmJ5dGViYXNlLnYxLkFJQ29tcGxldGlvblJlcXVlc3QuTWVzc2FnZRooCgdNZXNzYWdlEgwKBHJvbGUYASABKAkSDwoHY29udGVudBgCIAEoCSKVAgoUQUlDb21wbGV0aW9uUmVzcG9uc2USPwoKY2FuZGlkYXRlcxgBIAMoCzIrLmJ5dGViYXNlLnYxLkFJQ29tcGxldGlvblJlc3BvbnNlLkNhbmRpZGF0ZRq7AQoJQ2FuZGlkYXRlEkQKB2NvbnRlbnQYASABKAsyMy5ieXRlYmFzZS52MS5BSUNvbXBsZXRpb25SZXNwb25zZS5DYW5kaWRhdGUuQ29udGVudBpoCgdDb250ZW50EkcKBXBhcnRzGAEgAygLMjguYnl0ZWJhc2UudjEuQUlDb21wbGV0aW9uUmVzcG9uc2UuQ2FuZGlkYXRlLkNvbnRlbnQuUGFydBoUCgRQYXJ0EgwKBHRleHQYASABKAkyvQcKClNRTFNlcnZpY2USjwEKBVF1ZXJ5EhkuYnl0ZWJhc2UudjEuUXVlcnlSZXF1ZXN0GhouYnl0ZWJhc2UudjEuUXVlcnlSZXNwb25zZSJPiuowEGJiLmRhdGFiYXNlcy5nZXSQ6jABmOowAYLT5JMCLToBKiIoL3YxL3tuYW1lPWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qfTpxdWVyeRKJAQoMQWRtaW5FeGVjdXRlEiAuYnl0ZWJhc2UudjEuQWRtaW5FeGVjdXRlUmVxdWVzdBohLmJ5dGViYXNlLnYxLkFkbWluRXhlY3V0ZVJlc3BvbnNlIjCK6jAMYmIuc3FsLmFkbWlukOowAZjqMAGC0+STAhISEC92MTphZG1pbkV4ZWN1dGUoATABEpUBChRTZWFyY2hRdWVyeUhpc3RvcmllcxIoLmJ5dGViYXNlLnYxLlNlYXJjaFF1ZXJ5SGlzdG9yaWVzUmVxdWVzdBopLmJ5dGViYXNlLnYxLlNlYXJjaFF1ZXJ5SGlzdG9yaWVzUmVzcG9uc2UiKJDqMAKC0+STAh46ASoiGS92MS9xdWVyeUhpc3RvcmllczpzZWFyY2gS+gEKBkV4cG9ydBIaLmJ5dGViYXNlLnYxLkV4cG9ydFJlcXVlc3QaGy5ieXRlYmFzZS52MS5FeHBvcnRSZXNwb25zZSK2AYrqMBBiYi5kYXRhYmFzZXMuZ2V0kOowAZjqMAGC0+STApMBOgEqWiw6ASoiJy92MS97bmFtZT1wcm9qZWN0cy8qL3JvbGxvdXRzLyp9OmV4cG9ydFo1OgEqIjAvdjEve25hbWU9cHJvamVjdHMvKi9yb2xsb3V0cy8qL3N0YWdlcy8qfTpleHBvcnQiKS92MS97bmFtZT1pbnN0YW5jZXMvKi9kYXRhYmFzZXMvKn06ZXhwb3J0EoEBCgxEaWZmTWV0YWRhdGESIC5ieXRlYmFzZS52MS5EaWZmTWV0YWRhdGFSZXF1ZXN0GiEuYnl0ZWJhc2UudjEuRGlmZk1ldGFkYXRhUmVzcG9uc2UiLIDqMAGC0+STAiI6ASoiHS92MS9zY2hlbWFEZXNpZ246ZGlmZk1ldGFkYXRhEngKDEFJQ29tcGxldGlvbhIgLmJ5dGViYXNlLnYxLkFJQ29tcGxldGlvblJlcXVlc3QaIS5ieXRlYmFzZS52MS5BSUNvbXBsZXRpb25SZXNwb25zZSIjkOowAoLT5JMCGToBKiIUL3YxL3NxbC9haUNvbXBsZXRpb25CpQEKD2NvbS5ieXRlYmFzZS52MUIPU3FsU2VydmljZVByb3RvUAFaNGdpdGh1Yi5jb20vYnl0ZWJhc2UvYnl0ZWJhc2UvYmFja2VuZC9nZW5lcmF0ZWQtZ28vdjGiAgNCWFiqAgtCeXRlYmFzZS5WMcoCC0J5dGViYXNlXFYx4gIXQnl0ZWJhc2VcVjFcR1BCTWV0YWRhdGHqAgxCeXRlYmFzZTo6VjFiBnByb3RvMw", [file_google_api_annotations, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_duration, file_google_protobuf_struct, file_google_protobuf_timestamp, file_v1_annotation, file_v1_common, file_v1_database_catalog_service, file_v1_database_service]);
/**
* Describes the message bytebase.v1.AdminExecuteRequest.
diff --git a/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/TreeNode/DatabaseNode.vue b/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/TreeNode/DatabaseNode.vue
index 14e782a228..626d13bcb7 100644
--- a/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/TreeNode/DatabaseNode.vue
+++ b/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/TreeNode/DatabaseNode.vue
@@ -31,9 +31,11 @@
</span>
<RequestQueryButton
v-if="showRequestQueryButton"
- :database-resource="{
- databaseFullName: database.name,
- }"
+ :database-resources="[
+ {
+ databaseFullName: database.name,
+ },
+ ]"
:size="'tiny'"
/>
</div>
diff --git a/frontend/src/views/sql-editor/EditorCommon/ResultView/RequestQueryButton.vue b/frontend/src/views/sql-editor/EditorCommon/ResultView/RequestQueryButton.vue
index 404f9e060c..d2e6b01507 100644
--- a/frontend/src/views/sql-editor/EditorCommon/ResultView/RequestQueryButton.vue
+++ b/frontend/src/views/sql-editor/EditorCommon/ResultView/RequestQueryButton.vue
@@ -7,7 +7,7 @@
<GrantRequestPanel
v-if="showPanel"
:project-name="database.project"
- :database-resource="databaseResource"
+ :database-resources="databaseResources"
:placement="'right'"
:role="PresetRoleType.SQL_EDITOR_USER"
@close="showPanel = false"
@@ -29,7 +29,7 @@ import { hasPermissionToCreateRequestGrantIssue } from "@/utils";
const props = withDefaults(
defineProps<{
- databaseResource: DatabaseResource;
+ databaseResources: DatabaseResource[];
size?: "tiny" | "medium";
}>(),
{
@@ -39,11 +39,19 @@ const props = withDefaults(
const showPanel = ref(false);
+const primaryDatabase = computed(() => {
+ return props.databaseResources[0];
+});
+
const { database } = useDatabaseV1ByName(
- computed(() => props.databaseResource.databaseFullName)
+ computed(() => primaryDatabase.value?.databaseFullName ?? "")
);
const available = computed(() => {
+ if (props.databaseResources.length === 0) {
+ return false;
+ }
+
if (!isValidDatabaseName(database.value.name)) {
return false;
}
diff --git a/frontend/src/views/sql-editor/EditorCommon/ResultView/ResultViewV1.vue b/frontend/src/views/sql-editor/EditorCommon/ResultView/ResultViewV1.vue
index 6d4d68cfe5..1359970074 100644
--- a/frontend/src/views/sql-editor/EditorCommon/ResultView/ResultViewV1.vue
+++ b/frontend/src/views/sql-editor/EditorCommon/ResultView/ResultViewV1.vue
@@ -12,7 +12,14 @@
:execute-params="executeParams"
:result-set="resultSet"
@execute="$emit('execute', $event)"
- />
+ >
+ <template #suffix>
+ <RequestQueryButton
+ v-if="showRequestQueryButton"
+ :database-resources="missingResources"
+ />
+ </template>
+ </ErrorView>
<SingleResultViewV1
v-else
:params="executeParams"
@@ -56,7 +63,14 @@
:execute-params="executeParams"
:result-set="resultSet"
@execute="$emit('execute', $event)"
- />
+ >
+ <template #suffix>
+ <RequestQueryButton
+ v-if="showRequestQueryButton"
+ :database-resources="missingResources"
+ />
+ </template>
+ </ErrorView>
<SingleResultViewV1
v-else
:params="executeParams"
@@ -111,7 +125,7 @@
<template #suffix>
<RequestQueryButton
v-if="showRequestQueryButton"
- :database-resource="missingResource!"
+ :database-resources="missingResources"
/>
<SyncDatabaseButton
v-else-if="resultSet.error.includes('resource not found')"
@@ -252,20 +266,26 @@ const detail: SQLResultViewContext["detail"] = ref(undefined);
provideBinaryFormatContext(computed(() => props.contextId));
-const missingResource = computed((): DatabaseResource | undefined => {
+const missingResources = computed((): DatabaseResource[] => {
+ const resources: DatabaseResource[] = [];
for (const result of props.resultSet?.results ?? []) {
if (
result.detailedError.case === "permissionDenied" &&
- result.detailedError.value?.resource !== ""
+ result.detailedError.value?.resources.length > 0
) {
- return parseStringToResource(result.detailedError.value?.resource);
+ for (const resourceString of result.detailedError.value.resources) {
+ const resource = parseStringToResource(resourceString);
+ if (resource) {
+ resources.push(resource);
+ }
+ }
}
}
- return undefined;
+ return resources;
});
const showRequestQueryButton = computed(() => {
- return missingResource.value;
+ return missingResources.value.length > 0;
});
const viewMode = computed((): ViewMode => {
diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yaml
index 5a808a25d3..0af82f8cfd 100644
--- a/proto/gen/grpc-doc/openapi.yaml
+++ b/proto/gen/grpc-doc/openapi.yaml
@@ -12288,10 +12288,12 @@ components:
QueryResult_PermissionDenied:
type: object
properties:
- resource:
- type: string
+ resources:
+ type: array
+ items:
+ type: string
description: |-
- Denied to access the resource.
+ Denied to access the resources.
Format:
instances/{instance}/databases/{database}
instances/{instance}/databases/{database}/schemas/{schema}
@@ -12308,7 +12310,7 @@ components:
format: enum
description: |-
Permission denied with resource information or disallowed command_type.
- Either resource or command_type is available.
+ Either resources or command_type is available.
QueryResult_PostgresError:
type: object
properties:
diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.md
index 5002766d3f..10bb1126f8 100644
--- a/proto/gen/grpc-doc/v1/README.md
+++ b/proto/gen/grpc-doc/v1/README.md
@@ -7890,12 +7890,12 @@ OrgPolicyService manages organizational policies at various resource levels.
### QueryResult.PermissionDenied
Permission denied with resource information or disallowed command_type.
-Either resource or command_type is available.
+Either resources or command_type is available.
| Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- |
-| resource | [string](#string) | | Denied to access the resource. Format: instances/{instance}/databases/{database} instances/{instance}/databases/{database}/schemas/{schema} instances/{instance}/databases/{database}/tables/{table} instances/{instance}/databases/{database}/schemas/{schema}/tables/{table} |
+| resources | [string](#string) | repeated | Denied to access the resources. Format: instances/{instance}/databases/{database} instances/{instance}/databases/{database}/schemas/{schema} instances/{instance}/databases/{database}/tables/{table} instances/{instance}/databases/{database}/schemas/{schema}/tables/{table} |
| command_type | [QueryResult.PermissionDenied.CommandType](#bytebase-v1-QueryResult-PermissionDenied-CommandType) | | Disallowed command_type. |
diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.html
index 9145964064..b1f4ba60c9 100644
--- a/proto/gen/grpc-doc/v1/index.html
+++ b/proto/gen/grpc-doc/v1/index.html
@@ -22206,7 +22206,7 @@ Examples include PostgreSQL&#39;s RAISE NOTICE, MSSQL&#39;s PRINT, or Oracle&#39
<h3 id="bytebase.v1.QueryResult.PermissionDenied">QueryResult.PermissionDenied</h3>
- <p>Permission denied with resource information or disallowed command_type.</p><p>Either resource or command_type is available.</p>
+ <p>Permission denied with resource information or disallowed command_type.</p><p>Either resources or command_type is available.</p>
<table class="field-table">
@@ -22216,10 +22216,10 @@ Examples include PostgreSQL&#39;s RAISE NOTICE, MSSQL&#39;s PRINT, or Oracle&#39
<tbody>
<tr>
- <td>resource</td>
+ <td>resources</td>
<td><a href="#string">string</a></td>
- <td></td>
- <td><p>Denied to access the resource.
+ <td>repeated</td>
+ <td><p>Denied to access the resources.
Format:
instances/{instance}/databases/{database}
instances/{instance}/databases/{database}/schemas/{schema}
diff --git a/proto/v1/v1/sql_service.proto b/proto/v1/v1/sql_service.proto
index 01f3e46e44..89e90e9d56 100644
--- a/proto/v1/v1/sql_service.proto
+++ b/proto/v1/v1/sql_service.proto
@@ -234,15 +234,15 @@ message QueryResult {
}
// Permission denied with resource information or disallowed command_type.
- // Either resource or command_type is available.
+ // Either resources or command_type is available.
message PermissionDenied {
- // Denied to access the resource.
+ // Denied to access the resources.
// Format:
// instances/{instance}/databases/{database}
// instances/{instance}/databases/{database}/schemas/{schema}
// instances/{instance}/databases/{database}/tables/{table}
// instances/{instance}/databases/{database}/schemas/{schema}/tables/{table}
- string resource = 1;
+ repeated string resources = 1;
// Disallowed command_type.
CommandType command_type = 2;