Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
chore: support configure environment for ddl/dml permission (#19239)
ecmadao00288007adf2
diff --git a/backend/api/mcp/gen/openapi.yaml b/backend/api/mcp/gen/openapi.yamlindex 6658934a45..387a045192 100644--- a/backend/api/mcp/gen/openapi.yaml+++ b/backend/api/mcp/gen/openapi.yaml@@ -14000,17 +14000,6 @@ components:If false,1. when read-only data source is configured, users're force to use the read-only data source2. otherwise fallback to use the admin data source.- disallowDdl:- type: boolean- title: disallow_ddl- description: |-- ================- Deprecate following fields.- Disallow running DDL statements in the SQL editor.- disallowDml:- type: boolean- title: disallow_dml- description: Disallow running DML statements in the SQL editor.title: QueryDataPolicyadditionalProperties: falsedescription: QueryDataPolicy is the policy configuration for querying data in the SQL Editor.@@ -14202,10 +14191,17 @@ components:title: maskeddescription: Masking reasons for each column (empty for non-masked columns).- oneOf:+ - properties:+ commandError:+ title: command_error+ $ref: '#/components/schemas/bytebase.v1.QueryResult.CommandError'+ title: command_error+ required:+ - commandError- properties:permissionDenied:title: permission_denied- $ref: '#/components/schemas/bytebase.v1.QueryResult.PermissionDenied'+ $ref: '#/components/schemas/bytebase.v1.PermissionDeniedDetail'title: permission_deniedrequired:- permissionDenied@@ -14225,6 +14221,26 @@ components:- syntaxErrortitle: QueryResultadditionalProperties: false+ bytebase.v1.QueryResult.CommandError:+ type: object+ properties:+ commandType:+ title: command_type+ description: Disallowed command_type.+ $ref: '#/components/schemas/bytebase.v1.QueryResult.CommandError.Type'+ title: CommandError+ additionalProperties: false+ description: |-+ Permission denied with resource information or disallowed command_type.+ Either resources or command_type is available.+ bytebase.v1.QueryResult.CommandError.Type:+ type: string+ title: Type+ enum:+ - TYPE_UNSPECIFIED+ - DDL+ - DML+ - NON_READ_ONLYbytebase.v1.QueryResult.Message:type: objectproperties:@@ -14247,38 +14263,6 @@ components:- LOG- NOTICE- EXCEPTION- bytebase.v1.QueryResult.PermissionDenied:- type: object- properties:- resources:- type: array- items:- type: string- title: resources- description: |-- 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}- commandType:- title: command_type- description: Disallowed command_type.- $ref: '#/components/schemas/bytebase.v1.QueryResult.PermissionDenied.CommandType'- title: PermissionDenied- additionalProperties: false- description: |-- Permission denied with resource information or disallowed command_type.- Either resources or command_type is available.- bytebase.v1.QueryResult.PermissionDenied.CommandType:- type: string- title: CommandType- enum:- - COMMAND_TYPE_UNSPECIFIED- - DDL- - DML- - NON_READ_ONLYbytebase.v1.QueryResult.PostgresError:type: objectproperties:diff --git a/backend/api/v1/error.go b/backend/api/v1/error.goindex 0210f28c36..ac2a3daa28 100644--- a/backend/api/v1/error.go+++ b/backend/api/v1/error.go@@ -1,13 +1,15 @@package v1import (+ "github.com/bytebase/bytebase/backend/common/permission"v1pb "github.com/bytebase/bytebase/backend/generated-go/v1")type queryError struct {err errorresources []string- commandType v1pb.QueryResult_PermissionDenied_CommandType+ permission permission.Permission+ commandType v1pb.QueryResult_CommandError_Type}func (qe *queryError) Error() string {diff --git a/backend/api/v1/org_policy_service_converter.go b/backend/api/v1/org_policy_service_converter.goindex f13ef49901..d1fd86aa83 100644--- a/backend/api/v1/org_policy_service_converter.go+++ b/backend/api/v1/org_policy_service_converter.go@@ -172,8 +172,6 @@ func convertToV1PBQueryDataPolicy(payloadStr string) (*v1pb.Policy_QueryDataPoliMaximumResultRows: payload.MaximumResultRows,DisableCopyData: payload.DisableCopyData,AllowAdminDataSource: payload.AllowAdminDataSource,- DisallowDdl: payload.DisallowDdl,- DisallowDml: payload.DisallowDml,},}, nil}@@ -184,8 +182,6 @@ func convertToQueryDataPolicyPayload(policy *v1pb.QueryDataPolicy) *storepb.QuerMaximumResultRows: policy.MaximumResultRows,DisableCopyData: policy.DisableCopyData,AllowAdminDataSource: policy.AllowAdminDataSource,- DisallowDdl: policy.DisallowDdl,- DisallowDml: policy.DisallowDml,}}diff --git a/backend/api/v1/sql_service.go b/backend/api/v1/sql_service.goindex e1fbc0f59e..aa47174a25 100644--- a/backend/api/v1/sql_service.go+++ b/backend/api/v1/sql_service.go@@ -268,14 +268,17 @@ func (s *SQLService) Query(ctx context.Context, req *connect.Request[v1pb.QueryRvar pe *parserbase.SyntaxErrorif errors.As(queryErr, &qe) {if len(qe.resources) > 0 {- results[len(results)-1].DetailedError = &v1pb.QueryResult_PermissionDenied_{- PermissionDenied: &v1pb.QueryResult_PermissionDenied{+ results[len(results)-1].DetailedError = &v1pb.QueryResult_PermissionDenied{+ PermissionDenied: &v1pb.PermissionDeniedDetail{Resources: qe.resources,+ RequiredPermissions: []string{+ qe.permission,+ },},}- } else if qe.commandType != v1pb.QueryResult_PermissionDenied_COMMAND_TYPE_UNSPECIFIED {- results[len(results)-1].DetailedError = &v1pb.QueryResult_PermissionDenied_{- PermissionDenied: &v1pb.QueryResult_PermissionDenied{+ } else if qe.commandType != v1pb.QueryResult_CommandError_TYPE_UNSPECIFIED {+ results[len(results)-1].DetailedError = &v1pb.QueryResult_CommandError_{+ CommandError: &v1pb.QueryResult_CommandError{CommandType: qe.commandType,},}@@ -1454,14 +1457,21 @@ func (s *SQLService) accessCheck(checkDatabaseAccess := func(perm permission.Permission) error {databaseFullName := common.FormatDatabase(instance.ResourceID, database.DatabaseName)+ attributes := map[string]any{+ common.CELAttributeRequestTime: time.Now(),+ common.CELAttributeResourceDatabase: databaseFullName,+ }+ env := ""+ if database.EffectiveEnvironmentID != nil {+ env = *database.EffectiveEnvironmentID+ }+ attributes[common.CELAttributeResourceEnvironmentID] = env+ok, err := s.hasDatabaseAccessRights(ctx,user,perm,- map[string]any{- common.CELAttributeRequestTime: time.Now(),- common.CELAttributeResourceDatabase: databaseFullName,- },+ attributes,workspacePolicy.Policy,projectPolicy.Policy,)@@ -1474,7 +1484,8 @@ func (s *SQLService) accessCheck(connect.CodePermissionDenied,errors.Errorf("permission denied to access resources: %v", databaseFullName),),- resources: []string{databaseFullName},+ resources: []string{databaseFullName},+ permission: perm,}}return nil@@ -1566,7 +1577,8 @@ func (s *SQLService) accessCheck(connect.CodePermissionDenied,errors.Errorf("permission denied to access resources: %v", deniedResources),),- resources: deniedResources,+ resources: deniedResources,+ permission: perm,}}}@@ -1648,7 +1660,7 @@ func validateQueryRequest(instance *store.InstanceMessage, statement string) errif !ok {return &queryError{err: connect.NewError(connect.CodeInvalidArgument, errors.New("Support read-only command statements only")),- commandType: v1pb.QueryResult_PermissionDenied_NON_READ_ONLY,+ commandType: v1pb.QueryResult_CommandError_NON_READ_ONLY,}}return nil@@ -1671,9 +1683,17 @@ func (s *SQLService) hasDatabaseAccessRights(continue}- ok, err := evaluateQueryExportPolicyCondition(binding.Condition.GetExpression(), attributes)+ expression := binding.Condition.GetExpression()+ // resource.environment_id only applies to DDL/DML permissions.+ // For other permissions (e.g., SELECT), strip the environment condition+ // to prevent it from incorrectly denying access.+ if perm != permission.SQLDdl && perm != permission.SQLDml {+ expression = stripEnvironmentCondition(expression)+ }++ ok, err := evaluateQueryExportPolicyCondition(expression, attributes)if err != nil {- slog.Error("failed to evaluate condition", log.BBError(err), slog.String("condition", binding.Condition.GetExpression()))+ slog.Error("failed to evaluate condition", log.BBError(err), slog.String("condition", expression))continue}if ok {@@ -1683,6 +1703,18 @@ func (s *SQLService) hasDatabaseAccessRights(return false, nil}+var envConditionRe = regexp.MustCompile(`resource\.environment_id\s+in\s+\[[^\]]*\]`)++// stripEnvironmentCondition removes the "resource.environment_id in [...]" clause+// from a CEL expression string.+func stripEnvironmentCondition(expression string) string {+ result := envConditionRe.ReplaceAllString(expression, "")+ result = strings.TrimSpace(result)+ result = strings.TrimPrefix(result, "&&")+ result = strings.TrimSuffix(result, "&&")+ return strings.TrimSpace(result)+}+func (*SQLService) getUser(ctx context.Context) (*store.UserMessage, error) {user, ok := GetUserFromContext(ctx)if !ok {diff --git a/backend/generated-go/v1/org_policy_service.pb.go b/backend/generated-go/v1/org_policy_service.pb.goindex 131c747ec7..fc2c131099 100644--- a/backend/generated-go/v1/org_policy_service.pb.go+++ b/backend/generated-go/v1/org_policy_service.pb.go@@ -747,14 +747,8 @@ type QueryDataPolicy struct {// 1. when read-only data source is configured, users're force to use the read-only data source// 2. otherwise fallback to use the admin data source.AllowAdminDataSource bool `protobuf:"varint,4,opt,name=allow_admin_data_source,json=allowAdminDataSource,proto3" json:"allow_admin_data_source,omitempty"`- // ================- // Deprecate following fields.- // Disallow running DDL statements in the SQL editor.- DisallowDdl bool `protobuf:"varint,7,opt,name=disallow_ddl,json=disallowDdl,proto3" json:"disallow_ddl,omitempty"`- // Disallow running DML statements in the SQL editor.- DisallowDml bool `protobuf:"varint,8,opt,name=disallow_dml,json=disallowDml,proto3" json:"disallow_dml,omitempty"`- unknownFields protoimpl.UnknownFields- sizeCache protoimpl.SizeCache+ unknownFields protoimpl.UnknownFields+ sizeCache protoimpl.SizeCache}func (x *QueryDataPolicy) Reset() {@@ -815,20 +809,6 @@ func (x *QueryDataPolicy) GetAllowAdminDataSource() bool {return false}-func (x *QueryDataPolicy) GetDisallowDdl() bool {- if x != nil {- return x.DisallowDdl- }- return false-}--func (x *QueryDataPolicy) GetDisallowDml() bool {- if x != nil {- return x.DisallowDml- }- return false-}-// MaskingExemptionPolicy is the allowlist of users who can access sensitive data.type MaskingExemptionPolicy struct {state protoimpl.MessageState `protogen:"open.v1"`@@ -1171,14 +1151,12 @@ const file_v1_org_policy_service_proto_rawDesc = "" +"\x06policy\"C\n" +"\rRolloutPolicy\x12\x1c\n" +"\tautomatic\x18\x01 \x01(\bR\tautomatic\x12\x14\n" +- "\x05roles\x18\x02 \x03(\tR\x05roles\"\x91\x02\n" ++ "\x05roles\x18\x02 \x03(\tR\x05roles\"\xcb\x01\n" +"\x0fQueryDataPolicy\x12.\n" +"\x13maximum_result_rows\x18\x01 \x01(\x05R\x11maximumResultRows\x12%\n" +"\x0edisable_export\x18\x02 \x01(\bR\rdisableExport\x12*\n" +"\x11disable_copy_data\x18\x03 \x01(\bR\x0fdisableCopyData\x125\n" +- "\x17allow_admin_data_source\x18\x04 \x01(\bR\x14allowAdminDataSource\x12!\n" +- "\fdisallow_ddl\x18\a \x01(\bR\vdisallowDdl\x12!\n" +- "\fdisallow_dml\x18\b \x01(\bR\vdisallowDml\"\xbf\x01\n" ++ "\x17allow_admin_data_source\x18\x04 \x01(\bR\x14allowAdminDataSource\"\xbf\x01\n" +"\x16MaskingExemptionPolicy\x12M\n" +"\n" +"exemptions\x18\x01 \x03(\v2-.bytebase.v1.MaskingExemptionPolicy.ExemptionR\n" +diff --git a/backend/generated-go/v1/org_policy_service_equal.pb.go b/backend/generated-go/v1/org_policy_service_equal.pb.goindex ba99910054..1c7369fb67 100644--- a/backend/generated-go/v1/org_policy_service_equal.pb.go+++ b/backend/generated-go/v1/org_policy_service_equal.pb.go@@ -194,12 +194,6 @@ func (x *QueryDataPolicy) Equal(y *QueryDataPolicy) bool {if x.AllowAdminDataSource != y.AllowAdminDataSource {return false}- if x.DisallowDdl != y.DisallowDdl {- return false- }- if x.DisallowDml != y.DisallowDml {- return false- }return true}diff --git a/backend/generated-go/v1/sql_service.pb.go b/backend/generated-go/v1/sql_service.pb.goindex aaad608855..c92fc7e453 100644--- a/backend/generated-go/v1/sql_service.pb.go+++ b/backend/generated-go/v1/sql_service.pb.go@@ -129,55 +129,55 @@ func (QueryOption_MSSQLExplainFormat) EnumDescriptor() ([]byte, []int) {return file_v1_sql_service_proto_rawDescGZIP(), []int{4, 1}}-type QueryResult_PermissionDenied_CommandType int32+type QueryResult_CommandError_Type int32const (- QueryResult_PermissionDenied_COMMAND_TYPE_UNSPECIFIED QueryResult_PermissionDenied_CommandType = 0- QueryResult_PermissionDenied_DDL QueryResult_PermissionDenied_CommandType = 1- QueryResult_PermissionDenied_DML QueryResult_PermissionDenied_CommandType = 2- QueryResult_PermissionDenied_NON_READ_ONLY QueryResult_PermissionDenied_CommandType = 3+ QueryResult_CommandError_TYPE_UNSPECIFIED QueryResult_CommandError_Type = 0+ QueryResult_CommandError_DDL QueryResult_CommandError_Type = 1+ QueryResult_CommandError_DML QueryResult_CommandError_Type = 2+ QueryResult_CommandError_NON_READ_ONLY QueryResult_CommandError_Type = 3)-// Enum value maps for QueryResult_PermissionDenied_CommandType.+// Enum value maps for QueryResult_CommandError_Type.var (- QueryResult_PermissionDenied_CommandType_name = map[int32]string{- 0: "COMMAND_TYPE_UNSPECIFIED",+ QueryResult_CommandError_Type_name = map[int32]string{+ 0: "TYPE_UNSPECIFIED",1: "DDL",2: "DML",3: "NON_READ_ONLY",}- QueryResult_PermissionDenied_CommandType_value = map[string]int32{- "COMMAND_TYPE_UNSPECIFIED": 0,- "DDL": 1,- "DML": 2,- "NON_READ_ONLY": 3,+ QueryResult_CommandError_Type_value = map[string]int32{+ "TYPE_UNSPECIFIED": 0,+ "DDL": 1,+ "DML": 2,+ "NON_READ_ONLY": 3,})-func (x QueryResult_PermissionDenied_CommandType) Enum() *QueryResult_PermissionDenied_CommandType {- p := new(QueryResult_PermissionDenied_CommandType)+func (x QueryResult_CommandError_Type) Enum() *QueryResult_CommandError_Type {+ p := new(QueryResult_CommandError_Type)*p = xreturn p}-func (x QueryResult_PermissionDenied_CommandType) String() string {+func (x QueryResult_CommandError_Type) String() string {return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))}-func (QueryResult_PermissionDenied_CommandType) Descriptor() protoreflect.EnumDescriptor {+func (QueryResult_CommandError_Type) Descriptor() protoreflect.EnumDescriptor {return file_v1_sql_service_proto_enumTypes[2].Descriptor()}-func (QueryResult_PermissionDenied_CommandType) Type() protoreflect.EnumType {+func (QueryResult_CommandError_Type) Type() protoreflect.EnumType {return &file_v1_sql_service_proto_enumTypes[2]}-func (x QueryResult_PermissionDenied_CommandType) Number() protoreflect.EnumNumber {+func (x QueryResult_CommandError_Type) Number() protoreflect.EnumNumber {return protoreflect.EnumNumber(x)}-// Deprecated: Use QueryResult_PermissionDenied_CommandType.Descriptor instead.-func (QueryResult_PermissionDenied_CommandType) EnumDescriptor() ([]byte, []int) {+// Deprecated: Use QueryResult_CommandError_Type.Descriptor instead.+func (QueryResult_CommandError_Type) EnumDescriptor() ([]byte, []int) {return file_v1_sql_service_proto_rawDescGZIP(), []int{5, 2, 0}}@@ -772,7 +772,8 @@ type QueryResult struct {//// *QueryResult_PostgresError_// *QueryResult_SyntaxError_- // *QueryResult_PermissionDenied_+ // *QueryResult_PermissionDenied+ // *QueryResult_CommandError_DetailedError isQueryResult_DetailedError `protobuf_oneof:"detailed_error"`// Informational or debug messages returned by the database engine during query execution.// Examples include PostgreSQL's RAISE NOTICE, MSSQL's PRINT, or Oracle's DBMS_OUTPUT.PUT_LINE.@@ -887,15 +888,24 @@ func (x *QueryResult) GetSyntaxError() *QueryResult_SyntaxError {return nil}-func (x *QueryResult) GetPermissionDenied() *QueryResult_PermissionDenied {+func (x *QueryResult) GetPermissionDenied() *PermissionDeniedDetail {if x != nil {- if x, ok := x.DetailedError.(*QueryResult_PermissionDenied_); ok {+ if x, ok := x.DetailedError.(*QueryResult_PermissionDenied); ok {return x.PermissionDenied}}return nil}+func (x *QueryResult) GetCommandError() *QueryResult_CommandError {+ if x != nil {+ if x, ok := x.DetailedError.(*QueryResult_CommandError_); ok {+ return x.CommandError+ }+ }+ return nil+}+func (x *QueryResult) GetMessages() []*QueryResult_Message {if x != nil {return x.Messages@@ -922,15 +932,21 @@ type QueryResult_SyntaxError_ struct {SyntaxError *QueryResult_SyntaxError `protobuf:"bytes,9,opt,name=syntax_error,json=syntaxError,proto3,oneof"`}-type QueryResult_PermissionDenied_ struct {- PermissionDenied *QueryResult_PermissionDenied `protobuf:"bytes,10,opt,name=permission_denied,json=permissionDenied,proto3,oneof"`+type QueryResult_PermissionDenied struct {+ PermissionDenied *PermissionDeniedDetail `protobuf:"bytes,10,opt,name=permission_denied,json=permissionDenied,proto3,oneof"`+}++type QueryResult_CommandError_ struct {+ CommandError *QueryResult_CommandError `protobuf:"bytes,13,opt,name=command_error,json=commandError,proto3,oneof"`}func (*QueryResult_PostgresError_) isQueryResult_DetailedError() {}func (*QueryResult_SyntaxError_) isQueryResult_DetailedError() {}-func (*QueryResult_PermissionDenied_) isQueryResult_DetailedError() {}+func (*QueryResult_PermissionDenied) isQueryResult_DetailedError() {}++func (*QueryResult_CommandError_) isQueryResult_DetailedError() {}type MaskingReason struct {state protoimpl.MessageState `protogen:"open.v1"`@@ -2266,35 +2282,28 @@ func (x *QueryResult_SyntaxError) GetStartPosition() *Position {// Permission denied with resource information or disallowed command_type.// Either resources or command_type is available.-type QueryResult_PermissionDenied struct {+type QueryResult_CommandError struct {state protoimpl.MessageState `protogen:"open.v1"`- // 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}- 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"`+ CommandType QueryResult_CommandError_Type `protobuf:"varint,1,opt,name=command_type,json=commandType,proto3,enum=bytebase.v1.QueryResult_CommandError_Type" json:"command_type,omitempty"`unknownFields protoimpl.UnknownFieldssizeCache protoimpl.SizeCache}-func (x *QueryResult_PermissionDenied) Reset() {- *x = QueryResult_PermissionDenied{}+func (x *QueryResult_CommandError) Reset() {+ *x = QueryResult_CommandError{}mi := &file_v1_sql_service_proto_msgTypes[21]ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))ms.StoreMessageInfo(mi)}-func (x *QueryResult_PermissionDenied) String() string {+func (x *QueryResult_CommandError) String() string {return protoimpl.X.MessageStringOf(x)}-func (*QueryResult_PermissionDenied) ProtoMessage() {}+func (*QueryResult_CommandError) ProtoMessage() {}-func (x *QueryResult_PermissionDenied) ProtoReflect() protoreflect.Message {+func (x *QueryResult_CommandError) ProtoReflect() protoreflect.Message {mi := &file_v1_sql_service_proto_msgTypes[21]if x != nil {ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))@@ -2306,23 +2315,16 @@ func (x *QueryResult_PermissionDenied) ProtoReflect() protoreflect.Message {return mi.MessageOf(x)}-// Deprecated: Use QueryResult_PermissionDenied.ProtoReflect.Descriptor instead.-func (*QueryResult_PermissionDenied) Descriptor() ([]byte, []int) {+// Deprecated: Use QueryResult_CommandError.ProtoReflect.Descriptor instead.+func (*QueryResult_CommandError) Descriptor() ([]byte, []int) {return file_v1_sql_service_proto_rawDescGZIP(), []int{5, 2}}-func (x *QueryResult_PermissionDenied) GetResources() []string {- if x != nil {- return x.Resources- }- return nil-}--func (x *QueryResult_PermissionDenied) GetCommandType() QueryResult_PermissionDenied_CommandType {+func (x *QueryResult_CommandError) GetCommandType() QueryResult_CommandError_Type {if x != nil {return x.CommandType}- return QueryResult_PermissionDenied_COMMAND_TYPE_UNSPECIFIED+ return QueryResult_CommandError_TYPE_UNSPECIFIED}type QueryResult_Message struct {@@ -2732,7 +2734,7 @@ const file_v1_sql_service_proto_rawDesc = "" +"\x12MSSQLExplainFormat\x12$\n" +" MSSQL_EXPLAIN_FORMAT_UNSPECIFIED\x10\x00\x12\x1c\n" +"\x18MSSQL_EXPLAIN_FORMAT_ALL\x10\x01\x12\x1c\n" +- "\x18MSSQL_EXPLAIN_FORMAT_XML\x10\x02\"\xff\f\n" ++ "\x18MSSQL_EXPLAIN_FORMAT_XML\x10\x02\"\x8b\r\n" +"\vQueryResult\x12!\n" +"\fcolumn_names\x18\x01 \x03(\tR\vcolumnNames\x12*\n" +"\x11column_type_names\x18\x02 \x03(\tR\x0fcolumnTypeNames\x12)\n" +@@ -2743,9 +2745,10 @@ const file_v1_sql_service_proto_rawDesc = "" +"\alatency\x18\x06 \x01(\v2\x19.google.protobuf.DurationR\alatency\x12\x1c\n" +"\tstatement\x18\a \x01(\tR\tstatement\x12O\n" +"\x0epostgres_error\x18\b \x01(\v2&.bytebase.v1.QueryResult.PostgresErrorH\x00R\rpostgresError\x12I\n" +- "\fsyntax_error\x18\t \x01(\v2$.bytebase.v1.QueryResult.SyntaxErrorH\x00R\vsyntaxError\x12X\n" ++ "\fsyntax_error\x18\t \x01(\v2$.bytebase.v1.QueryResult.SyntaxErrorH\x00R\vsyntaxError\x12R\n" +"\x11permission_denied\x18\n" +- " \x01(\v2).bytebase.v1.QueryResult.PermissionDeniedH\x00R\x10permissionDenied\x12<\n" ++ " \x01(\v2#.bytebase.v1.PermissionDeniedDetailH\x00R\x10permissionDenied\x12L\n" ++ "\rcommand_error\x18\r \x01(\v2%.bytebase.v1.QueryResult.CommandErrorH\x00R\fcommandError\x12<\n" +"\bmessages\x18\v \x03(\v2 .bytebase.v1.QueryResult.MessageR\bmessages\x122\n" +"\x06masked\x18\f \x03(\v2\x1a.bytebase.v1.MaskingReasonR\x06masked\x1a\xfd\x03\n" +"\rPostgresError\x12\x1a\n" +@@ -2771,12 +2774,11 @@ 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\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" ++ "\x0estart_position\x18\x01 \x01(\v2\x15.bytebase.v1.PositionR\rstartPosition\x1a\xa0\x01\n" ++ "\fCommandError\x12M\n" ++ "\fcommand_type\x18\x01 \x01(\x0e2*.bytebase.v1.QueryResult.CommandError.TypeR\vcommandType\"A\n" ++ "\x04Type\x12\x14\n" ++ "\x10TYPE_UNSPECIFIED\x10\x00\x12\a\n" +"\x03DDL\x10\x01\x12\a\n" +"\x03DML\x10\x02\x12\x11\n" +"\rNON_READ_ONLY\x10\x03\x1a\xc7\x01\n" +@@ -2937,7 +2939,7 @@ var file_v1_sql_service_proto_msgTypes = make([]protoimpl.MessageInfo, 29)var file_v1_sql_service_proto_goTypes = []any{(QueryOption_RedisRunCommandsOn)(0), // 0: bytebase.v1.QueryOption.RedisRunCommandsOn(QueryOption_MSSQLExplainFormat)(0), // 1: bytebase.v1.QueryOption.MSSQLExplainFormat- (QueryResult_PermissionDenied_CommandType)(0), // 2: bytebase.v1.QueryResult.PermissionDenied.CommandType+ (QueryResult_CommandError_Type)(0), // 2: bytebase.v1.QueryResult.CommandError.Type(QueryResult_Message_Level)(0), // 3: bytebase.v1.QueryResult.Message.Level(Advice_Level)(0), // 4: bytebase.v1.Advice.Level(Advice_RuleType)(0), // 5: bytebase.v1.Advice.RuleType@@ -2963,7 +2965,7 @@ var file_v1_sql_service_proto_goTypes = []any{(*AICompletionResponse)(nil), // 25: bytebase.v1.AICompletionResponse(*QueryResult_PostgresError)(nil), // 26: bytebase.v1.QueryResult.PostgresError(*QueryResult_SyntaxError)(nil), // 27: bytebase.v1.QueryResult.SyntaxError- (*QueryResult_PermissionDenied)(nil), // 28: bytebase.v1.QueryResult.PermissionDenied+ (*QueryResult_CommandError)(nil), // 28: bytebase.v1.QueryResult.CommandError(*QueryResult_Message)(nil), // 29: bytebase.v1.QueryResult.Message(*RowValue_Timestamp)(nil), // 30: bytebase.v1.RowValue.Timestamp(*RowValue_TimestampTZ)(nil), // 31: bytebase.v1.RowValue.TimestampTZ@@ -2972,13 +2974,14 @@ var file_v1_sql_service_proto_goTypes = []any{(*AICompletionResponse_Candidate_Content)(nil), // 34: bytebase.v1.AICompletionResponse.Candidate.Content(*AICompletionResponse_Candidate_Content_Part)(nil), // 35: bytebase.v1.AICompletionResponse.Candidate.Content.Part(*durationpb.Duration)(nil), // 36: google.protobuf.Duration- (structpb.NullValue)(0), // 37: google.protobuf.NullValue- (*structpb.Value)(nil), // 38: google.protobuf.Value- (*Position)(nil), // 39: bytebase.v1.Position- (ExportFormat)(0), // 40: bytebase.v1.ExportFormat- (*DatabaseMetadata)(nil), // 41: bytebase.v1.DatabaseMetadata- (Engine)(0), // 42: bytebase.v1.Engine- (*timestamppb.Timestamp)(nil), // 43: google.protobuf.Timestamp+ (*PermissionDeniedDetail)(nil), // 37: bytebase.v1.PermissionDeniedDetail+ (structpb.NullValue)(0), // 38: google.protobuf.NullValue+ (*structpb.Value)(nil), // 39: google.protobuf.Value+ (*Position)(nil), // 40: bytebase.v1.Position+ (ExportFormat)(0), // 41: bytebase.v1.ExportFormat+ (*DatabaseMetadata)(nil), // 42: bytebase.v1.DatabaseMetadata+ (Engine)(0), // 43: bytebase.v1.Engine+ (*timestamppb.Timestamp)(nil), // 44: google.protobuf.Timestamp}var file_v1_sql_service_proto_depIdxs = []int32{12, // 0: bytebase.v1.AdminExecuteResponse.results:type_name -> bytebase.v1.QueryResult@@ -2990,52 +2993,53 @@ var file_v1_sql_service_proto_depIdxs = []int32{36, // 6: bytebase.v1.QueryResult.latency:type_name -> google.protobuf.Duration26, // 7: bytebase.v1.QueryResult.postgres_error:type_name -> bytebase.v1.QueryResult.PostgresError27, // 8: bytebase.v1.QueryResult.syntax_error:type_name -> bytebase.v1.QueryResult.SyntaxError- 28, // 9: bytebase.v1.QueryResult.permission_denied:type_name -> bytebase.v1.QueryResult.PermissionDenied- 29, // 10: bytebase.v1.QueryResult.messages:type_name -> bytebase.v1.QueryResult.Message- 13, // 11: bytebase.v1.QueryResult.masked:type_name -> bytebase.v1.MaskingReason- 15, // 12: bytebase.v1.QueryRow.values:type_name -> bytebase.v1.RowValue- 37, // 13: bytebase.v1.RowValue.null_value:type_name -> google.protobuf.NullValue- 38, // 14: bytebase.v1.RowValue.value_value:type_name -> google.protobuf.Value- 30, // 15: bytebase.v1.RowValue.timestamp_value:type_name -> bytebase.v1.RowValue.Timestamp- 31, // 16: bytebase.v1.RowValue.timestamp_tz_value:type_name -> bytebase.v1.RowValue.TimestampTZ- 4, // 17: bytebase.v1.Advice.status:type_name -> bytebase.v1.Advice.Level- 39, // 18: bytebase.v1.Advice.start_position:type_name -> bytebase.v1.Position- 39, // 19: bytebase.v1.Advice.end_position:type_name -> bytebase.v1.Position- 5, // 20: bytebase.v1.Advice.rule_type:type_name -> bytebase.v1.Advice.RuleType- 40, // 21: bytebase.v1.ExportRequest.format:type_name -> bytebase.v1.ExportFormat- 41, // 22: bytebase.v1.DiffMetadataRequest.source_metadata:type_name -> bytebase.v1.DatabaseMetadata- 41, // 23: bytebase.v1.DiffMetadataRequest.target_metadata:type_name -> bytebase.v1.DatabaseMetadata- 42, // 24: bytebase.v1.DiffMetadataRequest.engine:type_name -> bytebase.v1.Engine- 23, // 25: bytebase.v1.SearchQueryHistoriesResponse.query_histories:type_name -> bytebase.v1.QueryHistory- 43, // 26: bytebase.v1.QueryHistory.create_time:type_name -> google.protobuf.Timestamp- 36, // 27: bytebase.v1.QueryHistory.duration:type_name -> google.protobuf.Duration- 6, // 28: bytebase.v1.QueryHistory.type:type_name -> bytebase.v1.QueryHistory.Type- 32, // 29: bytebase.v1.AICompletionRequest.messages:type_name -> bytebase.v1.AICompletionRequest.Message- 33, // 30: bytebase.v1.AICompletionResponse.candidates:type_name -> bytebase.v1.AICompletionResponse.Candidate- 39, // 31: bytebase.v1.QueryResult.SyntaxError.start_position:type_name -> bytebase.v1.Position- 2, // 32: bytebase.v1.QueryResult.PermissionDenied.command_type:type_name -> bytebase.v1.QueryResult.PermissionDenied.CommandType- 3, // 33: bytebase.v1.QueryResult.Message.level:type_name -> bytebase.v1.QueryResult.Message.Level- 43, // 34: bytebase.v1.RowValue.Timestamp.google_timestamp:type_name -> google.protobuf.Timestamp- 43, // 35: bytebase.v1.RowValue.TimestampTZ.google_timestamp:type_name -> google.protobuf.Timestamp- 34, // 36: bytebase.v1.AICompletionResponse.Candidate.content:type_name -> bytebase.v1.AICompletionResponse.Candidate.Content- 35, // 37: bytebase.v1.AICompletionResponse.Candidate.Content.parts:type_name -> bytebase.v1.AICompletionResponse.Candidate.Content.Part- 9, // 38: bytebase.v1.SQLService.Query:input_type -> bytebase.v1.QueryRequest- 7, // 39: bytebase.v1.SQLService.AdminExecute:input_type -> bytebase.v1.AdminExecuteRequest- 21, // 40: bytebase.v1.SQLService.SearchQueryHistories:input_type -> bytebase.v1.SearchQueryHistoriesRequest- 17, // 41: bytebase.v1.SQLService.Export:input_type -> bytebase.v1.ExportRequest- 19, // 42: bytebase.v1.SQLService.DiffMetadata:input_type -> bytebase.v1.DiffMetadataRequest- 24, // 43: bytebase.v1.SQLService.AICompletion:input_type -> bytebase.v1.AICompletionRequest- 10, // 44: bytebase.v1.SQLService.Query:output_type -> bytebase.v1.QueryResponse- 8, // 45: bytebase.v1.SQLService.AdminExecute:output_type -> bytebase.v1.AdminExecuteResponse- 22, // 46: bytebase.v1.SQLService.SearchQueryHistories:output_type -> bytebase.v1.SearchQueryHistoriesResponse- 18, // 47: bytebase.v1.SQLService.Export:output_type -> bytebase.v1.ExportResponse- 20, // 48: bytebase.v1.SQLService.DiffMetadata:output_type -> bytebase.v1.DiffMetadataResponse- 25, // 49: bytebase.v1.SQLService.AICompletion:output_type -> bytebase.v1.AICompletionResponse- 44, // [44:50] is the sub-list for method output_type- 38, // [38:44] is the sub-list for method input_type- 38, // [38:38] is the sub-list for extension type_name- 38, // [38:38] is the sub-list for extension extendee- 0, // [0:38] is the sub-list for field type_name+ 37, // 9: bytebase.v1.QueryResult.permission_denied:type_name -> bytebase.v1.PermissionDeniedDetail+ 28, // 10: bytebase.v1.QueryResult.command_error:type_name -> bytebase.v1.QueryResult.CommandError+ 29, // 11: bytebase.v1.QueryResult.messages:type_name -> bytebase.v1.QueryResult.Message+ 13, // 12: bytebase.v1.QueryResult.masked:type_name -> bytebase.v1.MaskingReason+ 15, // 13: bytebase.v1.QueryRow.values:type_name -> bytebase.v1.RowValue+ 38, // 14: bytebase.v1.RowValue.null_value:type_name -> google.protobuf.NullValue+ 39, // 15: bytebase.v1.RowValue.value_value:type_name -> google.protobuf.Value+ 30, // 16: bytebase.v1.RowValue.timestamp_value:type_name -> bytebase.v1.RowValue.Timestamp+ 31, // 17: bytebase.v1.RowValue.timestamp_tz_value:type_name -> bytebase.v1.RowValue.TimestampTZ+ 4, // 18: bytebase.v1.Advice.status:type_name -> bytebase.v1.Advice.Level+ 40, // 19: bytebase.v1.Advice.start_position:type_name -> bytebase.v1.Position+ 40, // 20: bytebase.v1.Advice.end_position:type_name -> bytebase.v1.Position+ 5, // 21: bytebase.v1.Advice.rule_type:type_name -> bytebase.v1.Advice.RuleType+ 41, // 22: bytebase.v1.ExportRequest.format:type_name -> bytebase.v1.ExportFormat+ 42, // 23: bytebase.v1.DiffMetadataRequest.source_metadata:type_name -> bytebase.v1.DatabaseMetadata+ 42, // 24: bytebase.v1.DiffMetadataRequest.target_metadata:type_name -> bytebase.v1.DatabaseMetadata+ 43, // 25: bytebase.v1.DiffMetadataRequest.engine:type_name -> bytebase.v1.Engine+ 23, // 26: bytebase.v1.SearchQueryHistoriesResponse.query_histories:type_name -> bytebase.v1.QueryHistory+ 44, // 27: bytebase.v1.QueryHistory.create_time:type_name -> google.protobuf.Timestamp+ 36, // 28: bytebase.v1.QueryHistory.duration:type_name -> google.protobuf.Duration+ 6, // 29: bytebase.v1.QueryHistory.type:type_name -> bytebase.v1.QueryHistory.Type+ 32, // 30: bytebase.v1.AICompletionRequest.messages:type_name -> bytebase.v1.AICompletionRequest.Message+ 33, // 31: bytebase.v1.AICompletionResponse.candidates:type_name -> bytebase.v1.AICompletionResponse.Candidate+ 40, // 32: bytebase.v1.QueryResult.SyntaxError.start_position:type_name -> bytebase.v1.Position+ 2, // 33: bytebase.v1.QueryResult.CommandError.command_type:type_name -> bytebase.v1.QueryResult.CommandError.Type+ 3, // 34: bytebase.v1.QueryResult.Message.level:type_name -> bytebase.v1.QueryResult.Message.Level+ 44, // 35: bytebase.v1.RowValue.Timestamp.google_timestamp:type_name -> google.protobuf.Timestamp+ 44, // 36: bytebase.v1.RowValue.TimestampTZ.google_timestamp:type_name -> google.protobuf.Timestamp+ 34, // 37: bytebase.v1.AICompletionResponse.Candidate.content:type_name -> bytebase.v1.AICompletionResponse.Candidate.Content+ 35, // 38: bytebase.v1.AICompletionResponse.Candidate.Content.parts:type_name -> bytebase.v1.AICompletionResponse.Candidate.Content.Part+ 9, // 39: bytebase.v1.SQLService.Query:input_type -> bytebase.v1.QueryRequest+ 7, // 40: bytebase.v1.SQLService.AdminExecute:input_type -> bytebase.v1.AdminExecuteRequest+ 21, // 41: bytebase.v1.SQLService.SearchQueryHistories:input_type -> bytebase.v1.SearchQueryHistoriesRequest+ 17, // 42: bytebase.v1.SQLService.Export:input_type -> bytebase.v1.ExportRequest+ 19, // 43: bytebase.v1.SQLService.DiffMetadata:input_type -> bytebase.v1.DiffMetadataRequest+ 24, // 44: bytebase.v1.SQLService.AICompletion:input_type -> bytebase.v1.AICompletionRequest+ 10, // 45: bytebase.v1.SQLService.Query:output_type -> bytebase.v1.QueryResponse+ 8, // 46: bytebase.v1.SQLService.AdminExecute:output_type -> bytebase.v1.AdminExecuteResponse+ 22, // 47: bytebase.v1.SQLService.SearchQueryHistories:output_type -> bytebase.v1.SearchQueryHistoriesResponse+ 18, // 48: bytebase.v1.SQLService.Export:output_type -> bytebase.v1.ExportResponse+ 20, // 49: bytebase.v1.SQLService.DiffMetadata:output_type -> bytebase.v1.DiffMetadataResponse+ 25, // 50: bytebase.v1.SQLService.AICompletion:output_type -> bytebase.v1.AICompletionResponse+ 45, // [45:51] is the sub-list for method output_type+ 39, // [39:45] is the sub-list for method input_type+ 39, // [39:39] is the sub-list for extension type_name+ 39, // [39:39] is the sub-list for extension extendee+ 0, // [0:39] is the sub-list for field type_name}func init() { file_v1_sql_service_proto_init() }@@ -3051,7 +3055,8 @@ func file_v1_sql_service_proto_init() {file_v1_sql_service_proto_msgTypes[5].OneofWrappers = []any{(*QueryResult_PostgresError_)(nil),(*QueryResult_SyntaxError_)(nil),- (*QueryResult_PermissionDenied_)(nil),+ (*QueryResult_PermissionDenied)(nil),+ (*QueryResult_CommandError_)(nil),}file_v1_sql_service_proto_msgTypes[8].OneofWrappers = []any{(*RowValue_NullValue)(nil),diff --git a/backend/generated-go/v1/sql_service_equal.pb.go b/backend/generated-go/v1/sql_service_equal.pb.goindex d887dab7b6..4935bbd657 100644--- a/backend/generated-go/v1/sql_service_equal.pb.go+++ b/backend/generated-go/v1/sql_service_equal.pb.go@@ -194,21 +194,13 @@ func (x *QueryResult_SyntaxError) Equal(y *QueryResult_SyntaxError) bool {return true}-func (x *QueryResult_PermissionDenied) Equal(y *QueryResult_PermissionDenied) bool {+func (x *QueryResult_CommandError) Equal(y *QueryResult_CommandError) bool {if x == y {return true}if x == nil || y == nil {return x == nil && y == nil}- 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}@@ -283,6 +275,9 @@ func (x *QueryResult) Equal(y *QueryResult) bool {if !x.GetPermissionDenied().Equal(y.GetPermissionDenied()) {return false}+ if !x.GetCommandError().Equal(y.GetCommandError()) {+ return false+ }if len(x.Messages) != len(y.Messages) {return false}diff --git a/backend/migrator/migration/3.15/0009##migrate_iam_binding_environment_condition.sql b/backend/migrator/migration/3.15/0009##migrate_iam_binding_environment_condition.sqlnew file mode 100644index 0000000000..075d0545bf--- /dev/null+++ b/backend/migrator/migration/3.15/0009##migrate_iam_binding_environment_condition.sql@@ -0,0 +1,86 @@+-- For roles with bb.sql.ddl or bb.sql.dml permissions (excluding projectOwner),+-- add "resource.environment_id in [...]" to the binding condition expression+-- if it doesn't already have one.+-- The environment list is populated from existing QUERY_DATA policies:+-- environments where DDL or DML is not disallowed are included.++WITH+-- Get all environment IDs from the setting table+all_envs AS (+ SELECT env->>'id' AS env_id+ FROM setting+ CROSS JOIN LATERAL jsonb_array_elements(COALESCE(value->'environments', '[]'::jsonb)) AS env+ WHERE name = 'ENVIRONMENT'+),+-- Get environment QUERY_DATA policies with DDL/DML flags+env_policy AS (+ SELECT+ SUBSTRING(resource FROM 'environments/(.+)') AS env_id,+ COALESCE((payload->>'disallowDdl')::boolean, false) AS disallow_ddl,+ COALESCE((payload->>'disallowDml')::boolean, false) AS disallow_dml+ FROM policy+ WHERE resource_type = 'ENVIRONMENT'+ AND type = 'QUERY_DATA'+),+-- Environments that allow DDL or DML (or don't have a QUERY_DATA policy)+allowed_envs AS (+ SELECT e.env_id+ FROM all_envs e+ LEFT JOIN env_policy ep ON e.env_id = ep.env_id+ WHERE ep.env_id IS NULL -- No policy, default to allowed+ OR NOT ep.disallow_ddl -- DDL is allowed+ OR NOT ep.disallow_dml -- DML is allowed+),+-- Build the environment list as a CEL-compatible string like "env1", "env2"+env_list AS (+ SELECT COALESCE(string_agg('"' || env_id || '"', ', '), '') AS env_ids+ FROM allowed_envs+),+roles_with_env_limitation AS (+ -- Predefined role with bb.sql.ddl/bb.sql.dml (excluding projectOwner)+ SELECT 'roles/sqlEditorUser' AS role_name+ UNION ALL+ -- Custom roles with bb.sql.ddl or bb.sql.dml+ SELECT 'roles/' || resource_id AS role_name+ FROM role+ WHERE resource_id != 'projectOwner'+ AND (+ permissions->'permissions' @> '["bb.sql.ddl"]'::jsonb+ OR permissions->'permissions' @> '["bb.sql.dml"]'::jsonb+ )+)+UPDATE policy+SET payload = (+ SELECT jsonb_set(+ payload,+ '{bindings}',+ (+ SELECT COALESCE(jsonb_agg(+ CASE+ WHEN binding->>'role' IN (SELECT role_name FROM roles_with_env_limitation)+ AND COALESCE(binding->'condition'->>'expression', '') NOT LIKE '%resource.environment_id%'+ THEN+ CASE+ -- condition key doesn't exist: create it with expression+ WHEN binding->'condition' IS NULL+ THEN binding || jsonb_build_object('condition', jsonb_build_object('expression', 'resource.environment_id in [' || (SELECT env_ids FROM env_list) || ']'))+ -- condition exists but expression is empty or missing+ WHEN COALESCE(binding->'condition'->>'expression', '') = ''+ THEN jsonb_set(binding, '{condition,expression}', to_jsonb('resource.environment_id in [' || (SELECT env_ids FROM env_list) || ']'))+ -- condition exists with non-empty expression: append+ ELSE jsonb_set(+ binding,+ '{condition,expression}',+ to_jsonb((binding->'condition'->>'expression') || ' && resource.environment_id in [' || (SELECT env_ids FROM env_list) || ']')+ )+ END+ ELSE binding+ END+ ), '[]'::jsonb)+ FROM jsonb_array_elements(payload->'bindings') AS binding+ )+ )+)+WHERE type = 'IAM'+ AND resource_type = 'PROJECT'+ AND payload->'bindings' IS NOT NULL;diff --git a/backend/migrator/migrator_test.go b/backend/migrator/migrator_test.goindex 7cfb70c6c9..71bf922ba0 100644--- a/backend/migrator/migrator_test.go+++ b/backend/migrator/migrator_test.go@@ -12,8 +12,8 @@ import (func TestLatestVersion(t *testing.T) {files, err := getSortedVersionedFiles()require.NoError(t, err)- require.Equal(t, semver.MustParse("3.15.8"), *files[len(files)-1].version)- require.Equal(t, "migration/3.15/0008##move_timeout_to_workspace_profile.sql", files[len(files)-1].path)+ require.Equal(t, semver.MustParse("3.15.9"), *files[len(files)-1].version)+ require.Equal(t, "migration/3.15/0009##migrate_iam_binding_environment_condition.sql", files[len(files)-1].path)}func TestVersionUnique(t *testing.T) {diff --git a/frontend/src/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/useApprovalStep.ts b/frontend/src/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/useApprovalStep.tsindex 166ba7ab2c..8e597aa9d4 100644--- a/frontend/src/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/useApprovalStep.ts+++ b/frontend/src/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/useApprovalStep.ts@@ -12,10 +12,9 @@ import {useCurrentUserV1,useGroupStore,useProjectIamPolicyStore,- useRoleStore,useUserStore,} from "@/store";-import { groupBindingPrefix, PresetRoleType } from "@/types";+import { groupBindingPrefix } from "@/types";import { State } from "@/types/proto-es/v1/common_pb";import type {Issue,@@ -27,6 +26,7 @@ import {} from "@/types/proto-es/v1/issue_service_pb";import type { User as UserType } from "@/types/proto-es/v1/user_service_pb";import {+ displayRoleTitle,ensureUserFullName,isBindingPolicyExpired,memberMapToRolesInProjectIAM,@@ -48,7 +48,6 @@ export function useApprovalStep(const planContext = tryUsePlanContext();const currentUser = useCurrentUserV1();const userStore = useUserStore();- const roleStore = useRoleStore();const groupStore = useGroupStore();const projectIamPolicyStore = useProjectIamPolicyStore();@@ -123,18 +122,7 @@ export function useApprovalStep(const roleName = computed((): string => {if (step.value) {- const role = step.value;- if (role === PresetRoleType.PROJECT_OWNER) {- return t("role.project-owner.self");- } else if (role === PresetRoleType.WORKSPACE_DBA) {- return t("role.workspace-dba.self");- } else if (role === PresetRoleType.WORKSPACE_ADMIN) {- return t("role.workspace-admin.self");- }- const customRole = roleStore.getRoleByName(role);- if (customRole) {- return customRole.title;- }+ return displayRoleTitle(step.value);}return t("custom-approval.approval-flow.node.approver");});diff --git a/frontend/src/components/ProjectMember/AddProjectMember/AddProjectMemberForm.vue b/frontend/src/components/ProjectMember/AddProjectMember/AddProjectMemberForm.vueindex b18f786507..cf0c79bcbe 100644--- a/frontend/src/components/ProjectMember/AddProjectMember/AddProjectMemberForm.vue+++ b/frontend/src/components/ProjectMember/AddProjectMember/AddProjectMemberForm.vue@@ -84,6 +84,24 @@/></div>+ <div+ v-if="roleHasEnvironmentLimitation(state.role)"+ class="w-full flex flex-col gap-y-2"+ >+ <div>+ <div class="flex items-center gap-x-1">+ <span>{{ $t("common.environments") }}</span>+ </div>+ <span class="textinfolabel">+ {{ $t("project.members.allow-ddl") }}+ </span>+ </div>+ <EnvironmentSelect+ :multiple="true"+ v-model:value="state.environments"+ />+ </div>+<div class="w-full flex flex-col gap-y-2"><div class="flex items-center gap-x-1"><span>{{ $t("common.expiration") }}</span>@@ -109,14 +127,17 @@ import ExpirationSelector from "@/components/ExpirationSelector.vue";import QuerierDatabaseResourceForm from "@/components/GrantRequestPanel/DatabaseResourceForm/index.vue";import MembersBindingSelect from "@/components/Member/MembersBindingSelect.vue";import RequiredStar from "@/components/RequiredStar.vue";-import { RoleSelect } from "@/components/v2/Select";+import { EnvironmentSelect, RoleSelect } from "@/components/v2/Select";import { useRoleStore } from "@/store";import { type DatabaseResource } from "@/types";import { type Binding, BindingSchema } from "@/types/proto-es/v1/iam_policy_pb";import type { Role } from "@/types/proto-es/v1/role_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";import { buildConditionExpr, convertFromExpr } from "@/utils/issue/cel";-import { roleHasDatabaseLimitation } from "../utils";+import {+ roleHasDatabaseLimitation,+ roleHasEnvironmentLimitation,+} from "../utils";const props = defineProps<{projectName: string;@@ -134,7 +155,7 @@ interface LocalState {role: string;reason: string;expirationTimestampInMS?: number;- environments?: string[];+ environments: string[];}const filterRole = (role: Role) => {@@ -149,6 +170,7 @@ const getInitialState = (): LocalState => {role: props.binding.role,memberList: props.binding.members,reason: props.binding.condition?.description ?? "",+ environments: [],};if (props.binding.parsedExpr) {@@ -158,6 +180,7 @@ const getInitialState = (): LocalState => {conditionExpr.expiredTime).getTime();}+ defaultState.environments = conditionExpr.environments ?? [];}return defaultState;@@ -199,6 +222,9 @@ defineExpose({description: state.reason,expirationTimestampInMS: state.expirationTimestampInMS,databaseResources,+ environments: roleHasEnvironmentLimitation(state.role)+ ? state.environments+ : undefined,});return create(BindingSchema, {diff --git a/frontend/src/components/ProjectMember/ProjectMemberRolePanel/index.vue b/frontend/src/components/ProjectMember/ProjectMemberRolePanel/index.vueindex c4484cb6c8..e5a197bac9 100644--- a/frontend/src/components/ProjectMember/ProjectMemberRolePanel/index.vue+++ b/frontend/src/components/ProjectMember/ProjectMemberRolePanel/index.vue@@ -24,7 +24,7 @@</div></div></div>- <template v-if="binding.workspaceLevelRoles.size > 0">+ <div v-if="binding.workspaceLevelRoles.size > 0" class="mb-6"><p class="text-lg px-1 pb-1 w-full border-b mb-3">{{ $t("project.members.workspace-level-roles") }}</p>@@ -41,38 +41,49 @@{{ displayRoleTitle(role) }}</NTag></div>- </template>- <template v-if="roleList.length > 0">+ </div>+ <div v-if="binding.projectRoleBindings.length > 0"><pv-if="binding.workspaceLevelRoles.size > 0"class="text-lg px-1 pb-1 w-full border-b mt-4 mb-3">{{ $t("project.members.project-level-roles") }}</p>- <div v-for="role in roleList" :key="role.role" class="mb-4">- <template v-if="role.singleBindingList.length > 0">+ <div v-for="(b, index) in binding.projectRoleBindings" :key="index" class="mb-4">+ <div class="py-2"><div- class="w-full px-2 py-2 flex flex-row justify-start items-center gap-x-1"+ class="w-full flex flex-row justify-start items-center gap-x-1">- <span class="textlabel">{{ displayRoleTitle(role.role) }}</span>+ <span class="textlabel">{{ displayRoleTitle(b.role) }}</span>+ <MiniActionButton+ @click="() => {+ editingBinding = cloneDeep(b)+ }"+ >+ <PencilIcon class="w-4 h-4" />+ </MiniActionButton><MiniActionButtontype="error"- :disabled="!allowRemoveRole(role.role)"- @click.prevent="handleDeleteRole(role.role)"+ :disabled="!allowRemoveRole"+ @click.prevent="handleDeleteRole(b)"><TrashIcon class="w-4 h-4" /></MiniActionButton></div>- <NDataTable- size="small"- :columns="getDataTableColumns(role.role)"- :data="role.singleBindingList"- :striped="true"- :bordered="true"- />- </template>+ <span v-if="b.condition?.description" class="textinfolabel">+ {{ b.condition?.description }}+ </span>+ </div>+ <NDataTable+ size="small"+ :columns="getDataTableColumns(b.role)"+ :data="getSingleBindingList(b)"+ :striped="true"+ :bordered="true"+ />+ <NDivider /></div>- </template>+ </div><template #footer><div class="w-full flex flex-row justify-between items-center"><div>@@ -125,56 +136,44 @@ import { computedAsync } from "@vueuse/core";import { cloneDeep, isEqual } from "lodash-es";import { Building2Icon, PencilIcon, TrashIcon } from "lucide-vue-next";import type { DataTableColumn } from "naive-ui";-import { NButton, NDataTable, NTag, NTooltip, useDialog } from "naive-ui";-import { computed, reactive, ref, watch } from "vue";+import {+ NButton,+ NDataTable,+ NDivider,+ NTag,+ NTooltip,+ useDialog,+} from "naive-ui";+import { computed, reactive, ref } from "vue";import { useI18n } from "vue-i18n";import { BBButtonConfirm } from "@/bbkit";import type { MemberBinding } from "@/components/Member/types";import GroupMemberNameCell from "@/components/User/Settings/UserDataTableByGroup/cells/GroupMemberNameCell.vue";import GroupNameCell from "@/components/User/Settings/UserDataTableByGroup/cells/GroupNameCell.vue";-import {- Drawer,- DrawerContent,- InstanceV1Name,- MiniActionButton,-} from "@/components/v2";+import { Drawer, DrawerContent, MiniActionButton } from "@/components/v2";import {extractGroupEmail,extractUserEmail,pushNotification,- useDatabaseV1Store,useProjectIamPolicy,useProjectIamPolicyStore,useUserStore,} from "@/store";-import {- type DatabaseResource,- PRESET_ROLES,- PresetRoleType,- unknownUser,-} from "@/types";+import { type DatabaseResource, unknownUser } from "@/types";import { State } from "@/types/proto-es/v1/common_pb";import type { Binding } from "@/types/proto-es/v1/iam_policy_pb";import { BindingSchema } from "@/types/proto-es/v1/iam_policy_pb";import type { Project } from "@/types/proto-es/v1/project_service_pb";-import {- displayRoleTitle,- extractDatabaseResourceName,- getInstanceResource,- hasProjectPermissionV2,-} from "@/utils";-import { buildConditionExpr, convertFromExpr } from "@/utils/issue/cel";+import { displayRoleTitle, hasProjectPermissionV2 } from "@/utils";+import { convertFromExpr } from "@/utils/issue/cel";import AddProjectMembersPanel from "../AddProjectMember/AddProjectMembersPanel.vue";import { roleHasDatabaseLimitation } from "../utils";import EditProjectRolePanel from "./EditProjectRolePanel.vue";-import RoleDescription from "./RoleDescription.vue";import RoleExpiredTip from "./RoleExpiredTip.vue";interface SingleBinding {databaseResource?: DatabaseResource;expiration?: Date;- description: string;- rawBinding: Binding;}interface LocalState {@@ -194,19 +193,12 @@ defineEmits<{const { t } = useI18n();const dialog = useDialog();const userStore = useUserStore();-const databaseStore = useDatabaseV1Store();const projectIamPolicyStore = useProjectIamPolicyStore();const projectResourceName = computed(() => props.project.name);const { policy: iamPolicy } = useProjectIamPolicy(projectResourceName);const state = reactive<LocalState>({showAddMemberPanel: false,});-const roleList = ref<- {- role: string;- singleBindingList: SingleBinding[];- }[]->([]);const editingBinding = ref<Binding | null>(null);const panelTitle = computed(() => {@@ -232,17 +224,7 @@ const allowRevokeMember = computed(() => {const getDataTableColumns = (role: string): DataTableColumn<SingleBinding>[] => {- const columns: DataTableColumn<SingleBinding>[] = [- {- title: t("project.members.condition-name"),- key: "conditionName",- render: (singleBinding) => {- const conditionTitle = singleBinding.rawBinding.condition?.title;- const roleTitle = displayRoleTitle(singleBinding.rawBinding.role);- return conditionTitle || roleTitle;- },- },- ];+ const columns: DataTableColumn<SingleBinding>[] = [];if (roleHasDatabaseLimitation(role)) {columns.push(@@ -250,23 +232,7 @@ const getDataTableColumns = (title: t("common.database"),key: "database",render: (singleBinding) => {- const databaseName = extractDatabaseName(- singleBinding.databaseResource- );- if (singleBinding.databaseResource) {- const database = extractDatabase(singleBinding.databaseResource);- return (- <div class="flex items-center gap-x-1">- <InstanceV1Name- instance={getInstanceResource(database)}- link={false}- />- <span>/</span>- <span>{databaseName}</span>- </div>- );- }- return databaseName;+ return singleBinding.databaseResource?.databaseFullName ?? "*";},},{@@ -284,70 +250,22 @@ const getDataTableColumns = ();}- columns.push(- {- title: t("common.expiration"),- key: "expiration",- render: (singleBinding) => {- const content = extractExpiration(singleBinding.expiration);- if (checkRoleExpired(singleBinding)) {- return <RoleExpiredTip content={content} />;- }- return content;- },- },- {- title: t("common.description"),- key: "description",- render: (singleBinding) => (- <RoleDescription description={singleBinding.description || ""} />- ),+ columns.push({+ title: t("common.expiration"),+ key: "expiration",+ render: (singleBinding) => {+ const content = extractExpiration(singleBinding.expiration);+ if (checkRoleExpired(singleBinding)) {+ return <RoleExpiredTip content={content} />;+ }+ return content;},- {- title: "",- key: "operations",- width: 32,- render: (singleBinding) => (- <div class="flex justify-end pr-2 gap-x-1">- <MiniActionButton- onClick={() => {- editingBinding.value = create(BindingSchema, {- role: role,- members: [props.binding.binding],- condition: singleBinding.rawBinding.condition,- parsedExpr: singleBinding.rawBinding.parsedExpr,- });- }}- >- <PencilIcon class="w-4 h-4" />- </MiniActionButton>- {(roleList.value.find((r) => r.role === role)?.singleBindingList- ?.length ?? 0) > 1 && (- <MiniActionButton- type="error"- disabled={!allowDeleteCondition(singleBinding)}- onClick={() => {- const item = roleList.value.find((r) => r.role === role);- if (item) {- const index = item.singleBindingList.indexOf(singleBinding);- if (index >= 0) {- handleDeleteCondition(item, index);- }- }- }}- >- <TrashIcon class="w-4 h-4" />- </MiniActionButton>- )}- </div>- ),- }- );+ });return columns;};-const allowRemoveRole = (_role: string) => {+const allowRemoveRole = computed(() => {if (props.project.state === State.DELETED) {return false;}@@ -356,12 +274,12 @@ const allowRemoveRole = (_role: string) => {}return true;-};+});-const handleDeleteRole = (role: string) => {+const handleDeleteRole = (binding: Binding) => {const title = t("project.members.revoke-role-from-user", {- role: displayRoleTitle(role),- user: props.binding.title,+ role: displayRoleTitle(binding.role),+ user: props.binding.binding,});dialog.create({type: "error",@@ -371,96 +289,13 @@ const handleDeleteRole = (role: string) => {negativeText: t("common.cancel"),onPositiveClick: async () => {const policy = cloneDeep(iamPolicy.value);- for (const binding of policy.bindings) {- if (binding.role !== role) {- continue;- }- binding.members = binding.members.filter((member) => {- return member !== props.binding.binding;- });- }- await projectIamPolicyStore.updateProjectIamPolicy(- projectResourceName.value,- policy- );- pushNotification({- module: "bytebase",- style: "SUCCESS",- title: t("common.deleted"),- });- },- });-};--const allowDeleteCondition = (singleBinding: SingleBinding) => {- if (singleBinding.rawBinding.role === PresetRoleType.PROJECT_OWNER) {- return allowRemoveRole(PresetRoleType.PROJECT_OWNER);- }- return true;-};--const handleDeleteCondition = async (- item: {- role: string;- singleBindingList: SingleBinding[];- },- index: number-) => {- const singleBinding = item.singleBindingList[index];- const conditionName =- singleBinding.rawBinding.condition?.title ||- displayRoleTitle(singleBinding.rawBinding.role);-- const title = t("project.members.revoke-role-from-user", {- role: conditionName,- user: props.binding.title,- });-- dialog.create({- title: title,- type: "error",- content: t("common.cannot-undo-this-action"),- positiveText: t("common.revoke"),- negativeText: t("common.cancel"),- onPositiveClick: async () => {- const policy = cloneDeep(iamPolicy.value);- const rawBinding = policy.bindings.find((binding) =>- isEqual(binding, singleBinding.rawBinding)- );+ const rawBinding = policy.bindings.find((b) => isEqual(binding, b));if (!rawBinding) {return;}- // Simply remove the member from original binding.- rawBinding.members = rawBinding.members.filter((member) => {+ rawBinding.members = binding.members.filter((member) => {return member !== props.binding.binding;});-- // Build new bindings with the remaining conditions- const bindingList = item.singleBindingList.filter((b, i) => {- if (i === index) {- return false;- }- return isEqual(b.rawBinding, singleBinding.rawBinding);- });- if (bindingList.length > 0) {- const databaseResources = bindingList- .filter((b) => b.databaseResource)- .map((b) => b.databaseResource) as DatabaseResource[];-- policy.bindings.push(- create(BindingSchema, {- role: item.role,- members: [props.binding.binding],- condition: buildConditionExpr({- role: item.role,- description: bindingList[0].description,- expirationTimestampInMS: bindingList[0].expiration?.getTime(),- databaseResources: databaseResources,- }),- })- );- }-await projectIamPolicyStore.updateProjectIamPolicy(projectResourceName.value,policy@@ -474,22 +309,6 @@ const handleDeleteCondition = async (});};-const extractDatabase = (databaseResource: DatabaseResource) => {- const database = databaseStore.getDatabaseByName(- databaseResource.databaseFullName- );- return database;-};--const extractDatabaseName = (databaseResource?: DatabaseResource) => {- if (!databaseResource) {- return "*";- }- const database = extractDatabase(databaseResource);- const { databaseName } = extractDatabaseResourceName(database.name);- return databaseName;-};-const extractSchemaName = (databaseResource?: DatabaseResource) => {if (!databaseResource) {return "*";@@ -532,71 +351,33 @@ const checkRoleExpired = (role: SingleBinding) => {return role.expiration < new Date();};-watch(- () => props.binding,- async () => {- const tempRoleList: {- role: string;- singleBindingList: SingleBinding[];- }[] = [];- for (const rawBinding of props.binding.projectRoleBindings) {- const singleBindingList = [];- const singleBinding: SingleBinding = {- description: rawBinding.condition?.description || "",- rawBinding: rawBinding,- };+const getSingleBindingList = (rawBinding: Binding): SingleBinding[] => {+ const singleBindingList = [];+ const singleBinding: SingleBinding = {};- if (rawBinding.parsedExpr) {- const conditionExpr = convertFromExpr(rawBinding.parsedExpr);- if (conditionExpr.expiredTime) {- singleBinding.expiration = new Date(conditionExpr.expiredTime);- }- if (- Array.isArray(conditionExpr.databaseResources) &&- conditionExpr.databaseResources.length > 0- ) {- await databaseStore.batchGetOrFetchDatabases(- conditionExpr.databaseResources.map(- (resource) => resource.databaseFullName- )- );- for (const resource of conditionExpr.databaseResources) {- singleBindingList.push({- ...singleBinding,- databaseResource: resource,- });- }- } else {- singleBindingList.push(singleBinding);- }- } else {- singleBindingList.push(singleBinding);- }-- const tempRole = tempRoleList.find(- (role) => role.role === rawBinding.role- );- if (tempRole) {- tempRole.singleBindingList.push(...singleBindingList);- } else {- tempRoleList.push({- role: rawBinding.role,- singleBindingList: singleBindingList,+ if (rawBinding.parsedExpr) {+ const conditionExpr = convertFromExpr(rawBinding.parsedExpr);+ if (conditionExpr.expiredTime) {+ singleBinding.expiration = new Date(conditionExpr.expiredTime);+ }+ if (+ Array.isArray(conditionExpr.databaseResources) &&+ conditionExpr.databaseResources.length > 0+ ) {+ for (const resource of conditionExpr.databaseResources) {+ singleBindingList.push({+ ...singleBinding,+ databaseResource: resource,});}+ } else {+ singleBindingList.push(singleBinding);}-- // Sort by role type.- tempRoleList.sort((a, b) => {- if (!PRESET_ROLES.includes(a.role)) return -1;- if (!PRESET_ROLES.includes(b.role)) return 1;- return PRESET_ROLES.indexOf(a.role) - PRESET_ROLES.indexOf(b.role);- });-- roleList.value = tempRoleList;- },- { immediate: true, deep: true }-);+ } else {+ singleBindingList.push(singleBinding);+ }+ return singleBindingList;+};const groupMembers = computedAsync(async () => {if (props.binding.type !== "groups") {diff --git a/frontend/src/components/ProjectMember/utils.ts b/frontend/src/components/ProjectMember/utils.tsindex 99dcc944f9..adca087277 100644--- a/frontend/src/components/ProjectMember/utils.ts+++ b/frontend/src/components/ProjectMember/utils.ts@@ -1,4 +1,3 @@-import { PresetRoleType } from "@/types";import type { Binding } from "@/types/proto-es/v1/iam_policy_pb";import { checkRoleContainsAnyPermission, displayRoleTitle } from "@/utils";@@ -11,15 +10,16 @@ export const getBindingIdentifier = (binding: Binding): string => {};export const roleHasDatabaseLimitation = (role: string) => {- return (- role !== PresetRoleType.PROJECT_OWNER &&- checkRoleContainsAnyPermission(- role,- "bb.sql.select",- "bb.sql.ddl",- "bb.sql.dml",- "bb.sql.explain",- "bb.sql.info"- )+ return checkRoleContainsAnyPermission(+ role,+ "bb.sql.select",+ "bb.sql.ddl",+ "bb.sql.dml",+ "bb.sql.explain",+ "bb.sql.info");};++export const roleHasEnvironmentLimitation = (role: string) => {+ return checkRoleContainsAnyPermission(role, "bb.sql.ddl", "bb.sql.dml");+};diff --git a/frontend/src/composables/useExecuteSQL.ts b/frontend/src/composables/useExecuteSQL.tsindex 9a6a801678..9d8912585f 100644--- a/frontend/src/composables/useExecuteSQL.ts+++ b/frontend/src/composables/useExecuteSQL.ts@@ -31,7 +31,7 @@ import {type QueryOption,QueryOptionSchema,QueryRequestSchema,- QueryResult_PermissionDenied_CommandType,+ QueryResult_CommandError_Type,} from "@/types/proto-es/v1/sql_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";import {@@ -361,11 +361,11 @@ const useExecuteSQL = () => {const isOnlySelectError = (resultSet: SQLResultSetV1) => {return resultSet.results.some((result) => {return (- result.detailedError.case === "permissionDenied" &&+ result.detailedError.case === "commandError" &&[- QueryResult_PermissionDenied_CommandType.DDL,- QueryResult_PermissionDenied_CommandType.DML,- QueryResult_PermissionDenied_CommandType.NON_READ_ONLY,+ QueryResult_CommandError_Type.DDL,+ QueryResult_CommandError_Type.DML,+ QueryResult_CommandError_Type.NON_READ_ONLY,].includes(result.detailedError.value.commandType));});diff --git a/frontend/src/locales/en-US.json b/frontend/src/locales/en-US.jsonindex 0f94b55caa..258e15be0e 100644--- a/frontend/src/locales/en-US.json+++ b/frontend/src/locales/en-US.json@@ -1898,7 +1898,8 @@"condition-name": "Condition name","workspace-level-roles": "Workspace level roles","project-level-roles": "Project level roles",- "roles-are-filtered-by-permissions": "Roles are filtered by the permissions"+ "roles-are-filtered-by-permissions": "Roles are filtered by the permissions",+ "allow-ddl": "Allow running DDL/DML statement in the selected environments"},"select": "Select Project","all": "All projects",diff --git a/frontend/src/locales/es-ES.json b/frontend/src/locales/es-ES.jsonindex c042949aa4..5005b01013 100644--- a/frontend/src/locales/es-ES.json+++ b/frontend/src/locales/es-ES.json@@ -1898,7 +1898,8 @@"condition-name": "Nombre de la condición","workspace-level-roles": "Roles a nivel de espacio de trabajo","project-level-roles": "Roles a nivel de proyecto",- "roles-are-filtered-by-permissions": "Roles are filtered by the permissions"+ "roles-are-filtered-by-permissions": "Roles are filtered by the permissions",+ "allow-ddl": "Permitir ejecutar sentencias DDL/DML en los entornos seleccionados"},"select": "Seleccionar Proyecto","all": "Todos los proyectos",diff --git a/frontend/src/locales/ja-JP.json b/frontend/src/locales/ja-JP.jsonindex 996b856b4b..e9f516a476 100644--- a/frontend/src/locales/ja-JP.json+++ b/frontend/src/locales/ja-JP.json@@ -1898,7 +1898,8 @@"condition-name": "条件名","workspace-level-roles": "ワークスペースレベルのロール","project-level-roles": "プロジェクトレベルのロール",- "roles-are-filtered-by-permissions": "Roles are filtered by the permissions"+ "roles-are-filtered-by-permissions": "Roles are filtered by the permissions",+ "allow-ddl": "選択した環境で DDL/DML ステートメントの実行を許可する"},"select": "アイテムを選択","all": "全てのアイテム",diff --git a/frontend/src/locales/vi-VN.json b/frontend/src/locales/vi-VN.jsonindex b529f6476d..072db9771d 100644--- a/frontend/src/locales/vi-VN.json+++ b/frontend/src/locales/vi-VN.json@@ -1898,7 +1898,8 @@"condition-name": "Tên điều kiện","workspace-level-roles": "Vai trò cấp độ không gian làm việc","project-level-roles": "Vai trò cấp độ dự án",- "roles-are-filtered-by-permissions": "Roles are filtered by the permissions"+ "roles-are-filtered-by-permissions": "Roles are filtered by the permissions",+ "allow-ddl": "Cho phép chạy câu lệnh DDL/DML trong các môi trường đã chọn"},"select": "Chọn Dự án","all": "Tất cả dự án",diff --git a/frontend/src/locales/zh-CN.json b/frontend/src/locales/zh-CN.jsonindex 303eadb1f9..52fe100870 100644--- a/frontend/src/locales/zh-CN.json+++ b/frontend/src/locales/zh-CN.json@@ -1898,7 +1898,8 @@"condition-name": "条件名称","workspace-level-roles": "工作空间级别角色","project-level-roles": "项目级别角色",- "roles-are-filtered-by-permissions": "角色已按权限筛选"+ "roles-are-filtered-by-permissions": "角色已按权限筛选",+ "allow-ddl": "允许在所选环境中执行 DDL/DML 语句"},"select": "选择项目","all": "所有项目",diff --git a/frontend/src/types/iam/permission.ts b/frontend/src/types/iam/permission.tsindex 7b9e9fe98c..3b51c16085 100644--- a/frontend/src/types/iam/permission.ts+++ b/frontend/src/types/iam/permission.ts@@ -12,7 +12,6 @@ export type QueryPermission = Extract<| "bb.sql.admin">;-export const QueryPermissionQueryOnly: QueryPermission[] = ["bb.sql.select"];export const QueryPermissionQueryAny: QueryPermission[] = ["bb.sql.select","bb.sql.info",diff --git a/frontend/src/types/proto-es/v1/org_policy_service_pb.d.ts b/frontend/src/types/proto-es/v1/org_policy_service_pb.d.tsindex d2ea60a20d..313252de53 100644--- a/frontend/src/types/proto-es/v1/org_policy_service_pb.d.ts+++ b/frontend/src/types/proto-es/v1/org_policy_service_pb.d.ts@@ -338,22 +338,6 @@ export declare type QueryDataPolicy = Message<"bytebase.v1.QueryDataPolicy"> & {* @generated from field: bool allow_admin_data_source = 4;*/allowAdminDataSource: boolean;-- /**- * ================- * Deprecate following fields.- * Disallow running DDL statements in the SQL editor.- *- * @generated from field: bool disallow_ddl = 7;- */- disallowDdl: boolean;-- /**- * Disallow running DML statements in the SQL editor.- *- * @generated from field: bool disallow_dml = 8;- */- disallowDml: boolean;};/**diff --git a/frontend/src/types/proto-es/v1/org_policy_service_pb.js b/frontend/src/types/proto-es/v1/org_policy_service_pb.jsindex 49e4cadd22..a78f375afe 100644--- a/frontend/src/types/proto-es/v1/org_policy_service_pb.js+++ b/frontend/src/types/proto-es/v1/org_policy_service_pb.js@@ -15,7 +15,7 @@ import { file_v1_annotation } from "./annotation_pb";* Describes the file v1/org_policy_service.proto.*/export const file_v1_org_policy_service = /*@__PURE__*/- fileDesc("Cht2MS9vcmdfcG9saWN5X3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIpMBChNDcmVhdGVQb2xpY3lSZXF1ZXN0EisKBnBhcmVudBgBIAEoCUIb4EEC+kEVEhNieXRlYmFzZS5jb20vUG9saWN5EigKBnBvbGljeRgCIAEoCzITLmJ5dGViYXNlLnYxLlBvbGljeUID4EECEiUKBHR5cGUYAyABKA4yFy5ieXRlYmFzZS52MS5Qb2xpY3lUeXBlIocBChNVcGRhdGVQb2xpY3lSZXF1ZXN0EigKBnBvbGljeRgBIAEoCzITLmJ5dGViYXNlLnYxLlBvbGljeUID4EECEi8KC3VwZGF0ZV9tYXNrGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFzaxIVCg1hbGxvd19taXNzaW5nGAMgASgIIkAKE0RlbGV0ZVBvbGljeVJlcXVlc3QSKQoEbmFtZRgBIAEoCUIb4EEC+kEVChNieXRlYmFzZS5jb20vUG9saWN5Ij0KEEdldFBvbGljeVJlcXVlc3QSKQoEbmFtZRgBIAEoCUIb4EEC+kEVChNieXRlYmFzZS5jb20vUG9saWN5IpsBChNMaXN0UG9saWNpZXNSZXF1ZXN0EisKBnBhcmVudBgBIAEoCUIb4EEC+kEVEhNieXRlYmFzZS5jb20vUG9saWN5EjEKC3BvbGljeV90eXBlGAIgASgOMhcuYnl0ZWJhc2UudjEuUG9saWN5VHlwZUgAiAEBEhQKDHNob3dfZGVsZXRlZBgDIAEoCEIOCgxfcG9saWN5X3R5cGUiPQoUTGlzdFBvbGljaWVzUmVzcG9uc2USJQoIcG9saWNpZXMYASADKAsyEy5ieXRlYmFzZS52MS5Qb2xpY3kiwQUKBlBvbGljeRIMCgRuYW1lGAEgASgJEhsKE2luaGVyaXRfZnJvbV9wYXJlbnQYAiABKAgSJQoEdHlwZRgDIAEoDjIXLmJ5dGViYXNlLnYxLlBvbGljeVR5cGUSNAoOcm9sbG91dF9wb2xpY3kYBCABKAsyGi5ieXRlYmFzZS52MS5Sb2xsb3V0UG9saWN5SAASPQoTbWFza2luZ19ydWxlX3BvbGljeRgFIAEoCzIeLmJ5dGViYXNlLnYxLk1hc2tpbmdSdWxlUG9saWN5SAASRwoYbWFza2luZ19leGVtcHRpb25fcG9saWN5GAYgASgLMiMuYnl0ZWJhc2UudjEuTWFza2luZ0V4ZW1wdGlvblBvbGljeUgAEiwKCnRhZ19wb2xpY3kYByABKAsyFi5ieXRlYmFzZS52MS5UYWdQb2xpY3lIABI5ChFxdWVyeV9kYXRhX3BvbGljeRgJIAEoCzIcLmJ5dGViYXNlLnYxLlF1ZXJ5RGF0YVBvbGljeUgAEg8KB2VuZm9yY2UYCiABKAgSOwoNcmVzb3VyY2VfdHlwZRgLIAEoDjIfLmJ5dGViYXNlLnYxLlBvbGljeVJlc291cmNlVHlwZUID4EEDOuUB6kHhAQoTYnl0ZWJhc2UuY29tL1BvbGljeRIRcG9saWNpZXMve3BvbGljeX0SJHByb2plY3RzL3twcm9qZWN0fS9wb2xpY2llcy97cG9saWN5fRIsZW52aXJvbm1lbnRzL3tlbnZpcm9ubWVudH0vcG9saWNpZXMve3BvbGljeX0SJmluc3RhbmNlcy97aW5zdGFuY2V9L3BvbGljaWVzL3twb2xpY3l9EjtpbnN0YW5jZXMve2luc3RhbmNlfS9kYXRhYmFzZXMve2RhdGFiYXNlfS9wb2xpY2llcy97cG9saWN5fUIICgZwb2xpY3kiMQoNUm9sbG91dFBvbGljeRIRCglhdXRvbWF0aWMYASABKAgSDQoFcm9sZXMYAiADKAkirgEKD1F1ZXJ5RGF0YVBvbGljeRIbChNtYXhpbXVtX3Jlc3VsdF9yb3dzGAEgASgFEhYKDmRpc2FibGVfZXhwb3J0GAIgASgIEhkKEWRpc2FibGVfY29weV9kYXRhGAMgASgIEh8KF2FsbG93X2FkbWluX2RhdGFfc291cmNlGAQgASgIEhQKDGRpc2FsbG93X2RkbBgHIAEoCBIUCgxkaXNhbGxvd19kbWwYCCABKAginwEKFk1hc2tpbmdFeGVtcHRpb25Qb2xpY3kSQQoKZXhlbXB0aW9ucxgBIAMoCzItLmJ5dGViYXNlLnYxLk1hc2tpbmdFeGVtcHRpb25Qb2xpY3kuRXhlbXB0aW9uGkIKCUV4ZW1wdGlvbhIPCgdtZW1iZXJzGAEgAygJEiQKCWNvbmRpdGlvbhgCIAEoCzIRLmdvb2dsZS50eXBlLkV4cHIipgEKEU1hc2tpbmdSdWxlUG9saWN5EjkKBXJ1bGVzGAEgAygLMiouYnl0ZWJhc2UudjEuTWFza2luZ1J1bGVQb2xpY3kuTWFza2luZ1J1bGUaVgoLTWFza2luZ1J1bGUSCgoCaWQYASABKAkSJAoJY29uZGl0aW9uGAIgASgLMhEuZ29vZ2xlLnR5cGUuRXhwchIVCg1zZW1hbnRpY190eXBlGAMgASgJImgKCVRhZ1BvbGljeRIuCgR0YWdzGAEgAygLMiAuYnl0ZWJhc2UudjEuVGFnUG9saWN5LlRhZ3NFbnRyeRorCglUYWdzRW50cnkSCwoDa2V5GAEgASgJEg0KBXZhbHVlGAIgASgJOgI4ASp/CgpQb2xpY3lUeXBlEhsKF1BPTElDWV9UWVBFX1VOU1BFQ0lGSUVEEAASEAoMTUFTS0lOR19SVUxFEAESFQoRTUFTS0lOR19FWEVNUFRJT04QAhISCg5ST0xMT1VUX1BPTElDWRADEgcKA1RBRxAEEg4KCkRBVEFfUVVFUlkQBipgChJQb2xpY3lSZXNvdXJjZVR5cGUSHQoZUkVTT1VSQ0VfVFlQRV9VTlNQRUNJRklFRBAAEg0KCVdPUktTUEFDRRABEg8KC0VOVklST05NRU5UEAISCwoHUFJPSkVDVBADMvQMChBPcmdQb2xpY3lTZXJ2aWNlEqACCglHZXRQb2xpY3kSHS5ieXRlYmFzZS52MS5HZXRQb2xpY3lSZXF1ZXN0GhMuYnl0ZWJhc2UudjEuUG9saWN5It4B2kEEbmFtZYrqMA9iYi5wb2xpY2llcy5nZXSQ6jACgtPkkwK5AVoiEiAvdjEve25hbWU9cHJvamVjdHMvKi9wb2xpY2llcy8qfVomEiQvdjEve25hbWU9ZW52aXJvbm1lbnRzLyovcG9saWNpZXMvKn1aIxIhL3YxL3tuYW1lPWluc3RhbmNlcy8qL3BvbGljaWVzLyp9Wi8SLS92MS97bmFtZT1pbnN0YW5jZXMvKi9kYXRhYmFzZXMvKi9wb2xpY2llcy8qfRIVL3YxL3tuYW1lPXBvbGljaWVzLyp9EqgCCgxMaXN0UG9saWNpZXMSIC5ieXRlYmFzZS52MS5MaXN0UG9saWNpZXNSZXF1ZXN0GiEuYnl0ZWJhc2UudjEuTGlzdFBvbGljaWVzUmVzcG9uc2Ui0gHaQQCK6jAQYmIucG9saWNpZXMubGlzdJDqMAGC0+STArABWiISIC92MS97cGFyZW50PXByb2plY3RzLyp9L3BvbGljaWVzWiYSJC92MS97cGFyZW50PWVudmlyb25tZW50cy8qfS9wb2xpY2llc1ojEiEvdjEve3BhcmVudD1pbnN0YW5jZXMvKn0vcG9saWNpZXNaLxItL3YxL3twYXJlbnQ9aW5zdGFuY2VzLyovZGF0YWJhc2VzLyp9L3BvbGljaWVzEgwvdjEvcG9saWNpZXMS1QIKDENyZWF0ZVBvbGljeRIgLmJ5dGViYXNlLnYxLkNyZWF0ZVBvbGljeVJlcXVlc3QaEy5ieXRlYmFzZS52MS5Qb2xpY3kijQLaQQ1wYXJlbnQscG9saWN5iuowEmJiLnBvbGljaWVzLmNyZWF0ZZDqMAKY6jABgtPkkwLYAToGcG9saWN5Wio6BnBvbGljeSIgL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vcG9saWNpZXNaLjoGcG9saWN5IiQvdjEve3BhcmVudD1lbnZpcm9ubWVudHMvKn0vcG9saWNpZXNaKzoGcG9saWN5IiEvdjEve3BhcmVudD1pbnN0YW5jZXMvKn0vcG9saWNpZXNaNzoGcG9saWN5Ii0vdjEve3BhcmVudD1pbnN0YW5jZXMvKi9kYXRhYmFzZXMvKn0vcG9saWNpZXMiDC92MS9wb2xpY2llcxKGAwoMVXBkYXRlUG9saWN5EiAuYnl0ZWJhc2UudjEuVXBkYXRlUG9saWN5UmVxdWVzdBoTLmJ5dGViYXNlLnYxLlBvbGljeSK+AtpBEnBvbGljeSx1cGRhdGVfbWFza4rqMBJiYi5wb2xpY2llcy51cGRhdGWQ6jACmOowAYLT5JMChAI6BnBvbGljeVoxOgZwb2xpY3kyJy92MS97cG9saWN5Lm5hbWU9cHJvamVjdHMvKi9wb2xpY2llcy8qfVo1OgZwb2xpY3kyKy92MS97cG9saWN5Lm5hbWU9ZW52aXJvbm1lbnRzLyovcG9saWNpZXMvKn1aMjoGcG9saWN5MigvdjEve3BvbGljeS5uYW1lPWluc3RhbmNlcy8qL3BvbGljaWVzLyp9Wj46BnBvbGljeTI0L3YxL3twb2xpY3kubmFtZT1pbnN0YW5jZXMvKi9kYXRhYmFzZXMvKi9wb2xpY2llcy8qfTIcL3YxL3twb2xpY3kubmFtZT1wb2xpY2llcy8qfRKwAgoMRGVsZXRlUG9saWN5EiAuYnl0ZWJhc2UudjEuRGVsZXRlUG9saWN5UmVxdWVzdBoWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eSLlAdpBBG5hbWWK6jASYmIucG9saWNpZXMuZGVsZXRlkOowApjqMAGC0+STArkBWiIqIC92MS97bmFtZT1wcm9qZWN0cy8qL3BvbGljaWVzLyp9WiYqJC92MS97bmFtZT1lbnZpcm9ubWVudHMvKi9wb2xpY2llcy8qfVojKiEvdjEve25hbWU9aW5zdGFuY2VzLyovcG9saWNpZXMvKn1aLyotL3YxL3tuYW1lPWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qL3BvbGljaWVzLyp9KhUvdjEve25hbWU9cG9saWNpZXMvKn1CqwEKD2NvbS5ieXRlYmFzZS52MUIVT3JnUG9saWN5U2VydmljZVByb3RvUAFaNGdpdGh1Yi5jb20vYnl0ZWJhc2UvYnl0ZWJhc2UvYmFja2VuZC9nZW5lcmF0ZWQtZ28vdjGiAgNCWFiqAgtCeXRlYmFzZS5WMcoCC0J5dGViYXNlXFYx4gIXQnl0ZWJhc2VcVjFcR1BCTWV0YWRhdGHqAgxCeXRlYmFzZTo6VjFiBnByb3RvMw", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_empty, file_google_protobuf_field_mask, file_google_type_expr, file_v1_annotation]);+ fileDesc("Cht2MS9vcmdfcG9saWN5X3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIpMBChNDcmVhdGVQb2xpY3lSZXF1ZXN0EisKBnBhcmVudBgBIAEoCUIb4EEC+kEVEhNieXRlYmFzZS5jb20vUG9saWN5EigKBnBvbGljeRgCIAEoCzITLmJ5dGViYXNlLnYxLlBvbGljeUID4EECEiUKBHR5cGUYAyABKA4yFy5ieXRlYmFzZS52MS5Qb2xpY3lUeXBlIocBChNVcGRhdGVQb2xpY3lSZXF1ZXN0EigKBnBvbGljeRgBIAEoCzITLmJ5dGViYXNlLnYxLlBvbGljeUID4EECEi8KC3VwZGF0ZV9tYXNrGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFzaxIVCg1hbGxvd19taXNzaW5nGAMgASgIIkAKE0RlbGV0ZVBvbGljeVJlcXVlc3QSKQoEbmFtZRgBIAEoCUIb4EEC+kEVChNieXRlYmFzZS5jb20vUG9saWN5Ij0KEEdldFBvbGljeVJlcXVlc3QSKQoEbmFtZRgBIAEoCUIb4EEC+kEVChNieXRlYmFzZS5jb20vUG9saWN5IpsBChNMaXN0UG9saWNpZXNSZXF1ZXN0EisKBnBhcmVudBgBIAEoCUIb4EEC+kEVEhNieXRlYmFzZS5jb20vUG9saWN5EjEKC3BvbGljeV90eXBlGAIgASgOMhcuYnl0ZWJhc2UudjEuUG9saWN5VHlwZUgAiAEBEhQKDHNob3dfZGVsZXRlZBgDIAEoCEIOCgxfcG9saWN5X3R5cGUiPQoUTGlzdFBvbGljaWVzUmVzcG9uc2USJQoIcG9saWNpZXMYASADKAsyEy5ieXRlYmFzZS52MS5Qb2xpY3kiwQUKBlBvbGljeRIMCgRuYW1lGAEgASgJEhsKE2luaGVyaXRfZnJvbV9wYXJlbnQYAiABKAgSJQoEdHlwZRgDIAEoDjIXLmJ5dGViYXNlLnYxLlBvbGljeVR5cGUSNAoOcm9sbG91dF9wb2xpY3kYBCABKAsyGi5ieXRlYmFzZS52MS5Sb2xsb3V0UG9saWN5SAASPQoTbWFza2luZ19ydWxlX3BvbGljeRgFIAEoCzIeLmJ5dGViYXNlLnYxLk1hc2tpbmdSdWxlUG9saWN5SAASRwoYbWFza2luZ19leGVtcHRpb25fcG9saWN5GAYgASgLMiMuYnl0ZWJhc2UudjEuTWFza2luZ0V4ZW1wdGlvblBvbGljeUgAEiwKCnRhZ19wb2xpY3kYByABKAsyFi5ieXRlYmFzZS52MS5UYWdQb2xpY3lIABI5ChFxdWVyeV9kYXRhX3BvbGljeRgJIAEoCzIcLmJ5dGViYXNlLnYxLlF1ZXJ5RGF0YVBvbGljeUgAEg8KB2VuZm9yY2UYCiABKAgSOwoNcmVzb3VyY2VfdHlwZRgLIAEoDjIfLmJ5dGViYXNlLnYxLlBvbGljeVJlc291cmNlVHlwZUID4EEDOuUB6kHhAQoTYnl0ZWJhc2UuY29tL1BvbGljeRIRcG9saWNpZXMve3BvbGljeX0SJHByb2plY3RzL3twcm9qZWN0fS9wb2xpY2llcy97cG9saWN5fRIsZW52aXJvbm1lbnRzL3tlbnZpcm9ubWVudH0vcG9saWNpZXMve3BvbGljeX0SJmluc3RhbmNlcy97aW5zdGFuY2V9L3BvbGljaWVzL3twb2xpY3l9EjtpbnN0YW5jZXMve2luc3RhbmNlfS9kYXRhYmFzZXMve2RhdGFiYXNlfS9wb2xpY2llcy97cG9saWN5fUIICgZwb2xpY3kiMQoNUm9sbG91dFBvbGljeRIRCglhdXRvbWF0aWMYASABKAgSDQoFcm9sZXMYAiADKAkiggEKD1F1ZXJ5RGF0YVBvbGljeRIbChNtYXhpbXVtX3Jlc3VsdF9yb3dzGAEgASgFEhYKDmRpc2FibGVfZXhwb3J0GAIgASgIEhkKEWRpc2FibGVfY29weV9kYXRhGAMgASgIEh8KF2FsbG93X2FkbWluX2RhdGFfc291cmNlGAQgASgIIp8BChZNYXNraW5nRXhlbXB0aW9uUG9saWN5EkEKCmV4ZW1wdGlvbnMYASADKAsyLS5ieXRlYmFzZS52MS5NYXNraW5nRXhlbXB0aW9uUG9saWN5LkV4ZW1wdGlvbhpCCglFeGVtcHRpb24SDwoHbWVtYmVycxgBIAMoCRIkCgljb25kaXRpb24YAiABKAsyES5nb29nbGUudHlwZS5FeHByIqYBChFNYXNraW5nUnVsZVBvbGljeRI5CgVydWxlcxgBIAMoCzIqLmJ5dGViYXNlLnYxLk1hc2tpbmdSdWxlUG9saWN5Lk1hc2tpbmdSdWxlGlYKC01hc2tpbmdSdWxlEgoKAmlkGAEgASgJEiQKCWNvbmRpdGlvbhgCIAEoCzIRLmdvb2dsZS50eXBlLkV4cHISFQoNc2VtYW50aWNfdHlwZRgDIAEoCSJoCglUYWdQb2xpY3kSLgoEdGFncxgBIAMoCzIgLmJ5dGViYXNlLnYxLlRhZ1BvbGljeS5UYWdzRW50cnkaKwoJVGFnc0VudHJ5EgsKA2tleRgBIAEoCRINCgV2YWx1ZRgCIAEoCToCOAEqfwoKUG9saWN5VHlwZRIbChdQT0xJQ1lfVFlQRV9VTlNQRUNJRklFRBAAEhAKDE1BU0tJTkdfUlVMRRABEhUKEU1BU0tJTkdfRVhFTVBUSU9OEAISEgoOUk9MTE9VVF9QT0xJQ1kQAxIHCgNUQUcQBBIOCgpEQVRBX1FVRVJZEAYqYAoSUG9saWN5UmVzb3VyY2VUeXBlEh0KGVJFU09VUkNFX1RZUEVfVU5TUEVDSUZJRUQQABINCglXT1JLU1BBQ0UQARIPCgtFTlZJUk9OTUVOVBACEgsKB1BST0pFQ1QQAzL0DAoQT3JnUG9saWN5U2VydmljZRKgAgoJR2V0UG9saWN5Eh0uYnl0ZWJhc2UudjEuR2V0UG9saWN5UmVxdWVzdBoTLmJ5dGViYXNlLnYxLlBvbGljeSLeAdpBBG5hbWWK6jAPYmIucG9saWNpZXMuZ2V0kOowAoLT5JMCuQFaIhIgL3YxL3tuYW1lPXByb2plY3RzLyovcG9saWNpZXMvKn1aJhIkL3YxL3tuYW1lPWVudmlyb25tZW50cy8qL3BvbGljaWVzLyp9WiMSIS92MS97bmFtZT1pbnN0YW5jZXMvKi9wb2xpY2llcy8qfVovEi0vdjEve25hbWU9aW5zdGFuY2VzLyovZGF0YWJhc2VzLyovcG9saWNpZXMvKn0SFS92MS97bmFtZT1wb2xpY2llcy8qfRKoAgoMTGlzdFBvbGljaWVzEiAuYnl0ZWJhc2UudjEuTGlzdFBvbGljaWVzUmVxdWVzdBohLmJ5dGViYXNlLnYxLkxpc3RQb2xpY2llc1Jlc3BvbnNlItIB2kEAiuowEGJiLnBvbGljaWVzLmxpc3SQ6jABgtPkkwKwAVoiEiAvdjEve3BhcmVudD1wcm9qZWN0cy8qfS9wb2xpY2llc1omEiQvdjEve3BhcmVudD1lbnZpcm9ubWVudHMvKn0vcG9saWNpZXNaIxIhL3YxL3twYXJlbnQ9aW5zdGFuY2VzLyp9L3BvbGljaWVzWi8SLS92MS97cGFyZW50PWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qfS9wb2xpY2llcxIML3YxL3BvbGljaWVzEtUCCgxDcmVhdGVQb2xpY3kSIC5ieXRlYmFzZS52MS5DcmVhdGVQb2xpY3lSZXF1ZXN0GhMuYnl0ZWJhc2UudjEuUG9saWN5Io0C2kENcGFyZW50LHBvbGljeYrqMBJiYi5wb2xpY2llcy5jcmVhdGWQ6jACmOowAYLT5JMC2AE6BnBvbGljeVoqOgZwb2xpY3kiIC92MS97cGFyZW50PXByb2plY3RzLyp9L3BvbGljaWVzWi46BnBvbGljeSIkL3YxL3twYXJlbnQ9ZW52aXJvbm1lbnRzLyp9L3BvbGljaWVzWis6BnBvbGljeSIhL3YxL3twYXJlbnQ9aW5zdGFuY2VzLyp9L3BvbGljaWVzWjc6BnBvbGljeSItL3YxL3twYXJlbnQ9aW5zdGFuY2VzLyovZGF0YWJhc2VzLyp9L3BvbGljaWVzIgwvdjEvcG9saWNpZXMShgMKDFVwZGF0ZVBvbGljeRIgLmJ5dGViYXNlLnYxLlVwZGF0ZVBvbGljeVJlcXVlc3QaEy5ieXRlYmFzZS52MS5Qb2xpY3kivgLaQRJwb2xpY3ksdXBkYXRlX21hc2uK6jASYmIucG9saWNpZXMudXBkYXRlkOowApjqMAGC0+STAoQCOgZwb2xpY3laMToGcG9saWN5MicvdjEve3BvbGljeS5uYW1lPXByb2plY3RzLyovcG9saWNpZXMvKn1aNToGcG9saWN5MisvdjEve3BvbGljeS5uYW1lPWVudmlyb25tZW50cy8qL3BvbGljaWVzLyp9WjI6BnBvbGljeTIoL3YxL3twb2xpY3kubmFtZT1pbnN0YW5jZXMvKi9wb2xpY2llcy8qfVo+OgZwb2xpY3kyNC92MS97cG9saWN5Lm5hbWU9aW5zdGFuY2VzLyovZGF0YWJhc2VzLyovcG9saWNpZXMvKn0yHC92MS97cG9saWN5Lm5hbWU9cG9saWNpZXMvKn0SsAIKDERlbGV0ZVBvbGljeRIgLmJ5dGViYXNlLnYxLkRlbGV0ZVBvbGljeVJlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHki5QHaQQRuYW1liuowEmJiLnBvbGljaWVzLmRlbGV0ZZDqMAKY6jABgtPkkwK5AVoiKiAvdjEve25hbWU9cHJvamVjdHMvKi9wb2xpY2llcy8qfVomKiQvdjEve25hbWU9ZW52aXJvbm1lbnRzLyovcG9saWNpZXMvKn1aIyohL3YxL3tuYW1lPWluc3RhbmNlcy8qL3BvbGljaWVzLyp9Wi8qLS92MS97bmFtZT1pbnN0YW5jZXMvKi9kYXRhYmFzZXMvKi9wb2xpY2llcy8qfSoVL3YxL3tuYW1lPXBvbGljaWVzLyp9QqsBCg9jb20uYnl0ZWJhc2UudjFCFU9yZ1BvbGljeVNlcnZpY2VQcm90b1ABWjRnaXRodWIuY29tL2J5dGViYXNlL2J5dGViYXNlL2JhY2tlbmQvZ2VuZXJhdGVkLWdvL3YxogIDQlhYqgILQnl0ZWJhc2UuVjHKAgtCeXRlYmFzZVxWMeICF0J5dGViYXNlXFYxXEdQQk1ldGFkYXRh6gIMQnl0ZWJhc2U6OlYxYgZwcm90bzM", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_empty, file_google_protobuf_field_mask, file_google_type_expr, file_v1_annotation]);/*** Describes the message bytebase.v1.CreatePolicyRequest.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.tsindex 47039f51a0..2fe09f0c03 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@@ -5,7 +5,7 @@import type { GenEnum, GenFile, GenMessage, GenService } from "@bufbuild/protobuf/codegenv2";import type { Message } from "@bufbuild/protobuf";import type { Duration, NullValue, Timestamp, Value } from "@bufbuild/protobuf/wkt";-import type { Engine, ExportFormat, Position } from "./common_pb";+import type { Engine, ExportFormat, PermissionDeniedDetail, Position } from "./common_pb";import type { DatabaseMetadata } from "./database_service_pb";/**@@ -321,10 +321,16 @@ export declare type QueryResult = Message<"bytebase.v1.QueryResult"> & {case: "syntaxError";} | {/**- * @generated from field: bytebase.v1.QueryResult.PermissionDenied permission_denied = 10;+ * @generated from field: bytebase.v1.PermissionDeniedDetail permission_denied = 10;*/- value: QueryResult_PermissionDenied;+ value: PermissionDeniedDetail;case: "permissionDenied";+ } | {+ /**+ * @generated from field: bytebase.v1.QueryResult.CommandError command_error = 13;+ */+ value: QueryResult_CommandError;+ case: "commandError";} | { case: undefined; value?: undefined };/**@@ -472,43 +478,31 @@ export declare const QueryResult_SyntaxErrorSchema: GenMessage<QueryResult_Synta* Permission denied with resource information or disallowed command_type.* Either resources or command_type is available.*- * @generated from message bytebase.v1.QueryResult.PermissionDenied+ * @generated from message bytebase.v1.QueryResult.CommandError*/-export declare type QueryResult_PermissionDenied = Message<"bytebase.v1.QueryResult.PermissionDenied"> & {- /**- * 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: repeated string resources = 1;- */- resources: string[];-+export declare type QueryResult_CommandError = Message<"bytebase.v1.QueryResult.CommandError"> & {/*** Disallowed command_type.*- * @generated from field: bytebase.v1.QueryResult.PermissionDenied.CommandType command_type = 2;+ * @generated from field: bytebase.v1.QueryResult.CommandError.Type command_type = 1;*/- commandType: QueryResult_PermissionDenied_CommandType;+ commandType: QueryResult_CommandError_Type;};/**- * Describes the message bytebase.v1.QueryResult.PermissionDenied.- * Use `create(QueryResult_PermissionDeniedSchema)` to create a new message.+ * Describes the message bytebase.v1.QueryResult.CommandError.+ * Use `create(QueryResult_CommandErrorSchema)` to create a new message.*/-export declare const QueryResult_PermissionDeniedSchema: GenMessage<QueryResult_PermissionDenied>;+export declare const QueryResult_CommandErrorSchema: GenMessage<QueryResult_CommandError>;/**- * @generated from enum bytebase.v1.QueryResult.PermissionDenied.CommandType+ * @generated from enum bytebase.v1.QueryResult.CommandError.Type*/-export enum QueryResult_PermissionDenied_CommandType {+export enum QueryResult_CommandError_Type {/**- * @generated from enum value: COMMAND_TYPE_UNSPECIFIED = 0;+ * @generated from enum value: TYPE_UNSPECIFIED = 0;*/- COMMAND_TYPE_UNSPECIFIED = 0,+ TYPE_UNSPECIFIED = 0,/*** @generated from enum value: DDL = 1;@@ -527,9 +521,9 @@ export enum QueryResult_PermissionDenied_CommandType {}/**- * Describes the enum bytebase.v1.QueryResult.PermissionDenied.CommandType.+ * Describes the enum bytebase.v1.QueryResult.CommandError.Type.*/-export declare const QueryResult_PermissionDenied_CommandTypeSchema: GenEnum<QueryResult_PermissionDenied_CommandType>;+export declare const QueryResult_CommandError_TypeSchema: GenEnum<QueryResult_CommandError_Type>;/*** @generated from message bytebase.v1.QueryResult.Messagediff --git a/frontend/src/types/proto-es/v1/sql_service_pb.js b/frontend/src/types/proto-es/v1/sql_service_pb.jsindex a1246c002e..79f9cc56fc 100644--- a/frontend/src/types/proto-es/v1/sql_service_pb.js+++ b/frontend/src/types/proto-es/v1/sql_service_pb.js@@ -15,7 +15,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("ChR2MS9zcWxfc2VydmljZS5wcm90bxILYnl0ZWJhc2UudjEiqgEKE0FkbWluRXhlY3V0ZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vRGF0YWJhc2USEQoJc3RhdGVtZW50GAIgASgJEg0KBWxpbWl0GAMgASgFEhMKBnNjaGVtYRgEIAEoCUgAiAEBEhYKCWNvbnRhaW5lchgFIAEoCUgBiAEBQgkKB19zY2hlbWFCDAoKX2NvbnRhaW5lciJBChRBZG1pbkV4ZWN1dGVSZXNwb25zZRIpCgdyZXN1bHRzGAEgAygLMhguYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQigQIKDFF1ZXJ5UmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9EYXRhYmFzZRIRCglzdGF0ZW1lbnQYAiABKAkSDQoFbGltaXQYAyABKAUSGwoOZGF0YV9zb3VyY2VfaWQYBCABKAlCA+BBAhIPCgdleHBsYWluGAUgASgIEhMKBnNjaGVtYRgGIAEoCUgAiAEBEi4KDHF1ZXJ5X29wdGlvbhgHIAEoCzIYLmJ5dGViYXNlLnYxLlF1ZXJ5T3B0aW9uEhYKCWNvbnRhaW5lchgIIAEoCUgBiAEBQgkKB19zY2hlbWFCDAoKX2NvbnRhaW5lciI6Cg1RdWVyeVJlc3BvbnNlEikKB3Jlc3VsdHMYASADKAsyGC5ieXRlYmFzZS52MS5RdWVyeVJlc3VsdCL5AgoLUXVlcnlPcHRpb24SSgoVcmVkaXNfcnVuX2NvbW1hbmRzX29uGAEgASgOMisuYnl0ZWJhc2UudjEuUXVlcnlPcHRpb24uUmVkaXNSdW5Db21tYW5kc09uEkkKFG1zc3FsX2V4cGxhaW5fZm9ybWF0GAIgASgOMisuYnl0ZWJhc2UudjEuUXVlcnlPcHRpb24uTVNTUUxFeHBsYWluRm9ybWF0IlsKElJlZGlzUnVuQ29tbWFuZHNPbhIlCiFSRURJU19SVU5fQ09NTUFORFNfT05fVU5TUEVDSUZJRUQQABIPCgtTSU5HTEVfTk9ERRABEg0KCUFMTF9OT0RFUxACInYKEk1TU1FMRXhwbGFpbkZvcm1hdBIkCiBNU1NRTF9FWFBMQUlOX0ZPUk1BVF9VTlNQRUNJRklFRBAAEhwKGE1TU1FMX0VYUExBSU5fRk9STUFUX0FMTBABEhwKGE1TU1FMX0VYUExBSU5fRk9STUFUX1hNTBACIo8KCgtRdWVyeVJlc3VsdBIUCgxjb2x1bW5fbmFtZXMYASADKAkSGQoRY29sdW1uX3R5cGVfbmFtZXMYAiADKAkSIwoEcm93cxgDIAMoCzIVLmJ5dGViYXNlLnYxLlF1ZXJ5Um93EhIKCnJvd3NfY291bnQYBCABKAMSDQoFZXJyb3IYBSABKAkSKgoHbGF0ZW5jeRgGIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbhIRCglzdGF0ZW1lbnQYByABKAkSQAoOcG9zdGdyZXNfZXJyb3IYCCABKAsyJi5ieXRlYmFzZS52MS5RdWVyeVJlc3VsdC5Qb3N0Z3Jlc0Vycm9ySAASPAoMc3ludGF4X2Vycm9yGAkgASgLMiQuYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQuU3ludGF4RXJyb3JIABJGChFwZXJtaXNzaW9uX2RlbmllZBgKIAEoCzIpLmJ5dGViYXNlLnYxLlF1ZXJ5UmVzdWx0LlBlcm1pc3Npb25EZW5pZWRIABIyCghtZXNzYWdlcxgLIAMoCzIgLmJ5dGViYXNlLnYxLlF1ZXJ5UmVzdWx0Lk1lc3NhZ2USKgoGbWFza2VkGAwgAygLMhouYnl0ZWJhc2UudjEuTWFza2luZ1JlYXNvbhrOAgoNUG9zdGdyZXNFcnJvchIQCghzZXZlcml0eRgBIAEoCRIMCgRjb2RlGAIgASgJEg8KB21lc3NhZ2UYAyABKAkSDgoGZGV0YWlsGAQgASgJEgwKBGhpbnQYBSABKAkSEAoIcG9zaXRpb24YBiABKAUSGQoRaW50ZXJuYWxfcG9zaXRpb24YByABKAUSFgoOaW50ZXJuYWxfcXVlcnkYCCABKAkSDQoFd2hlcmUYCSABKAkSEwoLc2NoZW1hX25hbWUYCiABKAkSEgoKdGFibGVfbmFtZRgLIAEoCRITCgtjb2x1bW5fbmFtZRgMIAEoCRIWCg5kYXRhX3R5cGVfbmFtZRgNIAEoCRIXCg9jb25zdHJhaW50X25hbWUYDiABKAkSDAoEZmlsZRgPIAEoCRIMCgRsaW5lGBAgASgFEg8KB3JvdXRpbmUYESABKAkaPAoLU3ludGF4RXJyb3ISLQoOc3RhcnRfcG9zaXRpb24YASABKAsyFS5ieXRlYmFzZS52MS5Qb3NpdGlvbhrEAQoQUGVybWlzc2lvbkRlbmllZBIRCglyZXNvdXJjZXMYASADKAkSSwoMY29tbWFuZF90eXBlGAIgASgOMjUuYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQuUGVybWlzc2lvbkRlbmllZC5Db21tYW5kVHlwZSJQCgtDb21tYW5kVHlwZRIcChhDT01NQU5EX1RZUEVfVU5TUEVDSUZJRUQQABIHCgNEREwQARIHCgNETUwQAhIRCg1OT05fUkVBRF9PTkxZEAMatwEKB01lc3NhZ2USNQoFbGV2ZWwYASABKA4yJi5ieXRlYmFzZS52MS5RdWVyeVJlc3VsdC5NZXNzYWdlLkxldmVsEg8KB2NvbnRlbnQYAiABKAkiZAoFTGV2ZWwSFQoRTEVWRUxfVU5TUEVDSUZJRUQQABIICgRJTkZPEAESCwoHV0FSTklORxACEgkKBURFQlVHEAMSBwoDTE9HEAQSCgoGTk9USUNFEAUSDQoJRVhDRVBUSU9OEAZCEAoOZGV0YWlsZWRfZXJyb3IivQEKDU1hc2tpbmdSZWFzb24SGAoQc2VtYW50aWNfdHlwZV9pZBgBIAEoCRIbChNzZW1hbnRpY190eXBlX3RpdGxlGAIgASgJEhcKD21hc2tpbmdfcnVsZV9pZBgDIAEoCRIRCglhbGdvcml0aG0YBCABKAkSDwoHY29udGV4dBgFIAEoCRIcChRjbGFzc2lmaWNhdGlvbl9sZXZlbBgGIAEoCRIaChJzZW1hbnRpY190eXBlX2ljb24YByABKAkiMQoIUXVlcnlSb3cSJQoGdmFsdWVzGAEgAygLMhUuYnl0ZWJhc2UudjEuUm93VmFsdWUijAUKCFJvd1ZhbHVlEjAKCm51bGxfdmFsdWUYASABKA4yGi5nb29nbGUucHJvdG9idWYuTnVsbFZhbHVlSAASFAoKYm9vbF92YWx1ZRgCIAEoCEgAEhUKC2J5dGVzX3ZhbHVlGAMgASgMSAASFgoMZG91YmxlX3ZhbHVlGAQgASgBSAASFQoLZmxvYXRfdmFsdWUYBSABKAJIABIVCgtpbnQzMl92YWx1ZRgGIAEoBUgAEhUKC2ludDY0X3ZhbHVlGAcgASgDSAASFgoMc3RyaW5nX3ZhbHVlGAggASgJSAASFgoMdWludDMyX3ZhbHVlGAkgASgNSAASFgoMdWludDY0X3ZhbHVlGAogASgESAASLQoLdmFsdWVfdmFsdWUYCyABKAsyFi5nb29nbGUucHJvdG9idWYuVmFsdWVIABI6Cg90aW1lc3RhbXBfdmFsdWUYDCABKAsyHy5ieXRlYmFzZS52MS5Sb3dWYWx1ZS5UaW1lc3RhbXBIABI/ChJ0aW1lc3RhbXBfdHpfdmFsdWUYDSABKAsyIS5ieXRlYmFzZS52MS5Sb3dWYWx1ZS5UaW1lc3RhbXBUWkgAGlMKCVRpbWVzdGFtcBI0ChBnb29nbGVfdGltZXN0YW1wGAEgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIQCghhY2N1cmFjeRgCIAEoBRpzCgtUaW1lc3RhbXBUWhI0ChBnb29nbGVfdGltZXN0YW1wGAEgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIMCgR6b25lGAIgASgJEg4KBm9mZnNldBgDIAEoBRIQCghhY2N1cmFjeRgEIAEoBUIGCgRraW5kIoMDCgZBZHZpY2USKQoGc3RhdHVzGAEgASgOMhkuYnl0ZWJhc2UudjEuQWR2aWNlLkxldmVsEgwKBGNvZGUYAiABKAUSDQoFdGl0bGUYAyABKAkSDwoHY29udGVudBgEIAEoCRItCg5zdGFydF9wb3NpdGlvbhgFIAEoCzIVLmJ5dGViYXNlLnYxLlBvc2l0aW9uEisKDGVuZF9wb3NpdGlvbhgGIAEoCzIVLmJ5dGViYXNlLnYxLlBvc2l0aW9uEi8KCXJ1bGVfdHlwZRgHIAEoDjIcLmJ5dGViYXNlLnYxLkFkdmljZS5SdWxlVHlwZSJKCgVMZXZlbBIcChhBRFZJQ0VfTEVWRUxfVU5TUEVDSUZJRUQQABILCgdTVUNDRVNTEAESCwoHV0FSTklORxACEgkKBUVSUk9SEAMiRwoIUnVsZVR5cGUSGQoVUlVMRV9UWVBFX1VOU1BFQ0lGSUVEEAASEAoMUEFSU0VSX0JBU0VEEAESDgoKQUlfUE9XRVJFRBACIuIBCg1FeHBvcnRSZXF1ZXN0EisKBG5hbWUYASABKAlCHeBBAvpBFwoVYnl0ZWJhc2UuY29tL0RhdGFiYXNlEhEKCXN0YXRlbWVudBgCIAEoCRINCgVsaW1pdBgDIAEoBRIpCgZmb3JtYXQYBCABKA4yGS5ieXRlYmFzZS52MS5FeHBvcnRGb3JtYXQSDQoFYWRtaW4YBSABKAgSEAoIcGFzc3dvcmQYBiABKAkSFgoOZGF0YV9zb3VyY2VfaWQYByABKAkSEwoGc2NoZW1hGAggASgJSACIAQFCCQoHX3NjaGVtYSIhCg5FeHBvcnRSZXNwb25zZRIPCgdjb250ZW50GAEgASgMIrQBChNEaWZmTWV0YWRhdGFSZXF1ZXN0EjsKD3NvdXJjZV9tZXRhZGF0YRgBIAEoCzIdLmJ5dGViYXNlLnYxLkRhdGFiYXNlTWV0YWRhdGFCA+BBAhI7Cg90YXJnZXRfbWV0YWRhdGEYAiABKAsyHS5ieXRlYmFzZS52MS5EYXRhYmFzZU1ldGFkYXRhQgPgQQISIwoGZW5naW5lGAMgASgOMhMuYnl0ZWJhc2UudjEuRW5naW5lIiQKFERpZmZNZXRhZGF0YVJlc3BvbnNlEgwKBGRpZmYYASABKAkiVAobU2VhcmNoUXVlcnlIaXN0b3JpZXNSZXF1ZXN0EhEKCXBhZ2Vfc2l6ZRgBIAEoBRISCgpwYWdlX3Rva2VuGAIgASgJEg4KBmZpbHRlchgDIAEoCSJwChxTZWFyY2hRdWVyeUhpc3Rvcmllc1Jlc3BvbnNlEjcKD3F1ZXJ5X2hpc3RvcmllcxgBIAMoCzIZLmJ5dGViYXNlLnYxLlF1ZXJ5SGlzdG9yeUID4EEDEhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSLUAgoMUXVlcnlIaXN0b3J5EhEKBG5hbWUYASABKAlCA+BBAxIVCghkYXRhYmFzZRgCIAEoCUID4EEDEhQKB2NyZWF0b3IYAyABKAlCA+BBAxI0CgtjcmVhdGVfdGltZRgEIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxIWCglzdGF0ZW1lbnQYBSABKAlCA+BBAxIXCgVlcnJvchgGIAEoCUID4EEDSACIAQESMAoIZHVyYXRpb24YByABKAsyGS5nb29nbGUucHJvdG9idWYuRHVyYXRpb25CA+BBAxIsCgR0eXBlGAggASgOMh4uYnl0ZWJhc2UudjEuUXVlcnlIaXN0b3J5LlR5cGUiMwoEVHlwZRIUChBUWVBFX1VOU1BFQ0lGSUVEEAASCQoFUVVFUlkQARIKCgZFWFBPUlQQAkIICgZfZXJyb3IiewoTQUlDb21wbGV0aW9uUmVxdWVzdBI6CghtZXNzYWdlcxgBIAMoCzIoLmJ5dGViYXNlLnYxLkFJQ29tcGxldGlvblJlcXVlc3QuTWVzc2FnZRooCgdNZXNzYWdlEgwKBHJvbGUYASABKAkSDwoHY29udGVudBgCIAEoCSKVAgoUQUlDb21wbGV0aW9uUmVzcG9uc2USPwoKY2FuZGlkYXRlcxgBIAMoCzIrLmJ5dGViYXNlLnYxLkFJQ29tcGxldGlvblJlc3BvbnNlLkNhbmRpZGF0ZRq7AQoJQ2FuZGlkYXRlEkQKB2NvbnRlbnQYASABKAsyMy5ieXRlYmFzZS52MS5BSUNvbXBsZXRpb25SZXNwb25zZS5DYW5kaWRhdGUuQ29udGVudBpoCgdDb250ZW50EkcKBXBhcnRzGAEgAygLMjguYnl0ZWJhc2UudjEuQUlDb21wbGV0aW9uUmVzcG9uc2UuQ2FuZGlkYXRlLkNvbnRlbnQuUGFydBoUCgRQYXJ0EgwKBHRleHQYASABKAkyxwcKClNRTFNlcnZpY2USjwEKBVF1ZXJ5EhkuYnl0ZWJhc2UudjEuUXVlcnlSZXF1ZXN0GhouYnl0ZWJhc2UudjEuUXVlcnlSZXNwb25zZSJPiuowEGJiLmRhdGFiYXNlcy5nZXSQ6jABmOowAYLT5JMCLToBKiIoL3YxL3tuYW1lPWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qfTpxdWVyeRKJAQoMQWRtaW5FeGVjdXRlEiAuYnl0ZWJhc2UudjEuQWRtaW5FeGVjdXRlUmVxdWVzdBohLmJ5dGViYXNlLnYxLkFkbWluRXhlY3V0ZVJlc3BvbnNlIjCK6jAMYmIuc3FsLmFkbWlukOowAZjqMAGC0+STAhISEC92MTphZG1pbkV4ZWN1dGUoATABEpUBChRTZWFyY2hRdWVyeUhpc3RvcmllcxIoLmJ5dGViYXNlLnYxLlNlYXJjaFF1ZXJ5SGlzdG9yaWVzUmVxdWVzdBopLmJ5dGViYXNlLnYxLlNlYXJjaFF1ZXJ5SGlzdG9yaWVzUmVzcG9uc2UiKJDqMAKC0+STAh46ASoiGS92MS9xdWVyeUhpc3RvcmllczpzZWFyY2gShAIKBkV4cG9ydBIaLmJ5dGViYXNlLnYxLkV4cG9ydFJlcXVlc3QaGy5ieXRlYmFzZS52MS5FeHBvcnRSZXNwb25zZSLAAYrqMBBiYi5kYXRhYmFzZXMuZ2V0kOowAZjqMAGC0+STAp0BOgEqWjE6ASoiLC92MS97bmFtZT1wcm9qZWN0cy8qL3BsYW5zLyovcm9sbG91dH06ZXhwb3J0Wjo6ASoiNS92MS97bmFtZT1wcm9qZWN0cy8qL3BsYW5zLyovcm9sbG91dC9zdGFnZXMvKn06ZXhwb3J0IikvdjEve25hbWU9aW5zdGFuY2VzLyovZGF0YWJhc2VzLyp9OmV4cG9ydBKBAQoMRGlmZk1ldGFkYXRhEiAuYnl0ZWJhc2UudjEuRGlmZk1ldGFkYXRhUmVxdWVzdBohLmJ5dGViYXNlLnYxLkRpZmZNZXRhZGF0YVJlc3BvbnNlIiyA6jABgtPkkwIiOgEqIh0vdjEvc2NoZW1hRGVzaWduOmRpZmZNZXRhZGF0YRJ4CgxBSUNvbXBsZXRpb24SIC5ieXRlYmFzZS52MS5BSUNvbXBsZXRpb25SZXF1ZXN0GiEuYnl0ZWJhc2UudjEuQUlDb21wbGV0aW9uUmVzcG9uc2UiI5DqMAKC0+STAhk6ASoiFC92MS9zcWwvYWlDb21wbGV0aW9uQqUBCg9jb20uYnl0ZWJhc2UudjFCD1NxbFNlcnZpY2VQcm90b1ABWjRnaXRodWIuY29tL2J5dGViYXNlL2J5dGViYXNlL2JhY2tlbmQvZ2VuZXJhdGVkLWdvL3YxogIDQlhYqgILQnl0ZWJhc2UuVjHKAgtCeXRlYmFzZVxWMeICF0J5dGViYXNlXFYxXEdQQk1ldGFkYXRh6gIMQnl0ZWJhc2U6OlYxYgZwcm90bzM", [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_service]);+ fileDesc("ChR2MS9zcWxfc2VydmljZS5wcm90bxILYnl0ZWJhc2UudjEiqgEKE0FkbWluRXhlY3V0ZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vRGF0YWJhc2USEQoJc3RhdGVtZW50GAIgASgJEg0KBWxpbWl0GAMgASgFEhMKBnNjaGVtYRgEIAEoCUgAiAEBEhYKCWNvbnRhaW5lchgFIAEoCUgBiAEBQgkKB19zY2hlbWFCDAoKX2NvbnRhaW5lciJBChRBZG1pbkV4ZWN1dGVSZXNwb25zZRIpCgdyZXN1bHRzGAEgAygLMhguYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQigQIKDFF1ZXJ5UmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9EYXRhYmFzZRIRCglzdGF0ZW1lbnQYAiABKAkSDQoFbGltaXQYAyABKAUSGwoOZGF0YV9zb3VyY2VfaWQYBCABKAlCA+BBAhIPCgdleHBsYWluGAUgASgIEhMKBnNjaGVtYRgGIAEoCUgAiAEBEi4KDHF1ZXJ5X29wdGlvbhgHIAEoCzIYLmJ5dGViYXNlLnYxLlF1ZXJ5T3B0aW9uEhYKCWNvbnRhaW5lchgIIAEoCUgBiAEBQgkKB19zY2hlbWFCDAoKX2NvbnRhaW5lciI6Cg1RdWVyeVJlc3BvbnNlEikKB3Jlc3VsdHMYASADKAsyGC5ieXRlYmFzZS52MS5RdWVyeVJlc3VsdCL5AgoLUXVlcnlPcHRpb24SSgoVcmVkaXNfcnVuX2NvbW1hbmRzX29uGAEgASgOMisuYnl0ZWJhc2UudjEuUXVlcnlPcHRpb24uUmVkaXNSdW5Db21tYW5kc09uEkkKFG1zc3FsX2V4cGxhaW5fZm9ybWF0GAIgASgOMisuYnl0ZWJhc2UudjEuUXVlcnlPcHRpb24uTVNTUUxFeHBsYWluRm9ybWF0IlsKElJlZGlzUnVuQ29tbWFuZHNPbhIlCiFSRURJU19SVU5fQ09NTUFORFNfT05fVU5TUEVDSUZJRUQQABIPCgtTSU5HTEVfTk9ERRABEg0KCUFMTF9OT0RFUxACInYKEk1TU1FMRXhwbGFpbkZvcm1hdBIkCiBNU1NRTF9FWFBMQUlOX0ZPUk1BVF9VTlNQRUNJRklFRBAAEhwKGE1TU1FMX0VYUExBSU5fRk9STUFUX0FMTBABEhwKGE1TU1FMX0VYUExBSU5fRk9STUFUX1hNTBACIpgKCgtRdWVyeVJlc3VsdBIUCgxjb2x1bW5fbmFtZXMYASADKAkSGQoRY29sdW1uX3R5cGVfbmFtZXMYAiADKAkSIwoEcm93cxgDIAMoCzIVLmJ5dGViYXNlLnYxLlF1ZXJ5Um93EhIKCnJvd3NfY291bnQYBCABKAMSDQoFZXJyb3IYBSABKAkSKgoHbGF0ZW5jeRgGIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbhIRCglzdGF0ZW1lbnQYByABKAkSQAoOcG9zdGdyZXNfZXJyb3IYCCABKAsyJi5ieXRlYmFzZS52MS5RdWVyeVJlc3VsdC5Qb3N0Z3Jlc0Vycm9ySAASPAoMc3ludGF4X2Vycm9yGAkgASgLMiQuYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQuU3ludGF4RXJyb3JIABJAChFwZXJtaXNzaW9uX2RlbmllZBgKIAEoCzIjLmJ5dGViYXNlLnYxLlBlcm1pc3Npb25EZW5pZWREZXRhaWxIABI+Cg1jb21tYW5kX2Vycm9yGA0gASgLMiUuYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQuQ29tbWFuZEVycm9ySAASMgoIbWVzc2FnZXMYCyADKAsyIC5ieXRlYmFzZS52MS5RdWVyeVJlc3VsdC5NZXNzYWdlEioKBm1hc2tlZBgMIAMoCzIaLmJ5dGViYXNlLnYxLk1hc2tpbmdSZWFzb24azgIKDVBvc3RncmVzRXJyb3ISEAoIc2V2ZXJpdHkYASABKAkSDAoEY29kZRgCIAEoCRIPCgdtZXNzYWdlGAMgASgJEg4KBmRldGFpbBgEIAEoCRIMCgRoaW50GAUgASgJEhAKCHBvc2l0aW9uGAYgASgFEhkKEWludGVybmFsX3Bvc2l0aW9uGAcgASgFEhYKDmludGVybmFsX3F1ZXJ5GAggASgJEg0KBXdoZXJlGAkgASgJEhMKC3NjaGVtYV9uYW1lGAogASgJEhIKCnRhYmxlX25hbWUYCyABKAkSEwoLY29sdW1uX25hbWUYDCABKAkSFgoOZGF0YV90eXBlX25hbWUYDSABKAkSFwoPY29uc3RyYWludF9uYW1lGA4gASgJEgwKBGZpbGUYDyABKAkSDAoEbGluZRgQIAEoBRIPCgdyb3V0aW5lGBEgASgJGjwKC1N5bnRheEVycm9yEi0KDnN0YXJ0X3Bvc2l0aW9uGAEgASgLMhUuYnl0ZWJhc2UudjEuUG9zaXRpb24akwEKDENvbW1hbmRFcnJvchJACgxjb21tYW5kX3R5cGUYASABKA4yKi5ieXRlYmFzZS52MS5RdWVyeVJlc3VsdC5Db21tYW5kRXJyb3IuVHlwZSJBCgRUeXBlEhQKEFRZUEVfVU5TUEVDSUZJRUQQABIHCgNEREwQARIHCgNETUwQAhIRCg1OT05fUkVBRF9PTkxZEAMatwEKB01lc3NhZ2USNQoFbGV2ZWwYASABKA4yJi5ieXRlYmFzZS52MS5RdWVyeVJlc3VsdC5NZXNzYWdlLkxldmVsEg8KB2NvbnRlbnQYAiABKAkiZAoFTGV2ZWwSFQoRTEVWRUxfVU5TUEVDSUZJRUQQABIICgRJTkZPEAESCwoHV0FSTklORxACEgkKBURFQlVHEAMSBwoDTE9HEAQSCgoGTk9USUNFEAUSDQoJRVhDRVBUSU9OEAZCEAoOZGV0YWlsZWRfZXJyb3IivQEKDU1hc2tpbmdSZWFzb24SGAoQc2VtYW50aWNfdHlwZV9pZBgBIAEoCRIbChNzZW1hbnRpY190eXBlX3RpdGxlGAIgASgJEhcKD21hc2tpbmdfcnVsZV9pZBgDIAEoCRIRCglhbGdvcml0aG0YBCABKAkSDwoHY29udGV4dBgFIAEoCRIcChRjbGFzc2lmaWNhdGlvbl9sZXZlbBgGIAEoCRIaChJzZW1hbnRpY190eXBlX2ljb24YByABKAkiMQoIUXVlcnlSb3cSJQoGdmFsdWVzGAEgAygLMhUuYnl0ZWJhc2UudjEuUm93VmFsdWUijAUKCFJvd1ZhbHVlEjAKCm51bGxfdmFsdWUYASABKA4yGi5nb29nbGUucHJvdG9idWYuTnVsbFZhbHVlSAASFAoKYm9vbF92YWx1ZRgCIAEoCEgAEhUKC2J5dGVzX3ZhbHVlGAMgASgMSAASFgoMZG91YmxlX3ZhbHVlGAQgASgBSAASFQoLZmxvYXRfdmFsdWUYBSABKAJIABIVCgtpbnQzMl92YWx1ZRgGIAEoBUgAEhUKC2ludDY0X3ZhbHVlGAcgASgDSAASFgoMc3RyaW5nX3ZhbHVlGAggASgJSAASFgoMdWludDMyX3ZhbHVlGAkgASgNSAASFgoMdWludDY0X3ZhbHVlGAogASgESAASLQoLdmFsdWVfdmFsdWUYCyABKAsyFi5nb29nbGUucHJvdG9idWYuVmFsdWVIABI6Cg90aW1lc3RhbXBfdmFsdWUYDCABKAsyHy5ieXRlYmFzZS52MS5Sb3dWYWx1ZS5UaW1lc3RhbXBIABI/ChJ0aW1lc3RhbXBfdHpfdmFsdWUYDSABKAsyIS5ieXRlYmFzZS52MS5Sb3dWYWx1ZS5UaW1lc3RhbXBUWkgAGlMKCVRpbWVzdGFtcBI0ChBnb29nbGVfdGltZXN0YW1wGAEgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIQCghhY2N1cmFjeRgCIAEoBRpzCgtUaW1lc3RhbXBUWhI0ChBnb29nbGVfdGltZXN0YW1wGAEgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIMCgR6b25lGAIgASgJEg4KBm9mZnNldBgDIAEoBRIQCghhY2N1cmFjeRgEIAEoBUIGCgRraW5kIoMDCgZBZHZpY2USKQoGc3RhdHVzGAEgASgOMhkuYnl0ZWJhc2UudjEuQWR2aWNlLkxldmVsEgwKBGNvZGUYAiABKAUSDQoFdGl0bGUYAyABKAkSDwoHY29udGVudBgEIAEoCRItCg5zdGFydF9wb3NpdGlvbhgFIAEoCzIVLmJ5dGViYXNlLnYxLlBvc2l0aW9uEisKDGVuZF9wb3NpdGlvbhgGIAEoCzIVLmJ5dGViYXNlLnYxLlBvc2l0aW9uEi8KCXJ1bGVfdHlwZRgHIAEoDjIcLmJ5dGViYXNlLnYxLkFkdmljZS5SdWxlVHlwZSJKCgVMZXZlbBIcChhBRFZJQ0VfTEVWRUxfVU5TUEVDSUZJRUQQABILCgdTVUNDRVNTEAESCwoHV0FSTklORxACEgkKBUVSUk9SEAMiRwoIUnVsZVR5cGUSGQoVUlVMRV9UWVBFX1VOU1BFQ0lGSUVEEAASEAoMUEFSU0VSX0JBU0VEEAESDgoKQUlfUE9XRVJFRBACIuIBCg1FeHBvcnRSZXF1ZXN0EisKBG5hbWUYASABKAlCHeBBAvpBFwoVYnl0ZWJhc2UuY29tL0RhdGFiYXNlEhEKCXN0YXRlbWVudBgCIAEoCRINCgVsaW1pdBgDIAEoBRIpCgZmb3JtYXQYBCABKA4yGS5ieXRlYmFzZS52MS5FeHBvcnRGb3JtYXQSDQoFYWRtaW4YBSABKAgSEAoIcGFzc3dvcmQYBiABKAkSFgoOZGF0YV9zb3VyY2VfaWQYByABKAkSEwoGc2NoZW1hGAggASgJSACIAQFCCQoHX3NjaGVtYSIhCg5FeHBvcnRSZXNwb25zZRIPCgdjb250ZW50GAEgASgMIrQBChNEaWZmTWV0YWRhdGFSZXF1ZXN0EjsKD3NvdXJjZV9tZXRhZGF0YRgBIAEoCzIdLmJ5dGViYXNlLnYxLkRhdGFiYXNlTWV0YWRhdGFCA+BBAhI7Cg90YXJnZXRfbWV0YWRhdGEYAiABKAsyHS5ieXRlYmFzZS52MS5EYXRhYmFzZU1ldGFkYXRhQgPgQQISIwoGZW5naW5lGAMgASgOMhMuYnl0ZWJhc2UudjEuRW5naW5lIiQKFERpZmZNZXRhZGF0YVJlc3BvbnNlEgwKBGRpZmYYASABKAkiVAobU2VhcmNoUXVlcnlIaXN0b3JpZXNSZXF1ZXN0EhEKCXBhZ2Vfc2l6ZRgBIAEoBRISCgpwYWdlX3Rva2VuGAIgASgJEg4KBmZpbHRlchgDIAEoCSJwChxTZWFyY2hRdWVyeUhpc3Rvcmllc1Jlc3BvbnNlEjcKD3F1ZXJ5X2hpc3RvcmllcxgBIAMoCzIZLmJ5dGViYXNlLnYxLlF1ZXJ5SGlzdG9yeUID4EEDEhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSLUAgoMUXVlcnlIaXN0b3J5EhEKBG5hbWUYASABKAlCA+BBAxIVCghkYXRhYmFzZRgCIAEoCUID4EEDEhQKB2NyZWF0b3IYAyABKAlCA+BBAxI0CgtjcmVhdGVfdGltZRgEIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxIWCglzdGF0ZW1lbnQYBSABKAlCA+BBAxIXCgVlcnJvchgGIAEoCUID4EEDSACIAQESMAoIZHVyYXRpb24YByABKAsyGS5nb29nbGUucHJvdG9idWYuRHVyYXRpb25CA+BBAxIsCgR0eXBlGAggASgOMh4uYnl0ZWJhc2UudjEuUXVlcnlIaXN0b3J5LlR5cGUiMwoEVHlwZRIUChBUWVBFX1VOU1BFQ0lGSUVEEAASCQoFUVVFUlkQARIKCgZFWFBPUlQQAkIICgZfZXJyb3IiewoTQUlDb21wbGV0aW9uUmVxdWVzdBI6CghtZXNzYWdlcxgBIAMoCzIoLmJ5dGViYXNlLnYxLkFJQ29tcGxldGlvblJlcXVlc3QuTWVzc2FnZRooCgdNZXNzYWdlEgwKBHJvbGUYASABKAkSDwoHY29udGVudBgCIAEoCSKVAgoUQUlDb21wbGV0aW9uUmVzcG9uc2USPwoKY2FuZGlkYXRlcxgBIAMoCzIrLmJ5dGViYXNlLnYxLkFJQ29tcGxldGlvblJlc3BvbnNlLkNhbmRpZGF0ZRq7AQoJQ2FuZGlkYXRlEkQKB2NvbnRlbnQYASABKAsyMy5ieXRlYmFzZS52MS5BSUNvbXBsZXRpb25SZXNwb25zZS5DYW5kaWRhdGUuQ29udGVudBpoCgdDb250ZW50EkcKBXBhcnRzGAEgAygLMjguYnl0ZWJhc2UudjEuQUlDb21wbGV0aW9uUmVzcG9uc2UuQ2FuZGlkYXRlLkNvbnRlbnQuUGFydBoUCgRQYXJ0EgwKBHRleHQYASABKAkyxwcKClNRTFNlcnZpY2USjwEKBVF1ZXJ5EhkuYnl0ZWJhc2UudjEuUXVlcnlSZXF1ZXN0GhouYnl0ZWJhc2UudjEuUXVlcnlSZXNwb25zZSJPiuowEGJiLmRhdGFiYXNlcy5nZXSQ6jABmOowAYLT5JMCLToBKiIoL3YxL3tuYW1lPWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qfTpxdWVyeRKJAQoMQWRtaW5FeGVjdXRlEiAuYnl0ZWJhc2UudjEuQWRtaW5FeGVjdXRlUmVxdWVzdBohLmJ5dGViYXNlLnYxLkFkbWluRXhlY3V0ZVJlc3BvbnNlIjCK6jAMYmIuc3FsLmFkbWlukOowAZjqMAGC0+STAhISEC92MTphZG1pbkV4ZWN1dGUoATABEpUBChRTZWFyY2hRdWVyeUhpc3RvcmllcxIoLmJ5dGViYXNlLnYxLlNlYXJjaFF1ZXJ5SGlzdG9yaWVzUmVxdWVzdBopLmJ5dGViYXNlLnYxLlNlYXJjaFF1ZXJ5SGlzdG9yaWVzUmVzcG9uc2UiKJDqMAKC0+STAh46ASoiGS92MS9xdWVyeUhpc3RvcmllczpzZWFyY2gShAIKBkV4cG9ydBIaLmJ5dGViYXNlLnYxLkV4cG9ydFJlcXVlc3QaGy5ieXRlYmFzZS52MS5FeHBvcnRSZXNwb25zZSLAAYrqMBBiYi5kYXRhYmFzZXMuZ2V0kOowAZjqMAGC0+STAp0BOgEqWjE6ASoiLC92MS97bmFtZT1wcm9qZWN0cy8qL3BsYW5zLyovcm9sbG91dH06ZXhwb3J0Wjo6ASoiNS92MS97bmFtZT1wcm9qZWN0cy8qL3BsYW5zLyovcm9sbG91dC9zdGFnZXMvKn06ZXhwb3J0IikvdjEve25hbWU9aW5zdGFuY2VzLyovZGF0YWJhc2VzLyp9OmV4cG9ydBKBAQoMRGlmZk1ldGFkYXRhEiAuYnl0ZWJhc2UudjEuRGlmZk1ldGFkYXRhUmVxdWVzdBohLmJ5dGViYXNlLnYxLkRpZmZNZXRhZGF0YVJlc3BvbnNlIiyA6jABgtPkkwIiOgEqIh0vdjEvc2NoZW1hRGVzaWduOmRpZmZNZXRhZGF0YRJ4CgxBSUNvbXBsZXRpb24SIC5ieXRlYmFzZS52MS5BSUNvbXBsZXRpb25SZXF1ZXN0GiEuYnl0ZWJhc2UudjEuQUlDb21wbGV0aW9uUmVzcG9uc2UiI5DqMAKC0+STAhk6ASoiFC92MS9zcWwvYWlDb21wbGV0aW9uQqUBCg9jb20uYnl0ZWJhc2UudjFCD1NxbFNlcnZpY2VQcm90b1ABWjRnaXRodWIuY29tL2J5dGViYXNlL2J5dGViYXNlL2JhY2tlbmQvZ2VuZXJhdGVkLWdvL3YxogIDQlhYqgILQnl0ZWJhc2UuVjHKAgtCeXRlYmFzZVxWMeICF0J5dGViYXNlXFYxXEdQQk1ldGFkYXRh6gIMQnl0ZWJhc2U6OlYxYgZwcm90bzM", [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_service]);/*** Describes the message bytebase.v1.AdminExecuteRequest.@@ -98,23 +98,23 @@ export const QueryResult_SyntaxErrorSchema = /*@__PURE__*/messageDesc(file_v1_sql_service, 5, 1);/**- * Describes the message bytebase.v1.QueryResult.PermissionDenied.- * Use `create(QueryResult_PermissionDeniedSchema)` to create a new message.+ * Describes the message bytebase.v1.QueryResult.CommandError.+ * Use `create(QueryResult_CommandErrorSchema)` to create a new message.*/-export const QueryResult_PermissionDeniedSchema = /*@__PURE__*/+export const QueryResult_CommandErrorSchema = /*@__PURE__*/messageDesc(file_v1_sql_service, 5, 2);/**- * Describes the enum bytebase.v1.QueryResult.PermissionDenied.CommandType.+ * Describes the enum bytebase.v1.QueryResult.CommandError.Type.*/-export const QueryResult_PermissionDenied_CommandTypeSchema = /*@__PURE__*/+export const QueryResult_CommandError_TypeSchema = /*@__PURE__*/enumDesc(file_v1_sql_service, 5, 2, 0);/**- * @generated from enum bytebase.v1.QueryResult.PermissionDenied.CommandType+ * @generated from enum bytebase.v1.QueryResult.CommandError.Type*/-export const QueryResult_PermissionDenied_CommandType = /*@__PURE__*/- tsEnum(QueryResult_PermissionDenied_CommandTypeSchema);+export const QueryResult_CommandError_Type = /*@__PURE__*/+ tsEnum(QueryResult_CommandError_TypeSchema);/*** Describes the message bytebase.v1.QueryResult.Message.diff --git a/frontend/src/utils/issue/cel.ts b/frontend/src/utils/issue/cel.tsindex 2c1c553bf8..0456f9c2a6 100644--- a/frontend/src/utils/issue/cel.ts+++ b/frontend/src/utils/issue/cel.ts@@ -5,6 +5,7 @@ import type { SimpleExpr } from "@/plugins/cel";import { isRawStringExpr, resolveCELExpr } from "@/plugins/cel";import {databaseNamePrefix,+ environmentNamePrefix,getEnvironmentId,instanceNamePrefix,} from "@/store/modules/v1/common";@@ -59,7 +60,8 @@ type DatabaseResourceCondition =export interface ConditionExpression {databaseResources?: DatabaseResource[];expiredTime?: string;- exportFormat?: string;+ // environment full name list in environments/{name} format.+ environments?: string[];}const getDatabaseResourceName = (databaseResource: DatabaseResource) => {@@ -240,7 +242,7 @@ export const stringifyConditionExpression = ({`${CEL_ATTRIBUTE_REQUEST_TIME} < timestamp("${dayjs(expirationTimestampInMS).toISOString()}")`);}- if (environments && environments.length > 0) {+ if (environments !== undefined) {expression.push(`${CEL_ATTRIBUTE_RESOURCE_ENVIRONMENT_ID} in [${environments.map((env) => `"${getEnvironmentId(env)}"`)}]`);@@ -399,6 +401,17 @@ export const convertFromExpr = (expr: Expr): ConditionExpression => {const [property, values] = expr.args;if (typeof property === "string" && Array.isArray(values)) {switch (property) {+ case CEL_ATTRIBUTE_RESOURCE_ENVIRONMENT_ID: {+ if (conditionExpression.environments === undefined) {+ conditionExpression.environments = [];+ }+ for (const value of values) {+ conditionExpression.environments?.push(+ `${environmentNamePrefix}${value as string}`+ );+ }+ break;+ }case CEL_ATTRIBUTE_RESOURCE_DATABASE: {for (const value of values) {const databaseResource: DatabaseResource = {diff --git a/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/TreeNode/DatabaseNode.vue b/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/TreeNode/DatabaseNode.vueindex cc1a5634ca..b71f19add6 100644--- a/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/TreeNode/DatabaseNode.vue+++ b/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/TreeNode/DatabaseNode.vue@@ -27,22 +27,23 @@<RequestQueryButtonv-if="showRequestQueryButton":text="true"- :database-resources="[- {- databaseFullName: database.name,- },- ]"+ :permission-denied-detail="create(PermissionDeniedDetailSchema, {+ resources: [database.name],+ requiredPermissions: ['bb.sql.select']+ })":size="'tiny'"/></div></template><script setup lang="ts">+import { create } from "@bufbuild/protobuf";import { NCheckbox, NTooltip } from "naive-ui";import { computed } from "vue";import { RichDatabaseName } from "@/components/v2";import { useSQLEditorTabStore } from "@/store";import type { SQLEditorTreeNode as TreeNode } from "@/types";+import { PermissionDeniedDetailSchema } from "@/types/proto-es/v1/common_pb";import { isDatabaseV1Queryable } from "@/utils";import RequestQueryButton from "../../../EditorCommon/ResultView/RequestQueryButton.vue";diff --git a/frontend/src/views/sql-editor/EditorCommon/ResultView/RequestQueryButton.vue b/frontend/src/views/sql-editor/EditorCommon/ResultView/RequestQueryButton.vueindex eb0a708136..05a1067b70 100644--- a/frontend/src/views/sql-editor/EditorCommon/ResultView/RequestQueryButton.vue+++ b/frontend/src/views/sql-editor/EditorCommon/ResultView/RequestQueryButton.vue@@ -23,9 +23,10 @@<GrantRequestPanelv-if="showPanel":project-name="project.name"- :database-resources="databaseResources"+ :database-resources="missingResources":placement="'right'":role="PresetRoleType.SQL_EDITOR_USER"+ :required-permissions="permissionDeniedDetail.requiredPermissions"@close="showPanel = false"/></div>@@ -37,16 +38,18 @@ import { NButton } from "naive-ui";import { computed, ref } from "vue";import { FeatureBadge } from "@/components/FeatureGuard";import GrantRequestPanel from "@/components/GrantRequestPanel";+import { parseStringToResource } from "@/components/GrantRequestPanel/DatabaseResourceForm/common";import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";import { hasFeature, useProjectV1Store, useSQLEditorStore } from "@/store";import { type DatabaseResource, PresetRoleType } from "@/types";+import { type PermissionDeniedDetail } from "@/types/proto-es/v1/common_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";-withDefaults(+const props = withDefaults(defineProps<{- databaseResources: DatabaseResource[];size?: "tiny" | "medium";text: boolean;+ permissionDeniedDetail: PermissionDeniedDetail;}>(),{size: "medium",@@ -60,6 +63,17 @@ const hasRequestRoleFeature = computed(() =>hasFeature(PlanFeature.FEATURE_REQUEST_ROLE_WORKFLOW));+const missingResources = computed((): DatabaseResource[] => {+ const resources: DatabaseResource[] = [];+ for (const resourceString of props.permissionDeniedDetail.resources) {+ const resource = parseStringToResource(resourceString);+ if (resource) {+ resources.push(resource);+ }+ }+ return resources;+});+const project = computed(() =>projectStore.getProjectByName(editorStore.project));diff --git a/frontend/src/views/sql-editor/EditorCommon/ResultView/ResultViewV1.vue b/frontend/src/views/sql-editor/EditorCommon/ResultView/ResultViewV1.vueindex fec8315e4b..84e88dc50b 100644--- a/frontend/src/views/sql-editor/EditorCommon/ResultView/ResultViewV1.vue+++ b/frontend/src/views/sql-editor/EditorCommon/ResultView/ResultViewV1.vue@@ -15,9 +15,9 @@><template #suffix><RequestQueryButton- v-if="isPermissionDenied"+ v-if="!!permissionDeniedError":text="false"- :database-resources="missingResources"+ :permission-denied-detail="permissionDeniedError"/></template></ErrorView>@@ -68,9 +68,9 @@><template #suffix><RequestQueryButton- v-if="isPermissionDenied"+ v-if="!!permissionDeniedError":text="false"- :database-resources="missingResources"+ :permission-denied-detail="permissionDeniedError"/></template></ErrorView>@@ -129,9 +129,9 @@><template #suffix><RequestQueryButton- v-if="isPermissionDenied"+ v-if="!!permissionDeniedError":text="false"- :database-resources="missingResources"+ :permission-denied-detail="permissionDeniedError"/><SyncDatabaseButtonv-else-if="resultSet.error.includes('resource not found')"@@ -187,19 +187,17 @@ import type {ExportOption,} from "@/components/DataExportButton.vue";import DataExportButton from "@/components/DataExportButton.vue";-import { parseStringToResource } from "@/components/GrantRequestPanel/DatabaseResourceForm/common";import { Drawer } from "@/components/v2";import { useSQLEditorTabStore, useSQLStore } from "@/store";import {usePolicyV1Store,useQueryDataPolicy,} from "@/store/modules/v1/policy";-import type {- DatabaseResource,- SQLEditorQueryParams,- SQLResultSetV1,-} from "@/types";-import { ExportFormat } from "@/types/proto-es/v1/common_pb";+import type { SQLEditorQueryParams, SQLResultSetV1 } from "@/types";+import {+ ExportFormat,+ type PermissionDeniedDetail,+} from "@/types/proto-es/v1/common_pb";import type { Database } from "@/types/proto-es/v1/database_service_pb";import { ExportRequestSchema } from "@/types/proto-es/v1/sql_service_pb";import { extractDatabaseResourceName } from "@/utils";@@ -247,32 +245,16 @@ const detail: SQLResultViewContext["detail"] = ref(undefined);provideBinaryFormatContext(computed(() => props.contextId));-const isPermissionDenied = computed(() => {- for (const result of props.resultSet?.results ?? []) {- if (result.detailedError.case === "permissionDenied") {- return true;- }- }- return false;-});--const missingResources = computed((): DatabaseResource[] => {- const resources: DatabaseResource[] = [];- for (const result of props.resultSet?.results ?? []) {- if (- result.detailedError.case === "permissionDenied" &&- result.detailedError.value?.resources.length > 0- ) {- for (const resourceString of result.detailedError.value.resources) {- const resource = parseStringToResource(resourceString);- if (resource) {- resources.push(resource);- }+const permissionDeniedError = computed(+ (): PermissionDeniedDetail | undefined => {+ for (const result of props.resultSet?.results ?? []) {+ if (result.detailedError.case === "permissionDenied") {+ return result.detailedError.value;}}+ return undefined;}- return resources;-});+);const viewMode = computed((): ViewMode => {const { resultSet } = props;diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yamlindex 7bec46fdf6..a3b72e5d88 100644--- a/proto/gen/grpc-doc/openapi.yaml+++ b/proto/gen/grpc-doc/openapi.yaml@@ -23223,17 +23223,6 @@ components:If false,1. when read-only data source is configured, users're force to use the read-only data source2. otherwise fallback to use the admin data source.- disallowDdl:- type: boolean- title: disallow_ddl- description: |-- ================- Deprecate following fields.- Disallow running DDL statements in the SQL editor.- disallowDml:- type: boolean- title: disallow_dml- description: Disallow running DML statements in the SQL editor.title: QueryDataPolicyadditionalProperties: falsedescription: QueryDataPolicy is the policy configuration for querying data in the SQL Editor.@@ -23435,10 +23424,17 @@ components:title: maskeddescription: Masking reasons for each column (empty for non-masked columns).- oneOf:+ - properties:+ commandError:+ title: command_error+ $ref: '#/components/schemas/bytebase.v1.QueryResult.CommandError'+ title: command_error+ required:+ - commandError- properties:permissionDenied:title: permission_denied- $ref: '#/components/schemas/bytebase.v1.QueryResult.PermissionDenied'+ $ref: '#/components/schemas/bytebase.v1.PermissionDeniedDetail'title: permission_deniedrequired:- permissionDenied@@ -23458,6 +23454,26 @@ components:- syntaxErrortitle: QueryResultadditionalProperties: false+ bytebase.v1.QueryResult.CommandError:+ type: object+ properties:+ commandType:+ title: command_type+ description: Disallowed command_type.+ $ref: '#/components/schemas/bytebase.v1.QueryResult.CommandError.Type'+ title: CommandError+ additionalProperties: false+ description: |-+ Permission denied with resource information or disallowed command_type.+ Either resources or command_type is available.+ bytebase.v1.QueryResult.CommandError.Type:+ type: string+ title: Type+ enum:+ - TYPE_UNSPECIFIED+ - DDL+ - DML+ - NON_READ_ONLYbytebase.v1.QueryResult.Message:type: objectproperties:@@ -23480,38 +23496,6 @@ components:- LOG- NOTICE- EXCEPTION- bytebase.v1.QueryResult.PermissionDenied:- type: object- properties:- resources:- type: array- items:- type: string- title: resources- description: |-- 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}- commandType:- title: command_type- description: Disallowed command_type.- $ref: '#/components/schemas/bytebase.v1.QueryResult.PermissionDenied.CommandType'- title: PermissionDenied- additionalProperties: false- description: |-- Permission denied with resource information or disallowed command_type.- Either resources or command_type is available.- bytebase.v1.QueryResult.PermissionDenied.CommandType:- type: string- title: CommandType- enum:- - COMMAND_TYPE_UNSPECIFIED- - DDL- - DML- - NON_READ_ONLYbytebase.v1.QueryResult.PostgresError:type: objectproperties:diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.mdindex 26df180db7..b9a0de644f 100644--- a/proto/gen/grpc-doc/v1/README.md+++ b/proto/gen/grpc-doc/v1/README.md@@ -423,8 +423,8 @@- [QueryRequest](#bytebase-v1-QueryRequest)- [QueryResponse](#bytebase-v1-QueryResponse)- [QueryResult](#bytebase-v1-QueryResult)+ - [QueryResult.CommandError](#bytebase-v1-QueryResult-CommandError)- [QueryResult.Message](#bytebase-v1-QueryResult-Message)- - [QueryResult.PermissionDenied](#bytebase-v1-QueryResult-PermissionDenied)- [QueryResult.PostgresError](#bytebase-v1-QueryResult-PostgresError)- [QueryResult.SyntaxError](#bytebase-v1-QueryResult-SyntaxError)- [QueryRow](#bytebase-v1-QueryRow)@@ -439,8 +439,8 @@- [QueryHistory.Type](#bytebase-v1-QueryHistory-Type)- [QueryOption.MSSQLExplainFormat](#bytebase-v1-QueryOption-MSSQLExplainFormat)- [QueryOption.RedisRunCommandsOn](#bytebase-v1-QueryOption-RedisRunCommandsOn)+ - [QueryResult.CommandError.Type](#bytebase-v1-QueryResult-CommandError-Type)- [QueryResult.Message.Level](#bytebase-v1-QueryResult-Message-Level)- - [QueryResult.PermissionDenied.CommandType](#bytebase-v1-QueryResult-PermissionDenied-CommandType)- [SQLService](#bytebase-v1-SQLService)@@ -6643,8 +6643,6 @@ QueryDataPolicy is the policy configuration for querying data in the SQL Editor.| disable_export | [bool](#bool) | | workspace-level policy Disable data export in the SQL editor. || disable_copy_data | [bool](#bool) | | workspace-level policy Disable copying query results in the SQL editor. || allow_admin_data_source | [bool](#bool) | | workspace-level policy Allow using the admin data source to query in the SQL editor. If true, users can select the admin data source or read-only data source If false, 1. when read-only data source is configured, users're force to use the read-only data source 2. otherwise fallback to use the admin data source. |-| disallow_ddl | [bool](#bool) | | ================ Deprecate following fields. Disallow running DDL statements in the SQL editor. |-| disallow_dml | [bool](#bool) | | Disallow running DML statements in the SQL editor. |@@ -7105,7 +7103,8 @@ OrgPolicyService manages organizational policies at various resource levels.| statement | [string](#string) | | The query statement for the result. || postgres_error | [QueryResult.PostgresError](#bytebase-v1-QueryResult-PostgresError) | | || syntax_error | [QueryResult.SyntaxError](#bytebase-v1-QueryResult-SyntaxError) | | |-| permission_denied | [QueryResult.PermissionDenied](#bytebase-v1-QueryResult-PermissionDenied) | | |+| permission_denied | [PermissionDeniedDetail](#bytebase-v1-PermissionDeniedDetail) | | |+| command_error | [QueryResult.CommandError](#bytebase-v1-QueryResult-CommandError) | | || messages | [QueryResult.Message](#bytebase-v1-QueryResult-Message) | repeated | Informational or debug messages returned by the database engine during query execution. Examples include PostgreSQL's RAISE NOTICE, MSSQL's PRINT, or Oracle's DBMS_OUTPUT.PUT_LINE. || masked | [MaskingReason](#bytebase-v1-MaskingReason) | repeated | Masking reasons for each column (empty for non-masked columns). |@@ -7114,33 +7113,32 @@ OrgPolicyService manages organizational policies at various resource levels.-<a name="bytebase-v1-QueryResult-Message"></a>--### QueryResult.Message+<a name="bytebase-v1-QueryResult-CommandError"></a>+### QueryResult.CommandError+Permission denied with resource information or disallowed command_type.+Either resources or command_type is available.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| level | [QueryResult.Message.Level](#bytebase-v1-QueryResult-Message-Level) | | |-| content | [string](#string) | | |+| command_type | [QueryResult.CommandError.Type](#bytebase-v1-QueryResult-CommandError-Type) | | Disallowed command_type. |-<a name="bytebase-v1-QueryResult-PermissionDenied"></a>+<a name="bytebase-v1-QueryResult-Message"></a>++### QueryResult.Message-### QueryResult.PermissionDenied-Permission denied with resource information or disallowed command_type.-Either resources or command_type is available.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| 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. |+| level | [QueryResult.Message.Level](#bytebase-v1-QueryResult-Message-Level) | | |+| content | [string](#string) | | |@@ -7375,6 +7373,20 @@ RuleType indicates the source of the linting rule.+<a name="bytebase-v1-QueryResult-CommandError-Type"></a>++### QueryResult.CommandError.Type+++| Name | Number | Description |+| ---- | ------ | ----------- |+| TYPE_UNSPECIFIED | 0 | |+| DDL | 1 | |+| DML | 2 | |+| NON_READ_ONLY | 3 | |+++<a name="bytebase-v1-QueryResult-Message-Level"></a>### QueryResult.Message.Level@@ -7391,20 +7403,6 @@ RuleType indicates the source of the linting rule.| EXCEPTION | 6 | Exception message indicating error conditions. |--<a name="bytebase-v1-QueryResult-PermissionDenied-CommandType"></a>--### QueryResult.PermissionDenied.CommandType---| Name | Number | Description |-| ---- | ------ | ----------- |-| COMMAND_TYPE_UNSPECIFIED | 0 | |-| DDL | 1 | |-| DML | 2 | |-| NON_READ_ONLY | 3 | |--diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.htmlindex 622d7dcd0c..5aaab31891 100644--- a/proto/gen/grpc-doc/v1/index.html+++ b/proto/gen/grpc-doc/v1/index.html@@ -1793,11 +1793,11 @@</li><li>- <a href="#bytebase.v1.QueryResult.Message"><span class="badge">M</span>QueryResult.Message</a>+ <a href="#bytebase.v1.QueryResult.CommandError"><span class="badge">M</span>QueryResult.CommandError</a></li><li>- <a href="#bytebase.v1.QueryResult.PermissionDenied"><span class="badge">M</span>QueryResult.PermissionDenied</a>+ <a href="#bytebase.v1.QueryResult.Message"><span class="badge">M</span>QueryResult.Message</a></li><li>@@ -1854,11 +1854,11 @@</li><li>- <a href="#bytebase.v1.QueryResult.Message.Level"><span class="badge">E</span>QueryResult.Message.Level</a>+ <a href="#bytebase.v1.QueryResult.CommandError.Type"><span class="badge">E</span>QueryResult.CommandError.Type</a></li><li>- <a href="#bytebase.v1.QueryResult.PermissionDenied.CommandType"><span class="badge">E</span>QueryResult.PermissionDenied.CommandType</a>+ <a href="#bytebase.v1.QueryResult.Message.Level"><span class="badge">E</span>QueryResult.Message.Level</a></li>@@ -18851,22 +18851,6 @@ If false,2. otherwise fallback to use the admin data source. </p></td></tr>- <tr>- <td>disallow_ddl</td>- <td><a href="#bool">bool</a></td>- <td></td>- <td><p>================-Deprecate following fields.-Disallow running DDL statements in the SQL editor. </p></td>- </tr>-- <tr>- <td>disallow_dml</td>- <td><a href="#bool">bool</a></td>- <td></td>- <td><p>Disallow running DML statements in the SQL editor. </p></td>- </tr>-</tbody></table>@@ -20180,7 +20164,14 @@ The types come from the Golang SQL driver. </p></td><tr><td>permission_denied</td>- <td><a href="#bytebase.v1.QueryResult.PermissionDenied">QueryResult.PermissionDenied</a></td>+ <td><a href="#bytebase.v1.PermissionDeniedDetail">PermissionDeniedDetail</a></td>+ <td></td>+ <td><p> </p></td>+ </tr>++ <tr>+ <td>command_error</td>+ <td><a href="#bytebase.v1.QueryResult.CommandError">QueryResult.CommandError</a></td><td></td><td><p> </p></td></tr>@@ -20207,8 +20198,8 @@ Examples include PostgreSQL's RAISE NOTICE, MSSQL's PRINT, or Oracle'- <h3 id="bytebase.v1.QueryResult.Message">QueryResult.Message</h3>- <p></p>+ <h3 id="bytebase.v1.QueryResult.CommandError">QueryResult.CommandError</h3>+ <p>Permission denied with resource information or disallowed command_type.</p><p>Either resources or command_type is available.</p><table class="field-table">@@ -20218,17 +20209,10 @@ Examples include PostgreSQL's RAISE NOTICE, MSSQL's PRINT, or Oracle'<tbody><tr>- <td>level</td>- <td><a href="#bytebase.v1.QueryResult.Message.Level">QueryResult.Message.Level</a></td>- <td></td>- <td><p> </p></td>- </tr>-- <tr>- <td>content</td>- <td><a href="#string">string</a></td>+ <td>command_type</td>+ <td><a href="#bytebase.v1.QueryResult.CommandError.Type">QueryResult.CommandError.Type</a></td><td></td>- <td><p> </p></td>+ <td><p>Disallowed command_type. </p></td></tr></tbody>@@ -20238,8 +20222,8 @@ Examples include PostgreSQL's RAISE NOTICE, MSSQL's PRINT, or Oracle'- <h3 id="bytebase.v1.QueryResult.PermissionDenied">QueryResult.PermissionDenied</h3>- <p>Permission denied with resource information or disallowed command_type.</p><p>Either resources or command_type is available.</p>+ <h3 id="bytebase.v1.QueryResult.Message">QueryResult.Message</h3>+ <p></p><table class="field-table">@@ -20249,22 +20233,17 @@ Examples include PostgreSQL's RAISE NOTICE, MSSQL's PRINT, or Oracle'<tbody><tr>- <td>resources</td>- <td><a href="#string">string</a></td>- <td>repeated</td>- <td><p>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} </p></td>+ <td>level</td>+ <td><a href="#bytebase.v1.QueryResult.Message.Level">QueryResult.Message.Level</a></td>+ <td></td>+ <td><p> </p></td></tr><tr>- <td>command_type</td>- <td><a href="#bytebase.v1.QueryResult.PermissionDenied.CommandType">QueryResult.PermissionDenied.CommandType</a></td>+ <td>content</td>+ <td><a href="#string">string</a></td><td></td>- <td><p>Disallowed command_type. </p></td>+ <td><p> </p></td></tr></tbody>@@ -20898,6 +20877,41 @@ These are custom, flexible checks powered by AI models.</p></td></tbody></table>+ <h3 id="bytebase.v1.QueryResult.CommandError.Type">QueryResult.CommandError.Type</h3>+ <p></p>+ <table class="enum-table">+ <thead>+ <tr><td>Name</td><td>Number</td><td>Description</td></tr>+ </thead>+ <tbody>++ <tr>+ <td>TYPE_UNSPECIFIED</td>+ <td>0</td>+ <td><p></p></td>+ </tr>++ <tr>+ <td>DDL</td>+ <td>1</td>+ <td><p></p></td>+ </tr>++ <tr>+ <td>DML</td>+ <td>2</td>+ <td><p></p></td>+ </tr>++ <tr>+ <td>NON_READ_ONLY</td>+ <td>3</td>+ <td><p></p></td>+ </tr>++ </tbody>+ </table>+<h3 id="bytebase.v1.QueryResult.Message.Level">QueryResult.Message.Level</h3><p></p><table class="enum-table">@@ -20951,41 +20965,6 @@ These are custom, flexible checks powered by AI models.</p></td></tbody></table>- <h3 id="bytebase.v1.QueryResult.PermissionDenied.CommandType">QueryResult.PermissionDenied.CommandType</h3>- <p></p>- <table class="enum-table">- <thead>- <tr><td>Name</td><td>Number</td><td>Description</td></tr>- </thead>- <tbody>-- <tr>- <td>COMMAND_TYPE_UNSPECIFIED</td>- <td>0</td>- <td><p></p></td>- </tr>-- <tr>- <td>DDL</td>- <td>1</td>- <td><p></p></td>- </tr>-- <tr>- <td>DML</td>- <td>2</td>- <td><p></p></td>- </tr>-- <tr>- <td>NON_READ_ONLY</td>- <td>3</td>- <td><p></p></td>- </tr>-- </tbody>- </table>-diff --git a/proto/v1/v1/org_policy_service.proto b/proto/v1/v1/org_policy_service.protoindex 2ee5ab7f0b..4c50c3f162 100644--- a/proto/v1/v1/org_policy_service.proto+++ b/proto/v1/v1/org_policy_service.proto@@ -302,13 +302,6 @@ message QueryDataPolicy {// 1. when read-only data source is configured, users're force to use the read-only data source// 2. otherwise fallback to use the admin data source.bool allow_admin_data_source = 4;-- // ================- // Deprecate following fields.- // Disallow running DDL statements in the SQL editor.- bool disallow_ddl = 7;- // Disallow running DML statements in the SQL editor.- bool disallow_dml = 8;}// MaskingExemptionPolicy is the allowlist of users who can access sensitive data.diff --git a/proto/v1/v1/sql_service.proto b/proto/v1/v1/sql_service.protoindex e1113c33e3..a826531d64 100644--- a/proto/v1/v1/sql_service.proto+++ b/proto/v1/v1/sql_service.proto@@ -205,7 +205,8 @@ message QueryResult {oneof detailed_error {PostgresError postgres_error = 8;SyntaxError syntax_error = 9;- PermissionDenied permission_denied = 10;+ PermissionDeniedDetail permission_denied = 10;+ CommandError command_error = 13;}// refer https://www.postgresql.org/docs/11/protocol-error-fields.html@@ -238,24 +239,16 @@ message QueryResult {// Permission denied with resource information or disallowed command_type.// Either resources or command_type is available.- message PermissionDenied {- // 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}- repeated string resources = 1;-- // Disallowed command_type.- CommandType command_type = 2;-- enum CommandType {- COMMAND_TYPE_UNSPECIFIED = 0;+ message CommandError {+ enum Type {+ TYPE_UNSPECIFIED = 0;DDL = 1;DML = 2;NON_READ_ONLY = 3;}++ // Disallowed command_type.+ Type command_type = 1;}message Message {