Skip to content

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

feat: cross-project query history listing via AIP-159 "projects/-" parent (#21053)

Danny Xuc708a0730c15
diff --git a/backend/api/mcp/gen/openapi.yaml b/backend/api/mcp/gen/openapi.yaml
index 442eccfd12..5b0e5b3986 100644
--- a/backend/api/mcp/gen/openapi.yaml
+++ b/backend/api/mcp/gen/openapi.yaml
@@ -13988,6 +13988,9 @@ components:
description: |-
The parent project whose query histories are listed.
Format: projects/{project}
+ Use "projects/-" to list query histories across all projects
+ (https://google.aip.dev/159); this requires the bb.queryHistories.list
+ permission on the workspace.
pageSize:
type: integer
title: page_size
@@ -17759,6 +17762,14 @@ components:
bytebase.v1.SearchQueryHistoriesRequest:
type: object
properties:
+ parent:
+ type: string
+ title: parent
+ description: |-
+ The parent project to search query histories in.
+ Format: projects/{project}
+ Use "projects/-" to search across all projects
+ (https://google.aip.dev/159).
pageSize:
type: integer
title: page_size
diff --git a/backend/api/v1/sql_service.go b/backend/api/v1/sql_service.go
index 5ed616f86b..6db5269722 100644
--- a/backend/api/v1/sql_service.go
+++ b/backend/api/v1/sql_service.go
@@ -1405,7 +1405,8 @@ func (s *SQLService) createQueryHistory(database *store.DatabaseMessage, queryTy
}
}
-// SearchQueryHistories lists query histories.
+// SearchQueryHistories lists the caller's own query histories in the parent
+// project, or across all projects for the AIP-159 wildcard "projects/-".
func (s *SQLService) SearchQueryHistories(ctx context.Context, req *connect.Request[v1pb.SearchQueryHistoriesRequest]) (*connect.Response[v1pb.SearchQueryHistoriesResponse], error) {
request := req.Msg
user, ok := GetUserFromContext(ctx)
@@ -1413,15 +1414,18 @@ func (s *SQLService) SearchQueryHistories(ctx context.Context, req *connect.Requ
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("user not found"))
}
+ find := &store.FindQueryHistoryMessage{Creator: &user.Email}
+ if err := s.resolveQueryHistoryParent(ctx, request.Parent, find); err != nil {
+ return nil, err
+ }
+
filterQ, err := store.GetListQueryHistoryFilter(request.Filter)
if err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
+ find.FilterQ = filterQ
- histories, nextPageToken, err := s.paginatedQueryHistories(ctx, &store.FindQueryHistoryMessage{
- Creator: &user.Email,
- FilterQ: filterQ,
- }, request.PageToken, request.PageSize)
+ histories, nextPageToken, err := s.paginatedQueryHistories(ctx, find, request.PageToken, request.PageSize)
if err != nil {
return nil, err
}
@@ -1474,33 +1478,22 @@ func (s *SQLService) paginatedQueryHistories(ctx context.Context, find *store.Fi
}
// ListQueryHistories lists query histories of all users in a project. The IAM
-// interceptor checks bb.queryHistories.list on the parent project.
+// interceptor checks bb.queryHistories.list on the parent project, or on the
+// workspace when the parent is the AIP-159 wildcard "projects/-".
func (s *SQLService) ListQueryHistories(ctx context.Context, req *connect.Request[v1pb.ListQueryHistoriesRequest]) (*connect.Response[v1pb.ListQueryHistoriesResponse], error) {
request := req.Msg
- projectID, err := common.GetProjectID(request.Parent)
- if err != nil {
- return nil, connect.NewError(connect.CodeInvalidArgument, err)
- }
- project, err := s.store.GetProject(ctx, &store.FindProjectMessage{
- Workspace: common.GetWorkspaceIDFromContext(ctx),
- ResourceID: &projectID,
- })
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get project"))
- }
- if project == nil {
- return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("project %q not found", request.Parent))
+ find := &store.FindQueryHistoryMessage{}
+ if err := s.resolveQueryHistoryParent(ctx, request.Parent, find); err != nil {
+ return nil, err
}
creator, err := store.GetListQueryHistoriesCreatorFilter(request.Filter)
if err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
+ find.Creator = creator
- histories, nextPageToken, err := s.paginatedQueryHistories(ctx, &store.FindQueryHistoryMessage{
- Project: &projectID,
- Creator: creator,
- }, request.PageToken, request.PageSize)
+ histories, nextPageToken, err := s.paginatedQueryHistories(ctx, find, request.PageToken, request.PageSize)
if err != nil {
return nil, err
}
@@ -1510,6 +1503,38 @@ func (s *SQLService) ListQueryHistories(ctx context.Context, req *connect.Reques
}), nil
}
+// resolveQueryHistoryParent applies the parent scope to find: a concrete
+// "projects/{id}" parent must exist in the caller's workspace and scopes by
+// project; the AIP-159 wildcard "projects/-" scopes by workspace, which is
+// mandatory because query_history rows are workspace-scoped only through
+// their project.
+func (s *SQLService) resolveQueryHistoryParent(ctx context.Context, parent string, find *store.FindQueryHistoryMessage) error {
+ projectID, err := common.GetProjectID(parent)
+ if err != nil {
+ return connect.NewError(connect.CodeInvalidArgument, err)
+ }
+ if projectID == "-" {
+ workspaceID := common.GetWorkspaceIDFromContext(ctx)
+ if workspaceID == "" {
+ return connect.NewError(connect.CodeInternal, errors.Errorf("workspace not found in context"))
+ }
+ find.Workspace = workspaceID
+ return nil
+ }
+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{
+ Workspace: common.GetWorkspaceIDFromContext(ctx),
+ ResourceID: &projectID,
+ })
+ if err != nil {
+ return connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get project"))
+ }
+ if project == nil {
+ return connect.NewError(connect.CodeNotFound, errors.Errorf("project %q not found", parent))
+ }
+ find.Project = &projectID
+ return nil
+}
+
// GetQueryHistory gets a single query history. Query histories are private to
// their creator, so only the creator may retrieve one.
func (s *SQLService) GetQueryHistory(ctx context.Context, req *connect.Request[v1pb.GetQueryHistoryRequest]) (*connect.Response[v1pb.QueryHistory], error) {
diff --git a/backend/generated-go/v1/sql_service.pb.go b/backend/generated-go/v1/sql_service.pb.go
index a748b03466..052a252f23 100644
--- a/backend/generated-go/v1/sql_service.pb.go
+++ b/backend/generated-go/v1/sql_service.pb.go
@@ -1752,6 +1752,11 @@ func (x *DiffMetadataResponse) GetDiff() string {
type SearchQueryHistoriesRequest struct {
state protoimpl.MessageState `protogen:"open.v1"`
+ // The parent project to search query histories in.
+ // Format: projects/{project}
+ // Use "projects/-" to search across all projects
+ // (https://google.aip.dev/159).
+ Parent string `protobuf:"bytes,4,opt,name=parent,proto3" json:"parent,omitempty"`
// The maximum number of histories to return.
// The service may return fewer than this value.
// If unspecified, at most 10 history entries will be returned.
@@ -1813,6 +1818,13 @@ func (*SearchQueryHistoriesRequest) Descriptor() ([]byte, []int) {
return file_v1_sql_service_proto_rawDescGZIP(), []int{14}
}
+func (x *SearchQueryHistoriesRequest) GetParent() string {
+ if x != nil {
+ return x.Parent
+ }
+ return ""
+}
+
func (x *SearchQueryHistoriesRequest) GetPageSize() int32 {
if x != nil {
return x.PageSize
@@ -1838,6 +1850,9 @@ type ListQueryHistoriesRequest struct {
state protoimpl.MessageState `protogen:"open.v1"`
// The parent project whose query histories are listed.
// Format: projects/{project}
+ // Use "projects/-" to list query histories across all projects
+ // (https://google.aip.dev/159); this requires the bb.queryHistories.list
+ // permission on the workspace.
Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
// The maximum number of histories to return.
// The service may return fewer than this value.
@@ -3084,8 +3099,9 @@ const file_v1_sql_service_proto_rawDesc = "" +
"\x0ftarget_metadata\x18\x02 \x01(\v2\x1d.bytebase.v1.DatabaseMetadataB\x03\xe0A\x02R\x0etargetMetadata\x12+\n" +
"\x06engine\x18\x03 \x01(\x0e2\x13.bytebase.v1.EngineR\x06engine\"*\n" +
"\x14DiffMetadataResponse\x12\x12\n" +
- "\x04diff\x18\x01 \x01(\tR\x04diff\"q\n" +
+ "\x04diff\x18\x01 \x01(\tR\x04diff\"\x8e\x01\n" +
"\x1bSearchQueryHistoriesRequest\x12\x1b\n" +
+ "\x06parent\x18\x04 \x01(\tB\x03\xe0A\x02R\x06parent\x12\x1b\n" +
"\tpage_size\x18\x01 \x01(\x05R\bpageSize\x12\x1d\n" +
"\n" +
"page_token\x18\x02 \x01(\tR\tpageToken\x12\x16\n" +
@@ -3135,13 +3151,13 @@ const file_v1_sql_service_proto_rawDesc = "" +
"\aContent\x12N\n" +
"\x05parts\x18\x01 \x03(\v28.bytebase.v1.AICompletionResponse.Candidate.Content.PartR\x05parts\x1a\x1a\n" +
"\x04Part\x12\x12\n" +
- "\x04text\x18\x01 \x01(\tR\x04text2\x8e\n" +
+ "\x04text\x18\x01 \x01(\tR\x04text2\xab\n" +
"\n" +
"\n" +
"SQLService\x12\x8f\x01\n" +
"\x05Query\x12\x19.bytebase.v1.QueryRequest\x1a\x1a.bytebase.v1.QueryResponse\"O\x8a\xea0\x10bb.databases.get\x90\xea0\x01\x98\xea0\x01\x82\xd3\xe4\x93\x02-:\x01*\"(/v1/{name=instances/*/databases/*}:query\x12\x89\x01\n" +
- "\fAdminExecute\x12 .bytebase.v1.AdminExecuteRequest\x1a!.bytebase.v1.AdminExecuteResponse\"0\x8a\xea0\fbb.sql.admin\x90\xea0\x01\x98\xea0\x01\x82\xd3\xe4\x93\x02\x12\x12\x10/v1:adminExecute(\x010\x01\x12\x95\x01\n" +
- "\x14SearchQueryHistories\x12(.bytebase.v1.SearchQueryHistoriesRequest\x1a).bytebase.v1.SearchQueryHistoriesResponse\"(\x90\xea0\x02\x82\xd3\xe4\x93\x02\x1e:\x01*\"\x19/v1/queryHistories:search\x12\xbc\x01\n" +
+ "\fAdminExecute\x12 .bytebase.v1.AdminExecuteRequest\x1a!.bytebase.v1.AdminExecuteResponse\"0\x8a\xea0\fbb.sql.admin\x90\xea0\x01\x98\xea0\x01\x82\xd3\xe4\x93\x02\x12\x12\x10/v1:adminExecute(\x010\x01\x12\xb2\x01\n" +
+ "\x14SearchQueryHistories\x12(.bytebase.v1.SearchQueryHistoriesRequest\x1a).bytebase.v1.SearchQueryHistoriesResponse\"E\xdaA\x06parent\x90\xea0\x02\x82\xd3\xe4\x93\x022:\x01*\"-/v1/{parent=projects/*}/queryHistories:search\x12\xbc\x01\n" +
"\x12ListQueryHistories\x12&.bytebase.v1.ListQueryHistoriesRequest\x1a'.bytebase.v1.ListQueryHistoriesResponse\"U\xdaA\x06parent\x8a\xea0\x16bb.queryHistories.list\x90\xea0\x01\x82\xd3\xe4\x93\x02(\x12&/v1/{parent=projects/*}/queryHistories\x12\x85\x01\n" +
"\x0fGetQueryHistory\x12#.bytebase.v1.GetQueryHistoryRequest\x1a\x19.bytebase.v1.QueryHistory\"2\x90\xea0\x02\x82\xd3\xe4\x93\x02(\x12&/v1/{name=projects/*/queryHistories/*}\x12\x84\x02\n" +
"\x06Export\x12\x1a.bytebase.v1.ExportRequest\x1a\x1b.bytebase.v1.ExportResponse\"\xc0\x01\x8a\xea0\x10bb.databases.get\x90\xea0\x01\x98\xea0\x01\x82\xd3\xe4\x93\x02\x9d\x01:\x01*Z1:\x01*\",/v1/{name=projects/*/plans/*/rollout}:exportZ::\x01*\"5/v1/{name=projects/*/plans/*/rollout/stages/*}:export\")/v1/{name=instances/*/databases/*}:export\x12\x81\x01\n" +
diff --git a/backend/generated-go/v1/sql_service.pb.gw.go b/backend/generated-go/v1/sql_service.pb.gw.go
index 69698e616d..9e349efb22 100644
--- a/backend/generated-go/v1/sql_service.pb.gw.go
+++ b/backend/generated-go/v1/sql_service.pb.gw.go
@@ -127,6 +127,7 @@ func request_SQLService_SearchQueryHistories_0(ctx context.Context, marshaler ru
var (
protoReq SearchQueryHistoriesRequest
metadata runtime.ServerMetadata
+ err error
)
if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
@@ -134,6 +135,14 @@ func request_SQLService_SearchQueryHistories_0(ctx context.Context, marshaler ru
if req.Body != nil {
_, _ = io.Copy(io.Discard, req.Body)
}
+ val, ok := pathParams["parent"]
+ if !ok {
+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "parent")
+ }
+ protoReq.Parent, err = runtime.String(val)
+ if err != nil {
+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "parent", err)
+ }
msg, err := client.SearchQueryHistories(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
return msg, metadata, err
}
@@ -142,10 +151,19 @@ func local_request_SQLService_SearchQueryHistories_0(ctx context.Context, marsha
var (
protoReq SearchQueryHistoriesRequest
metadata runtime.ServerMetadata
+ err error
)
if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
}
+ val, ok := pathParams["parent"]
+ if !ok {
+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "parent")
+ }
+ protoReq.Parent, err = runtime.String(val)
+ if err != nil {
+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "parent", err)
+ }
msg, err := server.SearchQueryHistories(ctx, &protoReq)
return msg, metadata, err
}
@@ -470,7 +488,7 @@ func RegisterSQLServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux,
var stream runtime.ServerTransportStream
ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.SQLService/SearchQueryHistories", runtime.WithHTTPPathPattern("/v1/queryHistories:search"))
+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.SQLService/SearchQueryHistories", runtime.WithHTTPPathPattern("/v1/{parent=projects/*}/queryHistories:search"))
if err != nil {
runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
return
@@ -702,7 +720,7 @@ func RegisterSQLServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux,
ctx, cancel := context.WithCancel(req.Context())
defer cancel()
inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
- annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.SQLService/SearchQueryHistories", runtime.WithHTTPPathPattern("/v1/queryHistories:search"))
+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.SQLService/SearchQueryHistories", runtime.WithHTTPPathPattern("/v1/{parent=projects/*}/queryHistories:search"))
if err != nil {
runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
return
@@ -840,7 +858,7 @@ func RegisterSQLServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux,
var (
pattern_SQLService_Query_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3}, []string{"v1", "instances", "databases", "name"}, "query"))
pattern_SQLService_AdminExecute_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0}, []string{"v1"}, "adminExecute"))
- pattern_SQLService_SearchQueryHistories_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "queryHistories"}, "search"))
+ pattern_SQLService_SearchQueryHistories_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2, 2, 3}, []string{"v1", "projects", "parent", "queryHistories"}, "search"))
pattern_SQLService_ListQueryHistories_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2, 2, 3}, []string{"v1", "projects", "parent", "queryHistories"}, ""))
pattern_SQLService_GetQueryHistory_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3}, []string{"v1", "projects", "queryHistories", "name"}, ""))
pattern_SQLService_Export_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3}, []string{"v1", "instances", "databases", "name"}, "export"))
diff --git a/backend/generated-go/v1/sql_service_equal.pb.go b/backend/generated-go/v1/sql_service_equal.pb.go
index 2d4f2a061b..1f7a6587ac 100644
--- a/backend/generated-go/v1/sql_service_equal.pb.go
+++ b/backend/generated-go/v1/sql_service_equal.pb.go
@@ -558,6 +558,9 @@ func (x *SearchQueryHistoriesRequest) Equal(y *SearchQueryHistoriesRequest) bool
if x == nil || y == nil {
return x == nil && y == nil
}
+ if x.Parent != y.Parent {
+ return false
+ }
if x.PageSize != y.PageSize {
return false
}
diff --git a/backend/migrator/migration/3.21/0004##add_query_history_created_at_index.sql b/backend/migrator/migration/3.21/0004##add_query_history_created_at_index.sql
new file mode 100644
index 0000000000..ea13745531
--- /dev/null
+++ b/backend/migrator/migration/3.21/0004##add_query_history_created_at_index.sql
@@ -0,0 +1 @@
+CREATE INDEX idx_query_history_created_at ON query_history(created_at DESC);
diff --git a/backend/migrator/migration/LATEST.sql b/backend/migrator/migration/LATEST.sql
index 71c44e2fd2..1bd467b2c8 100644
--- a/backend/migrator/migration/LATEST.sql
+++ b/backend/migrator/migration/LATEST.sql
@@ -440,6 +440,8 @@ CREATE INDEX idx_query_history_creator_created_at_project ON query_history(creat
CREATE INDEX idx_query_history_project_created_at ON query_history(project, created_at DESC);
+CREATE INDEX idx_query_history_created_at ON query_history(created_at DESC);
+
-----------------------
-- Instance and instance-scoped tables
-----------------------
diff --git a/backend/migrator/migrator_test.go b/backend/migrator/migrator_test.go
index afcade94c0..22e13b08b9 100644
--- a/backend/migrator/migrator_test.go
+++ b/backend/migrator/migrator_test.go
@@ -17,8 +17,8 @@ import (
func TestLatestVersion(t *testing.T) {
files, err := getSortedVersionedFiles()
require.NoError(t, err)
- require.Equal(t, semver.MustParse("3.21.3"), *files[len(files)-1].version)
- require.Equal(t, "migration/3.21/0003##migrate_gcp_data_source_fields.sql", files[len(files)-1].path)
+ require.Equal(t, semver.MustParse("3.21.4"), *files[len(files)-1].version)
+ require.Equal(t, "migration/3.21/0004##add_query_history_created_at_index.sql", files[len(files)-1].path)
}
func TestVersionUnique(t *testing.T) {
diff --git a/backend/store/query_history.go b/backend/store/query_history.go
index 612cc495a7..7687e1a0a9 100644
--- a/backend/store/query_history.go
+++ b/backend/store/query_history.go
@@ -50,6 +50,11 @@ type FindQueryHistoryMessage struct {
ResourceID *string
Creator *string
Project *string
+ // Workspace scopes the result to projects of the given workspace. It is
+ // required for cross-project listing: query_history has no workspace
+ // column, so without a Project filter the rows must be scoped through the
+ // owning project to keep multi-workspace deployments isolated.
+ Workspace string
// Instance is the instance resource name like instances/{instance}.
Instance *string
// Database is database resource name like instances/{instance}/databases/{database}.
@@ -133,6 +138,9 @@ func (s *Store) ListQueryHistories(ctx context.Context, find *FindQueryHistoryMe
if v := find.Project; v != nil {
q.And("query_history.project = ?", *v)
}
+ if v := find.Workspace; v != "" {
+ q.And("EXISTS (SELECT 1 FROM project WHERE project.resource_id = query_history.project AND project.workspace = ?)", v)
+ }
if v := find.Instance; v != nil {
q.And("query_history.database LIKE ?", *v)
} else if v := find.Database; v != nil {
diff --git a/backend/tests/query_history_test.go b/backend/tests/query_history_test.go
index e949343193..24c62302cc 100644
--- a/backend/tests/query_history_test.go
+++ b/backend/tests/query_history_test.go
@@ -3,6 +3,7 @@ package tests
import (
"context"
"fmt"
+ "strings"
"testing"
"connectrpc.com/connect"
@@ -67,9 +68,42 @@ func TestListQueryHistories(t *testing.T) {
a.Len(queryResp.Msg.Results, 1)
}
+ // 2b. Create a second project with its own database and history so we can
+ // assert that listing is scoped to the parent project.
+ otherProjectID := generateRandomString("qh-other")
+ otherProjectResp, err := ctl.projectServiceClient.CreateProject(ctx, connect.NewRequest(&v1pb.CreateProjectRequest{
+ Project: &v1pb.Project{
+ Name: fmt.Sprintf("projects/%s", otherProjectID),
+ Title: otherProjectID,
+ AllowSelfApproval: true,
+ },
+ ProjectId: otherProjectID,
+ }))
+ a.NoError(err)
+ otherProject := otherProjectResp.Msg
+
+ const otherDatabaseName = "history_db_other"
+ err = ctl.createDatabase(ctx, otherProject, instance, nil, otherDatabaseName, "postgres")
+ a.NoError(err)
+
+ otherDatabaseResp, err := ctl.databaseServiceClient.GetDatabase(ctx, connect.NewRequest(&v1pb.GetDatabaseRequest{
+ Name: fmt.Sprintf("%s/databases/%s", instance.Name, otherDatabaseName),
+ }))
+ a.NoError(err)
+ otherDatabase := otherDatabaseResp.Msg
+
+ const otherStatement = "SELECT 33;"
+ otherQueryResp, err := ctl.sqlServiceClient.Query(ctx, connect.NewRequest(&v1pb.QueryRequest{
+ Name: otherDatabase.Name,
+ Statement: otherStatement,
+ Limit: 10,
+ }))
+ a.NoError(err)
+ a.Len(otherQueryResp.Msg.Results, 1)
+
// Grab one history name for the GetQueryHistory checks below.
searchResp, err := ctl.sqlServiceClient.SearchQueryHistories(ctx, connect.NewRequest(&v1pb.SearchQueryHistoriesRequest{
- Filter: fmt.Sprintf("project == %q", ctl.project.Name),
+ Parent: ctl.project.Name,
}))
a.NoError(err)
a.GreaterOrEqual(len(searchResp.Msg.QueryHistories), 2)
@@ -149,6 +183,33 @@ func TestListQueryHistories(t *testing.T) {
a.Equal(fmt.Sprintf("users/%s", ownerEmail), history.Creator)
}
+ // Listing is scoped to the parent project: the other project's history must
+ // not leak in, and its name must carry the parent project prefix.
+ for _, history := range listResp.Msg.QueryHistories {
+ a.Contains(history.Name, ctl.project.Name+"/queryHistories/")
+ a.NotEqual(otherStatement, history.Statement)
+ a.NotEqual(otherDatabase.Name, history.Database)
+ }
+
+ // The grant is on ctl.project only, so listing the other project is denied.
+ _, err = ctl.sqlServiceClient.ListQueryHistories(ctx, connect.NewRequest(&v1pb.ListQueryHistoriesRequest{
+ Parent: otherProject.Name,
+ }))
+ a.Error(err)
+ a.Equal(connect.CodePermissionDenied, connect.CodeOf(err))
+
+ // The owner (workspace admin) listing the other project sees only that
+ // project's single history.
+ ctl.authInterceptor.token = ownerToken
+ otherListResp, err := ctl.sqlServiceClient.ListQueryHistories(ctx, connect.NewRequest(&v1pb.ListQueryHistoriesRequest{
+ Parent: otherProject.Name,
+ }))
+ a.NoError(err)
+ a.Len(otherListResp.Msg.QueryHistories, 1)
+ a.Equal(otherStatement, otherListResp.Msg.QueryHistories[0].Statement)
+ a.Contains(otherListResp.Msg.QueryHistories[0].Name, otherProject.Name+"/queryHistories/")
+ ctl.authInterceptor.token = auditorToken
+
// Creator filter pins to the given user.
listResp, err = ctl.sqlServiceClient.ListQueryHistories(ctx, connect.NewRequest(&v1pb.ListQueryHistoriesRequest{
Parent: ctl.project.Name,
@@ -182,9 +243,97 @@ func TestListQueryHistories(t *testing.T) {
a.Equal(connect.CodeNotFound, connect.CodeOf(err))
// SearchQueryHistories stays caller-scoped: the auditor sees nothing.
- searchResp, err = ctl.sqlServiceClient.SearchQueryHistories(ctx, connect.NewRequest(&v1pb.SearchQueryHistoriesRequest{}))
+ searchResp, err = ctl.sqlServiceClient.SearchQueryHistories(ctx, connect.NewRequest(&v1pb.SearchQueryHistoriesRequest{
+ Parent: ctl.project.Name,
+ }))
a.NoError(err)
a.Empty(searchResp.Msg.QueryHistories)
+ // 7. Cross-project listing via the AIP-159 wildcard parent "projects/-"
+ // requires a workspace-level grant, so the project-scoped auditor is denied.
+ _, err = ctl.sqlServiceClient.ListQueryHistories(ctx, connect.NewRequest(&v1pb.ListQueryHistoriesRequest{
+ Parent: "projects/-",
+ }))
+ a.Error(err)
+ a.Equal(connect.CodePermissionDenied, connect.CodeOf(err))
+
+ // The owner (workspace admin) lists across all projects and sees rows from
+ // both projects, each named under its own project.
+ ctl.authInterceptor.token = ownerToken
+ wildcardResp, err := ctl.sqlServiceClient.ListQueryHistories(ctx, connect.NewRequest(&v1pb.ListQueryHistoriesRequest{
+ Parent: "projects/-",
+ }))
+ a.NoError(err)
+ a.GreaterOrEqual(len(wildcardResp.Msg.QueryHistories), 3)
+ mainProjectCount, otherProjectCount := 0, 0
+ for _, history := range wildcardResp.Msg.QueryHistories {
+ switch {
+ case strings.HasPrefix(history.Name, ctl.project.Name+"/queryHistories/"):
+ mainProjectCount++
+ case strings.HasPrefix(history.Name, otherProject.Name+"/queryHistories/"):
+ otherProjectCount++
+ a.Equal(otherStatement, history.Statement)
+ default:
+ a.Failf("unexpected project in wildcard listing", "history %q", history.Name)
+ }
+ }
+ a.GreaterOrEqual(mainProjectCount, 2)
+ a.Equal(1, otherProjectCount)
+
+ // The creator filter composes with the wildcard parent.
+ wildcardResp, err = ctl.sqlServiceClient.ListQueryHistories(ctx, connect.NewRequest(&v1pb.ListQueryHistoriesRequest{
+ Parent: "projects/-",
+ Filter: fmt.Sprintf("creator == \"users/%s\"", auditorEmail),
+ }))
+ a.NoError(err)
+ a.Empty(wildcardResp.Msg.QueryHistories)
+
+ // 8. SearchQueryHistories takes the same parent semantics as
+ // ListQueryHistories while staying caller-scoped.
+ searchResp, err = ctl.sqlServiceClient.SearchQueryHistories(ctx, connect.NewRequest(&v1pb.SearchQueryHistoriesRequest{
+ Parent: ctl.project.Name,
+ }))
+ a.NoError(err)
+ a.GreaterOrEqual(len(searchResp.Msg.QueryHistories), 2)
+ for _, history := range searchResp.Msg.QueryHistories {
+ a.Contains(history.Name, ctl.project.Name+"/queryHistories/")
+ a.NotEqual(otherStatement, history.Statement)
+ }
+
+ searchResp, err = ctl.sqlServiceClient.SearchQueryHistories(ctx, connect.NewRequest(&v1pb.SearchQueryHistoriesRequest{
+ Parent: otherProject.Name,
+ }))
+ a.NoError(err)
+ a.Len(searchResp.Msg.QueryHistories, 1)
+ a.Equal(otherStatement, searchResp.Msg.QueryHistories[0].Statement)
+
+ // The wildcard parent searches across all projects.
+ searchResp, err = ctl.sqlServiceClient.SearchQueryHistories(ctx, connect.NewRequest(&v1pb.SearchQueryHistoriesRequest{
+ Parent: "projects/-",
+ }))
+ a.NoError(err)
+ a.GreaterOrEqual(len(searchResp.Msg.QueryHistories), 3)
+
+ // The parent is required.
+ _, err = ctl.sqlServiceClient.SearchQueryHistories(ctx, connect.NewRequest(&v1pb.SearchQueryHistoriesRequest{}))
+ a.Error(err)
+ a.Equal(connect.CodeInvalidArgument, connect.CodeOf(err))
+
+ // A nonexistent parent project is rejected, consistent with
+ // ListQueryHistories.
+ _, err = ctl.sqlServiceClient.SearchQueryHistories(ctx, connect.NewRequest(&v1pb.SearchQueryHistoriesRequest{
+ Parent: "projects/no-such-project",
+ }))
+ a.Error(err)
+ a.Equal(connect.CodeNotFound, connect.CodeOf(err))
+
+ // Search stays caller-scoped even with the wildcard parent: the auditor
+ // has run no queries and sees nothing.
+ ctl.authInterceptor.token = auditorToken
+ searchResp, err = ctl.sqlServiceClient.SearchQueryHistories(ctx, connect.NewRequest(&v1pb.SearchQueryHistoriesRequest{
+ Parent: "projects/-",
+ }))
+ a.NoError(err)
+ a.Empty(searchResp.Msg.QueryHistories)
ctl.authInterceptor.token = ownerToken
}
diff --git a/frontend/src/components/WorkspaceSetupGuide.test.tsx b/frontend/src/components/WorkspaceSetupGuide.test.tsx
index 0a14ea7d6a..f86591f404 100644
--- a/frontend/src/components/WorkspaceSetupGuide.test.tsx
+++ b/frontend/src/components/WorkspaceSetupGuide.test.tsx
@@ -710,6 +710,30 @@ describe("WorkspaceSetupGuide", () => {
expect(container.querySelector("[data-testid='active-action']")).toBeNull();
});
+ it("passes the wildcard parent to the query history check", async () => {
+ mocks.fetchProjectList.mockResolvedValue({
+ projects: [{ name: "projects/project-a" }],
+ nextPageToken: "",
+ });
+ mocks.fetchDatabases.mockImplementation(async ({ parent } = {}) => ({
+ databases:
+ parent === "projects/project-a"
+ ? [{ name: "instances/instance-a/databases/db-a" }]
+ : [],
+ nextPageToken: "",
+ }));
+ mocks.searchQueryHistories.mockResolvedValue({
+ queryHistories: [{ name: "projects/project-a/queryHistories/h1" }],
+ nextPageToken: "",
+ });
+
+ await render(<WorkspaceSetupGuide />);
+
+ expect(mocks.searchQueryHistories).toHaveBeenCalledWith(
+ expect.objectContaining({ parent: "projects/-" })
+ );
+ });
+
it("asks users to create a database when the connected instance has no databases", async () => {
mocks.fetchProjectList.mockResolvedValue({
projects: [{ name: "projects/project-a" }],
diff --git a/frontend/src/components/WorkspaceSetupGuide.tsx b/frontend/src/components/WorkspaceSetupGuide.tsx
index 8ee9dc5fb7..752d53c018 100644
--- a/frontend/src/components/WorkspaceSetupGuide.tsx
+++ b/frontend/src/components/WorkspaceSetupGuide.tsx
@@ -190,6 +190,7 @@ export function WorkspaceSetupGuide() {
const queryHistoryResult =
await sqlServiceClientConnect.searchQueryHistories(
create(SearchQueryHistoriesRequestSchema, {
+ parent: "projects/-",
pageSize: 1,
filter: 'type == "QUERY"',
})
diff --git a/frontend/src/modules/sql-editor/store/queryHistory.test.ts b/frontend/src/modules/sql-editor/store/queryHistory.test.ts
index be9cba1660..757f38067b 100644
--- a/frontend/src/modules/sql-editor/store/queryHistory.test.ts
+++ b/frontend/src/modules/sql-editor/store/queryHistory.test.ts
@@ -114,6 +114,36 @@ describe("getQueryHistoryCacheKey", () => {
});
});
+describe("queryHistory slice — request parent scoping", () => {
+ test("passes the project as parent and keeps project out of the CEL filter", async () => {
+ searchQueryHistoriesMock.mockResolvedValue({
+ queryHistories: [],
+ nextPageToken: "",
+ });
+ const store = makeStore();
+ await store.getState().fetchQueryHistoryList(filter);
+ await store.getState().mergeLatest(filter);
+ expect(searchQueryHistoriesMock).toHaveBeenCalledTimes(2);
+ for (const call of searchQueryHistoriesMock.mock.calls) {
+ const request = call[0] as { parent: string; filter: string };
+ expect(request.parent).toBe("projects/p1");
+ expect(request.filter).not.toContain("project ==");
+ }
+ });
+
+ test("falls back to the projects/- wildcard without a valid project", async () => {
+ searchQueryHistoriesMock.mockResolvedValue({
+ queryHistories: [],
+ nextPageToken: "",
+ });
+ const store = makeStore();
+ await store.getState().fetchQueryHistoryList({ project: "", database: "" });
+ expect(searchQueryHistoriesMock.mock.calls[0][0]).toMatchObject({
+ parent: "projects/-",
+ });
+ });
+});
+
describe("queryHistory slice — fetchQueryHistoryList", () => {
test("replaces the list on first page (no pageToken)", async () => {
searchQueryHistoriesMock.mockResolvedValue({
diff --git a/frontend/src/modules/sql-editor/store/queryHistory.ts b/frontend/src/modules/sql-editor/store/queryHistory.ts
index 426ec83afd..ccfa0ccdee 100644
--- a/frontend/src/modules/sql-editor/store/queryHistory.ts
+++ b/frontend/src/modules/sql-editor/store/queryHistory.ts
@@ -18,11 +18,15 @@ import type {
const EMPTY_ENTRY: QueryHistoryEntry = { queryHistories: [] };
+// Project scoping travels in `parent` (AIP-159; "projects/-" means all
+// projects), so the CEL filter only carries the non-project dimensions.
+const getSearchParent = (filter: QueryHistoryFilter) =>
+ isValidProjectName(filter.project)
+ ? (filter.project as string)
+ : "projects/-";
+
const getListQueryHistoryFilter = (filter: QueryHistoryFilter) => {
const params = [`type == "QUERY"`];
- if (isValidProjectName(filter.project)) {
- params.push(`project == "${filter.project}"`);
- }
if (isValidDatabaseName(filter.database)) {
params.push(`database == "${filter.database}"`);
}
@@ -56,6 +60,7 @@ export const createQueryHistorySlice: SQLEditorSliceCreator<
const pageToken = existing.nextPageToken;
const request = create(SearchQueryHistoriesRequestSchema, {
+ parent: getSearchParent(filter),
pageSize: 5,
pageToken,
filter: getListQueryHistoryFilter(filter),
@@ -112,6 +117,7 @@ export const createQueryHistorySlice: SQLEditorSliceCreator<
const key = getQueryHistoryCacheKey(filter);
const resp = await sqlServiceClientConnect.searchQueryHistories(
create(SearchQueryHistoriesRequestSchema, {
+ parent: getSearchParent(filter),
pageSize: 5,
filter: getListQueryHistoryFilter(filter),
})
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 52a2f3d408..9d22c81b5c 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
@@ -1152,6 +1152,16 @@ export declare const DiffMetadataResponseSchema: GenMessage<DiffMetadataResponse
* @generated from message bytebase.v1.SearchQueryHistoriesRequest
*/
export declare type SearchQueryHistoriesRequest = Message<"bytebase.v1.SearchQueryHistoriesRequest"> & {
+ /**
+ * The parent project to search query histories in.
+ * Format: projects/{project}
+ * Use "projects/-" to search across all projects
+ * (https://google.aip.dev/159).
+ *
+ * @generated from field: string parent = 4;
+ */
+ parent: string;
+
/**
* The maximum number of histories to return.
* The service may return fewer than this value.
@@ -1208,6 +1218,9 @@ export declare type ListQueryHistoriesRequest = Message<"bytebase.v1.ListQueryHi
/**
* The parent project whose query histories are listed.
* Format: projects/{project}
+ * Use "projects/-" to list query histories across all projects
+ * (https://google.aip.dev/159); this requires the bb.queryHistories.list
+ * permission on the workspace.
*
* @generated from field: string parent = 1;
*/
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 13691b2964..3e223f93a8 100644
--- a/frontend/src/types/proto-es/v1/sql_service_pb.js
+++ b/frontend/src/types/proto-es/v1/sql_service_pb.js
@@ -16,7 +16,7 @@ import { file_v1_database_service } from "./database_service_pb";
* Describes the file v1/sql_service.proto.
*/
export const file_v1_sql_service = /*@__PURE__*/
- fileDesc("ChR2MS9zcWxfc2VydmljZS5wcm90bxILYnl0ZWJhc2UudjEiqgEKE0FkbWluRXhlY3V0ZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vRGF0YWJhc2USEQoJc3RhdGVtZW50GAIgASgJEg0KBWxpbWl0GAMgASgFEhMKBnNjaGVtYRgEIAEoCUgAiAEBEhYKCWNvbnRhaW5lchgFIAEoCUgBiAEBQgkKB19zY2hlbWFCDAoKX2NvbnRhaW5lciJBChRBZG1pbkV4ZWN1dGVSZXNwb25zZRIpCgdyZXN1bHRzGAEgAygLMhguYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQi/AEKDFF1ZXJ5UmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9EYXRhYmFzZRIRCglzdGF0ZW1lbnQYAiABKAkSDQoFbGltaXQYAyABKAUSFgoOZGF0YV9zb3VyY2VfaWQYBCABKAkSDwoHZXhwbGFpbhgFIAEoCBITCgZzY2hlbWEYBiABKAlIAIgBARIuCgxxdWVyeV9vcHRpb24YByABKAsyGC5ieXRlYmFzZS52MS5RdWVyeU9wdGlvbhIWCgljb250YWluZXIYCCABKAlIAYgBAUIJCgdfc2NoZW1hQgwKCl9jb250YWluZXIiWAoNUXVlcnlSZXNwb25zZRIpCgdyZXN1bHRzGAEgAygLMhguYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQSHAoUYXBwbGllZF9hY2Nlc3NfZ3JhbnQYAiABKAki+QIKC1F1ZXJ5T3B0aW9uEkoKFXJlZGlzX3J1bl9jb21tYW5kc19vbhgBIAEoDjIrLmJ5dGViYXNlLnYxLlF1ZXJ5T3B0aW9uLlJlZGlzUnVuQ29tbWFuZHNPbhJJChRtc3NxbF9leHBsYWluX2Zvcm1hdBgCIAEoDjIrLmJ5dGViYXNlLnYxLlF1ZXJ5T3B0aW9uLk1TU1FMRXhwbGFpbkZvcm1hdCJbChJSZWRpc1J1bkNvbW1hbmRzT24SJQohUkVESVNfUlVOX0NPTU1BTkRTX09OX1VOU1BFQ0lGSUVEEAASDwoLU0lOR0xFX05PREUQARINCglBTExfTk9ERVMQAiJ2ChJNU1NRTEV4cGxhaW5Gb3JtYXQSJAogTVNTUUxfRVhQTEFJTl9GT1JNQVRfVU5TUEVDSUZJRUQQABIcChhNU1NRTF9FWFBMQUlOX0ZPUk1BVF9BTEwQARIcChhNU1NRTF9FWFBMQUlOX0ZPUk1BVF9YTUwQAiKYCgoLUXVlcnlSZXN1bHQSFAoMY29sdW1uX25hbWVzGAEgAygJEhkKEWNvbHVtbl90eXBlX25hbWVzGAIgAygJEiMKBHJvd3MYAyADKAsyFS5ieXRlYmFzZS52MS5RdWVyeVJvdxISCgpyb3dzX2NvdW50GAQgASgDEg0KBWVycm9yGAUgASgJEioKB2xhdGVuY3kYBiABKAsyGS5nb29nbGUucHJvdG9idWYuRHVyYXRpb24SEQoJc3RhdGVtZW50GAcgASgJEkAKDnBvc3RncmVzX2Vycm9yGAggASgLMiYuYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQuUG9zdGdyZXNFcnJvckgAEjwKDHN5bnRheF9lcnJvchgJIAEoCzIkLmJ5dGViYXNlLnYxLlF1ZXJ5UmVzdWx0LlN5bnRheEVycm9ySAASQAoRcGVybWlzc2lvbl9kZW5pZWQYCiABKAsyIy5ieXRlYmFzZS52MS5QZXJtaXNzaW9uRGVuaWVkRGV0YWlsSAASPgoNY29tbWFuZF9lcnJvchgNIAEoCzIlLmJ5dGViYXNlLnYxLlF1ZXJ5UmVzdWx0LkNvbW1hbmRFcnJvckgAEjIKCG1lc3NhZ2VzGAsgAygLMiAuYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQuTWVzc2FnZRIqCgZtYXNrZWQYDCADKAsyGi5ieXRlYmFzZS52MS5NYXNraW5nUmVhc29uGs4CCg1Qb3N0Z3Jlc0Vycm9yEhAKCHNldmVyaXR5GAEgASgJEgwKBGNvZGUYAiABKAkSDwoHbWVzc2FnZRgDIAEoCRIOCgZkZXRhaWwYBCABKAkSDAoEaGludBgFIAEoCRIQCghwb3NpdGlvbhgGIAEoBRIZChFpbnRlcm5hbF9wb3NpdGlvbhgHIAEoBRIWCg5pbnRlcm5hbF9xdWVyeRgIIAEoCRINCgV3aGVyZRgJIAEoCRITCgtzY2hlbWFfbmFtZRgKIAEoCRISCgp0YWJsZV9uYW1lGAsgASgJEhMKC2NvbHVtbl9uYW1lGAwgASgJEhYKDmRhdGFfdHlwZV9uYW1lGA0gASgJEhcKD2NvbnN0cmFpbnRfbmFtZRgOIAEoCRIMCgRmaWxlGA8gASgJEgwKBGxpbmUYECABKAUSDwoHcm91dGluZRgRIAEoCRo8CgtTeW50YXhFcnJvchItCg5zdGFydF9wb3NpdGlvbhgBIAEoCzIVLmJ5dGViYXNlLnYxLlBvc2l0aW9uGpMBCgxDb21tYW5kRXJyb3ISQAoMY29tbWFuZF90eXBlGAEgASgOMiouYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQuQ29tbWFuZEVycm9yLlR5cGUiQQoEVHlwZRIUChBUWVBFX1VOU1BFQ0lGSUVEEAASBwoDRERMEAESBwoDRE1MEAISEQoNTk9OX1JFQURfT05MWRADGrcBCgdNZXNzYWdlEjUKBWxldmVsGAEgASgOMiYuYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQuTWVzc2FnZS5MZXZlbBIPCgdjb250ZW50GAIgASgJImQKBUxldmVsEhUKEUxFVkVMX1VOU1BFQ0lGSUVEEAASCAoESU5GTxABEgsKB1dBUk5JTkcQAhIJCgVERUJVRxADEgcKA0xPRxAEEgoKBk5PVElDRRAFEg0KCUVYQ0VQVElPThAGQhAKDmRldGFpbGVkX2Vycm9yIr0BCg1NYXNraW5nUmVhc29uEhgKEHNlbWFudGljX3R5cGVfaWQYASABKAkSGwoTc2VtYW50aWNfdHlwZV90aXRsZRgCIAEoCRIXCg9tYXNraW5nX3J1bGVfaWQYAyABKAkSEQoJYWxnb3JpdGhtGAQgASgJEg8KB2NvbnRleHQYBSABKAkSHAoUY2xhc3NpZmljYXRpb25fbGV2ZWwYBiABKAUSGgoSc2VtYW50aWNfdHlwZV9pY29uGAcgASgJIjEKCFF1ZXJ5Um93EiUKBnZhbHVlcxgBIAMoCzIVLmJ5dGViYXNlLnYxLlJvd1ZhbHVlIowFCghSb3dWYWx1ZRIwCgpudWxsX3ZhbHVlGAEgASgOMhouZ29vZ2xlLnByb3RvYnVmLk51bGxWYWx1ZUgAEhQKCmJvb2xfdmFsdWUYAiABKAhIABIVCgtieXRlc192YWx1ZRgDIAEoDEgAEhYKDGRvdWJsZV92YWx1ZRgEIAEoAUgAEhUKC2Zsb2F0X3ZhbHVlGAUgASgCSAASFQoLaW50MzJfdmFsdWUYBiABKAVIABIVCgtpbnQ2NF92YWx1ZRgHIAEoA0gAEhYKDHN0cmluZ192YWx1ZRgIIAEoCUgAEhYKDHVpbnQzMl92YWx1ZRgJIAEoDUgAEhYKDHVpbnQ2NF92YWx1ZRgKIAEoBEgAEi0KC3ZhbHVlX3ZhbHVlGAsgASgLMhYuZ29vZ2xlLnByb3RvYnVmLlZhbHVlSAASOgoPdGltZXN0YW1wX3ZhbHVlGAwgASgLMh8uYnl0ZWJhc2UudjEuUm93VmFsdWUuVGltZXN0YW1wSAASPwoSdGltZXN0YW1wX3R6X3ZhbHVlGA0gASgLMiEuYnl0ZWJhc2UudjEuUm93VmFsdWUuVGltZXN0YW1wVFpIABpTCglUaW1lc3RhbXASNAoQZ29vZ2xlX3RpbWVzdGFtcBgBIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASEAoIYWNjdXJhY3kYAiABKAUacwoLVGltZXN0YW1wVFoSNAoQZ29vZ2xlX3RpbWVzdGFtcBgBIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASDAoEem9uZRgCIAEoCRIOCgZvZmZzZXQYAyABKAUSEAoIYWNjdXJhY3kYBCABKAVCBgoEa2luZCKDAwoGQWR2aWNlEikKBnN0YXR1cxgBIAEoDjIZLmJ5dGViYXNlLnYxLkFkdmljZS5MZXZlbBIMCgRjb2RlGAIgASgFEg0KBXRpdGxlGAMgASgJEg8KB2NvbnRlbnQYBCABKAkSLQoOc3RhcnRfcG9zaXRpb24YBSABKAsyFS5ieXRlYmFzZS52MS5Qb3NpdGlvbhIrCgxlbmRfcG9zaXRpb24YBiABKAsyFS5ieXRlYmFzZS52MS5Qb3NpdGlvbhIvCglydWxlX3R5cGUYByABKA4yHC5ieXRlYmFzZS52MS5BZHZpY2UuUnVsZVR5cGUiSgoFTGV2ZWwSHAoYQURWSUNFX0xFVkVMX1VOU1BFQ0lGSUVEEAASCwoHU1VDQ0VTUxABEgsKB1dBUk5JTkcQAhIJCgVFUlJPUhADIkcKCFJ1bGVUeXBlEhkKFVJVTEVfVFlQRV9VTlNQRUNJRklFRBAAEhAKDFBBUlNFUl9CQVNFRBABEg4KCkFJX1BPV0VSRUQQAiLiAQoNRXhwb3J0UmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9EYXRhYmFzZRIRCglzdGF0ZW1lbnQYAiABKAkSDQoFbGltaXQYAyABKAUSKQoGZm9ybWF0GAQgASgOMhkuYnl0ZWJhc2UudjEuRXhwb3J0Rm9ybWF0Eg0KBWFkbWluGAUgASgIEhAKCHBhc3N3b3JkGAYgASgJEhYKDmRhdGFfc291cmNlX2lkGAcgASgJEhMKBnNjaGVtYRgIIAEoCUgAiAEBQgkKB19zY2hlbWEiPwoORXhwb3J0UmVzcG9uc2USDwoHY29udGVudBgBIAEoDBIcChRhcHBsaWVkX2FjY2Vzc19ncmFudBgCIAEoCSK0AQoTRGlmZk1ldGFkYXRhUmVxdWVzdBI7Cg9zb3VyY2VfbWV0YWRhdGEYASABKAsyHS5ieXRlYmFzZS52MS5EYXRhYmFzZU1ldGFkYXRhQgPgQQISOwoPdGFyZ2V0X21ldGFkYXRhGAIgASgLMh0uYnl0ZWJhc2UudjEuRGF0YWJhc2VNZXRhZGF0YUID4EECEiMKBmVuZ2luZRgDIAEoDjITLmJ5dGViYXNlLnYxLkVuZ2luZSIkChREaWZmTWV0YWRhdGFSZXNwb25zZRIMCgRkaWZmGAEgASgJIlQKG1NlYXJjaFF1ZXJ5SGlzdG9yaWVzUmVxdWVzdBIRCglwYWdlX3NpemUYASABKAUSEgoKcGFnZV90b2tlbhgCIAEoCRIOCgZmaWx0ZXIYAyABKAkigAEKGUxpc3RRdWVyeUhpc3Rvcmllc1JlcXVlc3QSLAoGcGFyZW50GAEgASgJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9Qcm9qZWN0EhEKCXBhZ2Vfc2l6ZRgCIAEoBRISCgpwYWdlX3Rva2VuGAMgASgJEg4KBmZpbHRlchgEIAEoCSJuChpMaXN0UXVlcnlIaXN0b3JpZXNSZXNwb25zZRI3Cg9xdWVyeV9oaXN0b3JpZXMYASADKAsyGS5ieXRlYmFzZS52MS5RdWVyeUhpc3RvcnlCA+BBAxIXCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAkiKwoWR2V0UXVlcnlIaXN0b3J5UmVxdWVzdBIRCgRuYW1lGAEgASgJQgPgQQIicAocU2VhcmNoUXVlcnlIaXN0b3JpZXNSZXNwb25zZRI3Cg9xdWVyeV9oaXN0b3JpZXMYASADKAsyGS5ieXRlYmFzZS52MS5RdWVyeUhpc3RvcnlCA+BBAxIXCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAki1AIKDFF1ZXJ5SGlzdG9yeRIRCgRuYW1lGAEgASgJQgPgQQMSFQoIZGF0YWJhc2UYAiABKAlCA+BBAxIUCgdjcmVhdG9yGAMgASgJQgPgQQMSNAoLY3JlYXRlX3RpbWUYBCABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSFgoJc3RhdGVtZW50GAUgASgJQgPgQQMSFwoFZXJyb3IYBiABKAlCA+BBA0gAiAEBEjAKCGR1cmF0aW9uGAcgASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uQgPgQQMSLAoEdHlwZRgIIAEoDjIeLmJ5dGViYXNlLnYxLlF1ZXJ5SGlzdG9yeS5UeXBlIjMKBFR5cGUSFAoQVFlQRV9VTlNQRUNJRklFRBAAEgkKBVFVRVJZEAESCgoGRVhQT1JUEAJCCAoGX2Vycm9yInsKE0FJQ29tcGxldGlvblJlcXVlc3QSOgoIbWVzc2FnZXMYASADKAsyKC5ieXRlYmFzZS52MS5BSUNvbXBsZXRpb25SZXF1ZXN0Lk1lc3NhZ2UaKAoHTWVzc2FnZRIMCgRyb2xlGAEgASgJEg8KB2NvbnRlbnQYAiABKAkilQIKFEFJQ29tcGxldGlvblJlc3BvbnNlEj8KCmNhbmRpZGF0ZXMYASADKAsyKy5ieXRlYmFzZS52MS5BSUNvbXBsZXRpb25SZXNwb25zZS5DYW5kaWRhdGUauwEKCUNhbmRpZGF0ZRJECgdjb250ZW50GAEgASgLMjMuYnl0ZWJhc2UudjEuQUlDb21wbGV0aW9uUmVzcG9uc2UuQ2FuZGlkYXRlLkNvbnRlbnQaaAoHQ29udGVudBJHCgVwYXJ0cxgBIAMoCzI4LmJ5dGViYXNlLnYxLkFJQ29tcGxldGlvblJlc3BvbnNlLkNhbmRpZGF0ZS5Db250ZW50LlBhcnQaFAoEUGFydBIMCgR0ZXh0GAEgASgJMo4KCgpTUUxTZXJ2aWNlEo8BCgVRdWVyeRIZLmJ5dGViYXNlLnYxLlF1ZXJ5UmVxdWVzdBoaLmJ5dGViYXNlLnYxLlF1ZXJ5UmVzcG9uc2UiT4rqMBBiYi5kYXRhYmFzZXMuZ2V0kOowAZjqMAGC0+STAi06ASoiKC92MS97bmFtZT1pbnN0YW5jZXMvKi9kYXRhYmFzZXMvKn06cXVlcnkSiQEKDEFkbWluRXhlY3V0ZRIgLmJ5dGViYXNlLnYxLkFkbWluRXhlY3V0ZVJlcXVlc3QaIS5ieXRlYmFzZS52MS5BZG1pbkV4ZWN1dGVSZXNwb25zZSIwiuowDGJiLnNxbC5hZG1pbpDqMAGY6jABgtPkkwISEhAvdjE6YWRtaW5FeGVjdXRlKAEwARKVAQoUU2VhcmNoUXVlcnlIaXN0b3JpZXMSKC5ieXRlYmFzZS52MS5TZWFyY2hRdWVyeUhpc3Rvcmllc1JlcXVlc3QaKS5ieXRlYmFzZS52MS5TZWFyY2hRdWVyeUhpc3Rvcmllc1Jlc3BvbnNlIiiQ6jACgtPkkwIeOgEqIhkvdjEvcXVlcnlIaXN0b3JpZXM6c2VhcmNoErwBChJMaXN0UXVlcnlIaXN0b3JpZXMSJi5ieXRlYmFzZS52MS5MaXN0UXVlcnlIaXN0b3JpZXNSZXF1ZXN0GicuYnl0ZWJhc2UudjEuTGlzdFF1ZXJ5SGlzdG9yaWVzUmVzcG9uc2UiVdpBBnBhcmVudIrqMBZiYi5xdWVyeUhpc3Rvcmllcy5saXN0kOowAYLT5JMCKBImL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vcXVlcnlIaXN0b3JpZXMShQEKD0dldFF1ZXJ5SGlzdG9yeRIjLmJ5dGViYXNlLnYxLkdldFF1ZXJ5SGlzdG9yeVJlcXVlc3QaGS5ieXRlYmFzZS52MS5RdWVyeUhpc3RvcnkiMpDqMAKC0+STAigSJi92MS97bmFtZT1wcm9qZWN0cy8qL3F1ZXJ5SGlzdG9yaWVzLyp9EoQCCgZFeHBvcnQSGi5ieXRlYmFzZS52MS5FeHBvcnRSZXF1ZXN0GhsuYnl0ZWJhc2UudjEuRXhwb3J0UmVzcG9uc2UiwAGK6jAQYmIuZGF0YWJhc2VzLmdldJDqMAGY6jABgtPkkwKdAToBKloxOgEqIiwvdjEve25hbWU9cHJvamVjdHMvKi9wbGFucy8qL3JvbGxvdXR9OmV4cG9ydFo6OgEqIjUvdjEve25hbWU9cHJvamVjdHMvKi9wbGFucy8qL3JvbGxvdXQvc3RhZ2VzLyp9OmV4cG9ydCIpL3YxL3tuYW1lPWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qfTpleHBvcnQSgQEKDERpZmZNZXRhZGF0YRIgLmJ5dGViYXNlLnYxLkRpZmZNZXRhZGF0YVJlcXVlc3QaIS5ieXRlYmFzZS52MS5EaWZmTWV0YWRhdGFSZXNwb25zZSIsgOowAYLT5JMCIjoBKiIdL3YxL3NjaGVtYURlc2lnbjpkaWZmTWV0YWRhdGESeAoMQUlDb21wbGV0aW9uEiAuYnl0ZWJhc2UudjEuQUlDb21wbGV0aW9uUmVxdWVzdBohLmJ5dGViYXNlLnYxLkFJQ29tcGxldGlvblJlc3BvbnNlIiOQ6jACgtPkkwIZOgEqIhQvdjEvc3FsL2FpQ29tcGxldGlvbkKlAQoPY29tLmJ5dGViYXNlLnYxQg9TcWxTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [file_google_api_annotations, file_google_api_client, 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+kEXChVieXRlYmFzZS5jb20vRGF0YWJhc2USEQoJc3RhdGVtZW50GAIgASgJEg0KBWxpbWl0GAMgASgFEhMKBnNjaGVtYRgEIAEoCUgAiAEBEhYKCWNvbnRhaW5lchgFIAEoCUgBiAEBQgkKB19zY2hlbWFCDAoKX2NvbnRhaW5lciJBChRBZG1pbkV4ZWN1dGVSZXNwb25zZRIpCgdyZXN1bHRzGAEgAygLMhguYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQi/AEKDFF1ZXJ5UmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9EYXRhYmFzZRIRCglzdGF0ZW1lbnQYAiABKAkSDQoFbGltaXQYAyABKAUSFgoOZGF0YV9zb3VyY2VfaWQYBCABKAkSDwoHZXhwbGFpbhgFIAEoCBITCgZzY2hlbWEYBiABKAlIAIgBARIuCgxxdWVyeV9vcHRpb24YByABKAsyGC5ieXRlYmFzZS52MS5RdWVyeU9wdGlvbhIWCgljb250YWluZXIYCCABKAlIAYgBAUIJCgdfc2NoZW1hQgwKCl9jb250YWluZXIiWAoNUXVlcnlSZXNwb25zZRIpCgdyZXN1bHRzGAEgAygLMhguYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQSHAoUYXBwbGllZF9hY2Nlc3NfZ3JhbnQYAiABKAki+QIKC1F1ZXJ5T3B0aW9uEkoKFXJlZGlzX3J1bl9jb21tYW5kc19vbhgBIAEoDjIrLmJ5dGViYXNlLnYxLlF1ZXJ5T3B0aW9uLlJlZGlzUnVuQ29tbWFuZHNPbhJJChRtc3NxbF9leHBsYWluX2Zvcm1hdBgCIAEoDjIrLmJ5dGViYXNlLnYxLlF1ZXJ5T3B0aW9uLk1TU1FMRXhwbGFpbkZvcm1hdCJbChJSZWRpc1J1bkNvbW1hbmRzT24SJQohUkVESVNfUlVOX0NPTU1BTkRTX09OX1VOU1BFQ0lGSUVEEAASDwoLU0lOR0xFX05PREUQARINCglBTExfTk9ERVMQAiJ2ChJNU1NRTEV4cGxhaW5Gb3JtYXQSJAogTVNTUUxfRVhQTEFJTl9GT1JNQVRfVU5TUEVDSUZJRUQQABIcChhNU1NRTF9FWFBMQUlOX0ZPUk1BVF9BTEwQARIcChhNU1NRTF9FWFBMQUlOX0ZPUk1BVF9YTUwQAiKYCgoLUXVlcnlSZXN1bHQSFAoMY29sdW1uX25hbWVzGAEgAygJEhkKEWNvbHVtbl90eXBlX25hbWVzGAIgAygJEiMKBHJvd3MYAyADKAsyFS5ieXRlYmFzZS52MS5RdWVyeVJvdxISCgpyb3dzX2NvdW50GAQgASgDEg0KBWVycm9yGAUgASgJEioKB2xhdGVuY3kYBiABKAsyGS5nb29nbGUucHJvdG9idWYuRHVyYXRpb24SEQoJc3RhdGVtZW50GAcgASgJEkAKDnBvc3RncmVzX2Vycm9yGAggASgLMiYuYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQuUG9zdGdyZXNFcnJvckgAEjwKDHN5bnRheF9lcnJvchgJIAEoCzIkLmJ5dGViYXNlLnYxLlF1ZXJ5UmVzdWx0LlN5bnRheEVycm9ySAASQAoRcGVybWlzc2lvbl9kZW5pZWQYCiABKAsyIy5ieXRlYmFzZS52MS5QZXJtaXNzaW9uRGVuaWVkRGV0YWlsSAASPgoNY29tbWFuZF9lcnJvchgNIAEoCzIlLmJ5dGViYXNlLnYxLlF1ZXJ5UmVzdWx0LkNvbW1hbmRFcnJvckgAEjIKCG1lc3NhZ2VzGAsgAygLMiAuYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQuTWVzc2FnZRIqCgZtYXNrZWQYDCADKAsyGi5ieXRlYmFzZS52MS5NYXNraW5nUmVhc29uGs4CCg1Qb3N0Z3Jlc0Vycm9yEhAKCHNldmVyaXR5GAEgASgJEgwKBGNvZGUYAiABKAkSDwoHbWVzc2FnZRgDIAEoCRIOCgZkZXRhaWwYBCABKAkSDAoEaGludBgFIAEoCRIQCghwb3NpdGlvbhgGIAEoBRIZChFpbnRlcm5hbF9wb3NpdGlvbhgHIAEoBRIWCg5pbnRlcm5hbF9xdWVyeRgIIAEoCRINCgV3aGVyZRgJIAEoCRITCgtzY2hlbWFfbmFtZRgKIAEoCRISCgp0YWJsZV9uYW1lGAsgASgJEhMKC2NvbHVtbl9uYW1lGAwgASgJEhYKDmRhdGFfdHlwZV9uYW1lGA0gASgJEhcKD2NvbnN0cmFpbnRfbmFtZRgOIAEoCRIMCgRmaWxlGA8gASgJEgwKBGxpbmUYECABKAUSDwoHcm91dGluZRgRIAEoCRo8CgtTeW50YXhFcnJvchItCg5zdGFydF9wb3NpdGlvbhgBIAEoCzIVLmJ5dGViYXNlLnYxLlBvc2l0aW9uGpMBCgxDb21tYW5kRXJyb3ISQAoMY29tbWFuZF90eXBlGAEgASgOMiouYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQuQ29tbWFuZEVycm9yLlR5cGUiQQoEVHlwZRIUChBUWVBFX1VOU1BFQ0lGSUVEEAASBwoDRERMEAESBwoDRE1MEAISEQoNTk9OX1JFQURfT05MWRADGrcBCgdNZXNzYWdlEjUKBWxldmVsGAEgASgOMiYuYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQuTWVzc2FnZS5MZXZlbBIPCgdjb250ZW50GAIgASgJImQKBUxldmVsEhUKEUxFVkVMX1VOU1BFQ0lGSUVEEAASCAoESU5GTxABEgsKB1dBUk5JTkcQAhIJCgVERUJVRxADEgcKA0xPRxAEEgoKBk5PVElDRRAFEg0KCUVYQ0VQVElPThAGQhAKDmRldGFpbGVkX2Vycm9yIr0BCg1NYXNraW5nUmVhc29uEhgKEHNlbWFudGljX3R5cGVfaWQYASABKAkSGwoTc2VtYW50aWNfdHlwZV90aXRsZRgCIAEoCRIXCg9tYXNraW5nX3J1bGVfaWQYAyABKAkSEQoJYWxnb3JpdGhtGAQgASgJEg8KB2NvbnRleHQYBSABKAkSHAoUY2xhc3NpZmljYXRpb25fbGV2ZWwYBiABKAUSGgoSc2VtYW50aWNfdHlwZV9pY29uGAcgASgJIjEKCFF1ZXJ5Um93EiUKBnZhbHVlcxgBIAMoCzIVLmJ5dGViYXNlLnYxLlJvd1ZhbHVlIowFCghSb3dWYWx1ZRIwCgpudWxsX3ZhbHVlGAEgASgOMhouZ29vZ2xlLnByb3RvYnVmLk51bGxWYWx1ZUgAEhQKCmJvb2xfdmFsdWUYAiABKAhIABIVCgtieXRlc192YWx1ZRgDIAEoDEgAEhYKDGRvdWJsZV92YWx1ZRgEIAEoAUgAEhUKC2Zsb2F0X3ZhbHVlGAUgASgCSAASFQoLaW50MzJfdmFsdWUYBiABKAVIABIVCgtpbnQ2NF92YWx1ZRgHIAEoA0gAEhYKDHN0cmluZ192YWx1ZRgIIAEoCUgAEhYKDHVpbnQzMl92YWx1ZRgJIAEoDUgAEhYKDHVpbnQ2NF92YWx1ZRgKIAEoBEgAEi0KC3ZhbHVlX3ZhbHVlGAsgASgLMhYuZ29vZ2xlLnByb3RvYnVmLlZhbHVlSAASOgoPdGltZXN0YW1wX3ZhbHVlGAwgASgLMh8uYnl0ZWJhc2UudjEuUm93VmFsdWUuVGltZXN0YW1wSAASPwoSdGltZXN0YW1wX3R6X3ZhbHVlGA0gASgLMiEuYnl0ZWJhc2UudjEuUm93VmFsdWUuVGltZXN0YW1wVFpIABpTCglUaW1lc3RhbXASNAoQZ29vZ2xlX3RpbWVzdGFtcBgBIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASEAoIYWNjdXJhY3kYAiABKAUacwoLVGltZXN0YW1wVFoSNAoQZ29vZ2xlX3RpbWVzdGFtcBgBIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASDAoEem9uZRgCIAEoCRIOCgZvZmZzZXQYAyABKAUSEAoIYWNjdXJhY3kYBCABKAVCBgoEa2luZCKDAwoGQWR2aWNlEikKBnN0YXR1cxgBIAEoDjIZLmJ5dGViYXNlLnYxLkFkdmljZS5MZXZlbBIMCgRjb2RlGAIgASgFEg0KBXRpdGxlGAMgASgJEg8KB2NvbnRlbnQYBCABKAkSLQoOc3RhcnRfcG9zaXRpb24YBSABKAsyFS5ieXRlYmFzZS52MS5Qb3NpdGlvbhIrCgxlbmRfcG9zaXRpb24YBiABKAsyFS5ieXRlYmFzZS52MS5Qb3NpdGlvbhIvCglydWxlX3R5cGUYByABKA4yHC5ieXRlYmFzZS52MS5BZHZpY2UuUnVsZVR5cGUiSgoFTGV2ZWwSHAoYQURWSUNFX0xFVkVMX1VOU1BFQ0lGSUVEEAASCwoHU1VDQ0VTUxABEgsKB1dBUk5JTkcQAhIJCgVFUlJPUhADIkcKCFJ1bGVUeXBlEhkKFVJVTEVfVFlQRV9VTlNQRUNJRklFRBAAEhAKDFBBUlNFUl9CQVNFRBABEg4KCkFJX1BPV0VSRUQQAiLiAQoNRXhwb3J0UmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9EYXRhYmFzZRIRCglzdGF0ZW1lbnQYAiABKAkSDQoFbGltaXQYAyABKAUSKQoGZm9ybWF0GAQgASgOMhkuYnl0ZWJhc2UudjEuRXhwb3J0Rm9ybWF0Eg0KBWFkbWluGAUgASgIEhAKCHBhc3N3b3JkGAYgASgJEhYKDmRhdGFfc291cmNlX2lkGAcgASgJEhMKBnNjaGVtYRgIIAEoCUgAiAEBQgkKB19zY2hlbWEiPwoORXhwb3J0UmVzcG9uc2USDwoHY29udGVudBgBIAEoDBIcChRhcHBsaWVkX2FjY2Vzc19ncmFudBgCIAEoCSK0AQoTRGlmZk1ldGFkYXRhUmVxdWVzdBI7Cg9zb3VyY2VfbWV0YWRhdGEYASABKAsyHS5ieXRlYmFzZS52MS5EYXRhYmFzZU1ldGFkYXRhQgPgQQISOwoPdGFyZ2V0X21ldGFkYXRhGAIgASgLMh0uYnl0ZWJhc2UudjEuRGF0YWJhc2VNZXRhZGF0YUID4EECEiMKBmVuZ2luZRgDIAEoDjITLmJ5dGViYXNlLnYxLkVuZ2luZSIkChREaWZmTWV0YWRhdGFSZXNwb25zZRIMCgRkaWZmGAEgASgJImkKG1NlYXJjaFF1ZXJ5SGlzdG9yaWVzUmVxdWVzdBITCgZwYXJlbnQYBCABKAlCA+BBAhIRCglwYWdlX3NpemUYASABKAUSEgoKcGFnZV90b2tlbhgCIAEoCRIOCgZmaWx0ZXIYAyABKAkigAEKGUxpc3RRdWVyeUhpc3Rvcmllc1JlcXVlc3QSLAoGcGFyZW50GAEgASgJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9Qcm9qZWN0EhEKCXBhZ2Vfc2l6ZRgCIAEoBRISCgpwYWdlX3Rva2VuGAMgASgJEg4KBmZpbHRlchgEIAEoCSJuChpMaXN0UXVlcnlIaXN0b3JpZXNSZXNwb25zZRI3Cg9xdWVyeV9oaXN0b3JpZXMYASADKAsyGS5ieXRlYmFzZS52MS5RdWVyeUhpc3RvcnlCA+BBAxIXCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAkiKwoWR2V0UXVlcnlIaXN0b3J5UmVxdWVzdBIRCgRuYW1lGAEgASgJQgPgQQIicAocU2VhcmNoUXVlcnlIaXN0b3JpZXNSZXNwb25zZRI3Cg9xdWVyeV9oaXN0b3JpZXMYASADKAsyGS5ieXRlYmFzZS52MS5RdWVyeUhpc3RvcnlCA+BBAxIXCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAki1AIKDFF1ZXJ5SGlzdG9yeRIRCgRuYW1lGAEgASgJQgPgQQMSFQoIZGF0YWJhc2UYAiABKAlCA+BBAxIUCgdjcmVhdG9yGAMgASgJQgPgQQMSNAoLY3JlYXRlX3RpbWUYBCABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSFgoJc3RhdGVtZW50GAUgASgJQgPgQQMSFwoFZXJyb3IYBiABKAlCA+BBA0gAiAEBEjAKCGR1cmF0aW9uGAcgASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uQgPgQQMSLAoEdHlwZRgIIAEoDjIeLmJ5dGViYXNlLnYxLlF1ZXJ5SGlzdG9yeS5UeXBlIjMKBFR5cGUSFAoQVFlQRV9VTlNQRUNJRklFRBAAEgkKBVFVRVJZEAESCgoGRVhQT1JUEAJCCAoGX2Vycm9yInsKE0FJQ29tcGxldGlvblJlcXVlc3QSOgoIbWVzc2FnZXMYASADKAsyKC5ieXRlYmFzZS52MS5BSUNvbXBsZXRpb25SZXF1ZXN0Lk1lc3NhZ2UaKAoHTWVzc2FnZRIMCgRyb2xlGAEgASgJEg8KB2NvbnRlbnQYAiABKAkilQIKFEFJQ29tcGxldGlvblJlc3BvbnNlEj8KCmNhbmRpZGF0ZXMYASADKAsyKy5ieXRlYmFzZS52MS5BSUNvbXBsZXRpb25SZXNwb25zZS5DYW5kaWRhdGUauwEKCUNhbmRpZGF0ZRJECgdjb250ZW50GAEgASgLMjMuYnl0ZWJhc2UudjEuQUlDb21wbGV0aW9uUmVzcG9uc2UuQ2FuZGlkYXRlLkNvbnRlbnQaaAoHQ29udGVudBJHCgVwYXJ0cxgBIAMoCzI4LmJ5dGViYXNlLnYxLkFJQ29tcGxldGlvblJlc3BvbnNlLkNhbmRpZGF0ZS5Db250ZW50LlBhcnQaFAoEUGFydBIMCgR0ZXh0GAEgASgJMqsKCgpTUUxTZXJ2aWNlEo8BCgVRdWVyeRIZLmJ5dGViYXNlLnYxLlF1ZXJ5UmVxdWVzdBoaLmJ5dGViYXNlLnYxLlF1ZXJ5UmVzcG9uc2UiT4rqMBBiYi5kYXRhYmFzZXMuZ2V0kOowAZjqMAGC0+STAi06ASoiKC92MS97bmFtZT1pbnN0YW5jZXMvKi9kYXRhYmFzZXMvKn06cXVlcnkSiQEKDEFkbWluRXhlY3V0ZRIgLmJ5dGViYXNlLnYxLkFkbWluRXhlY3V0ZVJlcXVlc3QaIS5ieXRlYmFzZS52MS5BZG1pbkV4ZWN1dGVSZXNwb25zZSIwiuowDGJiLnNxbC5hZG1pbpDqMAGY6jABgtPkkwISEhAvdjE6YWRtaW5FeGVjdXRlKAEwARKyAQoUU2VhcmNoUXVlcnlIaXN0b3JpZXMSKC5ieXRlYmFzZS52MS5TZWFyY2hRdWVyeUhpc3Rvcmllc1JlcXVlc3QaKS5ieXRlYmFzZS52MS5TZWFyY2hRdWVyeUhpc3Rvcmllc1Jlc3BvbnNlIkXaQQZwYXJlbnSQ6jACgtPkkwIyOgEqIi0vdjEve3BhcmVudD1wcm9qZWN0cy8qfS9xdWVyeUhpc3RvcmllczpzZWFyY2gSvAEKEkxpc3RRdWVyeUhpc3RvcmllcxImLmJ5dGViYXNlLnYxLkxpc3RRdWVyeUhpc3Rvcmllc1JlcXVlc3QaJy5ieXRlYmFzZS52MS5MaXN0UXVlcnlIaXN0b3JpZXNSZXNwb25zZSJV2kEGcGFyZW50iuowFmJiLnF1ZXJ5SGlzdG9yaWVzLmxpc3SQ6jABgtPkkwIoEiYvdjEve3BhcmVudD1wcm9qZWN0cy8qfS9xdWVyeUhpc3RvcmllcxKFAQoPR2V0UXVlcnlIaXN0b3J5EiMuYnl0ZWJhc2UudjEuR2V0UXVlcnlIaXN0b3J5UmVxdWVzdBoZLmJ5dGViYXNlLnYxLlF1ZXJ5SGlzdG9yeSIykOowAoLT5JMCKBImL3YxL3tuYW1lPXByb2plY3RzLyovcXVlcnlIaXN0b3JpZXMvKn0ShAIKBkV4cG9ydBIaLmJ5dGViYXNlLnYxLkV4cG9ydFJlcXVlc3QaGy5ieXRlYmFzZS52MS5FeHBvcnRSZXNwb25zZSLAAYrqMBBiYi5kYXRhYmFzZXMuZ2V0kOowAZjqMAGC0+STAp0BOgEqWjE6ASoiLC92MS97bmFtZT1wcm9qZWN0cy8qL3BsYW5zLyovcm9sbG91dH06ZXhwb3J0Wjo6ASoiNS92MS97bmFtZT1wcm9qZWN0cy8qL3BsYW5zLyovcm9sbG91dC9zdGFnZXMvKn06ZXhwb3J0IikvdjEve25hbWU9aW5zdGFuY2VzLyovZGF0YWJhc2VzLyp9OmV4cG9ydBKBAQoMRGlmZk1ldGFkYXRhEiAuYnl0ZWJhc2UudjEuRGlmZk1ldGFkYXRhUmVxdWVzdBohLmJ5dGViYXNlLnYxLkRpZmZNZXRhZGF0YVJlc3BvbnNlIiyA6jABgtPkkwIiOgEqIh0vdjEvc2NoZW1hRGVzaWduOmRpZmZNZXRhZGF0YRJ4CgxBSUNvbXBsZXRpb24SIC5ieXRlYmFzZS52MS5BSUNvbXBsZXRpb25SZXF1ZXN0GiEuYnl0ZWJhc2UudjEuQUlDb21wbGV0aW9uUmVzcG9uc2UiI5DqMAKC0+STAhk6ASoiFC92MS9zcWwvYWlDb21wbGV0aW9uQqUBCg9jb20uYnl0ZWJhc2UudjFCD1NxbFNlcnZpY2VQcm90b1ABWjRnaXRodWIuY29tL2J5dGViYXNlL2J5dGViYXNlL2JhY2tlbmQvZ2VuZXJhdGVkLWdvL3YxogIDQlhYqgILQnl0ZWJhc2UuVjHKAgtCeXRlYmFzZVxWMeICF0J5dGViYXNlXFYxXEdQQk1ldGFkYXRh6gIMQnl0ZWJhc2U6OlYxYgZwcm90bzM", [file_google_api_annotations, file_google_api_client, 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/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yaml
index 31b2b33335..b7494aba73 100644
--- a/proto/gen/grpc-doc/openapi.yaml
+++ b/proto/gen/grpc-doc/openapi.yaml
@@ -10022,6 +10022,75 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/bytebase.v1.QueryHistory'
+ /v1/projects/{project}/queryHistories:search:
+ post:
+ tags:
+ - SQLService
+ summary: SearchQueryHistories
+ description: |-
+ SearchQueryHistories searches query histories for the caller.
+ Permissions required: None (only returns caller's own query histories)
+ operationId: SQLService_SearchQueryHistories
+ parameters:
+ - name: project
+ in: path
+ description: The project id.
+ required: true
+ schema:
+ type: string
+ requestBody:
+ content:
+ application/json:
+ schema:
+ type: object
+ properties:
+ pageSize:
+ type: integer
+ title: page_size
+ format: int32
+ description: |-
+ The maximum number of histories to return.
+ The service may return fewer than this value.
+ If unspecified, at most 10 history entries will be returned.
+ The maximum value is 1000; values above 1000 will be coerced to 1000.
+ pageToken:
+ type: string
+ title: page_token
+ description: |-
+ A page token, received from a previous `ListQueryHistory` call.
+ Provide this to retrieve the subsequent page.
+ filter:
+ type: string
+ title: filter
+ description: |-
+ Filter is the filter to apply on the search query history
+ The syntax and semantics of CEL are documented at https://github.com/google/cel-spec
+
+ Supported filter:
+ - project: the project full name in "projects/{id}" format, support "==" operator.
+ - database: the database full name in "instances/{id}/databases/{name}" format, support "==" operator.
+ - instance: the instance full name in "instances/{id}" format, support "==" operator.
+ - type: the type, should be "QUERY" or "EXPORT", support "==" operator.
+ - statement: the SQL statement, support ".contains()" operator.
+
+ For example:
+ project == "projects/{project}"
+ database == "instances/{instance}/databases/{database}"
+ instance == "instances/{instance}"
+ type == "QUERY"
+ type == "EXPORT"
+ statement.contains("select")
+ type == "QUERY" && statement.contains("select")
+ title: SearchQueryHistoriesRequest
+ additionalProperties: false
+ required: true
+ responses:
+ "200":
+ description: Success
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/bytebase.v1.SearchQueryHistoriesResponse'
/v1/projects/{project}/releases:
get:
tags:
@@ -12125,28 +12194,6 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/bytebase.v1.SearchProjectsResponse'
- /v1/queryHistories:search:
- post:
- tags:
- - SQLService
- summary: SearchQueryHistories
- description: |-
- SearchQueryHistories searches query histories for the caller.
- Permissions required: None (only returns caller's own query histories)
- operationId: SQLService_SearchQueryHistories
- requestBody:
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/bytebase.v1.SearchQueryHistoriesRequest'
- required: true
- responses:
- "200":
- description: Success
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/bytebase.v1.SearchQueryHistoriesResponse'
/v1/reviewConfigs:
get:
tags:
@@ -22188,6 +22235,9 @@ components:
description: |-
The parent project whose query histories are listed.
Format: projects/{project}
+ Use "projects/-" to list query histories across all projects
+ (https://google.aip.dev/159); this requires the bb.queryHistories.list
+ permission on the workspace.
pageSize:
type: integer
title: page_size
@@ -26039,6 +26089,14 @@ components:
bytebase.v1.SearchQueryHistoriesRequest:
type: object
properties:
+ parent:
+ type: string
+ title: parent
+ description: |-
+ The parent project to search query histories in.
+ Format: projects/{project}
+ Use "projects/-" to search across all projects
+ (https://google.aip.dev/159).
pageSize:
type: integer
title: page_size
@@ -26077,6 +26135,8 @@ components:
statement.contains("select")
type == "QUERY" && statement.contains("select")
title: SearchQueryHistoriesRequest
+ required:
+ - parent
additionalProperties: false
bytebase.v1.SearchQueryHistoriesResponse:
type: object
diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.md
index 5aa0402082..06b5ab2df6 100644
--- a/proto/gen/grpc-doc/v1/README.md
+++ b/proto/gen/grpc-doc/v1/README.md
@@ -4631,7 +4631,7 @@ DatabaseService manages databases and their schemas.
| Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- |
-| parent | [string](#string) | | The parent project whose query histories are listed. Format: projects/{project} |
+| parent | [string](#string) | | The parent project whose query histories are listed. Format: projects/{project} Use &#34;projects/-&#34; to list query histories across all projects (https://google.aip.dev/159); this requires the bb.queryHistories.list permission on the workspace. |
| page_size | [int32](#int32) | | The maximum number of histories to return. The service may return fewer than this value. If unspecified, at most 10 history entries will be returned. The maximum value is 1000; values above 1000 will be coerced to 1000. |
| page_token | [string](#string) | | A page token, received from a previous `ListQueryHistories` call. Provide this to retrieve the subsequent page. |
| filter | [string](#string) | | Filter is the filter to apply on the list query histories. The syntax and semantics of CEL are documented at https://github.com/google/cel-spec
@@ -4948,6 +4948,7 @@ Syntax error with position information for editor highlighting
| Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- |
+| parent | [string](#string) | | The parent project to search query histories in. Format: projects/{project} Use &#34;projects/-&#34; to search across all projects (https://google.aip.dev/159). |
| page_size | [int32](#int32) | | The maximum number of histories to return. The service may return fewer than this value. If unspecified, at most 10 history entries will be returned. The maximum value is 1000; values above 1000 will be coerced to 1000. |
| page_token | [string](#string) | | A page token, received from a previous `ListQueryHistory` call. Provide this to retrieve the subsequent page. |
| filter | [string](#string) | | Filter is the filter to apply on the search query history The syntax and semantics of CEL are documented at https://github.com/google/cel-spec
diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.html
index c83b517466..669388ec2f 100644
--- a/proto/gen/grpc-doc/v1/index.html
+++ b/proto/gen/grpc-doc/v1/index.html
@@ -13971,7 +13971,10 @@ Format: projects/{project}/queryHistories/{id} </p></td>
<td><a href="#string">string</a></td>
<td></td>
<td><p>The parent project whose query histories are listed.
-Format: projects/{project} </p></td>
+Format: projects/{project}
+Use &#34;projects/-&#34; to list query histories across all projects
+(https://google.aip.dev/159); this requires the bb.queryHistories.list
+permission on the workspace. </p></td>
</tr>
<tr>
@@ -14883,6 +14886,16 @@ time.Time.Zone() </p></td>
</thead>
<tbody>
+ <tr>
+ <td>parent</td>
+ <td><a href="#string">string</a></td>
+ <td></td>
+ <td><p>The parent project to search query histories in.
+Format: projects/{project}
+Use &#34;projects/-&#34; to search across all projects
+(https://google.aip.dev/159). </p></td>
+ </tr>
+
<tr>
<td>page_size</td>
<td><a href="#int32">int32</a></td>
@@ -15327,7 +15340,7 @@ Permissions required: None (authenticated users only, requires AI to be enabled)
<tr>
<td>SearchQueryHistories</td>
<td>POST</td>
- <td>/v1/queryHistories:search</td>
+ <td>/v1/{parent=projects/*}/queryHistories:search</td>
<td>*</td>
</tr>
diff --git a/proto/v1/v1/sql_service.proto b/proto/v1/v1/sql_service.proto
index f404808d9e..3f3319a374 100644
--- a/proto/v1/v1/sql_service.proto
+++ b/proto/v1/v1/sql_service.proto
@@ -43,9 +43,10 @@ service SQLService {
// Permissions required: None (only returns caller's own query histories)
rpc SearchQueryHistories(SearchQueryHistoriesRequest) returns (SearchQueryHistoriesResponse) {
option (google.api.http) = {
- post: "/v1/queryHistories:search"
+ post: "/v1/{parent=projects/*}/queryHistories:search"
body: "*"
};
+ option (google.api.method_signature) = "parent";
option (bytebase.v1.auth_method) = CUSTOM;
}
@@ -487,6 +488,12 @@ message DiffMetadataResponse {
}
message SearchQueryHistoriesRequest {
+ // The parent project to search query histories in.
+ // Format: projects/{project}
+ // Use "projects/-" to search across all projects
+ // (https://google.aip.dev/159).
+ string parent = 4 [(google.api.field_behavior) = REQUIRED];
+
// The maximum number of histories to return.
// The service may return fewer than this value.
// If unspecified, at most 10 history entries will be returned.
@@ -521,6 +528,9 @@ message SearchQueryHistoriesRequest {
message ListQueryHistoriesRequest {
// The parent project whose query histories are listed.
// Format: projects/{project}
+ // Use "projects/-" to list query histories across all projects
+ // (https://google.aip.dev/159); this requires the bb.queryHistories.list
+ // permission on the workspace.
string parent = 1 [
(google.api.field_behavior) = REQUIRED,
(google.api.resource_reference) = {type: "bytebase.com/Project"}