Skip to content

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

feat: send access grant name in the query & project setting update (#19333)

ecmadaof1d0e395d5fe
diff --git a/backend/api/mcp/gen/openapi.yaml b/backend/api/mcp/gen/openapi.yaml
index 8c776ee0cb..5f96975c09 100644
--- a/backend/api/mcp/gen/openapi.yaml
+++ b/backend/api/mcp/gen/openapi.yaml
@@ -14344,6 +14344,10 @@ components:
allowRequestRole:
type: boolean
title: allow_request_role
+ allowJustInTimeAccess:
+ type: boolean
+ title: allow_just_in_time_access
+ description: Once enabled, users can request and use the just-in-time access in the SQL Editor.
title: Project
additionalProperties: false
bytebase.v1.Project.ExecutionRetryPolicy:
@@ -14522,6 +14526,14 @@ components:
description: |-
Container is the container name to execute the query against, used for
CosmosDB only.
+ accessGrant:
+ type:
+ - string
+ - "null"
+ title: access_grant
+ description: |-
+ The access grant to apply the query.
+ Format: projects/{project}/accessGrants/{access_grant}
title: QueryRequest
additionalProperties: false
bytebase.v1.QueryResponse:
diff --git a/backend/api/v1/access_grant_service.go b/backend/api/v1/access_grant_service.go
index b7afd9238c..1fcb56de96 100644
--- a/backend/api/v1/access_grant_service.go
+++ b/backend/api/v1/access_grant_service.go
@@ -135,6 +135,10 @@ func (s *AccessGrantService) CreateAccessGrant(ctx context.Context, request *con
if len(ag.Targets) == 0 {
return nil, connect.NewError(connect.CodeInvalidArgument, errors.New("targets is required"))
}
+ if ag.Query == "" {
+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.New("query is required"))
+ }
+
creatorEmail, err := common.GetUserEmail(ag.Creator)
if err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "invalid creator"))
@@ -207,12 +211,22 @@ func (s *AccessGrantService) CreateAccessGrant(ctx context.Context, request *con
// Step 4: Post-create: webhook, approval finding, auto-approve.
project, err := s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &projectID})
if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get project"))
+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get project %v", projectID))
}
if project != nil {
- if _, err := postCreateIssue(ctx, s.store, s.webhookManager, s.licenseService, s.bus, project, creatorEmail, creatorEmail, issue); err != nil {
+ issue, err := postCreateIssue(ctx, s.store, s.webhookManager, s.licenseService, s.bus, project, creatorEmail, creatorEmail, issue)
+ if err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
}
+ if issue.Status == storepb.Issue_DONE {
+ // Refresh the grant if issue is completed.
+ grant, err = s.store.GetAccessGrant(ctx, &store.FindAccessGrantMessage{
+ ID: &grant.ID,
+ })
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get access grant %v", grant.ID))
+ }
+ }
}
return connect.NewResponse(convertToAccessGrant(grant)), nil
@@ -223,13 +237,22 @@ func (s *AccessGrantService) ActivateAccessGrant(ctx context.Context, request *c
if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_JIT); err != nil {
return nil, connect.NewError(connect.CodePermissionDenied, err)
}
- req := request.Msg
- projectID, accessGrantID, err := common.GetProjectIDAccessGrantID(req.Name)
+
+ grant, err := activateAccessGrant(ctx, s.store, request.Msg.Name, false /* do not refresh expire time */)
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get access grant"))
+ }
+
+ return connect.NewResponse(convertToAccessGrant(grant)), nil
+}
+
+func activateAccessGrant(ctx context.Context, stores *store.Store, accessGrantName string, refreshExpireTime bool) (*store.AccessGrantMessage, error) {
+ projectID, accessGrantID, err := common.GetProjectIDAccessGrantID(accessGrantName)
if err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
- grant, err := s.store.GetAccessGrant(ctx, &store.FindAccessGrantMessage{
+ grant, err := stores.GetAccessGrant(ctx, &store.FindAccessGrantMessage{
ID: &accessGrantID,
ProjectID: &projectID,
})
@@ -237,10 +260,7 @@ func (s *AccessGrantService) ActivateAccessGrant(ctx context.Context, request *c
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get access grant"))
}
if grant == nil {
- return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("access grant %q not found", req.Name))
- }
- if grant.Status != storepb.AccessGrant_PENDING {
- return nil, connect.NewError(connect.CodeFailedPrecondition, errors.Errorf("access grant %q is not in PENDING status", req.Name))
+ return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("access grant %q not found", accessGrantName))
}
status := storepb.AccessGrant_ACTIVE
@@ -249,17 +269,17 @@ func (s *AccessGrantService) ActivateAccessGrant(ctx context.Context, request *c
}
// If the grant was created with a TTL, compute expire_time at activation time.
- if grant.Payload != nil && grant.Payload.RequestedDuration != nil {
+ if refreshExpireTime && grant.Payload != nil && grant.Payload.RequestedDuration != nil {
expireTime := time.Now().Add(grant.Payload.RequestedDuration.AsDuration())
update.ExpireTime = &expireTime
}
- updated, err := s.store.UpdateAccessGrant(ctx, accessGrantID, update)
+ updated, err := stores.UpdateAccessGrant(ctx, accessGrantID, update)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to activate access grant"))
}
- return connect.NewResponse(convertToAccessGrant(updated)), nil
+ return updated, nil
}
// RevokeAccessGrant revokes an active access grant.
diff --git a/backend/api/v1/issue_hook.go b/backend/api/v1/issue_hook.go
index d87a9dc197..f422b2475d 100644
--- a/backend/api/v1/issue_hook.go
+++ b/backend/api/v1/issue_hook.go
@@ -6,6 +6,7 @@ import (
"github.com/pkg/errors"
+ "github.com/bytebase/bytebase/backend/common"
"github.com/bytebase/bytebase/backend/common/log"
"github.com/bytebase/bytebase/backend/component/bus"
"github.com/bytebase/bytebase/backend/component/webhook"
@@ -96,11 +97,9 @@ func completeAccessRequestIssue(ctx context.Context, stores *store.Store, userEm
if issue.Payload.AccessGrantId == "" {
return nil, errors.Errorf("invalid access grant id for issue %d", issue.UID)
}
- status := storepb.AccessGrant_ACTIVE
- if _, err := stores.UpdateAccessGrant(ctx, issue.Payload.AccessGrantId, &store.UpdateAccessGrantMessage{
- Status: &status,
- }); err != nil {
- return nil, errors.Wrapf(err, "failed to update access grant status")
+ accessGrantName := common.FormatAccessGrant(issue.ProjectID, issue.Payload.AccessGrantId)
+ if _, err := activateAccessGrant(ctx, stores, accessGrantName, true /* refresh expire time */); err != nil {
+ return nil, errors.Wrapf(err, "failed to activate access grant %v", accessGrantName)
}
case storepb.Issue_GRANT_REQUEST:
if err := utils.UpdateProjectPolicyFromGrantIssue(ctx, stores, issue, issue.Payload.GrantRequest); err != nil {
diff --git a/backend/api/v1/project_service.go b/backend/api/v1/project_service.go
index b5c835f7e5..c327991796 100644
--- a/backend/api/v1/project_service.go
+++ b/backend/api/v1/project_service.go
@@ -342,6 +342,9 @@ func (s *ProjectService) UpdateProject(ctx context.Context, req *connect.Request
case "allow_request_role":
projectSettings.AllowRequestRole = req.Msg.Project.AllowRequestRole
patch.Setting = projectSettings
+ case "allow_just_in_time_access":
+ projectSettings.AllowJustInTimeAccess = req.Msg.Project.AllowJustInTimeAccess
+ patch.Setting = projectSettings
case "labels":
if err := validateLabels(req.Msg.Project.Labels); err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, err)
diff --git a/backend/api/v1/project_service_converter.go b/backend/api/v1/project_service_converter.go
index 2563b988c4..c252527ec8 100644
--- a/backend/api/v1/project_service_converter.go
+++ b/backend/api/v1/project_service_converter.go
@@ -288,6 +288,7 @@ func convertToProject(projectMessage *store.ProjectMessage) *v1pb.Project {
RequireIssueApproval: projectMessage.Setting.RequireIssueApproval,
RequirePlanCheckNoError: projectMessage.Setting.RequirePlanCheckNoError,
AllowRequestRole: projectMessage.Setting.AllowRequestRole,
+ AllowJustInTimeAccess: projectMessage.Setting.AllowJustInTimeAccess,
}
}
@@ -325,6 +326,7 @@ func convertToProjectMessage(resourceID string, project *v1pb.Project) *store.Pr
RequireIssueApproval: project.RequireIssueApproval,
RequirePlanCheckNoError: project.RequirePlanCheckNoError,
AllowRequestRole: project.AllowRequestRole,
+ AllowJustInTimeAccess: project.AllowJustInTimeAccess,
DataClassificationConfigId: project.DataClassificationConfigId,
}
return &store.ProjectMessage{
diff --git a/backend/api/v1/sql_service.go b/backend/api/v1/sql_service.go
index aa47174a25..3c99e933e2 100644
--- a/backend/api/v1/sql_service.go
+++ b/backend/api/v1/sql_service.go
@@ -163,6 +163,79 @@ func (s *SQLService) AdminExecute(ctx context.Context, stream *connect.BidiStrea
}
}
+// Validate and load access grant if provided.
+func (s *SQLService) preCheckAccess(ctx context.Context, request *v1pb.QueryRequest, database *store.DatabaseMessage) *store.AccessGrantMessage {
+ if request.AccessGrant == nil || *request.AccessGrant == "" {
+ return nil
+ }
+
+ accessGrantID := *request.AccessGrant
+ projectID, accessGrantID, err := common.GetProjectIDAccessGrantID(accessGrantID)
+ if err != nil {
+ slog.Warn("invalid access grant id", slog.String("access_grant", accessGrantID), log.BBError(err))
+ return nil
+ }
+ if database.ProjectID != projectID {
+ slog.Warn("project for access and database not match", slog.String("access_grant", accessGrantID), slog.String("access_grant_project", projectID), slog.String("database_project", database.ProjectID))
+ return nil
+ }
+
+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{
+ ResourceID: &projectID,
+ })
+ if err != nil {
+ slog.Warn("failed to find project", slog.String("project_id", projectID), log.BBError(err))
+ return nil
+ }
+ if project == nil {
+ slog.Warn("project not found", slog.String("project_id", projectID))
+ return nil
+ }
+ if !project.Setting.AllowJustInTimeAccess {
+ slog.Warn("JIT is not enabled in the project", slog.String("project_id", projectID))
+ return nil
+ }
+
+ accessGrant, err := s.store.GetAccessGrant(ctx, &store.FindAccessGrantMessage{
+ ID: &accessGrantID,
+ ProjectID: &projectID,
+ })
+ if err != nil {
+ slog.Warn("failed to get access grant", slog.String("access_grant", accessGrantID), log.BBError(err))
+ return nil
+ }
+ if accessGrant == nil {
+ slog.Warn("access grant not found", slog.String("access_grant", accessGrantID))
+ return nil
+ }
+ if accessGrant.Status != storepb.AccessGrant_ACTIVE {
+ slog.Warn("access grant is not active", slog.String("access_grant", accessGrantID), slog.String("status", accessGrant.Status.String()))
+ return nil
+ }
+ if accessGrant.Payload == nil {
+ slog.Warn("invalid access grant payload", slog.String("access_grant", accessGrantID))
+ return nil
+ }
+ if accessGrant.Payload.Query != request.Statement {
+ slog.Warn("statement does not match access grant", slog.String("access_grant", accessGrantID))
+ return nil
+ }
+ if accessGrant.ExpireTime != nil && accessGrant.ExpireTime.Before(time.Now()) {
+ slog.Warn("access grant has expired", slog.String("access_grant", accessGrantID), slog.String("expire_time", accessGrant.ExpireTime.String()))
+ return nil
+ }
+
+ databaseFullName := common.FormatDatabase(database.InstanceID, database.DatabaseName)
+ for _, target := range accessGrant.Payload.Targets {
+ if target == databaseFullName {
+ return accessGrant
+ }
+ }
+
+ slog.Warn("database not found in access grant targets", slog.String("access_grant", accessGrantID), slog.String("database", databaseFullName))
+ return nil
+}
+
func (s *SQLService) Query(ctx context.Context, req *connect.Request[v1pb.QueryRequest]) (*connect.Response[v1pb.QueryResponse], error) {
request := req.Msg
// Prepare related message.
@@ -171,6 +244,8 @@ func (s *SQLService) Query(ctx context.Context, req *connect.Request[v1pb.QueryR
return nil, err
}
+ accessGrant := s.preCheckAccess(ctx, request, database)
+
statement := request.Statement
// In Redshift datashare, Rewrite query used for parser.
if database.Metadata.GetDatashare() {
@@ -223,6 +298,7 @@ func (s *SQLService) Query(ctx context.Context, req *connect.Request[v1pb.QueryR
OperatorEmail: user.Email,
Option: request.QueryOption,
Container: request.GetContainer(),
+ SkipMasking: accessGrant != nil && accessGrant.Payload.Unmask,
MaximumSQLResultSize: queryRestriction.MaximumResultSize,
}
if request.Schema != nil {
@@ -232,6 +308,10 @@ func (s *SQLService) Query(ctx context.Context, req *connect.Request[v1pb.QueryR
queryContext.Timeout = &durationpb.Duration{Seconds: queryRestriction.MaxQueryTimeoutInSeconds}
}
+ var optionalAccessCheck accessCheckFunc
+ if accessGrant == nil {
+ optionalAccessCheck = s.accessCheck
+ }
results, _, duration, queryErr := queryRetryStopOnError(
ctx,
s.store,
@@ -243,7 +323,7 @@ func (s *SQLService) Query(ctx context.Context, req *connect.Request[v1pb.QueryR
statement,
queryContext,
s.licenseService,
- s.accessCheck,
+ optionalAccessCheck,
s.schemaSyncer,
)
slog.Debug("query finished",
@@ -505,7 +585,7 @@ func queryRetry(
}
slog.Debug("optional access check", slog.String("instance", instance.ResourceID), slog.String("database", database.DatabaseName))
}
- if licenseService.IsFeatureEnabledForInstance(v1pb.PlanFeature_FEATURE_DATA_MASKING, instance) == nil {
+ if !queryContext.SkipMasking && licenseService.IsFeatureEnabledForInstance(v1pb.PlanFeature_FEATURE_DATA_MASKING, instance) == nil {
masker := NewQueryResultMasker(stores)
sensitivePredicateColumns, err = masker.ExtractSensitivePredicateColumns(ctx, spans, instance, user)
if err != nil {
@@ -581,7 +661,7 @@ func queryRetry(
if err := replaceBackupTableWithSource(ctx, stores, instance, database, spans); err != nil {
slog.Debug("failed to replace backup table with source", log.BBError(err))
}
- if licenseService.IsFeatureEnabledForInstance(v1pb.PlanFeature_FEATURE_DATA_MASKING, instance) == nil {
+ if !queryContext.SkipMasking && licenseService.IsFeatureEnabledForInstance(v1pb.PlanFeature_FEATURE_DATA_MASKING, instance) == nil {
masker := NewQueryResultMasker(stores)
sensitivePredicateColumns, err = masker.ExtractSensitivePredicateColumns(ctx, spans, instance, user)
if err != nil {
@@ -601,7 +681,7 @@ func queryRetry(
}
}
- if licenseService.IsFeatureEnabledForInstance(v1pb.PlanFeature_FEATURE_DATA_MASKING, instance) == nil && !queryContext.Explain {
+ if !queryContext.SkipMasking && licenseService.IsFeatureEnabledForInstance(v1pb.PlanFeature_FEATURE_DATA_MASKING, instance) == nil && !queryContext.Explain {
slog.Debug("mask query results", slog.String("instance", instance.ResourceID), slog.String("database", database.DatabaseName))
// TODO(zp): Refactor Document Database and RDBMS to use the same masking logic.
if instance.Metadata.GetEngine() == storepb.Engine_COSMOSDB {
diff --git a/backend/generated-go/store/project.pb.go b/backend/generated-go/store/project.pb.go
index d90652b0fc..7879bdac3e 100644
--- a/backend/generated-go/store/project.pb.go
+++ b/backend/generated-go/store/project.pb.go
@@ -119,8 +119,10 @@ type Project struct {
AllowRequestRole bool `protobuf:"varint,17,opt,name=allow_request_role,json=allowRequestRole,proto3" json:"allow_request_role,omitempty"`
// The data classification configuration ID for the project.
DataClassificationConfigId string `protobuf:"bytes,18,opt,name=data_classification_config_id,json=dataClassificationConfigId,proto3" json:"data_classification_config_id,omitempty"`
- unknownFields protoimpl.UnknownFields
- sizeCache protoimpl.SizeCache
+ // Once enabled, users can request and use the just-in-time access in the SQL Editor.
+ AllowJustInTimeAccess bool `protobuf:"varint,19,opt,name=allow_just_in_time_access,json=allowJustInTimeAccess,proto3" json:"allow_just_in_time_access,omitempty"`
+ unknownFields protoimpl.UnknownFields
+ sizeCache protoimpl.SizeCache
}
func (x *Project) Reset() {
@@ -251,6 +253,13 @@ func (x *Project) GetDataClassificationConfigId() string {
return ""
}
+func (x *Project) GetAllowJustInTimeAccess() bool {
+ if x != nil {
+ return x.AllowJustInTimeAccess
+ }
+ return false
+}
+
// ExecutionRetryPolicy defines retry behavior for failed task executions.
type Project_ExecutionRetryPolicy struct {
state protoimpl.MessageState `protogen:"open.v1"`
@@ -305,7 +314,7 @@ const file_store_project_proto_rawDesc = "" +
"\x05Label\x12\x14\n" +
"\x05value\x18\x01 \x01(\tR\x05value\x12\x14\n" +
"\x05color\x18\x02 \x01(\tR\x05color\x12\x14\n" +
- "\x05group\x18\x03 \x01(\tR\x05group\"\xab\a\n" +
+ "\x05group\x18\x03 \x01(\tR\x05group\"\xe5\a\n" +
"\aProject\x128\n" +
"\fissue_labels\x18\x01 \x03(\v2\x15.bytebase.store.LabelR\vissueLabels\x12,\n" +
"\x12force_issue_labels\x18\x02 \x01(\bR\x10forceIssueLabels\x12.\n" +
@@ -321,7 +330,8 @@ const file_store_project_proto_rawDesc = "" +
"\x16require_issue_approval\x18\x0f \x01(\bR\x14requireIssueApproval\x12<\n" +
"\x1brequire_plan_check_no_error\x18\x10 \x01(\bR\x17requirePlanCheckNoError\x12,\n" +
"\x12allow_request_role\x18\x11 \x01(\bR\x10allowRequestRole\x12A\n" +
- "\x1ddata_classification_config_id\x18\x12 \x01(\tR\x1adataClassificationConfigId\x1a?\n" +
+ "\x1ddata_classification_config_id\x18\x12 \x01(\tR\x1adataClassificationConfigId\x128\n" +
+ "\x19allow_just_in_time_access\x18\x13 \x01(\bR\x15allowJustInTimeAccess\x1a?\n" +
"\x14ExecutionRetryPolicy\x12'\n" +
"\x0fmaximum_retries\x18\x01 \x01(\x05R\x0emaximumRetries\x1a9\n" +
"\vLabelsEntry\x12\x10\n" +
diff --git a/backend/generated-go/store/project_equal.pb.go b/backend/generated-go/store/project_equal.pb.go
index 504a0e75e9..3a9e5a2794 100644
--- a/backend/generated-go/store/project_equal.pb.go
+++ b/backend/generated-go/store/project_equal.pb.go
@@ -98,5 +98,8 @@ func (x *Project) Equal(y *Project) bool {
if x.DataClassificationConfigId != y.DataClassificationConfigId {
return false
}
+ if x.AllowJustInTimeAccess != y.AllowJustInTimeAccess {
+ return false
+ }
return true
}
diff --git a/backend/generated-go/v1/project_service.pb.go b/backend/generated-go/v1/project_service.pb.go
index 070f4898a0..c37659ff5e 100644
--- a/backend/generated-go/v1/project_service.pb.go
+++ b/backend/generated-go/v1/project_service.pb.go
@@ -945,8 +945,10 @@ type Project struct {
// Whether to require plan check to have no error before rollout.
RequirePlanCheckNoError bool `protobuf:"varint,21,opt,name=require_plan_check_no_error,json=requirePlanCheckNoError,proto3" json:"require_plan_check_no_error,omitempty"`
AllowRequestRole bool `protobuf:"varint,22,opt,name=allow_request_role,json=allowRequestRole,proto3" json:"allow_request_role,omitempty"`
- unknownFields protoimpl.UnknownFields
- sizeCache protoimpl.SizeCache
+ // Once enabled, users can request and use the just-in-time access in the SQL Editor.
+ AllowJustInTimeAccess bool `protobuf:"varint,23,opt,name=allow_just_in_time_access,json=allowJustInTimeAccess,proto3" json:"allow_just_in_time_access,omitempty"`
+ unknownFields protoimpl.UnknownFields
+ sizeCache protoimpl.SizeCache
}
func (x *Project) Reset() {
@@ -1105,6 +1107,13 @@ func (x *Project) GetAllowRequestRole() bool {
return false
}
+func (x *Project) GetAllowJustInTimeAccess() bool {
+ if x != nil {
+ return x.AllowJustInTimeAccess
+ }
+ return false
+}
+
type AddWebhookRequest struct {
state protoimpl.MessageState `protogen:"open.v1"`
// The name of the project to add the webhook to.
@@ -1609,7 +1618,7 @@ const file_v1_project_service_proto_rawDesc = "" +
"\x05Label\x12\x14\n" +
"\x05value\x18\x01 \x01(\tR\x05value\x12\x14\n" +
"\x05color\x18\x02 \x01(\tR\x05color\x12\x14\n" +
- "\x05group\x18\x03 \x01(\tR\x05group\"\xe1\b\n" +
+ "\x05group\x18\x03 \x01(\tR\x05group\"\x9b\t\n" +
"\aProject\x12\x12\n" +
"\x04name\x18\x01 \x01(\tR\x04name\x12(\n" +
"\x05state\x18\x02 \x01(\x0e2\x12.bytebase.v1.StateR\x05state\x12\x1e\n" +
@@ -1629,7 +1638,8 @@ const file_v1_project_service_proto_rawDesc = "" +
"\x12enforce_sql_review\x18\x13 \x01(\bR\x10enforceSqlReview\x124\n" +
"\x16require_issue_approval\x18\x14 \x01(\bR\x14requireIssueApproval\x12<\n" +
"\x1brequire_plan_check_no_error\x18\x15 \x01(\bR\x17requirePlanCheckNoError\x12,\n" +
- "\x12allow_request_role\x18\x16 \x01(\bR\x10allowRequestRole\x1a?\n" +
+ "\x12allow_request_role\x18\x16 \x01(\bR\x10allowRequestRole\x128\n" +
+ "\x19allow_just_in_time_access\x18\x17 \x01(\bR\x15allowJustInTimeAccess\x1a?\n" +
"\x14ExecutionRetryPolicy\x12'\n" +
"\x0fmaximum_retries\x18\x01 \x01(\x05R\x0emaximumRetries\x1a9\n" +
"\vLabelsEntry\x12\x10\n" +
diff --git a/backend/generated-go/v1/project_service_equal.pb.go b/backend/generated-go/v1/project_service_equal.pb.go
index 7a5ea6e4ab..2d135deb58 100644
--- a/backend/generated-go/v1/project_service_equal.pb.go
+++ b/backend/generated-go/v1/project_service_equal.pb.go
@@ -350,6 +350,9 @@ func (x *Project) Equal(y *Project) bool {
if x.AllowRequestRole != y.AllowRequestRole {
return false
}
+ if x.AllowJustInTimeAccess != y.AllowJustInTimeAccess {
+ return false
+ }
return true
}
diff --git a/backend/generated-go/v1/sql_service.pb.go b/backend/generated-go/v1/sql_service.pb.go
index c92fc7e453..15b1783ec5 100644
--- a/backend/generated-go/v1/sql_service.pb.go
+++ b/backend/generated-go/v1/sql_service.pb.go
@@ -564,7 +564,10 @@ type QueryRequest struct {
QueryOption *QueryOption `protobuf:"bytes,7,opt,name=query_option,json=queryOption,proto3" json:"query_option,omitempty"`
// Container is the container name to execute the query against, used for
// CosmosDB only.
- Container *string `protobuf:"bytes,8,opt,name=container,proto3,oneof" json:"container,omitempty"`
+ Container *string `protobuf:"bytes,8,opt,name=container,proto3,oneof" json:"container,omitempty"`
+ // The access grant to apply the query.
+ // Format: projects/{project}/accessGrants/{access_grant}
+ AccessGrant *string `protobuf:"bytes,9,opt,name=access_grant,json=accessGrant,proto3,oneof" json:"access_grant,omitempty"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
@@ -655,6 +658,13 @@ func (x *QueryRequest) GetContainer() string {
return ""
}
+func (x *QueryRequest) GetAccessGrant() string {
+ if x != nil && x.AccessGrant != nil {
+ return *x.AccessGrant
+ }
+ return ""
+}
+
type QueryResponse struct {
state protoimpl.MessageState `protogen:"open.v1"`
// The query results.
@@ -2708,7 +2718,7 @@ const file_v1_sql_service_proto_rawDesc = "" +
"\n" +
"_container\"J\n" +
"\x14AdminExecuteResponse\x122\n" +
- "\aresults\x18\x01 \x03(\v2\x18.bytebase.v1.QueryResultR\aresults\"\xd0\x02\n" +
+ "\aresults\x18\x01 \x03(\v2\x18.bytebase.v1.QueryResultR\aresults\"\x89\x03\n" +
"\fQueryRequest\x121\n" +
"\x04name\x18\x01 \x01(\tB\x1d\xe0A\x02\xfaA\x17\n" +
"\x15bytebase.com/DatabaseR\x04name\x12\x1c\n" +
@@ -2718,10 +2728,12 @@ const file_v1_sql_service_proto_rawDesc = "" +
"\aexplain\x18\x05 \x01(\bR\aexplain\x12\x1b\n" +
"\x06schema\x18\x06 \x01(\tH\x00R\x06schema\x88\x01\x01\x12;\n" +
"\fquery_option\x18\a \x01(\v2\x18.bytebase.v1.QueryOptionR\vqueryOption\x12!\n" +
- "\tcontainer\x18\b \x01(\tH\x01R\tcontainer\x88\x01\x01B\t\n" +
+ "\tcontainer\x18\b \x01(\tH\x01R\tcontainer\x88\x01\x01\x12&\n" +
+ "\faccess_grant\x18\t \x01(\tH\x02R\vaccessGrant\x88\x01\x01B\t\n" +
"\a_schemaB\f\n" +
"\n" +
- "_container\"C\n" +
+ "_containerB\x0f\n" +
+ "\r_access_grant\"C\n" +
"\rQueryResponse\x122\n" +
"\aresults\x18\x01 \x03(\v2\x18.bytebase.v1.QueryResultR\aresults\"\xa1\x03\n" +
"\vQueryOption\x12^\n" +
diff --git a/backend/generated-go/v1/sql_service_equal.pb.go b/backend/generated-go/v1/sql_service_equal.pb.go
index 4935bbd657..4003471d38 100644
--- a/backend/generated-go/v1/sql_service_equal.pb.go
+++ b/backend/generated-go/v1/sql_service_equal.pb.go
@@ -83,6 +83,9 @@ func (x *QueryRequest) Equal(y *QueryRequest) bool {
if p, q := x.Container, y.Container; (p == nil && q != nil) || (p != nil && (q == nil || *p != *q)) {
return false
}
+ if p, q := x.AccessGrant, y.AccessGrant; (p == nil && q != nil) || (p != nil && (q == nil || *p != *q)) {
+ return false
+ }
return true
}
diff --git a/backend/plugin/db/driver.go b/backend/plugin/db/driver.go
index 7a43726735..e8e65b1326 100644
--- a/backend/plugin/db/driver.go
+++ b/backend/plugin/db/driver.go
@@ -125,6 +125,8 @@ type QueryContext struct {
Explain bool
OperatorEmail string
Option *v1pb.QueryOption
+ // SkipMasking skips data masking when the query is authorized by an access grant with unmask=true.
+ SkipMasking bool
// The maximum number of bytes for sql results in response body.
MaximumSQLResultSize int64
Timeout *durationpb.Duration
diff --git a/backend/store/predefined_roles.go b/backend/store/predefined_roles.go
index c54803c594..df494ab9eb 100644
--- a/backend/store/predefined_roles.go
+++ b/backend/store/predefined_roles.go
@@ -301,6 +301,7 @@ var PredefinedRoles = []*RoleMessage{
Name: "Workspace member",
Predefined: true,
Permissions: permissionSet(
+ permission.AccessGrantsCreate,
permission.InstanceRolesGet,
permission.InstanceRolesList,
permission.PoliciesGet,
@@ -425,8 +426,6 @@ var PredefinedRoles = []*RoleMessage{
Name: "Project developer",
Predefined: true,
Permissions: permissionSet(
- permission.AccessGrantsCreate,
- permission.AccessGrantsGet,
permission.AuditLogsSearch,
permission.ChangelogsGet,
permission.ChangelogsList,
@@ -546,7 +545,6 @@ var PredefinedRoles = []*RoleMessage{
Name: "Project viewer",
Predefined: true,
Permissions: permissionSet(
- permission.AccessGrantsCreate,
permission.DatabaseCatalogsGet,
permission.DatabaseGroupsGet,
permission.DatabaseGroupsList,
diff --git a/frontend/src/composables/useExecuteSQL.ts b/frontend/src/composables/useExecuteSQL.ts
index 9d8912585f..8b76ae408f 100644
--- a/frontend/src/composables/useExecuteSQL.ts
+++ b/frontend/src/composables/useExecuteSQL.ts
@@ -150,7 +150,7 @@ const useExecuteSQL = () => {
return;
}
- const databaseQueryContexts = tab.databaseQueryContexts!;
+ const databaseQueryContexts = tab.databaseQueryContexts ?? new Map();
const batchQueryDatabaseSet = new Set<string /* database name */>([
params.connection.database,
]);
@@ -303,6 +303,7 @@ const useExecuteSQL = () => {
schema: context.params.connection.schema,
container: context.params.connection.table,
queryOption: queryOption,
+ accessGrant: context.params.accessGrant,
}),
abortController.signal
);
diff --git a/frontend/src/types/proto-es/v1/project_service_pb.d.ts b/frontend/src/types/proto-es/v1/project_service_pb.d.ts
index b76b4a0605..514cbb9488 100644
--- a/frontend/src/types/proto-es/v1/project_service_pb.d.ts
+++ b/frontend/src/types/proto-es/v1/project_service_pb.d.ts
@@ -574,6 +574,13 @@ export declare type Project = Message<"bytebase.v1.Project"> & {
* @generated from field: bool allow_request_role = 22;
*/
allowRequestRole: boolean;
+
+ /**
+ * Once enabled, users can request and use the just-in-time access in the SQL Editor.
+ *
+ * @generated from field: bool allow_just_in_time_access = 23;
+ */
+ allowJustInTimeAccess: boolean;
};
/**
diff --git a/frontend/src/types/proto-es/v1/project_service_pb.js b/frontend/src/types/proto-es/v1/project_service_pb.js
index cd7c5470ef..406b4cb846 100644
--- a/frontend/src/types/proto-es/v1/project_service_pb.js
+++ b/frontend/src/types/proto-es/v1/project_service_pb.js
@@ -17,7 +17,7 @@ import { file_v1_iam_policy } from "./iam_policy_pb";
* Describes the file v1/project_service.proto.
*/
export const file_v1_project_service = /*@__PURE__*/
- fileDesc("Chh2MS9wcm9qZWN0X3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIj8KEUdldFByb2plY3RSZXF1ZXN0EioKBG5hbWUYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QiRgoXQmF0Y2hHZXRQcm9qZWN0c1JlcXVlc3QSKwoFbmFtZXMYASADKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QiQgoYQmF0Y2hHZXRQcm9qZWN0c1Jlc3BvbnNlEiYKCHByb2plY3RzGAEgAygLMhQuYnl0ZWJhc2UudjEuUHJvamVjdCJ0ChNMaXN0UHJvamVjdHNSZXF1ZXN0EhEKCXBhZ2Vfc2l6ZRgBIAEoBRISCgpwYWdlX3Rva2VuGAIgASgJEhQKDHNob3dfZGVsZXRlZBgDIAEoCBIOCgZmaWx0ZXIYBCABKAkSEAoIb3JkZXJfYnkYBSABKAkiVwoUTGlzdFByb2plY3RzUmVzcG9uc2USJgoIcHJvamVjdHMYASADKAsyFC5ieXRlYmFzZS52MS5Qcm9qZWN0EhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSJ2ChVTZWFyY2hQcm9qZWN0c1JlcXVlc3QSFAoMc2hvd19kZWxldGVkGAEgASgIEg4KBmZpbHRlchgCIAEoCRIRCglwYWdlX3NpemUYAyABKAUSEgoKcGFnZV90b2tlbhgEIAEoCRIQCghvcmRlcl9ieRgFIAEoCSJZChZTZWFyY2hQcm9qZWN0c1Jlc3BvbnNlEiYKCHByb2plY3RzGAEgAygLMhQuYnl0ZWJhc2UudjEuUHJvamVjdBIXCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAkiVgoUQ3JlYXRlUHJvamVjdFJlcXVlc3QSKgoHcHJvamVjdBgBIAEoCzIULmJ5dGViYXNlLnYxLlByb2plY3RCA+BBAhISCgpwcm9qZWN0X2lkGAIgASgJIooBChRVcGRhdGVQcm9qZWN0UmVxdWVzdBIqCgdwcm9qZWN0GAEgASgLMhQuYnl0ZWJhc2UudjEuUHJvamVjdEID4EECEi8KC3VwZGF0ZV9tYXNrGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFzaxIVCg1hbGxvd19taXNzaW5nGAMgASgIIlEKFERlbGV0ZVByb2plY3RSZXF1ZXN0EioKBG5hbWUYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QSDQoFcHVyZ2UYAiABKAgiRAoWVW5kZWxldGVQcm9qZWN0UmVxdWVzdBIqCgRuYW1lGAEgASgJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9Qcm9qZWN0IlgKGkJhdGNoRGVsZXRlUHJvamVjdHNSZXF1ZXN0EisKBW5hbWVzGAEgAygJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9Qcm9qZWN0Eg0KBXB1cmdlGAIgASgIIjQKBUxhYmVsEg0KBXZhbHVlGAEgASgJEg0KBWNvbG9yGAIgASgJEg0KBWdyb3VwGAMgASgJIpAGCgdQcm9qZWN0EgwKBG5hbWUYASABKAkSIQoFc3RhdGUYAiABKA4yEi5ieXRlYmFzZS52MS5TdGF0ZRIXCgV0aXRsZRgDIAEoCUIIukgFcgMYyAESJgoId2ViaG9va3MYBCADKAsyFC5ieXRlYmFzZS52MS5XZWJob29rEiUKHWRhdGFfY2xhc3NpZmljYXRpb25fY29uZmlnX2lkGAUgASgJEigKDGlzc3VlX2xhYmVscxgGIAMoCzISLmJ5dGViYXNlLnYxLkxhYmVsEhoKEmZvcmNlX2lzc3VlX2xhYmVscxgHIAEoCBIbChNlbmZvcmNlX2lzc3VlX3RpdGxlGAogASgIEiUKHXBvc3RncmVzX2RhdGFiYXNlX3RlbmFudF9tb2RlGA0gASgIEhsKE2FsbG93X3NlbGZfYXBwcm92YWwYDiABKAgSSQoWZXhlY3V0aW9uX3JldHJ5X3BvbGljeRgPIAEoCzIpLmJ5dGViYXNlLnYxLlByb2plY3QuRXhlY3V0aW9uUmV0cnlQb2xpY3kSGAoQY2lfc2FtcGxpbmdfc2l6ZRgQIAEoBRIiChpwYXJhbGxlbF90YXNrc19wZXJfcm9sbG91dBgRIAEoBRIwCgZsYWJlbHMYEiADKAsyIC5ieXRlYmFzZS52MS5Qcm9qZWN0LkxhYmVsc0VudHJ5EhoKEmVuZm9yY2Vfc3FsX3JldmlldxgTIAEoCBIeChZyZXF1aXJlX2lzc3VlX2FwcHJvdmFsGBQgASgIEiMKG3JlcXVpcmVfcGxhbl9jaGVja19ub19lcnJvchgVIAEoCBIaChJhbGxvd19yZXF1ZXN0X3JvbGUYFiABKAgaLwoURXhlY3V0aW9uUmV0cnlQb2xpY3kSFwoPbWF4aW11bV9yZXRyaWVzGAEgASgFGi0KC0xhYmVsc0VudHJ5EgsKA2tleRgBIAEoCRINCgV2YWx1ZRgCIAEoCToCOAE6LepBKgoUYnl0ZWJhc2UuY29tL1Byb2plY3QSEnByb2plY3RzL3twcm9qZWN0fSJuChFBZGRXZWJob29rUmVxdWVzdBItCgdwcm9qZWN0GAEgASgJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9Qcm9qZWN0EioKB3dlYmhvb2sYAiABKAsyFC5ieXRlYmFzZS52MS5XZWJob29rQgPgQQIiigEKFFVwZGF0ZVdlYmhvb2tSZXF1ZXN0EioKB3dlYmhvb2sYASABKAsyFC5ieXRlYmFzZS52MS5XZWJob29rQgPgQQISLwoLdXBkYXRlX21hc2sYAiABKAsyGi5nb29nbGUucHJvdG9idWYuRmllbGRNYXNrEhUKDWFsbG93X21pc3NpbmcYAyABKAgiQgoUUmVtb3ZlV2ViaG9va1JlcXVlc3QSKgoHd2ViaG9vaxgBIAEoCzIULmJ5dGViYXNlLnYxLldlYmhvb2tCA+BBAiJvChJUZXN0V2ViaG9va1JlcXVlc3QSLQoHcHJvamVjdBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBIqCgd3ZWJob29rGAIgASgLMhQuYnl0ZWJhc2UudjEuV2ViaG9va0ID4EECIiQKE1Rlc3RXZWJob29rUmVzcG9uc2USDQoFZXJyb3IYASABKAkigQIKB1dlYmhvb2sSDAoEbmFtZRgBIAEoCRIrCgR0eXBlGAIgASgOMhguYnl0ZWJhc2UudjEuV2ViaG9va1R5cGVCA+BBAhISCgV0aXRsZRgDIAEoCUID4EECEhAKA3VybBgEIAEoCUID4EECEhYKDmRpcmVjdF9tZXNzYWdlGAYgASgIEjsKEm5vdGlmaWNhdGlvbl90eXBlcxgFIAMoDjIaLmJ5dGViYXNlLnYxLkFjdGl2aXR5LlR5cGVCA+BBBjpA6kE9ChRieXRlYmFzZS5jb20vV2ViaG9vaxIlcHJvamVjdHMve3Byb2plY3R9L3dlYmhvb2tzL3t3ZWJob29rfSKcAQoIQWN0aXZpdHkijwEKBFR5cGUSFAoQVFlQRV9VTlNQRUNJRklFRBAAEhEKDUlTU1VFX0NSRUFURUQQChIcChhJU1NVRV9BUFBST1ZBTF9SRVFVRVNURUQQCxITCg9JU1NVRV9TRU5UX0JBQ0sQDBITCg9QSVBFTElORV9GQUlMRUQQDRIWChJQSVBFTElORV9DT01QTEVURUQQDjKCEgoOUHJvamVjdFNlcnZpY2USfwoKR2V0UHJvamVjdBIeLmJ5dGViYXNlLnYxLkdldFByb2plY3RSZXF1ZXN0GhQuYnl0ZWJhc2UudjEuUHJvamVjdCI72kEEbmFtZYrqMA9iYi5wcm9qZWN0cy5nZXSQ6jABgtPkkwIXEhUvdjEve25hbWU9cHJvamVjdHMvKn0SlQEKEEJhdGNoR2V0UHJvamVjdHMSJC5ieXRlYmFzZS52MS5CYXRjaEdldFByb2plY3RzUmVxdWVzdBolLmJ5dGViYXNlLnYxLkJhdGNoR2V0UHJvamVjdHNSZXNwb25zZSI0iuowD2JiLnByb2plY3RzLmdldJDqMAGC0+STAhcSFS92MS9wcm9qZWN0czpiYXRjaEdldBKEAQoMTGlzdFByb2plY3RzEiAuYnl0ZWJhc2UudjEuTGlzdFByb2plY3RzUmVxdWVzdBohLmJ5dGViYXNlLnYxLkxpc3RQcm9qZWN0c1Jlc3BvbnNlIi/aQQCK6jAQYmIucHJvamVjdHMubGlzdJDqMAGC0+STAg4SDC92MS9wcm9qZWN0cxKAAQoOU2VhcmNoUHJvamVjdHMSIi5ieXRlYmFzZS52MS5TZWFyY2hQcm9qZWN0c1JlcXVlc3QaIy5ieXRlYmFzZS52MS5TZWFyY2hQcm9qZWN0c1Jlc3BvbnNlIiXaQQCQ6jACgtPkkwIYOgEqIhMvdjEvcHJvamVjdHM6c2VhcmNoEoQBCg1DcmVhdGVQcm9qZWN0EiEuYnl0ZWJhc2UudjEuQ3JlYXRlUHJvamVjdFJlcXVlc3QaFC5ieXRlYmFzZS52MS5Qcm9qZWN0IjraQQCK6jASYmIucHJvamVjdHMuY3JlYXRlkOowAYLT5JMCFzoHcHJvamVjdCIML3YxL3Byb2plY3RzEqgBCg1VcGRhdGVQcm9qZWN0EiEuYnl0ZWJhc2UudjEuVXBkYXRlUHJvamVjdFJlcXVlc3QaFC5ieXRlYmFzZS52MS5Qcm9qZWN0Il7aQRNwcm9qZWN0LHVwZGF0ZV9tYXNriuowEmJiLnByb2plY3RzLnVwZGF0ZZDqMAGC0+STAig6B3Byb2plY3QyHS92MS97cHJvamVjdC5uYW1lPXByb2plY3RzLyp9Eo4BCg1EZWxldGVQcm9qZWN0EiEuYnl0ZWJhc2UudjEuRGVsZXRlUHJvamVjdFJlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkiQtpBBG5hbWWK6jASYmIucHJvamVjdHMuZGVsZXRlkOowAZjqMAGC0+STAhcqFS92MS97bmFtZT1wcm9qZWN0cy8qfRKXAQoPVW5kZWxldGVQcm9qZWN0EiMuYnl0ZWJhc2UudjEuVW5kZWxldGVQcm9qZWN0UmVxdWVzdBoULmJ5dGViYXNlLnYxLlByb2plY3QiSYrqMBRiYi5wcm9qZWN0cy51bmRlbGV0ZZDqMAGY6jABgtPkkwIjOgEqIh4vdjEve25hbWU9cHJvamVjdHMvKn06dW5kZWxldGUSmQEKE0JhdGNoRGVsZXRlUHJvamVjdHMSJy5ieXRlYmFzZS52MS5CYXRjaERlbGV0ZVByb2plY3RzUmVxdWVzdBoWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eSJBiuowEmJiLnByb2plY3RzLmRlbGV0ZZDqMAGY6jABgtPkkwIdOgEqIhgvdjEvcHJvamVjdHM6YmF0Y2hEZWxldGUSmAEKDEdldElhbVBvbGljeRIgLmJ5dGViYXNlLnYxLkdldElhbVBvbGljeVJlcXVlc3QaFi5ieXRlYmFzZS52MS5JYW1Qb2xpY3kiTorqMBhiYi5wcm9qZWN0cy5nZXRJYW1Qb2xpY3mQ6jABgtPkkwIoEiYvdjEve3Jlc291cmNlPXByb2plY3RzLyp9OmdldElhbVBvbGljeRKfAQoMU2V0SWFtUG9saWN5EiAuYnl0ZWJhc2UudjEuU2V0SWFtUG9saWN5UmVxdWVzdBoWLmJ5dGViYXNlLnYxLklhbVBvbGljeSJViuowGGJiLnByb2plY3RzLnNldElhbVBvbGljeZDqMAGY6jABgtPkkwIrOgEqIiYvdjEve3Jlc291cmNlPXByb2plY3RzLyp9OnNldElhbVBvbGljeRKMAQoKQWRkV2ViaG9vaxIeLmJ5dGViYXNlLnYxLkFkZFdlYmhvb2tSZXF1ZXN0GhQuYnl0ZWJhc2UudjEuUHJvamVjdCJIiuowEmJiLnByb2plY3RzLnVwZGF0ZZDqMAGC0+STAig6ASoiIy92MS97cHJvamVjdD1wcm9qZWN0cy8qfTphZGRXZWJob29rEsEBCg1VcGRhdGVXZWJob29rEiEuYnl0ZWJhc2UudjEuVXBkYXRlV2ViaG9va1JlcXVlc3QaFC5ieXRlYmFzZS52MS5Qcm9qZWN0InfaQRN3ZWJob29rLHVwZGF0ZV9tYXNriuowEmJiLnByb2plY3RzLnVwZGF0ZZDqMAGC0+STAkE6B3dlYmhvb2syNi92MS97d2ViaG9vay5uYW1lPXByb2plY3RzLyovd2ViaG9va3MvKn06dXBkYXRlV2ViaG9vaxKlAQoNUmVtb3ZlV2ViaG9vaxIhLmJ5dGViYXNlLnYxLlJlbW92ZVdlYmhvb2tSZXF1ZXN0GhQuYnl0ZWJhc2UudjEuUHJvamVjdCJbiuowEmJiLnByb2plY3RzLnVwZGF0ZZDqMAGC0+STAjs6ASoiNi92MS97d2ViaG9vay5uYW1lPXByb2plY3RzLyovd2ViaG9va3MvKn06cmVtb3ZlV2ViaG9vaxKbAQoLVGVzdFdlYmhvb2sSHy5ieXRlYmFzZS52MS5UZXN0V2ViaG9va1JlcXVlc3QaIC5ieXRlYmFzZS52MS5UZXN0V2ViaG9va1Jlc3BvbnNlIkmK6jASYmIucHJvamVjdHMudXBkYXRlkOowAYLT5JMCKToBKiIkL3YxL3twcm9qZWN0PXByb2plY3RzLyp9OnRlc3RXZWJob29rQqkBCg9jb20uYnl0ZWJhc2UudjFCE1Byb2plY3RTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [file_buf_validate_validate, 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_v1_annotation, file_v1_common, file_v1_iam_policy]);
+ fileDesc("Chh2MS9wcm9qZWN0X3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIj8KEUdldFByb2plY3RSZXF1ZXN0EioKBG5hbWUYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QiRgoXQmF0Y2hHZXRQcm9qZWN0c1JlcXVlc3QSKwoFbmFtZXMYASADKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QiQgoYQmF0Y2hHZXRQcm9qZWN0c1Jlc3BvbnNlEiYKCHByb2plY3RzGAEgAygLMhQuYnl0ZWJhc2UudjEuUHJvamVjdCJ0ChNMaXN0UHJvamVjdHNSZXF1ZXN0EhEKCXBhZ2Vfc2l6ZRgBIAEoBRISCgpwYWdlX3Rva2VuGAIgASgJEhQKDHNob3dfZGVsZXRlZBgDIAEoCBIOCgZmaWx0ZXIYBCABKAkSEAoIb3JkZXJfYnkYBSABKAkiVwoUTGlzdFByb2plY3RzUmVzcG9uc2USJgoIcHJvamVjdHMYASADKAsyFC5ieXRlYmFzZS52MS5Qcm9qZWN0EhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSJ2ChVTZWFyY2hQcm9qZWN0c1JlcXVlc3QSFAoMc2hvd19kZWxldGVkGAEgASgIEg4KBmZpbHRlchgCIAEoCRIRCglwYWdlX3NpemUYAyABKAUSEgoKcGFnZV90b2tlbhgEIAEoCRIQCghvcmRlcl9ieRgFIAEoCSJZChZTZWFyY2hQcm9qZWN0c1Jlc3BvbnNlEiYKCHByb2plY3RzGAEgAygLMhQuYnl0ZWJhc2UudjEuUHJvamVjdBIXCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAkiVgoUQ3JlYXRlUHJvamVjdFJlcXVlc3QSKgoHcHJvamVjdBgBIAEoCzIULmJ5dGViYXNlLnYxLlByb2plY3RCA+BBAhISCgpwcm9qZWN0X2lkGAIgASgJIooBChRVcGRhdGVQcm9qZWN0UmVxdWVzdBIqCgdwcm9qZWN0GAEgASgLMhQuYnl0ZWJhc2UudjEuUHJvamVjdEID4EECEi8KC3VwZGF0ZV9tYXNrGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFzaxIVCg1hbGxvd19taXNzaW5nGAMgASgIIlEKFERlbGV0ZVByb2plY3RSZXF1ZXN0EioKBG5hbWUYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QSDQoFcHVyZ2UYAiABKAgiRAoWVW5kZWxldGVQcm9qZWN0UmVxdWVzdBIqCgRuYW1lGAEgASgJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9Qcm9qZWN0IlgKGkJhdGNoRGVsZXRlUHJvamVjdHNSZXF1ZXN0EisKBW5hbWVzGAEgAygJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9Qcm9qZWN0Eg0KBXB1cmdlGAIgASgIIjQKBUxhYmVsEg0KBXZhbHVlGAEgASgJEg0KBWNvbG9yGAIgASgJEg0KBWdyb3VwGAMgASgJIrMGCgdQcm9qZWN0EgwKBG5hbWUYASABKAkSIQoFc3RhdGUYAiABKA4yEi5ieXRlYmFzZS52MS5TdGF0ZRIXCgV0aXRsZRgDIAEoCUIIukgFcgMYyAESJgoId2ViaG9va3MYBCADKAsyFC5ieXRlYmFzZS52MS5XZWJob29rEiUKHWRhdGFfY2xhc3NpZmljYXRpb25fY29uZmlnX2lkGAUgASgJEigKDGlzc3VlX2xhYmVscxgGIAMoCzISLmJ5dGViYXNlLnYxLkxhYmVsEhoKEmZvcmNlX2lzc3VlX2xhYmVscxgHIAEoCBIbChNlbmZvcmNlX2lzc3VlX3RpdGxlGAogASgIEiUKHXBvc3RncmVzX2RhdGFiYXNlX3RlbmFudF9tb2RlGA0gASgIEhsKE2FsbG93X3NlbGZfYXBwcm92YWwYDiABKAgSSQoWZXhlY3V0aW9uX3JldHJ5X3BvbGljeRgPIAEoCzIpLmJ5dGViYXNlLnYxLlByb2plY3QuRXhlY3V0aW9uUmV0cnlQb2xpY3kSGAoQY2lfc2FtcGxpbmdfc2l6ZRgQIAEoBRIiChpwYXJhbGxlbF90YXNrc19wZXJfcm9sbG91dBgRIAEoBRIwCgZsYWJlbHMYEiADKAsyIC5ieXRlYmFzZS52MS5Qcm9qZWN0LkxhYmVsc0VudHJ5EhoKEmVuZm9yY2Vfc3FsX3JldmlldxgTIAEoCBIeChZyZXF1aXJlX2lzc3VlX2FwcHJvdmFsGBQgASgIEiMKG3JlcXVpcmVfcGxhbl9jaGVja19ub19lcnJvchgVIAEoCBIaChJhbGxvd19yZXF1ZXN0X3JvbGUYFiABKAgSIQoZYWxsb3dfanVzdF9pbl90aW1lX2FjY2VzcxgXIAEoCBovChRFeGVjdXRpb25SZXRyeVBvbGljeRIXCg9tYXhpbXVtX3JldHJpZXMYASABKAUaLQoLTGFiZWxzRW50cnkSCwoDa2V5GAEgASgJEg0KBXZhbHVlGAIgASgJOgI4ATot6kEqChRieXRlYmFzZS5jb20vUHJvamVjdBIScHJvamVjdHMve3Byb2plY3R9Im4KEUFkZFdlYmhvb2tSZXF1ZXN0Ei0KB3Byb2plY3QYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QSKgoHd2ViaG9vaxgCIAEoCzIULmJ5dGViYXNlLnYxLldlYmhvb2tCA+BBAiKKAQoUVXBkYXRlV2ViaG9va1JlcXVlc3QSKgoHd2ViaG9vaxgBIAEoCzIULmJ5dGViYXNlLnYxLldlYmhvb2tCA+BBAhIvCgt1cGRhdGVfbWFzaxgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2sSFQoNYWxsb3dfbWlzc2luZxgDIAEoCCJCChRSZW1vdmVXZWJob29rUmVxdWVzdBIqCgd3ZWJob29rGAEgASgLMhQuYnl0ZWJhc2UudjEuV2ViaG9va0ID4EECIm8KElRlc3RXZWJob29rUmVxdWVzdBItCgdwcm9qZWN0GAEgASgJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9Qcm9qZWN0EioKB3dlYmhvb2sYAiABKAsyFC5ieXRlYmFzZS52MS5XZWJob29rQgPgQQIiJAoTVGVzdFdlYmhvb2tSZXNwb25zZRINCgVlcnJvchgBIAEoCSKBAgoHV2ViaG9vaxIMCgRuYW1lGAEgASgJEisKBHR5cGUYAiABKA4yGC5ieXRlYmFzZS52MS5XZWJob29rVHlwZUID4EECEhIKBXRpdGxlGAMgASgJQgPgQQISEAoDdXJsGAQgASgJQgPgQQISFgoOZGlyZWN0X21lc3NhZ2UYBiABKAgSOwoSbm90aWZpY2F0aW9uX3R5cGVzGAUgAygOMhouYnl0ZWJhc2UudjEuQWN0aXZpdHkuVHlwZUID4EEGOkDqQT0KFGJ5dGViYXNlLmNvbS9XZWJob29rEiVwcm9qZWN0cy97cHJvamVjdH0vd2ViaG9va3Mve3dlYmhvb2t9IpwBCghBY3Rpdml0eSKPAQoEVHlwZRIUChBUWVBFX1VOU1BFQ0lGSUVEEAASEQoNSVNTVUVfQ1JFQVRFRBAKEhwKGElTU1VFX0FQUFJPVkFMX1JFUVVFU1RFRBALEhMKD0lTU1VFX1NFTlRfQkFDSxAMEhMKD1BJUEVMSU5FX0ZBSUxFRBANEhYKElBJUEVMSU5FX0NPTVBMRVRFRBAOMoISCg5Qcm9qZWN0U2VydmljZRJ/CgpHZXRQcm9qZWN0Eh4uYnl0ZWJhc2UudjEuR2V0UHJvamVjdFJlcXVlc3QaFC5ieXRlYmFzZS52MS5Qcm9qZWN0IjvaQQRuYW1liuowD2JiLnByb2plY3RzLmdldJDqMAGC0+STAhcSFS92MS97bmFtZT1wcm9qZWN0cy8qfRKVAQoQQmF0Y2hHZXRQcm9qZWN0cxIkLmJ5dGViYXNlLnYxLkJhdGNoR2V0UHJvamVjdHNSZXF1ZXN0GiUuYnl0ZWJhc2UudjEuQmF0Y2hHZXRQcm9qZWN0c1Jlc3BvbnNlIjSK6jAPYmIucHJvamVjdHMuZ2V0kOowAYLT5JMCFxIVL3YxL3Byb2plY3RzOmJhdGNoR2V0EoQBCgxMaXN0UHJvamVjdHMSIC5ieXRlYmFzZS52MS5MaXN0UHJvamVjdHNSZXF1ZXN0GiEuYnl0ZWJhc2UudjEuTGlzdFByb2plY3RzUmVzcG9uc2UiL9pBAIrqMBBiYi5wcm9qZWN0cy5saXN0kOowAYLT5JMCDhIML3YxL3Byb2plY3RzEoABCg5TZWFyY2hQcm9qZWN0cxIiLmJ5dGViYXNlLnYxLlNlYXJjaFByb2plY3RzUmVxdWVzdBojLmJ5dGViYXNlLnYxLlNlYXJjaFByb2plY3RzUmVzcG9uc2UiJdpBAJDqMAKC0+STAhg6ASoiEy92MS9wcm9qZWN0czpzZWFyY2gShAEKDUNyZWF0ZVByb2plY3QSIS5ieXRlYmFzZS52MS5DcmVhdGVQcm9qZWN0UmVxdWVzdBoULmJ5dGViYXNlLnYxLlByb2plY3QiOtpBAIrqMBJiYi5wcm9qZWN0cy5jcmVhdGWQ6jABgtPkkwIXOgdwcm9qZWN0IgwvdjEvcHJvamVjdHMSqAEKDVVwZGF0ZVByb2plY3QSIS5ieXRlYmFzZS52MS5VcGRhdGVQcm9qZWN0UmVxdWVzdBoULmJ5dGViYXNlLnYxLlByb2plY3QiXtpBE3Byb2plY3QsdXBkYXRlX21hc2uK6jASYmIucHJvamVjdHMudXBkYXRlkOowAYLT5JMCKDoHcHJvamVjdDIdL3YxL3twcm9qZWN0Lm5hbWU9cHJvamVjdHMvKn0SjgEKDURlbGV0ZVByb2plY3QSIS5ieXRlYmFzZS52MS5EZWxldGVQcm9qZWN0UmVxdWVzdBoWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eSJC2kEEbmFtZYrqMBJiYi5wcm9qZWN0cy5kZWxldGWQ6jABmOowAYLT5JMCFyoVL3YxL3tuYW1lPXByb2plY3RzLyp9EpcBCg9VbmRlbGV0ZVByb2plY3QSIy5ieXRlYmFzZS52MS5VbmRlbGV0ZVByb2plY3RSZXF1ZXN0GhQuYnl0ZWJhc2UudjEuUHJvamVjdCJJiuowFGJiLnByb2plY3RzLnVuZGVsZXRlkOowAZjqMAGC0+STAiM6ASoiHi92MS97bmFtZT1wcm9qZWN0cy8qfTp1bmRlbGV0ZRKZAQoTQmF0Y2hEZWxldGVQcm9qZWN0cxInLmJ5dGViYXNlLnYxLkJhdGNoRGVsZXRlUHJvamVjdHNSZXF1ZXN0GhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5IkGK6jASYmIucHJvamVjdHMuZGVsZXRlkOowAZjqMAGC0+STAh06ASoiGC92MS9wcm9qZWN0czpiYXRjaERlbGV0ZRKYAQoMR2V0SWFtUG9saWN5EiAuYnl0ZWJhc2UudjEuR2V0SWFtUG9saWN5UmVxdWVzdBoWLmJ5dGViYXNlLnYxLklhbVBvbGljeSJOiuowGGJiLnByb2plY3RzLmdldElhbVBvbGljeZDqMAGC0+STAigSJi92MS97cmVzb3VyY2U9cHJvamVjdHMvKn06Z2V0SWFtUG9saWN5Ep8BCgxTZXRJYW1Qb2xpY3kSIC5ieXRlYmFzZS52MS5TZXRJYW1Qb2xpY3lSZXF1ZXN0GhYuYnl0ZWJhc2UudjEuSWFtUG9saWN5IlWK6jAYYmIucHJvamVjdHMuc2V0SWFtUG9saWN5kOowAZjqMAGC0+STAis6ASoiJi92MS97cmVzb3VyY2U9cHJvamVjdHMvKn06c2V0SWFtUG9saWN5EowBCgpBZGRXZWJob29rEh4uYnl0ZWJhc2UudjEuQWRkV2ViaG9va1JlcXVlc3QaFC5ieXRlYmFzZS52MS5Qcm9qZWN0IkiK6jASYmIucHJvamVjdHMudXBkYXRlkOowAYLT5JMCKDoBKiIjL3YxL3twcm9qZWN0PXByb2plY3RzLyp9OmFkZFdlYmhvb2sSwQEKDVVwZGF0ZVdlYmhvb2sSIS5ieXRlYmFzZS52MS5VcGRhdGVXZWJob29rUmVxdWVzdBoULmJ5dGViYXNlLnYxLlByb2plY3Qid9pBE3dlYmhvb2ssdXBkYXRlX21hc2uK6jASYmIucHJvamVjdHMudXBkYXRlkOowAYLT5JMCQToHd2ViaG9vazI2L3YxL3t3ZWJob29rLm5hbWU9cHJvamVjdHMvKi93ZWJob29rcy8qfTp1cGRhdGVXZWJob29rEqUBCg1SZW1vdmVXZWJob29rEiEuYnl0ZWJhc2UudjEuUmVtb3ZlV2ViaG9va1JlcXVlc3QaFC5ieXRlYmFzZS52MS5Qcm9qZWN0IluK6jASYmIucHJvamVjdHMudXBkYXRlkOowAYLT5JMCOzoBKiI2L3YxL3t3ZWJob29rLm5hbWU9cHJvamVjdHMvKi93ZWJob29rcy8qfTpyZW1vdmVXZWJob29rEpsBCgtUZXN0V2ViaG9vaxIfLmJ5dGViYXNlLnYxLlRlc3RXZWJob29rUmVxdWVzdBogLmJ5dGViYXNlLnYxLlRlc3RXZWJob29rUmVzcG9uc2UiSYrqMBJiYi5wcm9qZWN0cy51cGRhdGWQ6jABgtPkkwIpOgEqIiQvdjEve3Byb2plY3Q9cHJvamVjdHMvKn06dGVzdFdlYmhvb2tCqQEKD2NvbS5ieXRlYmFzZS52MUITUHJvamVjdFNlcnZpY2VQcm90b1ABWjRnaXRodWIuY29tL2J5dGViYXNlL2J5dGViYXNlL2JhY2tlbmQvZ2VuZXJhdGVkLWdvL3YxogIDQlhYqgILQnl0ZWJhc2UuVjHKAgtCeXRlYmFzZVxWMeICF0J5dGViYXNlXFYxXEdQQk1ldGFkYXRh6gIMQnl0ZWJhc2U6OlYxYgZwcm90bzM", [file_buf_validate_validate, 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_v1_annotation, file_v1_common, file_v1_iam_policy]);
/**
* Describes the message bytebase.v1.GetProjectRequest.
diff --git a/frontend/src/types/proto-es/v1/sql_service_pb.d.ts b/frontend/src/types/proto-es/v1/sql_service_pb.d.ts
index 2fe09f0c03..f66338d2d7 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
@@ -143,6 +143,14 @@ export declare type QueryRequest = Message<"bytebase.v1.QueryRequest"> & {
* @generated from field: optional string container = 8;
*/
container?: string;
+
+ /**
+ * The access grant to apply the query.
+ * Format: projects/{project}/accessGrants/{access_grant}
+ *
+ * @generated from field: optional string access_grant = 9;
+ */
+ accessGrant?: string;
};
/**
diff --git a/frontend/src/types/proto-es/v1/sql_service_pb.js b/frontend/src/types/proto-es/v1/sql_service_pb.js
index 79f9cc56fc..59c53a31f7 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+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]);
+ fileDesc("ChR2MS9zcWxfc2VydmljZS5wcm90bxILYnl0ZWJhc2UudjEiqgEKE0FkbWluRXhlY3V0ZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vRGF0YWJhc2USEQoJc3RhdGVtZW50GAIgASgJEg0KBWxpbWl0GAMgASgFEhMKBnNjaGVtYRgEIAEoCUgAiAEBEhYKCWNvbnRhaW5lchgFIAEoCUgBiAEBQgkKB19zY2hlbWFCDAoKX2NvbnRhaW5lciJBChRBZG1pbkV4ZWN1dGVSZXNwb25zZRIpCgdyZXN1bHRzGAEgAygLMhguYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQirQIKDFF1ZXJ5UmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9EYXRhYmFzZRIRCglzdGF0ZW1lbnQYAiABKAkSDQoFbGltaXQYAyABKAUSGwoOZGF0YV9zb3VyY2VfaWQYBCABKAlCA+BBAhIPCgdleHBsYWluGAUgASgIEhMKBnNjaGVtYRgGIAEoCUgAiAEBEi4KDHF1ZXJ5X29wdGlvbhgHIAEoCzIYLmJ5dGViYXNlLnYxLlF1ZXJ5T3B0aW9uEhYKCWNvbnRhaW5lchgIIAEoCUgBiAEBEhkKDGFjY2Vzc19ncmFudBgJIAEoCUgCiAEBQgkKB19zY2hlbWFCDAoKX2NvbnRhaW5lckIPCg1fYWNjZXNzX2dyYW50IjoKDVF1ZXJ5UmVzcG9uc2USKQoHcmVzdWx0cxgBIAMoCzIYLmJ5dGViYXNlLnYxLlF1ZXJ5UmVzdWx0IvkCCgtRdWVyeU9wdGlvbhJKChVyZWRpc19ydW5fY29tbWFuZHNfb24YASABKA4yKy5ieXRlYmFzZS52MS5RdWVyeU9wdGlvbi5SZWRpc1J1bkNvbW1hbmRzT24SSQoUbXNzcWxfZXhwbGFpbl9mb3JtYXQYAiABKA4yKy5ieXRlYmFzZS52MS5RdWVyeU9wdGlvbi5NU1NRTEV4cGxhaW5Gb3JtYXQiWwoSUmVkaXNSdW5Db21tYW5kc09uEiUKIVJFRElTX1JVTl9DT01NQU5EU19PTl9VTlNQRUNJRklFRBAAEg8KC1NJTkdMRV9OT0RFEAESDQoJQUxMX05PREVTEAIidgoSTVNTUUxFeHBsYWluRm9ybWF0EiQKIE1TU1FMX0VYUExBSU5fRk9STUFUX1VOU1BFQ0lGSUVEEAASHAoYTVNTUUxfRVhQTEFJTl9GT1JNQVRfQUxMEAESHAoYTVNTUUxfRVhQTEFJTl9GT1JNQVRfWE1MEAIimAoKC1F1ZXJ5UmVzdWx0EhQKDGNvbHVtbl9uYW1lcxgBIAMoCRIZChFjb2x1bW5fdHlwZV9uYW1lcxgCIAMoCRIjCgRyb3dzGAMgAygLMhUuYnl0ZWJhc2UudjEuUXVlcnlSb3cSEgoKcm93c19jb3VudBgEIAEoAxINCgVlcnJvchgFIAEoCRIqCgdsYXRlbmN5GAYgASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uEhEKCXN0YXRlbWVudBgHIAEoCRJACg5wb3N0Z3Jlc19lcnJvchgIIAEoCzImLmJ5dGViYXNlLnYxLlF1ZXJ5UmVzdWx0LlBvc3RncmVzRXJyb3JIABI8CgxzeW50YXhfZXJyb3IYCSABKAsyJC5ieXRlYmFzZS52MS5RdWVyeVJlc3VsdC5TeW50YXhFcnJvckgAEkAKEXBlcm1pc3Npb25fZGVuaWVkGAogASgLMiMuYnl0ZWJhc2UudjEuUGVybWlzc2lvbkRlbmllZERldGFpbEgAEj4KDWNvbW1hbmRfZXJyb3IYDSABKAsyJS5ieXRlYmFzZS52MS5RdWVyeVJlc3VsdC5Db21tYW5kRXJyb3JIABIyCghtZXNzYWdlcxgLIAMoCzIgLmJ5dGViYXNlLnYxLlF1ZXJ5UmVzdWx0Lk1lc3NhZ2USKgoGbWFza2VkGAwgAygLMhouYnl0ZWJhc2UudjEuTWFza2luZ1JlYXNvbhrOAgoNUG9zdGdyZXNFcnJvchIQCghzZXZlcml0eRgBIAEoCRIMCgRjb2RlGAIgASgJEg8KB21lc3NhZ2UYAyABKAkSDgoGZGV0YWlsGAQgASgJEgwKBGhpbnQYBSABKAkSEAoIcG9zaXRpb24YBiABKAUSGQoRaW50ZXJuYWxfcG9zaXRpb24YByABKAUSFgoOaW50ZXJuYWxfcXVlcnkYCCABKAkSDQoFd2hlcmUYCSABKAkSEwoLc2NoZW1hX25hbWUYCiABKAkSEgoKdGFibGVfbmFtZRgLIAEoCRITCgtjb2x1bW5fbmFtZRgMIAEoCRIWCg5kYXRhX3R5cGVfbmFtZRgNIAEoCRIXCg9jb25zdHJhaW50X25hbWUYDiABKAkSDAoEZmlsZRgPIAEoCRIMCgRsaW5lGBAgASgFEg8KB3JvdXRpbmUYESABKAkaPAoLU3ludGF4RXJyb3ISLQoOc3RhcnRfcG9zaXRpb24YASABKAsyFS5ieXRlYmFzZS52MS5Qb3NpdGlvbhqTAQoMQ29tbWFuZEVycm9yEkAKDGNvbW1hbmRfdHlwZRgBIAEoDjIqLmJ5dGViYXNlLnYxLlF1ZXJ5UmVzdWx0LkNvbW1hbmRFcnJvci5UeXBlIkEKBFR5cGUSFAoQVFlQRV9VTlNQRUNJRklFRBAAEgcKA0RETBABEgcKA0RNTBACEhEKDU5PTl9SRUFEX09OTFkQAxq3AQoHTWVzc2FnZRI1CgVsZXZlbBgBIAEoDjImLmJ5dGViYXNlLnYxLlF1ZXJ5UmVzdWx0Lk1lc3NhZ2UuTGV2ZWwSDwoHY29udGVudBgCIAEoCSJkCgVMZXZlbBIVChFMRVZFTF9VTlNQRUNJRklFRBAAEggKBElORk8QARILCgdXQVJOSU5HEAISCQoFREVCVUcQAxIHCgNMT0cQBBIKCgZOT1RJQ0UQBRINCglFWENFUFRJT04QBkIQCg5kZXRhaWxlZF9lcnJvciK9AQoNTWFza2luZ1JlYXNvbhIYChBzZW1hbnRpY190eXBlX2lkGAEgASgJEhsKE3NlbWFudGljX3R5cGVfdGl0bGUYAiABKAkSFwoPbWFza2luZ19ydWxlX2lkGAMgASgJEhEKCWFsZ29yaXRobRgEIAEoCRIPCgdjb250ZXh0GAUgASgJEhwKFGNsYXNzaWZpY2F0aW9uX2xldmVsGAYgASgJEhoKEnNlbWFudGljX3R5cGVfaWNvbhgHIAEoCSIxCghRdWVyeVJvdxIlCgZ2YWx1ZXMYASADKAsyFS5ieXRlYmFzZS52MS5Sb3dWYWx1ZSKMBQoIUm93VmFsdWUSMAoKbnVsbF92YWx1ZRgBIAEoDjIaLmdvb2dsZS5wcm90b2J1Zi5OdWxsVmFsdWVIABIUCgpib29sX3ZhbHVlGAIgASgISAASFQoLYnl0ZXNfdmFsdWUYAyABKAxIABIWCgxkb3VibGVfdmFsdWUYBCABKAFIABIVCgtmbG9hdF92YWx1ZRgFIAEoAkgAEhUKC2ludDMyX3ZhbHVlGAYgASgFSAASFQoLaW50NjRfdmFsdWUYByABKANIABIWCgxzdHJpbmdfdmFsdWUYCCABKAlIABIWCgx1aW50MzJfdmFsdWUYCSABKA1IABIWCgx1aW50NjRfdmFsdWUYCiABKARIABItCgt2YWx1ZV92YWx1ZRgLIAEoCzIWLmdvb2dsZS5wcm90b2J1Zi5WYWx1ZUgAEjoKD3RpbWVzdGFtcF92YWx1ZRgMIAEoCzIfLmJ5dGViYXNlLnYxLlJvd1ZhbHVlLlRpbWVzdGFtcEgAEj8KEnRpbWVzdGFtcF90el92YWx1ZRgNIAEoCzIhLmJ5dGViYXNlLnYxLlJvd1ZhbHVlLlRpbWVzdGFtcFRaSAAaUwoJVGltZXN0YW1wEjQKEGdvb2dsZV90aW1lc3RhbXAYASABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEhAKCGFjY3VyYWN5GAIgASgFGnMKC1RpbWVzdGFtcFRaEjQKEGdvb2dsZV90aW1lc3RhbXAYASABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEgwKBHpvbmUYAiABKAkSDgoGb2Zmc2V0GAMgASgFEhAKCGFjY3VyYWN5GAQgASgFQgYKBGtpbmQigwMKBkFkdmljZRIpCgZzdGF0dXMYASABKA4yGS5ieXRlYmFzZS52MS5BZHZpY2UuTGV2ZWwSDAoEY29kZRgCIAEoBRINCgV0aXRsZRgDIAEoCRIPCgdjb250ZW50GAQgASgJEi0KDnN0YXJ0X3Bvc2l0aW9uGAUgASgLMhUuYnl0ZWJhc2UudjEuUG9zaXRpb24SKwoMZW5kX3Bvc2l0aW9uGAYgASgLMhUuYnl0ZWJhc2UudjEuUG9zaXRpb24SLwoJcnVsZV90eXBlGAcgASgOMhwuYnl0ZWJhc2UudjEuQWR2aWNlLlJ1bGVUeXBlIkoKBUxldmVsEhwKGEFEVklDRV9MRVZFTF9VTlNQRUNJRklFRBAAEgsKB1NVQ0NFU1MQARILCgdXQVJOSU5HEAISCQoFRVJST1IQAyJHCghSdWxlVHlwZRIZChVSVUxFX1RZUEVfVU5TUEVDSUZJRUQQABIQCgxQQVJTRVJfQkFTRUQQARIOCgpBSV9QT1dFUkVEEAIi4gEKDUV4cG9ydFJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vRGF0YWJhc2USEQoJc3RhdGVtZW50GAIgASgJEg0KBWxpbWl0GAMgASgFEikKBmZvcm1hdBgEIAEoDjIZLmJ5dGViYXNlLnYxLkV4cG9ydEZvcm1hdBINCgVhZG1pbhgFIAEoCBIQCghwYXNzd29yZBgGIAEoCRIWCg5kYXRhX3NvdXJjZV9pZBgHIAEoCRITCgZzY2hlbWEYCCABKAlIAIgBAUIJCgdfc2NoZW1hIiEKDkV4cG9ydFJlc3BvbnNlEg8KB2NvbnRlbnQYASABKAwitAEKE0RpZmZNZXRhZGF0YVJlcXVlc3QSOwoPc291cmNlX21ldGFkYXRhGAEgASgLMh0uYnl0ZWJhc2UudjEuRGF0YWJhc2VNZXRhZGF0YUID4EECEjsKD3RhcmdldF9tZXRhZGF0YRgCIAEoCzIdLmJ5dGViYXNlLnYxLkRhdGFiYXNlTWV0YWRhdGFCA+BBAhIjCgZlbmdpbmUYAyABKA4yEy5ieXRlYmFzZS52MS5FbmdpbmUiJAoURGlmZk1ldGFkYXRhUmVzcG9uc2USDAoEZGlmZhgBIAEoCSJUChtTZWFyY2hRdWVyeUhpc3Rvcmllc1JlcXVlc3QSEQoJcGFnZV9zaXplGAEgASgFEhIKCnBhZ2VfdG9rZW4YAiABKAkSDgoGZmlsdGVyGAMgASgJInAKHFNlYXJjaFF1ZXJ5SGlzdG9yaWVzUmVzcG9uc2USNwoPcXVlcnlfaGlzdG9yaWVzGAEgAygLMhkuYnl0ZWJhc2UudjEuUXVlcnlIaXN0b3J5QgPgQQMSFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJItQCCgxRdWVyeUhpc3RvcnkSEQoEbmFtZRgBIAEoCUID4EEDEhUKCGRhdGFiYXNlGAIgASgJQgPgQQMSFAoHY3JlYXRvchgDIAEoCUID4EEDEjQKC2NyZWF0ZV90aW1lGAQgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEhYKCXN0YXRlbWVudBgFIAEoCUID4EEDEhcKBWVycm9yGAYgASgJQgPgQQNIAIgBARIwCghkdXJhdGlvbhgHIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbkID4EEDEiwKBHR5cGUYCCABKA4yHi5ieXRlYmFzZS52MS5RdWVyeUhpc3RvcnkuVHlwZSIzCgRUeXBlEhQKEFRZUEVfVU5TUEVDSUZJRUQQABIJCgVRVUVSWRABEgoKBkVYUE9SVBACQggKBl9lcnJvciJ7ChNBSUNvbXBsZXRpb25SZXF1ZXN0EjoKCG1lc3NhZ2VzGAEgAygLMiguYnl0ZWJhc2UudjEuQUlDb21wbGV0aW9uUmVxdWVzdC5NZXNzYWdlGigKB01lc3NhZ2USDAoEcm9sZRgBIAEoCRIPCgdjb250ZW50GAIgASgJIpUCChRBSUNvbXBsZXRpb25SZXNwb25zZRI/CgpjYW5kaWRhdGVzGAEgAygLMisuYnl0ZWJhc2UudjEuQUlDb21wbGV0aW9uUmVzcG9uc2UuQ2FuZGlkYXRlGrsBCglDYW5kaWRhdGUSRAoHY29udGVudBgBIAEoCzIzLmJ5dGViYXNlLnYxLkFJQ29tcGxldGlvblJlc3BvbnNlLkNhbmRpZGF0ZS5Db250ZW50GmgKB0NvbnRlbnQSRwoFcGFydHMYASADKAsyOC5ieXRlYmFzZS52MS5BSUNvbXBsZXRpb25SZXNwb25zZS5DYW5kaWRhdGUuQ29udGVudC5QYXJ0GhQKBFBhcnQSDAoEdGV4dBgBIAEoCTLHBwoKU1FMU2VydmljZRKPAQoFUXVlcnkSGS5ieXRlYmFzZS52MS5RdWVyeVJlcXVlc3QaGi5ieXRlYmFzZS52MS5RdWVyeVJlc3BvbnNlIk+K6jAQYmIuZGF0YWJhc2VzLmdldJDqMAGY6jABgtPkkwItOgEqIigvdjEve25hbWU9aW5zdGFuY2VzLyovZGF0YWJhc2VzLyp9OnF1ZXJ5EokBCgxBZG1pbkV4ZWN1dGUSIC5ieXRlYmFzZS52MS5BZG1pbkV4ZWN1dGVSZXF1ZXN0GiEuYnl0ZWJhc2UudjEuQWRtaW5FeGVjdXRlUmVzcG9uc2UiMIrqMAxiYi5zcWwuYWRtaW6Q6jABmOowAYLT5JMCEhIQL3YxOmFkbWluRXhlY3V0ZSgBMAESlQEKFFNlYXJjaFF1ZXJ5SGlzdG9yaWVzEiguYnl0ZWJhc2UudjEuU2VhcmNoUXVlcnlIaXN0b3JpZXNSZXF1ZXN0GikuYnl0ZWJhc2UudjEuU2VhcmNoUXVlcnlIaXN0b3JpZXNSZXNwb25zZSIokOowAoLT5JMCHjoBKiIZL3YxL3F1ZXJ5SGlzdG9yaWVzOnNlYXJjaBKEAgoGRXhwb3J0EhouYnl0ZWJhc2UudjEuRXhwb3J0UmVxdWVzdBobLmJ5dGViYXNlLnYxLkV4cG9ydFJlc3BvbnNlIsABiuowEGJiLmRhdGFiYXNlcy5nZXSQ6jABmOowAYLT5JMCnQE6ASpaMToBKiIsL3YxL3tuYW1lPXByb2plY3RzLyovcGxhbnMvKi9yb2xsb3V0fTpleHBvcnRaOjoBKiI1L3YxL3tuYW1lPXByb2plY3RzLyovcGxhbnMvKi9yb2xsb3V0L3N0YWdlcy8qfTpleHBvcnQiKS92MS97bmFtZT1pbnN0YW5jZXMvKi9kYXRhYmFzZXMvKn06ZXhwb3J0EoEBCgxEaWZmTWV0YWRhdGESIC5ieXRlYmFzZS52MS5EaWZmTWV0YWRhdGFSZXF1ZXN0GiEuYnl0ZWJhc2UudjEuRGlmZk1ldGFkYXRhUmVzcG9uc2UiLIDqMAGC0+STAiI6ASoiHS92MS9zY2hlbWFEZXNpZ246ZGlmZk1ldGFkYXRhEngKDEFJQ29tcGxldGlvbhIgLmJ5dGViYXNlLnYxLkFJQ29tcGxldGlvblJlcXVlc3QaIS5ieXRlYmFzZS52MS5BSUNvbXBsZXRpb25SZXNwb25zZSIjkOowAoLT5JMCGToBKiIUL3YxL3NxbC9haUNvbXBsZXRpb25CpQEKD2NvbS5ieXRlYmFzZS52MUIPU3FsU2VydmljZVByb3RvUAFaNGdpdGh1Yi5jb20vYnl0ZWJhc2UvYnl0ZWJhc2UvYmFja2VuZC9nZW5lcmF0ZWQtZ28vdjGiAgNCWFiqAgtCeXRlYmFzZS5WMcoCC0J5dGViYXNlXFYx4gIXQnl0ZWJhc2VcVjFcR1BCTWV0YWRhdGHqAgxCeXRlYmFzZTo6VjFiBnByb3RvMw", [file_google_api_annotations, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_duration, file_google_protobuf_struct, file_google_protobuf_timestamp, file_v1_annotation, file_v1_common, file_v1_database_service]);
/**
* Describes the message bytebase.v1.AdminExecuteRequest.
diff --git a/frontend/src/types/sqlEditor/editor.ts b/frontend/src/types/sqlEditor/editor.ts
index 61e768eba2..bfb7fe852a 100644
--- a/frontend/src/types/sqlEditor/editor.ts
+++ b/frontend/src/types/sqlEditor/editor.ts
@@ -55,4 +55,7 @@ export type SQLEditorQueryParams = {
// Use to calculate the advice position.
selection: monaco.Selection | null;
queryOption?: QueryOption;
+ // The access grant resource name to authorize the query.
+ // Format: projects/{project}/accessGrants/{id}
+ accessGrant?: string;
};
diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yaml
index c06d62cb2c..34098448bc 100644
--- a/proto/gen/grpc-doc/openapi.yaml
+++ b/proto/gen/grpc-doc/openapi.yaml
@@ -5214,6 +5214,14 @@ paths:
description: |-
Container is the container name to execute the query against, used for
CosmosDB only.
+ accessGrant:
+ type:
+ - string
+ - "null"
+ title: access_grant
+ description: |-
+ The access grant to apply the query.
+ Format: projects/{project}/accessGrants/{access_grant}
title: QueryRequest
required:
- dataSourceId
@@ -23602,6 +23610,10 @@ components:
allowRequestRole:
type: boolean
title: allow_request_role
+ allowJustInTimeAccess:
+ type: boolean
+ title: allow_just_in_time_access
+ description: Once enabled, users can request and use the just-in-time access in the SQL Editor.
title: Project
additionalProperties: false
bytebase.v1.Project.ExecutionRetryPolicy:
@@ -23787,6 +23799,14 @@ components:
description: |-
Container is the container name to execute the query against, used for
CosmosDB only.
+ accessGrant:
+ type:
+ - string
+ - "null"
+ title: access_grant
+ description: |-
+ The access grant to apply the query.
+ Format: projects/{project}/accessGrants/{access_grant}
title: QueryRequest
required:
- name
diff --git a/proto/gen/grpc-doc/store/README.md b/proto/gen/grpc-doc/store/README.md
index bac164d5ec..8111725b99 100644
--- a/proto/gen/grpc-doc/store/README.md
+++ b/proto/gen/grpc-doc/store/README.md
@@ -3417,6 +3417,7 @@ Project contains settings and configuration for a Bytebase project.
| require_plan_check_no_error | [bool](#bool) | | Whether to block rollout when plan check finds errors. |
| allow_request_role | [bool](#bool) | | |
| data_classification_config_id | [string](#string) | | The data classification configuration ID for the project. |
+| allow_just_in_time_access | [bool](#bool) | | Once enabled, users can request and use the just-in-time access in the SQL Editor. |
diff --git a/proto/gen/grpc-doc/store/index.html b/proto/gen/grpc-doc/store/index.html
index 539d21e8bf..2c826c7e74 100644
--- a/proto/gen/grpc-doc/store/index.html
+++ b/proto/gen/grpc-doc/store/index.html
@@ -9703,6 +9703,13 @@ If enabled, issues cannot be created when SQL review finds errors. </p></td>
<td><p>The data classification configuration ID for the project. </p></td>
</tr>
+ <tr>
+ <td>allow_just_in_time_access</td>
+ <td><a href="#bool">bool</a></td>
+ <td></td>
+ <td><p>Once enabled, users can request and use the just-in-time access in the SQL Editor. </p></td>
+ </tr>
+
</tbody>
</table>
diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.md
index e7b98eb01a..92c4b6a6d8 100644
--- a/proto/gen/grpc-doc/v1/README.md
+++ b/proto/gen/grpc-doc/v1/README.md
@@ -7284,6 +7284,7 @@ OrgPolicyService manages organizational policies at various resource levels.
| schema | [string](#string) | optional | The default schema to search objects. Equals to the current schema in Oracle and search path in Postgres. |
| query_option | [QueryOption](#bytebase-v1-QueryOption) | | |
| container | [string](#string) | optional | Container is the container name to execute the query against, used for CosmosDB only. |
+| access_grant | [string](#string) | optional | The access grant to apply the query. Format: projects/{project}/accessGrants/{access_grant} |
@@ -8260,6 +8261,7 @@ When paginating, all other parameters provided to `ListProjects` must match the
| require_issue_approval | [bool](#bool) | | Whether to require issue approval before rollout. |
| require_plan_check_no_error | [bool](#bool) | | Whether to require plan check to have no error before rollout. |
| allow_request_role | [bool](#bool) | | |
+| allow_just_in_time_access | [bool](#bool) | | Once enabled, users can request and use the just-in-time access in the SQL Editor. |
diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.html
index 6bbe52bfa6..2dbe71899d 100644
--- a/proto/gen/grpc-doc/v1/index.html
+++ b/proto/gen/grpc-doc/v1/index.html
@@ -20702,6 +20702,14 @@ Oracle and search path in Postgres. </p></td>
CosmosDB only. </p></td>
</tr>
+ <tr>
+ <td>access_grant</td>
+ <td><a href="#string">string</a></td>
+ <td>optional</td>
+ <td><p>The access grant to apply the query.
+Format: projects/{project}/accessGrants/{access_grant} </p></td>
+ </tr>
+
</tbody>
</table>
@@ -23362,6 +23370,13 @@ If enabled, issues cannot be created when SQL review finds errors. </p></td>
<td><p> </p></td>
</tr>
+ <tr>
+ <td>allow_just_in_time_access</td>
+ <td><a href="#bool">bool</a></td>
+ <td></td>
+ <td><p>Once enabled, users can request and use the just-in-time access in the SQL Editor. </p></td>
+ </tr>
+
</tbody>
</table>
diff --git a/proto/store/store/project.proto b/proto/store/store/project.proto
index 0a02e40d64..f0bea7171e 100644
--- a/proto/store/store/project.proto
+++ b/proto/store/store/project.proto
@@ -65,4 +65,7 @@ message Project {
// The data classification configuration ID for the project.
string data_classification_config_id = 18;
+
+ // Once enabled, users can request and use the just-in-time access in the SQL Editor.
+ bool allow_just_in_time_access = 19;
}
diff --git a/proto/v1/v1/project_service.proto b/proto/v1/v1/project_service.proto
index 4be6a9e80a..6ab9a1cde5 100644
--- a/proto/v1/v1/project_service.proto
+++ b/proto/v1/v1/project_service.proto
@@ -453,6 +453,9 @@ message Project {
bool require_plan_check_no_error = 21;
bool allow_request_role = 22;
+
+ // Once enabled, users can request and use the just-in-time access in the SQL Editor.
+ bool allow_just_in_time_access = 23;
}
message AddWebhookRequest {
diff --git a/proto/v1/v1/sql_service.proto b/proto/v1/v1/sql_service.proto
index a826531d64..2986bcde28 100644
--- a/proto/v1/v1/sql_service.proto
+++ b/proto/v1/v1/sql_service.proto
@@ -151,6 +151,10 @@ message QueryRequest {
// Container is the container name to execute the query against, used for
// CosmosDB only.
optional string container = 8;
+
+ // The access grant to apply the query.
+ // Format: projects/{project}/accessGrants/{access_grant}
+ optional string access_grant = 9;
}
message QueryResponse {