Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
feat: support project-scoped instances (#21084)
p0nyf914c2dda629
diff --git a/backend/api/mcp/gen/openapi.yaml b/backend/api/mcp/gen/openapi.yamlindex 5524ff4ef0..d8791c91ca 100644--- a/backend/api/mcp/gen/openapi.yaml+++ b/backend/api/mcp/gen/openapi.yaml@@ -2478,7 +2478,7 @@ paths:- bytebase.v1.InstanceServicesummary: ListInstancesdescription: |-- Lists all database instances.+ Lists database instances, optionally within a project.Permissions required: bb.instances.listoperationId: bytebase.v1.InstanceService.ListInstancesparameters:@@ -8231,7 +8231,7 @@ components:title: namedescription: |-The name of the instance to add a data source to.- Format: instances/{instance}+ Format: instances/{instance} or projects/{project}/instances/{instance}dataSource:title: data_sourcedescription: |-@@ -8836,7 +8836,7 @@ components:title: parentdescription: |-The parent resource shared by all revisions being created.- Format: instances/{instance}/databases/{database}+ Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}requests:type: arrayitems:@@ -8940,7 +8940,8 @@ components:description: |-The parent resource shared by all databases being retrieved.- projects/{project}: batch get databases in a project;- - instances/{instances}: batch get databases in a instance;+ - instances/{instance}: batch get databases in an instance;+ - projects/{project}/instances/{instance}: batch get databases in a project instance;Use "-" as wildcard to batch get databases across parent.names:type: array@@ -9128,7 +9129,7 @@ components:title: parentdescription: |-The parent resource shared by all databases being updated.- Format: instances/{instance}+ Format: instances/{instance} or projects/{project}/instances/{instance}If the operation spans parents, a dash (-) may be accepted as a wildcard.names:type: array@@ -9145,6 +9146,15 @@ components:bytebase.v1.BatchSyncInstancesRequest:type: objectproperties:+ parent:+ type:+ - string+ - "null"+ title: parent+ description: |-+ The parent, which owns this collection of instances.+ Format: projects/{project}. If omitted, all targets must be workspace+ instances; otherwise, every target must belong to this project collection.requests:type: arrayitems:@@ -9167,7 +9177,7 @@ components:title: parentdescription: |-The parent resource shared by all databases being updated.- Format: instances/{instance}+ Format: instances/{instance} or projects/{project}/instances/{instance}If the operation spans parents, a dash (-) may be accepted as a wildcard.We only support updating the project of databases for now.requests:@@ -9194,6 +9204,15 @@ components:bytebase.v1.BatchUpdateInstancesRequest:type: objectproperties:+ parent:+ type:+ - string+ - "null"+ title: parent+ description: |-+ The parent, which owns this collection of instances.+ Format: projects/{project}. If omitted, all targets must be workspace+ instances; otherwise, every target must belong to this project collection.requests:type: arrayitems:@@ -9461,7 +9480,7 @@ components:name:type: stringtitle: name- description: 'Format: instances/{instance}/databases/{database}/changelogs/{changelog}'+ description: 'Format: instances/{instance}/databases/{database}/changelogs/{changelog} or projects/{project}/instances/{instance}/databases/{database}/changelogs/{changelog}'createTime:title: create_time$ref: '#/components/schemas/google.protobuf.Timestamp'@@ -9906,6 +9925,15 @@ components:bytebase.v1.CreateInstanceRequest:type: objectproperties:+ parent:+ type:+ - string+ - "null"+ title: parent+ description: |-+ The parent, which owns this collection of instances.+ Format: projects/{project}. If omitted, the instance is created in the+ workspace collection.instance:title: instancedescription: The instance to create.@@ -9928,7 +9956,7 @@ components:title: initial_database_projectdescription: |-The project to assign newly discovered databases to during initial sync.- Format: projects/{project}+ Format: projects/{project}. This must be unset when `parent` is set.title: CreateInstanceRequestadditionalProperties: falsebytebase.v1.CreateIssueCommentRequest:@@ -9986,8 +10014,6 @@ components:The parent resource where this instance will be created.Workspace resource name: workspaces/{workspace-id}.Environment resource name: environments/environment-id.- Instance resource name: instances/instance-id.- Database resource name: instances/instance-id/databases/database-name.policy:title: policydescription: The policy to create.@@ -10074,7 +10100,7 @@ components:parent:type: stringtitle: parent- description: 'Format: instances/{instance}/databases/{database}'+ description: 'Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}'revision:title: revisiondescription: The revision to create.@@ -10775,7 +10801,7 @@ components:title: namedescription: |-The name of the database.- Format: instances/{instance}/databases/{database}+ Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}{database} is the database name in the instance.state:title: state@@ -10859,7 +10885,7 @@ components:title: namedescription: |-The name of the database catalog.- Format: instances/{instance}/databases/{database}/catalog+ Format: instances/{instance}/databases/{database}/catalog or projects/{project}/instances/{instance}/databases/{database}/catalogschemas:type: arrayitems:@@ -10945,7 +10971,7 @@ components:description: |-The database metadata name.- Format: instances/{instance}/databases/{database}/metadata+ Format: instances/{instance}/databases/{database}/metadata or projects/{project}/instances/{instance}/databases/{database}/metadataschemas:type: arrayitems:@@ -11058,11 +11084,14 @@ components:title: namedescription: |-The name of the instance to delete.- Format: instances/{instance}+ Format: instances/{instance} or projects/{project}/instances/{instance}force:type: booleantitle: force- description: If set to true, any databases and sheets from this project will also be moved to default project, and all open issues will be closed.+ description: |-+ If set to true, a workspace instance's databases are moved to the default+ project before the instance is soft-deleted. Project instances reject this+ option because their databases must remain in the owning project.purge:type: booleantitle: purge@@ -11084,8 +11113,6 @@ components:Format: {resource name}/policies/{policy type}Workspace resource name: workspaces/{workspace-id}.Environment resource name: environments/environment-id.- Instance resource name: instances/instance-id.- Database resource name: instances/instance-id/databases/database-name.title: DeletePolicyRequestadditionalProperties: falsebytebase.v1.DeleteProjectRequest:@@ -11139,7 +11166,7 @@ components:title: namedescription: |-The name of the revision to delete.- Format: instances/{instance}/databases/{database}/revisions/{revision}+ Format: instances/{instance}/databases/{database}/revisions/{revision} or projects/{project}/instances/{instance}/databases/{database}/revisions/{revision}title: DeleteRevisionRequestadditionalProperties: falsebytebase.v1.DeleteRoleRequest:@@ -11247,7 +11274,7 @@ components:title: namedescription: |-The database whose current schema is the diff source.- Format: instances/{instance}/databases/{database}+ Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}targetMetadata:title: target_metadatadescription: |-@@ -11278,8 +11305,8 @@ components:description: |-The name of the database or changelog.Format:- database: instances/{instance}/databases/{database}- changelog: instances/{instance}/databases/{database}/changelogs/{changelog}+ database: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}+ changelog: instances/{instance}/databases/{database}/changelogs/{changelog} or projects/{project}/instances/{instance}/databases/{database}/changelogs/{changelog}- oneOf:- type: objectproperties:@@ -11289,7 +11316,7 @@ components:description: |-The resource name of the changelogFormat:- instances/{instance}/databases/{database}/changelogs/{changelog}+ instances/{instance}/databases/{database}/changelogs/{changelog} or projects/{project}/instances/{instance}/databases/{database}/changelogs/{changelog}title: changelogrequired:- changelog@@ -11960,7 +11987,7 @@ components:title: namedescription: |-The name of the changelog to retrieve.- Format: instances/{instance}/databases/{database}/changelogs/{changelog}+ Format: instances/{instance}/databases/{database}/changelogs/{changelog} or projects/{project}/instances/{instance}/databases/{database}/changelogs/{changelog}view:title: view$ref: '#/components/schemas/bytebase.v1.ChangelogView'@@ -11974,7 +12001,7 @@ components:title: namedescription: |-The name of the database catalog to retrieve.- Format: instances/{instance}/databases/{database}/catalog+ Format: instances/{instance}/databases/{database}/catalog or projects/{project}/instances/{instance}/databases/{database}/catalogtitle: GetDatabaseCatalogRequestadditionalProperties: falsedescription: Request message for getting a database catalog.@@ -12002,7 +12029,7 @@ components:title: namedescription: |-The name of the database to retrieve metadata.- Format: instances/{instance}/databases/{database}/metadata+ Format: instances/{instance}/databases/{database}/metadata or projects/{project}/instances/{instance}/databases/{database}/metadatafilter:type: stringtitle: filter@@ -12040,7 +12067,7 @@ components:title: namedescription: |-The name of the database to retrieve.- Format: instances/{instance}/databases/{database}+ Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}title: GetDatabaseRequestadditionalProperties: falsebytebase.v1.GetDatabaseSDLSchemaRequest:@@ -12051,7 +12078,7 @@ components:title: namedescription: |-The name of the database to retrieve SDL schema.- Format: instances/{instance}/databases/{database}/sdlSchema+ Format: instances/{instance}/databases/{database}/sdlSchema or projects/{project}/instances/{instance}/databases/{database}/sdlSchemaformat:title: formatdescription: The format of the SDL schema output.@@ -12074,7 +12101,7 @@ components:title: namedescription: |-The name of the database to retrieve schema.- Format: instances/{instance}/databases/{database}/schema+ Format: instances/{instance}/databases/{database}/schema or projects/{project}/instances/{instance}/databases/{database}/schematitle: GetDatabaseSchemaRequestadditionalProperties: falsebytebase.v1.GetGroupRequest:@@ -12121,7 +12148,7 @@ components:title: namedescription: |-The name of the instance to retrieve.- Format: instances/{instance}+ Format: instances/{instance} or projects/{project}/instances/{instance}title: GetInstanceRequestadditionalProperties: falsebytebase.v1.GetIssueRequest:@@ -12226,7 +12253,7 @@ components:title: namedescription: |-The name of the revision.- Format: instances/{instance}/databases/{database}/revisions/{revision}+ Format: instances/{instance}/databases/{database}/revisions/{revision} or projects/{project}/instances/{instance}/databases/{database}/revisions/{revision}title: GetRevisionRequestadditionalProperties: falsebytebase.v1.GetRoleRequest:@@ -12260,7 +12287,7 @@ components:title: namedescription: |-The name of the database.- Format: instances/{instance}/databases/{database}+ Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}type:title: type$ref: '#/components/schemas/bytebase.v1.GetSchemaStringRequest.ObjectType'@@ -12718,7 +12745,7 @@ components:title: namedescription: |-The name of the instance.- Format: instances/{instance}+ Format: instances/{instance} or projects/{project}/instances/{instance}state:title: statedescription: The lifecycle state of the instance.@@ -12830,7 +12857,7 @@ components:title: namedescription: |-The name of the instance.- Format: instances/{instance}+ Format: instances/{instance} or projects/{project}/instances/{instance}environment:type:- string@@ -12849,7 +12876,7 @@ components:title: namedescription: |-The name of the role.- Format: instances/{instance}/roles/{role}+ Format: instances/{instance}/roles/{role} or projects/{project}/instances/{instance}/roles/{role}The role name is the unique name for the role.roleName:type: string@@ -13371,7 +13398,7 @@ components:title: parentdescription: |-The parent of the changelogs.- Format: instances/{instance}/databases/{database}+ Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}pageSize:type: integertitle: page_size@@ -13463,7 +13490,8 @@ components:description: |-- projects/{project}: list databases in a project, require "bb.projects.get" permission.- workspaces/{id}: list databases in the workspace, require "bb.databases.list" permission.- - instances/{instances}: list databases in a instance, require "bb.instances.get" permission+ - instances/{instance}: list databases in an instance, require "bb.instances.get" permission.+ - projects/{project}/instances/{instance}: list databases in a project instance, require "bb.instances.get" permission.pageSize:type: integertitle: page_size@@ -13643,7 +13671,7 @@ components:title: namedescription: |-The name of the instance.- Format: instances/{instance}+ Format: instances/{instance} or projects/{project}/instances/{instance}instance:oneOf:- $ref: '#/components/schemas/bytebase.v1.Instance'@@ -13671,7 +13699,7 @@ components:title: parentdescription: |-The parent, which owns this collection of roles.- Format: instances/{instance}+ Format: instances/{instance} or projects/{project}/instances/{instance}pageSize:type: integertitle: page_size@@ -13718,6 +13746,16 @@ components:bytebase.v1.ListInstancesRequest:type: objectproperties:+ parent:+ type:+ - string+ - "null"+ title: parent+ description: |-+ The parent, which owns this collection of instances.+ Format: projects/{project}. If omitted, only workspace instances are+ returned. Wildcard project parents are not supported. When set, the+ `project` filter must be omitted or match this parent.pageSize:type: integertitle: page_size@@ -14273,7 +14311,7 @@ components:title: parentdescription: |-The parent of the revisions.- Format: instances/{instance}/databases/{database}+ Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}pageSize:type: integertitle: page_size@@ -15766,8 +15804,6 @@ components:Format: {resource name}/policies/{policy type}Workspace resource name: workspaces/{workspace-id}.Environment resource name: environments/environment-id.- Instance resource name: instances/instance-id.- Database resource name: instances/instance-id/databases/database-name.inheritFromParent:type: booleantitle: inherit_from_parent@@ -16707,7 +16743,7 @@ components:title: namedescription: |-The name of the instance to remove a data source from.- Format: instances/{instance}+ Format: instances/{instance} or projects/{project}/instances/{instance}dataSource:title: data_sourcedescription: |-@@ -16870,7 +16906,7 @@ components:name:type: stringtitle: name- description: 'Format: instances/{instance}/databases/{database}/revisions/{revision}'+ description: 'Format: instances/{instance}/databases/{database}/revisions/{revision} or projects/{project}/instances/{instance}/databases/{database}/revisions/{revision}'release:type: stringtitle: release@@ -18679,7 +18715,7 @@ components:title: namedescription: |-The name of the database to sync.- Format: instances/{instance}/databases/{database}+ Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}title: SyncDatabaseRequestadditionalProperties: falsebytebase.v1.SyncDatabaseResponse:@@ -18704,7 +18740,7 @@ components:title: namedescription: |-The name of instance.- Format: instances/{instance}+ Format: instances/{instance} or projects/{project}/instances/{instance}enableFullSync:type: booleantitle: enable_full_sync@@ -19938,7 +19974,7 @@ components:title: namedescription: |-The name of the deleted instance.- Format: instances/{instance}+ Format: instances/{instance} or projects/{project}/instances/{instance}title: UndeleteInstanceRequestadditionalProperties: falsebytebase.v1.UndeleteProjectRequest:@@ -20006,7 +20042,7 @@ components:title: namedescription: |-The name of the instance to update a data source.- Format: instances/{instance}+ Format: instances/{instance} or projects/{project}/instances/{instance}dataSource:title: data_sourcedescription: Identified by data source ID.@@ -20036,7 +20072,7 @@ components:The database catalog to update.The catalog's `name` field is used to identify the database catalog to update.- Format: instances/{instance}/databases/{database}/catalog+ Format: instances/{instance}/databases/{database}/catalog or projects/{project}/instances/{instance}/databases/{database}/catalog$ref: '#/components/schemas/bytebase.v1.DatabaseCatalog'allowMissing:type: boolean@@ -20080,7 +20116,7 @@ components:The database to update.The database's `name` field is used to identify the database to update.- Format: instances/{instance}/databases/{database}+ Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}$ref: '#/components/schemas/bytebase.v1.Database'updateMask:title: update_mask@@ -20166,7 +20202,7 @@ components:The instance to update.The instance's `name` field is used to identify the instance to update.- Format: instances/{instance}+ Format: instances/{instance} or projects/{project}/instances/{instance}$ref: '#/components/schemas/bytebase.v1.Instance'updateMask:title: update_mask@@ -20177,7 +20213,9 @@ components:title: allow_missingdescription: |-If set to true, and the instance is not found, a new instance will be created.- In this situation, `update_mask` is ignored.+ In this situation, `update_mask` is ignored. A project-nested name creates+ the instance only under its encoded active, non-default project; it never+ falls back to a workspace instance.title: UpdateInstanceRequestadditionalProperties: falsebytebase.v1.UpdateIssueCommentRequest:@@ -20263,8 +20301,6 @@ components:Format: {resource name}/policies/{policy type}Workspace resource name: workspaces/{workspace-id}.Environment resource name: environments/environment-id.- Instance resource name: instances/instance-id.- Database resource name: instances/instance-id/databases/database-name.$ref: '#/components/schemas/bytebase.v1.Policy'updateMask:title: update_maskdiff --git a/backend/api/v1/acl.go b/backend/api/v1/acl.goindex 827759d14c..5fb53054d4 100644--- a/backend/api/v1/acl.go+++ b/backend/api/v1/acl.go@@ -90,6 +90,13 @@ func hasAllowMissingEnabled(request any) bool {if request == nil {return false}+ if r, ok := request.(*v1pb.BatchUpdateInstancesRequest); ok {+ for _, updateRequest := range r.GetRequests() {+ if updateRequest.GetAllowMissing() {+ return true+ }+ }+ }pm, ok := request.(proto.Message)if !ok {@@ -128,6 +135,9 @@ func (in *ACLInterceptor) doACLCheck(ctx context.Context, request any, fullMetho}resources, err := populateRawResources(ctx, in.store, request, fullMethod)if err != nil {+ if common.ErrorCode(err) == common.NotFound {+ return connect.NewError(connect.CodeNotFound, err)+ }return connect.NewError(connect.CodeInternal, errors.Errorf("failed to populate raw resources %s", err))}authContext.Resources = resources@@ -299,22 +309,206 @@ func doIAMPermissionCheck(ctx context.Context, iamManager *iam.Manager, fullMethreturn true, nil, nil}-var workspaceRegex = regexp.MustCompile(`^workspaces/[^/]+`)-var projectRegex = regexp.MustCompile(`^projects/[^/]+`)-var databaseRegex = regexp.MustCompile(`^instances/[^/]+/databases/[^/]+`)-var instanceRegex = regexp.MustCompile(`^instances/[^/]+`)--// populateRawResources extracts resources from the request and validates workspace ownership.-//-// Resource resolution strategy:-// - workspaces/{id} → ResourceTypeWorkspace (direct match)-// - projects/{id} → ResourceTypeProject (direct match)-// - instances/{id}/databases/{name} → looks up database with workspace filter, returns ResourceTypeProject (parent project)-// - instances/{id}[/...] → looks up instance with workspace filter, returns ResourceTypeWorkspace (instance permissions are workspace-scoped)-// - default → ResourceTypeWorkspace from context (fallback for unmatched patterns)-//-// All instance/database lookups use the workspace ID from the request context,-// ensuring the resource belongs to the caller's workspace before any permission check.+const (+ maxResourceRouteDepth = 3++ workspaceCollection = "workspaces"+ projectCollection = "projects"+ instanceCollection = "instances"+ databaseCollection = "databases"+)++type resourceRoute [maxResourceRouteDepth]string++type resourceResolver func(context.Context, *store.Store, []string) (*common.Resource, error)++var resourceResolvers = map[resourceRoute]resourceResolver{+ {workspaceCollection}: resolveWorkspaceResource,+ {projectCollection}: resolveProjectResource,+ {projectCollection, instanceCollection}: resolveProjectInstanceResource,+ {projectCollection, instanceCollection, databaseCollection}: resolveProjectDatabaseResource,+ {instanceCollection}: resolveWorkspaceInstanceResource,+ {instanceCollection, databaseCollection}: resolveWorkspaceDatabaseResource,+}++func getResourceRoute(parts []string) resourceRoute {+ var route resourceRoute+ for i := range route {+ partIndex := 2 * i+ if partIndex >= len(parts) {+ break+ }+ route[i] = parts[partIndex]+ }+ return route+}++func findResourceResolver(route resourceRoute) (resourceRoute, resourceResolver, bool) {+ for {+ if resolver, ok := resourceResolvers[route]; ok {+ return route, resolver, true+ }+ cleared := false+ for i := len(route) - 1; i >= 0; i-- {+ if route[i] != "" {+ route[i] = ""+ cleared = true+ break+ }+ }+ if !cleared {+ return resourceRoute{}, nil, false+ }+ }+}++func resolveRawResource(ctx context.Context, stores *store.Store, name string) (*common.Resource, error) {+ if name == "projects/-" || strings.HasPrefix(name, "instances/-/databases/") {+ return workspaceFallback(ctx), nil+ }++ parts := strings.Split(name, "/")+ _, resolver, ok := findResourceResolver(getResourceRoute(parts))+ if !ok {+ return workspaceFallback(ctx), nil+ }+ return resolver(ctx, stores, parts)+}++func resolveWorkspaceResource(_ context.Context, _ *store.Store, parts []string) (*common.Resource, error) {+ workspaceID, err := requiredResourceIdentifier(parts, 1, workspaceCollection)+ if err != nil {+ return nil, err+ }+ return &common.Resource{Type: common.ResourceTypeWorkspace, ID: workspaceID}, nil+}++func resolveProjectResource(_ context.Context, _ *store.Store, parts []string) (*common.Resource, error) {+ projectID, err := requiredResourceIdentifier(parts, 1, projectCollection)+ if err != nil {+ return nil, err+ }+ return &common.Resource{Type: common.ResourceTypeProject, ID: projectID}, nil+}++func resolveProjectInstanceResource(ctx context.Context, stores *store.Store, parts []string) (*common.Resource, error) {+ projectID, err := requiredResourceIdentifier(parts, 1, projectCollection)+ if err != nil {+ return nil, err+ }+ instanceID, err := requiredResourceIdentifier(parts, 3, instanceCollection)+ if err != nil {+ return nil, err+ }+ if _, err := getProjectScopedInstance(ctx, stores, projectID, instanceID); err != nil {+ return nil, err+ }+ return &common.Resource{Type: common.ResourceTypeProject, ID: projectID}, nil+}++func resolveProjectDatabaseResource(ctx context.Context, stores *store.Store, parts []string) (*common.Resource, error) {+ projectID, err := requiredResourceIdentifier(parts, 1, projectCollection)+ if err != nil {+ return nil, err+ }+ instanceID, err := requiredResourceIdentifier(parts, 3, instanceCollection)+ if err != nil {+ return nil, err+ }+ databaseName, err := requiredResourceIdentifier(parts, 5, databaseCollection)+ if err != nil {+ return nil, err+ }+ instance, err := getProjectScopedInstance(ctx, stores, projectID, instanceID)+ if err != nil {+ return nil, err+ }+ database, err := stores.GetDatabase(ctx, &store.FindDatabaseMessage{+ Workspace: common.GetWorkspaceIDFromContext(ctx),+ InstanceID: &instance.ResourceID,+ DatabaseName: &databaseName,+ ShowDeleted: true,+ })+ if err != nil {+ return nil, errors.Wrapf(err, "failed to get database")+ }+ if database == nil {+ return nil, common.Errorf(common.NotFound, "database %q not found", strings.Join(parts[:6], "/"))+ }+ return &common.Resource{Type: common.ResourceTypeProject, ID: projectID}, nil+}++func resolveWorkspaceInstanceResource(ctx context.Context, stores *store.Store, parts []string) (*common.Resource, error) {+ instanceID, err := requiredResourceIdentifier(parts, 1, instanceCollection)+ if err != nil {+ return nil, err+ }+ workspaceID := common.GetWorkspaceIDFromContext(ctx)+ instance, err := stores.GetInstance(ctx, &store.FindInstanceMessage{+ Workspace: workspaceID,+ WorkspaceOnly: true,+ ResourceID: &instanceID,+ })+ if err != nil {+ return nil, errors.Wrapf(err, "failed to get instance")+ }+ if instance == nil {+ return nil, common.Errorf(common.NotFound, "instance %q not found", strings.Join(parts[:2], "/"))+ }+ return &common.Resource{Type: common.ResourceTypeWorkspace, ID: workspaceID}, nil+}++func resolveWorkspaceDatabaseResource(ctx context.Context, stores *store.Store, parts []string) (*common.Resource, error) {+ instanceID, err := requiredResourceIdentifier(parts, 1, instanceCollection)+ if err != nil {+ return nil, err+ }+ databaseName, err := requiredResourceIdentifier(parts, 3, databaseCollection)+ if err != nil {+ return nil, err+ }+ workspaceID := common.GetWorkspaceIDFromContext(ctx)+ instance, err := stores.GetInstance(ctx, &store.FindInstanceMessage{+ Workspace: workspaceID,+ WorkspaceOnly: true,+ ResourceID: &instanceID,+ })+ if err != nil {+ return nil, errors.Wrapf(err, "failed to get instance")+ }+ if instance == nil {+ return nil, errors.Errorf("instance %q not found", instanceID)+ }+ database, err := stores.GetDatabase(ctx, &store.FindDatabaseMessage{+ Workspace: workspaceID,+ InstanceID: &instanceID,+ DatabaseName: &databaseName,+ ShowDeleted: true,+ })+ if err != nil {+ return nil, errors.Wrapf(err, "failed to get database")+ }+ if database == nil {+ return nil, common.Errorf(common.NotFound, "database %q not found", strings.Join(parts[:4], "/"))+ }+ return &common.Resource{Type: common.ResourceTypeProject, ID: database.ProjectID}, nil+}++func requiredResourceIdentifier(parts []string, index int, collection string) (string, error) {+ if len(parts) <= index || parts[index] == "" {+ return "", errors.Errorf("invalid %s resource %q", collection, strings.Join(parts, "/"))+ }+ return parts[index], nil+}++func workspaceFallback(ctx context.Context) *common.Resource {+ if workspaceID := common.GetWorkspaceIDFromContext(ctx); workspaceID != "" {+ return &common.Resource{Type: common.ResourceTypeWorkspace, ID: workspaceID}+ }+ return nil+}++// populateRawResources extracts authorization resources from the request.func populateRawResources(ctx context.Context, stores *store.Store, request any, method string) ([]*common.Resource, error) {rawNames, err := getResourceFromRequest(ctx, request, method)if err != nil {@@ -323,98 +517,32 @@ func populateRawResources(ctx context.Context, stores *store.Store, request any,var resources []*common.Resourcefor _, name := range rawNames {- switch {- case strings.HasPrefix(name, "workspaces/"):- match := workspaceRegex.FindString(name)- if match == "" {- return nil, errors.Errorf("invalid workspace resource %q", name)- }- wsID, err := common.GetWorkspaceID(match)- if err != nil {- return nil, err- }- resources = append(resources, &common.Resource{- Type: common.ResourceTypeWorkspace,- ID: wsID,- })- // TODO(d): remove "projects/-" hack later.- case strings.HasPrefix(name, "projects/") && name != "projects/-":- project := projectRegex.FindString(name)- if project == "" {- return nil, errors.Errorf("invalid project resource %q", name)- }- projectID, err := common.GetProjectID(project)- if err != nil {- return nil, err- }- resources = append(resources, &common.Resource{- Type: common.ResourceTypeProject,- ID: projectID,- })- // Database resources: look up the database (with workspace filter) and resolve- // to its parent project for project-level permission checks.- case strings.HasPrefix(name, "instances/") && strings.Contains(name, "/databases/") && !strings.HasPrefix(name, "instances/-/databases/"):- match := databaseRegex.FindString(name)- if match != "" {- instanceID, databaseName, err := common.GetInstanceDatabaseID(match)- if err != nil {- return nil, errors.Wrapf(err, "failed to parse %q", match)- }- database, err := stores.GetDatabase(ctx, &store.FindDatabaseMessage{- Workspace: common.GetWorkspaceIDFromContext(ctx),- InstanceID: &instanceID,- DatabaseName: &databaseName,- ShowDeleted: true,- })- if err != nil {- return nil, errors.Wrapf(err, "failed to get database")- }- if database == nil {- return nil, errors.Errorf("database %q not found", match)- }- resources = append(resources, &common.Resource{- Type: common.ResourceTypeProject,- ID: database.ProjectID,- })- }- // Instance resources (e.g. instances/{id}, instances/{id}/roles/{role}):- // validate the instance belongs to the caller's workspace. Returns workspace- // resource since instance permissions are workspace-scoped.- case strings.HasPrefix(name, "instances/") && !strings.Contains(name, "/databases/"):- match := instanceRegex.FindString(name)- if match != "" {- instanceID, err := common.GetInstanceID(match)- if err != nil {- return nil, errors.Wrapf(err, "failed to parse %q", match)- }- workspaceID := common.GetWorkspaceIDFromContext(ctx)- instance, err := stores.GetInstance(ctx, &store.FindInstanceMessage{- Workspace: workspaceID,- ResourceID: &instanceID,- })- if err != nil {- return nil, errors.Wrapf(err, "failed to get instance")- }- if instance == nil {- return nil, errors.Errorf("instance %q not found", match)- }- resources = append(resources, &common.Resource{- Type: common.ResourceTypeWorkspace,- ID: workspaceID,- })- }- default:- if workspaceID := common.GetWorkspaceIDFromContext(ctx); workspaceID != "" {- resources = append(resources, &common.Resource{- Type: common.ResourceTypeWorkspace,- ID: workspaceID,- })- }+ resource, err := resolveRawResource(ctx, stores, name)+ if err != nil {+ return nil, err+ }+ if resource != nil {+ resources = append(resources, resource)}}return resources, nil}+func getProjectScopedInstance(ctx context.Context, stores *store.Store, projectID, instanceID string) (*store.InstanceMessage, error) {+ instance, err := stores.GetInstance(ctx, &store.FindInstanceMessage{+ Workspace: common.GetWorkspaceIDFromContext(ctx),+ ProjectID: &projectID,+ ResourceID: &instanceID,+ })+ if err != nil {+ return nil, errors.Wrapf(err, "failed to get instance")+ }+ if instance == nil {+ return nil, common.Errorf(common.NotFound, "instance %q not found", common.FormatProjectInstance(projectID, instanceID))+ }+ return instance, nil+}+func getResourceFromRequest(ctx context.Context, request any, method string) ([]string, error) {pm, ok := request.(proto.Message)if !ok {@@ -428,17 +556,49 @@ func getResourceFromRequest(ctx context.Context, request any, method string) ([]}shortMethod := methodTokens[2]- if r, ok := request.(*v1pb.ListInstanceDatabaseRequest); ok && r.GetInstance() != nil {- return []string{""}, nil- }-var resources []string+ if r, ok := request.(*v1pb.CreateInstanceRequest); ok && r.Parent != nil {+ projectID, err := common.GetProjectID(*r.Parent)+ if err == nil && common.IsDefaultProject(common.GetWorkspaceIDFromContext(ctx), projectID) {+ // Default projects cannot own instances. Authorize at workspace scope so+ // InstanceService can return its canonical invalid-argument response.+ return []string{""}, nil+ }+ }+ if r, ok := request.(*v1pb.UpdateInstanceRequest); ok && r.AllowMissing && r.Instance != nil {+ if projectID, _, err := common.GetProjectIDInstanceID(r.Instance.Name); err == nil {+ // The instance does not exist yet, so authorize the implicit creation+ // against its project collection instead of resolving the instance.+ return []string{common.FormatProject(projectID)}, nil+ }+ if _, err := common.GetInstanceID(r.Instance.Name); err == nil {+ return []string{""}, nil+ }+ }+ if r, ok := request.(*v1pb.BatchUpdateInstancesRequest); ok {+ // The batch parent authorizes every implicit creation. An empty parent+ // represents the workspace instance collection.+ resources = append(resources, r.GetParent())+ for _, updateRequest := range r.GetRequests() {+ if updateRequest.GetAllowMissing() {+ continue+ }+ resources = append(resources, getResourceFromSingleRequest(updateRequest.ProtoReflect(), "UpdateInstance"))+ }+ return resources, nil+ }+if r, ok := request.(*v1pb.ListInstanceDatabaseRequest); ok && r.GetInstance() != nil {// During instance creation, the request carries an inline instance so// the handler can preview remote databases before the instance exists.- // Use the workspace resource instead of validating the future instance name.- resources = append(resources, "")+ // Use the nested parent project when present; a top-level candidate is+ // still authorized at workspace scope.+ if projectID, _, err := common.GetProjectIDInstanceID(r.GetName()); err == nil {+ resources = append(resources, common.FormatProject(projectID))+ } else {+ resources = append(resources, "")+ }return resources, nil}@@ -472,6 +632,10 @@ func getResourceFromRequest(ctx context.Context, request any, method string) ([]}if strings.HasPrefix(shortMethod, "Batch") {+ parentDesc := mr.Descriptor().Fields().ByName("parent")+ if parentDesc != nil && proto.HasExtension(parentDesc.Options(), annotationsproto.E_ResourceReference) && mr.Has(parentDesc) {+ resources = append(resources, mr.Get(parentDesc).String())+ }// Handle batch get requests.if strings.HasPrefix(shortMethod, "BatchGet") {namesDesc := mr.Descriptor().Fields().ByName("names")diff --git a/backend/api/v1/acl_test.go b/backend/api/v1/acl_test.goindex 0a85332fcb..068fb02484 100644--- a/backend/api/v1/acl_test.go+++ b/backend/api/v1/acl_test.go@@ -7,10 +7,183 @@ import ("github.com/stretchr/testify/require""google.golang.org/protobuf/types/known/fieldmaskpb"+ "github.com/bytebase/bytebase/backend/common""github.com/bytebase/bytebase/backend/common/permission"v1pb "github.com/bytebase/bytebase/backend/generated-go/v1")+func TestGetResourceRoute(t *testing.T) {+ tests := []struct {+ name string+ parts []string+ want resourceRoute+ }{+ {+ name: "workspace",+ parts: []string{"workspaces", "default"},+ want: resourceRoute{"workspaces"},+ },+ {+ name: "project",+ parts: []string{"projects", "project-a"},+ want: resourceRoute{"projects"},+ },+ {+ name: "project instance",+ parts: []string{"projects", "project-a", "instances", "instance-a"},+ want: resourceRoute{"projects", "instances"},+ },+ {+ name: "project database",+ parts: []string{"projects", "project-a", "instances", "instance-a", "databases", "app"},+ want: resourceRoute{"projects", "instances", "databases"},+ },+ {+ name: "workspace instance",+ parts: []string{"instances", "instance-a"},+ want: resourceRoute{"instances"},+ },+ {+ name: "workspace database",+ parts: []string{"instances", "instance-a", "databases", "app"},+ want: resourceRoute{"instances", "databases"},+ },+ {+ name: "project instance role",+ parts: []string{"projects", "project-a", "instances", "instance-a", "roles", "role-a"},+ want: resourceRoute{"projects", "instances", "roles"},+ },+ {+ name: "project database revision",+ parts: []string{"projects", "project-a", "instances", "instance-a", "databases", "app", "revisions", "1"},+ want: resourceRoute{"projects", "instances", "databases"},+ },+ {+ name: "project database changelog",+ parts: []string{"projects", "project-a", "instances", "instance-a", "databases", "app", "changelogs", "1"},+ want: resourceRoute{"projects", "instances", "databases"},+ },+ {+ name: "project database schema",+ parts: []string{"projects", "project-a", "instances", "instance-a", "databases", "app", "schema"},+ want: resourceRoute{"projects", "instances", "databases"},+ },+ {+ name: "workspace instance role",+ parts: []string{"instances", "instance-a", "roles", "role-a"},+ want: resourceRoute{"instances", "roles"},+ },+ {+ name: "workspace database revision",+ parts: []string{"instances", "instance-a", "databases", "app", "revisions", "1"},+ want: resourceRoute{"instances", "databases", "revisions"},+ },+ {+ name: "workspace database schema",+ parts: []string{"instances", "instance-a", "databases", "app", "schema"},+ want: resourceRoute{"instances", "databases", "schema"},+ },+ }++ for _, tt := range tests {+ t.Run(tt.name, func(t *testing.T) {+ require.Equal(t, tt.want, getResourceRoute(tt.parts))+ })+ }+}++func TestFindResourceResolver(t *testing.T) {+ tests := []struct {+ name string+ route resourceRoute+ wantRoute resourceRoute+ wantExists bool+ }{+ {name: "workspace", route: resourceRoute{"workspaces"}, wantRoute: resourceRoute{"workspaces"}, wantExists: true},+ {name: "project", route: resourceRoute{"projects"}, wantRoute: resourceRoute{"projects"}, wantExists: true},+ {name: "project instance", route: resourceRoute{"projects", "instances"}, wantRoute: resourceRoute{"projects", "instances"}, wantExists: true},+ {name: "project database", route: resourceRoute{"projects", "instances", "databases"}, wantRoute: resourceRoute{"projects", "instances", "databases"}, wantExists: true},+ {name: "workspace instance", route: resourceRoute{"instances"}, wantRoute: resourceRoute{"instances"}, wantExists: true},+ {name: "workspace database", route: resourceRoute{"instances", "databases"}, wantRoute: resourceRoute{"instances", "databases"}, wantExists: true},+ {name: "project instance role", route: resourceRoute{"projects", "instances", "roles"}, wantRoute: resourceRoute{"projects", "instances"}, wantExists: true},+ {name: "project database revision", route: resourceRoute{"projects", "instances", "databases"}, wantRoute: resourceRoute{"projects", "instances", "databases"}, wantExists: true},+ {name: "project database changelog", route: resourceRoute{"projects", "instances", "databases"}, wantRoute: resourceRoute{"projects", "instances", "databases"}, wantExists: true},+ {name: "project database schema", route: resourceRoute{"projects", "instances", "databases"}, wantRoute: resourceRoute{"projects", "instances", "databases"}, wantExists: true},+ {name: "workspace instance role", route: resourceRoute{"instances", "roles"}, wantRoute: resourceRoute{"instances"}, wantExists: true},+ {name: "workspace database revision", route: resourceRoute{"instances", "databases", "revisions"}, wantRoute: resourceRoute{"instances", "databases"}, wantExists: true},+ {name: "workspace database schema", route: resourceRoute{"instances", "databases", "schema"}, wantRoute: resourceRoute{"instances", "databases"}, wantExists: true},+ {name: "ordinary project descendant", route: resourceRoute{"projects", "issues"}, wantRoute: resourceRoute{"projects"}, wantExists: true},+ {name: "unknown root", route: resourceRoute{"unknowns"}, wantExists: false},+ }++ for _, tt := range tests {+ t.Run(tt.name, func(t *testing.T) {+ gotRoute, resolver, gotExists := findResourceResolver(tt.route)+ require.Equal(t, tt.wantExists, gotExists)+ if !tt.wantExists {+ require.Nil(t, resolver)+ return+ }+ require.NotNil(t, resolver)+ require.Equal(t, tt.wantRoute, gotRoute)+ })+ }+}++func TestResolveRawResource(t *testing.T) {+ ctx, stores, instanceID, _, _, _ := setupProjectInstanceDescendantServiceTest(t)++ t.Run("rejects project instance in another project", func(t *testing.T) {+ resource, err := resolveRawResource(ctx, stores, common.FormatProjectInstance("project-b", instanceID)+"/roles/role-a")+ require.Error(t, err)+ require.Nil(t, resource)+ })++ t.Run("rejects missing project database", func(t *testing.T) {+ resource, err := resolveRawResource(ctx, stores, common.FormatProjectDatabase("project-a", instanceID, "missing")+"/schema")+ require.Error(t, err)+ require.Nil(t, resource)+ })++ t.Run("requires resolver identifiers", func(t *testing.T) {+ for _, name := range []string{+ "workspaces/",+ "projects/",+ "projects/project-a/instances/",+ "projects/project-a/instances/instance-a/databases/",+ "instances/",+ "instances/instance-a/databases/",+ } {+ resource, err := resolveRawResource(ctx, nil, name)+ require.Error(t, err, name)+ require.Nil(t, resource, name)+ }+ })+}++func TestResolveRawResourceWorkspaceDatabaseUsesDatabaseProject(t *testing.T) {+ ctx, stores, instanceID, databaseName, _, _ := setupWorkspaceInstanceDescendantServiceTest(t)+ resource, err := resolveRawResource(ctx, stores, common.FormatDatabase(instanceID, databaseName)+"/revisions/1")+ require.NoError(t, err)+ require.Equal(t, &common.Resource{Type: common.ResourceTypeProject, ID: "project-a"}, resource)+}++func TestPopulateRawResourcesUsesWorkspaceFallback(t *testing.T) {+ ctx := context.WithValue(context.Background(), common.WorkspaceIDContextKey, "default")+ for _, request := range []any{+ &v1pb.GetInstanceRequest{Name: "projects/-"},+ &v1pb.GetDatabaseRequest{Name: "instances/-/databases/app"},+ } {+ resources, err := populateRawResources(ctx, nil, request, "/bytebase.v1.TestService/Get")+ require.NoError(t, err)+ require.Equal(t, []*common.Resource{{Type: common.ResourceTypeWorkspace, ID: "default"}}, resources)+ }++ resources, err := populateRawResources(context.Background(), nil, &v1pb.ListProjectsRequest{}, "/bytebase.v1.ProjectService/ListProjects")+ require.NoError(t, err)+ require.Empty(t, resources)+}+func TestGetResourceFromRequest(t *testing.T) {tests := []struct {request any@@ -63,6 +236,28 @@ func TestGetResourceFromRequest(t *testing.T) {method: "/bytebase.v1.InstanceService/UpdateInstance",want: []string{"instances/hello"},},+ {+ request: &v1pb.CreateInstanceRequest{+ Parent: new("projects/default"),+ },+ method: "/bytebase.v1.InstanceService/CreateInstance",+ want: []string{""},+ },+ {+ request: &v1pb.CreateInstanceRequest{+ Parent: new("projects/hello"),+ },+ method: "/bytebase.v1.InstanceService/CreateInstance",+ want: []string{"projects/hello"},+ },+ {+ request: &v1pb.UpdateInstanceRequest{+ Instance: &v1pb.Instance{Name: "projects/hello/instances/new-instance"},+ AllowMissing: true,+ },+ method: "/bytebase.v1.InstanceService/UpdateInstance",+ want: []string{"projects/hello"},+ },{request: &v1pb.UploadLicenseRequest{License: "123",@@ -144,6 +339,14 @@ func TestGetResourceFromRequest(t *testing.T) {method: "/bytebase.v1.InstanceService/ListInstanceDatabase",want: []string{""},},+ {+ request: &v1pb.ListInstanceDatabaseRequest{+ Name: "projects/project-a/instances/hello",+ Instance: &v1pb.Instance{},+ },+ method: "/bytebase.v1.InstanceService/ListInstanceDatabase",+ want: []string{"projects/project-a"},+ },{request: &v1pb.BatchSyncInstancesRequest{Requests: []*v1pb.SyncInstanceRequest{@@ -154,6 +357,37 @@ func TestGetResourceFromRequest(t *testing.T) {method: "/bytebase.v1.InstanceService/BatchSyncInstances",want: []string{"instances/hello", "instances/world"},},+ {+ request: &v1pb.BatchSyncInstancesRequest{+ Parent: new("projects/project-a"),+ Requests: []*v1pb.SyncInstanceRequest{+ {Name: "projects/project-a/instances/hello"},+ },+ },+ method: "/bytebase.v1.InstanceService/BatchSyncInstances",+ want: []string{"projects/project-a", "projects/project-a/instances/hello"},+ },+ {+ request: &v1pb.BatchUpdateInstancesRequest{+ Parent: new("projects/project-a"),+ Requests: []*v1pb.UpdateInstanceRequest{+ {Instance: &v1pb.Instance{Name: "projects/project-a/instances/new-instance"}, AllowMissing: true},+ {Instance: &v1pb.Instance{Name: "projects/project-a/instances/existing-instance"}},+ },+ },+ method: "/bytebase.v1.InstanceService/BatchUpdateInstances",+ want: []string{"projects/project-a", "projects/project-a/instances/existing-instance"},+ },+ {+ request: &v1pb.BatchUpdateInstancesRequest{+ Requests: []*v1pb.UpdateInstanceRequest{+ {Instance: &v1pb.Instance{Name: "instances/new-instance"}, AllowMissing: true},+ {Instance: &v1pb.Instance{Name: "instances/existing-instance"}},+ },+ },+ method: "/bytebase.v1.InstanceService/BatchUpdateInstances",+ want: []string{"", "instances/existing-instance"},+ },{request: &v1pb.CancelPlanCheckRunRequest{Name: "projects/hello/plans/world/planCheckRun",@@ -291,6 +525,23 @@ func TestHasAllowMissingEnabled(t *testing.T) {},want: false,},+ {+ name: "BatchUpdateInstancesRequest with nested AllowMissing true",+ request: &v1pb.BatchUpdateInstancesRequest{+ Requests: []*v1pb.UpdateInstanceRequest{+ {AllowMissing: false},+ {AllowMissing: true},+ },+ },+ want: true,+ },+ {+ name: "BatchUpdateInstancesRequest with nested AllowMissing false",+ request: &v1pb.BatchUpdateInstancesRequest{+ Requests: []*v1pb.UpdateInstanceRequest{{AllowMissing: false}},+ },+ want: false,+ },}for _, tt := range tests {diff --git a/backend/api/v1/changelog_service.go b/backend/api/v1/changelog_service.goindex a9edf25b23..4b410a6790 100644--- a/backend/api/v1/changelog_service.go+++ b/backend/api/v1/changelog_service.go@@ -103,21 +103,9 @@ func parseChangelogFilter(filter string, find *store.FindChangelogMessage) error}func (s *ChangelogService) ListChangelogs(ctx context.Context, req *connect.Request[v1pb.ListChangelogsRequest]) (*connect.Response[v1pb.ListChangelogsResponse], error) {- instanceID, databaseName, err := common.GetInstanceDatabaseID(req.Msg.Parent)+ instance, database, err := getInstanceDatabaseMessage(ctx, s.store, req.Msg.Parent)if err != nil {- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "failed to parse %q", req.Msg.Parent))- }- database, err := s.store.GetDatabase(ctx, &store.FindDatabaseMessage{- Workspace: common.GetWorkspaceIDFromContext(ctx),- InstanceID: &instanceID,- DatabaseName: &databaseName,- ShowDeleted: true,- })- if err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get database"))- }- if database == nil {- return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("database %q not found", req.Msg.Parent))+ return nil, err}offset, err := parseLimitAndOffset(&pageSize{@@ -157,7 +145,7 @@ func (s *ChangelogService) ListChangelogs(ctx context.Context, req *connect.Requ}// no subsequent pages- converted := convertToChangelogs(database, changelogs)+ converted := convertToChangelogs(instance, database, changelogs)return connect.NewResponse(&v1pb.ListChangelogsResponse{Changelogs: converted,NextPageToken: nextPageToken,@@ -165,14 +153,19 @@ func (s *ChangelogService) ListChangelogs(ctx context.Context, req *connect.Requ}func (s *ChangelogService) GetChangelog(ctx context.Context, req *connect.Request[v1pb.GetChangelogRequest]) (*connect.Response[v1pb.Changelog], error) {- instanceID, databaseName, changelogID, err := common.GetInstanceDatabaseChangelogID(req.Msg.Name)+ parent, changelogID, err := getChangelogParentAndID(req.Msg.Name)if err != nil {- return nil, connect.NewError(connect.CodeInvalidArgument, err)+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "failed to parse %q", req.Msg.Name))+ }+ instance, database, err := getInstanceDatabaseMessage(ctx, s.store, parent)+ if err != nil {+ return nil, err}find := &store.FindChangelogMessage{- InstanceID: instanceID,- ResourceID: &changelogID,+ InstanceID: database.InstanceID,+ DatabaseName: &database.DatabaseName,+ ResourceID: &changelogID,}if req.Msg.View == v1pb.ChangelogView_CHANGELOG_VIEW_FULL {find.ShowFull = true@@ -186,35 +179,76 @@ func (s *ChangelogService) GetChangelog(ctx context.Context, req *connect.Requesreturn nil, connect.NewError(connect.CodeNotFound, errors.Errorf("changelog %q not found", changelogID))}- database, err := s.store.GetDatabase(ctx, &store.FindDatabaseMessage{+ converted := convertToChangelog(instance, database, changelog)+ return connect.NewResponse(converted), nil+}++func getInstanceDatabaseMessage(ctx context.Context, stores *store.Store, parent string) (*store.InstanceMessage, *store.DatabaseMessage, error) {+ instanceID, databaseName, err := common.GetInstanceDatabaseID(parent)+ if err != nil {+ if projectID, nestedInstanceID, nestedDatabaseName, projectErr := common.GetProjectIDInstanceDatabaseID(parent); projectErr == nil {+ instanceID, databaseName = nestedInstanceID, nestedDatabaseName+ instance, getErr := getInstanceMessage(ctx, stores, common.FormatProjectInstance(projectID, instanceID))+ if getErr != nil {+ return nil, nil, getErr+ }+ database, getErr := getDatabaseMessage(ctx, stores, instanceID, databaseName, parent)+ return instance, database, getErr+ }+ return nil, nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "failed to parse %q", parent))+ }++ instance, err := getInstanceMessage(ctx, stores, common.FormatInstance(instanceID))+ if err != nil {+ return nil, nil, err+ }+ database, err := getDatabaseMessage(ctx, stores, instanceID, databaseName, parent)+ return instance, database, err+}++func getDatabaseMessage(ctx context.Context, stores *store.Store, instanceID, databaseName, requestName string) (*store.DatabaseMessage, error) {+ database, err := stores.GetDatabase(ctx, &store.FindDatabaseMessage{Workspace: common.GetWorkspaceIDFromContext(ctx),InstanceID: &instanceID,DatabaseName: &databaseName,ShowDeleted: true,})if err != nil {- return nil, connect.NewError(connect.CodeInternal, err)+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get database"))}if database == nil {- return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("database %q not found", databaseName))+ return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("database %q not found", requestName))}+ return database, nil+}- converted := convertToChangelog(database, changelog)- return connect.NewResponse(converted), nil+func getChangelogParentAndID(name string) (string, string, error) {+ if projectID, instanceID, databaseName, changelogID, err := common.GetProjectIDInstanceDatabaseChangelogID(name); err == nil {+ return common.FormatProjectDatabase(projectID, instanceID, databaseName), changelogID, nil+ }+ instanceID, databaseName, changelogID, err := common.GetInstanceDatabaseChangelogID(name)+ if err != nil {+ return "", "", err+ }+ return common.FormatDatabase(instanceID, databaseName), changelogID, nil}-func convertToChangelogs(d *store.DatabaseMessage, cs []*store.ChangelogMessage) []*v1pb.Changelog {+func convertToChangelogs(instance *store.InstanceMessage, d *store.DatabaseMessage, cs []*store.ChangelogMessage) []*v1pb.Changelog {var changelogs []*v1pb.Changelogfor _, c := range cs {- changelog := convertToChangelog(d, c)+ changelog := convertToChangelog(instance, d, c)changelogs = append(changelogs, changelog)}return changelogs}-func convertToChangelog(d *store.DatabaseMessage, c *store.ChangelogMessage) *v1pb.Changelog {+func convertToChangelog(instance *store.InstanceMessage, d *store.DatabaseMessage, c *store.ChangelogMessage) *v1pb.Changelog {+ name := common.FormatChangelog(d.InstanceID, d.DatabaseName, c.ResourceID)+ if instance.ProjectID != nil {+ name = common.FormatProjectChangelog(*instance.ProjectID, d.InstanceID, d.DatabaseName, c.ResourceID)+ }cl := &v1pb.Changelog{- Name: common.FormatChangelog(d.InstanceID, d.DatabaseName, c.ResourceID),+ Name: name,CreateTime: timestamppb.New(c.CreatedAt),Status: convertToChangelogStatus(c.Status),Schema: "",diff --git a/backend/api/v1/database_catalog_service.go b/backend/api/v1/database_catalog_service.goindex 3d136437a3..2f50ec0191 100644--- a/backend/api/v1/database_catalog_service.go+++ b/backend/api/v1/database_catalog_service.go@@ -2,7 +2,6 @@ package v1import ("context"- "fmt""strings""connectrpc.com/connect"@@ -28,28 +27,53 @@ func NewDatabaseCatalogService(store *store.Store) *DatabaseCatalogService {}}-// GetDatabaseCatalog gets a database catalog.-func (s *DatabaseCatalogService) GetDatabaseCatalog(ctx context.Context, req *connect.Request[v1pb.GetDatabaseCatalogRequest]) (*connect.Response[v1pb.DatabaseCatalog], error) {- databaseResourceName, err := common.TrimSuffix(req.Msg.Name, common.CatalogSuffix)+func (s *DatabaseCatalogService) findDatabaseForResource(+ ctx context.Context,+ projectID *string,+ instanceID,+ databaseID string,+ showDeleted bool,+) (*store.DatabaseMessage, *store.InstanceMessage, error) {+ database, err := s.store.GetDatabase(ctx, &store.FindDatabaseMessage{+ Workspace: common.GetWorkspaceIDFromContext(ctx),+ InstanceID: &instanceID,+ DatabaseName: &databaseID,+ ShowDeleted: showDeleted,+ })+ if err != nil || database == nil {+ return database, nil, err+ }+ instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{+ Workspace: common.GetWorkspaceIDFromContext(ctx),+ ResourceID: &instanceID,+ })if err != nil {- return nil, connect.NewError(connect.CodeInvalidArgument, err)+ return nil, nil, err+ }+ if instance == nil {+ return nil, nil, errors.Errorf("instance %q not found", instanceID)+ }+ if projectID == nil && instance.ProjectID != nil {+ return nil, nil, errors.Errorf("instance %q must be addressed through its project", instanceID)}+ if projectID != nil && (instance.ProjectID == nil || *projectID != *instance.ProjectID) {+ return nil, nil, errors.Errorf("project in database resource name does not own instance %q", instanceID)+ }+ return database, instance, nil+}- instanceID, databaseName, err := common.GetInstanceDatabaseID(databaseResourceName)+// GetDatabaseCatalog gets a database catalog.+func (s *DatabaseCatalogService) GetDatabaseCatalog(ctx context.Context, req *connect.Request[v1pb.GetDatabaseCatalogRequest]) (*connect.Response[v1pb.DatabaseCatalog], error) {+ projectID, instanceID, databaseID, err := common.GetDatabaseResourceNameWithSuffix(req.Msg.Name, common.CatalogSuffix)if err != nil {- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "failed to parse %q", databaseResourceName))+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "failed to parse %q", req.Msg.Name))}- database, err := s.store.GetDatabase(ctx, &store.FindDatabaseMessage{- Workspace: common.GetWorkspaceIDFromContext(ctx),- InstanceID: &instanceID,- DatabaseName: &databaseName,- ShowDeleted: true,- })+ database, instance, err := s.findDatabaseForResource(ctx, projectID, instanceID, databaseID, true)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get database"))}if database == nil {- return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("database %q not found", databaseResourceName))+ return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("database %q not found", req.Msg.Name))}dbMetadata, err := s.store.GetDBSchema(ctx, &store.FindDBSchemaMessage{Workspace: common.GetWorkspaceIDFromContext(ctx),@@ -61,34 +85,25 @@ func (s *DatabaseCatalogService) GetDatabaseCatalog(ctx context.Context, req *co}if dbMetadata == nil {return connect.NewResponse(&v1pb.DatabaseCatalog{- Name: fmt.Sprintf("%s%s/%s%s%s", common.InstanceNamePrefix, database.InstanceID, common.DatabaseIDPrefix, database.DatabaseName, common.CatalogSuffix),+ Name: formatDatabaseResourceName(instance, database) + common.CatalogSuffix,}), nil}- return connect.NewResponse(convertDatabaseConfig(database, dbMetadata.GetConfig())), nil+ return connect.NewResponse(convertDatabaseConfig(instance, database, dbMetadata.GetConfig())), nil}// UpdateDatabaseCatalog updates a database catalog.func (s *DatabaseCatalogService) UpdateDatabaseCatalog(ctx context.Context, req *connect.Request[v1pb.UpdateDatabaseCatalogRequest]) (*connect.Response[v1pb.DatabaseCatalog], error) {- databaseResourceName, err := common.TrimSuffix(req.Msg.GetCatalog().GetName(), common.CatalogSuffix)+ projectID, instanceID, databaseID, err := common.GetDatabaseResourceNameWithSuffix(req.Msg.GetCatalog().GetName(), common.CatalogSuffix)if err != nil {- return nil, connect.NewError(connect.CodeInvalidArgument, err)+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "failed to parse %q", req.Msg.GetCatalog().GetName()))}-- instanceID, databaseName, err := common.GetInstanceDatabaseID(databaseResourceName)- if err != nil {- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "failed to parse %q", databaseResourceName))- }- database, err := s.store.GetDatabase(ctx, &store.FindDatabaseMessage{- Workspace: common.GetWorkspaceIDFromContext(ctx),- InstanceID: &instanceID,- DatabaseName: &databaseName,- })+ database, instance, err := s.findDatabaseForResource(ctx, projectID, instanceID, databaseID, false)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get database"))}if database == nil {- return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("database %q not found", databaseResourceName))+ return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("database %q not found", req.Msg.GetCatalog().GetName()))}dbMetadata, err := s.store.GetDBSchema(ctx, &store.FindDBSchemaMessage{@@ -121,12 +136,12 @@ func (s *DatabaseCatalogService) UpdateDatabaseCatalog(ctx context.Context, reqreturn nil, connect.NewError(connect.CodeInternal, err)}- return connect.NewResponse(convertDatabaseConfig(database, databaseConfig)), nil+ return connect.NewResponse(convertDatabaseConfig(instance, database, databaseConfig)), nil}-func convertDatabaseConfig(database *store.DatabaseMessage, config *storepb.DatabaseConfig) *v1pb.DatabaseCatalog {+func convertDatabaseConfig(instance *store.InstanceMessage, database *store.DatabaseMessage, config *storepb.DatabaseConfig) *v1pb.DatabaseCatalog {c := &v1pb.DatabaseCatalog{- Name: fmt.Sprintf("%s%s/%s%s%s", common.InstanceNamePrefix, database.InstanceID, common.DatabaseIDPrefix, database.DatabaseName, common.CatalogSuffix),+ Name: formatDatabaseResourceName(instance, database) + common.CatalogSuffix,}for _, sc := range config.Schemas {s := &v1pb.SchemaCatalog{Name: sc.Name}diff --git a/backend/api/v1/database_service.go b/backend/api/v1/database_service.goindex 08e1909ace..fa1dc7b007 100644--- a/backend/api/v1/database_service.go+++ b/backend/api/v1/database_service.go@@ -49,20 +49,68 @@ func NewDatabaseService(store *store.Store, schemaSyncer *schemasync.Syncer, pro}}-// GetDatabase gets a database.-func (s *DatabaseService) GetDatabase(ctx context.Context, req *connect.Request[v1pb.GetDatabaseRequest]) (*connect.Response[v1pb.Database], error) {- instanceID, databaseName, err := common.GetInstanceDatabaseID(req.Msg.Name)+func formatDatabaseResourceName(instance *store.InstanceMessage, database *store.DatabaseMessage) string {+ if instance.ProjectID != nil {+ return common.FormatProjectDatabase(*instance.ProjectID, database.InstanceID, database.DatabaseName)+ }+ return common.FormatDatabase(database.InstanceID, database.DatabaseName)+}++func (s *DatabaseService) getInstanceForDatabaseResource(ctx context.Context, projectID *string, instanceID string) (*store.InstanceMessage, error) {+ instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{+ Workspace: common.GetWorkspaceIDFromContext(ctx),+ ResourceID: &instanceID,+ })if err != nil {- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "failed to parse %q", req.Msg.Name))+ return nil, errors.Wrap(err, "failed to get instance")}- databaseMessage, err := s.store.GetDatabase(ctx, &store.FindDatabaseMessage{+ if instance == nil {+ return nil, errors.Errorf("instance %q not found", instanceID)+ }+ if projectID == nil && instance.ProjectID != nil {+ return nil, errors.Errorf("instance %q must be addressed through its project", instanceID)+ }+ if projectID != nil && (instance.ProjectID == nil || *projectID != *instance.ProjectID) {+ return nil, errors.Errorf("project in database resource name does not own instance %q", instanceID)+ }+ return instance, nil+}++func (s *DatabaseService) findDatabaseForResource(+ ctx context.Context,+ projectID *string,+ instanceID,+ databaseID string,+ showDeleted bool,+) (*store.DatabaseMessage, *store.InstanceMessage, error) {+ database, err := s.store.GetDatabase(ctx, &store.FindDatabaseMessage{Workspace: common.GetWorkspaceIDFromContext(ctx),InstanceID: &instanceID,- DatabaseName: &databaseName,- ShowDeleted: true,+ DatabaseName: &databaseID,+ ShowDeleted: showDeleted,})if err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get database"))+ return nil, nil, errors.Wrap(err, "failed to get database")+ }+ if database == nil {+ return nil, nil, nil+ }+ instance, err := s.getInstanceForDatabaseResource(ctx, projectID, instanceID)+ if err != nil {+ return nil, nil, err+ }+ return database, instance, nil+}++// GetDatabase gets a database.+func (s *DatabaseService) GetDatabase(ctx context.Context, req *connect.Request[v1pb.GetDatabaseRequest]) (*connect.Response[v1pb.Database], error) {+ projectID, instanceID, databaseID, err := common.GetDatabaseResourceName(req.Msg.Name)+ if err != nil {+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "failed to parse %q", req.Msg.Name))+ }+ databaseMessage, _, err := s.findDatabaseForResource(ctx, projectID, instanceID, databaseID, true)+ if err != nil {+ return nil, connect.NewError(connect.CodeInvalidArgument, err)}if databaseMessage == nil {return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("database %q not found", req.Msg.Name))@@ -74,45 +122,76 @@ func (s *DatabaseService) GetDatabase(ctx context.Context, req *connect.Request[return connect.NewResponse(database), nil}+type databaseParent struct {+ projectID *string+ instanceID *string+}++func (s *DatabaseService) parseDatabaseParent(ctx context.Context, parent string, allowProjectOnly bool) (*databaseParent, error) {+ if parent == "-" {+ return &databaseParent{}, nil+ }+ if projectID, instanceID, err := common.GetProjectIDInstanceID(parent); err == nil {+ if _, err := s.getInstanceForDatabaseResource(ctx, &projectID, instanceID); err != nil {+ return nil, err+ }+ return &databaseParent{projectID: &projectID, instanceID: &instanceID}, nil+ }+ if instanceID, err := common.GetInstanceID(parent); err == nil {+ if _, err := s.getInstanceForDatabaseResource(ctx, nil, instanceID); err != nil {+ return nil, err+ }+ return &databaseParent{instanceID: &instanceID}, nil+ }+ if allowProjectOnly {+ if projectID, err := common.GetProjectID(parent); err == nil {+ return &databaseParent{projectID: &projectID}, nil+ }+ }+ return nil, errors.Errorf("invalid parent %q", parent)+}++func validateDatabaseParent(projectID *string, instanceID, databaseID string, database *store.DatabaseMessage, parent *databaseParent) error {+ if parent.instanceID != nil && instanceID != *parent.instanceID {+ return errors.Errorf("database %q does not belong to parent instance", databaseID)+ }+ if parent.projectID != nil {+ if projectID != nil && *projectID != *parent.projectID {+ return errors.Errorf("database %q does not belong to parent project", databaseID)+ }+ if database.ProjectID != *parent.projectID {+ return errors.Errorf("database %q does not belong to parent project", databaseID)+ }+ }+ return nil+}+func (s *DatabaseService) BatchGetDatabases(ctx context.Context, req *connect.Request[v1pb.BatchGetDatabasesRequest]) (*connect.Response[v1pb.BatchGetDatabasesResponse], error) {user, ok := GetUserFromContext(ctx)if !ok {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("user not found"))}- // Parse parent to extract project ID filter if specified.- var projectIDFilter *string- if strings.HasPrefix(req.Msg.Parent, common.ProjectNamePrefix) {- projectID, err := common.GetProjectID(req.Msg.Parent)- if err != nil {- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid parent %q", req.Msg.Parent))- }- projectIDFilter = new(projectID)+ parent, err := s.parseDatabaseParent(ctx, req.Msg.Parent, true)+ if err != nil {+ return nil, connect.NewError(connect.CodeInvalidArgument, err)}- // For instances/{instance} or "-" (wildcard), no project filter is applied.databases := make([]*v1pb.Database, 0, len(req.Msg.Names))for _, name := range req.Msg.Names {- instanceID, databaseName, err := common.GetInstanceDatabaseID(name)+ projectID, instanceID, databaseID, err := common.GetDatabaseResourceName(name)if err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "failed to parse %q", name))}- databaseMessage, err := s.store.GetDatabase(ctx, &store.FindDatabaseMessage{- Workspace: common.GetWorkspaceIDFromContext(ctx),- InstanceID: &instanceID,- DatabaseName: &databaseName,- ShowDeleted: true,- })+ databaseMessage, _, err := s.findDatabaseForResource(ctx, projectID, instanceID, databaseID, true)if err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get database"))+ return nil, connect.NewError(connect.CodeInvalidArgument, err)}if databaseMessage == nil {// Ignore deleted database.continue}- // If parent specifies a project, validate database belongs to that project.- if projectIDFilter != nil && databaseMessage.ProjectID != *projectIDFilter {- // Ignore database not in the specified project.- continue+ if err := validateDatabaseParent(projectID, instanceID, databaseID, databaseMessage, parent); err != nil {+ return nil, connect.NewError(connect.CodeInvalidArgument, err)}ok, err := s.iamManager.CheckPermission(ctx, permission.DatabasesGet, user, common.GetWorkspaceIDFromContext(ctx), databaseMessage.ProjectID)if err != nil {@@ -208,21 +287,28 @@ func (s *DatabaseService) ListDatabases(ctx context.Context, req *connect.Reques}find.FilterQ = filterQ- switch {- case strings.HasPrefix(req.Msg.Parent, common.ProjectNamePrefix):- p, err := common.GetProjectID(req.Msg.Parent)+ if projectID, instanceID, err := common.GetProjectIDInstanceID(req.Msg.Parent); err == nil {+ if _, err := s.getInstanceForDatabaseResource(ctx, &projectID, instanceID); err != nil {+ return nil, connect.NewError(connect.CodeInvalidArgument, err)+ }+ ok, err := s.iamManager.CheckPermission(ctx, permission.InstancesGet, user, common.GetWorkspaceIDFromContext(ctx), projectID)if err != nil {- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid parent %q", req.Msg.Parent))+ return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to check permission with error: %v", err))}- ok, err := s.iamManager.CheckPermission(ctx, permission.ProjectsGet, user, common.GetWorkspaceIDFromContext(ctx), p)+ if !ok {+ return nil, connect.NewError(connect.CodePermissionDenied, errors.Errorf("user does not have permission %q in %q", permission.InstancesGet, req.Msg.Parent))+ }+ find.InstanceID = &instanceID+ } else if projectID, err := common.GetProjectID(req.Msg.Parent); err == nil {+ ok, err := s.iamManager.CheckPermission(ctx, permission.ProjectsGet, user, common.GetWorkspaceIDFromContext(ctx), projectID)if err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to check permission with error: %v", err.Error()))+ return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to check permission with error: %v", err))}if !ok {return nil, connect.NewError(connect.CodePermissionDenied, errors.Errorf("user does not have permission %q in %q", permission.ProjectsGet, req.Msg.Parent))}- find.ProjectID = &p- case strings.HasPrefix(req.Msg.Parent, common.WorkspacePrefix):+ find.ProjectID = &projectID+ } else if _, err := common.GetWorkspaceID(req.Msg.Parent); err == nil {ok, err := s.iamManager.CheckPermission(ctx, permission.DatabasesList, user, common.GetWorkspaceIDFromContext(ctx))if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to check permission with error: %v", err.Error()))@@ -230,7 +316,10 @@ func (s *DatabaseService) ListDatabases(ctx context.Context, req *connect.Requesif !ok {return nil, connect.NewError(connect.CodePermissionDenied, errors.Errorf("user does not have permission %q", permission.DatabasesList))}- case strings.HasPrefix(req.Msg.Parent, common.InstanceNamePrefix):+ } else if instanceID, err := common.GetInstanceID(req.Msg.Parent); err == nil {+ if _, err := s.getInstanceForDatabaseResource(ctx, nil, instanceID); err != nil {+ return nil, connect.NewError(connect.CodeInvalidArgument, err)+ }ok, err := s.iamManager.CheckPermission(ctx, permission.InstancesGet, user, common.GetWorkspaceIDFromContext(ctx))if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to check permission with error: %v", err.Error()))@@ -238,13 +327,8 @@ func (s *DatabaseService) ListDatabases(ctx context.Context, req *connect.Requesif !ok {return nil, connect.NewError(connect.CodePermissionDenied, errors.Errorf("user does not have permission %q", permission.InstancesGet))}-- instanceID, err := common.GetInstanceID(req.Msg.Parent)- if err != nil {- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid parent %q", req.Msg.Parent))- }find.InstanceID = &instanceID- default:+ } else {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid parent %q", req.Msg.Parent))}@@ -283,18 +367,13 @@ func (s *DatabaseService) UpdateDatabase(ctx context.Context, req *connect.Requereturn nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("update_mask must be set"))}- // Use the helper function to get the database- instanceID, databaseName, err := common.GetInstanceDatabaseID(req.Msg.Database.Name)+ projectID, instanceID, databaseID, err := common.GetDatabaseResourceName(req.Msg.Database.Name)if err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "failed to parse %q", req.Msg.Database.Name))}- databaseMessage, err := s.store.GetDatabase(ctx, &store.FindDatabaseMessage{- Workspace: common.GetWorkspaceIDFromContext(ctx),- InstanceID: &instanceID,- DatabaseName: &databaseName,- })+ databaseMessage, instance, err := s.findDatabaseForResource(ctx, projectID, instanceID, databaseID, false)if err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get database"))+ return nil, connect.NewError(connect.CodeInvalidArgument, err)}if databaseMessage == nil {return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("database %q not found", req.Msg.Database.Name))@@ -329,6 +408,9 @@ func (s *DatabaseService) UpdateDatabase(ctx context.Context, req *connect.Requeif project.Deleted {return nil, connect.NewError(connect.CodeFailedPrecondition, errors.Errorf("project %q is deleted", projectID))}+ if instance.ProjectID != nil && project.ResourceID != *instance.ProjectID {+ return nil, connect.NewError(connect.CodeFailedPrecondition, errors.Errorf("database on project instance %q cannot move from project %q", instance.ResourceID, *instance.ProjectID))+ }patch.ProjectID = &project.ResourceIDcase "labels":patch.MetadataUpdates = append(patch.MetadataUpdates, func(dm *storepb.DatabaseMetadata) {@@ -370,17 +452,13 @@ func (s *DatabaseService) UpdateDatabase(ctx context.Context, req *connect.Reque// SyncDatabase syncs the schema of a database.func (s *DatabaseService) SyncDatabase(ctx context.Context, req *connect.Request[v1pb.SyncDatabaseRequest]) (*connect.Response[v1pb.SyncDatabaseResponse], error) {- instanceID, databaseName, err := common.GetInstanceDatabaseID(req.Msg.Name)+ projectID, instanceID, databaseID, err := common.GetDatabaseResourceName(req.Msg.Name)if err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "failed to parse %q", req.Msg.Name))}- databaseMessage, err := s.store.GetDatabase(ctx, &store.FindDatabaseMessage{- Workspace: common.GetWorkspaceIDFromContext(ctx),- InstanceID: &instanceID,- DatabaseName: &databaseName,- })+ databaseMessage, _, err := s.findDatabaseForResource(ctx, projectID, instanceID, databaseID, false)if err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get database"))+ return nil, connect.NewError(connect.CodeInvalidArgument, err)}if databaseMessage == nil {return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("database %q not found", req.Msg.Name))@@ -396,22 +474,25 @@ func (s *DatabaseService) SyncDatabase(ctx context.Context, req *connect.Request// BatchSyncDatabases sync multiply database asynchronously.func (s *DatabaseService) BatchSyncDatabases(ctx context.Context, req *connect.Request[v1pb.BatchSyncDatabasesRequest]) (*connect.Response[v1pb.BatchSyncDatabasesResponse], error) {+ parent, err := s.parseDatabaseParent(ctx, req.Msg.Parent, false)+ if err != nil {+ return nil, connect.NewError(connect.CodeInvalidArgument, err)+ }for _, name := range req.Msg.Names {- instanceID, databaseName, err := common.GetInstanceDatabaseID(name)+ projectID, instanceID, databaseID, err := common.GetDatabaseResourceName(name)if err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "failed to parse %q", name))}- databaseMessage, err := s.store.GetDatabase(ctx, &store.FindDatabaseMessage{- Workspace: common.GetWorkspaceIDFromContext(ctx),- InstanceID: &instanceID,- DatabaseName: &databaseName,- })+ databaseMessage, _, err := s.findDatabaseForResource(ctx, projectID, instanceID, databaseID, false)if err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get database"))+ return nil, connect.NewError(connect.CodeInvalidArgument, err)}if databaseMessage == nil {continue}+ if err := validateDatabaseParent(projectID, instanceID, databaseID, databaseMessage, parent); err != nil {+ return nil, connect.NewError(connect.CodeInvalidArgument, err)+ }s.schemaSyncer.SyncDatabaseAsync(databaseMessage)}return connect.NewResponse(&v1pb.BatchSyncDatabasesResponse{}), nil@@ -419,6 +500,28 @@ func (s *DatabaseService) BatchSyncDatabases(ctx context.Context, req *connect.R// BatchUpdateDatabases updates databases in batch.func (s *DatabaseService) BatchUpdateDatabases(ctx context.Context, req *connect.Request[v1pb.BatchUpdateDatabasesRequest]) (*connect.Response[v1pb.BatchUpdateDatabasesResponse], error) {+ parent, err := s.parseDatabaseParent(ctx, req.Msg.Parent, false)+ if err != nil {+ return nil, connect.NewError(connect.CodeInvalidArgument, err)+ }+ for _, updateReq := range req.Msg.GetRequests() {+ if updateReq.Database == nil {+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.New("database must be set"))+ }+ projectID, instanceID, databaseID, err := common.GetDatabaseResourceName(updateReq.Database.Name)+ if err != nil {+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "failed to parse %q", updateReq.Database.Name))+ }+ database, _, err := s.findDatabaseForResource(ctx, projectID, instanceID, databaseID, false)+ if err != nil {+ return nil, connect.NewError(connect.CodeInvalidArgument, err)+ }+ if database != nil {+ if err := validateDatabaseParent(projectID, instanceID, databaseID, database, parent); err != nil {+ return nil, connect.NewError(connect.CodeInvalidArgument, err)+ }+ }+ }response := &v1pb.BatchUpdateDatabasesResponse{}for _, updateReq := range req.Msg.GetRequests() {updated, err := s.UpdateDatabase(ctx, connect.NewRequest(updateReq))@@ -512,25 +615,16 @@ func getDatabaseMetadataFilter(filter string) (*metadataFilter, error) {// GetDatabaseMetadata gets the metadata of a database.func (s *DatabaseService) GetDatabaseMetadata(ctx context.Context, req *connect.Request[v1pb.GetDatabaseMetadataRequest]) (*connect.Response[v1pb.DatabaseMetadata], error) {- name, err := common.TrimSuffix(req.Msg.Name, common.MetadataSuffix)- if err != nil {- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("%v", err.Error()))- }- instanceID, databaseName, err := common.GetInstanceDatabaseID(name)+ projectID, instanceID, databaseID, err := common.GetDatabaseResourceNameWithSuffix(req.Msg.Name, common.MetadataSuffix)if err != nil {- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "failed to parse %q", name))+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "failed to parse %q", req.Msg.Name))}- database, err := s.store.GetDatabase(ctx, &store.FindDatabaseMessage{- Workspace: common.GetWorkspaceIDFromContext(ctx),- InstanceID: &instanceID,- DatabaseName: &databaseName,- ShowDeleted: true,- })+ database, instance, err := s.findDatabaseForResource(ctx, projectID, instanceID, databaseID, true)if err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get database"))+ return nil, connect.NewError(connect.CodeInvalidArgument, err)}if database == nil {- return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("database %q not found", name))+ return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("database %q not found", req.Msg.Name))}dbMetadata, err := s.store.GetDBSchema(ctx, &store.FindDBSchemaMessage{Workspace: common.GetWorkspaceIDFromContext(ctx),@@ -542,7 +636,7 @@ func (s *DatabaseService) GetDatabaseMetadata(ctx context.Context, req *connect.}if dbMetadata == nil {if err := s.schemaSyncer.SyncDatabaseSchema(ctx, database); err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to sync database schema for database %q, error %v", name, err))+ return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to sync database schema for database %q, error %v", req.Msg.Name, err))}newDBSchema, err := s.store.GetDBSchema(ctx, &store.FindDBSchemaMessage{Workspace: common.GetWorkspaceIDFromContext(ctx),@@ -553,7 +647,7 @@ func (s *DatabaseService) GetDatabaseMetadata(ctx context.Context, req *connect.return nil, connect.NewError(connect.CodeInternal, errors.Errorf("%v", err.Error()))}if newDBSchema == nil {- return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("database schema %q not found", name))+ return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("database schema %q not found", req.Msg.Name))}dbMetadata = newDBSchema}@@ -563,28 +657,23 @@ func (s *DatabaseService) GetDatabaseMetadata(ctx context.Context, req *connect.return nil, err}v1pbMetadata := convertStoreDatabaseMetadata(dbMetadata.GetProto(), filter, int(req.Msg.Limit))- v1pbMetadata.Name = fmt.Sprintf("%s%s/%s%s%s", common.InstanceNamePrefix, database.InstanceID, common.DatabaseIDPrefix, database.DatabaseName, common.MetadataSuffix)+ v1pbMetadata.Name = formatDatabaseResourceName(instance, database) + common.MetadataSuffixreturn connect.NewResponse(v1pbMetadata), nil}// GetDatabaseSchema gets the schema of a database.func (s *DatabaseService) GetDatabaseSchema(ctx context.Context, req *connect.Request[v1pb.GetDatabaseSchemaRequest]) (*connect.Response[v1pb.DatabaseSchema], error) {- instanceID, databaseName, err := common.TrimSuffixAndGetInstanceDatabaseID(req.Msg.Name, common.SchemaSuffix)+ projectID, instanceID, databaseID, err := common.GetDatabaseResourceNameWithSuffix(req.Msg.Name, common.SchemaSuffix)if err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("%v", err.Error()))}- database, err := s.store.GetDatabase(ctx, &store.FindDatabaseMessage{- Workspace: common.GetWorkspaceIDFromContext(ctx),- InstanceID: &instanceID,- DatabaseName: &databaseName,- ShowDeleted: true,- })+ database, _, err := s.findDatabaseForResource(ctx, projectID, instanceID, databaseID, true)if err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("%v", err.Error()))+ return nil, connect.NewError(connect.CodeInvalidArgument, err)}if database == nil {- return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("database %q not found", databaseName))+ return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("database %q not found", databaseID))}dbMetadata, err := s.store.GetDBSchema(ctx, &store.FindDBSchemaMessage{Workspace: common.GetWorkspaceIDFromContext(ctx),@@ -596,7 +685,7 @@ func (s *DatabaseService) GetDatabaseSchema(ctx context.Context, req *connect.Re}if dbMetadata == nil {if err := s.schemaSyncer.SyncDatabaseSchema(ctx, database); err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to sync database schema for database %q, error %v", databaseName, err))+ return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to sync database schema for database %q, error %v", databaseID, err))}newDBSchema, err := s.store.GetDBSchema(ctx, &store.FindDBSchemaMessage{Workspace: common.GetWorkspaceIDFromContext(ctx),@@ -607,7 +696,7 @@ func (s *DatabaseService) GetDatabaseSchema(ctx context.Context, req *connect.Rereturn nil, connect.NewError(connect.CodeInternal, errors.Errorf("%v", err.Error()))}if newDBSchema == nil {- return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("database schema %q not found", databaseName))+ return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("database schema %q not found", databaseID))}dbMetadata = newDBSchema}@@ -617,34 +706,29 @@ func (s *DatabaseService) GetDatabaseSchema(ctx context.Context, req *connect.Re// GetDatabaseSDLSchema gets the SDL schema of a database.func (s *DatabaseService) GetDatabaseSDLSchema(ctx context.Context, req *connect.Request[v1pb.GetDatabaseSDLSchemaRequest]) (*connect.Response[v1pb.DatabaseSDLSchema], error) {- instanceID, databaseName, err := common.TrimSuffixAndGetInstanceDatabaseID(req.Msg.Name, common.SDLSchemaSuffix)+ projectID, instanceID, databaseID, err := common.GetDatabaseResourceNameWithSuffix(req.Msg.Name, common.SDLSchemaSuffix)if err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("%v", err.Error()))}- database, err := s.store.GetDatabase(ctx, &store.FindDatabaseMessage{- Workspace: common.GetWorkspaceIDFromContext(ctx),- InstanceID: &instanceID,- DatabaseName: &databaseName,- ShowDeleted: true,- })+ database, _, err := s.findDatabaseForResource(ctx, projectID, instanceID, databaseID, true)if err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("%v", err.Error()))+ return nil, connect.NewError(connect.CodeInvalidArgument, err)}if database == nil {- return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("database %q not found", databaseName))+ return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("database %q not found", databaseID))}dbMetadata, err := s.store.GetDBSchema(ctx, &store.FindDBSchemaMessage{Workspace: common.GetWorkspaceIDFromContext(ctx),InstanceID: instanceID,- DatabaseName: databaseName,+ DatabaseName: databaseID,})if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("%v", err.Error()))}if dbMetadata == nil {if err := s.schemaSyncer.SyncDatabaseSchema(ctx, database); err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to sync database schema for database %q, error %v", databaseName, err))+ return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to sync database schema for database %q, error %v", databaseID, err))}newDBSchema, err := s.store.GetDBSchema(ctx, &store.FindDBSchemaMessage{Workspace: common.GetWorkspaceIDFromContext(ctx),@@ -655,14 +739,14 @@ func (s *DatabaseService) GetDatabaseSDLSchema(ctx context.Context, req *connectreturn nil, connect.NewError(connect.CodeInternal, errors.Errorf("%v", err.Error()))}if newDBSchema == nil {- return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("database schema %q not found", databaseName))+ return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("database schema %q not found", databaseID))}dbMetadata = newDBSchema}metadata := dbMetadata.GetProto()if metadata == nil {- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("database metadata not found for database %q", databaseName))+ return nil, connect.NewError(connect.CodeInternal, errors.Errorf("database metadata not found for database %q", databaseID))}if !common.EngineSupportSDLExport(database.Engine) {@@ -737,17 +821,13 @@ func (s *DatabaseService) DiffMetadata(ctx context.Context, req *connect.Requestif request.TargetMetadata == nil {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("target_metadata is required"))}- instanceID, databaseName, err := common.GetInstanceDatabaseID(request.Name)+ projectID, instanceID, databaseID, err := common.GetDatabaseResourceName(request.Name)if err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, err)}-- instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{- Workspace: common.GetWorkspaceIDFromContext(ctx),- ResourceID: &instanceID,- })+ _, instance, err := s.findDatabaseForResource(ctx, projectID, instanceID, databaseID, false)if err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get instance"))+ return nil, connect.NewError(connect.CodeInvalidArgument, err)}if instance == nil {return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("instance %q not found", instanceID))@@ -762,7 +842,7 @@ func (s *DatabaseService) DiffMetadata(ctx context.Context, req *connect.RequestsourceDBSchema, err := s.store.GetDBSchema(ctx, &store.FindDBSchemaMessage{Workspace: common.GetWorkspaceIDFromContext(ctx),InstanceID: instanceID,- DatabaseName: databaseName,+ DatabaseName: databaseID,})if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get database schema"))@@ -851,24 +931,21 @@ func (s *DatabaseService) resolveDiffSchemaTargetSDL(ctx context.Context, req *v// instance. It is best-effort: any lookup failure returns "" so the diff falls back to the// engine's default stored form (and non-MySQL engines ignore the version regardless).func (s *DatabaseService) diffSchemaEngineVersion(ctx context.Context, req *v1pb.DiffSchemaRequest) string {+ var projectID *stringvar instanceID string+ var err errorif strings.Contains(req.Name, common.ChangelogPrefix) {- insID, _, _, err := common.GetInstanceDatabaseChangelogID(req.Name)+ projectID, instanceID, _, _, err = common.GetDatabaseChangelogResourceName(req.Name)if err != nil {return ""}- instanceID = insID} else {- insID, _, err := common.GetInstanceDatabaseID(req.Name)+ projectID, instanceID, _, err = common.GetDatabaseResourceName(req.Name)if err != nil {return ""}- instanceID = insID}- instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{- Workspace: common.GetWorkspaceIDFromContext(ctx),- ResourceID: &instanceID,- })+ instance, err := s.getInstanceForDatabaseResource(ctx, projectID, instanceID)if err != nil || instance == nil {return ""}@@ -877,7 +954,11 @@ func (s *DatabaseService) diffSchemaEngineVersion(ctx context.Context, req *v1pbfunc (s *DatabaseService) getSourceDBMetadata(ctx context.Context, request *v1pb.DiffSchemaRequest) (*model.DatabaseMetadata, error) {if strings.Contains(request.Name, common.ChangelogPrefix) {- instanceID, databaseName, changelogID, err := common.GetInstanceDatabaseChangelogID(request.Name)+ projectID, instanceID, databaseID, changelogID, err := common.GetDatabaseChangelogResourceName(request.Name)+ if err != nil {+ return nil, err+ }+ instance, err := s.getInstanceForDatabaseResource(ctx, projectID, instanceID)if err != nil {return nil, err}@@ -904,17 +985,6 @@ func (s *DatabaseService) getSourceDBMetadata(ctx context.Context, request *v1pb}// Get instance to determine engine and case sensitivity- instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{- Workspace: common.GetWorkspaceIDFromContext(ctx),- ResourceID: &instanceID,- })- if err != nil {- return nil, err- }- if instance == nil {- return nil, errors.Errorf("instance %s not found", instanceID)- }-return model.NewDatabaseMetadata(syncHistory.Metadata,[]byte(syncHistory.Schema),@@ -928,32 +998,35 @@ func (s *DatabaseService) getSourceDBMetadata(ctx context.Context, request *v1pbdbMetadata, err := s.store.GetDBSchema(ctx, &store.FindDBSchemaMessage{Workspace: common.GetWorkspaceIDFromContext(ctx),InstanceID: instanceID,- DatabaseName: databaseName,+ DatabaseName: databaseID,})if err != nil {return nil, err}if dbMetadata == nil {- return nil, errors.Errorf("database schema not found for %s/%s", instanceID, databaseName)+ return nil, errors.Errorf("database schema not found for %s/%s", instanceID, databaseID)}return dbMetadata, nil}- instanceID, databaseName, err := common.GetInstanceDatabaseID(request.Name)+ projectID, instanceID, databaseID, err := common.GetDatabaseResourceName(request.Name)if err != nil {return nil, err}+ if _, err := s.getInstanceForDatabaseResource(ctx, projectID, instanceID); err != nil {+ return nil, err+ }dbMetadata, err := s.store.GetDBSchema(ctx, &store.FindDBSchemaMessage{Workspace: common.GetWorkspaceIDFromContext(ctx),InstanceID: instanceID,- DatabaseName: databaseName,+ DatabaseName: databaseID,})if err != nil {return nil, err}if dbMetadata == nil {- return nil, errors.Errorf("database schema not found for %s/%s", instanceID, databaseName)+ return nil, errors.Errorf("database schema not found for %s/%s", instanceID, databaseID)}return dbMetadata, nil}@@ -963,7 +1036,11 @@ func (s *DatabaseService) getTargetDBMetadata(ctx context.Context, request *v1pb// If the change history id is set, use the schema of the change history as the target.if changeHistoryID != "" {- instanceID, databaseName, changelogID, err := common.GetInstanceDatabaseChangelogID(changeHistoryID)+ projectID, instanceID, databaseID, changelogID, err := common.GetDatabaseChangelogResourceName(changeHistoryID)+ if err != nil {+ return nil, err+ }+ instance, err := s.getInstanceForDatabaseResource(ctx, projectID, instanceID)if err != nil {return nil, err}@@ -990,17 +1067,6 @@ func (s *DatabaseService) getTargetDBMetadata(ctx context.Context, request *v1pb}// Get instance to determine engine and case sensitivity- instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{- Workspace: common.GetWorkspaceIDFromContext(ctx),- ResourceID: &instanceID,- })- if err != nil {- return nil, err- }- if instance == nil {- return nil, errors.Errorf("instance %s not found", instanceID)- }-return model.NewDatabaseMetadata(syncHistory.Metadata,[]byte(syncHistory.Schema),@@ -1014,13 +1080,13 @@ func (s *DatabaseService) getTargetDBMetadata(ctx context.Context, request *v1pbdbMetadata, err := s.store.GetDBSchema(ctx, &store.FindDBSchemaMessage{Workspace: common.GetWorkspaceIDFromContext(ctx),InstanceID: instanceID,- DatabaseName: databaseName,+ DatabaseName: databaseID,})if err != nil {return nil, err}if dbMetadata == nil {- return nil, errors.Errorf("database schema not found for %s/%s", instanceID, databaseName)+ return nil, errors.Errorf("database schema not found for %s/%s", instanceID, databaseID)}return dbMetadata, nil}@@ -1041,14 +1107,11 @@ func (s *DatabaseService) getTargetDBMetadata(ctx context.Context, request *v1pb}// Get instance to determine case sensitivity- instanceID, _, err := common.GetInstanceDatabaseID(request.Name)+ projectID, instanceID, _, err := common.GetDatabaseResourceName(request.Name)if err != nil {return nil, err}- instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{- Workspace: common.GetWorkspaceIDFromContext(ctx),- ResourceID: &instanceID,- })+ instance, err := s.getInstanceForDatabaseResource(ctx, projectID, instanceID)if err != nil {return nil, err}@@ -1074,27 +1137,23 @@ func (s *DatabaseService) getTargetDBMetadata(ctx context.Context, request *v1pb// getParserEngine applies. Gates that must distinguish MariaDB/OceanBase from MySQL — such// as the SDL diff gate — use this.func (s *DatabaseService) getRawEngine(ctx context.Context, request *v1pb.DiffSchemaRequest) (storepb.Engine, error) {+ var projectID *stringvar instanceID string+ var err errorif strings.Contains(request.Name, common.ChangelogPrefix) {- insID, _, _, err := common.GetInstanceDatabaseChangelogID(request.Name)+ projectID, instanceID, _, _, err = common.GetDatabaseChangelogResourceName(request.Name)if err != nil {return storepb.Engine_ENGINE_UNSPECIFIED, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("%v", err.Error()))}- instanceID = insID} else {- insID, _, err := common.GetInstanceDatabaseID(request.Name)+ projectID, instanceID, _, err = common.GetDatabaseResourceName(request.Name)if err != nil {return storepb.Engine_ENGINE_UNSPECIFIED, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("%v", err.Error()))}- instanceID = insID}-- instance, err := s.store.GetInstance(ctx, &store.FindInstanceMessage{- Workspace: common.GetWorkspaceIDFromContext(ctx),- ResourceID: &instanceID,- })+ instance, err := s.getInstanceForDatabaseResource(ctx, projectID, instanceID)if err != nil {- return storepb.Engine_ENGINE_UNSPECIFIED, errors.Wrapf(err, "failed to get instance %s", instanceID)+ return storepb.Engine_ENGINE_UNSPECIFIED, err}if instance == nil {return storepb.Engine_ENGINE_UNSPECIFIED, connect.NewError(connect.CodeNotFound, errors.Errorf("instance %q not found", instanceID))@@ -1119,6 +1178,9 @@ func (s *DatabaseService) convertToDatabase(ctx context.Context, database *storeif err != nil {return nil, errors.Wrap(err, "failed to find instance")}+ if instance == nil {+ return nil, errors.Errorf("instance %q not found", database.InstanceID)+ }var environment, effectiveEnvironment *stringif database.EnvironmentID != nil && *database.EnvironmentID != "" {@@ -1131,8 +1193,9 @@ func (s *DatabaseService) convertToDatabase(ctx context.Context, database *storeinstance,s.licenseService.IsInstanceEffectivelyActivated(ctx, common.GetWorkspaceIDFromContext(ctx), instance),)+ instanceResource.Name = buildInstanceName(instance.ResourceID, instance.ProjectID)return &v1pb.Database{- Name: common.FormatDatabase(database.InstanceID, database.DatabaseName),+ Name: formatDatabaseResourceName(instance, database),State: convertDeletedToState(database.Deleted),SuccessfulSyncTime: database.Metadata.GetLastSyncTime(),Project: common.FormatProject(database.ProjectID),@@ -1169,18 +1232,13 @@ type metadataFilter struct {}func (s *DatabaseService) GetSchemaString(ctx context.Context, req *connect.Request[v1pb.GetSchemaStringRequest]) (*connect.Response[v1pb.GetSchemaStringResponse], error) {- instanceID, databaseName, err := common.TrimSuffixAndGetInstanceDatabaseID(req.Msg.Name, common.SchemaStringSuffix)+ projectID, instanceID, databaseID, err := common.GetDatabaseResourceNameWithSuffix(req.Msg.Name, common.SchemaStringSuffix)if err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "failed to parse %q", req.Msg.Name))}- database, err := s.store.GetDatabase(ctx, &store.FindDatabaseMessage{- Workspace: common.GetWorkspaceIDFromContext(ctx),- InstanceID: &instanceID,- DatabaseName: &databaseName,- ShowDeleted: true,- })+ database, _, err := s.findDatabaseForResource(ctx, projectID, instanceID, databaseID, true)if err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get database %q", req.Msg.Name))+ return nil, connect.NewError(connect.CodeInvalidArgument, err)}if database == nil {return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("database %q not found", req.Msg.Name))@@ -1188,7 +1246,7 @@ func (s *DatabaseService) GetSchemaString(ctx context.Context, req *connect.RequdbMetadata, err := s.store.GetDBSchema(ctx, &store.FindDBSchemaMessage{Workspace: common.GetWorkspaceIDFromContext(ctx),InstanceID: instanceID,- DatabaseName: databaseName,+ DatabaseName: databaseID,})if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("Failed to get database schema: %v", err))diff --git a/backend/api/v1/database_service_test.go b/backend/api/v1/database_service_test.goindex f4fc0fda3a..b46b0fb34e 100644--- a/backend/api/v1/database_service_test.go+++ b/backend/api/v1/database_service_test.go@@ -98,6 +98,16 @@ func TestShouldDiffSchemaViaSDL(t *testing.T) {}}+func TestFormatDatabaseResourceName(t *testing.T) {+ database := &store.DatabaseMessage{InstanceID: "instance-a", DatabaseName: "app"}+ require.Equal(t, "instances/instance-a/databases/app", formatDatabaseResourceName(&store.InstanceMessage{ResourceID: "instance-a"}, database))+ projectID := "project-a"+ require.Equal(t, "projects/project-a/instances/instance-a/databases/app", formatDatabaseResourceName(&store.InstanceMessage{+ ResourceID: "instance-a",+ ProjectID: &projectID,+ }, database))+}+func TestListDatabaseFilter(t *testing.T) {testCases := []struct {input stringdiff --git a/backend/api/v1/instance_descendant_service_test.go b/backend/api/v1/instance_descendant_service_test.gonew file mode 100644index 0000000000..0c8c1b1eb8--- /dev/null+++ b/backend/api/v1/instance_descendant_service_test.go@@ -0,0 +1,176 @@+package v1++import (+ "context"+ "fmt"+ "testing"++ "connectrpc.com/connect"+ "github.com/stretchr/testify/require"++ "github.com/bytebase/bytebase/backend/common"+ "github.com/bytebase/bytebase/backend/common/testcontainer"+ storepb "github.com/bytebase/bytebase/backend/generated-go/store"+ v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"+ "github.com/bytebase/bytebase/backend/migrator"+ "github.com/bytebase/bytebase/backend/store"+)++func TestProjectInstanceDescendantServicesUseCanonicalNames(t *testing.T) {+ ctx, stores, instanceID, databaseName, changelogID, revisionID := setupProjectInstanceDescendantServiceTest(t)+ projectID := "project-a"+ parent := common.FormatProjectDatabase(projectID, instanceID, databaseName)++ roles, err := NewInstanceRoleService(stores).ListInstanceRoles(ctx, connect.NewRequest(&v1pb.ListInstanceRolesRequest{+ Parent: common.FormatProjectInstance(projectID, instanceID),+ }))+ require.NoError(t, err)+ require.Equal(t, common.FormatProjectInstance(projectID, instanceID)+"/roles/role-a", roles.Msg.Roles[0].Name)++ changelogService := NewChangelogService(stores)+ changelogs, err := changelogService.ListChangelogs(ctx, connect.NewRequest(&v1pb.ListChangelogsRequest{Parent: parent}))+ require.NoError(t, err)+ require.Equal(t, common.FormatProjectChangelog(projectID, instanceID, databaseName, changelogID), changelogs.Msg.Changelogs[0].Name)+ changelog, err := changelogService.GetChangelog(ctx, connect.NewRequest(&v1pb.GetChangelogRequest{+ Name: common.FormatProjectChangelog(projectID, instanceID, databaseName, changelogID),+ }))+ require.NoError(t, err)+ require.Equal(t, common.FormatProjectChangelog(projectID, instanceID, databaseName, changelogID), changelog.Msg.Name)++ revisionService := NewRevisionService(stores)+ revisions, err := revisionService.ListRevisions(ctx, connect.NewRequest(&v1pb.ListRevisionsRequest{Parent: parent}))+ require.NoError(t, err)+ require.Equal(t, common.FormatProjectRevision(projectID, instanceID, databaseName, revisionID), revisions.Msg.Revisions[0].Name)+ require.Equal(t, common.FormatSheet(projectID, "sheet-a"), revisions.Msg.Revisions[0].Sheet)+ revision, err := revisionService.GetRevision(ctx, connect.NewRequest(&v1pb.GetRevisionRequest{+ Name: common.FormatProjectRevision(projectID, instanceID, databaseName, revisionID),+ }))+ require.NoError(t, err)+ require.Equal(t, common.FormatProjectRevision(projectID, instanceID, databaseName, revisionID), revision.Msg.Name)+}++func TestProjectInstanceDescendantServicesRejectWrongScopeParents(t *testing.T) {+ ctx, stores, instanceID, databaseName, changelogID, revisionID := setupProjectInstanceDescendantServiceTest(t)+ workspaceParent := common.FormatDatabase(instanceID, databaseName)+ wrongProjectID := "project-b"+ wrongProjectParent := common.FormatProjectDatabase(wrongProjectID, instanceID, databaseName)++ roleService := NewInstanceRoleService(stores)+ _, err := roleService.ListInstanceRoles(ctx, connect.NewRequest(&v1pb.ListInstanceRolesRequest{Parent: common.FormatInstance(instanceID)}))+ require.Equal(t, connect.CodeNotFound, connect.CodeOf(err))+ _, err = roleService.ListInstanceRoles(ctx, connect.NewRequest(&v1pb.ListInstanceRolesRequest{+ Parent: common.FormatProjectInstance(wrongProjectID, instanceID),+ }))+ require.Equal(t, connect.CodeNotFound, connect.CodeOf(err))++ changelogService := NewChangelogService(stores)+ _, err = changelogService.ListChangelogs(ctx, connect.NewRequest(&v1pb.ListChangelogsRequest{Parent: workspaceParent}))+ require.Equal(t, connect.CodeNotFound, connect.CodeOf(err))+ _, err = changelogService.GetChangelog(ctx, connect.NewRequest(&v1pb.GetChangelogRequest{+ Name: common.FormatProjectChangelog(wrongProjectID, instanceID, databaseName, changelogID),+ }))+ require.Equal(t, connect.CodeNotFound, connect.CodeOf(err))++ revisionService := NewRevisionService(stores)+ _, err = revisionService.ListRevisions(ctx, connect.NewRequest(&v1pb.ListRevisionsRequest{Parent: wrongProjectParent}))+ require.Equal(t, connect.CodeNotFound, connect.CodeOf(err))+ _, err = revisionService.GetRevision(ctx, connect.NewRequest(&v1pb.GetRevisionRequest{+ Name: common.FormatRevision(instanceID, databaseName, revisionID),+ }))+ require.Equal(t, connect.CodeNotFound, connect.CodeOf(err))+}++func TestWorkspaceInstanceDescendantServicesKeepWorkspaceNames(t *testing.T) {+ ctx, stores, instanceID, databaseName, changelogID, revisionID := setupWorkspaceInstanceDescendantServiceTest(t)+ parent := common.FormatDatabase(instanceID, databaseName)++ roles, err := NewInstanceRoleService(stores).ListInstanceRoles(ctx, connect.NewRequest(&v1pb.ListInstanceRolesRequest{+ Parent: common.FormatInstance(instanceID),+ }))+ require.NoError(t, err)+ require.Equal(t, common.FormatInstance(instanceID)+"/roles/role-a", roles.Msg.Roles[0].Name)++ changelogs, err := NewChangelogService(stores).ListChangelogs(ctx, connect.NewRequest(&v1pb.ListChangelogsRequest{Parent: parent}))+ require.NoError(t, err)+ require.Equal(t, common.FormatChangelog(instanceID, databaseName, changelogID), changelogs.Msg.Changelogs[0].Name)++ revisions, err := NewRevisionService(stores).ListRevisions(ctx, connect.NewRequest(&v1pb.ListRevisionsRequest{Parent: parent}))+ require.NoError(t, err)+ require.Equal(t, common.FormatRevision(instanceID, databaseName, revisionID), revisions.Msg.Revisions[0].Name)+}++func setupProjectInstanceDescendantServiceTest(t *testing.T) (context.Context, *store.Store, string, string, string, string) {+ t.Helper()+ projectID := "project-a"+ return setupInstanceDescendantServiceTest(t, &projectID)+}++func setupWorkspaceInstanceDescendantServiceTest(t *testing.T) (context.Context, *store.Store, string, string, string, string) {+ t.Helper()+ return setupInstanceDescendantServiceTest(t, nil)+}++func setupInstanceDescendantServiceTest(t *testing.T, instanceProjectID *string) (context.Context, *store.Store, string, string, string, string) {+ t.Helper()+ ctx := context.WithValue(context.Background(), common.WorkspaceIDContextKey, "default")+ container := testcontainer.GetTestPgContainer(ctx, t)+ t.Cleanup(func() { container.Close(ctx) })+ db := container.GetDB()+ require.NoError(t, migrator.MigrateSchema(ctx, db))+ _, err := db.ExecContext(ctx, `+ INSERT INTO workspace (resource_id) VALUES ('default');+ INSERT INTO project (resource_id, workspace, name) VALUES ('project-a', 'default', 'Project A'), ('project-b', 'default', 'Project B');+ `)+ require.NoError(t, err)++ pgURL := fmt.Sprintf("host=%s port=%s user=postgres password=root-password database=postgres", container.GetHost(), container.GetPort())+ stores, err := store.New(ctx, pgURL, false)+ require.NoError(t, err)+ t.Cleanup(func() { require.NoError(t, stores.Close()) })++ instanceID := "project-instance"+ _, err = stores.CreateInstance(ctx, &store.InstanceMessage{+ ResourceID: instanceID,+ Workspace: "default",+ ProjectID: instanceProjectID,+ Metadata: &storepb.Instance{+ DataSources: []*storepb.DataSource{{+ Id: "admin",+ Type: storepb.DataSourceType_ADMIN,+ }},+ Roles: []*storepb.InstanceRole{{+ Name: "role-a",+ }},+ },+ })+ require.NoError(t, err)++ databaseName := "app"+ databaseProjectID := "project-a"+ _, err = stores.UpsertDatabase(ctx, &store.DatabaseMessage{+ InstanceID: instanceID,+ DatabaseName: databaseName,+ ProjectID: databaseProjectID,+ Metadata: &storepb.DatabaseMetadata{},+ })+ require.NoError(t, err)++ changelogID, err := stores.CreateChangelog(ctx, &store.ChangelogMessage{+ InstanceID: instanceID,+ DatabaseName: databaseName,+ Payload: &storepb.ChangelogPayload{},+ Status: store.ChangelogStatusDone,+ })+ require.NoError(t, err)+ revision, err := stores.CreateRevision(ctx, &store.RevisionMessage{+ InstanceID: instanceID,+ DatabaseName: databaseName,+ Version: "1",+ Payload: &storepb.RevisionPayload{+ SheetSha256: "sheet-a",+ Type: storepb.SchemaChangeType_VERSIONED,+ },+ })+ require.NoError(t, err)+ return ctx, stores, instanceID, databaseName, changelogID, revision.ResourceID+}diff --git a/backend/api/v1/instance_role_service.go b/backend/api/v1/instance_role_service.goindex 3128cdee9c..b012f4733b 100644--- a/backend/api/v1/instance_role_service.go+++ b/backend/api/v1/instance_role_service.go@@ -4,7 +4,6 @@ import ("context""connectrpc.com/connect"- "github.com/pkg/errors"v1pb "github.com/bytebase/bytebase/backend/generated-go/v1""github.com/bytebase/bytebase/backend/generated-go/v1/v1connect"@@ -29,7 +28,7 @@ func NewInstanceRoleService(store *store.Store) *InstanceRoleService {func (s *InstanceRoleService) ListInstanceRoles(ctx context.Context, req *connect.Request[v1pb.ListInstanceRolesRequest]) (*connect.Response[v1pb.ListInstanceRolesResponse], error) {instance, err := getInstanceMessage(ctx, s.store, req.Msg.Parent)if err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get instance"))+ return nil, err}instanceRoles := convertInstanceRoles(instance, instance.Metadata.GetRoles())return connect.NewResponse(&v1pb.ListInstanceRolesResponse{diff --git a/backend/api/v1/instance_service.go b/backend/api/v1/instance_service.goindex 0edf3065c4..c92cdf6f2e 100644--- a/backend/api/v1/instance_service.go+++ b/backend/api/v1/instance_service.go@@ -14,6 +14,9 @@ import ("time""connectrpc.com/connect"+ "github.com/google/cel-go/cel"+ celast "github.com/google/cel-go/common/ast"+ celoperators "github.com/google/cel-go/common/operators""github.com/pkg/errors""google.golang.org/protobuf/proto""google.golang.org/protobuf/types/known/emptypb"@@ -220,16 +223,26 @@ func (s *InstanceService) ListInstances(ctx context.Context, req *connect.Reques}limitPlusOne := offset.limit + 1+ parentProjectID, err := s.getProjectInstanceParent(ctx, req.Msg.Parent)+ if err != nil {+ return nil, err+ }+find := &store.FindInstanceMessage{- Workspace: common.GetWorkspaceIDFromContext(ctx),- ShowDeleted: req.Msg.ShowDeleted,- Limit: &limitPlusOne,- Offset: &offset.offset,+ Workspace: common.GetWorkspaceIDFromContext(ctx),+ ProjectID: parentProjectID,+ WorkspaceOnly: parentProjectID == nil,+ ShowDeleted: req.Msg.ShowDeleted,+ Limit: &limitPlusOne,+ Offset: &offset.offset,}filterQ, err := store.GetListInstanceFilter(req.Msg.Filter)if err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, err)}+ if err := validateProjectInstanceListFilter(parentProjectID, req.Msg.Filter); err != nil {+ return nil, connect.NewError(connect.CodeInvalidArgument, err)+ }find.FilterQ = filterQorderByKeys, err := store.GetInstanceOrders(req.Msg.OrderBy)@@ -262,20 +275,82 @@ func (s *InstanceService) ListInstances(ctx context.Context, req *connect.Requesreturn connect.NewResponse(response), nil}+func validateProjectInstanceListFilter(parentProjectID *string, filter string) error {+ if parentProjectID == nil || filter == "" {+ return nil+ }+ env, err := cel.NewEnv()+ if err != nil {+ return errors.Wrap(err, "failed to create CEL environment")+ }+ ast, issues := env.Parse(filter)+ if issues != nil {+ return errors.Errorf("failed to parse filter %q", filter)+ }++ var validate func(celast.Expr) error+ validate = func(expr celast.Expr) error {+ if expr.Kind() != celast.CallKind {+ return nil+ }+ call := expr.AsCall()+ switch call.FunctionName() {+ case celoperators.LogicalAnd, celoperators.LogicalOr:+ for _, arg := range call.Args() {+ if err := validate(arg); err != nil {+ return err+ }+ }+ case celoperators.Equals:+ variable, value := getVariableAndValueFromExpr(expr)+ if variable != "project" {+ break+ }+ projectName, ok := value.(string)+ if !ok {+ return nil+ }+ projectID, err := common.GetProjectID(projectName)+ if err != nil {+ return errors.Errorf("invalid project filter %q", projectName)+ }+ if projectID != *parentProjectID {+ return errors.Errorf("project filter %q does not match parent %q", projectName, common.FormatProject(*parentProjectID))+ }+ default:+ for _, arg := range call.Args() {+ if err := validate(arg); err != nil {+ return err+ }+ }+ }+ return nil+ }+ return validate(ast.NativeRep().Expr())+}+// ListInstanceDatabase list all databases in the instance.func (s *InstanceService) ListInstanceDatabase(ctx context.Context, req *connect.Request[v1pb.ListInstanceDatabaseRequest]) (*connect.Response[v1pb.ListInstanceDatabaseResponse], error) {var instanceMessage *store.InstanceMessageif req.Msg.Instance != nil {- instanceID, err := common.GetInstanceID(req.Msg.Name)+ projectID, instanceID, err := common.GetInstanceResourceName(req.Msg.Name)if err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, err)}+ if projectID != nil {+ parent := common.FormatProject(*projectID)+ projectID, err = s.getProjectInstanceParent(ctx, &parent)+ if err != nil {+ return nil, err+ }+ }if instanceMessage, err = convertToStoreInstance(instanceID, req.Msg.Instance); err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, err)}instanceMessage.Workspace = common.GetWorkspaceIDFromContext(ctx)+ instanceMessage.ProjectID = projectID} else {instance, err := getInstanceMessage(ctx, s.store, req.Msg.Name)if err != nil {@@ -305,7 +380,11 @@ func (s *InstanceService) CreateInstance(ctx context.Context, req *connect.Requereturn nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid instance ID %v", req.Msg.InstanceId))}- if err := s.instanceCountGuard(ctx); err != nil {+ if req.Msg.Parent != nil && req.Msg.InitialDatabaseProject != "" {+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.New("initial_database_project must be unset when parent is set"))+ }+ projectID, err := s.getProjectInstanceParent(ctx, req.Msg.Parent)+ if err != nil {return nil, err}@@ -322,6 +401,7 @@ func (s *InstanceService) CreateInstance(ctx context.Context, req *connect.Reque// connection below, before the instance is persisted.workspaceID := common.GetWorkspaceIDFromContext(ctx)instanceMessage.Workspace = workspaceID+ instanceMessage.ProjectID = projectIDinitialProjectID, err := s.getInitialDatabaseProjectID(ctx, req.Msg.GetInitialDatabaseProject())if err != nil {return nil, err@@ -346,6 +426,9 @@ func (s *InstanceService) CreateInstance(ctx context.Context, req *connect.Requeresult := s.convertToV1Instance(ctx, instanceMessage)return connect.NewResponse(result), nil}+ if err := s.instanceCountGuard(ctx); err != nil {+ return nil, err+ }if err := s.checkActivationLimit(ctx, workspaceID, instanceMessage.Metadata.GetActivation()); err != nil {return nil, err@@ -405,6 +488,31 @@ func (s *InstanceService) getInitialDatabaseProjectID(ctx context.Context, projereturn project.ResourceID, nil}+func (s *InstanceService) getProjectInstanceParent(ctx context.Context, parent *string) (*string, error) {+ if parent == nil {+ return nil, nil+ }+ projectID, err := common.GetProjectID(*parent)+ if err != nil || projectID == "-" {+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid instance parent %q", *parent))+ }+ workspaceID := common.GetWorkspaceIDFromContext(ctx)+ if common.IsDefaultProject(workspaceID, projectID) {+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("default project %q cannot own instances", *parent))+ }+ project, err := s.store.GetProject(ctx, &store.FindProjectMessage{+ ResourceID: &projectID,+ Workspace: workspaceID,+ })+ if err != nil {+ return nil, connect.NewError(connect.CodeInternal, err)+ }+ if project == nil || project.Deleted {+ return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("project %q not found", *parent))+ }+ return &projectID, nil+}+func instanceWithMetadata(instance *store.InstanceMessage, metadata *storepb.Instance) *store.InstanceMessage {candidate := *instancecandidate.Metadata = metadata@@ -677,7 +785,7 @@ func (s *InstanceService) UpdateInstance(ctx context.Context, req *connect.Requeif err != nil {if strings.Contains(err.Error(), "not found") && req.Msg.AllowMissing {// When allow_missing is true and instance doesn't exist, create a new one- instanceID, ierr := common.GetInstanceID(req.Msg.Instance.Name)+ projectID, instanceID, ierr := common.GetInstanceResourceName(req.Msg.Instance.Name)if ierr != nil {return nil, connect.NewError(connect.CodeInvalidArgument, ierr)}@@ -685,6 +793,7 @@ func (s *InstanceService) UpdateInstance(ctx context.Context, req *connect.Requereturn s.CreateInstance(ctx, connect.NewRequest(&v1pb.CreateInstanceRequest{InstanceId: instanceID,Instance: req.Msg.Instance,+ Parent: instanceCollectionParent(projectID),}))}return nil, connect.NewError(connect.CodeInvalidArgument, err)@@ -789,6 +898,9 @@ func (s *InstanceService) DeleteInstance(ctx context.Context, req *connect.Requeif err != nil {return nil, err}+ if req.Msg.Force && instance.ProjectID != nil {+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.New("force deletion is only supported for workspace instances"))+ }// Handle purge (hard delete) of soft-deleted instanceif req.Msg.Purge {@@ -811,30 +923,32 @@ func (s *InstanceService) DeleteInstance(ctx context.Context, req *connect.Requereturn connect.NewResponse(&emptypb.Empty{}), nil}- databases, err := s.store.ListDatabases(ctx, &store.FindDatabaseMessage{Workspace: common.GetWorkspaceIDFromContext(ctx), InstanceID: &instance.ResourceID})- if err != nil {- return nil, err- }- if req.Msg.Force {- if len(databases) > 0 {- defaultProjectID, err := s.store.GetDefaultProjectID(ctx, common.GetWorkspaceIDFromContext(ctx))- if err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to get default project ID"))+ if instance.ProjectID == nil {+ databases, err := s.store.ListDatabases(ctx, &store.FindDatabaseMessage{Workspace: common.GetWorkspaceIDFromContext(ctx), InstanceID: &instance.ResourceID})+ if err != nil {+ return nil, err+ }+ if req.Msg.Force {+ if len(databases) > 0 {+ defaultProjectID, err := s.store.GetDefaultProjectID(ctx, common.GetWorkspaceIDFromContext(ctx))+ if err != nil {+ return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to get default project ID"))+ }+ if err := s.store.BatchUpdateDatabases(ctx, databases, &store.BatchUpdateDatabases{Workspace: common.GetWorkspaceIDFromContext(ctx), ProjectID: &defaultProjectID}); err != nil {+ return nil, connect.NewError(connect.CodeInternal, err)+ }}- if err := s.store.BatchUpdateDatabases(ctx, databases, &store.BatchUpdateDatabases{Workspace: common.GetWorkspaceIDFromContext(ctx), ProjectID: &defaultProjectID}); err != nil {- return nil, connect.NewError(connect.CodeInternal, err)+ } else {+ var databaseNames []string+ for _, database := range databases {+ if !common.IsDefaultProject(common.GetWorkspaceIDFromContext(ctx), database.ProjectID) {+ databaseNames = append(databaseNames, database.DatabaseName)+ }}- }- } else {- var databaseNames []string- for _, database := range databases {- if !common.IsDefaultProject(common.GetWorkspaceIDFromContext(ctx), database.ProjectID) {- databaseNames = append(databaseNames, database.DatabaseName)+ if len(databaseNames) > 0 {+ return nil, connect.NewError(connect.CodeFailedPrecondition, errors.New("all databases should be transferred to the unassigned project before deleting the instance"))}}- if len(databaseNames) > 0 {- return nil, connect.NewError(connect.CodeFailedPrecondition, errors.New("all databases should be transferred to the unassigned project before deleting the instance"))- }}metadata := proto.CloneOf(instance.Metadata)@@ -923,14 +1037,16 @@ func (s *InstanceService) SyncInstance(ctx context.Context, req *connect.Request// BatchSyncInstances syncs multiple instances.func (s *InstanceService) BatchSyncInstances(ctx context.Context, req *connect.Request[v1pb.BatchSyncInstancesRequest]) (*connect.Response[v1pb.BatchSyncInstancesResponse], error) {- for _, r := range req.Msg.Requests {- instance, err := getInstanceMessage(ctx, s.store, r.Name)- if err != nil {- return nil, err- }- if instance.Deleted {- return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("instance %q has been deleted", r.Name))- }+ names := make([]string, 0, len(req.Msg.Requests))+ for _, request := range req.Msg.Requests {+ names = append(names, request.Name)+ }+ instances, err := s.getInstanceCollection(ctx, req.Msg.Parent, names)+ if err != nil {+ return nil, err+ }+ for i, instance := range instances {+ r := req.Msg.Requests[i]updatedInstance, _, newDatabases, err := s.schemaSyncer.SyncInstance(ctx, instance)if err != nil {@@ -949,6 +1065,33 @@ func (s *InstanceService) BatchSyncInstances(ctx context.Context, req *connect.R// BatchUpdateInstances update multiple instances.func (s *InstanceService) BatchUpdateInstances(ctx context.Context, req *connect.Request[v1pb.BatchUpdateInstancesRequest]) (*connect.Response[v1pb.BatchUpdateInstancesResponse], error) {+ projectID, err := s.getProjectInstanceParent(ctx, req.Msg.Parent)+ if err != nil {+ return nil, err+ }+ for _, updateReq := range req.Msg.GetRequests() {+ name := updateReq.GetInstance().GetName()+ instanceProjectID, _, err := common.GetInstanceResourceName(name)+ if err != nil {+ return nil, connect.NewError(connect.CodeInvalidArgument, err)+ }+ if (projectID == nil) != (instanceProjectID == nil) || projectID != nil && *projectID != *instanceProjectID {+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("instance %q is not in its requested collection", name))+ }+ }+ for _, updateReq := range req.Msg.GetRequests() {+ name := updateReq.GetInstance().GetName()+ instance, err := getInstanceMessage(ctx, s.store, name)+ if err != nil {+ if connect.CodeOf(err) == connect.CodeNotFound && updateReq.AllowMissing {+ continue+ }+ return nil, err+ }+ if instance.Deleted {+ return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("instance %q has been deleted", name))+ }+ }response := &v1pb.BatchUpdateInstancesResponse{}for _, updateReq := range req.Msg.GetRequests() {updated, err := s.UpdateInstance(ctx, connect.NewRequest(updateReq))@@ -1284,14 +1427,16 @@ func (s *InstanceService) RemoveDataSource(ctx context.Context, req *connect.Req}func getInstanceMessage(ctx context.Context, stores *store.Store, name string) (*store.InstanceMessage, error) {- instanceID, err := common.GetInstanceID(name)+ projectID, instanceID, err := common.GetInstanceResourceName(name)if err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, err)}find := &store.FindInstanceMessage{- Workspace: common.GetWorkspaceIDFromContext(ctx),- ResourceID: &instanceID,+ Workspace: common.GetWorkspaceIDFromContext(ctx),+ ResourceID: &instanceID,+ ProjectID: projectID,+ WorkspaceOnly: projectID == nil,}instance, err := stores.GetInstance(ctx, find)if err != nil {@@ -1304,8 +1449,40 @@ func getInstanceMessage(ctx context.Context, stores *store.Store, name string) (return instance, nil}-// buildInstanceName builds the instance name with the given instance ID.-func buildInstanceName(instanceID string) string {+func instanceCollectionParent(projectID *string) *string {+ if projectID == nil {+ return nil+ }+ return new(common.FormatProject(*projectID))+}++func (s *InstanceService) getInstanceCollection(ctx context.Context, parent *string, names []string) ([]*store.InstanceMessage, error) {+ projectID, err := s.getProjectInstanceParent(ctx, parent)+ if err != nil {+ return nil, err+ }+ instances := make([]*store.InstanceMessage, 0, len(names))+ for _, name := range names {+ instance, err := getInstanceMessage(ctx, s.store, name)+ if err != nil {+ return nil, err+ }+ if instance.Deleted {+ return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("instance %q has been deleted", name))+ }+ if (projectID == nil) != (instance.ProjectID == nil) || projectID != nil && *projectID != *instance.ProjectID {+ return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("instance %q is not in its requested collection", name))+ }+ instances = append(instances, instance)+ }+ return instances, nil+}++// buildInstanceName builds an instance name in its owner collection.+func buildInstanceName(instanceID string, projectID *string) string {+ if projectID != nil {+ return common.FormatProjectInstance(*projectID, instanceID)+ }var b strings.Builderb.Grow(len(common.InstanceNamePrefix) + len(instanceID))_, _ = b.WriteString(common.InstanceNamePrefix)diff --git a/backend/api/v1/instance_service_converter.go b/backend/api/v1/instance_service_converter.goindex 98db0f1e9c..ca7438c63a 100644--- a/backend/api/v1/instance_service_converter.go+++ b/backend/api/v1/instance_service_converter.go@@ -18,7 +18,7 @@ func convertToV1Instance(instance *store.InstanceMessage, activation bool) *v1pbdataSources := convertDataSources(instance.Metadata.GetDataSources())return &v1pb.Instance{- Name: buildInstanceName(instance.ResourceID),+ Name: buildInstanceName(instance.ResourceID, instance.ProjectID),Title: instance.Metadata.GetTitle(),Engine: engine,EngineVersion: instance.Metadata.GetVersion(),@@ -36,10 +36,9 @@ func convertToV1Instance(instance *store.InstanceMessage, activation bool) *v1pb}// buildRoleName builds the role name with the given instance ID and role name.-func buildRoleName(b *strings.Builder, instanceID, roleName string) string {+func buildRoleName(b *strings.Builder, instanceID string, projectID *string, roleName string) string {b.Reset()- _, _ = b.WriteString(common.InstanceNamePrefix)- _, _ = b.WriteString(instanceID)+ _, _ = b.WriteString(buildInstanceName(instanceID, projectID))_, _ = b.WriteString("/")_, _ = b.WriteString(common.RolePrefix)_, _ = b.WriteString(roleName)@@ -55,7 +54,7 @@ func convertInstanceRoles(instance *store.InstanceMessage, roles []*storepb.Instfor _, role := range roles {v1Roles = append(v1Roles, &v1pb.InstanceRole{- Name: buildRoleName(&b, instance.ResourceID, role.Name),+ Name: buildRoleName(&b, instance.ResourceID, instance.ProjectID, role.Name),RoleName: role.Name,Attribute: role.Attribute,})@@ -115,7 +114,7 @@ func convertToStoreSyncDatabases(syncDatabases *v1pb.SyncDatabases) *storepb.Synfunc convertToV1InstanceResource(instanceMessage *store.InstanceMessage, activation bool) *v1pb.InstanceResource {return &v1pb.InstanceResource{- Name: buildInstanceName(instanceMessage.ResourceID),+ Name: buildInstanceName(instanceMessage.ResourceID, instanceMessage.ProjectID),Title: instanceMessage.Metadata.GetTitle(),Engine: convertToEngine(instanceMessage.Metadata.GetEngine()),EngineVersion: instanceMessage.Metadata.GetVersion(),diff --git a/backend/api/v1/instance_service_converter_test.go b/backend/api/v1/instance_service_converter_test.goindex a9d1181bc6..ee0b5820dd 100644--- a/backend/api/v1/instance_service_converter_test.go+++ b/backend/api/v1/instance_service_converter_test.go@@ -7,8 +7,27 @@ import (storepb "github.com/bytebase/bytebase/backend/generated-go/store"v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"+ "github.com/bytebase/bytebase/backend/store")+func TestConvertToV1InstanceUsesOwningProjectName(t *testing.T) {+ projectID := "project-a"+ instance := &store.InstanceMessage{+ ResourceID: "instance-a",+ ProjectID: &projectID,+ Metadata: &storepb.Instance{+ Roles: []*storepb.InstanceRole{{Name: "role-a"}},+ },+ }++ got := convertToV1Instance(instance, false)+ require.Equal(t, "projects/project-a/instances/instance-a", got.Name)+ require.Equal(t, "projects/project-a/instances/instance-a/roles/role-a", got.Roles[0].Name)++ resource := convertToV1InstanceResource(instance, false)+ require.Equal(t, "projects/project-a/instances/instance-a", resource.Name)+}+func TestConvertDataSourceCloudSQLIPType(t *testing.T) {tests := []struct {name stringdiff --git a/backend/api/v1/instance_service_test.go b/backend/api/v1/instance_service_test.goindex daa7448873..319328fd56 100644--- a/backend/api/v1/instance_service_test.go+++ b/backend/api/v1/instance_service_test.go@@ -23,6 +23,35 @@ func TestValidateExtraConnectionParametersRejectsTiDBAllowAllFiles(t *testing.T)require.Contains(t, err.Error(), "allowAllFiles")}+func TestValidateProjectInstanceListFilter(t *testing.T) {+ projectID := "project-a"+ tests := []struct {+ name string+ parent *string+ filter string+ wantErr bool+ }{+ {name: "project parent accepts omitted filter", parent: &projectID},+ {name: "project parent accepts matching project filter", parent: &projectID, filter: `project == "projects/project-a"`},+ {name: "project parent accepts matching project filter in conjunction", parent: &projectID, filter: `project == "projects/project-a" && engine == "POSTGRES"`},+ {name: "project parent rejects another project filter", parent: &projectID, filter: `project == "projects/project-b"`, wantErr: true},+ {name: "project parent rejects reversed another project filter", parent: &projectID, filter: `"projects/project-b" == project`, wantErr: true},+ {name: "project parent rejects another project in disjunction", parent: &projectID, filter: `project == "projects/project-a" || project == "projects/project-b"`, wantErr: true},+ {name: "project parent rejects another project under negation", parent: &projectID, filter: `!(project == "projects/project-b")`, wantErr: true},+ {name: "workspace parent retains project filter behavior", filter: `project == "projects/project-b"`},+ }+ for _, test := range tests {+ t.Run(test.name, func(t *testing.T) {+ err := validateProjectInstanceListFilter(test.parent, test.filter)+ if test.wantErr {+ require.Error(t, err)+ return+ }+ require.NoError(t, err)+ })+ }+}+func TestClassifyConnectionFailure(t *testing.T) {connectErr := connect.NewError(connect.CodeInvalidArgument, errors.New("generic connect error"))connectErr.Meta().Set(connectionCategoryHeader, connectionCategoryAuthFailed)diff --git a/backend/api/v1/revision_service.go b/backend/api/v1/revision_service.goindex c2972d03da..288c5b10ec 100644--- a/backend/api/v1/revision_service.go+++ b/backend/api/v1/revision_service.go@@ -37,21 +37,9 @@ func (s *RevisionService) ListRevisions(req *connect.Request[v1pb.ListRevisionsRequest],) (*connect.Response[v1pb.ListRevisionsResponse], error) {request := req.Msg- instanceID, databaseName, err := common.GetInstanceDatabaseID(request.Parent)+ instance, database, err := getInstanceDatabaseMessage(ctx, s.store, request.Parent)if err != nil {- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "failed to parse %q", request.Parent))- }- database, err := s.store.GetDatabase(ctx, &store.FindDatabaseMessage{- Workspace: common.GetWorkspaceIDFromContext(ctx),- InstanceID: &instanceID,- DatabaseName: &databaseName,- ShowDeleted: true,- })- if err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get database"))- }- if database == nil {- return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("database %v not found", request.Parent))+ return nil, err}offset, err := parseLimitAndOffset(&pageSize{@@ -85,7 +73,7 @@ func (s *RevisionService) ListRevisions(revisions = revisions[:offset.limit]}- converted := convertToRevisions(request.Parent, database.ProjectID, revisions)+ converted := convertToRevisions(formatDatabaseParent(instance, database), database.ProjectID, revisions)return connect.NewResponse(&v1pb.ListRevisionsResponse{Revisions: converted,@@ -98,29 +86,20 @@ func (s *RevisionService) GetRevision(req *connect.Request[v1pb.GetRevisionRequest],) (*connect.Response[v1pb.Revision], error) {request := req.Msg- instanceID, databaseName, revisionID, err := common.GetInstanceDatabaseRevisionID(request.Name)+ parent, revisionID, err := getRevisionParentAndID(request.Name)if err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "failed to get revision ID from %v", request.Name))}- database, err := s.store.GetDatabase(ctx, &store.FindDatabaseMessage{- Workspace: common.GetWorkspaceIDFromContext(ctx),- InstanceID: &instanceID,- DatabaseName: &databaseName,- ShowDeleted: true,- })+ instance, database, err := getInstanceDatabaseMessage(ctx, s.store, parent)if err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get database"))- }- if database == nil {- return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("database not found"))+ return nil, err}- revision, err := s.store.GetRevision(ctx, revisionID, instanceID, databaseName)+ revision, err := s.store.GetRevision(ctx, revisionID, database.InstanceID, database.DatabaseName)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get revision %v", request.Name))}- parent := common.FormatDatabase(instanceID, databaseName)- converted := convertToRevision(parent, database.ProjectID, revision)+ converted := convertToRevision(formatDatabaseParent(instance, database), database.ProjectID, revision)return connect.NewResponse(converted), nil}@@ -129,20 +108,9 @@ func (s *RevisionService) BatchCreateRevisions(req *connect.Request[v1pb.BatchCreateRevisionsRequest],) (*connect.Response[v1pb.BatchCreateRevisionsResponse], error) {request := req.Msg- instanceID, databaseName, err := common.GetInstanceDatabaseID(request.Parent)- if err != nil {- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "failed to parse %q", request.Parent))- }- database, err := s.store.GetDatabase(ctx, &store.FindDatabaseMessage{- Workspace: common.GetWorkspaceIDFromContext(ctx),- InstanceID: &instanceID,- DatabaseName: &databaseName,- })+ instance, database, err := getInstanceDatabaseMessage(ctx, s.store, request.Parent)if err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to get database"))- }- if database == nil {- return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("database %v not found", request.Parent))+ return nil, err}var revisions []*v1pb.Revision@@ -154,7 +122,7 @@ func (s *RevisionService) BatchCreateRevisions(revisions = append(revisions, r.Revision)}- createdRevisions, err := s.createRevisions(ctx, request.Parent, revisions, database)+ createdRevisions, err := s.createRevisions(ctx, formatDatabaseParent(instance, database), revisions, database)if err != nil {return nil, err}@@ -278,20 +246,42 @@ func (s *RevisionService) DeleteRevision(req *connect.Request[v1pb.DeleteRevisionRequest],) (*connect.Response[emptypb.Empty], error) {request := req.Msg- instanceID, databaseName, revisionID, err := common.GetInstanceDatabaseRevisionID(request.Name)+ parent, revisionID, err := getRevisionParentAndID(request.Name)if err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Wrapf(err, "failed to parse %v", request.Name))}+ _, database, err := getInstanceDatabaseMessage(ctx, s.store, parent)+ if err != nil {+ return nil, err+ }user, ok := GetUserFromContext(ctx)if !ok {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("user not found"))}- if err := s.store.DeleteRevision(ctx, revisionID, instanceID, databaseName, user.Email); err != nil {+ if err := s.store.DeleteRevision(ctx, revisionID, database.InstanceID, database.DatabaseName, user.Email); err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to delete revision %v", request.Name))}return connect.NewResponse(&emptypb.Empty{}), nil}+func getRevisionParentAndID(name string) (string, string, error) {+ if projectID, instanceID, databaseName, revisionID, err := common.GetProjectIDInstanceDatabaseRevisionID(name); err == nil {+ return common.FormatProjectDatabase(projectID, instanceID, databaseName), revisionID, nil+ }+ instanceID, databaseName, revisionID, err := common.GetInstanceDatabaseRevisionID(name)+ if err != nil {+ return "", "", err+ }+ return common.FormatDatabase(instanceID, databaseName), revisionID, nil+}++func formatDatabaseParent(instance *store.InstanceMessage, database *store.DatabaseMessage) string {+ if instance.ProjectID != nil {+ return common.FormatProjectDatabase(*instance.ProjectID, database.InstanceID, database.DatabaseName)+ }+ return common.FormatDatabase(database.InstanceID, database.DatabaseName)+}+func convertToRevisions(parent string, projectID string, revisions []*store.RevisionMessage) []*v1pb.Revision {var rs []*v1pb.Revisionfor _, revision := range revisions {diff --git a/backend/common/resource_name.go b/backend/common/resource_name.goindex 116a8bab89..b6d611e2a3 100644--- a/backend/common/resource_name.go+++ b/backend/common/resource_name.go@@ -136,6 +136,50 @@ func GetEnvironmentID(name string) (string, error) {return tokens[0], nil}+// GetInstanceResourceName gets the IDs from a workspace- or project-scoped instance resource name.+func GetInstanceResourceName(name string) (*string, string, error) {+ if projectID, instanceID, err := GetProjectIDInstanceID(name); err == nil {+ return &projectID, instanceID, nil+ }+ if instanceID, err := GetInstanceID(name); err == nil {+ return nil, instanceID, nil+ }+ return nil, "", errors.Errorf("invalid instance name %q", name)+}++// GetDatabaseResourceName gets the IDs from a workspace- or project-scoped database resource name.+func GetDatabaseResourceName(name string) (*string, string, string, error) {+ if instanceID, databaseID, err := GetInstanceDatabaseID(name); err == nil {+ return nil, instanceID, databaseID, nil+ }+ projectID, instanceID, databaseID, err := GetProjectIDInstanceDatabaseID(name)+ if err != nil {+ return nil, "", "", err+ }+ return &projectID, instanceID, databaseID, nil+}++// GetDatabaseResourceNameWithSuffix gets the IDs from a database resource name with the given suffix.+func GetDatabaseResourceNameWithSuffix(name, suffix string) (*string, string, string, error) {+ databaseName, err := TrimSuffix(name, suffix)+ if err != nil {+ return nil, "", "", err+ }+ return GetDatabaseResourceName(databaseName)+}++// GetDatabaseChangelogResourceName gets the IDs from a workspace- or project-scoped changelog resource name.+func GetDatabaseChangelogResourceName(name string) (*string, string, string, string, error) {+ if instanceID, databaseID, changelogID, err := GetInstanceDatabaseChangelogID(name); err == nil {+ return nil, instanceID, databaseID, changelogID, nil+ }+ projectID, instanceID, databaseID, changelogID, err := GetProjectIDInstanceDatabaseChangelogID(name)+ if err != nil {+ return nil, "", "", "", err+ }+ return &projectID, instanceID, databaseID, changelogID, nil+}+// GetInstanceID returns the instance ID from a resource name.func GetInstanceID(name string) (string, error) {// the instance request should be instances/{instance-id}@@ -175,6 +219,42 @@ func GetInstanceDatabaseChangelogID(name string) (string, string, string, error)return tokens[0], tokens[1], tokens[2], nil}+// GetProjectIDInstanceID returns the project ID and instance ID from a project instance resource name.+func GetProjectIDInstanceID(name string) (string, string, error) {+ tokens, err := GetNameParentTokens(name, ProjectNamePrefix, InstanceNamePrefix)+ if err != nil {+ return "", "", err+ }+ return tokens[0], tokens[1], nil+}++// GetProjectIDInstanceDatabaseID returns the project ID, instance ID, and database ID from a project database resource name.+func GetProjectIDInstanceDatabaseID(name string) (string, string, string, error) {+ tokens, err := GetNameParentTokens(name, ProjectNamePrefix, InstanceNamePrefix, DatabaseIDPrefix)+ if err != nil {+ return "", "", "", err+ }+ return tokens[0], tokens[1], tokens[2], nil+}++// GetProjectIDInstanceDatabaseRevisionID returns the project ID, instance ID, database ID, and revision ID from a project revision resource name.+func GetProjectIDInstanceDatabaseRevisionID(name string) (string, string, string, string, error) {+ tokens, err := GetNameParentTokens(name, ProjectNamePrefix, InstanceNamePrefix, DatabaseIDPrefix, RevisionNamePrefix)+ if err != nil {+ return "", "", "", "", err+ }+ return tokens[0], tokens[1], tokens[2], tokens[3], nil+}++// GetProjectIDInstanceDatabaseChangelogID returns the project ID, instance ID, database ID, and changelog ID from a project changelog resource name.+func GetProjectIDInstanceDatabaseChangelogID(name string) (string, string, string, string, error) {+ tokens, err := GetNameParentTokens(name, ProjectNamePrefix, InstanceNamePrefix, DatabaseIDPrefix, ChangelogPrefix)+ if err != nil {+ return "", "", "", "", err+ }+ return tokens[0], tokens[1], tokens[2], tokens[3], nil+}+// GetUserEmail returns the user email from a resource name.func GetUserEmail(name string) (string, error) {tokens, err := GetNameParentTokens(name, UserNamePrefix)@@ -523,7 +603,7 @@ func GetNameParentTokens(name string, tokenPrefixes ...string) ([]string, error)var tokens []stringfor i, tokenPrefix := range tokenPrefixes {- if fmt.Sprintf("%s/", parts[2*i]) != tokenPrefix {+ if parts[2*i+1] == "" || fmt.Sprintf("%s/", parts[2*i]) != tokenPrefix {return nil, errors.Errorf("invalid prefix %q in request %q", tokenPrefix, name)}tokens = append(tokens, parts[2*i+1])@@ -587,6 +667,16 @@ func FormatDatabase(instance string, database string) string {return fmt.Sprintf("%s/%s%s", FormatInstance(instance), DatabaseIDPrefix, database)}+// FormatProjectInstance formats a project instance resource name.+func FormatProjectInstance(projectID, instanceID string) string {+ return fmt.Sprintf("%s/%s%s", FormatProject(projectID), InstanceNamePrefix, instanceID)+}++// FormatProjectDatabase formats a project database resource name.+func FormatProjectDatabase(projectID, instanceID, databaseID string) string {+ return fmt.Sprintf("%s/%s%s", FormatProjectInstance(projectID, instanceID), DatabaseIDPrefix, databaseID)+}+func FormatRole(role string) string {return fmt.Sprintf("%s%s", RolePrefix, role)}@@ -646,6 +736,16 @@ func FormatChangelog(instanceID, databaseID string, changelogID string) string {return fmt.Sprintf("%s/%s%s", FormatDatabase(instanceID, databaseID), ChangelogPrefix, changelogID)}+// FormatProjectRevision formats a project revision resource name.+func FormatProjectRevision(projectID, instanceID, databaseID, revisionID string) string {+ return fmt.Sprintf("%s/%s%s", FormatProjectDatabase(projectID, instanceID, databaseID), RevisionNamePrefix, revisionID)+}++// FormatProjectChangelog formats a project changelog resource name.+func FormatProjectChangelog(projectID, instanceID, databaseID, changelogID string) string {+ return fmt.Sprintf("%s/%s%s", FormatProjectDatabase(projectID, instanceID, databaseID), ChangelogPrefix, changelogID)+}+func FormatPlan(projectID string, planUID int64) string {return fmt.Sprintf("%s/%s%d", FormatProject(projectID), PlanPrefix, planUID)}@@ -665,7 +765,7 @@ func GetPolicyResourceTypeAndResource(requestName string) (storepb.Policy_Resourreturn storepb.Policy_RESOURCE_UNSPECIFIED, nil, connect.NewError(connect.CodeInvalidArgument, errors.New("policy parent resource name must not be empty"))}- if strings.HasPrefix(requestName, WorkspacePrefix) {+ if _, err := GetWorkspaceID(requestName); err == nil {return storepb.Policy_WORKSPACE, &requestName, nil}diff --git a/backend/common/resource_name_test.go b/backend/common/resource_name_test.goindex 92f2399ef2..d999e06f06 100644--- a/backend/common/resource_name_test.go+++ b/backend/common/resource_name_test.go@@ -16,6 +16,266 @@ func TestGetInstanceDatabaseID(t *testing.T) {require.Error(t, err)}+func TestGetInstanceResourceName(t *testing.T) {+ for _, test := range []struct {+ name string+ wantProjectID *string+ wantInstanceID string+ wantErr bool+ }{+ {+ name: "instances/instance-1",+ wantInstanceID: "instance-1",+ },+ {+ name: "projects/project-1/instances/instance-1",+ wantProjectID: new("project-1"),+ wantInstanceID: "instance-1",+ },+ {+ name: "projects/project-1/instances",+ wantErr: true,+ },+ } {+ t.Run(test.name, func(t *testing.T) {+ projectID, instanceID, err := GetInstanceResourceName(test.name)+ if test.wantErr {+ require.Error(t, err)+ return+ }+ require.NoError(t, err)+ require.Equal(t, test.wantProjectID, projectID)+ require.Equal(t, test.wantInstanceID, instanceID)+ })+ }+}++func TestGetDatabaseResourceName(t *testing.T) {+ for _, test := range []struct {+ name string+ wantProjectID *string+ wantInstanceID string+ wantDatabaseID string+ wantErr bool+ }{+ {+ name: "instances/instance-1/databases/database-1",+ wantInstanceID: "instance-1",+ wantDatabaseID: "database-1",+ },+ {+ name: "projects/project-1/instances/instance-1/databases/database-1",+ wantProjectID: new("project-1"),+ wantInstanceID: "instance-1",+ wantDatabaseID: "database-1",+ },+ {+ name: "projects/project-1/instances/instance-1",+ wantErr: true,+ },+ {+ name: "projects/project-1/instances/instance-1/databases/database-1/metadata",+ wantErr: true,+ },+ } {+ t.Run(test.name, func(t *testing.T) {+ projectID, instanceID, databaseID, err := GetDatabaseResourceName(test.name)+ if test.wantErr {+ require.Error(t, err)+ return+ }+ require.NoError(t, err)+ require.Equal(t, test.wantProjectID, projectID)+ require.Equal(t, test.wantInstanceID, instanceID)+ require.Equal(t, test.wantDatabaseID, databaseID)+ })+ }+}++func TestGetDatabaseResourceNameWithSuffix(t *testing.T) {+ for _, test := range []struct {+ name string+ suffix string+ wantProjectID *string+ wantInstanceID string+ wantDatabaseID string+ wantErr bool+ }{+ {+ name: "instances/instance-1/databases/database-1/metadata",+ suffix: MetadataSuffix,+ wantInstanceID: "instance-1",+ wantDatabaseID: "database-1",+ },+ {+ name: "projects/project-1/instances/instance-1/databases/database-1/metadata",+ suffix: MetadataSuffix,+ wantProjectID: new("project-1"),+ wantInstanceID: "instance-1",+ wantDatabaseID: "database-1",+ },+ {+ name: "instances/instance-1/databases/database-1/metadata",+ suffix: "/schema",+ wantErr: true,+ },+ } {+ t.Run(test.name+test.suffix, func(t *testing.T) {+ projectID, instanceID, databaseID, err := GetDatabaseResourceNameWithSuffix(test.name, test.suffix)+ if test.wantErr {+ require.Error(t, err)+ return+ }+ require.NoError(t, err)+ require.Equal(t, test.wantProjectID, projectID)+ require.Equal(t, test.wantInstanceID, instanceID)+ require.Equal(t, test.wantDatabaseID, databaseID)+ })+ }+}++func TestGetDatabaseChangelogResourceName(t *testing.T) {+ projectID, instanceID, databaseID, changelogID, err := GetDatabaseChangelogResourceName(+ "instances/instance-1/databases/database-1/changelogs/changelog-1")+ require.NoError(t, err)+ require.Nil(t, projectID)+ require.Equal(t, "instance-1", instanceID)+ require.Equal(t, "database-1", databaseID)+ require.Equal(t, "changelog-1", changelogID)++ projectID, instanceID, databaseID, changelogID, err = GetDatabaseChangelogResourceName(+ "projects/project-1/instances/instance-1/databases/database-1/changelogs/changelog-1")+ require.NoError(t, err)+ require.Equal(t, new("project-1"), projectID)+ require.Equal(t, "instance-1", instanceID)+ require.Equal(t, "database-1", databaseID)+ require.Equal(t, "changelog-1", changelogID)++ _, _, _, _, err = GetDatabaseChangelogResourceName(+ "projects/project-1/instances/instance-1/databases/database-1/changelogs")+ require.Error(t, err)+}++func TestWorkspaceInstanceResourceNames(t *testing.T) {+ instance := FormatInstance("instance-1")+ require.Equal(t, "instances/instance-1", instance)+ instanceID, err := GetInstanceID(instance)+ require.NoError(t, err)+ require.Equal(t, "instance-1", instanceID)++ database := FormatDatabase("instance-1", "database-1")+ require.Equal(t, "instances/instance-1/databases/database-1", database)+ instanceID, databaseID, err := GetInstanceDatabaseID(database)+ require.NoError(t, err)+ require.Equal(t, "instance-1", instanceID)+ require.Equal(t, "database-1", databaseID)++ revision := FormatRevision("instance-1", "database-1", "revision-1")+ require.Equal(t, "instances/instance-1/databases/database-1/revisions/revision-1", revision)+ instanceID, databaseID, revisionID, err := GetInstanceDatabaseRevisionID(revision)+ require.NoError(t, err)+ require.Equal(t, "instance-1", instanceID)+ require.Equal(t, "database-1", databaseID)+ require.Equal(t, "revision-1", revisionID)++ changelog := FormatChangelog("instance-1", "database-1", "changelog-1")+ require.Equal(t, "instances/instance-1/databases/database-1/changelogs/changelog-1", changelog)+ instanceID, databaseID, changelogID, err := GetInstanceDatabaseChangelogID(changelog)+ require.NoError(t, err)+ require.Equal(t, "instance-1", instanceID)+ require.Equal(t, "database-1", databaseID)+ require.Equal(t, "changelog-1", changelogID)+}++func TestProjectInstanceResourceNames(t *testing.T) {+ instance := FormatProjectInstance("project-1", "instance-1")+ require.Equal(t, "projects/project-1/instances/instance-1", instance)+ projectID, instanceID, err := GetProjectIDInstanceID(instance)+ require.NoError(t, err)+ require.Equal(t, "project-1", projectID)+ require.Equal(t, "instance-1", instanceID)++ database := FormatProjectDatabase("project-1", "instance-1", "database-1")+ require.Equal(t, "projects/project-1/instances/instance-1/databases/database-1", database)+ projectID, instanceID, databaseID, err := GetProjectIDInstanceDatabaseID(database)+ require.NoError(t, err)+ require.Equal(t, "project-1", projectID)+ require.Equal(t, "instance-1", instanceID)+ require.Equal(t, "database-1", databaseID)++ revision := FormatProjectRevision("project-1", "instance-1", "database-1", "revision-1")+ require.Equal(t, "projects/project-1/instances/instance-1/databases/database-1/revisions/revision-1", revision)+ projectID, instanceID, databaseID, revisionID, err := GetProjectIDInstanceDatabaseRevisionID(revision)+ require.NoError(t, err)+ require.Equal(t, "project-1", projectID)+ require.Equal(t, "instance-1", instanceID)+ require.Equal(t, "database-1", databaseID)+ require.Equal(t, "revision-1", revisionID)++ changelog := FormatProjectChangelog("project-1", "instance-1", "database-1", "changelog-1")+ require.Equal(t, "projects/project-1/instances/instance-1/databases/database-1/changelogs/changelog-1", changelog)+ projectID, instanceID, databaseID, changelogID, err := GetProjectIDInstanceDatabaseChangelogID(changelog)+ require.NoError(t, err)+ require.Equal(t, "project-1", projectID)+ require.Equal(t, "instance-1", instanceID)+ require.Equal(t, "database-1", databaseID)+ require.Equal(t, "changelog-1", changelogID)+}++func TestInstanceResourceNamesRejectWrongScopeAndMalformedNames(t *testing.T) {+ projectInstance := "projects/project-1/instances/instance-1"+ projectDatabase := projectInstance + "/databases/database-1"+ projectRevision := projectDatabase + "/revisions/revision-1"+ projectChangelog := projectDatabase + "/changelogs/changelog-1"++ _, err := GetInstanceID(projectInstance)+ require.Error(t, err)+ _, _, err = GetInstanceDatabaseID(projectDatabase)+ require.Error(t, err)+ _, _, _, err = GetInstanceDatabaseRevisionID(projectRevision)+ require.Error(t, err)+ _, _, _, err = GetInstanceDatabaseChangelogID(projectChangelog)+ require.Error(t, err)++ _, _, err = GetProjectIDInstanceID("instances/instance-1")+ require.Error(t, err)+ _, _, _, err = GetProjectIDInstanceDatabaseID("instances/instance-1/databases/database-1")+ require.Error(t, err)+ _, _, _, _, err = GetProjectIDInstanceDatabaseRevisionID("instances/instance-1/databases/database-1/revisions/revision-1")+ require.Error(t, err)+ _, _, _, _, err = GetProjectIDInstanceDatabaseChangelogID("instances/instance-1/databases/database-1/changelogs/changelog-1")+ require.Error(t, err)++ for _, name := range []string{+ "projects/project-1/instances",+ "projects//instances/instance-1",+ "projects/project-1/instances/instance-1/",+ "projects/project-1/instances/instance-1/databases/database-1/revisions",+ "projects/project-1/instances/instance-1/databases/database-1/changelogs/",+ } {+ _, _, err := GetProjectIDInstanceID(name)+ require.Error(t, err, name)+ _, _, _, err = GetProjectIDInstanceDatabaseID(name)+ require.Error(t, err, name)+ _, _, _, _, err = GetProjectIDInstanceDatabaseRevisionID(name)+ require.Error(t, err, name)+ _, _, _, _, err = GetProjectIDInstanceDatabaseChangelogID(name)+ require.Error(t, err, name)+ }+}++func TestGetPolicyResourceTypeAndResourceRejectsInstanceAndDatabase(t *testing.T) {+ for _, name := range []string{+ "instances/instance-1",+ "instances/instance-1/databases/database-1",+ "projects/project-1/instances/instance-1",+ "projects/project-1/instances/instance-1/databases/database-1",+ } {+ _, _, err := GetPolicyResourceTypeAndResource(name)+ require.Error(t, err, name)+ }+}+func TestGetProjectIDQueryHistoryID(t *testing.T) {projectID, historyID, err := GetProjectIDQueryHistoryID("projects/p1/queryHistories/550e8400-e29b-41d4-a716-446655440000")require.NoError(t, err)diff --git a/backend/generated-go/v1/changelog_service.pb.go b/backend/generated-go/v1/changelog_service.pb.goindex 8c0e8301b3..c3ff758ed0 100644--- a/backend/generated-go/v1/changelog_service.pb.go+++ b/backend/generated-go/v1/changelog_service.pb.go@@ -129,7 +129,7 @@ func (Changelog_Status) EnumDescriptor() ([]byte, []int) {type ListChangelogsRequest struct {state protoimpl.MessageState `protogen:"open.v1"`// The parent of the changelogs.- // Format: instances/{instance}/databases/{database}+ // Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`// The maximum number of changelogs to return. The service may return fewer// than this value. If unspecified, at most 10 changelogs will be returned.@@ -281,7 +281,7 @@ func (x *ListChangelogsResponse) GetNextPageToken() string {type GetChangelogRequest struct {state protoimpl.MessageState `protogen:"open.v1"`// The name of the changelog to retrieve.- // Format: instances/{instance}/databases/{database}/changelogs/{changelog}+ // Format: instances/{instance}/databases/{database}/changelogs/{changelog} or projects/{project}/instances/{instance}/databases/{database}/changelogs/{changelog}Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`View ChangelogView `protobuf:"varint,2,opt,name=view,proto3,enum=bytebase.v1.ChangelogView" json:"view,omitempty"`unknownFields protoimpl.UnknownFields@@ -334,7 +334,7 @@ func (x *GetChangelogRequest) GetView() ChangelogView {type Changelog struct {state protoimpl.MessageState `protogen:"open.v1"`- // Format: instances/{instance}/databases/{database}/changelogs/{changelog}+ // Format: instances/{instance}/databases/{database}/changelogs/{changelog} or projects/{project}/instances/{instance}/databases/{database}/changelogs/{changelog}Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`Status Changelog_Status `protobuf:"varint,3,opt,name=status,proto3,enum=bytebase.v1.Changelog_Status" json:"status,omitempty"`@@ -449,7 +449,7 @@ const file_v1_changelog_service_proto_rawDesc = "" +"\x13GetChangelogRequest\x12:\n" +"\x04name\x18\x01 \x01(\tB&\xe0A\x02\xfaA \n" +"\x1ebytebase.com/DatabaseChangelogR\x04name\x12.\n" +- "\x04view\x18\x02 \x01(\x0e2\x1a.bytebase.v1.ChangelogViewR\x04view\"\xb7\x03\n" ++ "\x04view\x18\x02 \x01(\x0e2\x1a.bytebase.v1.ChangelogViewR\x04view\"\x8e\x04\n" +"\tChangelog\x12\x12\n" +"\x04name\x18\x01 \x01(\tR\x04name\x12;\n" +"\vcreate_time\x18\x02 \x01(\v2\x1a.google.protobuf.TimestampR\n" +@@ -466,15 +466,15 @@ const file_v1_changelog_service_proto_rawDesc = "" +"\aPENDING\x10\x01\x12\b\n" +"\x04DONE\x10\x02\x12\n" +"\n" +- "\x06FAILED\x10\x03:e\xeaAb\n" +- "\x1ebytebase.com/DatabaseChangelog\x12@instances/{instance}/databases/{database}/changelogs/{changelog}*b\n" ++ "\x06FAILED\x10\x03:\xbb\x01\xeaA\xb7\x01\n" ++ "\x1ebytebase.com/DatabaseChangelog\x12@instances/{instance}/databases/{database}/changelogs/{changelog}\x12Sprojects/{project}/instances/{instance}/databases/{database}/changelogs/{changelog}*b\n" +"\rChangelogView\x12\x1e\n" +"\x1aCHANGELOG_VIEW_UNSPECIFIED\x10\x00\x12\x18\n" +"\x14CHANGELOG_VIEW_BASIC\x10\x01\x12\x17\n" +- "\x13CHANGELOG_VIEW_FULL\x10\x022\xee\x02\n" +- "\x10ChangelogService\x12\xb5\x01\n" +- "\x0eListChangelogs\x12\".bytebase.v1.ListChangelogsRequest\x1a#.bytebase.v1.ListChangelogsResponse\"Z\xdaA\x06parent\x8a\xea0\x12bb.changelogs.list\x90\xea0\x01\x82\xd3\xe4\x93\x021\x12//v1/{parent=instances/*/databases/*}/changelogs\x12\xa1\x01\n" +- "\fGetChangelog\x12 .bytebase.v1.GetChangelogRequest\x1a\x16.bytebase.v1.Changelog\"W\xdaA\x04name\x8a\xea0\x11bb.changelogs.get\x90\xea0\x01\x82\xd3\xe4\x93\x021\x12//v1/{name=instances/*/databases/*/changelogs/*}B\xab\x01\n" ++ "\x13CHANGELOG_VIEW_FULL\x10\x022\xec\x03\n" ++ "\x10ChangelogService\x12\xf4\x01\n" ++ "\x0eListChangelogs\x12\".bytebase.v1.ListChangelogsRequest\x1a#.bytebase.v1.ListChangelogsResponse\"\x98\x01\xdaA\x06parent\x8a\xea0\x12bb.changelogs.list\x90\xea0\x01\x82\xd3\xe4\x93\x02oZ<\x12:/v1/{parent=projects/*/instances/*/databases/*}/changelogs\x12//v1/{parent=instances/*/databases/*}/changelogs\x12\xe0\x01\n" ++ "\fGetChangelog\x12 .bytebase.v1.GetChangelogRequest\x1a\x16.bytebase.v1.Changelog\"\x95\x01\xdaA\x04name\x8a\xea0\x11bb.changelogs.get\x90\xea0\x01\x82\xd3\xe4\x93\x02oZ<\x12:/v1/{name=projects/*/instances/*/databases/*/changelogs/*}\x12//v1/{name=instances/*/databases/*/changelogs/*}B\xab\x01\n" +"\x0fcom.bytebase.v1B\x15ChangelogServiceProtoP\x01Z4github.com/bytebase/bytebase/backend/generated-go/v1\xa2\x02\x03BXX\xaa\x02\vBytebase.V1\xca\x02\vBytebase\\V1\xe2\x02\x17Bytebase\\V1\\GPBMetadata\xea\x02\fBytebase::V1b\x06proto3"var (diff --git a/backend/generated-go/v1/changelog_service.pb.gw.go b/backend/generated-go/v1/changelog_service.pb.gw.goindex 2b0b68085e..e32dab04dc 100644--- a/backend/generated-go/v1/changelog_service.pb.gw.go+++ b/backend/generated-go/v1/changelog_service.pb.gw.go@@ -88,6 +88,59 @@ func local_request_ChangelogService_ListChangelogs_0(ctx context.Context, marshareturn msg, metadata, err}+var filter_ChangelogService_ListChangelogs_1 = &utilities.DoubleArray{Encoding: map[string]int{"parent": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}++func request_ChangelogService_ListChangelogs_1(ctx context.Context, marshaler runtime.Marshaler, client ChangelogServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq ListChangelogsRequest+ metadata runtime.ServerMetadata+ err error+ )+ 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)+ }+ if err := req.ParseForm(); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_ChangelogService_ListChangelogs_1); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ msg, err := client.ListChangelogs(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ return msg, metadata, err+}++func local_request_ChangelogService_ListChangelogs_1(ctx context.Context, marshaler runtime.Marshaler, server ChangelogServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq ListChangelogsRequest+ metadata runtime.ServerMetadata+ err error+ )+ 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)+ }+ if err := req.ParseForm(); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_ChangelogService_ListChangelogs_1); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ msg, err := server.ListChangelogs(ctx, &protoReq)+ return msg, metadata, err+}+var filter_ChangelogService_GetChangelog_0 = &utilities.DoubleArray{Encoding: map[string]int{"name": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}func request_ChangelogService_GetChangelog_0(ctx context.Context, marshaler runtime.Marshaler, client ChangelogServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {@@ -141,6 +194,59 @@ func local_request_ChangelogService_GetChangelog_0(ctx context.Context, marshalereturn msg, metadata, err}+var filter_ChangelogService_GetChangelog_1 = &utilities.DoubleArray{Encoding: map[string]int{"name": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}++func request_ChangelogService_GetChangelog_1(ctx context.Context, marshaler runtime.Marshaler, client ChangelogServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq GetChangelogRequest+ metadata runtime.ServerMetadata+ err error+ )+ if req.Body != nil {+ _, _ = io.Copy(io.Discard, req.Body)+ }+ val, ok := pathParams["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ if err := req.ParseForm(); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_ChangelogService_GetChangelog_1); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ msg, err := client.GetChangelog(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ return msg, metadata, err+}++func local_request_ChangelogService_GetChangelog_1(ctx context.Context, marshaler runtime.Marshaler, server ChangelogServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq GetChangelogRequest+ metadata runtime.ServerMetadata+ err error+ )+ val, ok := pathParams["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ if err := req.ParseForm(); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_ChangelogService_GetChangelog_1); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ msg, err := server.GetChangelog(ctx, &protoReq)+ return msg, metadata, err+}+// RegisterChangelogServiceHandlerServer registers the http handlers for service ChangelogService to "mux".// UnaryRPC :call ChangelogServiceServer directly.// StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906.@@ -167,6 +273,26 @@ func RegisterChangelogServiceHandlerServer(ctx context.Context, mux *runtime.Ser}forward_ChangelogService_ListChangelogs_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodGet, pattern_ChangelogService_ListChangelogs_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ var stream runtime.ServerTransportStream+ ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.ChangelogService/ListChangelogs", runtime.WithHTTPPathPattern("/v1/{parent=projects/*/instances/*/databases/*}/changelogs"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := local_request_ChangelogService_ListChangelogs_1(annotatedContext, inboundMarshaler, server, req, pathParams)+ md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_ChangelogService_ListChangelogs_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })mux.Handle(http.MethodGet, pattern_ChangelogService_GetChangelog_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()@@ -187,6 +313,26 @@ func RegisterChangelogServiceHandlerServer(ctx context.Context, mux *runtime.Ser}forward_ChangelogService_GetChangelog_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodGet, pattern_ChangelogService_GetChangelog_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ var stream runtime.ServerTransportStream+ ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.ChangelogService/GetChangelog", runtime.WithHTTPPathPattern("/v1/{name=projects/*/instances/*/databases/*/changelogs/*}"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := local_request_ChangelogService_GetChangelog_1(annotatedContext, inboundMarshaler, server, req, pathParams)+ md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_ChangelogService_GetChangelog_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })return nil}@@ -244,6 +390,23 @@ func RegisterChangelogServiceHandlerClient(ctx context.Context, mux *runtime.Ser}forward_ChangelogService_ListChangelogs_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodGet, pattern_ChangelogService_ListChangelogs_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.ChangelogService/ListChangelogs", runtime.WithHTTPPathPattern("/v1/{parent=projects/*/instances/*/databases/*}/changelogs"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := request_ChangelogService_ListChangelogs_1(annotatedContext, inboundMarshaler, client, req, pathParams)+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_ChangelogService_ListChangelogs_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })mux.Handle(http.MethodGet, pattern_ChangelogService_GetChangelog_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()@@ -261,15 +424,36 @@ func RegisterChangelogServiceHandlerClient(ctx context.Context, mux *runtime.Ser}forward_ChangelogService_GetChangelog_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodGet, pattern_ChangelogService_GetChangelog_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.ChangelogService/GetChangelog", runtime.WithHTTPPathPattern("/v1/{name=projects/*/instances/*/databases/*/changelogs/*}"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := request_ChangelogService_GetChangelog_1(annotatedContext, inboundMarshaler, client, req, pathParams)+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_ChangelogService_GetChangelog_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })return nil}var (pattern_ChangelogService_ListChangelogs_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3, 2, 4}, []string{"v1", "instances", "databases", "parent", "changelogs"}, ""))+ pattern_ChangelogService_ListChangelogs_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 2, 3, 1, 0, 4, 6, 5, 4, 2, 5}, []string{"v1", "projects", "instances", "databases", "parent", "changelogs"}, ""))pattern_ChangelogService_GetChangelog_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 2, 3, 1, 0, 4, 6, 5, 4}, []string{"v1", "instances", "databases", "changelogs", "name"}, ""))+ pattern_ChangelogService_GetChangelog_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 2, 3, 1, 0, 2, 4, 1, 0, 4, 8, 5, 5}, []string{"v1", "projects", "instances", "databases", "changelogs", "name"}, "")))var (forward_ChangelogService_ListChangelogs_0 = runtime.ForwardResponseMessage+ forward_ChangelogService_ListChangelogs_1 = runtime.ForwardResponseMessageforward_ChangelogService_GetChangelog_0 = runtime.ForwardResponseMessage+ forward_ChangelogService_GetChangelog_1 = runtime.ForwardResponseMessage)diff --git a/backend/generated-go/v1/database_catalog_service.pb.go b/backend/generated-go/v1/database_catalog_service.pb.goindex 4f595968eb..db9519b465 100644--- a/backend/generated-go/v1/database_catalog_service.pb.go+++ b/backend/generated-go/v1/database_catalog_service.pb.go@@ -91,7 +91,7 @@ func (ObjectSchema_Type) EnumDescriptor() ([]byte, []int) {type GetDatabaseCatalogRequest struct {state protoimpl.MessageState `protogen:"open.v1"`// The name of the database catalog to retrieve.- // Format: instances/{instance}/databases/{database}/catalog+ // Format: instances/{instance}/databases/{database}/catalog or projects/{project}/instances/{instance}/databases/{database}/catalogName string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`unknownFields protoimpl.UnknownFieldssizeCache protoimpl.SizeCache@@ -140,7 +140,7 @@ type UpdateDatabaseCatalogRequest struct {// The database catalog to update.//// The catalog's `name` field is used to identify the database catalog to update.- // Format: instances/{instance}/databases/{database}/catalog+ // Format: instances/{instance}/databases/{database}/catalog or projects/{project}/instances/{instance}/databases/{database}/catalogCatalog *DatabaseCatalog `protobuf:"bytes,1,opt,name=catalog,proto3" json:"catalog,omitempty"`// If set to true, and the database catalog is not found, a new database catalog will be created.// In this situation, `update_mask` is ignored.@@ -197,7 +197,7 @@ func (x *UpdateDatabaseCatalogRequest) GetAllowMissing() bool {type DatabaseCatalog struct {state protoimpl.MessageState `protogen:"open.v1"`// The name of the database catalog.- // Format: instances/{instance}/databases/{database}/catalog+ // Format: instances/{instance}/databases/{database}/catalog or projects/{project}/instances/{instance}/databases/{database}/catalogName string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`// The schemas in the database.Schemas []*SchemaCatalog `protobuf:"bytes,2,rep,name=schemas,proto3" json:"schemas,omitempty"`@@ -740,11 +740,11 @@ const file_v1_database_catalog_service_proto_rawDesc = "" +"\x1cbytebase.com/DatabaseCatalogR\x04name\"\x80\x01\n" +"\x1cUpdateDatabaseCatalogRequest\x12;\n" +"\acatalog\x18\x01 \x01(\v2\x1c.bytebase.v1.DatabaseCatalogB\x03\xe0A\x02R\acatalog\x12#\n" +- "\rallow_missing\x18\x02 \x01(\bR\fallowMissing\"\xb1\x01\n" ++ "\rallow_missing\x18\x02 \x01(\bR\fallowMissing\"\xf9\x01\n" +"\x0fDatabaseCatalog\x12\x12\n" +"\x04name\x18\x01 \x01(\tR\x04name\x124\n" +- "\aschemas\x18\x02 \x03(\v2\x1a.bytebase.v1.SchemaCatalogR\aschemas:T\xeaAQ\n" +- "\x1cbytebase.com/DatabaseCatalog\x121instances/{instance}/databases/{database}/catalog\"V\n" ++ "\aschemas\x18\x02 \x03(\v2\x1a.bytebase.v1.SchemaCatalogR\aschemas:\x9b\x01\xeaA\x97\x01\n" ++ "\x1cbytebase.com/DatabaseCatalog\x121instances/{instance}/databases/{database}/catalog\x12Dprojects/{project}/instances/{instance}/databases/{database}/catalog\"V\n" +"\rSchemaCatalog\x12\x12\n" +"\x04name\x18\x01 \x01(\tR\x04name\x121\n" +"\x06tables\x18\x02 \x03(\v2\x19.bytebase.v1.TableCatalogR\x06tables\"\x94\x02\n" +@@ -793,10 +793,10 @@ const file_v1_database_catalog_service_proto_rawDesc = "" +"\n" +"\x06OBJECT\x10\x04\x12\t\n" +"\x05ARRAY\x10\x05B\x06\n" +- "\x04kind2\xb3\x03\n" +- "\x16DatabaseCatalogService\x12\xb4\x01\n" +- "\x12GetDatabaseCatalog\x12&.bytebase.v1.GetDatabaseCatalogRequest\x1a\x1c.bytebase.v1.DatabaseCatalog\"X\xdaA\x04name\x8a\xea0\x17bb.databaseCatalogs.get\x90\xea0\x01\x82\xd3\xe4\x93\x02,\x12*/v1/{name=instances/*/databases/*/catalog}\x12\xe1\x01\n" +- "\x15UpdateDatabaseCatalog\x12).bytebase.v1.UpdateDatabaseCatalogRequest\x1a\x1c.bytebase.v1.DatabaseCatalog\"\x7f\xdaA\x13catalog,update_mask\x8a\xea0\x1abb.databaseCatalogs.update\x90\xea0\x01\x98\xea0\x01\x82\xd3\xe4\x93\x02=:\acatalog22/v1/{catalog.name=instances/*/databases/*/catalog}B\xb1\x01\n" ++ "\x04kind2\xb9\x04\n" ++ "\x16DatabaseCatalogService\x12\xee\x01\n" ++ "\x12GetDatabaseCatalog\x12&.bytebase.v1.GetDatabaseCatalogRequest\x1a\x1c.bytebase.v1.DatabaseCatalog\"\x91\x01\xdaA\x04name\x8a\xea0\x17bb.databaseCatalogs.get\x90\xea0\x01\x82\xd3\xe4\x93\x02eZ7\x125/v1/{name=projects/*/instances/*/databases/*/catalog}\x12*/v1/{name=instances/*/databases/*/catalog}\x12\xad\x02\n" ++ "\x15UpdateDatabaseCatalog\x12).bytebase.v1.UpdateDatabaseCatalogRequest\x1a\x1c.bytebase.v1.DatabaseCatalog\"\xca\x01\xdaA\x13catalog,update_mask\x8a\xea0\x1abb.databaseCatalogs.update\x90\xea0\x01\x98\xea0\x01\x82\xd3\xe4\x93\x02\x87\x01:\acatalogZH:\acatalog2=/v1/{catalog.name=projects/*/instances/*/databases/*/catalog}22/v1/{catalog.name=instances/*/databases/*/catalog}B\xb1\x01\n" +"\x0fcom.bytebase.v1B\x1bDatabaseCatalogServiceProtoP\x01Z4github.com/bytebase/bytebase/backend/generated-go/v1\xa2\x02\x03BXX\xaa\x02\vBytebase.V1\xca\x02\vBytebase\\V1\xe2\x02\x17Bytebase\\V1\\GPBMetadata\xea\x02\fBytebase::V1b\x06proto3"var (diff --git a/backend/generated-go/v1/database_catalog_service.pb.gw.go b/backend/generated-go/v1/database_catalog_service.pb.gw.goindex f47a9877bf..a5463f43ea 100644--- a/backend/generated-go/v1/database_catalog_service.pb.gw.go+++ b/backend/generated-go/v1/database_catalog_service.pb.gw.go@@ -74,6 +74,45 @@ func local_request_DatabaseCatalogService_GetDatabaseCatalog_0(ctx context.Contereturn msg, metadata, err}+func request_DatabaseCatalogService_GetDatabaseCatalog_1(ctx context.Context, marshaler runtime.Marshaler, client DatabaseCatalogServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq GetDatabaseCatalogRequest+ metadata runtime.ServerMetadata+ err error+ )+ if req.Body != nil {+ _, _ = io.Copy(io.Discard, req.Body)+ }+ val, ok := pathParams["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ msg, err := client.GetDatabaseCatalog(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ return msg, metadata, err+}++func local_request_DatabaseCatalogService_GetDatabaseCatalog_1(ctx context.Context, marshaler runtime.Marshaler, server DatabaseCatalogServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq GetDatabaseCatalogRequest+ metadata runtime.ServerMetadata+ err error+ )+ val, ok := pathParams["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ msg, err := server.GetDatabaseCatalog(ctx, &protoReq)+ return msg, metadata, err+}+var filter_DatabaseCatalogService_UpdateDatabaseCatalog_0 = &utilities.DoubleArray{Encoding: map[string]int{"catalog": 0, "name": 1}, Base: []int{1, 2, 1, 0, 0}, Check: []int{0, 1, 2, 3, 2}}func request_DatabaseCatalogService_UpdateDatabaseCatalog_0(ctx context.Context, marshaler runtime.Marshaler, client DatabaseCatalogServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {@@ -133,6 +172,65 @@ func local_request_DatabaseCatalogService_UpdateDatabaseCatalog_0(ctx context.Coreturn msg, metadata, err}+var filter_DatabaseCatalogService_UpdateDatabaseCatalog_1 = &utilities.DoubleArray{Encoding: map[string]int{"catalog": 0, "name": 1}, Base: []int{1, 2, 1, 0, 0}, Check: []int{0, 1, 2, 3, 2}}++func request_DatabaseCatalogService_UpdateDatabaseCatalog_1(ctx context.Context, marshaler runtime.Marshaler, client DatabaseCatalogServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq UpdateDatabaseCatalogRequest+ metadata runtime.ServerMetadata+ err error+ )+ if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Catalog); err != nil && !errors.Is(err, io.EOF) {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if req.Body != nil {+ _, _ = io.Copy(io.Discard, req.Body)+ }+ val, ok := pathParams["catalog.name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "catalog.name")+ }+ err = runtime.PopulateFieldFromPath(&protoReq, "catalog.name", val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "catalog.name", err)+ }+ if err := req.ParseForm(); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_DatabaseCatalogService_UpdateDatabaseCatalog_1); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ msg, err := client.UpdateDatabaseCatalog(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ return msg, metadata, err+}++func local_request_DatabaseCatalogService_UpdateDatabaseCatalog_1(ctx context.Context, marshaler runtime.Marshaler, server DatabaseCatalogServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq UpdateDatabaseCatalogRequest+ metadata runtime.ServerMetadata+ err error+ )+ if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Catalog); err != nil && !errors.Is(err, io.EOF) {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ val, ok := pathParams["catalog.name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "catalog.name")+ }+ err = runtime.PopulateFieldFromPath(&protoReq, "catalog.name", val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "catalog.name", err)+ }+ if err := req.ParseForm(); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_DatabaseCatalogService_UpdateDatabaseCatalog_1); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ msg, err := server.UpdateDatabaseCatalog(ctx, &protoReq)+ return msg, metadata, err+}+// RegisterDatabaseCatalogServiceHandlerServer registers the http handlers for service DatabaseCatalogService to "mux".// UnaryRPC :call DatabaseCatalogServiceServer directly.// StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906.@@ -159,6 +257,26 @@ func RegisterDatabaseCatalogServiceHandlerServer(ctx context.Context, mux *runti}forward_DatabaseCatalogService_GetDatabaseCatalog_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodGet, pattern_DatabaseCatalogService_GetDatabaseCatalog_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ var stream runtime.ServerTransportStream+ ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.DatabaseCatalogService/GetDatabaseCatalog", runtime.WithHTTPPathPattern("/v1/{name=projects/*/instances/*/databases/*/catalog}"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := local_request_DatabaseCatalogService_GetDatabaseCatalog_1(annotatedContext, inboundMarshaler, server, req, pathParams)+ md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_DatabaseCatalogService_GetDatabaseCatalog_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })mux.Handle(http.MethodPatch, pattern_DatabaseCatalogService_UpdateDatabaseCatalog_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()@@ -179,6 +297,26 @@ func RegisterDatabaseCatalogServiceHandlerServer(ctx context.Context, mux *runti}forward_DatabaseCatalogService_UpdateDatabaseCatalog_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodPatch, pattern_DatabaseCatalogService_UpdateDatabaseCatalog_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ var stream runtime.ServerTransportStream+ ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.DatabaseCatalogService/UpdateDatabaseCatalog", runtime.WithHTTPPathPattern("/v1/{catalog.name=projects/*/instances/*/databases/*/catalog}"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := local_request_DatabaseCatalogService_UpdateDatabaseCatalog_1(annotatedContext, inboundMarshaler, server, req, pathParams)+ md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_DatabaseCatalogService_UpdateDatabaseCatalog_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })return nil}@@ -236,6 +374,23 @@ func RegisterDatabaseCatalogServiceHandlerClient(ctx context.Context, mux *runti}forward_DatabaseCatalogService_GetDatabaseCatalog_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodGet, pattern_DatabaseCatalogService_GetDatabaseCatalog_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.DatabaseCatalogService/GetDatabaseCatalog", runtime.WithHTTPPathPattern("/v1/{name=projects/*/instances/*/databases/*/catalog}"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := request_DatabaseCatalogService_GetDatabaseCatalog_1(annotatedContext, inboundMarshaler, client, req, pathParams)+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_DatabaseCatalogService_GetDatabaseCatalog_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })mux.Handle(http.MethodPatch, pattern_DatabaseCatalogService_UpdateDatabaseCatalog_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()@@ -253,15 +408,36 @@ func RegisterDatabaseCatalogServiceHandlerClient(ctx context.Context, mux *runti}forward_DatabaseCatalogService_UpdateDatabaseCatalog_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodPatch, pattern_DatabaseCatalogService_UpdateDatabaseCatalog_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.DatabaseCatalogService/UpdateDatabaseCatalog", runtime.WithHTTPPathPattern("/v1/{catalog.name=projects/*/instances/*/databases/*/catalog}"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := request_DatabaseCatalogService_UpdateDatabaseCatalog_1(annotatedContext, inboundMarshaler, client, req, pathParams)+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_DatabaseCatalogService_UpdateDatabaseCatalog_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })return nil}var (pattern_DatabaseCatalogService_GetDatabaseCatalog_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 2, 3, 4, 5, 5, 4}, []string{"v1", "instances", "databases", "catalog", "name"}, ""))+ pattern_DatabaseCatalogService_GetDatabaseCatalog_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 2, 3, 1, 0, 2, 4, 4, 7, 5, 5}, []string{"v1", "projects", "instances", "databases", "catalog", "name"}, ""))pattern_DatabaseCatalogService_UpdateDatabaseCatalog_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 2, 3, 4, 5, 5, 4}, []string{"v1", "instances", "databases", "catalog", "catalog.name"}, ""))+ pattern_DatabaseCatalogService_UpdateDatabaseCatalog_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 2, 3, 1, 0, 2, 4, 4, 7, 5, 5}, []string{"v1", "projects", "instances", "databases", "catalog", "catalog.name"}, "")))var (forward_DatabaseCatalogService_GetDatabaseCatalog_0 = runtime.ForwardResponseMessage+ forward_DatabaseCatalogService_GetDatabaseCatalog_1 = runtime.ForwardResponseMessageforward_DatabaseCatalogService_UpdateDatabaseCatalog_0 = runtime.ForwardResponseMessage+ forward_DatabaseCatalogService_UpdateDatabaseCatalog_1 = runtime.ForwardResponseMessage)diff --git a/backend/generated-go/v1/database_service.pb.go b/backend/generated-go/v1/database_service.pb.goindex db85440c0e..c4a5d6d2ac 100644--- a/backend/generated-go/v1/database_service.pb.go+++ b/backend/generated-go/v1/database_service.pb.go@@ -519,7 +519,7 @@ func (GetSchemaStringRequest_ObjectType) EnumDescriptor() ([]byte, []int) {type GetDatabaseRequest struct {state protoimpl.MessageState `protogen:"open.v1"`// The name of the database to retrieve.- // Format: instances/{instance}/databases/{database}+ // Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`unknownFields protoimpl.UnknownFieldssizeCache protoimpl.SizeCache@@ -566,7 +566,8 @@ type BatchGetDatabasesRequest struct {state protoimpl.MessageState `protogen:"open.v1"`// The parent resource shared by all databases being retrieved.// - projects/{project}: batch get databases in a project;- // - instances/{instances}: batch get databases in a instance;+ // - instances/{instance}: batch get databases in an instance;+ // - projects/{project}/instances/{instance}: batch get databases in a project instance;// Use "-" as wildcard to batch get databases across parent.Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`// The list of database names to retrieve.@@ -668,7 +669,8 @@ type ListDatabasesRequest struct {state protoimpl.MessageState `protogen:"open.v1"`// - projects/{project}: list databases in a project, require "bb.projects.get" permission.// - workspaces/{id}: list databases in the workspace, require "bb.databases.list" permission.- // - instances/{instances}: list databases in a instance, require "bb.instances.get" permission+ // - instances/{instance}: list databases in an instance, require "bb.instances.get" permission.+ // - projects/{project}/instances/{instance}: list databases in a project instance, require "bb.instances.get" permission.Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`// The maximum number of databases to return. The service may return fewer// than this value.@@ -858,7 +860,7 @@ type UpdateDatabaseRequest struct {// The database to update.//// The database's `name` field is used to identify the database to update.- // Format: instances/{instance}/databases/{database}+ // Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}Database *Database `protobuf:"bytes,1,opt,name=database,proto3" json:"database,omitempty"`// The list of fields to update.UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`@@ -923,7 +925,7 @@ func (x *UpdateDatabaseRequest) GetAllowMissing() bool {type BatchUpdateDatabasesRequest struct {state protoimpl.MessageState `protogen:"open.v1"`// The parent resource shared by all databases being updated.- // Format: instances/{instance}+ // Format: instances/{instance} or projects/{project}/instances/{instance}// If the operation spans parents, a dash (-) may be accepted as a wildcard.// We only support updating the project of databases for now.Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`@@ -1026,7 +1028,7 @@ func (x *BatchUpdateDatabasesResponse) GetDatabases() []*Database {type BatchSyncDatabasesRequest struct {state protoimpl.MessageState `protogen:"open.v1"`// The parent resource shared by all databases being updated.- // Format: instances/{instance}+ // Format: instances/{instance} or projects/{project}/instances/{instance}// If the operation spans parents, a dash (-) may be accepted as a wildcard.Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`// The list of database names to sync.@@ -1118,7 +1120,7 @@ func (*BatchSyncDatabasesResponse) Descriptor() ([]byte, []int) {type SyncDatabaseRequest struct {state protoimpl.MessageState `protogen:"open.v1"`// The name of the database to sync.- // Format: instances/{instance}/databases/{database}+ // Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`unknownFields protoimpl.UnknownFieldssizeCache protoimpl.SizeCache@@ -1200,7 +1202,7 @@ func (*SyncDatabaseResponse) Descriptor() ([]byte, []int) {type GetDatabaseMetadataRequest struct {state protoimpl.MessageState `protogen:"open.v1"`// The name of the database to retrieve metadata.- // Format: instances/{instance}/databases/{database}/metadata+ // Format: instances/{instance}/databases/{database}/metadata or projects/{project}/instances/{instance}/databases/{database}/metadataName string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`// Filter is used to filter databases returned in the list.// The syntax and semantics of CEL are documented at https://github.com/google/cel-spec@@ -1280,7 +1282,7 @@ func (x *GetDatabaseMetadataRequest) GetLimit() int32 {type GetDatabaseSchemaRequest struct {state protoimpl.MessageState `protogen:"open.v1"`// The name of the database to retrieve schema.- // Format: instances/{instance}/databases/{database}/schema+ // Format: instances/{instance}/databases/{database}/schema or projects/{project}/instances/{instance}/databases/{database}/schemaName string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`unknownFields protoimpl.UnknownFieldssizeCache protoimpl.SizeCache@@ -1326,7 +1328,7 @@ func (x *GetDatabaseSchemaRequest) GetName() string {type GetDatabaseSDLSchemaRequest struct {state protoimpl.MessageState `protogen:"open.v1"`// The name of the database to retrieve SDL schema.- // Format: instances/{instance}/databases/{database}/sdlSchema+ // Format: instances/{instance}/databases/{database}/sdlSchema or projects/{project}/instances/{instance}/databases/{database}/sdlSchemaName string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`// The format of the SDL schema output.Format GetDatabaseSDLSchemaRequest_SDLFormat `protobuf:"varint,2,opt,name=format,proto3,enum=bytebase.v1.GetDatabaseSDLSchemaRequest_SDLFormat" json:"format,omitempty"`@@ -1382,8 +1384,8 @@ type DiffSchemaRequest struct {state protoimpl.MessageState `protogen:"open.v1"`// The name of the database or changelog.// Format:- // database: instances/{instance}/databases/{database}- // changelog: instances/{instance}/databases/{database}/changelogs/{changelog}+ // database: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}+ // changelog: instances/{instance}/databases/{database}/changelogs/{changelog} or projects/{project}/instances/{instance}/databases/{database}/changelogs/{changelog}Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`// Types that are valid to be assigned to Target://@@ -1468,7 +1470,7 @@ type DiffSchemaRequest_Schema struct {type DiffSchemaRequest_Changelog struct {// The resource name of the changelog// Format:- // instances/{instance}/databases/{database}/changelogs/{changelog}+ // instances/{instance}/databases/{database}/changelogs/{changelog} or projects/{project}/instances/{instance}/databases/{database}/changelogs/{changelog}Changelog string `protobuf:"bytes,3,opt,name=changelog,proto3,oneof"`}@@ -1523,7 +1525,7 @@ func (x *DiffSchemaResponse) GetDiff() string {type DiffMetadataRequest struct {state protoimpl.MessageState `protogen:"open.v1"`// The database whose current schema is the diff source.- // Format: instances/{instance}/databases/{database}+ // Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`// The metadata of the target schema. The source metadata and the engine are// read from the database, so only the target travels in the request.@@ -1627,7 +1629,7 @@ func (x *DiffMetadataResponse) GetDiff() string {type Database struct {state protoimpl.MessageState `protogen:"open.v1"`// The name of the database.- // Format: instances/{instance}/databases/{database}+ // Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}// {database} is the database name in the instance.Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`// The existence of a database.@@ -1781,7 +1783,7 @@ type DatabaseMetadata struct {state protoimpl.MessageState `protogen:"open.v1"`// The database metadata name.//- // Format: instances/{instance}/databases/{database}/metadata+ // Format: instances/{instance}/databases/{database}/metadata or projects/{project}/instances/{instance}/databases/{database}/metadataName string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`// The schemas is the list of schemas in a database.Schemas []*SchemaMetadata `protobuf:"bytes,2,rep,name=schemas,proto3" json:"schemas,omitempty"`@@ -5330,7 +5332,7 @@ func (x *DatabaseSDLSchema) GetContentType() string {type GetSchemaStringRequest struct {state protoimpl.MessageState `protogen:"open.v1"`// The name of the database.- // Format: instances/{instance}/databases/{database}+ // Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`Type GetSchemaStringRequest_ObjectType `protobuf:"varint,2,opt,name=type,proto3,enum=bytebase.v1.GetSchemaStringRequest_ObjectType" json:"type,omitempty"`// It's empty for DATABASE.@@ -5527,7 +5529,7 @@ const file_v1_database_service_proto_rawDesc = "" +"\x15bytebase.com/DatabaseR\x04name\x12K\n" +"\x0ftarget_metadata\x18\x02 \x01(\v2\x1d.bytebase.v1.DatabaseMetadataB\x03\xe0A\x02R\x0etargetMetadata\"*\n" +"\x14DiffMetadataResponse\x12\x12\n" +- "\x04diff\x18\x01 \x01(\tR\x04diff\"\x8f\x06\n" ++ "\x04diff\x18\x01 \x01(\tR\x04diff\"\xcf\x06\n" +"\bDatabase\x12\x12\n" +"\x04name\x18\x01 \x01(\tR\x04name\x12-\n" +"\x05state\x18\x02 \x01(\x0e2\x12.bytebase.v1.StateB\x03\xe0A\x03R\x05state\x12Q\n" +@@ -5546,10 +5548,10 @@ const file_v1_database_service_proto_rawDesc = "" +"sync_error\x18\f \x01(\tB\x03\xe0A\x03R\tsyncError\x1a9\n" +"\vLabelsEntry\x12\x10\n" +"\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" +- "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01:E\xeaAB\n" +- "\x15bytebase.com/Database\x12)instances/{instance}/databases/{database}B\x0e\n" ++ "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01:\x84\x01\xeaA\x80\x01\n" ++ "\x15bytebase.com/Database\x12)instances/{instance}/databases/{database}\x12<projects/{project}/instances/{instance}/databases/{database}B\x0e\n" +"\f_environmentB\x18\n" +- "\x16_effective_environment\"\xef\x02\n" ++ "\x16_effective_environment\"\xb8\x03\n" +"\x10DatabaseMetadata\x12\x12\n" +"\x04name\x18\x01 \x01(\tR\x04name\x125\n" +"\aschemas\x18\x02 \x03(\v2\x1b.bytebase.v1.SchemaMetadataR\aschemas\x12#\n" +@@ -5560,8 +5562,8 @@ const file_v1_database_service_proto_rawDesc = "" +"extensions\x12\x14\n" +"\x05owner\x18\x06 \x01(\tR\x05owner\x12\x1f\n" +"\vsearch_path\x18\a \x01(\tR\n" +- "searchPath:V\xeaAS\n" +- "\x1dbytebase.com/DatabaseMetadata\x122instances/{instance}/databases/{database}/metadata\"\x94\a\n" ++ "searchPath:\x9e\x01\xeaA\x9a\x01\n" ++ "\x1dbytebase.com/DatabaseMetadata\x122instances/{instance}/databases/{database}/metadata\x12Eprojects/{project}/instances/{instance}/databases/{database}/metadata\"\x94\a\n" +"\x0eSchemaMetadata\x12\x12\n" +"\x04name\x18\x01 \x01(\tR\x04name\x122\n" +"\x06tables\x18\x02 \x03(\v2\x1a.bytebase.v1.TableMetadataR\x06tables\x12K\n" +@@ -5956,22 +5958,22 @@ const file_v1_database_service_proto_rawDesc = "" +"\x17SYNC_STATUS_UNSPECIFIED\x10\x00\x12\x06\n" +"\x02OK\x10\x01\x12\n" +"\n" +- "\x06FAILED\x10\x022\xc3\x13\n" +- "\x0fDatabaseService\x12\x90\x01\n" +- "\vGetDatabase\x12\x1f.bytebase.v1.GetDatabaseRequest\x1a\x15.bytebase.v1.Database\"I\xdaA\x04name\x8a\xea0\x10bb.databases.get\x90\xea0\x01\x82\xd3\xe4\x93\x02$\x12\"/v1/{name=instances/*/databases/*}\x12\xdd\x01\n" +- "\x11BatchGetDatabases\x12%.bytebase.v1.BatchGetDatabasesRequest\x1a&.bytebase.v1.BatchGetDatabasesResponse\"y\x8a\xea0\x10bb.databases.get\x90\xea0\x02\x82\xd3\xe4\x93\x02[Z-\x12+/v1/{parent=instances/*}/databases:batchGet\x12*/v1/{parent=projects/*}/databases:batchGet\x12\xeb\x01\n" +- "\rListDatabases\x12!.bytebase.v1.ListDatabasesRequest\x1a\".bytebase.v1.ListDatabasesResponse\"\x92\x01\xdaA\x00\x8a\xea0\x11bb.databases.list\x90\xea0\x02\x82\xd3\xe4\x93\x02pZ$\x12\"/v1/{parent=instances/*}/databasesZ%\x12#/v1/{parent=workspaces/*}/databases\x12!/v1/{parent=projects/*}/databases\x12\xc0\x01\n" +- "\x0eUpdateDatabase\x12\".bytebase.v1.UpdateDatabaseRequest\x1a\x15.bytebase.v1.Database\"s\xdaA\x14database,update_mask\x8a\xea0\x13bb.databases.update\x90\xea0\x01\x98\xea0\x01\x82\xd3\xe4\x93\x027:\bdatabase2+/v1/{database.name=instances/*/databases/*}\x12\xc5\x01\n" +- "\x14BatchUpdateDatabases\x12(.bytebase.v1.BatchUpdateDatabasesRequest\x1a).bytebase.v1.BatchUpdateDatabasesResponse\"X\x8a\xea0\x13bb.databases.update\x90\xea0\x01\x98\xea0\x01\x82\xd3\xe4\x93\x023:\x01*\"./v1/{parent=instances/*}/databases:batchUpdate\x12\xa0\x01\n" +- "\fSyncDatabase\x12 .bytebase.v1.SyncDatabaseRequest\x1a!.bytebase.v1.SyncDatabaseResponse\"K\x8a\xea0\x11bb.databases.sync\x90\xea0\x01\x82\xd3\xe4\x93\x02,:\x01*\"'/v1/{name=instances/*/databases/*}:sync\x12\xb7\x01\n" +- "\x12BatchSyncDatabases\x12&.bytebase.v1.BatchSyncDatabasesRequest\x1a'.bytebase.v1.BatchSyncDatabasesResponse\"P\x8a\xea0\x11bb.databases.sync\x90\xea0\x01\x82\xd3\xe4\x93\x021:\x01*\",/v1/{parent=instances/*}/databases:batchSync\x12\xb0\x01\n" +- "\x13GetDatabaseMetadata\x12'.bytebase.v1.GetDatabaseMetadataRequest\x1a\x1d.bytebase.v1.DatabaseMetadata\"Q\x8a\xea0\x16bb.databases.getSchema\x90\xea0\x01\x82\xd3\xe4\x93\x02-\x12+/v1/{name=instances/*/databases/*/metadata}\x12\xa8\x01\n" +- "\x11GetDatabaseSchema\x12%.bytebase.v1.GetDatabaseSchemaRequest\x1a\x1b.bytebase.v1.DatabaseSchema\"O\x8a\xea0\x16bb.databases.getSchema\x90\xea0\x01\x82\xd3\xe4\x93\x02+\x12)/v1/{name=instances/*/databases/*/schema}\x12\xb4\x01\n" +- "\x14GetDatabaseSDLSchema\x12(.bytebase.v1.GetDatabaseSDLSchemaRequest\x1a\x1e.bytebase.v1.DatabaseSDLSchema\"R\x8a\xea0\x16bb.databases.getSchema\x90\xea0\x01\x82\xd3\xe4\x93\x02.\x12,/v1/{name=instances/*/databases/*/sdlSchema}\x12\xe1\x01\n" ++ "\x06FAILED\x10\x022\x9e\x1a\n" ++ "\x0fDatabaseService\x12\xc1\x01\n" ++ "\vGetDatabase\x12\x1f.bytebase.v1.GetDatabaseRequest\x1a\x15.bytebase.v1.Database\"z\xdaA\x04name\x8a\xea0\x10bb.databases.get\x90\xea0\x01\x82\xd3\xe4\x93\x02UZ/\x12-/v1/{name=projects/*/instances/*/databases/*}\x12\"/v1/{name=instances/*/databases/*}\x12\x99\x02\n" ++ "\x11BatchGetDatabases\x12%.bytebase.v1.BatchGetDatabasesRequest\x1a&.bytebase.v1.BatchGetDatabasesResponse\"\xb4\x01\x8a\xea0\x10bb.databases.get\x90\xea0\x02\x82\xd3\xe4\x93\x02\x95\x01Z-\x12+/v1/{parent=instances/*}/databases:batchGetZ8\x126/v1/{parent=projects/*/instances/*}/databases:batchGet\x12*/v1/{parent=projects/*}/databases:batchGet\x12\x9d\x02\n" ++ "\rListDatabases\x12!.bytebase.v1.ListDatabasesRequest\x1a\".bytebase.v1.ListDatabasesResponse\"\xc4\x01\xdaA\x00\x8a\xea0\x11bb.databases.list\x90\xea0\x02\x82\xd3\xe4\x93\x02\xa1\x01Z$\x12\"/v1/{parent=instances/*}/databasesZ%\x12#/v1/{parent=workspaces/*}/databasesZ/\x12-/v1/{parent=projects/*/instances/*}/databases\x12!/v1/{parent=projects/*}/databases\x12\x85\x02\n" ++ "\x0eUpdateDatabase\x12\".bytebase.v1.UpdateDatabaseRequest\x1a\x15.bytebase.v1.Database\"\xb7\x01\xdaA\x14database,update_mask\x8a\xea0\x13bb.databases.update\x90\xea0\x01\x98\xea0\x01\x82\xd3\xe4\x93\x02{:\bdatabaseZB:\bdatabase26/v1/{database.name=projects/*/instances/*/databases/*}2+/v1/{database.name=instances/*/databases/*}\x12\x86\x02\n" ++ "\x14BatchUpdateDatabases\x12(.bytebase.v1.BatchUpdateDatabasesRequest\x1a).bytebase.v1.BatchUpdateDatabasesResponse\"\x98\x01\x8a\xea0\x13bb.databases.update\x90\xea0\x01\x98\xea0\x01\x82\xd3\xe4\x93\x02s:\x01*Z>:\x01*\"9/v1/{parent=projects/*/instances/*}/databases:batchUpdate\"./v1/{parent=instances/*}/databases:batchUpdate\x12\xda\x01\n" ++ "\fSyncDatabase\x12 .bytebase.v1.SyncDatabaseRequest\x1a!.bytebase.v1.SyncDatabaseResponse\"\x84\x01\x8a\xea0\x11bb.databases.sync\x90\xea0\x01\x82\xd3\xe4\x93\x02e:\x01*Z7:\x01*\"2/v1/{name=projects/*/instances/*/databases/*}:sync\"'/v1/{name=instances/*/databases/*}:sync\x12\xf6\x01\n" ++ "\x12BatchSyncDatabases\x12&.bytebase.v1.BatchSyncDatabasesRequest\x1a'.bytebase.v1.BatchSyncDatabasesResponse\"\x8e\x01\x8a\xea0\x11bb.databases.sync\x90\xea0\x01\x82\xd3\xe4\x93\x02o:\x01*Z<:\x01*\"7/v1/{parent=projects/*/instances/*}/databases:batchSync\",/v1/{parent=instances/*}/databases:batchSync\x12\xeb\x01\n" ++ "\x13GetDatabaseMetadata\x12'.bytebase.v1.GetDatabaseMetadataRequest\x1a\x1d.bytebase.v1.DatabaseMetadata\"\x8b\x01\x8a\xea0\x16bb.databases.getSchema\x90\xea0\x01\x82\xd3\xe4\x93\x02gZ8\x126/v1/{name=projects/*/instances/*/databases/*/metadata}\x12+/v1/{name=instances/*/databases/*/metadata}\x12\xe1\x01\n" ++ "\x11GetDatabaseSchema\x12%.bytebase.v1.GetDatabaseSchemaRequest\x1a\x1b.bytebase.v1.DatabaseSchema\"\x87\x01\x8a\xea0\x16bb.databases.getSchema\x90\xea0\x01\x82\xd3\xe4\x93\x02cZ6\x124/v1/{name=projects/*/instances/*/databases/*/schema}\x12)/v1/{name=instances/*/databases/*/schema}\x12\xf0\x01\n" ++ "\x14GetDatabaseSDLSchema\x12(.bytebase.v1.GetDatabaseSDLSchemaRequest\x1a\x1e.bytebase.v1.DatabaseSDLSchema\"\x8d\x01\x8a\xea0\x16bb.databases.getSchema\x90\xea0\x01\x82\xd3\xe4\x93\x02iZ9\x127/v1/{name=projects/*/instances/*/databases/*/sdlSchema}\x12,/v1/{name=instances/*/databases/*/sdlSchema}\x12\xed\x02\n" +"\n" +- "DiffSchema\x12\x1e.bytebase.v1.DiffSchemaRequest\x1a\x1f.bytebase.v1.DiffSchemaResponse\"\x91\x01\x8a\xea0\x10bb.databases.get\x90\xea0\x01\x82\xd3\xe4\x93\x02s:\x01*Z?:\x01*\":/v1/{name=instances/*/databases/*/changelogs/*}:diffSchema\"-/v1/{name=instances/*/databases/*}:diffSchema\x12\xb0\x01\n" +- "\fDiffMetadata\x12 .bytebase.v1.DiffMetadataRequest\x1a!.bytebase.v1.DiffMetadataResponse\"[\x8a\xea0\x19bb.databases.diffMetadata\x90\xea0\x01\x82\xd3\xe4\x93\x024:\x01*\"//v1/{name=instances/*/databases/*}:diffMetadata\x12\xba\x01\n" +- "\x0fGetSchemaString\x12#.bytebase.v1.GetSchemaStringRequest\x1a$.bytebase.v1.GetSchemaStringResponse\"\\\xdaA\x04name\x8a\xea0\x16bb.databases.getSchema\x90\xea0\x01\x82\xd3\xe4\x93\x021\x12//v1/{name=instances/*/databases/*/schemaString}B\xaa\x01\n" ++ "DiffSchema\x12\x1e.bytebase.v1.DiffSchemaRequest\x1a\x1f.bytebase.v1.DiffSchemaResponse\"\x9d\x02\x8a\xea0\x10bb.databases.get\x90\xea0\x01\x82\xd3\xe4\x93\x02\xfe\x01:\x01*Z=:\x01*\"8/v1/{name=projects/*/instances/*/databases/*}:diffSchemaZ?:\x01*\":/v1/{name=instances/*/databases/*/changelogs/*}:diffSchemaZJ:\x01*\"E/v1/{name=projects/*/instances/*/databases/*/changelogs/*}:diffSchema\"-/v1/{name=instances/*/databases/*}:diffSchema\x12\xf2\x01\n" ++ "\fDiffMetadata\x12 .bytebase.v1.DiffMetadataRequest\x1a!.bytebase.v1.DiffMetadataResponse\"\x9c\x01\x8a\xea0\x19bb.databases.diffMetadata\x90\xea0\x01\x82\xd3\xe4\x93\x02u:\x01*Z?:\x01*\":/v1/{name=projects/*/instances/*/databases/*}:diffMetadata\"//v1/{name=instances/*/databases/*}:diffMetadata\x12\xf9\x01\n" ++ "\x0fGetSchemaString\x12#.bytebase.v1.GetSchemaStringRequest\x1a$.bytebase.v1.GetSchemaStringResponse\"\x9a\x01\xdaA\x04name\x8a\xea0\x16bb.databases.getSchema\x90\xea0\x01\x82\xd3\xe4\x93\x02oZ<\x12:/v1/{name=projects/*/instances/*/databases/*/schemaString}\x12//v1/{name=instances/*/databases/*/schemaString}B\xaa\x01\n" +"\x0fcom.bytebase.v1B\x14DatabaseServiceProtoP\x01Z4github.com/bytebase/bytebase/backend/generated-go/v1\xa2\x02\x03BXX\xaa\x02\vBytebase.V1\xca\x02\vBytebase\\V1\xe2\x02\x17Bytebase\\V1\\GPBMetadata\xea\x02\fBytebase::V1b\x06proto3"var (diff --git a/backend/generated-go/v1/database_service.pb.gw.go b/backend/generated-go/v1/database_service.pb.gw.goindex 4630756a9e..7981b45204 100644--- a/backend/generated-go/v1/database_service.pb.gw.go+++ b/backend/generated-go/v1/database_service.pb.gw.go@@ -74,6 +74,45 @@ func local_request_DatabaseService_GetDatabase_0(ctx context.Context, marshalerreturn msg, metadata, err}+func request_DatabaseService_GetDatabase_1(ctx context.Context, marshaler runtime.Marshaler, client DatabaseServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq GetDatabaseRequest+ metadata runtime.ServerMetadata+ err error+ )+ if req.Body != nil {+ _, _ = io.Copy(io.Discard, req.Body)+ }+ val, ok := pathParams["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ msg, err := client.GetDatabase(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ return msg, metadata, err+}++func local_request_DatabaseService_GetDatabase_1(ctx context.Context, marshaler runtime.Marshaler, server DatabaseServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq GetDatabaseRequest+ metadata runtime.ServerMetadata+ err error+ )+ val, ok := pathParams["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ msg, err := server.GetDatabase(ctx, &protoReq)+ return msg, metadata, err+}+var filter_DatabaseService_BatchGetDatabases_0 = &utilities.DoubleArray{Encoding: map[string]int{"parent": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}func request_DatabaseService_BatchGetDatabases_0(ctx context.Context, marshaler runtime.Marshaler, client DatabaseServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {@@ -180,6 +219,59 @@ func local_request_DatabaseService_BatchGetDatabases_1(ctx context.Context, marsreturn msg, metadata, err}+var filter_DatabaseService_BatchGetDatabases_2 = &utilities.DoubleArray{Encoding: map[string]int{"parent": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}++func request_DatabaseService_BatchGetDatabases_2(ctx context.Context, marshaler runtime.Marshaler, client DatabaseServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq BatchGetDatabasesRequest+ metadata runtime.ServerMetadata+ err error+ )+ 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)+ }+ if err := req.ParseForm(); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_DatabaseService_BatchGetDatabases_2); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ msg, err := client.BatchGetDatabases(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ return msg, metadata, err+}++func local_request_DatabaseService_BatchGetDatabases_2(ctx context.Context, marshaler runtime.Marshaler, server DatabaseServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq BatchGetDatabasesRequest+ metadata runtime.ServerMetadata+ err error+ )+ 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)+ }+ if err := req.ParseForm(); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_DatabaseService_BatchGetDatabases_2); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ msg, err := server.BatchGetDatabases(ctx, &protoReq)+ return msg, metadata, err+}+var filter_DatabaseService_ListDatabases_0 = &utilities.DoubleArray{Encoding: map[string]int{"parent": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}func request_DatabaseService_ListDatabases_0(ctx context.Context, marshaler runtime.Marshaler, client DatabaseServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {@@ -339,6 +431,59 @@ func local_request_DatabaseService_ListDatabases_2(ctx context.Context, marshalereturn msg, metadata, err}+var filter_DatabaseService_ListDatabases_3 = &utilities.DoubleArray{Encoding: map[string]int{"parent": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}++func request_DatabaseService_ListDatabases_3(ctx context.Context, marshaler runtime.Marshaler, client DatabaseServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq ListDatabasesRequest+ metadata runtime.ServerMetadata+ err error+ )+ 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)+ }+ if err := req.ParseForm(); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_DatabaseService_ListDatabases_3); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ msg, err := client.ListDatabases(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ return msg, metadata, err+}++func local_request_DatabaseService_ListDatabases_3(ctx context.Context, marshaler runtime.Marshaler, server DatabaseServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq ListDatabasesRequest+ metadata runtime.ServerMetadata+ err error+ )+ 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)+ }+ if err := req.ParseForm(); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_DatabaseService_ListDatabases_3); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ msg, err := server.ListDatabases(ctx, &protoReq)+ return msg, metadata, err+}+var filter_DatabaseService_UpdateDatabase_0 = &utilities.DoubleArray{Encoding: map[string]int{"database": 0, "name": 1}, Base: []int{1, 2, 1, 0, 0}, Check: []int{0, 1, 2, 3, 2}}func request_DatabaseService_UpdateDatabase_0(ctx context.Context, marshaler runtime.Marshaler, client DatabaseServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {@@ -420,54 +565,90 @@ func local_request_DatabaseService_UpdateDatabase_0(ctx context.Context, marshalreturn msg, metadata, err}-func request_DatabaseService_BatchUpdateDatabases_0(ctx context.Context, marshaler runtime.Marshaler, client DatabaseServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+var filter_DatabaseService_UpdateDatabase_1 = &utilities.DoubleArray{Encoding: map[string]int{"database": 0, "name": 1}, Base: []int{1, 2, 1, 0, 0}, Check: []int{0, 1, 2, 3, 2}}++func request_DatabaseService_UpdateDatabase_1(ctx context.Context, marshaler runtime.Marshaler, client DatabaseServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq BatchUpdateDatabasesRequest+ protoReq UpdateDatabaseRequestmetadata runtime.ServerMetadataerr error)- if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {+ newReader, berr := utilities.IOReaderFactory(req.Body)+ if berr != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr)+ }+ if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Database); err != nil && !errors.Is(err, io.EOF) {return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)}if req.Body != nil {_, _ = io.Copy(io.Discard, req.Body)}- val, ok := pathParams["parent"]+ if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 {+ if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Database); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ } else {+ protoReq.UpdateMask = fieldMask+ }+ }+ val, ok := pathParams["database.name"]if !ok {- return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "parent")+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "database.name")}- protoReq.Parent, err = runtime.String(val)+ err = runtime.PopulateFieldFromPath(&protoReq, "database.name", val)if err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "parent", err)+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "database.name", err)}- msg, err := client.BatchUpdateDatabases(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ if err := req.ParseForm(); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_DatabaseService_UpdateDatabase_1); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ msg, err := client.UpdateDatabase(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))return msg, metadata, err}-func local_request_DatabaseService_BatchUpdateDatabases_0(ctx context.Context, marshaler runtime.Marshaler, server DatabaseServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+func local_request_DatabaseService_UpdateDatabase_1(ctx context.Context, marshaler runtime.Marshaler, server DatabaseServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq BatchUpdateDatabasesRequest+ protoReq UpdateDatabaseRequestmetadata runtime.ServerMetadataerr error)- if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {+ newReader, berr := utilities.IOReaderFactory(req.Body)+ if berr != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr)+ }+ if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Database); err != nil && !errors.Is(err, io.EOF) {return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)}- val, ok := pathParams["parent"]+ if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 {+ if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Database); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ } else {+ protoReq.UpdateMask = fieldMask+ }+ }+ val, ok := pathParams["database.name"]if !ok {- return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "parent")+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "database.name")}- protoReq.Parent, err = runtime.String(val)+ err = runtime.PopulateFieldFromPath(&protoReq, "database.name", val)if err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "parent", err)+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "database.name", err)}- msg, err := server.BatchUpdateDatabases(ctx, &protoReq)+ if err := req.ParseForm(); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_DatabaseService_UpdateDatabase_1); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ msg, err := server.UpdateDatabase(ctx, &protoReq)return msg, metadata, err}-func request_DatabaseService_SyncDatabase_0(ctx context.Context, marshaler runtime.Marshaler, client DatabaseServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+func request_DatabaseService_BatchUpdateDatabases_0(ctx context.Context, marshaler runtime.Marshaler, client DatabaseServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq SyncDatabaseRequest+ protoReq BatchUpdateDatabasesRequestmetadata runtime.ServerMetadataerr error)@@ -477,42 +658,42 @@ func request_DatabaseService_SyncDatabase_0(ctx context.Context, marshaler runtiif req.Body != nil {_, _ = io.Copy(io.Discard, req.Body)}- val, ok := pathParams["name"]+ val, ok := pathParams["parent"]if !ok {- return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "parent")}- protoReq.Name, err = runtime.String(val)+ protoReq.Parent, err = runtime.String(val)if err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "parent", err)}- msg, err := client.SyncDatabase(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ msg, err := client.BatchUpdateDatabases(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))return msg, metadata, err}-func local_request_DatabaseService_SyncDatabase_0(ctx context.Context, marshaler runtime.Marshaler, server DatabaseServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+func local_request_DatabaseService_BatchUpdateDatabases_0(ctx context.Context, marshaler runtime.Marshaler, server DatabaseServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq SyncDatabaseRequest+ protoReq BatchUpdateDatabasesRequestmetadata runtime.ServerMetadataerr 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["name"]+ val, ok := pathParams["parent"]if !ok {- return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "parent")}- protoReq.Name, err = runtime.String(val)+ protoReq.Parent, err = runtime.String(val)if err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "parent", err)}- msg, err := server.SyncDatabase(ctx, &protoReq)+ msg, err := server.BatchUpdateDatabases(ctx, &protoReq)return msg, metadata, err}-func request_DatabaseService_BatchSyncDatabases_0(ctx context.Context, marshaler runtime.Marshaler, client DatabaseServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+func request_DatabaseService_BatchUpdateDatabases_1(ctx context.Context, marshaler runtime.Marshaler, client DatabaseServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq BatchSyncDatabasesRequest+ protoReq BatchUpdateDatabasesRequestmetadata runtime.ServerMetadataerr error)@@ -530,13 +711,13 @@ func request_DatabaseService_BatchSyncDatabases_0(ctx context.Context, marshalerif err != nil {return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "parent", err)}- msg, err := client.BatchSyncDatabases(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ msg, err := client.BatchUpdateDatabases(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))return msg, metadata, err}-func local_request_DatabaseService_BatchSyncDatabases_0(ctx context.Context, marshaler runtime.Marshaler, server DatabaseServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+func local_request_DatabaseService_BatchUpdateDatabases_1(ctx context.Context, marshaler runtime.Marshaler, server DatabaseServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq BatchSyncDatabasesRequest+ protoReq BatchUpdateDatabasesRequestmetadata runtime.ServerMetadataerr error)@@ -551,18 +732,19 @@ func local_request_DatabaseService_BatchSyncDatabases_0(ctx context.Context, marif err != nil {return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "parent", err)}- msg, err := server.BatchSyncDatabases(ctx, &protoReq)+ msg, err := server.BatchUpdateDatabases(ctx, &protoReq)return msg, metadata, err}-var filter_DatabaseService_GetDatabaseMetadata_0 = &utilities.DoubleArray{Encoding: map[string]int{"name": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}--func request_DatabaseService_GetDatabaseMetadata_0(ctx context.Context, marshaler runtime.Marshaler, client DatabaseServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+func request_DatabaseService_SyncDatabase_0(ctx context.Context, marshaler runtime.Marshaler, client DatabaseServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq GetDatabaseMetadataRequest+ protoReq SyncDatabaseRequestmetadata runtime.ServerMetadataerr 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)+ }if req.Body != nil {_, _ = io.Copy(io.Discard, req.Body)}@@ -574,23 +756,20 @@ func request_DatabaseService_GetDatabaseMetadata_0(ctx context.Context, marshaleif err != nil {return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)}- if err := req.ParseForm(); err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- }- if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_DatabaseService_GetDatabaseMetadata_0); err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- }- msg, err := client.GetDatabaseMetadata(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ msg, err := client.SyncDatabase(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))return msg, metadata, err}-func local_request_DatabaseService_GetDatabaseMetadata_0(ctx context.Context, marshaler runtime.Marshaler, server DatabaseServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+func local_request_DatabaseService_SyncDatabase_0(ctx context.Context, marshaler runtime.Marshaler, server DatabaseServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq GetDatabaseMetadataRequest+ protoReq SyncDatabaseRequestmetadata runtime.ServerMetadataerr error)- val, ok := pathParams["name"]+ 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["name"]if !ok {return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")}@@ -598,19 +777,150 @@ func local_request_DatabaseService_GetDatabaseMetadata_0(ctx context.Context, maif err != nil {return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)}- if err := req.ParseForm(); err != nil {+ msg, err := server.SyncDatabase(ctx, &protoReq)+ return msg, metadata, err+}++func request_DatabaseService_SyncDatabase_1(ctx context.Context, marshaler runtime.Marshaler, client DatabaseServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq SyncDatabaseRequest+ 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)}- if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_DatabaseService_GetDatabaseMetadata_0); err != nil {+ if req.Body != nil {+ _, _ = io.Copy(io.Discard, req.Body)+ }+ val, ok := pathParams["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ msg, err := client.SyncDatabase(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ return msg, metadata, err+}++func local_request_DatabaseService_SyncDatabase_1(ctx context.Context, marshaler runtime.Marshaler, server DatabaseServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq SyncDatabaseRequest+ 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)}- msg, err := server.GetDatabaseMetadata(ctx, &protoReq)+ val, ok := pathParams["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ msg, err := server.SyncDatabase(ctx, &protoReq)return msg, metadata, err}-func request_DatabaseService_GetDatabaseSchema_0(ctx context.Context, marshaler runtime.Marshaler, client DatabaseServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+func request_DatabaseService_BatchSyncDatabases_0(ctx context.Context, marshaler runtime.Marshaler, client DatabaseServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq GetDatabaseSchemaRequest+ protoReq BatchSyncDatabasesRequest+ 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)+ }+ 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.BatchSyncDatabases(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ return msg, metadata, err+}++func local_request_DatabaseService_BatchSyncDatabases_0(ctx context.Context, marshaler runtime.Marshaler, server DatabaseServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq BatchSyncDatabasesRequest+ 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.BatchSyncDatabases(ctx, &protoReq)+ return msg, metadata, err+}++func request_DatabaseService_BatchSyncDatabases_1(ctx context.Context, marshaler runtime.Marshaler, client DatabaseServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq BatchSyncDatabasesRequest+ 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)+ }+ 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.BatchSyncDatabases(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ return msg, metadata, err+}++func local_request_DatabaseService_BatchSyncDatabases_1(ctx context.Context, marshaler runtime.Marshaler, server DatabaseServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq BatchSyncDatabasesRequest+ 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.BatchSyncDatabases(ctx, &protoReq)+ return msg, metadata, err+}++var filter_DatabaseService_GetDatabaseMetadata_0 = &utilities.DoubleArray{Encoding: map[string]int{"name": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}++func request_DatabaseService_GetDatabaseMetadata_0(ctx context.Context, marshaler runtime.Marshaler, client DatabaseServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq GetDatabaseMetadataRequestmetadata runtime.ServerMetadataerr error)@@ -625,13 +935,19 @@ func request_DatabaseService_GetDatabaseSchema_0(ctx context.Context, marshalerif err != nil {return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)}- msg, err := client.GetDatabaseSchema(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ if err := req.ParseForm(); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_DatabaseService_GetDatabaseMetadata_0); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ msg, err := client.GetDatabaseMetadata(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))return msg, metadata, err}-func local_request_DatabaseService_GetDatabaseSchema_0(ctx context.Context, marshaler runtime.Marshaler, server DatabaseServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+func local_request_DatabaseService_GetDatabaseMetadata_0(ctx context.Context, marshaler runtime.Marshaler, server DatabaseServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq GetDatabaseSchemaRequest+ protoReq GetDatabaseMetadataRequestmetadata runtime.ServerMetadataerr error)@@ -643,15 +959,21 @@ func local_request_DatabaseService_GetDatabaseSchema_0(ctx context.Context, marsif err != nil {return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)}- msg, err := server.GetDatabaseSchema(ctx, &protoReq)+ if err := req.ParseForm(); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_DatabaseService_GetDatabaseMetadata_0); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ msg, err := server.GetDatabaseMetadata(ctx, &protoReq)return msg, metadata, err}-var filter_DatabaseService_GetDatabaseSDLSchema_0 = &utilities.DoubleArray{Encoding: map[string]int{"name": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}+var filter_DatabaseService_GetDatabaseMetadata_1 = &utilities.DoubleArray{Encoding: map[string]int{"name": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}-func request_DatabaseService_GetDatabaseSDLSchema_0(ctx context.Context, marshaler runtime.Marshaler, client DatabaseServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+func request_DatabaseService_GetDatabaseMetadata_1(ctx context.Context, marshaler runtime.Marshaler, client DatabaseServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq GetDatabaseSDLSchemaRequest+ protoReq GetDatabaseMetadataRequestmetadata runtime.ServerMetadataerr error)@@ -669,16 +991,16 @@ func request_DatabaseService_GetDatabaseSDLSchema_0(ctx context.Context, marshalif err := req.ParseForm(); err != nil {return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)}- if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_DatabaseService_GetDatabaseSDLSchema_0); err != nil {+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_DatabaseService_GetDatabaseMetadata_1); err != nil {return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)}- msg, err := client.GetDatabaseSDLSchema(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ msg, err := client.GetDatabaseMetadata(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))return msg, metadata, err}-func local_request_DatabaseService_GetDatabaseSDLSchema_0(ctx context.Context, marshaler runtime.Marshaler, server DatabaseServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+func local_request_DatabaseService_GetDatabaseMetadata_1(ctx context.Context, marshaler runtime.Marshaler, server DatabaseServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq GetDatabaseSDLSchemaRequest+ protoReq GetDatabaseMetadataRequestmetadata runtime.ServerMetadataerr error)@@ -693,22 +1015,19 @@ func local_request_DatabaseService_GetDatabaseSDLSchema_0(ctx context.Context, mif err := req.ParseForm(); err != nil {return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)}- if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_DatabaseService_GetDatabaseSDLSchema_0); err != nil {+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_DatabaseService_GetDatabaseMetadata_1); err != nil {return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)}- msg, err := server.GetDatabaseSDLSchema(ctx, &protoReq)+ msg, err := server.GetDatabaseMetadata(ctx, &protoReq)return msg, metadata, err}-func request_DatabaseService_DiffSchema_0(ctx context.Context, marshaler runtime.Marshaler, client DatabaseServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+func request_DatabaseService_GetDatabaseSchema_0(ctx context.Context, marshaler runtime.Marshaler, client DatabaseServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq DiffSchemaRequest+ protoReq GetDatabaseSchemaRequestmetadata runtime.ServerMetadataerr 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)- }if req.Body != nil {_, _ = io.Copy(io.Discard, req.Body)}@@ -720,19 +1039,16 @@ func request_DatabaseService_DiffSchema_0(ctx context.Context, marshaler runtimeif err != nil {return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)}- msg, err := client.DiffSchema(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ msg, err := client.GetDatabaseSchema(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))return msg, metadata, err}-func local_request_DatabaseService_DiffSchema_0(ctx context.Context, marshaler runtime.Marshaler, server DatabaseServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+func local_request_DatabaseService_GetDatabaseSchema_0(ctx context.Context, marshaler runtime.Marshaler, server DatabaseServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq DiffSchemaRequest+ protoReq GetDatabaseSchemaRequestmetadata runtime.ServerMetadataerr 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["name"]if !ok {return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")@@ -741,19 +1057,16 @@ func local_request_DatabaseService_DiffSchema_0(ctx context.Context, marshaler rif err != nil {return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)}- msg, err := server.DiffSchema(ctx, &protoReq)+ msg, err := server.GetDatabaseSchema(ctx, &protoReq)return msg, metadata, err}-func request_DatabaseService_DiffSchema_1(ctx context.Context, marshaler runtime.Marshaler, client DatabaseServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+func request_DatabaseService_GetDatabaseSchema_1(ctx context.Context, marshaler runtime.Marshaler, client DatabaseServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq DiffSchemaRequest+ protoReq GetDatabaseSchemaRequestmetadata runtime.ServerMetadataerr 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)- }if req.Body != nil {_, _ = io.Copy(io.Discard, req.Body)}@@ -765,19 +1078,16 @@ func request_DatabaseService_DiffSchema_1(ctx context.Context, marshaler runtimeif err != nil {return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)}- msg, err := client.DiffSchema(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ msg, err := client.GetDatabaseSchema(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))return msg, metadata, err}-func local_request_DatabaseService_DiffSchema_1(ctx context.Context, marshaler runtime.Marshaler, server DatabaseServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+func local_request_DatabaseService_GetDatabaseSchema_1(ctx context.Context, marshaler runtime.Marshaler, server DatabaseServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq DiffSchemaRequest+ protoReq GetDatabaseSchemaRequestmetadata runtime.ServerMetadataerr 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["name"]if !ok {return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")@@ -786,19 +1096,18 @@ func local_request_DatabaseService_DiffSchema_1(ctx context.Context, marshaler rif err != nil {return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)}- msg, err := server.DiffSchema(ctx, &protoReq)+ msg, err := server.GetDatabaseSchema(ctx, &protoReq)return msg, metadata, err}-func request_DatabaseService_DiffMetadata_0(ctx context.Context, marshaler runtime.Marshaler, client DatabaseServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+var filter_DatabaseService_GetDatabaseSDLSchema_0 = &utilities.DoubleArray{Encoding: map[string]int{"name": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}++func request_DatabaseService_GetDatabaseSDLSchema_0(ctx context.Context, marshaler runtime.Marshaler, client DatabaseServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq DiffMetadataRequest+ protoReq GetDatabaseSDLSchemaRequestmetadata runtime.ServerMetadataerr 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)- }if req.Body != nil {_, _ = io.Copy(io.Discard, req.Body)}@@ -810,19 +1119,22 @@ func request_DatabaseService_DiffMetadata_0(ctx context.Context, marshaler runtiif err != nil {return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)}- msg, err := client.DiffMetadata(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ if err := req.ParseForm(); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_DatabaseService_GetDatabaseSDLSchema_0); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ msg, err := client.GetDatabaseSDLSchema(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))return msg, metadata, err}-func local_request_DatabaseService_DiffMetadata_0(ctx context.Context, marshaler runtime.Marshaler, server DatabaseServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+func local_request_DatabaseService_GetDatabaseSDLSchema_0(ctx context.Context, marshaler runtime.Marshaler, server DatabaseServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq DiffMetadataRequest+ protoReq GetDatabaseSDLSchemaRequestmetadata runtime.ServerMetadataerr 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["name"]if !ok {return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")@@ -831,15 +1143,21 @@ func local_request_DatabaseService_DiffMetadata_0(ctx context.Context, marshalerif err != nil {return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)}- msg, err := server.DiffMetadata(ctx, &protoReq)+ if err := req.ParseForm(); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_DatabaseService_GetDatabaseSDLSchema_0); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ msg, err := server.GetDatabaseSDLSchema(ctx, &protoReq)return msg, metadata, err}-var filter_DatabaseService_GetSchemaString_0 = &utilities.DoubleArray{Encoding: map[string]int{"name": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}+var filter_DatabaseService_GetDatabaseSDLSchema_1 = &utilities.DoubleArray{Encoding: map[string]int{"name": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}-func request_DatabaseService_GetSchemaString_0(ctx context.Context, marshaler runtime.Marshaler, client DatabaseServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+func request_DatabaseService_GetDatabaseSDLSchema_1(ctx context.Context, marshaler runtime.Marshaler, client DatabaseServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq GetSchemaStringRequest+ protoReq GetDatabaseSDLSchemaRequestmetadata runtime.ServerMetadataerr error)@@ -857,16 +1175,16 @@ func request_DatabaseService_GetSchemaString_0(ctx context.Context, marshaler ruif err := req.ParseForm(); err != nil {return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)}- if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_DatabaseService_GetSchemaString_0); err != nil {+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_DatabaseService_GetDatabaseSDLSchema_1); err != nil {return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)}- msg, err := client.GetSchemaString(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ msg, err := client.GetDatabaseSDLSchema(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))return msg, metadata, err}-func local_request_DatabaseService_GetSchemaString_0(ctx context.Context, marshaler runtime.Marshaler, server DatabaseServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+func local_request_DatabaseService_GetDatabaseSDLSchema_1(ctx context.Context, marshaler runtime.Marshaler, server DatabaseServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq GetSchemaStringRequest+ protoReq GetDatabaseSDLSchemaRequestmetadata runtime.ServerMetadataerr error)@@ -881,16 +1199,392 @@ func local_request_DatabaseService_GetSchemaString_0(ctx context.Context, marshaif err := req.ParseForm(); err != nil {return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)}- if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_DatabaseService_GetSchemaString_0); err != nil {+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_DatabaseService_GetDatabaseSDLSchema_1); err != nil {return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)}- msg, err := server.GetSchemaString(ctx, &protoReq)+ msg, err := server.GetDatabaseSDLSchema(ctx, &protoReq)return msg, metadata, err}-// RegisterDatabaseServiceHandlerServer registers the http handlers for service DatabaseService to "mux".-// UnaryRPC :call DatabaseServiceServer directly.-// StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906.+func request_DatabaseService_DiffSchema_0(ctx context.Context, marshaler runtime.Marshaler, client DatabaseServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq DiffSchemaRequest+ 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)+ }+ if req.Body != nil {+ _, _ = io.Copy(io.Discard, req.Body)+ }+ val, ok := pathParams["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ msg, err := client.DiffSchema(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ return msg, metadata, err+}++func local_request_DatabaseService_DiffSchema_0(ctx context.Context, marshaler runtime.Marshaler, server DatabaseServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq DiffSchemaRequest+ 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["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ msg, err := server.DiffSchema(ctx, &protoReq)+ return msg, metadata, err+}++func request_DatabaseService_DiffSchema_1(ctx context.Context, marshaler runtime.Marshaler, client DatabaseServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq DiffSchemaRequest+ 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)+ }+ if req.Body != nil {+ _, _ = io.Copy(io.Discard, req.Body)+ }+ val, ok := pathParams["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ msg, err := client.DiffSchema(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ return msg, metadata, err+}++func local_request_DatabaseService_DiffSchema_1(ctx context.Context, marshaler runtime.Marshaler, server DatabaseServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq DiffSchemaRequest+ 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["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ msg, err := server.DiffSchema(ctx, &protoReq)+ return msg, metadata, err+}++func request_DatabaseService_DiffSchema_2(ctx context.Context, marshaler runtime.Marshaler, client DatabaseServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq DiffSchemaRequest+ 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)+ }+ if req.Body != nil {+ _, _ = io.Copy(io.Discard, req.Body)+ }+ val, ok := pathParams["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ msg, err := client.DiffSchema(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ return msg, metadata, err+}++func local_request_DatabaseService_DiffSchema_2(ctx context.Context, marshaler runtime.Marshaler, server DatabaseServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq DiffSchemaRequest+ 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["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ msg, err := server.DiffSchema(ctx, &protoReq)+ return msg, metadata, err+}++func request_DatabaseService_DiffSchema_3(ctx context.Context, marshaler runtime.Marshaler, client DatabaseServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq DiffSchemaRequest+ 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)+ }+ if req.Body != nil {+ _, _ = io.Copy(io.Discard, req.Body)+ }+ val, ok := pathParams["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ msg, err := client.DiffSchema(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ return msg, metadata, err+}++func local_request_DatabaseService_DiffSchema_3(ctx context.Context, marshaler runtime.Marshaler, server DatabaseServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq DiffSchemaRequest+ 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["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ msg, err := server.DiffSchema(ctx, &protoReq)+ return msg, metadata, err+}++func request_DatabaseService_DiffMetadata_0(ctx context.Context, marshaler runtime.Marshaler, client DatabaseServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq DiffMetadataRequest+ 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)+ }+ if req.Body != nil {+ _, _ = io.Copy(io.Discard, req.Body)+ }+ val, ok := pathParams["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ msg, err := client.DiffMetadata(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ return msg, metadata, err+}++func local_request_DatabaseService_DiffMetadata_0(ctx context.Context, marshaler runtime.Marshaler, server DatabaseServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq DiffMetadataRequest+ 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["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ msg, err := server.DiffMetadata(ctx, &protoReq)+ return msg, metadata, err+}++func request_DatabaseService_DiffMetadata_1(ctx context.Context, marshaler runtime.Marshaler, client DatabaseServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq DiffMetadataRequest+ 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)+ }+ if req.Body != nil {+ _, _ = io.Copy(io.Discard, req.Body)+ }+ val, ok := pathParams["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ msg, err := client.DiffMetadata(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ return msg, metadata, err+}++func local_request_DatabaseService_DiffMetadata_1(ctx context.Context, marshaler runtime.Marshaler, server DatabaseServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq DiffMetadataRequest+ 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["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ msg, err := server.DiffMetadata(ctx, &protoReq)+ return msg, metadata, err+}++var filter_DatabaseService_GetSchemaString_0 = &utilities.DoubleArray{Encoding: map[string]int{"name": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}++func request_DatabaseService_GetSchemaString_0(ctx context.Context, marshaler runtime.Marshaler, client DatabaseServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq GetSchemaStringRequest+ metadata runtime.ServerMetadata+ err error+ )+ if req.Body != nil {+ _, _ = io.Copy(io.Discard, req.Body)+ }+ val, ok := pathParams["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ if err := req.ParseForm(); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_DatabaseService_GetSchemaString_0); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ msg, err := client.GetSchemaString(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ return msg, metadata, err+}++func local_request_DatabaseService_GetSchemaString_0(ctx context.Context, marshaler runtime.Marshaler, server DatabaseServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq GetSchemaStringRequest+ metadata runtime.ServerMetadata+ err error+ )+ val, ok := pathParams["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ if err := req.ParseForm(); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_DatabaseService_GetSchemaString_0); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ msg, err := server.GetSchemaString(ctx, &protoReq)+ return msg, metadata, err+}++var filter_DatabaseService_GetSchemaString_1 = &utilities.DoubleArray{Encoding: map[string]int{"name": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}++func request_DatabaseService_GetSchemaString_1(ctx context.Context, marshaler runtime.Marshaler, client DatabaseServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq GetSchemaStringRequest+ metadata runtime.ServerMetadata+ err error+ )+ if req.Body != nil {+ _, _ = io.Copy(io.Discard, req.Body)+ }+ val, ok := pathParams["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ if err := req.ParseForm(); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_DatabaseService_GetSchemaString_1); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ msg, err := client.GetSchemaString(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ return msg, metadata, err+}++func local_request_DatabaseService_GetSchemaString_1(ctx context.Context, marshaler runtime.Marshaler, server DatabaseServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq GetSchemaStringRequest+ metadata runtime.ServerMetadata+ err error+ )+ val, ok := pathParams["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ if err := req.ParseForm(); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_DatabaseService_GetSchemaString_1); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ msg, err := server.GetSchemaString(ctx, &protoReq)+ return msg, metadata, err+}++// RegisterDatabaseServiceHandlerServer registers the http handlers for service DatabaseService to "mux".+// UnaryRPC :call DatabaseServiceServer directly.+// StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906.// Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterDatabaseServiceHandlerFromEndpoint instead.// GRPC interceptors will not work for this type of registration. To use interceptors, you must use the "runtime.WithMiddlewares" option in the "runtime.NewServeMux" call.func RegisterDatabaseServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux, server DatabaseServiceServer) error {@@ -914,6 +1608,26 @@ func RegisterDatabaseServiceHandlerServer(ctx context.Context, mux *runtime.Serv}forward_DatabaseService_GetDatabase_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodGet, pattern_DatabaseService_GetDatabase_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ var stream runtime.ServerTransportStream+ ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.DatabaseService/GetDatabase", runtime.WithHTTPPathPattern("/v1/{name=projects/*/instances/*/databases/*}"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := local_request_DatabaseService_GetDatabase_1(annotatedContext, inboundMarshaler, server, req, pathParams)+ md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_DatabaseService_GetDatabase_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })mux.Handle(http.MethodGet, pattern_DatabaseService_BatchGetDatabases_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()@@ -954,6 +1668,26 @@ func RegisterDatabaseServiceHandlerServer(ctx context.Context, mux *runtime.Serv}forward_DatabaseService_BatchGetDatabases_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodGet, pattern_DatabaseService_BatchGetDatabases_2, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ var stream runtime.ServerTransportStream+ ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.DatabaseService/BatchGetDatabases", runtime.WithHTTPPathPattern("/v1/{parent=projects/*/instances/*}/databases:batchGet"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := local_request_DatabaseService_BatchGetDatabases_2(annotatedContext, inboundMarshaler, server, req, pathParams)+ md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_DatabaseService_BatchGetDatabases_2(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })mux.Handle(http.MethodGet, pattern_DatabaseService_ListDatabases_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()@@ -994,245 +1728,485 @@ func RegisterDatabaseServiceHandlerServer(ctx context.Context, mux *runtime.Serv}forward_DatabaseService_ListDatabases_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodGet, pattern_DatabaseService_ListDatabases_2, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ mux.Handle(http.MethodGet, pattern_DatabaseService_ListDatabases_2, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ var stream runtime.ServerTransportStream+ ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.DatabaseService/ListDatabases", runtime.WithHTTPPathPattern("/v1/{parent=workspaces/*}/databases"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := local_request_DatabaseService_ListDatabases_2(annotatedContext, inboundMarshaler, server, req, pathParams)+ md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_DatabaseService_ListDatabases_2(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })+ mux.Handle(http.MethodGet, pattern_DatabaseService_ListDatabases_3, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ var stream runtime.ServerTransportStream+ ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.DatabaseService/ListDatabases", runtime.WithHTTPPathPattern("/v1/{parent=projects/*/instances/*}/databases"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := local_request_DatabaseService_ListDatabases_3(annotatedContext, inboundMarshaler, server, req, pathParams)+ md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_DatabaseService_ListDatabases_3(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })+ mux.Handle(http.MethodPatch, pattern_DatabaseService_UpdateDatabase_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ var stream runtime.ServerTransportStream+ ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.DatabaseService/UpdateDatabase", runtime.WithHTTPPathPattern("/v1/{database.name=instances/*/databases/*}"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := local_request_DatabaseService_UpdateDatabase_0(annotatedContext, inboundMarshaler, server, req, pathParams)+ md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_DatabaseService_UpdateDatabase_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })+ mux.Handle(http.MethodPatch, pattern_DatabaseService_UpdateDatabase_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ var stream runtime.ServerTransportStream+ ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.DatabaseService/UpdateDatabase", runtime.WithHTTPPathPattern("/v1/{database.name=projects/*/instances/*/databases/*}"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := local_request_DatabaseService_UpdateDatabase_1(annotatedContext, inboundMarshaler, server, req, pathParams)+ md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_DatabaseService_UpdateDatabase_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })+ mux.Handle(http.MethodPost, pattern_DatabaseService_BatchUpdateDatabases_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ var stream runtime.ServerTransportStream+ ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.DatabaseService/BatchUpdateDatabases", runtime.WithHTTPPathPattern("/v1/{parent=instances/*}/databases:batchUpdate"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := local_request_DatabaseService_BatchUpdateDatabases_0(annotatedContext, inboundMarshaler, server, req, pathParams)+ md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_DatabaseService_BatchUpdateDatabases_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })+ mux.Handle(http.MethodPost, pattern_DatabaseService_BatchUpdateDatabases_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ var stream runtime.ServerTransportStream+ ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.DatabaseService/BatchUpdateDatabases", runtime.WithHTTPPathPattern("/v1/{parent=projects/*/instances/*}/databases:batchUpdate"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := local_request_DatabaseService_BatchUpdateDatabases_1(annotatedContext, inboundMarshaler, server, req, pathParams)+ md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_DatabaseService_BatchUpdateDatabases_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })+ mux.Handle(http.MethodPost, pattern_DatabaseService_SyncDatabase_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ var stream runtime.ServerTransportStream+ ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.DatabaseService/SyncDatabase", runtime.WithHTTPPathPattern("/v1/{name=instances/*/databases/*}:sync"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := local_request_DatabaseService_SyncDatabase_0(annotatedContext, inboundMarshaler, server, req, pathParams)+ md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_DatabaseService_SyncDatabase_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })+ mux.Handle(http.MethodPost, pattern_DatabaseService_SyncDatabase_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ var stream runtime.ServerTransportStream+ ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.DatabaseService/SyncDatabase", runtime.WithHTTPPathPattern("/v1/{name=projects/*/instances/*/databases/*}:sync"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := local_request_DatabaseService_SyncDatabase_1(annotatedContext, inboundMarshaler, server, req, pathParams)+ md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_DatabaseService_SyncDatabase_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })+ mux.Handle(http.MethodPost, pattern_DatabaseService_BatchSyncDatabases_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ var stream runtime.ServerTransportStream+ ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.DatabaseService/BatchSyncDatabases", runtime.WithHTTPPathPattern("/v1/{parent=instances/*}/databases:batchSync"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := local_request_DatabaseService_BatchSyncDatabases_0(annotatedContext, inboundMarshaler, server, req, pathParams)+ md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_DatabaseService_BatchSyncDatabases_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })+ mux.Handle(http.MethodPost, pattern_DatabaseService_BatchSyncDatabases_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ var stream runtime.ServerTransportStream+ ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.DatabaseService/BatchSyncDatabases", runtime.WithHTTPPathPattern("/v1/{parent=projects/*/instances/*}/databases:batchSync"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := local_request_DatabaseService_BatchSyncDatabases_1(annotatedContext, inboundMarshaler, server, req, pathParams)+ md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_DatabaseService_BatchSyncDatabases_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })+ mux.Handle(http.MethodGet, pattern_DatabaseService_GetDatabaseMetadata_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ var stream runtime.ServerTransportStream+ ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.DatabaseService/GetDatabaseMetadata", runtime.WithHTTPPathPattern("/v1/{name=instances/*/databases/*/metadata}"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := local_request_DatabaseService_GetDatabaseMetadata_0(annotatedContext, inboundMarshaler, server, req, pathParams)+ md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_DatabaseService_GetDatabaseMetadata_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })+ mux.Handle(http.MethodGet, pattern_DatabaseService_GetDatabaseMetadata_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ var stream runtime.ServerTransportStream+ ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.DatabaseService/GetDatabaseMetadata", runtime.WithHTTPPathPattern("/v1/{name=projects/*/instances/*/databases/*/metadata}"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := local_request_DatabaseService_GetDatabaseMetadata_1(annotatedContext, inboundMarshaler, server, req, pathParams)+ md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_DatabaseService_GetDatabaseMetadata_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })+ mux.Handle(http.MethodGet, pattern_DatabaseService_GetDatabaseSchema_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()var stream runtime.ServerTransportStreamctx = grpc.NewContextWithServerTransportStream(ctx, &stream)inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.DatabaseService/ListDatabases", runtime.WithHTTPPathPattern("/v1/{parent=workspaces/*}/databases"))+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.DatabaseService/GetDatabaseSchema", runtime.WithHTTPPathPattern("/v1/{name=instances/*/databases/*/schema}"))if err != nil {runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)return}- resp, md, err := local_request_DatabaseService_ListDatabases_2(annotatedContext, inboundMarshaler, server, req, pathParams)+ resp, md, err := local_request_DatabaseService_GetDatabaseSchema_0(annotatedContext, inboundMarshaler, server, req, pathParams)md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)if err != nil {runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)return}- forward_DatabaseService_ListDatabases_2(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ forward_DatabaseService_GetDatabaseSchema_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodPatch, pattern_DatabaseService_UpdateDatabase_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ mux.Handle(http.MethodGet, pattern_DatabaseService_GetDatabaseSchema_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()var stream runtime.ServerTransportStreamctx = grpc.NewContextWithServerTransportStream(ctx, &stream)inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.DatabaseService/UpdateDatabase", runtime.WithHTTPPathPattern("/v1/{database.name=instances/*/databases/*}"))+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.DatabaseService/GetDatabaseSchema", runtime.WithHTTPPathPattern("/v1/{name=projects/*/instances/*/databases/*/schema}"))if err != nil {runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)return}- resp, md, err := local_request_DatabaseService_UpdateDatabase_0(annotatedContext, inboundMarshaler, server, req, pathParams)+ resp, md, err := local_request_DatabaseService_GetDatabaseSchema_1(annotatedContext, inboundMarshaler, server, req, pathParams)md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)if err != nil {runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)return}- forward_DatabaseService_UpdateDatabase_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ forward_DatabaseService_GetDatabaseSchema_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodPost, pattern_DatabaseService_BatchUpdateDatabases_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ mux.Handle(http.MethodGet, pattern_DatabaseService_GetDatabaseSDLSchema_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()var stream runtime.ServerTransportStreamctx = grpc.NewContextWithServerTransportStream(ctx, &stream)inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.DatabaseService/BatchUpdateDatabases", runtime.WithHTTPPathPattern("/v1/{parent=instances/*}/databases:batchUpdate"))+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.DatabaseService/GetDatabaseSDLSchema", runtime.WithHTTPPathPattern("/v1/{name=instances/*/databases/*/sdlSchema}"))if err != nil {runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)return}- resp, md, err := local_request_DatabaseService_BatchUpdateDatabases_0(annotatedContext, inboundMarshaler, server, req, pathParams)+ resp, md, err := local_request_DatabaseService_GetDatabaseSDLSchema_0(annotatedContext, inboundMarshaler, server, req, pathParams)md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)if err != nil {runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)return}- forward_DatabaseService_BatchUpdateDatabases_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ forward_DatabaseService_GetDatabaseSDLSchema_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodPost, pattern_DatabaseService_SyncDatabase_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ mux.Handle(http.MethodGet, pattern_DatabaseService_GetDatabaseSDLSchema_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()var stream runtime.ServerTransportStreamctx = grpc.NewContextWithServerTransportStream(ctx, &stream)inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.DatabaseService/SyncDatabase", runtime.WithHTTPPathPattern("/v1/{name=instances/*/databases/*}:sync"))+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.DatabaseService/GetDatabaseSDLSchema", runtime.WithHTTPPathPattern("/v1/{name=projects/*/instances/*/databases/*/sdlSchema}"))if err != nil {runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)return}- resp, md, err := local_request_DatabaseService_SyncDatabase_0(annotatedContext, inboundMarshaler, server, req, pathParams)+ resp, md, err := local_request_DatabaseService_GetDatabaseSDLSchema_1(annotatedContext, inboundMarshaler, server, req, pathParams)md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)if err != nil {runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)return}- forward_DatabaseService_SyncDatabase_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ forward_DatabaseService_GetDatabaseSDLSchema_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodPost, pattern_DatabaseService_BatchSyncDatabases_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ mux.Handle(http.MethodPost, pattern_DatabaseService_DiffSchema_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()var stream runtime.ServerTransportStreamctx = grpc.NewContextWithServerTransportStream(ctx, &stream)inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.DatabaseService/BatchSyncDatabases", runtime.WithHTTPPathPattern("/v1/{parent=instances/*}/databases:batchSync"))+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.DatabaseService/DiffSchema", runtime.WithHTTPPathPattern("/v1/{name=instances/*/databases/*}:diffSchema"))if err != nil {runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)return}- resp, md, err := local_request_DatabaseService_BatchSyncDatabases_0(annotatedContext, inboundMarshaler, server, req, pathParams)+ resp, md, err := local_request_DatabaseService_DiffSchema_0(annotatedContext, inboundMarshaler, server, req, pathParams)md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)if err != nil {runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)return}- forward_DatabaseService_BatchSyncDatabases_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ forward_DatabaseService_DiffSchema_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodGet, pattern_DatabaseService_GetDatabaseMetadata_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ mux.Handle(http.MethodPost, pattern_DatabaseService_DiffSchema_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()var stream runtime.ServerTransportStreamctx = grpc.NewContextWithServerTransportStream(ctx, &stream)inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.DatabaseService/GetDatabaseMetadata", runtime.WithHTTPPathPattern("/v1/{name=instances/*/databases/*/metadata}"))+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.DatabaseService/DiffSchema", runtime.WithHTTPPathPattern("/v1/{name=projects/*/instances/*/databases/*}:diffSchema"))if err != nil {runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)return}- resp, md, err := local_request_DatabaseService_GetDatabaseMetadata_0(annotatedContext, inboundMarshaler, server, req, pathParams)+ resp, md, err := local_request_DatabaseService_DiffSchema_1(annotatedContext, inboundMarshaler, server, req, pathParams)md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)if err != nil {runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)return}- forward_DatabaseService_GetDatabaseMetadata_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ forward_DatabaseService_DiffSchema_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodGet, pattern_DatabaseService_GetDatabaseSchema_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ mux.Handle(http.MethodPost, pattern_DatabaseService_DiffSchema_2, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()var stream runtime.ServerTransportStreamctx = grpc.NewContextWithServerTransportStream(ctx, &stream)inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.DatabaseService/GetDatabaseSchema", runtime.WithHTTPPathPattern("/v1/{name=instances/*/databases/*/schema}"))+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.DatabaseService/DiffSchema", runtime.WithHTTPPathPattern("/v1/{name=instances/*/databases/*/changelogs/*}:diffSchema"))if err != nil {runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)return}- resp, md, err := local_request_DatabaseService_GetDatabaseSchema_0(annotatedContext, inboundMarshaler, server, req, pathParams)+ resp, md, err := local_request_DatabaseService_DiffSchema_2(annotatedContext, inboundMarshaler, server, req, pathParams)md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)if err != nil {runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)return}- forward_DatabaseService_GetDatabaseSchema_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ forward_DatabaseService_DiffSchema_2(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodGet, pattern_DatabaseService_GetDatabaseSDLSchema_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ mux.Handle(http.MethodPost, pattern_DatabaseService_DiffSchema_3, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()var stream runtime.ServerTransportStreamctx = grpc.NewContextWithServerTransportStream(ctx, &stream)inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.DatabaseService/GetDatabaseSDLSchema", runtime.WithHTTPPathPattern("/v1/{name=instances/*/databases/*/sdlSchema}"))+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.DatabaseService/DiffSchema", runtime.WithHTTPPathPattern("/v1/{name=projects/*/instances/*/databases/*/changelogs/*}:diffSchema"))if err != nil {runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)return}- resp, md, err := local_request_DatabaseService_GetDatabaseSDLSchema_0(annotatedContext, inboundMarshaler, server, req, pathParams)+ resp, md, err := local_request_DatabaseService_DiffSchema_3(annotatedContext, inboundMarshaler, server, req, pathParams)md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)if err != nil {runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)return}- forward_DatabaseService_GetDatabaseSDLSchema_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ forward_DatabaseService_DiffSchema_3(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodPost, pattern_DatabaseService_DiffSchema_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ mux.Handle(http.MethodPost, pattern_DatabaseService_DiffMetadata_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()var stream runtime.ServerTransportStreamctx = grpc.NewContextWithServerTransportStream(ctx, &stream)inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.DatabaseService/DiffSchema", runtime.WithHTTPPathPattern("/v1/{name=instances/*/databases/*}:diffSchema"))+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.DatabaseService/DiffMetadata", runtime.WithHTTPPathPattern("/v1/{name=instances/*/databases/*}:diffMetadata"))if err != nil {runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)return}- resp, md, err := local_request_DatabaseService_DiffSchema_0(annotatedContext, inboundMarshaler, server, req, pathParams)+ resp, md, err := local_request_DatabaseService_DiffMetadata_0(annotatedContext, inboundMarshaler, server, req, pathParams)md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)if err != nil {runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)return}- forward_DatabaseService_DiffSchema_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ forward_DatabaseService_DiffMetadata_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodPost, pattern_DatabaseService_DiffSchema_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ mux.Handle(http.MethodPost, pattern_DatabaseService_DiffMetadata_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()var stream runtime.ServerTransportStreamctx = grpc.NewContextWithServerTransportStream(ctx, &stream)inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.DatabaseService/DiffSchema", runtime.WithHTTPPathPattern("/v1/{name=instances/*/databases/*/changelogs/*}:diffSchema"))+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.DatabaseService/DiffMetadata", runtime.WithHTTPPathPattern("/v1/{name=projects/*/instances/*/databases/*}:diffMetadata"))if err != nil {runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)return}- resp, md, err := local_request_DatabaseService_DiffSchema_1(annotatedContext, inboundMarshaler, server, req, pathParams)+ resp, md, err := local_request_DatabaseService_DiffMetadata_1(annotatedContext, inboundMarshaler, server, req, pathParams)md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)if err != nil {runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)return}- forward_DatabaseService_DiffSchema_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ forward_DatabaseService_DiffMetadata_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodPost, pattern_DatabaseService_DiffMetadata_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ mux.Handle(http.MethodGet, pattern_DatabaseService_GetSchemaString_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()var stream runtime.ServerTransportStreamctx = grpc.NewContextWithServerTransportStream(ctx, &stream)inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.DatabaseService/DiffMetadata", runtime.WithHTTPPathPattern("/v1/{name=instances/*/databases/*}:diffMetadata"))+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.DatabaseService/GetSchemaString", runtime.WithHTTPPathPattern("/v1/{name=instances/*/databases/*/schemaString}"))if err != nil {runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)return}- resp, md, err := local_request_DatabaseService_DiffMetadata_0(annotatedContext, inboundMarshaler, server, req, pathParams)+ resp, md, err := local_request_DatabaseService_GetSchemaString_0(annotatedContext, inboundMarshaler, server, req, pathParams)md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)if err != nil {runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)return}- forward_DatabaseService_DiffMetadata_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ forward_DatabaseService_GetSchemaString_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodGet, pattern_DatabaseService_GetSchemaString_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ mux.Handle(http.MethodGet, pattern_DatabaseService_GetSchemaString_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()var stream runtime.ServerTransportStreamctx = grpc.NewContextWithServerTransportStream(ctx, &stream)inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.DatabaseService/GetSchemaString", runtime.WithHTTPPathPattern("/v1/{name=instances/*/databases/*/schemaString}"))+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.DatabaseService/GetSchemaString", runtime.WithHTTPPathPattern("/v1/{name=projects/*/instances/*/databases/*/schemaString}"))if err != nil {runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)return}- resp, md, err := local_request_DatabaseService_GetSchemaString_0(annotatedContext, inboundMarshaler, server, req, pathParams)+ resp, md, err := local_request_DatabaseService_GetSchemaString_1(annotatedContext, inboundMarshaler, server, req, pathParams)md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)if err != nil {runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)return}- forward_DatabaseService_GetSchemaString_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ forward_DatabaseService_GetSchemaString_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})return nil@@ -1291,6 +2265,23 @@ func RegisterDatabaseServiceHandlerClient(ctx context.Context, mux *runtime.Serv}forward_DatabaseService_GetDatabase_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodGet, pattern_DatabaseService_GetDatabase_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.DatabaseService/GetDatabase", runtime.WithHTTPPathPattern("/v1/{name=projects/*/instances/*/databases/*}"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := request_DatabaseService_GetDatabase_1(annotatedContext, inboundMarshaler, client, req, pathParams)+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_DatabaseService_GetDatabase_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })mux.Handle(http.MethodGet, pattern_DatabaseService_BatchGetDatabases_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()@@ -1325,6 +2316,23 @@ func RegisterDatabaseServiceHandlerClient(ctx context.Context, mux *runtime.Serv}forward_DatabaseService_BatchGetDatabases_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodGet, pattern_DatabaseService_BatchGetDatabases_2, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.DatabaseService/BatchGetDatabases", runtime.WithHTTPPathPattern("/v1/{parent=projects/*/instances/*}/databases:batchGet"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := request_DatabaseService_BatchGetDatabases_2(annotatedContext, inboundMarshaler, client, req, pathParams)+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_DatabaseService_BatchGetDatabases_2(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })mux.Handle(http.MethodGet, pattern_DatabaseService_ListDatabases_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()@@ -1376,6 +2384,23 @@ func RegisterDatabaseServiceHandlerClient(ctx context.Context, mux *runtime.Serv}forward_DatabaseService_ListDatabases_2(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodGet, pattern_DatabaseService_ListDatabases_3, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.DatabaseService/ListDatabases", runtime.WithHTTPPathPattern("/v1/{parent=projects/*/instances/*}/databases"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := request_DatabaseService_ListDatabases_3(annotatedContext, inboundMarshaler, client, req, pathParams)+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_DatabaseService_ListDatabases_3(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })mux.Handle(http.MethodPatch, pattern_DatabaseService_UpdateDatabase_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()@@ -1393,6 +2418,23 @@ func RegisterDatabaseServiceHandlerClient(ctx context.Context, mux *runtime.Serv}forward_DatabaseService_UpdateDatabase_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodPatch, pattern_DatabaseService_UpdateDatabase_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.DatabaseService/UpdateDatabase", runtime.WithHTTPPathPattern("/v1/{database.name=projects/*/instances/*/databases/*}"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := request_DatabaseService_UpdateDatabase_1(annotatedContext, inboundMarshaler, client, req, pathParams)+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_DatabaseService_UpdateDatabase_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })mux.Handle(http.MethodPost, pattern_DatabaseService_BatchUpdateDatabases_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()@@ -1410,6 +2452,23 @@ func RegisterDatabaseServiceHandlerClient(ctx context.Context, mux *runtime.Serv}forward_DatabaseService_BatchUpdateDatabases_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodPost, pattern_DatabaseService_BatchUpdateDatabases_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.DatabaseService/BatchUpdateDatabases", runtime.WithHTTPPathPattern("/v1/{parent=projects/*/instances/*}/databases:batchUpdate"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := request_DatabaseService_BatchUpdateDatabases_1(annotatedContext, inboundMarshaler, client, req, pathParams)+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_DatabaseService_BatchUpdateDatabases_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })mux.Handle(http.MethodPost, pattern_DatabaseService_SyncDatabase_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()@@ -1427,6 +2486,23 @@ func RegisterDatabaseServiceHandlerClient(ctx context.Context, mux *runtime.Serv}forward_DatabaseService_SyncDatabase_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodPost, pattern_DatabaseService_SyncDatabase_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.DatabaseService/SyncDatabase", runtime.WithHTTPPathPattern("/v1/{name=projects/*/instances/*/databases/*}:sync"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := request_DatabaseService_SyncDatabase_1(annotatedContext, inboundMarshaler, client, req, pathParams)+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_DatabaseService_SyncDatabase_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })mux.Handle(http.MethodPost, pattern_DatabaseService_BatchSyncDatabases_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()@@ -1444,6 +2520,23 @@ func RegisterDatabaseServiceHandlerClient(ctx context.Context, mux *runtime.Serv}forward_DatabaseService_BatchSyncDatabases_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodPost, pattern_DatabaseService_BatchSyncDatabases_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.DatabaseService/BatchSyncDatabases", runtime.WithHTTPPathPattern("/v1/{parent=projects/*/instances/*}/databases:batchSync"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := request_DatabaseService_BatchSyncDatabases_1(annotatedContext, inboundMarshaler, client, req, pathParams)+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_DatabaseService_BatchSyncDatabases_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })mux.Handle(http.MethodGet, pattern_DatabaseService_GetDatabaseMetadata_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()@@ -1461,6 +2554,23 @@ func RegisterDatabaseServiceHandlerClient(ctx context.Context, mux *runtime.Serv}forward_DatabaseService_GetDatabaseMetadata_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodGet, pattern_DatabaseService_GetDatabaseMetadata_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.DatabaseService/GetDatabaseMetadata", runtime.WithHTTPPathPattern("/v1/{name=projects/*/instances/*/databases/*/metadata}"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := request_DatabaseService_GetDatabaseMetadata_1(annotatedContext, inboundMarshaler, client, req, pathParams)+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_DatabaseService_GetDatabaseMetadata_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })mux.Handle(http.MethodGet, pattern_DatabaseService_GetDatabaseSchema_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()@@ -1478,6 +2588,23 @@ func RegisterDatabaseServiceHandlerClient(ctx context.Context, mux *runtime.Serv}forward_DatabaseService_GetDatabaseSchema_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodGet, pattern_DatabaseService_GetDatabaseSchema_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.DatabaseService/GetDatabaseSchema", runtime.WithHTTPPathPattern("/v1/{name=projects/*/instances/*/databases/*/schema}"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := request_DatabaseService_GetDatabaseSchema_1(annotatedContext, inboundMarshaler, client, req, pathParams)+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_DatabaseService_GetDatabaseSchema_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })mux.Handle(http.MethodGet, pattern_DatabaseService_GetDatabaseSDLSchema_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()@@ -1495,6 +2622,23 @@ func RegisterDatabaseServiceHandlerClient(ctx context.Context, mux *runtime.Serv}forward_DatabaseService_GetDatabaseSDLSchema_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodGet, pattern_DatabaseService_GetDatabaseSDLSchema_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.DatabaseService/GetDatabaseSDLSchema", runtime.WithHTTPPathPattern("/v1/{name=projects/*/instances/*/databases/*/sdlSchema}"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := request_DatabaseService_GetDatabaseSDLSchema_1(annotatedContext, inboundMarshaler, client, req, pathParams)+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_DatabaseService_GetDatabaseSDLSchema_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })mux.Handle(http.MethodPost, pattern_DatabaseService_DiffSchema_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()@@ -1516,7 +2660,7 @@ func RegisterDatabaseServiceHandlerClient(ctx context.Context, mux *runtime.Servctx, cancel := context.WithCancel(req.Context())defer cancel()inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.DatabaseService/DiffSchema", runtime.WithHTTPPathPattern("/v1/{name=instances/*/databases/*/changelogs/*}:diffSchema"))+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.DatabaseService/DiffSchema", runtime.WithHTTPPathPattern("/v1/{name=projects/*/instances/*/databases/*}:diffSchema"))if err != nil {runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)return@@ -1529,6 +2673,40 @@ func RegisterDatabaseServiceHandlerClient(ctx context.Context, mux *runtime.Serv}forward_DatabaseService_DiffSchema_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodPost, pattern_DatabaseService_DiffSchema_2, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.DatabaseService/DiffSchema", runtime.WithHTTPPathPattern("/v1/{name=instances/*/databases/*/changelogs/*}:diffSchema"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := request_DatabaseService_DiffSchema_2(annotatedContext, inboundMarshaler, client, req, pathParams)+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_DatabaseService_DiffSchema_2(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })+ mux.Handle(http.MethodPost, pattern_DatabaseService_DiffSchema_3, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.DatabaseService/DiffSchema", runtime.WithHTTPPathPattern("/v1/{name=projects/*/instances/*/databases/*/changelogs/*}:diffSchema"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := request_DatabaseService_DiffSchema_3(annotatedContext, inboundMarshaler, client, req, pathParams)+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_DatabaseService_DiffSchema_3(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })mux.Handle(http.MethodPost, pattern_DatabaseService_DiffMetadata_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()@@ -1546,6 +2724,23 @@ func RegisterDatabaseServiceHandlerClient(ctx context.Context, mux *runtime.Serv}forward_DatabaseService_DiffMetadata_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodPost, pattern_DatabaseService_DiffMetadata_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.DatabaseService/DiffMetadata", runtime.WithHTTPPathPattern("/v1/{name=projects/*/instances/*/databases/*}:diffMetadata"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := request_DatabaseService_DiffMetadata_1(annotatedContext, inboundMarshaler, client, req, pathParams)+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_DatabaseService_DiffMetadata_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })mux.Handle(http.MethodGet, pattern_DatabaseService_GetSchemaString_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()@@ -1563,45 +2758,90 @@ func RegisterDatabaseServiceHandlerClient(ctx context.Context, mux *runtime.Serv}forward_DatabaseService_GetSchemaString_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodGet, pattern_DatabaseService_GetSchemaString_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.DatabaseService/GetSchemaString", runtime.WithHTTPPathPattern("/v1/{name=projects/*/instances/*/databases/*/schemaString}"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := request_DatabaseService_GetSchemaString_1(annotatedContext, inboundMarshaler, client, req, pathParams)+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_DatabaseService_GetSchemaString_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })return nil}var (pattern_DatabaseService_GetDatabase_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"}, ""))+ pattern_DatabaseService_GetDatabase_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 2, 3, 1, 0, 4, 6, 5, 4}, []string{"v1", "projects", "instances", "databases", "name"}, ""))pattern_DatabaseService_BatchGetDatabases_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2, 2, 3}, []string{"v1", "projects", "parent", "databases"}, "batchGet"))pattern_DatabaseService_BatchGetDatabases_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2, 2, 3}, []string{"v1", "instances", "parent", "databases"}, "batchGet"))+ pattern_DatabaseService_BatchGetDatabases_2 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3, 2, 4}, []string{"v1", "projects", "instances", "parent", "databases"}, "batchGet"))pattern_DatabaseService_ListDatabases_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2, 2, 3}, []string{"v1", "projects", "parent", "databases"}, ""))pattern_DatabaseService_ListDatabases_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2, 2, 3}, []string{"v1", "instances", "parent", "databases"}, ""))pattern_DatabaseService_ListDatabases_2 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2, 2, 3}, []string{"v1", "workspaces", "parent", "databases"}, ""))+ pattern_DatabaseService_ListDatabases_3 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3, 2, 4}, []string{"v1", "projects", "instances", "parent", "databases"}, ""))pattern_DatabaseService_UpdateDatabase_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", "database.name"}, ""))+ pattern_DatabaseService_UpdateDatabase_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 2, 3, 1, 0, 4, 6, 5, 4}, []string{"v1", "projects", "instances", "databases", "database.name"}, ""))pattern_DatabaseService_BatchUpdateDatabases_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2, 2, 3}, []string{"v1", "instances", "parent", "databases"}, "batchUpdate"))+ pattern_DatabaseService_BatchUpdateDatabases_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3, 2, 4}, []string{"v1", "projects", "instances", "parent", "databases"}, "batchUpdate"))pattern_DatabaseService_SyncDatabase_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"}, "sync"))+ pattern_DatabaseService_SyncDatabase_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 2, 3, 1, 0, 4, 6, 5, 4}, []string{"v1", "projects", "instances", "databases", "name"}, "sync"))pattern_DatabaseService_BatchSyncDatabases_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2, 2, 3}, []string{"v1", "instances", "parent", "databases"}, "batchSync"))+ pattern_DatabaseService_BatchSyncDatabases_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3, 2, 4}, []string{"v1", "projects", "instances", "parent", "databases"}, "batchSync"))pattern_DatabaseService_GetDatabaseMetadata_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 2, 3, 4, 5, 5, 4}, []string{"v1", "instances", "databases", "metadata", "name"}, ""))+ pattern_DatabaseService_GetDatabaseMetadata_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 2, 3, 1, 0, 2, 4, 4, 7, 5, 5}, []string{"v1", "projects", "instances", "databases", "metadata", "name"}, ""))pattern_DatabaseService_GetDatabaseSchema_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 2, 3, 4, 5, 5, 4}, []string{"v1", "instances", "databases", "schema", "name"}, ""))+ pattern_DatabaseService_GetDatabaseSchema_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 2, 3, 1, 0, 2, 4, 4, 7, 5, 5}, []string{"v1", "projects", "instances", "databases", "schema", "name"}, ""))pattern_DatabaseService_GetDatabaseSDLSchema_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 2, 3, 4, 5, 5, 4}, []string{"v1", "instances", "databases", "sdlSchema", "name"}, ""))+ pattern_DatabaseService_GetDatabaseSDLSchema_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 2, 3, 1, 0, 2, 4, 4, 7, 5, 5}, []string{"v1", "projects", "instances", "databases", "sdlSchema", "name"}, ""))pattern_DatabaseService_DiffSchema_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"}, "diffSchema"))- pattern_DatabaseService_DiffSchema_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 2, 3, 1, 0, 4, 6, 5, 4}, []string{"v1", "instances", "databases", "changelogs", "name"}, "diffSchema"))+ pattern_DatabaseService_DiffSchema_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 2, 3, 1, 0, 4, 6, 5, 4}, []string{"v1", "projects", "instances", "databases", "name"}, "diffSchema"))+ pattern_DatabaseService_DiffSchema_2 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 2, 3, 1, 0, 4, 6, 5, 4}, []string{"v1", "instances", "databases", "changelogs", "name"}, "diffSchema"))+ pattern_DatabaseService_DiffSchema_3 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 2, 3, 1, 0, 2, 4, 1, 0, 4, 8, 5, 5}, []string{"v1", "projects", "instances", "databases", "changelogs", "name"}, "diffSchema"))pattern_DatabaseService_DiffMetadata_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"}, "diffMetadata"))+ pattern_DatabaseService_DiffMetadata_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 2, 3, 1, 0, 4, 6, 5, 4}, []string{"v1", "projects", "instances", "databases", "name"}, "diffMetadata"))pattern_DatabaseService_GetSchemaString_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 2, 3, 4, 5, 5, 4}, []string{"v1", "instances", "databases", "schemaString", "name"}, ""))+ pattern_DatabaseService_GetSchemaString_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 2, 3, 1, 0, 2, 4, 4, 7, 5, 5}, []string{"v1", "projects", "instances", "databases", "schemaString", "name"}, "")))var (forward_DatabaseService_GetDatabase_0 = runtime.ForwardResponseMessage+ forward_DatabaseService_GetDatabase_1 = runtime.ForwardResponseMessageforward_DatabaseService_BatchGetDatabases_0 = runtime.ForwardResponseMessageforward_DatabaseService_BatchGetDatabases_1 = runtime.ForwardResponseMessage+ forward_DatabaseService_BatchGetDatabases_2 = runtime.ForwardResponseMessageforward_DatabaseService_ListDatabases_0 = runtime.ForwardResponseMessageforward_DatabaseService_ListDatabases_1 = runtime.ForwardResponseMessageforward_DatabaseService_ListDatabases_2 = runtime.ForwardResponseMessage+ forward_DatabaseService_ListDatabases_3 = runtime.ForwardResponseMessageforward_DatabaseService_UpdateDatabase_0 = runtime.ForwardResponseMessage+ forward_DatabaseService_UpdateDatabase_1 = runtime.ForwardResponseMessageforward_DatabaseService_BatchUpdateDatabases_0 = runtime.ForwardResponseMessage+ forward_DatabaseService_BatchUpdateDatabases_1 = runtime.ForwardResponseMessageforward_DatabaseService_SyncDatabase_0 = runtime.ForwardResponseMessage+ forward_DatabaseService_SyncDatabase_1 = runtime.ForwardResponseMessageforward_DatabaseService_BatchSyncDatabases_0 = runtime.ForwardResponseMessage+ forward_DatabaseService_BatchSyncDatabases_1 = runtime.ForwardResponseMessageforward_DatabaseService_GetDatabaseMetadata_0 = runtime.ForwardResponseMessage+ forward_DatabaseService_GetDatabaseMetadata_1 = runtime.ForwardResponseMessageforward_DatabaseService_GetDatabaseSchema_0 = runtime.ForwardResponseMessage+ forward_DatabaseService_GetDatabaseSchema_1 = runtime.ForwardResponseMessageforward_DatabaseService_GetDatabaseSDLSchema_0 = runtime.ForwardResponseMessage+ forward_DatabaseService_GetDatabaseSDLSchema_1 = runtime.ForwardResponseMessageforward_DatabaseService_DiffSchema_0 = runtime.ForwardResponseMessageforward_DatabaseService_DiffSchema_1 = runtime.ForwardResponseMessage+ forward_DatabaseService_DiffSchema_2 = runtime.ForwardResponseMessage+ forward_DatabaseService_DiffSchema_3 = runtime.ForwardResponseMessageforward_DatabaseService_DiffMetadata_0 = runtime.ForwardResponseMessage+ forward_DatabaseService_DiffMetadata_1 = runtime.ForwardResponseMessageforward_DatabaseService_GetSchemaString_0 = runtime.ForwardResponseMessage+ forward_DatabaseService_GetSchemaString_1 = runtime.ForwardResponseMessage)diff --git a/backend/generated-go/v1/instance_role_service.pb.go b/backend/generated-go/v1/instance_role_service.pb.goindex 45f7c161c4..094fc3ebc9 100644--- a/backend/generated-go/v1/instance_role_service.pb.go+++ b/backend/generated-go/v1/instance_role_service.pb.go@@ -25,7 +25,7 @@ const (type ListInstanceRolesRequest struct {state protoimpl.MessageState `protogen:"open.v1"`// The parent, which owns this collection of roles.- // Format: instances/{instance}+ // Format: instances/{instance} or projects/{project}/instances/{instance}Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`// Not used.// The maximum number of roles to return. The service may return fewer than@@ -163,7 +163,7 @@ func (x *ListInstanceRolesResponse) GetNextPageToken() string {type InstanceRole struct {state protoimpl.MessageState `protogen:"open.v1"`// The name of the role.- // Format: instances/{instance}/roles/{role}+ // Format: instances/{instance}/roles/{role} or projects/{project}/instances/{instance}/roles/{role}// The role name is the unique name for the role.Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`// The role name. It's unique within the instance.@@ -268,7 +268,7 @@ const file_v1_instance_role_service_proto_rawDesc = "" +"\arefresh\x18\x04 \x01(\bR\arefresh\"t\n" +"\x19ListInstanceRolesResponse\x12/\n" +"\x05roles\x18\x01 \x03(\v2\x19.bytebase.v1.InstanceRoleR\x05roles\x12&\n" +- "\x0fnext_page_token\x18\x02 \x01(\tR\rnextPageToken\"\xe1\x02\n" ++ "\x0fnext_page_token\x18\x02 \x01(\tR\rnextPageToken\"\x97\x03\n" +"\fInstanceRole\x12\x12\n" +"\x04name\x18\x01 \x01(\tR\x04name\x12\x1b\n" +"\trole_name\x18\x02 \x01(\tR\broleName\x12$\n" +@@ -276,15 +276,15 @@ const file_v1_instance_role_service_proto_rawDesc = "" +"\x10connection_limit\x18\x04 \x01(\x05H\x01R\x0fconnectionLimit\x88\x01\x01\x12$\n" +"\vvalid_until\x18\x05 \x01(\tH\x02R\n" +"validUntil\x88\x01\x01\x12!\n" +- "\tattribute\x18\x06 \x01(\tH\x03R\tattribute\x88\x01\x01:A\xeaA>\n" +- "\x19bytebase.com/InstanceRole\x12!instances/{instance}/roles/{role}B\v\n" ++ "\tattribute\x18\x06 \x01(\tH\x03R\tattribute\x88\x01\x01:w\xeaAt\n" ++ "\x19bytebase.com/InstanceRole\x12!instances/{instance}/roles/{role}\x124projects/{project}/instances/{instance}/roles/{role}B\v\n" +"\t_passwordB\x13\n" +"\x11_connection_limitB\x0e\n" +"\f_valid_untilB\f\n" +"\n" +- "_attribute2\xc8\x01\n" +- "\x13InstanceRoleService\x12\xb0\x01\n" +- "\x11ListInstanceRoles\x12%.bytebase.v1.ListInstanceRolesRequest\x1a&.bytebase.v1.ListInstanceRolesResponse\"L\xdaA\x06parent\x8a\xea0\x15bb.instanceRoles.list\x90\xea0\x01\x82\xd3\xe4\x93\x02 \x12\x1e/v1/{parent=instances/*}/rolesB\xae\x01\n" ++ "_attribute2\xf5\x01\n" ++ "\x13InstanceRoleService\x12\xdd\x01\n" ++ "\x11ListInstanceRoles\x12%.bytebase.v1.ListInstanceRolesRequest\x1a&.bytebase.v1.ListInstanceRolesResponse\"y\xdaA\x06parent\x8a\xea0\x15bb.instanceRoles.list\x90\xea0\x01\x82\xd3\xe4\x93\x02MZ+\x12)/v1/{parent=projects/*/instances/*}/roles\x12\x1e/v1/{parent=instances/*}/rolesB\xae\x01\n" +"\x0fcom.bytebase.v1B\x18InstanceRoleServiceProtoP\x01Z4github.com/bytebase/bytebase/backend/generated-go/v1\xa2\x02\x03BXX\xaa\x02\vBytebase.V1\xca\x02\vBytebase\\V1\xe2\x02\x17Bytebase\\V1\\GPBMetadata\xea\x02\fBytebase::V1b\x06proto3"var (diff --git a/backend/generated-go/v1/instance_role_service.pb.gw.go b/backend/generated-go/v1/instance_role_service.pb.gw.goindex df39108d6c..da033f1132 100644--- a/backend/generated-go/v1/instance_role_service.pb.gw.go+++ b/backend/generated-go/v1/instance_role_service.pb.gw.go@@ -88,6 +88,59 @@ func local_request_InstanceRoleService_ListInstanceRoles_0(ctx context.Context,return msg, metadata, err}+var filter_InstanceRoleService_ListInstanceRoles_1 = &utilities.DoubleArray{Encoding: map[string]int{"parent": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}++func request_InstanceRoleService_ListInstanceRoles_1(ctx context.Context, marshaler runtime.Marshaler, client InstanceRoleServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq ListInstanceRolesRequest+ metadata runtime.ServerMetadata+ err error+ )+ 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)+ }+ if err := req.ParseForm(); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_InstanceRoleService_ListInstanceRoles_1); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ msg, err := client.ListInstanceRoles(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ return msg, metadata, err+}++func local_request_InstanceRoleService_ListInstanceRoles_1(ctx context.Context, marshaler runtime.Marshaler, server InstanceRoleServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq ListInstanceRolesRequest+ metadata runtime.ServerMetadata+ err error+ )+ 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)+ }+ if err := req.ParseForm(); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_InstanceRoleService_ListInstanceRoles_1); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ msg, err := server.ListInstanceRoles(ctx, &protoReq)+ return msg, metadata, err+}+// RegisterInstanceRoleServiceHandlerServer registers the http handlers for service InstanceRoleService to "mux".// UnaryRPC :call InstanceRoleServiceServer directly.// StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906.@@ -114,6 +167,26 @@ func RegisterInstanceRoleServiceHandlerServer(ctx context.Context, mux *runtime.}forward_InstanceRoleService_ListInstanceRoles_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodGet, pattern_InstanceRoleService_ListInstanceRoles_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ var stream runtime.ServerTransportStream+ ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.InstanceRoleService/ListInstanceRoles", runtime.WithHTTPPathPattern("/v1/{parent=projects/*/instances/*}/roles"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := local_request_InstanceRoleService_ListInstanceRoles_1(annotatedContext, inboundMarshaler, server, req, pathParams)+ md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_InstanceRoleService_ListInstanceRoles_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })return nil}@@ -171,13 +244,32 @@ func RegisterInstanceRoleServiceHandlerClient(ctx context.Context, mux *runtime.}forward_InstanceRoleService_ListInstanceRoles_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodGet, pattern_InstanceRoleService_ListInstanceRoles_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.InstanceRoleService/ListInstanceRoles", runtime.WithHTTPPathPattern("/v1/{parent=projects/*/instances/*}/roles"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := request_InstanceRoleService_ListInstanceRoles_1(annotatedContext, inboundMarshaler, client, req, pathParams)+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_InstanceRoleService_ListInstanceRoles_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })return nil}var (pattern_InstanceRoleService_ListInstanceRoles_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2, 2, 3}, []string{"v1", "instances", "parent", "roles"}, ""))+ pattern_InstanceRoleService_ListInstanceRoles_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3, 2, 4}, []string{"v1", "projects", "instances", "parent", "roles"}, "")))var (forward_InstanceRoleService_ListInstanceRoles_0 = runtime.ForwardResponseMessage+ forward_InstanceRoleService_ListInstanceRoles_1 = runtime.ForwardResponseMessage)diff --git a/backend/generated-go/v1/instance_service.pb.go b/backend/generated-go/v1/instance_service.pb.goindex 5c7ff0c56a..b00c33a38f 100644--- a/backend/generated-go/v1/instance_service.pb.go+++ b/backend/generated-go/v1/instance_service.pb.go@@ -464,7 +464,7 @@ func (DataSource_RedisType) EnumDescriptor() ([]byte, []int) {type GetInstanceRequest struct {state protoimpl.MessageState `protogen:"open.v1"`// The name of the instance to retrieve.- // Format: instances/{instance}+ // Format: instances/{instance} or projects/{project}/instances/{instance}Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`unknownFields protoimpl.UnknownFieldssizeCache protoimpl.SizeCache@@ -509,6 +509,11 @@ func (x *GetInstanceRequest) GetName() string {type ListInstancesRequest struct {state protoimpl.MessageState `protogen:"open.v1"`+ // The parent, which owns this collection of instances.+ // Format: projects/{project}. If omitted, only workspace instances are+ // returned. Wildcard project parents are not supported. When set, the+ // `project` filter must be omitted or match this parent.+ Parent *string `protobuf:"bytes,6,opt,name=parent,proto3,oneof" json:"parent,omitempty"`// The maximum number of instances to return. The service may return fewer than// this value.// If unspecified, at most 10 instances will be returned.@@ -599,6 +604,13 @@ func (*ListInstancesRequest) Descriptor() ([]byte, []int) {return file_v1_instance_service_proto_rawDescGZIP(), []int{1}}+func (x *ListInstancesRequest) GetParent() string {+ if x != nil && x.Parent != nil {+ return *x.Parent+ }+ return ""+}+func (x *ListInstancesRequest) GetPageSize() int32 {if x != nil {return x.PageSize@@ -691,6 +703,10 @@ func (x *ListInstancesResponse) GetNextPageToken() string {type CreateInstanceRequest struct {state protoimpl.MessageState `protogen:"open.v1"`+ // The parent, which owns this collection of instances.+ // Format: projects/{project}. If omitted, the instance is created in the+ // workspace collection.+ Parent *string `protobuf:"bytes,5,opt,name=parent,proto3,oneof" json:"parent,omitempty"`// The instance to create.Instance *Instance `protobuf:"bytes,1,opt,name=instance,proto3" json:"instance,omitempty"`// The ID to use for the instance, which will become the final component of@@ -702,7 +718,7 @@ type CreateInstanceRequest struct {// Validate only also tests the data source connection.ValidateOnly bool `protobuf:"varint,3,opt,name=validate_only,json=validateOnly,proto3" json:"validate_only,omitempty"`// The project to assign newly discovered databases to during initial sync.- // Format: projects/{project}+ // Format: projects/{project}. This must be unset when `parent` is set.InitialDatabaseProject string `protobuf:"bytes,4,opt,name=initial_database_project,json=initialDatabaseProject,proto3" json:"initial_database_project,omitempty"`unknownFields protoimpl.UnknownFieldssizeCache protoimpl.SizeCache@@ -738,6 +754,13 @@ func (*CreateInstanceRequest) Descriptor() ([]byte, []int) {return file_v1_instance_service_proto_rawDescGZIP(), []int{3}}+func (x *CreateInstanceRequest) GetParent() string {+ if x != nil && x.Parent != nil {+ return *x.Parent+ }+ return ""+}+func (x *CreateInstanceRequest) GetInstance() *Instance {if x != nil {return x.Instance@@ -771,12 +794,14 @@ type UpdateInstanceRequest struct {// The instance to update.//// The instance's `name` field is used to identify the instance to update.- // Format: instances/{instance}+ // Format: instances/{instance} or projects/{project}/instances/{instance}Instance *Instance `protobuf:"bytes,1,opt,name=instance,proto3" json:"instance,omitempty"`// The list of fields to update.UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`// If set to true, and the instance is not found, a new instance will be created.- // In this situation, `update_mask` is ignored.+ // In this situation, `update_mask` is ignored. A project-nested name creates+ // the instance only under its encoded active, non-default project; it never+ // falls back to a workspace instance.AllowMissing bool `protobuf:"varint,3,opt,name=allow_missing,json=allowMissing,proto3" json:"allow_missing,omitempty"`unknownFields protoimpl.UnknownFieldssizeCache protoimpl.SizeCache@@ -836,9 +861,11 @@ func (x *UpdateInstanceRequest) GetAllowMissing() bool {type DeleteInstanceRequest struct {state protoimpl.MessageState `protogen:"open.v1"`// The name of the instance to delete.- // Format: instances/{instance}+ // Format: instances/{instance} or projects/{project}/instances/{instance}Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`- // If set to true, any databases and sheets from this project will also be moved to default project, and all open issues will be closed.+ // If set to true, a workspace instance's databases are moved to the default+ // project before the instance is soft-deleted. Project instances reject this+ // option because their databases must remain in the owning project.Force bool `protobuf:"varint,2,opt,name=force,proto3" json:"force,omitempty"`// If set to true, permanently purge the soft-deleted instance and all related resources.// This operation is irreversible. Following AIP-165, this should only be used for@@ -903,7 +930,7 @@ func (x *DeleteInstanceRequest) GetPurge() bool {type UndeleteInstanceRequest struct {state protoimpl.MessageState `protogen:"open.v1"`// The name of the deleted instance.- // Format: instances/{instance}+ // Format: instances/{instance} or projects/{project}/instances/{instance}Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`unknownFields protoimpl.UnknownFieldssizeCache protoimpl.SizeCache@@ -949,7 +976,7 @@ func (x *UndeleteInstanceRequest) GetName() string {type SyncInstanceRequest struct {state protoimpl.MessageState `protogen:"open.v1"`// The name of instance.- // Format: instances/{instance}+ // Format: instances/{instance} or projects/{project}/instances/{instance}Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`// When full sync is enabled, all databases in the instance will be synchronized. Otherwise, only// the instance metadata (such as the database list) and any newly discovered databases will be synced.@@ -1005,7 +1032,7 @@ func (x *SyncInstanceRequest) GetEnableFullSync() bool {type ListInstanceDatabaseRequest struct {state protoimpl.MessageState `protogen:"open.v1"`// The name of the instance.- // Format: instances/{instance}+ // Format: instances/{instance} or projects/{project}/instances/{instance}Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`// The target instance. We need to set this field if the target instance is not created yet.Instance *Instance `protobuf:"bytes,2,opt,name=instance,proto3,oneof" json:"instance,omitempty"`@@ -1149,6 +1176,10 @@ func (x *SyncInstanceResponse) GetDatabases() []string {type BatchSyncInstancesRequest struct {state protoimpl.MessageState `protogen:"open.v1"`+ // The parent, which owns this collection of instances.+ // Format: projects/{project}. If omitted, all targets must be workspace+ // instances; otherwise, every target must belong to this project collection.+ Parent *string `protobuf:"bytes,2,opt,name=parent,proto3,oneof" json:"parent,omitempty"`// The request message specifying the instances to sync.// A maximum of 1000 instances can be synced in a batch.Requests []*SyncInstanceRequest `protobuf:"bytes,1,rep,name=requests,proto3" json:"requests,omitempty"`@@ -1186,6 +1217,13 @@ func (*BatchSyncInstancesRequest) Descriptor() ([]byte, []int) {return file_v1_instance_service_proto_rawDescGZIP(), []int{11}}+func (x *BatchSyncInstancesRequest) GetParent() string {+ if x != nil && x.Parent != nil {+ return *x.Parent+ }+ return ""+}+func (x *BatchSyncInstancesRequest) GetRequests() []*SyncInstanceRequest {if x != nil {return x.Requests@@ -1231,6 +1269,10 @@ func (*BatchSyncInstancesResponse) Descriptor() ([]byte, []int) {type BatchUpdateInstancesRequest struct {state protoimpl.MessageState `protogen:"open.v1"`+ // The parent, which owns this collection of instances.+ // Format: projects/{project}. If omitted, all targets must be workspace+ // instances; otherwise, every target must belong to this project collection.+ Parent *string `protobuf:"bytes,2,opt,name=parent,proto3,oneof" json:"parent,omitempty"`// The request message specifying the resources to update.Requests []*UpdateInstanceRequest `protobuf:"bytes,1,rep,name=requests,proto3" json:"requests,omitempty"`unknownFields protoimpl.UnknownFields@@ -1267,6 +1309,13 @@ func (*BatchUpdateInstancesRequest) Descriptor() ([]byte, []int) {return file_v1_instance_service_proto_rawDescGZIP(), []int{13}}+func (x *BatchUpdateInstancesRequest) GetParent() string {+ if x != nil && x.Parent != nil {+ return *x.Parent+ }+ return ""+}+func (x *BatchUpdateInstancesRequest) GetRequests() []*UpdateInstanceRequest {if x != nil {return x.Requests@@ -1321,7 +1370,7 @@ func (x *BatchUpdateInstancesResponse) GetInstances() []*Instance {type AddDataSourceRequest struct {state protoimpl.MessageState `protogen:"open.v1"`// The name of the instance to add a data source to.- // Format: instances/{instance}+ // Format: instances/{instance} or projects/{project}/instances/{instance}Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`// Identified by data source ID.// Only READ_ONLY data source can be added.@@ -1386,7 +1435,7 @@ func (x *AddDataSourceRequest) GetValidateOnly() bool {type RemoveDataSourceRequest struct {state protoimpl.MessageState `protogen:"open.v1"`// The name of the instance to remove a data source from.- // Format: instances/{instance}+ // Format: instances/{instance} or projects/{project}/instances/{instance}Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`// Identified by data source ID.// Only READ_ONLY data source can be removed.@@ -1442,7 +1491,7 @@ func (x *RemoveDataSourceRequest) GetDataSource() *DataSource {type UpdateDataSourceRequest struct {state protoimpl.MessageState `protogen:"open.v1"`// The name of the instance to update a data source.- // Format: instances/{instance}+ // Format: instances/{instance} or projects/{project}/instances/{instance}Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`// Identified by data source ID.DataSource *DataSource `protobuf:"bytes,2,opt,name=data_source,json=dataSource,proto3" json:"data_source,omitempty"`@@ -1569,7 +1618,7 @@ func (x *SyncDatabases) GetDatabases() []string {type Instance struct {state protoimpl.MessageState `protogen:"open.v1"`// The name of the instance.- // Format: instances/{instance}+ // Format: instances/{instance} or projects/{project}/instances/{instance}Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`// The lifecycle state of the instance.State State `protobuf:"varint,3,opt,name=state,proto3,enum=bytebase.v1.State" json:"state,omitempty"`@@ -2482,7 +2531,7 @@ type InstanceResource struct {// Whether the instance is activated.Activation bool `protobuf:"varint,5,opt,name=activation,proto3" json:"activation,omitempty"`// The name of the instance.- // Format: instances/{instance}+ // Format: instances/{instance} or projects/{project}/instances/{instance}Name string `protobuf:"bytes,6,opt,name=name,proto3" json:"name,omitempty"`// The environment resource.// Format: environments/prod where prod is the environment resource ID.@@ -3051,23 +3100,27 @@ const file_v1_instance_service_proto_rawDesc = "" +"\x19v1/instance_service.proto\x12\vbytebase.v1\x1a\x1bbuf/validate/validate.proto\x1a\x1cgoogle/api/annotations.proto\x1a\x17google/api/client.proto\x1a\x1fgoogle/api/field_behavior.proto\x1a\x19google/api/resource.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a google/protobuf/field_mask.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x13v1/annotation.proto\x1a\x0fv1/common.proto\x1a\x1ev1/instance_role_service.proto\"G\n" +"\x12GetInstanceRequest\x121\n" +"\x04name\x18\x01 \x01(\tB\x1d\xe0A\x02\xfaA\x17\n" +- "\x15bytebase.com/InstanceR\x04name\"\xa8\x01\n" +- "\x14ListInstancesRequest\x12\x1b\n" ++ "\x15bytebase.com/InstanceR\x04name\"\xec\x01\n" ++ "\x14ListInstancesRequest\x127\n" ++ "\x06parent\x18\x06 \x01(\tB\x1a\xfaA\x17\x12\x15bytebase.com/InstanceH\x00R\x06parent\x88\x01\x01\x12\x1b\n" +"\tpage_size\x18\x01 \x01(\x05R\bpageSize\x12\x1d\n" +"\n" +"page_token\x18\x02 \x01(\tR\tpageToken\x12!\n" +"\fshow_deleted\x18\x03 \x01(\bR\vshowDeleted\x12\x16\n" +"\x06filter\x18\x04 \x01(\tR\x06filter\x12\x19\n" +- "\border_by\x18\x05 \x01(\tR\aorderBy\"t\n" ++ "\border_by\x18\x05 \x01(\tR\aorderByB\t\n" ++ "\a_parent\"t\n" +"\x15ListInstancesResponse\x123\n" +"\tinstances\x18\x01 \x03(\v2\x15.bytebase.v1.InstanceR\tinstances\x12&\n" +- "\x0fnext_page_token\x18\x02 \x01(\tR\rnextPageToken\"\xcf\x01\n" +- "\x15CreateInstanceRequest\x126\n" ++ "\x0fnext_page_token\x18\x02 \x01(\tR\rnextPageToken\"\x93\x02\n" ++ "\x15CreateInstanceRequest\x127\n" ++ "\x06parent\x18\x05 \x01(\tB\x1a\xfaA\x17\x12\x15bytebase.com/InstanceH\x00R\x06parent\x88\x01\x01\x126\n" +"\binstance\x18\x01 \x01(\v2\x15.bytebase.v1.InstanceB\x03\xe0A\x02R\binstance\x12\x1f\n" +"\vinstance_id\x18\x02 \x01(\tR\n" +"instanceId\x12#\n" +"\rvalidate_only\x18\x03 \x01(\bR\fvalidateOnly\x128\n" +- "\x18initial_database_project\x18\x04 \x01(\tR\x16initialDatabaseProject\"\xb1\x01\n" ++ "\x18initial_database_project\x18\x04 \x01(\tR\x16initialDatabaseProjectB\t\n" ++ "\a_parent\"\xb1\x01\n" +"\x15UpdateInstanceRequest\x126\n" +"\binstance\x18\x01 \x01(\v2\x15.bytebase.v1.InstanceB\x03\xe0A\x02R\binstance\x12;\n" +"\vupdate_mask\x18\x02 \x01(\v2\x1a.google.protobuf.FieldMaskR\n" +@@ -3093,12 +3146,16 @@ const file_v1_instance_service_proto_rawDesc = "" +"\x1cListInstanceDatabaseResponse\x12\x1c\n" +"\tdatabases\x18\x01 \x03(\tR\tdatabases\"4\n" +"\x14SyncInstanceResponse\x12\x1c\n" +- "\tdatabases\x18\x01 \x03(\tR\tdatabases\"^\n" +- "\x19BatchSyncInstancesRequest\x12A\n" +- "\brequests\x18\x01 \x03(\v2 .bytebase.v1.SyncInstanceRequestB\x03\xe0A\x02R\brequests\"\x1c\n" +- "\x1aBatchSyncInstancesResponse\"b\n" +- "\x1bBatchUpdateInstancesRequest\x12C\n" +- "\brequests\x18\x01 \x03(\v2\".bytebase.v1.UpdateInstanceRequestB\x03\xe0A\x02R\brequests\"S\n" ++ "\tdatabases\x18\x01 \x03(\tR\tdatabases\"\xa2\x01\n" ++ "\x19BatchSyncInstancesRequest\x127\n" ++ "\x06parent\x18\x02 \x01(\tB\x1a\xfaA\x17\x12\x15bytebase.com/InstanceH\x00R\x06parent\x88\x01\x01\x12A\n" ++ "\brequests\x18\x01 \x03(\v2 .bytebase.v1.SyncInstanceRequestB\x03\xe0A\x02R\brequestsB\t\n" ++ "\a_parent\"\x1c\n" ++ "\x1aBatchSyncInstancesResponse\"\xa6\x01\n" ++ "\x1bBatchUpdateInstancesRequest\x127\n" ++ "\x06parent\x18\x02 \x01(\tB\x1a\xfaA\x17\x12\x15bytebase.com/InstanceH\x00R\x06parent\x88\x01\x01\x12C\n" ++ "\brequests\x18\x01 \x03(\v2\".bytebase.v1.UpdateInstanceRequestB\x03\xe0A\x02R\brequestsB\t\n" ++ "\a_parent\"S\n" +"\x1cBatchUpdateInstancesResponse\x123\n" +"\tinstances\x18\x01 \x03(\v2\x15.bytebase.v1.InstanceR\tinstances\"\xad\x01\n" +"\x14AddDataSourceRequest\x121\n" +@@ -3122,7 +3179,7 @@ const file_v1_instance_service_proto_rawDesc = "" +"\rvalidate_only\x18\x04 \x01(\bR\fvalidateOnly\x12#\n" +"\rallow_missing\x18\x05 \x01(\bR\fallowMissing\"-\n" +"\rSyncDatabases\x12\x1c\n" +- "\tdatabases\x18\x01 \x03(\tR\tdatabases\"\xa6\x06\n" ++ "\tdatabases\x18\x01 \x03(\tR\tdatabases\"\xcf\x06\n" +"\bInstance\x12\x12\n" +"\x04name\x18\x01 \x01(\tR\x04name\x12(\n" +"\x05state\x18\x03 \x01(\x0e2\x12.bytebase.v1.StateR\x05state\x12\x1e\n" +@@ -3143,8 +3200,8 @@ const file_v1_instance_service_proto_rawDesc = "" +"\x06labels\x18\x10 \x03(\v2!.bytebase.v1.Instance.LabelsEntryR\x06labels\x1a9\n" +"\vLabelsEntry\x12\x10\n" +"\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" +- "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01:0\xeaA-\n" +- "\x15bytebase.com/Instance\x12\x14instances/{instance}B\x0e\n" ++ "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01:Y\xeaAV\n" ++ "\x15bytebase.com/Instance\x12\x14instances/{instance}\x12'projects/{project}/instances/{instance}B\x0e\n" +"\f_environment\"\xf2\t\n" +"\x18DataSourceExternalSecret\x12Q\n" +"\vsecret_type\x18\x01 \x01(\x0e20.bytebase.v1.DataSourceExternalSecret.SecretTypeR\n" +@@ -3323,21 +3380,21 @@ const file_v1_instance_service_proto_rawDesc = "" +"\x0eDataSourceType\x12\x1b\n" +"\x17DATA_SOURCE_UNSPECIFIED\x10\x00\x12\t\n" +"\x05ADMIN\x10\x01\x12\r\n" +- "\tREAD_ONLY\x10\x022\xd4\x10\n" +- "\x0fInstanceService\x12\x84\x01\n" +- "\vGetInstance\x12\x1f.bytebase.v1.GetInstanceRequest\x1a\x15.bytebase.v1.Instance\"=\xdaA\x04name\x8a\xea0\x10bb.instances.get\x90\xea0\x01\x82\xd3\xe4\x93\x02\x18\x12\x16/v1/{name=instances/*}\x12\x89\x01\n" +- "\rListInstances\x12!.bytebase.v1.ListInstancesRequest\x1a\".bytebase.v1.ListInstancesResponse\"1\xdaA\x00\x8a\xea0\x11bb.instances.list\x90\xea0\x01\x82\xd3\xe4\x93\x02\x0f\x12\r/v1/instances\x12\x96\x01\n" +- "\x0eCreateInstance\x12\".bytebase.v1.CreateInstanceRequest\x1a\x15.bytebase.v1.Instance\"I\xdaA\binstance\x8a\xea0\x13bb.instances.create\x90\xea0\x01\x98\xea0\x01\x82\xd3\xe4\x93\x02\x19:\binstance\"\r/v1/instances\x12\xb4\x01\n" +- "\x0eUpdateInstance\x12\".bytebase.v1.UpdateInstanceRequest\x1a\x15.bytebase.v1.Instance\"g\xdaA\x14instance,update_mask\x8a\xea0\x13bb.instances.update\x90\xea0\x01\x98\xea0\x01\x82\xd3\xe4\x93\x02+:\binstance2\x1f/v1/{instance.name=instances/*}\x12\x92\x01\n" +- "\x0eDeleteInstance\x12\".bytebase.v1.DeleteInstanceRequest\x1a\x16.google.protobuf.Empty\"D\xdaA\x04name\x8a\xea0\x13bb.instances.delete\x90\xea0\x01\x98\xea0\x01\x82\xd3\xe4\x93\x02\x18*\x16/v1/{name=instances/*}\x12\x9c\x01\n" +- "\x10UndeleteInstance\x12$.bytebase.v1.UndeleteInstanceRequest\x1a\x15.bytebase.v1.Instance\"K\x8a\xea0\x15bb.instances.undelete\x90\xea0\x01\x98\xea0\x01\x82\xd3\xe4\x93\x02$:\x01*\"\x1f/v1/{name=instances/*}:undelete\x12\x94\x01\n" +- "\fSyncInstance\x12 .bytebase.v1.SyncInstanceRequest\x1a!.bytebase.v1.SyncInstanceResponse\"?\x8a\xea0\x11bb.instances.sync\x90\xea0\x01\x82\xd3\xe4\x93\x02 :\x01*\"\x1b/v1/{name=instances/*}:sync\x12\xb0\x01\n" +- "\x14ListInstanceDatabase\x12(.bytebase.v1.ListInstanceDatabaseRequest\x1a).bytebase.v1.ListInstanceDatabaseResponse\"C\x8a\xea0\x10bb.instances.get\x90\xea0\x01\x82\xd3\xe4\x93\x02%:\x01*\" /v1/{name=instances/*}:databases\x12\xa2\x01\n" +- "\x12BatchSyncInstances\x12&.bytebase.v1.BatchSyncInstancesRequest\x1a'.bytebase.v1.BatchSyncInstancesResponse\";\x8a\xea0\x11bb.instances.sync\x90\xea0\x01\x82\xd3\xe4\x93\x02\x1c:\x01*\"\x17/v1/instances:batchSync\x12\xb0\x01\n" +- "\x14BatchUpdateInstances\x12(.bytebase.v1.BatchUpdateInstancesRequest\x1a).bytebase.v1.BatchUpdateInstancesResponse\"C\x8a\xea0\x13bb.instances.update\x90\xea0\x01\x98\xea0\x01\x82\xd3\xe4\x93\x02\x1e:\x01*\"\x19/v1/instances:batchUpdate\x12\x99\x01\n" +- "\rAddDataSource\x12!.bytebase.v1.AddDataSourceRequest\x1a\x15.bytebase.v1.Instance\"N\x8a\xea0\x13bb.instances.update\x90\xea0\x01\x98\xea0\x01\x82\xd3\xe4\x93\x02):\x01*\"$/v1/{name=instances/*}:addDataSource\x12\xa2\x01\n" +- "\x10RemoveDataSource\x12$.bytebase.v1.RemoveDataSourceRequest\x1a\x15.bytebase.v1.Instance\"Q\x8a\xea0\x13bb.instances.update\x90\xea0\x01\x98\xea0\x01\x82\xd3\xe4\x93\x02,:\x01*\"'/v1/{name=instances/*}:removeDataSource\x12\xc6\x01\n" +- "\x10UpdateDataSource\x12$.bytebase.v1.UpdateDataSourceRequest\x1a\x15.bytebase.v1.Instance\"u\xdaA\x17data_source,update_mask\x8a\xea0\x13bb.instances.update\x90\xea0\x01\x98\xea0\x01\x82\xd3\xe4\x93\x026:\vdata_source2'/v1/{name=instances/*}:updateDataSourceB\xaa\x01\n" ++ "\tREAD_ONLY\x10\x022\xd6\x15\n" ++ "\x0fInstanceService\x12\xa9\x01\n" ++ "\vGetInstance\x12\x1f.bytebase.v1.GetInstanceRequest\x1a\x15.bytebase.v1.Instance\"b\xdaA\x04name\x8a\xea0\x10bb.instances.get\x90\xea0\x01\x82\xd3\xe4\x93\x02=Z#\x12!/v1/{name=projects/*/instances/*}\x12\x16/v1/{name=instances/*}\x12\xae\x01\n" ++ "\rListInstances\x12!.bytebase.v1.ListInstancesRequest\x1a\".bytebase.v1.ListInstancesResponse\"V\xdaA\x00\x8a\xea0\x11bb.instances.list\x90\xea0\x01\x82\xd3\xe4\x93\x024Z#\x12!/v1/{parent=projects/*}/instances\x12\r/v1/instances\x12\xc5\x01\n" ++ "\x0eCreateInstance\x12\".bytebase.v1.CreateInstanceRequest\x1a\x15.bytebase.v1.Instance\"x\xdaA\binstance\x8a\xea0\x13bb.instances.create\x90\xea0\x01\x98\xea0\x01\x82\xd3\xe4\x93\x02H:\binstanceZ-:\binstance\"!/v1/{parent=projects/*}/instances\"\r/v1/instances\x12\xed\x01\n" ++ "\x0eUpdateInstance\x12\".bytebase.v1.UpdateInstanceRequest\x1a\x15.bytebase.v1.Instance\"\x9f\x01\xdaA\x14instance,update_mask\x8a\xea0\x13bb.instances.update\x90\xea0\x01\x98\xea0\x01\x82\xd3\xe4\x93\x02c:\binstanceZ6:\binstance2*/v1/{instance.name=projects/*/instances/*}2\x1f/v1/{instance.name=instances/*}\x12\xb7\x01\n" ++ "\x0eDeleteInstance\x12\".bytebase.v1.DeleteInstanceRequest\x1a\x16.google.protobuf.Empty\"i\xdaA\x04name\x8a\xea0\x13bb.instances.delete\x90\xea0\x01\x98\xea0\x01\x82\xd3\xe4\x93\x02=Z#*!/v1/{name=projects/*/instances/*}*\x16/v1/{name=instances/*}\x12\xcd\x01\n" ++ "\x10UndeleteInstance\x12$.bytebase.v1.UndeleteInstanceRequest\x1a\x15.bytebase.v1.Instance\"|\x8a\xea0\x15bb.instances.undelete\x90\xea0\x01\x98\xea0\x01\x82\xd3\xe4\x93\x02U:\x01*Z/:\x01*\"*/v1/{name=projects/*/instances/*}:undelete\"\x1f/v1/{name=instances/*}:undelete\x12\xc1\x01\n" ++ "\fSyncInstance\x12 .bytebase.v1.SyncInstanceRequest\x1a!.bytebase.v1.SyncInstanceResponse\"l\x8a\xea0\x11bb.instances.sync\x90\xea0\x01\x82\xd3\xe4\x93\x02M:\x01*Z+:\x01*\"&/v1/{name=projects/*/instances/*}:sync\"\x1b/v1/{name=instances/*}:sync\x12\xe2\x01\n" ++ "\x14ListInstanceDatabase\x12(.bytebase.v1.ListInstanceDatabaseRequest\x1a).bytebase.v1.ListInstanceDatabaseResponse\"u\x8a\xea0\x10bb.instances.get\x90\xea0\x01\x82\xd3\xe4\x93\x02W:\x01*Z0:\x01*\"+/v1/{name=projects/*/instances/*}:databases\" /v1/{name=instances/*}:databases\x12\xd4\x01\n" ++ "\x12BatchSyncInstances\x12&.bytebase.v1.BatchSyncInstancesRequest\x1a'.bytebase.v1.BatchSyncInstancesResponse\"m\x8a\xea0\x11bb.instances.sync\x90\xea0\x01\x82\xd3\xe4\x93\x02N:\x01*Z0:\x01*\"+/v1/{parent=projects/*}/instances:batchSync\"\x17/v1/instances:batchSync\x12\xe4\x01\n" ++ "\x14BatchUpdateInstances\x12(.bytebase.v1.BatchUpdateInstancesRequest\x1a).bytebase.v1.BatchUpdateInstancesResponse\"w\x8a\xea0\x13bb.instances.update\x90\xea0\x01\x98\xea0\x01\x82\xd3\xe4\x93\x02R:\x01*Z2:\x01*\"-/v1/{parent=projects/*}/instances:batchUpdate\"\x19/v1/instances:batchUpdate\x12\xd0\x01\n" ++ "\rAddDataSource\x12!.bytebase.v1.AddDataSourceRequest\x1a\x15.bytebase.v1.Instance\"\x84\x01\x8a\xea0\x13bb.instances.update\x90\xea0\x01\x98\xea0\x01\x82\xd3\xe4\x93\x02_:\x01*Z4:\x01*\"//v1/{name=projects/*/instances/*}:addDataSource\"$/v1/{name=instances/*}:addDataSource\x12\xdc\x01\n" ++ "\x10RemoveDataSource\x12$.bytebase.v1.RemoveDataSourceRequest\x1a\x15.bytebase.v1.Instance\"\x8a\x01\x8a\xea0\x13bb.instances.update\x90\xea0\x01\x98\xea0\x01\x82\xd3\xe4\x93\x02e:\x01*Z7:\x01*\"2/v1/{name=projects/*/instances/*}:removeDataSource\"'/v1/{name=instances/*}:removeDataSource\x12\x8a\x02\n" ++ "\x10UpdateDataSource\x12$.bytebase.v1.UpdateDataSourceRequest\x1a\x15.bytebase.v1.Instance\"\xb8\x01\xdaA\x17data_source,update_mask\x8a\xea0\x13bb.instances.update\x90\xea0\x01\x98\xea0\x01\x82\xd3\xe4\x93\x02y:\vdata_sourceZA:\vdata_source22/v1/{name=projects/*/instances/*}:updateDataSource2'/v1/{name=instances/*}:updateDataSourceB\xaa\x01\n" +"\x0fcom.bytebase.v1B\x14InstanceServiceProtoP\x01Z4github.com/bytebase/bytebase/backend/generated-go/v1\xa2\x02\x03BXX\xaa\x02\vBytebase.V1\xca\x02\vBytebase\\V1\xe2\x02\x17Bytebase\\V1\\GPBMetadata\xea\x02\fBytebase::V1b\x06proto3"var (@@ -3484,7 +3541,11 @@ func file_v1_instance_service_proto_init() {file_v1_annotation_proto_init()file_v1_common_proto_init()file_v1_instance_role_service_proto_init()+ file_v1_instance_service_proto_msgTypes[1].OneofWrappers = []any{}+ file_v1_instance_service_proto_msgTypes[3].OneofWrappers = []any{}file_v1_instance_service_proto_msgTypes[8].OneofWrappers = []any{}+ file_v1_instance_service_proto_msgTypes[11].OneofWrappers = []any{}+ file_v1_instance_service_proto_msgTypes[13].OneofWrappers = []any{}file_v1_instance_service_proto_msgTypes[19].OneofWrappers = []any{}file_v1_instance_service_proto_msgTypes[20].OneofWrappers = []any{(*DataSourceExternalSecret_AppRole)(nil),diff --git a/backend/generated-go/v1/instance_service.pb.gw.go b/backend/generated-go/v1/instance_service.pb.gw.goindex c0c210a63d..65580827a9 100644--- a/backend/generated-go/v1/instance_service.pb.gw.go+++ b/backend/generated-go/v1/instance_service.pb.gw.go@@ -74,6 +74,45 @@ func local_request_InstanceService_GetInstance_0(ctx context.Context, marshalerreturn msg, metadata, err}+func request_InstanceService_GetInstance_1(ctx context.Context, marshaler runtime.Marshaler, client InstanceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq GetInstanceRequest+ metadata runtime.ServerMetadata+ err error+ )+ if req.Body != nil {+ _, _ = io.Copy(io.Discard, req.Body)+ }+ val, ok := pathParams["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ msg, err := client.GetInstance(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ return msg, metadata, err+}++func local_request_InstanceService_GetInstance_1(ctx context.Context, marshaler runtime.Marshaler, server InstanceServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq GetInstanceRequest+ metadata runtime.ServerMetadata+ err error+ )+ val, ok := pathParams["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ msg, err := server.GetInstance(ctx, &protoReq)+ return msg, metadata, err+}+var filter_InstanceService_ListInstances_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}func request_InstanceService_ListInstances_0(ctx context.Context, marshaler runtime.Marshaler, client InstanceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {@@ -109,6 +148,59 @@ func local_request_InstanceService_ListInstances_0(ctx context.Context, marshalereturn msg, metadata, err}+var filter_InstanceService_ListInstances_1 = &utilities.DoubleArray{Encoding: map[string]int{"parent": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}++func request_InstanceService_ListInstances_1(ctx context.Context, marshaler runtime.Marshaler, client InstanceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq ListInstancesRequest+ metadata runtime.ServerMetadata+ err error+ )+ 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.StringP(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "parent", err)+ }+ if err := req.ParseForm(); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_InstanceService_ListInstances_1); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ msg, err := client.ListInstances(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ return msg, metadata, err+}++func local_request_InstanceService_ListInstances_1(ctx context.Context, marshaler runtime.Marshaler, server InstanceServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq ListInstancesRequest+ metadata runtime.ServerMetadata+ err error+ )+ val, ok := pathParams["parent"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "parent")+ }+ protoReq.Parent, err = runtime.StringP(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "parent", err)+ }+ if err := req.ParseForm(); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_InstanceService_ListInstances_1); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ msg, err := server.ListInstances(ctx, &protoReq)+ return msg, metadata, err+}+var filter_InstanceService_CreateInstance_0 = &utilities.DoubleArray{Encoding: map[string]int{"instance": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}func request_InstanceService_CreateInstance_0(ctx context.Context, marshaler runtime.Marshaler, client InstanceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {@@ -150,6 +242,65 @@ func local_request_InstanceService_CreateInstance_0(ctx context.Context, marshalreturn msg, metadata, err}+var filter_InstanceService_CreateInstance_1 = &utilities.DoubleArray{Encoding: map[string]int{"instance": 0, "parent": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}}++func request_InstanceService_CreateInstance_1(ctx context.Context, marshaler runtime.Marshaler, client InstanceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq CreateInstanceRequest+ metadata runtime.ServerMetadata+ err error+ )+ if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Instance); err != nil && !errors.Is(err, io.EOF) {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ 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.StringP(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "parent", err)+ }+ if err := req.ParseForm(); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_InstanceService_CreateInstance_1); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ msg, err := client.CreateInstance(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ return msg, metadata, err+}++func local_request_InstanceService_CreateInstance_1(ctx context.Context, marshaler runtime.Marshaler, server InstanceServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq CreateInstanceRequest+ metadata runtime.ServerMetadata+ err error+ )+ if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Instance); 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.StringP(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "parent", err)+ }+ if err := req.ParseForm(); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_InstanceService_CreateInstance_1); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ msg, err := server.CreateInstance(ctx, &protoReq)+ return msg, metadata, err+}+var filter_InstanceService_UpdateInstance_0 = &utilities.DoubleArray{Encoding: map[string]int{"instance": 0, "name": 1}, Base: []int{1, 2, 1, 0, 0}, Check: []int{0, 1, 2, 3, 2}}func request_InstanceService_UpdateInstance_0(ctx context.Context, marshaler runtime.Marshaler, client InstanceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {@@ -231,6 +382,87 @@ func local_request_InstanceService_UpdateInstance_0(ctx context.Context, marshalreturn msg, metadata, err}+var filter_InstanceService_UpdateInstance_1 = &utilities.DoubleArray{Encoding: map[string]int{"instance": 0, "name": 1}, Base: []int{1, 2, 1, 0, 0}, Check: []int{0, 1, 2, 3, 2}}++func request_InstanceService_UpdateInstance_1(ctx context.Context, marshaler runtime.Marshaler, client InstanceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq UpdateInstanceRequest+ metadata runtime.ServerMetadata+ err error+ )+ newReader, berr := utilities.IOReaderFactory(req.Body)+ if berr != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr)+ }+ if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Instance); err != nil && !errors.Is(err, io.EOF) {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if req.Body != nil {+ _, _ = io.Copy(io.Discard, req.Body)+ }+ if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 {+ if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Instance); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ } else {+ protoReq.UpdateMask = fieldMask+ }+ }+ val, ok := pathParams["instance.name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "instance.name")+ }+ err = runtime.PopulateFieldFromPath(&protoReq, "instance.name", val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "instance.name", err)+ }+ if err := req.ParseForm(); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_InstanceService_UpdateInstance_1); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ msg, err := client.UpdateInstance(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ return msg, metadata, err+}++func local_request_InstanceService_UpdateInstance_1(ctx context.Context, marshaler runtime.Marshaler, server InstanceServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq UpdateInstanceRequest+ metadata runtime.ServerMetadata+ err error+ )+ newReader, berr := utilities.IOReaderFactory(req.Body)+ if berr != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr)+ }+ if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Instance); err != nil && !errors.Is(err, io.EOF) {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 {+ if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Instance); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ } else {+ protoReq.UpdateMask = fieldMask+ }+ }+ val, ok := pathParams["instance.name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "instance.name")+ }+ err = runtime.PopulateFieldFromPath(&protoReq, "instance.name", val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "instance.name", err)+ }+ if err := req.ParseForm(); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_InstanceService_UpdateInstance_1); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ msg, err := server.UpdateInstance(ctx, &protoReq)+ return msg, metadata, err+}+var filter_InstanceService_DeleteInstance_0 = &utilities.DoubleArray{Encoding: map[string]int{"name": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}func request_InstanceService_DeleteInstance_0(ctx context.Context, marshaler runtime.Marshaler, client InstanceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {@@ -284,15 +516,14 @@ func local_request_InstanceService_DeleteInstance_0(ctx context.Context, marshalreturn msg, metadata, err}-func request_InstanceService_UndeleteInstance_0(ctx context.Context, marshaler runtime.Marshaler, client InstanceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+var filter_InstanceService_DeleteInstance_1 = &utilities.DoubleArray{Encoding: map[string]int{"name": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}++func request_InstanceService_DeleteInstance_1(ctx context.Context, marshaler runtime.Marshaler, client InstanceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq UndeleteInstanceRequest+ protoReq DeleteInstanceRequestmetadata runtime.ServerMetadataerr 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)- }if req.Body != nil {_, _ = io.Copy(io.Discard, req.Body)}@@ -304,19 +535,22 @@ func request_InstanceService_UndeleteInstance_0(ctx context.Context, marshaler rif err != nil {return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)}- msg, err := client.UndeleteInstance(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ if err := req.ParseForm(); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_InstanceService_DeleteInstance_1); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ msg, err := client.DeleteInstance(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))return msg, metadata, err}-func local_request_InstanceService_UndeleteInstance_0(ctx context.Context, marshaler runtime.Marshaler, server InstanceServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+func local_request_InstanceService_DeleteInstance_1(ctx context.Context, marshaler runtime.Marshaler, server InstanceServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq UndeleteInstanceRequest+ protoReq DeleteInstanceRequestmetadata runtime.ServerMetadataerr 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["name"]if !ok {return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")@@ -325,13 +559,19 @@ func local_request_InstanceService_UndeleteInstance_0(ctx context.Context, marshif err != nil {return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)}- msg, err := server.UndeleteInstance(ctx, &protoReq)+ if err := req.ParseForm(); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_InstanceService_DeleteInstance_1); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ msg, err := server.DeleteInstance(ctx, &protoReq)return msg, metadata, err}-func request_InstanceService_SyncInstance_0(ctx context.Context, marshaler runtime.Marshaler, client InstanceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+func request_InstanceService_UndeleteInstance_0(ctx context.Context, marshaler runtime.Marshaler, client InstanceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq SyncInstanceRequest+ protoReq UndeleteInstanceRequestmetadata runtime.ServerMetadataerr error)@@ -349,13 +589,13 @@ func request_InstanceService_SyncInstance_0(ctx context.Context, marshaler runtiif err != nil {return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)}- msg, err := client.SyncInstance(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ msg, err := client.UndeleteInstance(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))return msg, metadata, err}-func local_request_InstanceService_SyncInstance_0(ctx context.Context, marshaler runtime.Marshaler, server InstanceServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+func local_request_InstanceService_UndeleteInstance_0(ctx context.Context, marshaler runtime.Marshaler, server InstanceServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq SyncInstanceRequest+ protoReq UndeleteInstanceRequestmetadata runtime.ServerMetadataerr error)@@ -370,13 +610,13 @@ func local_request_InstanceService_SyncInstance_0(ctx context.Context, marshalerif err != nil {return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)}- msg, err := server.SyncInstance(ctx, &protoReq)+ msg, err := server.UndeleteInstance(ctx, &protoReq)return msg, metadata, err}-func request_InstanceService_ListInstanceDatabase_0(ctx context.Context, marshaler runtime.Marshaler, client InstanceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+func request_InstanceService_UndeleteInstance_1(ctx context.Context, marshaler runtime.Marshaler, client InstanceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq ListInstanceDatabaseRequest+ protoReq UndeleteInstanceRequestmetadata runtime.ServerMetadataerr error)@@ -394,13 +634,13 @@ func request_InstanceService_ListInstanceDatabase_0(ctx context.Context, marshalif err != nil {return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)}- msg, err := client.ListInstanceDatabase(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ msg, err := client.UndeleteInstance(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))return msg, metadata, err}-func local_request_InstanceService_ListInstanceDatabase_0(ctx context.Context, marshaler runtime.Marshaler, server InstanceServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+func local_request_InstanceService_UndeleteInstance_1(ctx context.Context, marshaler runtime.Marshaler, server InstanceServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq ListInstanceDatabaseRequest+ protoReq UndeleteInstanceRequestmetadata runtime.ServerMetadataerr error)@@ -415,14 +655,15 @@ func local_request_InstanceService_ListInstanceDatabase_0(ctx context.Context, mif err != nil {return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)}- msg, err := server.ListInstanceDatabase(ctx, &protoReq)+ msg, err := server.UndeleteInstance(ctx, &protoReq)return msg, metadata, err}-func request_InstanceService_BatchSyncInstances_0(ctx context.Context, marshaler runtime.Marshaler, client InstanceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+func request_InstanceService_SyncInstance_0(ctx context.Context, marshaler runtime.Marshaler, client InstanceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq BatchSyncInstancesRequest+ protoReq SyncInstanceRequestmetadata 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)@@ -430,26 +671,44 @@ func request_InstanceService_BatchSyncInstances_0(ctx context.Context, marshalerif req.Body != nil {_, _ = io.Copy(io.Discard, req.Body)}- msg, err := client.BatchSyncInstances(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))- return msg, metadata, err-}+ val, ok := pathParams["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ msg, err := client.SyncInstance(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ return msg, metadata, err+}-func local_request_InstanceService_BatchSyncInstances_0(ctx context.Context, marshaler runtime.Marshaler, server InstanceServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+func local_request_InstanceService_SyncInstance_0(ctx context.Context, marshaler runtime.Marshaler, server InstanceServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq BatchSyncInstancesRequest+ protoReq SyncInstanceRequestmetadata 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)}- msg, err := server.BatchSyncInstances(ctx, &protoReq)+ val, ok := pathParams["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ msg, err := server.SyncInstance(ctx, &protoReq)return msg, metadata, err}-func request_InstanceService_BatchUpdateInstances_0(ctx context.Context, marshaler runtime.Marshaler, client InstanceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+func request_InstanceService_SyncInstance_1(ctx context.Context, marshaler runtime.Marshaler, client InstanceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq BatchUpdateInstancesRequest+ protoReq SyncInstanceRequestmetadata 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)@@ -457,25 +716,42 @@ func request_InstanceService_BatchUpdateInstances_0(ctx context.Context, marshalif req.Body != nil {_, _ = io.Copy(io.Discard, req.Body)}- msg, err := client.BatchUpdateInstances(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ val, ok := pathParams["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ msg, err := client.SyncInstance(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))return msg, metadata, err}-func local_request_InstanceService_BatchUpdateInstances_0(ctx context.Context, marshaler runtime.Marshaler, server InstanceServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+func local_request_InstanceService_SyncInstance_1(ctx context.Context, marshaler runtime.Marshaler, server InstanceServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq BatchUpdateInstancesRequest+ protoReq SyncInstanceRequestmetadata 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)}- msg, err := server.BatchUpdateInstances(ctx, &protoReq)+ val, ok := pathParams["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ msg, err := server.SyncInstance(ctx, &protoReq)return msg, metadata, err}-func request_InstanceService_AddDataSource_0(ctx context.Context, marshaler runtime.Marshaler, client InstanceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+func request_InstanceService_ListInstanceDatabase_0(ctx context.Context, marshaler runtime.Marshaler, client InstanceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq AddDataSourceRequest+ protoReq ListInstanceDatabaseRequestmetadata runtime.ServerMetadataerr error)@@ -493,13 +769,13 @@ func request_InstanceService_AddDataSource_0(ctx context.Context, marshaler runtif err != nil {return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)}- msg, err := client.AddDataSource(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ msg, err := client.ListInstanceDatabase(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))return msg, metadata, err}-func local_request_InstanceService_AddDataSource_0(ctx context.Context, marshaler runtime.Marshaler, server InstanceServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+func local_request_InstanceService_ListInstanceDatabase_0(ctx context.Context, marshaler runtime.Marshaler, server InstanceServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq AddDataSourceRequest+ protoReq ListInstanceDatabaseRequestmetadata runtime.ServerMetadataerr error)@@ -514,13 +790,13 @@ func local_request_InstanceService_AddDataSource_0(ctx context.Context, marshaleif err != nil {return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)}- msg, err := server.AddDataSource(ctx, &protoReq)+ msg, err := server.ListInstanceDatabase(ctx, &protoReq)return msg, metadata, err}-func request_InstanceService_RemoveDataSource_0(ctx context.Context, marshaler runtime.Marshaler, client InstanceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+func request_InstanceService_ListInstanceDatabase_1(ctx context.Context, marshaler runtime.Marshaler, client InstanceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq RemoveDataSourceRequest+ protoReq ListInstanceDatabaseRequestmetadata runtime.ServerMetadataerr error)@@ -538,13 +814,13 @@ func request_InstanceService_RemoveDataSource_0(ctx context.Context, marshaler rif err != nil {return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)}- msg, err := client.RemoveDataSource(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ msg, err := client.ListInstanceDatabase(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))return msg, metadata, err}-func local_request_InstanceService_RemoveDataSource_0(ctx context.Context, marshaler runtime.Marshaler, server InstanceServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+func local_request_InstanceService_ListInstanceDatabase_1(ctx context.Context, marshaler runtime.Marshaler, server InstanceServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq RemoveDataSourceRequest+ protoReq ListInstanceDatabaseRequestmetadata runtime.ServerMetadataerr error)@@ -559,72 +835,165 @@ func local_request_InstanceService_RemoveDataSource_0(ctx context.Context, marshif err != nil {return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)}- msg, err := server.RemoveDataSource(ctx, &protoReq)+ msg, err := server.ListInstanceDatabase(ctx, &protoReq)return msg, metadata, err}-var filter_InstanceService_UpdateDataSource_0 = &utilities.DoubleArray{Encoding: map[string]int{"data_source": 0, "name": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}}+func request_InstanceService_BatchSyncInstances_0(ctx context.Context, marshaler runtime.Marshaler, client InstanceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq BatchSyncInstancesRequest+ metadata runtime.ServerMetadata+ )+ if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if req.Body != nil {+ _, _ = io.Copy(io.Discard, req.Body)+ }+ msg, err := client.BatchSyncInstances(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ return msg, metadata, err+}-func request_InstanceService_UpdateDataSource_0(ctx context.Context, marshaler runtime.Marshaler, client InstanceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+func local_request_InstanceService_BatchSyncInstances_0(ctx context.Context, marshaler runtime.Marshaler, server InstanceServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq UpdateDataSourceRequest+ protoReq BatchSyncInstancesRequestmetadata runtime.ServerMetadata- err error)- newReader, berr := utilities.IOReaderFactory(req.Body)- if berr != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr)+ if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)}- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.DataSource); err != nil && !errors.Is(err, io.EOF) {+ msg, err := server.BatchSyncInstances(ctx, &protoReq)+ return msg, metadata, err+}++func request_InstanceService_BatchSyncInstances_1(ctx context.Context, marshaler runtime.Marshaler, client InstanceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq BatchSyncInstancesRequest+ 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)}if req.Body != nil {_, _ = io.Copy(io.Discard, req.Body)}- if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 {- if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.DataSource); err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- } else {- protoReq.UpdateMask = fieldMask- }+ val, ok := pathParams["parent"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "parent")}- val, ok := pathParams["name"]+ protoReq.Parent, err = runtime.StringP(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "parent", err)+ }+ msg, err := client.BatchSyncInstances(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ return msg, metadata, err+}++func local_request_InstanceService_BatchSyncInstances_1(ctx context.Context, marshaler runtime.Marshaler, server InstanceServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq BatchSyncInstancesRequest+ 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", "name")+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "parent")}- protoReq.Name, err = runtime.String(val)+ protoReq.Parent, err = runtime.StringP(val)if err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "parent", err)}- if err := req.ParseForm(); err != nil {+ msg, err := server.BatchSyncInstances(ctx, &protoReq)+ return msg, metadata, err+}++func request_InstanceService_BatchUpdateInstances_0(ctx context.Context, marshaler runtime.Marshaler, client InstanceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq BatchUpdateInstancesRequest+ metadata runtime.ServerMetadata+ )+ if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)}- if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_InstanceService_UpdateDataSource_0); err != nil {+ if req.Body != nil {+ _, _ = io.Copy(io.Discard, req.Body)+ }+ msg, err := client.BatchUpdateInstances(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ return msg, metadata, err+}++func local_request_InstanceService_BatchUpdateInstances_0(ctx context.Context, marshaler runtime.Marshaler, server InstanceServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq BatchUpdateInstancesRequest+ metadata runtime.ServerMetadata+ )+ if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)}- msg, err := client.UpdateDataSource(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ msg, err := server.BatchUpdateInstances(ctx, &protoReq)return msg, metadata, err}-func local_request_InstanceService_UpdateDataSource_0(ctx context.Context, marshaler runtime.Marshaler, server InstanceServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+func request_InstanceService_BatchUpdateInstances_1(ctx context.Context, marshaler runtime.Marshaler, client InstanceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq UpdateDataSourceRequest+ protoReq BatchUpdateInstancesRequestmetadata runtime.ServerMetadataerr error)- newReader, berr := utilities.IOReaderFactory(req.Body)- if berr != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr)+ if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)}- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.DataSource); err != nil && !errors.Is(err, io.EOF) {+ 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.StringP(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "parent", err)+ }+ msg, err := client.BatchUpdateInstances(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ return msg, metadata, err+}++func local_request_InstanceService_BatchUpdateInstances_1(ctx context.Context, marshaler runtime.Marshaler, server InstanceServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq BatchUpdateInstancesRequest+ 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)}- if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 {- if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.DataSource); err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- } else {- protoReq.UpdateMask = fieldMask- }+ val, ok := pathParams["parent"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "parent")+ }+ protoReq.Parent, err = runtime.StringP(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "parent", err)+ }+ msg, err := server.BatchUpdateInstances(ctx, &protoReq)+ return msg, metadata, err+}++func request_InstanceService_AddDataSource_0(ctx context.Context, marshaler runtime.Marshaler, client InstanceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq AddDataSourceRequest+ 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)+ }+ if req.Body != nil {+ _, _ = io.Copy(io.Discard, req.Body)}val, ok := pathParams["name"]if !ok {@@ -634,261 +1003,813 @@ func local_request_InstanceService_UpdateDataSource_0(ctx context.Context, marshif err != nil {return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)}- if err := req.ParseForm(); err != nil {+ msg, err := client.AddDataSource(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ return msg, metadata, err+}++func local_request_InstanceService_AddDataSource_0(ctx context.Context, marshaler runtime.Marshaler, server InstanceServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq AddDataSourceRequest+ 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)}- if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_InstanceService_UpdateDataSource_0); err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ val, ok := pathParams["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")}- msg, err := server.UpdateDataSource(ctx, &protoReq)+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ msg, err := server.AddDataSource(ctx, &protoReq)return msg, metadata, err}-// RegisterInstanceServiceHandlerServer registers the http handlers for service InstanceService to "mux".-// UnaryRPC :call InstanceServiceServer directly.-// StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906.-// Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterInstanceServiceHandlerFromEndpoint instead.-// GRPC interceptors will not work for this type of registration. To use interceptors, you must use the "runtime.WithMiddlewares" option in the "runtime.NewServeMux" call.-func RegisterInstanceServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux, server InstanceServiceServer) error {- mux.Handle(http.MethodGet, pattern_InstanceService_GetInstance_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+func request_InstanceService_AddDataSource_1(ctx context.Context, marshaler runtime.Marshaler, client InstanceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq AddDataSourceRequest+ 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)+ }+ if req.Body != nil {+ _, _ = io.Copy(io.Discard, req.Body)+ }+ val, ok := pathParams["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ msg, err := client.AddDataSource(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ return msg, metadata, err+}++func local_request_InstanceService_AddDataSource_1(ctx context.Context, marshaler runtime.Marshaler, server InstanceServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq AddDataSourceRequest+ 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["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ msg, err := server.AddDataSource(ctx, &protoReq)+ return msg, metadata, err+}++func request_InstanceService_RemoveDataSource_0(ctx context.Context, marshaler runtime.Marshaler, client InstanceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq RemoveDataSourceRequest+ 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)+ }+ if req.Body != nil {+ _, _ = io.Copy(io.Discard, req.Body)+ }+ val, ok := pathParams["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ msg, err := client.RemoveDataSource(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ return msg, metadata, err+}++func local_request_InstanceService_RemoveDataSource_0(ctx context.Context, marshaler runtime.Marshaler, server InstanceServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq RemoveDataSourceRequest+ 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["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ msg, err := server.RemoveDataSource(ctx, &protoReq)+ return msg, metadata, err+}++func request_InstanceService_RemoveDataSource_1(ctx context.Context, marshaler runtime.Marshaler, client InstanceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq RemoveDataSourceRequest+ 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)+ }+ if req.Body != nil {+ _, _ = io.Copy(io.Discard, req.Body)+ }+ val, ok := pathParams["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ msg, err := client.RemoveDataSource(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ return msg, metadata, err+}++func local_request_InstanceService_RemoveDataSource_1(ctx context.Context, marshaler runtime.Marshaler, server InstanceServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq RemoveDataSourceRequest+ 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["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ msg, err := server.RemoveDataSource(ctx, &protoReq)+ return msg, metadata, err+}++var filter_InstanceService_UpdateDataSource_0 = &utilities.DoubleArray{Encoding: map[string]int{"data_source": 0, "name": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}}++func request_InstanceService_UpdateDataSource_0(ctx context.Context, marshaler runtime.Marshaler, client InstanceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq UpdateDataSourceRequest+ metadata runtime.ServerMetadata+ err error+ )+ newReader, berr := utilities.IOReaderFactory(req.Body)+ if berr != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr)+ }+ if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.DataSource); err != nil && !errors.Is(err, io.EOF) {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if req.Body != nil {+ _, _ = io.Copy(io.Discard, req.Body)+ }+ if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 {+ if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.DataSource); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ } else {+ protoReq.UpdateMask = fieldMask+ }+ }+ val, ok := pathParams["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ if err := req.ParseForm(); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_InstanceService_UpdateDataSource_0); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ msg, err := client.UpdateDataSource(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ return msg, metadata, err+}++func local_request_InstanceService_UpdateDataSource_0(ctx context.Context, marshaler runtime.Marshaler, server InstanceServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq UpdateDataSourceRequest+ metadata runtime.ServerMetadata+ err error+ )+ newReader, berr := utilities.IOReaderFactory(req.Body)+ if berr != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr)+ }+ if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.DataSource); err != nil && !errors.Is(err, io.EOF) {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 {+ if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.DataSource); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ } else {+ protoReq.UpdateMask = fieldMask+ }+ }+ val, ok := pathParams["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ if err := req.ParseForm(); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_InstanceService_UpdateDataSource_0); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ msg, err := server.UpdateDataSource(ctx, &protoReq)+ return msg, metadata, err+}++var filter_InstanceService_UpdateDataSource_1 = &utilities.DoubleArray{Encoding: map[string]int{"data_source": 0, "name": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}}++func request_InstanceService_UpdateDataSource_1(ctx context.Context, marshaler runtime.Marshaler, client InstanceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq UpdateDataSourceRequest+ metadata runtime.ServerMetadata+ err error+ )+ newReader, berr := utilities.IOReaderFactory(req.Body)+ if berr != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr)+ }+ if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.DataSource); err != nil && !errors.Is(err, io.EOF) {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if req.Body != nil {+ _, _ = io.Copy(io.Discard, req.Body)+ }+ if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 {+ if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.DataSource); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ } else {+ protoReq.UpdateMask = fieldMask+ }+ }+ val, ok := pathParams["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ if err := req.ParseForm(); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_InstanceService_UpdateDataSource_1); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ msg, err := client.UpdateDataSource(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ return msg, metadata, err+}++func local_request_InstanceService_UpdateDataSource_1(ctx context.Context, marshaler runtime.Marshaler, server InstanceServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq UpdateDataSourceRequest+ metadata runtime.ServerMetadata+ err error+ )+ newReader, berr := utilities.IOReaderFactory(req.Body)+ if berr != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr)+ }+ if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.DataSource); err != nil && !errors.Is(err, io.EOF) {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 {+ if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.DataSource); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ } else {+ protoReq.UpdateMask = fieldMask+ }+ }+ val, ok := pathParams["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ if err := req.ParseForm(); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_InstanceService_UpdateDataSource_1); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ msg, err := server.UpdateDataSource(ctx, &protoReq)+ return msg, metadata, err+}++// RegisterInstanceServiceHandlerServer registers the http handlers for service InstanceService to "mux".+// UnaryRPC :call InstanceServiceServer directly.+// StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906.+// Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterInstanceServiceHandlerFromEndpoint instead.+// GRPC interceptors will not work for this type of registration. To use interceptors, you must use the "runtime.WithMiddlewares" option in the "runtime.NewServeMux" call.+func RegisterInstanceServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux, server InstanceServiceServer) error {+ mux.Handle(http.MethodGet, pattern_InstanceService_GetInstance_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ var stream runtime.ServerTransportStream+ ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.InstanceService/GetInstance", runtime.WithHTTPPathPattern("/v1/{name=instances/*}"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := local_request_InstanceService_GetInstance_0(annotatedContext, inboundMarshaler, server, req, pathParams)+ md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_InstanceService_GetInstance_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })+ mux.Handle(http.MethodGet, pattern_InstanceService_GetInstance_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ var stream runtime.ServerTransportStream+ ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.InstanceService/GetInstance", runtime.WithHTTPPathPattern("/v1/{name=projects/*/instances/*}"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := local_request_InstanceService_GetInstance_1(annotatedContext, inboundMarshaler, server, req, pathParams)+ md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_InstanceService_GetInstance_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })+ mux.Handle(http.MethodGet, pattern_InstanceService_ListInstances_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ var stream runtime.ServerTransportStream+ ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.InstanceService/ListInstances", runtime.WithHTTPPathPattern("/v1/instances"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := local_request_InstanceService_ListInstances_0(annotatedContext, inboundMarshaler, server, req, pathParams)+ md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_InstanceService_ListInstances_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })+ mux.Handle(http.MethodGet, pattern_InstanceService_ListInstances_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ var stream runtime.ServerTransportStream+ ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.InstanceService/ListInstances", runtime.WithHTTPPathPattern("/v1/{parent=projects/*}/instances"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := local_request_InstanceService_ListInstances_1(annotatedContext, inboundMarshaler, server, req, pathParams)+ md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_InstanceService_ListInstances_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })+ mux.Handle(http.MethodPost, pattern_InstanceService_CreateInstance_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ var stream runtime.ServerTransportStream+ ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.InstanceService/CreateInstance", runtime.WithHTTPPathPattern("/v1/instances"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := local_request_InstanceService_CreateInstance_0(annotatedContext, inboundMarshaler, server, req, pathParams)+ md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_InstanceService_CreateInstance_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })+ mux.Handle(http.MethodPost, pattern_InstanceService_CreateInstance_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ var stream runtime.ServerTransportStream+ ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.InstanceService/CreateInstance", runtime.WithHTTPPathPattern("/v1/{parent=projects/*}/instances"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := local_request_InstanceService_CreateInstance_1(annotatedContext, inboundMarshaler, server, req, pathParams)+ md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_InstanceService_CreateInstance_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })+ mux.Handle(http.MethodPatch, pattern_InstanceService_UpdateInstance_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ var stream runtime.ServerTransportStream+ ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.InstanceService/UpdateInstance", runtime.WithHTTPPathPattern("/v1/{instance.name=instances/*}"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := local_request_InstanceService_UpdateInstance_0(annotatedContext, inboundMarshaler, server, req, pathParams)+ md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_InstanceService_UpdateInstance_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })+ mux.Handle(http.MethodPatch, pattern_InstanceService_UpdateInstance_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ var stream runtime.ServerTransportStream+ ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.InstanceService/UpdateInstance", runtime.WithHTTPPathPattern("/v1/{instance.name=projects/*/instances/*}"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := local_request_InstanceService_UpdateInstance_1(annotatedContext, inboundMarshaler, server, req, pathParams)+ md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_InstanceService_UpdateInstance_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })+ mux.Handle(http.MethodDelete, pattern_InstanceService_DeleteInstance_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ var stream runtime.ServerTransportStream+ ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.InstanceService/DeleteInstance", runtime.WithHTTPPathPattern("/v1/{name=instances/*}"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := local_request_InstanceService_DeleteInstance_0(annotatedContext, inboundMarshaler, server, req, pathParams)+ md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_InstanceService_DeleteInstance_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })+ mux.Handle(http.MethodDelete, pattern_InstanceService_DeleteInstance_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ var stream runtime.ServerTransportStream+ ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.InstanceService/DeleteInstance", runtime.WithHTTPPathPattern("/v1/{name=projects/*/instances/*}"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := local_request_InstanceService_DeleteInstance_1(annotatedContext, inboundMarshaler, server, req, pathParams)+ md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_InstanceService_DeleteInstance_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })+ mux.Handle(http.MethodPost, pattern_InstanceService_UndeleteInstance_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ var stream runtime.ServerTransportStream+ ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.InstanceService/UndeleteInstance", runtime.WithHTTPPathPattern("/v1/{name=instances/*}:undelete"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := local_request_InstanceService_UndeleteInstance_0(annotatedContext, inboundMarshaler, server, req, pathParams)+ md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_InstanceService_UndeleteInstance_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })+ mux.Handle(http.MethodPost, pattern_InstanceService_UndeleteInstance_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ var stream runtime.ServerTransportStream+ ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.InstanceService/UndeleteInstance", runtime.WithHTTPPathPattern("/v1/{name=projects/*/instances/*}:undelete"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := local_request_InstanceService_UndeleteInstance_1(annotatedContext, inboundMarshaler, server, req, pathParams)+ md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_InstanceService_UndeleteInstance_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })+ mux.Handle(http.MethodPost, pattern_InstanceService_SyncInstance_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()var stream runtime.ServerTransportStreamctx = grpc.NewContextWithServerTransportStream(ctx, &stream)inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.InstanceService/GetInstance", runtime.WithHTTPPathPattern("/v1/{name=instances/*}"))+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.InstanceService/SyncInstance", runtime.WithHTTPPathPattern("/v1/{name=instances/*}:sync"))if err != nil {runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)return}- resp, md, err := local_request_InstanceService_GetInstance_0(annotatedContext, inboundMarshaler, server, req, pathParams)+ resp, md, err := local_request_InstanceService_SyncInstance_0(annotatedContext, inboundMarshaler, server, req, pathParams)md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)if err != nil {runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)return}- forward_InstanceService_GetInstance_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ forward_InstanceService_SyncInstance_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodGet, pattern_InstanceService_ListInstances_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ mux.Handle(http.MethodPost, pattern_InstanceService_SyncInstance_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()var stream runtime.ServerTransportStreamctx = grpc.NewContextWithServerTransportStream(ctx, &stream)inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.InstanceService/ListInstances", runtime.WithHTTPPathPattern("/v1/instances"))+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.InstanceService/SyncInstance", runtime.WithHTTPPathPattern("/v1/{name=projects/*/instances/*}:sync"))if err != nil {runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)return}- resp, md, err := local_request_InstanceService_ListInstances_0(annotatedContext, inboundMarshaler, server, req, pathParams)+ resp, md, err := local_request_InstanceService_SyncInstance_1(annotatedContext, inboundMarshaler, server, req, pathParams)md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)if err != nil {runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)return}- forward_InstanceService_ListInstances_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ forward_InstanceService_SyncInstance_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodPost, pattern_InstanceService_CreateInstance_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ mux.Handle(http.MethodPost, pattern_InstanceService_ListInstanceDatabase_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()var stream runtime.ServerTransportStreamctx = grpc.NewContextWithServerTransportStream(ctx, &stream)inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.InstanceService/CreateInstance", runtime.WithHTTPPathPattern("/v1/instances"))+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.InstanceService/ListInstanceDatabase", runtime.WithHTTPPathPattern("/v1/{name=instances/*}:databases"))if err != nil {runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)return}- resp, md, err := local_request_InstanceService_CreateInstance_0(annotatedContext, inboundMarshaler, server, req, pathParams)+ resp, md, err := local_request_InstanceService_ListInstanceDatabase_0(annotatedContext, inboundMarshaler, server, req, pathParams)md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)if err != nil {runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)return}- forward_InstanceService_CreateInstance_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ forward_InstanceService_ListInstanceDatabase_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodPatch, pattern_InstanceService_UpdateInstance_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ mux.Handle(http.MethodPost, pattern_InstanceService_ListInstanceDatabase_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()var stream runtime.ServerTransportStreamctx = grpc.NewContextWithServerTransportStream(ctx, &stream)inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.InstanceService/UpdateInstance", runtime.WithHTTPPathPattern("/v1/{instance.name=instances/*}"))+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.InstanceService/ListInstanceDatabase", runtime.WithHTTPPathPattern("/v1/{name=projects/*/instances/*}:databases"))if err != nil {runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)return}- resp, md, err := local_request_InstanceService_UpdateInstance_0(annotatedContext, inboundMarshaler, server, req, pathParams)+ resp, md, err := local_request_InstanceService_ListInstanceDatabase_1(annotatedContext, inboundMarshaler, server, req, pathParams)md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)if err != nil {runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)return}- forward_InstanceService_UpdateInstance_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ forward_InstanceService_ListInstanceDatabase_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodDelete, pattern_InstanceService_DeleteInstance_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ mux.Handle(http.MethodPost, pattern_InstanceService_BatchSyncInstances_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()var stream runtime.ServerTransportStreamctx = grpc.NewContextWithServerTransportStream(ctx, &stream)inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.InstanceService/DeleteInstance", runtime.WithHTTPPathPattern("/v1/{name=instances/*}"))+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.InstanceService/BatchSyncInstances", runtime.WithHTTPPathPattern("/v1/instances:batchSync"))if err != nil {runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)return}- resp, md, err := local_request_InstanceService_DeleteInstance_0(annotatedContext, inboundMarshaler, server, req, pathParams)+ resp, md, err := local_request_InstanceService_BatchSyncInstances_0(annotatedContext, inboundMarshaler, server, req, pathParams)md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)if err != nil {runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)return}- forward_InstanceService_DeleteInstance_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ forward_InstanceService_BatchSyncInstances_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodPost, pattern_InstanceService_UndeleteInstance_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ mux.Handle(http.MethodPost, pattern_InstanceService_BatchSyncInstances_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()var stream runtime.ServerTransportStreamctx = grpc.NewContextWithServerTransportStream(ctx, &stream)inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.InstanceService/UndeleteInstance", runtime.WithHTTPPathPattern("/v1/{name=instances/*}:undelete"))+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.InstanceService/BatchSyncInstances", runtime.WithHTTPPathPattern("/v1/{parent=projects/*}/instances:batchSync"))if err != nil {runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)return}- resp, md, err := local_request_InstanceService_UndeleteInstance_0(annotatedContext, inboundMarshaler, server, req, pathParams)+ resp, md, err := local_request_InstanceService_BatchSyncInstances_1(annotatedContext, inboundMarshaler, server, req, pathParams)md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)if err != nil {runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)return}- forward_InstanceService_UndeleteInstance_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ forward_InstanceService_BatchSyncInstances_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodPost, pattern_InstanceService_SyncInstance_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ mux.Handle(http.MethodPost, pattern_InstanceService_BatchUpdateInstances_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()var stream runtime.ServerTransportStreamctx = grpc.NewContextWithServerTransportStream(ctx, &stream)inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.InstanceService/SyncInstance", runtime.WithHTTPPathPattern("/v1/{name=instances/*}:sync"))+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.InstanceService/BatchUpdateInstances", runtime.WithHTTPPathPattern("/v1/instances:batchUpdate"))if err != nil {runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)return}- resp, md, err := local_request_InstanceService_SyncInstance_0(annotatedContext, inboundMarshaler, server, req, pathParams)+ resp, md, err := local_request_InstanceService_BatchUpdateInstances_0(annotatedContext, inboundMarshaler, server, req, pathParams)md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)if err != nil {runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)return}- forward_InstanceService_SyncInstance_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ forward_InstanceService_BatchUpdateInstances_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodPost, pattern_InstanceService_ListInstanceDatabase_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ mux.Handle(http.MethodPost, pattern_InstanceService_BatchUpdateInstances_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()var stream runtime.ServerTransportStreamctx = grpc.NewContextWithServerTransportStream(ctx, &stream)inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.InstanceService/ListInstanceDatabase", runtime.WithHTTPPathPattern("/v1/{name=instances/*}:databases"))+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.InstanceService/BatchUpdateInstances", runtime.WithHTTPPathPattern("/v1/{parent=projects/*}/instances:batchUpdate"))if err != nil {runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)return}- resp, md, err := local_request_InstanceService_ListInstanceDatabase_0(annotatedContext, inboundMarshaler, server, req, pathParams)+ resp, md, err := local_request_InstanceService_BatchUpdateInstances_1(annotatedContext, inboundMarshaler, server, req, pathParams)md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)if err != nil {runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)return}- forward_InstanceService_ListInstanceDatabase_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ forward_InstanceService_BatchUpdateInstances_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodPost, pattern_InstanceService_BatchSyncInstances_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ mux.Handle(http.MethodPost, pattern_InstanceService_AddDataSource_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()var stream runtime.ServerTransportStreamctx = grpc.NewContextWithServerTransportStream(ctx, &stream)inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.InstanceService/BatchSyncInstances", runtime.WithHTTPPathPattern("/v1/instances:batchSync"))+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.InstanceService/AddDataSource", runtime.WithHTTPPathPattern("/v1/{name=instances/*}:addDataSource"))if err != nil {runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)return}- resp, md, err := local_request_InstanceService_BatchSyncInstances_0(annotatedContext, inboundMarshaler, server, req, pathParams)+ resp, md, err := local_request_InstanceService_AddDataSource_0(annotatedContext, inboundMarshaler, server, req, pathParams)md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)if err != nil {runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)return}- forward_InstanceService_BatchSyncInstances_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ forward_InstanceService_AddDataSource_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodPost, pattern_InstanceService_BatchUpdateInstances_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ mux.Handle(http.MethodPost, pattern_InstanceService_AddDataSource_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()var stream runtime.ServerTransportStreamctx = grpc.NewContextWithServerTransportStream(ctx, &stream)inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.InstanceService/BatchUpdateInstances", runtime.WithHTTPPathPattern("/v1/instances:batchUpdate"))+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.InstanceService/AddDataSource", runtime.WithHTTPPathPattern("/v1/{name=projects/*/instances/*}:addDataSource"))if err != nil {runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)return}- resp, md, err := local_request_InstanceService_BatchUpdateInstances_0(annotatedContext, inboundMarshaler, server, req, pathParams)+ resp, md, err := local_request_InstanceService_AddDataSource_1(annotatedContext, inboundMarshaler, server, req, pathParams)md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)if err != nil {runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)return}- forward_InstanceService_BatchUpdateInstances_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ forward_InstanceService_AddDataSource_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodPost, pattern_InstanceService_AddDataSource_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ mux.Handle(http.MethodPost, pattern_InstanceService_RemoveDataSource_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()var stream runtime.ServerTransportStreamctx = grpc.NewContextWithServerTransportStream(ctx, &stream)inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.InstanceService/AddDataSource", runtime.WithHTTPPathPattern("/v1/{name=instances/*}:addDataSource"))+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.InstanceService/RemoveDataSource", runtime.WithHTTPPathPattern("/v1/{name=instances/*}:removeDataSource"))if err != nil {runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)return}- resp, md, err := local_request_InstanceService_AddDataSource_0(annotatedContext, inboundMarshaler, server, req, pathParams)+ resp, md, err := local_request_InstanceService_RemoveDataSource_0(annotatedContext, inboundMarshaler, server, req, pathParams)md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)if err != nil {runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)return}- forward_InstanceService_AddDataSource_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ forward_InstanceService_RemoveDataSource_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodPost, pattern_InstanceService_RemoveDataSource_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ mux.Handle(http.MethodPost, pattern_InstanceService_RemoveDataSource_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()var stream runtime.ServerTransportStreamctx = grpc.NewContextWithServerTransportStream(ctx, &stream)inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.InstanceService/RemoveDataSource", runtime.WithHTTPPathPattern("/v1/{name=instances/*}:removeDataSource"))+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.InstanceService/RemoveDataSource", runtime.WithHTTPPathPattern("/v1/{name=projects/*/instances/*}:removeDataSource"))if err != nil {runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)return}- resp, md, err := local_request_InstanceService_RemoveDataSource_0(annotatedContext, inboundMarshaler, server, req, pathParams)+ resp, md, err := local_request_InstanceService_RemoveDataSource_1(annotatedContext, inboundMarshaler, server, req, pathParams)md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)if err != nil {runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)return}- forward_InstanceService_RemoveDataSource_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ forward_InstanceService_RemoveDataSource_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})mux.Handle(http.MethodPatch, pattern_InstanceService_UpdateDataSource_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())@@ -910,6 +1831,26 @@ func RegisterInstanceServiceHandlerServer(ctx context.Context, mux *runtime.Serv}forward_InstanceService_UpdateDataSource_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodPatch, pattern_InstanceService_UpdateDataSource_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ var stream runtime.ServerTransportStream+ ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.InstanceService/UpdateDataSource", runtime.WithHTTPPathPattern("/v1/{name=projects/*/instances/*}:updateDataSource"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := local_request_InstanceService_UpdateDataSource_1(annotatedContext, inboundMarshaler, server, req, pathParams)+ md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_InstanceService_UpdateDataSource_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })return nil}@@ -967,6 +1908,23 @@ func RegisterInstanceServiceHandlerClient(ctx context.Context, mux *runtime.Serv}forward_InstanceService_GetInstance_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodGet, pattern_InstanceService_GetInstance_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.InstanceService/GetInstance", runtime.WithHTTPPathPattern("/v1/{name=projects/*/instances/*}"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := request_InstanceService_GetInstance_1(annotatedContext, inboundMarshaler, client, req, pathParams)+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_InstanceService_GetInstance_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })mux.Handle(http.MethodGet, pattern_InstanceService_ListInstances_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()@@ -984,6 +1942,23 @@ func RegisterInstanceServiceHandlerClient(ctx context.Context, mux *runtime.Serv}forward_InstanceService_ListInstances_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodGet, pattern_InstanceService_ListInstances_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.InstanceService/ListInstances", runtime.WithHTTPPathPattern("/v1/{parent=projects/*}/instances"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := request_InstanceService_ListInstances_1(annotatedContext, inboundMarshaler, client, req, pathParams)+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_InstanceService_ListInstances_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })mux.Handle(http.MethodPost, pattern_InstanceService_CreateInstance_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()@@ -1001,6 +1976,23 @@ func RegisterInstanceServiceHandlerClient(ctx context.Context, mux *runtime.Serv}forward_InstanceService_CreateInstance_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodPost, pattern_InstanceService_CreateInstance_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.InstanceService/CreateInstance", runtime.WithHTTPPathPattern("/v1/{parent=projects/*}/instances"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := request_InstanceService_CreateInstance_1(annotatedContext, inboundMarshaler, client, req, pathParams)+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_InstanceService_CreateInstance_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })mux.Handle(http.MethodPatch, pattern_InstanceService_UpdateInstance_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()@@ -1018,6 +2010,23 @@ func RegisterInstanceServiceHandlerClient(ctx context.Context, mux *runtime.Serv}forward_InstanceService_UpdateInstance_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodPatch, pattern_InstanceService_UpdateInstance_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.InstanceService/UpdateInstance", runtime.WithHTTPPathPattern("/v1/{instance.name=projects/*/instances/*}"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := request_InstanceService_UpdateInstance_1(annotatedContext, inboundMarshaler, client, req, pathParams)+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_InstanceService_UpdateInstance_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })mux.Handle(http.MethodDelete, pattern_InstanceService_DeleteInstance_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()@@ -1035,6 +2044,23 @@ func RegisterInstanceServiceHandlerClient(ctx context.Context, mux *runtime.Serv}forward_InstanceService_DeleteInstance_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodDelete, pattern_InstanceService_DeleteInstance_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.InstanceService/DeleteInstance", runtime.WithHTTPPathPattern("/v1/{name=projects/*/instances/*}"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := request_InstanceService_DeleteInstance_1(annotatedContext, inboundMarshaler, client, req, pathParams)+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_InstanceService_DeleteInstance_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })mux.Handle(http.MethodPost, pattern_InstanceService_UndeleteInstance_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()@@ -1052,6 +2078,23 @@ func RegisterInstanceServiceHandlerClient(ctx context.Context, mux *runtime.Serv}forward_InstanceService_UndeleteInstance_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodPost, pattern_InstanceService_UndeleteInstance_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.InstanceService/UndeleteInstance", runtime.WithHTTPPathPattern("/v1/{name=projects/*/instances/*}:undelete"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := request_InstanceService_UndeleteInstance_1(annotatedContext, inboundMarshaler, client, req, pathParams)+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_InstanceService_UndeleteInstance_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })mux.Handle(http.MethodPost, pattern_InstanceService_SyncInstance_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()@@ -1069,6 +2112,23 @@ func RegisterInstanceServiceHandlerClient(ctx context.Context, mux *runtime.Serv}forward_InstanceService_SyncInstance_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodPost, pattern_InstanceService_SyncInstance_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.InstanceService/SyncInstance", runtime.WithHTTPPathPattern("/v1/{name=projects/*/instances/*}:sync"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := request_InstanceService_SyncInstance_1(annotatedContext, inboundMarshaler, client, req, pathParams)+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_InstanceService_SyncInstance_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })mux.Handle(http.MethodPost, pattern_InstanceService_ListInstanceDatabase_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()@@ -1086,6 +2146,23 @@ func RegisterInstanceServiceHandlerClient(ctx context.Context, mux *runtime.Serv}forward_InstanceService_ListInstanceDatabase_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodPost, pattern_InstanceService_ListInstanceDatabase_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.InstanceService/ListInstanceDatabase", runtime.WithHTTPPathPattern("/v1/{name=projects/*/instances/*}:databases"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := request_InstanceService_ListInstanceDatabase_1(annotatedContext, inboundMarshaler, client, req, pathParams)+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_InstanceService_ListInstanceDatabase_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })mux.Handle(http.MethodPost, pattern_InstanceService_BatchSyncInstances_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()@@ -1103,6 +2180,23 @@ func RegisterInstanceServiceHandlerClient(ctx context.Context, mux *runtime.Serv}forward_InstanceService_BatchSyncInstances_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodPost, pattern_InstanceService_BatchSyncInstances_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.InstanceService/BatchSyncInstances", runtime.WithHTTPPathPattern("/v1/{parent=projects/*}/instances:batchSync"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := request_InstanceService_BatchSyncInstances_1(annotatedContext, inboundMarshaler, client, req, pathParams)+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_InstanceService_BatchSyncInstances_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })mux.Handle(http.MethodPost, pattern_InstanceService_BatchUpdateInstances_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()@@ -1120,6 +2214,23 @@ func RegisterInstanceServiceHandlerClient(ctx context.Context, mux *runtime.Serv}forward_InstanceService_BatchUpdateInstances_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodPost, pattern_InstanceService_BatchUpdateInstances_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.InstanceService/BatchUpdateInstances", runtime.WithHTTPPathPattern("/v1/{parent=projects/*}/instances:batchUpdate"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := request_InstanceService_BatchUpdateInstances_1(annotatedContext, inboundMarshaler, client, req, pathParams)+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_InstanceService_BatchUpdateInstances_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })mux.Handle(http.MethodPost, pattern_InstanceService_AddDataSource_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()@@ -1137,6 +2248,23 @@ func RegisterInstanceServiceHandlerClient(ctx context.Context, mux *runtime.Serv}forward_InstanceService_AddDataSource_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodPost, pattern_InstanceService_AddDataSource_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.InstanceService/AddDataSource", runtime.WithHTTPPathPattern("/v1/{name=projects/*/instances/*}:addDataSource"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := request_InstanceService_AddDataSource_1(annotatedContext, inboundMarshaler, client, req, pathParams)+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_InstanceService_AddDataSource_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })mux.Handle(http.MethodPost, pattern_InstanceService_RemoveDataSource_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()@@ -1154,6 +2282,23 @@ func RegisterInstanceServiceHandlerClient(ctx context.Context, mux *runtime.Serv}forward_InstanceService_RemoveDataSource_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodPost, pattern_InstanceService_RemoveDataSource_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.InstanceService/RemoveDataSource", runtime.WithHTTPPathPattern("/v1/{name=projects/*/instances/*}:removeDataSource"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := request_InstanceService_RemoveDataSource_1(annotatedContext, inboundMarshaler, client, req, pathParams)+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_InstanceService_RemoveDataSource_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })mux.Handle(http.MethodPatch, pattern_InstanceService_UpdateDataSource_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()@@ -1171,37 +2316,80 @@ func RegisterInstanceServiceHandlerClient(ctx context.Context, mux *runtime.Serv}forward_InstanceService_UpdateDataSource_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodPatch, pattern_InstanceService_UpdateDataSource_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.InstanceService/UpdateDataSource", runtime.WithHTTPPathPattern("/v1/{name=projects/*/instances/*}:updateDataSource"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := request_InstanceService_UpdateDataSource_1(annotatedContext, inboundMarshaler, client, req, pathParams)+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_InstanceService_UpdateDataSource_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })return nil}var (pattern_InstanceService_GetInstance_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2}, []string{"v1", "instances", "name"}, ""))+ pattern_InstanceService_GetInstance_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3}, []string{"v1", "projects", "instances", "name"}, ""))pattern_InstanceService_ListInstances_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "instances"}, ""))+ pattern_InstanceService_ListInstances_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2, 2, 3}, []string{"v1", "projects", "parent", "instances"}, ""))pattern_InstanceService_CreateInstance_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "instances"}, ""))+ pattern_InstanceService_CreateInstance_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2, 2, 3}, []string{"v1", "projects", "parent", "instances"}, ""))pattern_InstanceService_UpdateInstance_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2}, []string{"v1", "instances", "instance.name"}, ""))+ pattern_InstanceService_UpdateInstance_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3}, []string{"v1", "projects", "instances", "instance.name"}, ""))pattern_InstanceService_DeleteInstance_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2}, []string{"v1", "instances", "name"}, ""))+ pattern_InstanceService_DeleteInstance_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3}, []string{"v1", "projects", "instances", "name"}, ""))pattern_InstanceService_UndeleteInstance_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2}, []string{"v1", "instances", "name"}, "undelete"))+ pattern_InstanceService_UndeleteInstance_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3}, []string{"v1", "projects", "instances", "name"}, "undelete"))pattern_InstanceService_SyncInstance_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2}, []string{"v1", "instances", "name"}, "sync"))+ pattern_InstanceService_SyncInstance_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3}, []string{"v1", "projects", "instances", "name"}, "sync"))pattern_InstanceService_ListInstanceDatabase_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2}, []string{"v1", "instances", "name"}, "databases"))+ pattern_InstanceService_ListInstanceDatabase_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3}, []string{"v1", "projects", "instances", "name"}, "databases"))pattern_InstanceService_BatchSyncInstances_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "instances"}, "batchSync"))+ pattern_InstanceService_BatchSyncInstances_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2, 2, 3}, []string{"v1", "projects", "parent", "instances"}, "batchSync"))pattern_InstanceService_BatchUpdateInstances_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "instances"}, "batchUpdate"))+ pattern_InstanceService_BatchUpdateInstances_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2, 2, 3}, []string{"v1", "projects", "parent", "instances"}, "batchUpdate"))pattern_InstanceService_AddDataSource_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2}, []string{"v1", "instances", "name"}, "addDataSource"))+ pattern_InstanceService_AddDataSource_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3}, []string{"v1", "projects", "instances", "name"}, "addDataSource"))pattern_InstanceService_RemoveDataSource_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2}, []string{"v1", "instances", "name"}, "removeDataSource"))+ pattern_InstanceService_RemoveDataSource_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3}, []string{"v1", "projects", "instances", "name"}, "removeDataSource"))pattern_InstanceService_UpdateDataSource_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2}, []string{"v1", "instances", "name"}, "updateDataSource"))+ pattern_InstanceService_UpdateDataSource_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3}, []string{"v1", "projects", "instances", "name"}, "updateDataSource")))var (forward_InstanceService_GetInstance_0 = runtime.ForwardResponseMessage+ forward_InstanceService_GetInstance_1 = runtime.ForwardResponseMessageforward_InstanceService_ListInstances_0 = runtime.ForwardResponseMessage+ forward_InstanceService_ListInstances_1 = runtime.ForwardResponseMessageforward_InstanceService_CreateInstance_0 = runtime.ForwardResponseMessage+ forward_InstanceService_CreateInstance_1 = runtime.ForwardResponseMessageforward_InstanceService_UpdateInstance_0 = runtime.ForwardResponseMessage+ forward_InstanceService_UpdateInstance_1 = runtime.ForwardResponseMessageforward_InstanceService_DeleteInstance_0 = runtime.ForwardResponseMessage+ forward_InstanceService_DeleteInstance_1 = runtime.ForwardResponseMessageforward_InstanceService_UndeleteInstance_0 = runtime.ForwardResponseMessage+ forward_InstanceService_UndeleteInstance_1 = runtime.ForwardResponseMessageforward_InstanceService_SyncInstance_0 = runtime.ForwardResponseMessage+ forward_InstanceService_SyncInstance_1 = runtime.ForwardResponseMessageforward_InstanceService_ListInstanceDatabase_0 = runtime.ForwardResponseMessage+ forward_InstanceService_ListInstanceDatabase_1 = runtime.ForwardResponseMessageforward_InstanceService_BatchSyncInstances_0 = runtime.ForwardResponseMessage+ forward_InstanceService_BatchSyncInstances_1 = runtime.ForwardResponseMessageforward_InstanceService_BatchUpdateInstances_0 = runtime.ForwardResponseMessage+ forward_InstanceService_BatchUpdateInstances_1 = runtime.ForwardResponseMessageforward_InstanceService_AddDataSource_0 = runtime.ForwardResponseMessage+ forward_InstanceService_AddDataSource_1 = runtime.ForwardResponseMessageforward_InstanceService_RemoveDataSource_0 = runtime.ForwardResponseMessage+ forward_InstanceService_RemoveDataSource_1 = runtime.ForwardResponseMessageforward_InstanceService_UpdateDataSource_0 = runtime.ForwardResponseMessage+ forward_InstanceService_UpdateDataSource_1 = runtime.ForwardResponseMessage)diff --git a/backend/generated-go/v1/instance_service_equal.pb.go b/backend/generated-go/v1/instance_service_equal.pb.goindex 78bb04deaf..6148dfab6b 100644--- a/backend/generated-go/v1/instance_service_equal.pb.go+++ b/backend/generated-go/v1/instance_service_equal.pb.go@@ -28,6 +28,9 @@ func (x *ListInstancesRequest) Equal(y *ListInstancesRequest) bool {if x == nil || y == nil {return x == nil && y == nil}+ if p, q := x.Parent, y.Parent; (p == nil && q != nil) || (p != nil && (q == nil || *p != *q)) {+ return false+ }if x.PageSize != y.PageSize {return false}@@ -74,6 +77,9 @@ func (x *CreateInstanceRequest) Equal(y *CreateInstanceRequest) bool {if x == nil || y == nil {return x == nil && y == nil}+ if p, q := x.Parent, y.Parent; (p == nil && q != nil) || (p != nil && (q == nil || *p != *q)) {+ return false+ }if !x.Instance.Equal(y.Instance) {return false}@@ -219,6 +225,9 @@ func (x *BatchSyncInstancesRequest) Equal(y *BatchSyncInstancesRequest) bool {if x == nil || y == nil {return x == nil && y == nil}+ if p, q := x.Parent, y.Parent; (p == nil && q != nil) || (p != nil && (q == nil || *p != *q)) {+ return false+ }if len(x.Requests) != len(y.Requests) {return false}@@ -247,6 +256,9 @@ func (x *BatchUpdateInstancesRequest) Equal(y *BatchUpdateInstancesRequest) boolif x == nil || y == nil {return x == nil && y == nil}+ if p, q := x.Parent, y.Parent; (p == nil && q != nil) || (p != nil && (q == nil || *p != *q)) {+ return false+ }if len(x.Requests) != len(y.Requests) {return false}diff --git a/backend/generated-go/v1/instance_service_grpc.pb.go b/backend/generated-go/v1/instance_service_grpc.pb.goindex 6fffbae162..81a8428c5d 100644--- a/backend/generated-go/v1/instance_service_grpc.pb.go+++ b/backend/generated-go/v1/instance_service_grpc.pb.go@@ -44,7 +44,7 @@ type InstanceServiceClient interface {// Gets a database instance by name.// Permissions required: bb.instances.getGetInstance(ctx context.Context, in *GetInstanceRequest, opts ...grpc.CallOption) (*Instance, error)- // Lists all database instances.+ // Lists database instances, optionally within a project.// Permissions required: bb.instances.listListInstances(ctx context.Context, in *ListInstancesRequest, opts ...grpc.CallOption) (*ListInstancesResponse, error)// Creates a new database instance.@@ -229,7 +229,7 @@ type InstanceServiceServer interface {// Gets a database instance by name.// Permissions required: bb.instances.getGetInstance(context.Context, *GetInstanceRequest) (*Instance, error)- // Lists all database instances.+ // Lists database instances, optionally within a project.// Permissions required: bb.instances.listListInstances(context.Context, *ListInstancesRequest) (*ListInstancesResponse, error)// Creates a new database instance.diff --git a/backend/generated-go/v1/org_policy_service.pb.go b/backend/generated-go/v1/org_policy_service.pb.goindex 6ad0dbbb36..f8052d075b 100644--- a/backend/generated-go/v1/org_policy_service.pb.go+++ b/backend/generated-go/v1/org_policy_service.pb.go@@ -152,8 +152,6 @@ type CreatePolicyRequest struct {// The parent resource where this instance will be created.// Workspace resource name: workspaces/{workspace-id}.// Environment resource name: environments/environment-id.- // Instance resource name: instances/instance-id.- // Database resource name: instances/instance-id/databases/database-name.Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`// The policy to create.Policy *Policy `protobuf:"bytes,2,opt,name=policy,proto3" json:"policy,omitempty"`@@ -222,8 +220,6 @@ type UpdatePolicyRequest struct {// Format: {resource name}/policies/{policy type}// Workspace resource name: workspaces/{workspace-id}.// Environment resource name: environments/environment-id.- // Instance resource name: instances/instance-id.- // Database resource name: instances/instance-id/databases/database-name.Policy *Policy `protobuf:"bytes,1,opt,name=policy,proto3" json:"policy,omitempty"`// The list of fields to update.UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`@@ -291,8 +287,6 @@ type DeletePolicyRequest struct {// Format: {resource name}/policies/{policy type}// Workspace resource name: workspaces/{workspace-id}.// Environment resource name: environments/environment-id.- // Instance resource name: instances/instance-id.- // Database resource name: instances/instance-id/databases/database-name.Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`unknownFields protoimpl.UnknownFieldssizeCache protoimpl.SizeCache@@ -496,8 +490,6 @@ type Policy struct {// Format: {resource name}/policies/{policy type}// Workspace resource name: workspaces/{workspace-id}.// Environment resource name: environments/environment-id.- // Instance resource name: instances/instance-id.- // Database resource name: instances/instance-id/databases/database-name.Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`// Whether this policy inherits from its parent resource.InheritFromParent bool `protobuf:"varint,2,opt,name=inherit_from_parent,json=inheritFromParent,proto3" json:"inherit_from_parent,omitempty"`@@ -1134,7 +1126,7 @@ const file_v1_org_policy_service_proto_rawDesc = "" +"\fshow_deleted\x18\x03 \x01(\bR\vshowDeletedB\x0e\n" +"\f_policy_type\"G\n" +"\x14ListPoliciesResponse\x12/\n" +- "\bpolicies\x18\x01 \x03(\v2\x13.bytebase.v1.PolicyR\bpolicies\"\xe4\x06\n" ++ "\bpolicies\x18\x01 \x03(\v2\x13.bytebase.v1.PolicyR\bpolicies\"\xff\x05\n" +"\x06Policy\x12\x12\n" +"\x04name\x18\x01 \x01(\tR\x04name\x12.\n" +"\x13inherit_from_parent\x18\x02 \x01(\bR\x11inheritFromParent\x12+\n" +@@ -1147,8 +1139,8 @@ const file_v1_org_policy_service_proto_rawDesc = "" +"\x11query_data_policy\x18\t \x01(\v2\x1c.bytebase.v1.QueryDataPolicyH\x00R\x0fqueryDataPolicy\x12\x18\n" +"\aenforce\x18\n" +" \x01(\bR\aenforce\x12I\n" +- "\rresource_type\x18\v \x01(\x0e2\x1f.bytebase.v1.PolicyResourceTypeB\x03\xe0A\x03R\fresourceType:\xfc\x01\xeaA\xf8\x01\n" +- "\x13bytebase.com/Policy\x12(workspaces/{workspace}/policies/{policy}\x12$projects/{project}/policies/{policy}\x12,environments/{environment}/policies/{policy}\x12&instances/{instance}/policies/{policy}\x12;instances/{instance}/databases/{database}/policies/{policy}B\b\n" ++ "\rresource_type\x18\v \x01(\x0e2\x1f.bytebase.v1.PolicyResourceTypeB\x03\xe0A\x03R\fresourceType:\x97\x01\xeaA\x93\x01\n" ++ "\x13bytebase.com/Policy\x12(workspaces/{workspace}/policies/{policy}\x12$projects/{project}/policies/{policy}\x12,environments/{environment}/policies/{policy}B\b\n" +"\x06policy\"C\n" +"\rRolloutPolicy\x12\x1c\n" +"\tautomatic\x18\x01 \x01(\bR\tautomatic\x12\x14\n" +@@ -1189,13 +1181,13 @@ const file_v1_org_policy_service_proto_rawDesc = "" +"\x19RESOURCE_TYPE_UNSPECIFIED\x10\x00\x12\r\n" +"\tWORKSPACE\x10\x01\x12\x0f\n" +"\vENVIRONMENT\x10\x02\x12\v\n" +- "\aPROJECT\x10\x032\xc7\r\n" +- "\x10OrgPolicyService\x12\xad\x02\n" +- "\tGetPolicy\x12\x1d.bytebase.v1.GetPolicyRequest\x1a\x13.bytebase.v1.Policy\"\xeb\x01\xdaA\x04name\x8a\xea0\x0fbb.policies.get\x90\xea0\x02\x82\xd3\xe4\x93\x02\xc6\x01Z\"\x12 /v1/{name=projects/*/policies/*}Z&\x12$/v1/{name=environments/*/policies/*}Z#\x12!/v1/{name=instances/*/policies/*}Z/\x12-/v1/{name=instances/*/databases/*/policies/*}\x12\"/v1/{name=workspaces/*/policies/*}\x12\xbe\x02\n" +- "\fListPolicies\x12 .bytebase.v1.ListPoliciesRequest\x1a!.bytebase.v1.ListPoliciesResponse\"\xe8\x01\xdaA\x00\x8a\xea0\x10bb.policies.list\x90\xea0\x01\x82\xd3\xe4\x93\x02\xc6\x01Z\"\x12 /v1/{parent=projects/*}/policiesZ&\x12$/v1/{parent=environments/*}/policiesZ#\x12!/v1/{parent=instances/*}/policiesZ/\x12-/v1/{parent=instances/*/databases/*}/policies\x12\"/v1/{parent=workspaces/*}/policies\x12\xeb\x02\n" +- "\fCreatePolicy\x12 .bytebase.v1.CreatePolicyRequest\x1a\x13.bytebase.v1.Policy\"\xa3\x02\xdaA\rparent,policy\x8a\xea0\x12bb.policies.create\x90\xea0\x02\x98\xea0\x01\x82\xd3\xe4\x93\x02\xee\x01:\x06policyZ*:\x06policy\" /v1/{parent=projects/*}/policiesZ.:\x06policy\"$/v1/{parent=environments/*}/policiesZ+:\x06policy\"!/v1/{parent=instances/*}/policiesZ7:\x06policy\"-/v1/{parent=instances/*/databases/*}/policies\"\"/v1/{parent=workspaces/*}/policies\x12\x93\x03\n" +- "\fUpdatePolicy\x12 .bytebase.v1.UpdatePolicyRequest\x1a\x13.bytebase.v1.Policy\"\xcb\x02\xdaA\x12policy,update_mask\x8a\xea0\x12bb.policies.update\x90\xea0\x02\x98\xea0\x01\x82\xd3\xe4\x93\x02\x91\x02:\x06policyZ1:\x06policy2'/v1/{policy.name=projects/*/policies/*}Z5:\x06policy2+/v1/{policy.name=environments/*/policies/*}Z2:\x06policy2(/v1/{policy.name=instances/*/policies/*}Z>:\x06policy24/v1/{policy.name=instances/*/databases/*/policies/*}2)/v1/{policy.name=workspaces/*/policies/*}\x12\xbd\x02\n" +- "\fDeletePolicy\x12 .bytebase.v1.DeletePolicyRequest\x1a\x16.google.protobuf.Empty\"\xf2\x01\xdaA\x04name\x8a\xea0\x12bb.policies.delete\x90\xea0\x02\x98\xea0\x01\x82\xd3\xe4\x93\x02\xc6\x01Z\"* /v1/{name=projects/*/policies/*}Z&*$/v1/{name=environments/*/policies/*}Z#*!/v1/{name=instances/*/policies/*}Z/*-/v1/{name=instances/*/databases/*/policies/*}*\"/v1/{name=workspaces/*/policies/*}B\xab\x01\n" ++ "\aPROJECT\x10\x032\xe8\t\n" ++ "\x10OrgPolicyService\x12\xd6\x01\n" ++ "\tGetPolicy\x12\x1d.bytebase.v1.GetPolicyRequest\x1a\x13.bytebase.v1.Policy\"\x94\x01\xdaA\x04name\x8a\xea0\x0fbb.policies.get\x90\xea0\x02\x82\xd3\xe4\x93\x02pZ\"\x12 /v1/{name=projects/*/policies/*}Z&\x12$/v1/{name=environments/*/policies/*}\x12\"/v1/{name=workspaces/*/policies/*}\x12\xe7\x01\n" ++ "\fListPolicies\x12 .bytebase.v1.ListPoliciesRequest\x1a!.bytebase.v1.ListPoliciesResponse\"\x91\x01\xdaA\x00\x8a\xea0\x10bb.policies.list\x90\xea0\x01\x82\xd3\xe4\x93\x02pZ\"\x12 /v1/{parent=projects/*}/policiesZ&\x12$/v1/{parent=environments/*}/policies\x12\"/v1/{parent=workspaces/*}/policies\x12\x85\x02\n" ++ "\fCreatePolicy\x12 .bytebase.v1.CreatePolicyRequest\x1a\x13.bytebase.v1.Policy\"\xbd\x01\xdaA\rparent,policy\x8a\xea0\x12bb.policies.create\x90\xea0\x02\x98\xea0\x01\x82\xd3\xe4\x93\x02\x88\x01:\x06policyZ*:\x06policy\" /v1/{parent=projects/*}/policiesZ.:\x06policy\"$/v1/{parent=environments/*}/policies\"\"/v1/{parent=workspaces/*}/policies\x12\x9f\x02\n" ++ "\fUpdatePolicy\x12 .bytebase.v1.UpdatePolicyRequest\x1a\x13.bytebase.v1.Policy\"\xd7\x01\xdaA\x12policy,update_mask\x8a\xea0\x12bb.policies.update\x90\xea0\x02\x98\xea0\x01\x82\xd3\xe4\x93\x02\x9d\x01:\x06policyZ1:\x06policy2'/v1/{policy.name=projects/*/policies/*}Z5:\x06policy2+/v1/{policy.name=environments/*/policies/*}2)/v1/{policy.name=workspaces/*/policies/*}\x12\xe6\x01\n" ++ "\fDeletePolicy\x12 .bytebase.v1.DeletePolicyRequest\x1a\x16.google.protobuf.Empty\"\x9b\x01\xdaA\x04name\x8a\xea0\x12bb.policies.delete\x90\xea0\x02\x98\xea0\x01\x82\xd3\xe4\x93\x02pZ\"* /v1/{name=projects/*/policies/*}Z&*$/v1/{name=environments/*/policies/*}*\"/v1/{name=workspaces/*/policies/*}B\xab\x01\n" +"\x0fcom.bytebase.v1B\x15OrgPolicyServiceProtoP\x01Z4github.com/bytebase/bytebase/backend/generated-go/v1\xa2\x02\x03BXX\xaa\x02\vBytebase.V1\xca\x02\vBytebase\\V1\xe2\x02\x17Bytebase\\V1\\GPBMetadata\xea\x02\fBytebase::V1b\x06proto3"var (diff --git a/backend/generated-go/v1/org_policy_service.pb.gw.go b/backend/generated-go/v1/org_policy_service.pb.gw.goindex 97554ba2e4..31d2c4a691 100644--- a/backend/generated-go/v1/org_policy_service.pb.gw.go+++ b/backend/generated-go/v1/org_policy_service.pb.gw.go@@ -152,84 +152,6 @@ func local_request_OrgPolicyService_GetPolicy_2(ctx context.Context, marshaler rreturn msg, metadata, err}-func request_OrgPolicyService_GetPolicy_3(ctx context.Context, marshaler runtime.Marshaler, client OrgPolicyServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {- var (- protoReq GetPolicyRequest- metadata runtime.ServerMetadata- err error- )- if req.Body != nil {- _, _ = io.Copy(io.Discard, req.Body)- }- val, ok := pathParams["name"]- if !ok {- return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")- }- protoReq.Name, err = runtime.String(val)- if err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)- }- msg, err := client.GetPolicy(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))- return msg, metadata, err-}--func local_request_OrgPolicyService_GetPolicy_3(ctx context.Context, marshaler runtime.Marshaler, server OrgPolicyServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {- var (- protoReq GetPolicyRequest- metadata runtime.ServerMetadata- err error- )- val, ok := pathParams["name"]- if !ok {- return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")- }- protoReq.Name, err = runtime.String(val)- if err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)- }- msg, err := server.GetPolicy(ctx, &protoReq)- return msg, metadata, err-}--func request_OrgPolicyService_GetPolicy_4(ctx context.Context, marshaler runtime.Marshaler, client OrgPolicyServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {- var (- protoReq GetPolicyRequest- metadata runtime.ServerMetadata- err error- )- if req.Body != nil {- _, _ = io.Copy(io.Discard, req.Body)- }- val, ok := pathParams["name"]- if !ok {- return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")- }- protoReq.Name, err = runtime.String(val)- if err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)- }- msg, err := client.GetPolicy(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))- return msg, metadata, err-}--func local_request_OrgPolicyService_GetPolicy_4(ctx context.Context, marshaler runtime.Marshaler, server OrgPolicyServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {- var (- protoReq GetPolicyRequest- metadata runtime.ServerMetadata- err error- )- val, ok := pathParams["name"]- if !ok {- return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")- }- protoReq.Name, err = runtime.String(val)- if err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)- }- msg, err := server.GetPolicy(ctx, &protoReq)- return msg, metadata, err-}-var filter_OrgPolicyService_ListPolicies_0 = &utilities.DoubleArray{Encoding: map[string]int{"parent": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}func request_OrgPolicyService_ListPolicies_0(ctx context.Context, marshaler runtime.Marshaler, client OrgPolicyServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {@@ -389,112 +311,6 @@ func local_request_OrgPolicyService_ListPolicies_2(ctx context.Context, marshalereturn msg, metadata, err}-var filter_OrgPolicyService_ListPolicies_3 = &utilities.DoubleArray{Encoding: map[string]int{"parent": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}--func request_OrgPolicyService_ListPolicies_3(ctx context.Context, marshaler runtime.Marshaler, client OrgPolicyServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {- var (- protoReq ListPoliciesRequest- metadata runtime.ServerMetadata- err error- )- 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)- }- if err := req.ParseForm(); err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- }- if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_OrgPolicyService_ListPolicies_3); err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- }- msg, err := client.ListPolicies(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))- return msg, metadata, err-}--func local_request_OrgPolicyService_ListPolicies_3(ctx context.Context, marshaler runtime.Marshaler, server OrgPolicyServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {- var (- protoReq ListPoliciesRequest- metadata runtime.ServerMetadata- err error- )- 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)- }- if err := req.ParseForm(); err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- }- if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_OrgPolicyService_ListPolicies_3); err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- }- msg, err := server.ListPolicies(ctx, &protoReq)- return msg, metadata, err-}--var filter_OrgPolicyService_ListPolicies_4 = &utilities.DoubleArray{Encoding: map[string]int{"parent": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}--func request_OrgPolicyService_ListPolicies_4(ctx context.Context, marshaler runtime.Marshaler, client OrgPolicyServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {- var (- protoReq ListPoliciesRequest- metadata runtime.ServerMetadata- err error- )- 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)- }- if err := req.ParseForm(); err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- }- if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_OrgPolicyService_ListPolicies_4); err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- }- msg, err := client.ListPolicies(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))- return msg, metadata, err-}--func local_request_OrgPolicyService_ListPolicies_4(ctx context.Context, marshaler runtime.Marshaler, server OrgPolicyServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {- var (- protoReq ListPoliciesRequest- metadata runtime.ServerMetadata- err error- )- 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)- }- if err := req.ParseForm(); err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- }- if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_OrgPolicyService_ListPolicies_4); err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- }- msg, err := server.ListPolicies(ctx, &protoReq)- return msg, metadata, err-}-var filter_OrgPolicyService_CreatePolicy_0 = &utilities.DoubleArray{Encoding: map[string]int{"policy": 0, "parent": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}}func request_OrgPolicyService_CreatePolicy_0(ctx context.Context, marshaler runtime.Marshaler, client OrgPolicyServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {@@ -672,251 +488,133 @@ func local_request_OrgPolicyService_CreatePolicy_2(ctx context.Context, marshalereturn msg, metadata, err}-var filter_OrgPolicyService_CreatePolicy_3 = &utilities.DoubleArray{Encoding: map[string]int{"policy": 0, "parent": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}}+var filter_OrgPolicyService_UpdatePolicy_0 = &utilities.DoubleArray{Encoding: map[string]int{"policy": 0, "name": 1}, Base: []int{1, 2, 1, 0, 0}, Check: []int{0, 1, 2, 3, 2}}-func request_OrgPolicyService_CreatePolicy_3(ctx context.Context, marshaler runtime.Marshaler, client OrgPolicyServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+func request_OrgPolicyService_UpdatePolicy_0(ctx context.Context, marshaler runtime.Marshaler, client OrgPolicyServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq CreatePolicyRequest+ protoReq UpdatePolicyRequestmetadata runtime.ServerMetadataerr error)- if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Policy); err != nil && !errors.Is(err, io.EOF) {+ newReader, berr := utilities.IOReaderFactory(req.Body)+ if berr != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr)+ }+ if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Policy); err != nil && !errors.Is(err, io.EOF) {return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)}if req.Body != nil {_, _ = io.Copy(io.Discard, req.Body)}- val, ok := pathParams["parent"]+ if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 {+ if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Policy); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ } else {+ protoReq.UpdateMask = fieldMask+ }+ }+ val, ok := pathParams["policy.name"]if !ok {- return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "parent")+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "policy.name")}- protoReq.Parent, err = runtime.String(val)+ err = runtime.PopulateFieldFromPath(&protoReq, "policy.name", val)if err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "parent", err)+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "policy.name", err)}if err := req.ParseForm(); err != nil {return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)}- if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_OrgPolicyService_CreatePolicy_3); err != nil {+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_OrgPolicyService_UpdatePolicy_0); err != nil {return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)}- msg, err := client.CreatePolicy(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ msg, err := client.UpdatePolicy(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))return msg, metadata, err}-func local_request_OrgPolicyService_CreatePolicy_3(ctx context.Context, marshaler runtime.Marshaler, server OrgPolicyServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+func local_request_OrgPolicyService_UpdatePolicy_0(ctx context.Context, marshaler runtime.Marshaler, server OrgPolicyServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq CreatePolicyRequest+ protoReq UpdatePolicyRequestmetadata runtime.ServerMetadataerr error)- if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Policy); err != nil && !errors.Is(err, io.EOF) {+ newReader, berr := utilities.IOReaderFactory(req.Body)+ if berr != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr)+ }+ if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Policy); err != nil && !errors.Is(err, io.EOF) {return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)}- val, ok := pathParams["parent"]+ if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 {+ if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Policy); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ } else {+ protoReq.UpdateMask = fieldMask+ }+ }+ val, ok := pathParams["policy.name"]if !ok {- return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "parent")+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "policy.name")}- protoReq.Parent, err = runtime.String(val)+ err = runtime.PopulateFieldFromPath(&protoReq, "policy.name", val)if err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "parent", err)+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "policy.name", err)}if err := req.ParseForm(); err != nil {return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)}- if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_OrgPolicyService_CreatePolicy_3); err != nil {+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_OrgPolicyService_UpdatePolicy_0); err != nil {return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)}- msg, err := server.CreatePolicy(ctx, &protoReq)+ msg, err := server.UpdatePolicy(ctx, &protoReq)return msg, metadata, err}-var filter_OrgPolicyService_CreatePolicy_4 = &utilities.DoubleArray{Encoding: map[string]int{"policy": 0, "parent": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}}+var filter_OrgPolicyService_UpdatePolicy_1 = &utilities.DoubleArray{Encoding: map[string]int{"policy": 0, "name": 1}, Base: []int{1, 2, 1, 0, 0}, Check: []int{0, 1, 2, 3, 2}}-func request_OrgPolicyService_CreatePolicy_4(ctx context.Context, marshaler runtime.Marshaler, client OrgPolicyServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+func request_OrgPolicyService_UpdatePolicy_1(ctx context.Context, marshaler runtime.Marshaler, client OrgPolicyServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq CreatePolicyRequest+ protoReq UpdatePolicyRequestmetadata runtime.ServerMetadataerr error)- if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Policy); err != nil && !errors.Is(err, io.EOF) {+ newReader, berr := utilities.IOReaderFactory(req.Body)+ if berr != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr)+ }+ if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Policy); err != nil && !errors.Is(err, io.EOF) {return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)}if req.Body != nil {_, _ = io.Copy(io.Discard, req.Body)}- val, ok := pathParams["parent"]+ if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 {+ if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Policy); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ } else {+ protoReq.UpdateMask = fieldMask+ }+ }+ val, ok := pathParams["policy.name"]if !ok {- return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "parent")+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "policy.name")}- protoReq.Parent, err = runtime.String(val)+ err = runtime.PopulateFieldFromPath(&protoReq, "policy.name", val)if err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "parent", err)+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "policy.name", err)}if err := req.ParseForm(); err != nil {return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)}- if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_OrgPolicyService_CreatePolicy_4); err != nil {+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_OrgPolicyService_UpdatePolicy_1); err != nil {return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)}- msg, err := client.CreatePolicy(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ msg, err := client.UpdatePolicy(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))return msg, metadata, err}-func local_request_OrgPolicyService_CreatePolicy_4(ctx context.Context, marshaler runtime.Marshaler, server OrgPolicyServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+func local_request_OrgPolicyService_UpdatePolicy_1(ctx context.Context, marshaler runtime.Marshaler, server OrgPolicyServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (- protoReq CreatePolicyRequest- metadata runtime.ServerMetadata- err error- )- if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Policy); 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)- }- if err := req.ParseForm(); err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- }- if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_OrgPolicyService_CreatePolicy_4); err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- }- msg, err := server.CreatePolicy(ctx, &protoReq)- return msg, metadata, err-}--var filter_OrgPolicyService_UpdatePolicy_0 = &utilities.DoubleArray{Encoding: map[string]int{"policy": 0, "name": 1}, Base: []int{1, 2, 1, 0, 0}, Check: []int{0, 1, 2, 3, 2}}--func request_OrgPolicyService_UpdatePolicy_0(ctx context.Context, marshaler runtime.Marshaler, client OrgPolicyServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {- var (- protoReq UpdatePolicyRequest- metadata runtime.ServerMetadata- err error- )- newReader, berr := utilities.IOReaderFactory(req.Body)- if berr != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr)- }- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Policy); err != nil && !errors.Is(err, io.EOF) {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- }- if req.Body != nil {- _, _ = io.Copy(io.Discard, req.Body)- }- if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 {- if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Policy); err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- } else {- protoReq.UpdateMask = fieldMask- }- }- val, ok := pathParams["policy.name"]- if !ok {- return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "policy.name")- }- err = runtime.PopulateFieldFromPath(&protoReq, "policy.name", val)- if err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "policy.name", err)- }- if err := req.ParseForm(); err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- }- if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_OrgPolicyService_UpdatePolicy_0); err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- }- msg, err := client.UpdatePolicy(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))- return msg, metadata, err-}--func local_request_OrgPolicyService_UpdatePolicy_0(ctx context.Context, marshaler runtime.Marshaler, server OrgPolicyServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {- var (- protoReq UpdatePolicyRequest- metadata runtime.ServerMetadata- err error- )- newReader, berr := utilities.IOReaderFactory(req.Body)- if berr != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr)- }- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Policy); err != nil && !errors.Is(err, io.EOF) {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- }- if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 {- if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Policy); err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- } else {- protoReq.UpdateMask = fieldMask- }- }- val, ok := pathParams["policy.name"]- if !ok {- return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "policy.name")- }- err = runtime.PopulateFieldFromPath(&protoReq, "policy.name", val)- if err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "policy.name", err)- }- if err := req.ParseForm(); err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- }- if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_OrgPolicyService_UpdatePolicy_0); err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- }- msg, err := server.UpdatePolicy(ctx, &protoReq)- return msg, metadata, err-}--var filter_OrgPolicyService_UpdatePolicy_1 = &utilities.DoubleArray{Encoding: map[string]int{"policy": 0, "name": 1}, Base: []int{1, 2, 1, 0, 0}, Check: []int{0, 1, 2, 3, 2}}--func request_OrgPolicyService_UpdatePolicy_1(ctx context.Context, marshaler runtime.Marshaler, client OrgPolicyServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {- var (- protoReq UpdatePolicyRequest- metadata runtime.ServerMetadata- err error- )- newReader, berr := utilities.IOReaderFactory(req.Body)- if berr != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr)- }- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Policy); err != nil && !errors.Is(err, io.EOF) {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- }- if req.Body != nil {- _, _ = io.Copy(io.Discard, req.Body)- }- if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 {- if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Policy); err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- } else {- protoReq.UpdateMask = fieldMask- }- }- val, ok := pathParams["policy.name"]- if !ok {- return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "policy.name")- }- err = runtime.PopulateFieldFromPath(&protoReq, "policy.name", val)- if err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "policy.name", err)- }- if err := req.ParseForm(); err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- }- if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_OrgPolicyService_UpdatePolicy_1); err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- }- msg, err := client.UpdatePolicy(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))- return msg, metadata, err-}--func local_request_OrgPolicyService_UpdatePolicy_1(ctx context.Context, marshaler runtime.Marshaler, server OrgPolicyServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {- var (- protoReq UpdatePolicyRequest+ protoReq UpdatePolicyRequestmetadata runtime.ServerMetadataerr error)@@ -1033,168 +731,6 @@ func local_request_OrgPolicyService_UpdatePolicy_2(ctx context.Context, marshalereturn msg, metadata, err}-var filter_OrgPolicyService_UpdatePolicy_3 = &utilities.DoubleArray{Encoding: map[string]int{"policy": 0, "name": 1}, Base: []int{1, 2, 1, 0, 0}, Check: []int{0, 1, 2, 3, 2}}--func request_OrgPolicyService_UpdatePolicy_3(ctx context.Context, marshaler runtime.Marshaler, client OrgPolicyServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {- var (- protoReq UpdatePolicyRequest- metadata runtime.ServerMetadata- err error- )- newReader, berr := utilities.IOReaderFactory(req.Body)- if berr != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr)- }- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Policy); err != nil && !errors.Is(err, io.EOF) {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- }- if req.Body != nil {- _, _ = io.Copy(io.Discard, req.Body)- }- if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 {- if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Policy); err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- } else {- protoReq.UpdateMask = fieldMask- }- }- val, ok := pathParams["policy.name"]- if !ok {- return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "policy.name")- }- err = runtime.PopulateFieldFromPath(&protoReq, "policy.name", val)- if err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "policy.name", err)- }- if err := req.ParseForm(); err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- }- if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_OrgPolicyService_UpdatePolicy_3); err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- }- msg, err := client.UpdatePolicy(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))- return msg, metadata, err-}--func local_request_OrgPolicyService_UpdatePolicy_3(ctx context.Context, marshaler runtime.Marshaler, server OrgPolicyServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {- var (- protoReq UpdatePolicyRequest- metadata runtime.ServerMetadata- err error- )- newReader, berr := utilities.IOReaderFactory(req.Body)- if berr != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr)- }- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Policy); err != nil && !errors.Is(err, io.EOF) {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- }- if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 {- if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Policy); err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- } else {- protoReq.UpdateMask = fieldMask- }- }- val, ok := pathParams["policy.name"]- if !ok {- return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "policy.name")- }- err = runtime.PopulateFieldFromPath(&protoReq, "policy.name", val)- if err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "policy.name", err)- }- if err := req.ParseForm(); err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- }- if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_OrgPolicyService_UpdatePolicy_3); err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- }- msg, err := server.UpdatePolicy(ctx, &protoReq)- return msg, metadata, err-}--var filter_OrgPolicyService_UpdatePolicy_4 = &utilities.DoubleArray{Encoding: map[string]int{"policy": 0, "name": 1}, Base: []int{1, 2, 1, 0, 0}, Check: []int{0, 1, 2, 3, 2}}--func request_OrgPolicyService_UpdatePolicy_4(ctx context.Context, marshaler runtime.Marshaler, client OrgPolicyServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {- var (- protoReq UpdatePolicyRequest- metadata runtime.ServerMetadata- err error- )- newReader, berr := utilities.IOReaderFactory(req.Body)- if berr != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr)- }- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Policy); err != nil && !errors.Is(err, io.EOF) {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- }- if req.Body != nil {- _, _ = io.Copy(io.Discard, req.Body)- }- if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 {- if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Policy); err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- } else {- protoReq.UpdateMask = fieldMask- }- }- val, ok := pathParams["policy.name"]- if !ok {- return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "policy.name")- }- err = runtime.PopulateFieldFromPath(&protoReq, "policy.name", val)- if err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "policy.name", err)- }- if err := req.ParseForm(); err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- }- if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_OrgPolicyService_UpdatePolicy_4); err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- }- msg, err := client.UpdatePolicy(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))- return msg, metadata, err-}--func local_request_OrgPolicyService_UpdatePolicy_4(ctx context.Context, marshaler runtime.Marshaler, server OrgPolicyServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {- var (- protoReq UpdatePolicyRequest- metadata runtime.ServerMetadata- err error- )- newReader, berr := utilities.IOReaderFactory(req.Body)- if berr != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr)- }- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Policy); err != nil && !errors.Is(err, io.EOF) {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- }- if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 {- if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Policy); err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- } else {- protoReq.UpdateMask = fieldMask- }- }- val, ok := pathParams["policy.name"]- if !ok {- return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "policy.name")- }- err = runtime.PopulateFieldFromPath(&protoReq, "policy.name", val)- if err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "policy.name", err)- }- if err := req.ParseForm(); err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- }- if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_OrgPolicyService_UpdatePolicy_4); err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)- }- msg, err := server.UpdatePolicy(ctx, &protoReq)- return msg, metadata, err-}-func request_OrgPolicyService_DeletePolicy_0(ctx context.Context, marshaler runtime.Marshaler, client OrgPolicyServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (protoReq DeletePolicyRequest@@ -1311,390 +847,192 @@ func local_request_OrgPolicyService_DeletePolicy_2(ctx context.Context, marshalemsg, err := server.DeletePolicy(ctx, &protoReq)return msg, metadata, err}--func request_OrgPolicyService_DeletePolicy_3(ctx context.Context, marshaler runtime.Marshaler, client OrgPolicyServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {- var (- protoReq DeletePolicyRequest- metadata runtime.ServerMetadata- err error- )- if req.Body != nil {- _, _ = io.Copy(io.Discard, req.Body)- }- val, ok := pathParams["name"]- if !ok {- return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")- }- protoReq.Name, err = runtime.String(val)- if err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)- }- msg, err := client.DeletePolicy(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))- return msg, metadata, err-}--func local_request_OrgPolicyService_DeletePolicy_3(ctx context.Context, marshaler runtime.Marshaler, server OrgPolicyServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {- var (- protoReq DeletePolicyRequest- metadata runtime.ServerMetadata- err error- )- val, ok := pathParams["name"]- if !ok {- return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")- }- protoReq.Name, err = runtime.String(val)- if err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)- }- msg, err := server.DeletePolicy(ctx, &protoReq)- return msg, metadata, err-}--func request_OrgPolicyService_DeletePolicy_4(ctx context.Context, marshaler runtime.Marshaler, client OrgPolicyServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {- var (- protoReq DeletePolicyRequest- metadata runtime.ServerMetadata- err error- )- if req.Body != nil {- _, _ = io.Copy(io.Discard, req.Body)- }- val, ok := pathParams["name"]- if !ok {- return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")- }- protoReq.Name, err = runtime.String(val)- if err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)- }- msg, err := client.DeletePolicy(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))- return msg, metadata, err-}--func local_request_OrgPolicyService_DeletePolicy_4(ctx context.Context, marshaler runtime.Marshaler, server OrgPolicyServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {- var (- protoReq DeletePolicyRequest- metadata runtime.ServerMetadata- err error- )- val, ok := pathParams["name"]- if !ok {- return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")- }- protoReq.Name, err = runtime.String(val)- if err != nil {- return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)- }- msg, err := server.DeletePolicy(ctx, &protoReq)- return msg, metadata, err-}--// RegisterOrgPolicyServiceHandlerServer registers the http handlers for service OrgPolicyService to "mux".-// UnaryRPC :call OrgPolicyServiceServer directly.-// StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906.-// Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterOrgPolicyServiceHandlerFromEndpoint instead.-// GRPC interceptors will not work for this type of registration. To use interceptors, you must use the "runtime.WithMiddlewares" option in the "runtime.NewServeMux" call.-func RegisterOrgPolicyServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux, server OrgPolicyServiceServer) error {- mux.Handle(http.MethodGet, pattern_OrgPolicyService_GetPolicy_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {- ctx, cancel := context.WithCancel(req.Context())- defer cancel()- var stream runtime.ServerTransportStream- ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)- inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.OrgPolicyService/GetPolicy", runtime.WithHTTPPathPattern("/v1/{name=workspaces/*/policies/*}"))- if err != nil {- runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)- return- }- resp, md, err := local_request_OrgPolicyService_GetPolicy_0(annotatedContext, inboundMarshaler, server, req, pathParams)- md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())- annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)- if err != nil {- runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)- return- }- forward_OrgPolicyService_GetPolicy_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)- })- mux.Handle(http.MethodGet, pattern_OrgPolicyService_GetPolicy_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {- ctx, cancel := context.WithCancel(req.Context())- defer cancel()- var stream runtime.ServerTransportStream- ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)- inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.OrgPolicyService/GetPolicy", runtime.WithHTTPPathPattern("/v1/{name=projects/*/policies/*}"))- if err != nil {- runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)- return- }- resp, md, err := local_request_OrgPolicyService_GetPolicy_1(annotatedContext, inboundMarshaler, server, req, pathParams)- md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())- annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)- if err != nil {- runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)- return- }- forward_OrgPolicyService_GetPolicy_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)- })- mux.Handle(http.MethodGet, pattern_OrgPolicyService_GetPolicy_2, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {- ctx, cancel := context.WithCancel(req.Context())- defer cancel()- var stream runtime.ServerTransportStream- ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)- inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.OrgPolicyService/GetPolicy", runtime.WithHTTPPathPattern("/v1/{name=environments/*/policies/*}"))- if err != nil {- runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)- return- }- resp, md, err := local_request_OrgPolicyService_GetPolicy_2(annotatedContext, inboundMarshaler, server, req, pathParams)- md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())- annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)- if err != nil {- runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)- return- }- forward_OrgPolicyService_GetPolicy_2(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)- })- mux.Handle(http.MethodGet, pattern_OrgPolicyService_GetPolicy_3, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {- ctx, cancel := context.WithCancel(req.Context())- defer cancel()- var stream runtime.ServerTransportStream- ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)- inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.OrgPolicyService/GetPolicy", runtime.WithHTTPPathPattern("/v1/{name=instances/*/policies/*}"))- if err != nil {- runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)- return- }- resp, md, err := local_request_OrgPolicyService_GetPolicy_3(annotatedContext, inboundMarshaler, server, req, pathParams)- md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())- annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)- if err != nil {- runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)- return- }- forward_OrgPolicyService_GetPolicy_3(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)- })- mux.Handle(http.MethodGet, pattern_OrgPolicyService_GetPolicy_4, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {- ctx, cancel := context.WithCancel(req.Context())- defer cancel()- var stream runtime.ServerTransportStream- ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)- inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.OrgPolicyService/GetPolicy", runtime.WithHTTPPathPattern("/v1/{name=instances/*/databases/*/policies/*}"))- if err != nil {- runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)- return- }- resp, md, err := local_request_OrgPolicyService_GetPolicy_4(annotatedContext, inboundMarshaler, server, req, pathParams)- md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())- annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)- if err != nil {- runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)- return- }- forward_OrgPolicyService_GetPolicy_4(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)- })- mux.Handle(http.MethodGet, pattern_OrgPolicyService_ListPolicies_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {- ctx, cancel := context.WithCancel(req.Context())- defer cancel()- var stream runtime.ServerTransportStream- ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)- inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.OrgPolicyService/ListPolicies", runtime.WithHTTPPathPattern("/v1/{parent=workspaces/*}/policies"))- if err != nil {- runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)- return- }- resp, md, err := local_request_OrgPolicyService_ListPolicies_0(annotatedContext, inboundMarshaler, server, req, pathParams)- md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())- annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)- if err != nil {- runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)- return- }- forward_OrgPolicyService_ListPolicies_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)- })- mux.Handle(http.MethodGet, pattern_OrgPolicyService_ListPolicies_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {++// RegisterOrgPolicyServiceHandlerServer registers the http handlers for service OrgPolicyService to "mux".+// UnaryRPC :call OrgPolicyServiceServer directly.+// StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906.+// Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterOrgPolicyServiceHandlerFromEndpoint instead.+// GRPC interceptors will not work for this type of registration. To use interceptors, you must use the "runtime.WithMiddlewares" option in the "runtime.NewServeMux" call.+func RegisterOrgPolicyServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux, server OrgPolicyServiceServer) error {+ mux.Handle(http.MethodGet, pattern_OrgPolicyService_GetPolicy_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()var stream runtime.ServerTransportStreamctx = grpc.NewContextWithServerTransportStream(ctx, &stream)inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.OrgPolicyService/ListPolicies", runtime.WithHTTPPathPattern("/v1/{parent=projects/*}/policies"))+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.OrgPolicyService/GetPolicy", runtime.WithHTTPPathPattern("/v1/{name=workspaces/*/policies/*}"))if err != nil {runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)return}- resp, md, err := local_request_OrgPolicyService_ListPolicies_1(annotatedContext, inboundMarshaler, server, req, pathParams)+ resp, md, err := local_request_OrgPolicyService_GetPolicy_0(annotatedContext, inboundMarshaler, server, req, pathParams)md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)if err != nil {runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)return}- forward_OrgPolicyService_ListPolicies_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ forward_OrgPolicyService_GetPolicy_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodGet, pattern_OrgPolicyService_ListPolicies_2, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ mux.Handle(http.MethodGet, pattern_OrgPolicyService_GetPolicy_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()var stream runtime.ServerTransportStreamctx = grpc.NewContextWithServerTransportStream(ctx, &stream)inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.OrgPolicyService/ListPolicies", runtime.WithHTTPPathPattern("/v1/{parent=environments/*}/policies"))+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.OrgPolicyService/GetPolicy", runtime.WithHTTPPathPattern("/v1/{name=projects/*/policies/*}"))if err != nil {runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)return}- resp, md, err := local_request_OrgPolicyService_ListPolicies_2(annotatedContext, inboundMarshaler, server, req, pathParams)+ resp, md, err := local_request_OrgPolicyService_GetPolicy_1(annotatedContext, inboundMarshaler, server, req, pathParams)md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)if err != nil {runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)return}- forward_OrgPolicyService_ListPolicies_2(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ forward_OrgPolicyService_GetPolicy_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodGet, pattern_OrgPolicyService_ListPolicies_3, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ mux.Handle(http.MethodGet, pattern_OrgPolicyService_GetPolicy_2, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()var stream runtime.ServerTransportStreamctx = grpc.NewContextWithServerTransportStream(ctx, &stream)inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.OrgPolicyService/ListPolicies", runtime.WithHTTPPathPattern("/v1/{parent=instances/*}/policies"))+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.OrgPolicyService/GetPolicy", runtime.WithHTTPPathPattern("/v1/{name=environments/*/policies/*}"))if err != nil {runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)return}- resp, md, err := local_request_OrgPolicyService_ListPolicies_3(annotatedContext, inboundMarshaler, server, req, pathParams)+ resp, md, err := local_request_OrgPolicyService_GetPolicy_2(annotatedContext, inboundMarshaler, server, req, pathParams)md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)if err != nil {runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)return}- forward_OrgPolicyService_ListPolicies_3(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ forward_OrgPolicyService_GetPolicy_2(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodGet, pattern_OrgPolicyService_ListPolicies_4, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ mux.Handle(http.MethodGet, pattern_OrgPolicyService_ListPolicies_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()var stream runtime.ServerTransportStreamctx = grpc.NewContextWithServerTransportStream(ctx, &stream)inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.OrgPolicyService/ListPolicies", runtime.WithHTTPPathPattern("/v1/{parent=instances/*/databases/*}/policies"))+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.OrgPolicyService/ListPolicies", runtime.WithHTTPPathPattern("/v1/{parent=workspaces/*}/policies"))if err != nil {runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)return}- resp, md, err := local_request_OrgPolicyService_ListPolicies_4(annotatedContext, inboundMarshaler, server, req, pathParams)+ resp, md, err := local_request_OrgPolicyService_ListPolicies_0(annotatedContext, inboundMarshaler, server, req, pathParams)md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)if err != nil {runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)return}- forward_OrgPolicyService_ListPolicies_4(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ forward_OrgPolicyService_ListPolicies_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodPost, pattern_OrgPolicyService_CreatePolicy_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ mux.Handle(http.MethodGet, pattern_OrgPolicyService_ListPolicies_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()var stream runtime.ServerTransportStreamctx = grpc.NewContextWithServerTransportStream(ctx, &stream)inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.OrgPolicyService/CreatePolicy", runtime.WithHTTPPathPattern("/v1/{parent=workspaces/*}/policies"))+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.OrgPolicyService/ListPolicies", runtime.WithHTTPPathPattern("/v1/{parent=projects/*}/policies"))if err != nil {runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)return}- resp, md, err := local_request_OrgPolicyService_CreatePolicy_0(annotatedContext, inboundMarshaler, server, req, pathParams)+ resp, md, err := local_request_OrgPolicyService_ListPolicies_1(annotatedContext, inboundMarshaler, server, req, pathParams)md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)if err != nil {runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)return}- forward_OrgPolicyService_CreatePolicy_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ forward_OrgPolicyService_ListPolicies_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodPost, pattern_OrgPolicyService_CreatePolicy_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ mux.Handle(http.MethodGet, pattern_OrgPolicyService_ListPolicies_2, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()var stream runtime.ServerTransportStreamctx = grpc.NewContextWithServerTransportStream(ctx, &stream)inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.OrgPolicyService/CreatePolicy", runtime.WithHTTPPathPattern("/v1/{parent=projects/*}/policies"))+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.OrgPolicyService/ListPolicies", runtime.WithHTTPPathPattern("/v1/{parent=environments/*}/policies"))if err != nil {runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)return}- resp, md, err := local_request_OrgPolicyService_CreatePolicy_1(annotatedContext, inboundMarshaler, server, req, pathParams)+ resp, md, err := local_request_OrgPolicyService_ListPolicies_2(annotatedContext, inboundMarshaler, server, req, pathParams)md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)if err != nil {runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)return}- forward_OrgPolicyService_CreatePolicy_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ forward_OrgPolicyService_ListPolicies_2(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodPost, pattern_OrgPolicyService_CreatePolicy_2, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ mux.Handle(http.MethodPost, pattern_OrgPolicyService_CreatePolicy_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()var stream runtime.ServerTransportStreamctx = grpc.NewContextWithServerTransportStream(ctx, &stream)inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.OrgPolicyService/CreatePolicy", runtime.WithHTTPPathPattern("/v1/{parent=environments/*}/policies"))+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.OrgPolicyService/CreatePolicy", runtime.WithHTTPPathPattern("/v1/{parent=workspaces/*}/policies"))if err != nil {runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)return}- resp, md, err := local_request_OrgPolicyService_CreatePolicy_2(annotatedContext, inboundMarshaler, server, req, pathParams)+ resp, md, err := local_request_OrgPolicyService_CreatePolicy_0(annotatedContext, inboundMarshaler, server, req, pathParams)md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)if err != nil {runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)return}- forward_OrgPolicyService_CreatePolicy_2(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ forward_OrgPolicyService_CreatePolicy_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodPost, pattern_OrgPolicyService_CreatePolicy_3, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ mux.Handle(http.MethodPost, pattern_OrgPolicyService_CreatePolicy_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()var stream runtime.ServerTransportStreamctx = grpc.NewContextWithServerTransportStream(ctx, &stream)inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.OrgPolicyService/CreatePolicy", runtime.WithHTTPPathPattern("/v1/{parent=instances/*}/policies"))+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.OrgPolicyService/CreatePolicy", runtime.WithHTTPPathPattern("/v1/{parent=projects/*}/policies"))if err != nil {runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)return}- resp, md, err := local_request_OrgPolicyService_CreatePolicy_3(annotatedContext, inboundMarshaler, server, req, pathParams)+ resp, md, err := local_request_OrgPolicyService_CreatePolicy_1(annotatedContext, inboundMarshaler, server, req, pathParams)md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)if err != nil {runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)return}- forward_OrgPolicyService_CreatePolicy_3(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ forward_OrgPolicyService_CreatePolicy_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodPost, pattern_OrgPolicyService_CreatePolicy_4, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ mux.Handle(http.MethodPost, pattern_OrgPolicyService_CreatePolicy_2, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()var stream runtime.ServerTransportStreamctx = grpc.NewContextWithServerTransportStream(ctx, &stream)inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.OrgPolicyService/CreatePolicy", runtime.WithHTTPPathPattern("/v1/{parent=instances/*/databases/*}/policies"))+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.OrgPolicyService/CreatePolicy", runtime.WithHTTPPathPattern("/v1/{parent=environments/*}/policies"))if err != nil {runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)return}- resp, md, err := local_request_OrgPolicyService_CreatePolicy_4(annotatedContext, inboundMarshaler, server, req, pathParams)+ resp, md, err := local_request_OrgPolicyService_CreatePolicy_2(annotatedContext, inboundMarshaler, server, req, pathParams)md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)if err != nil {runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)return}- forward_OrgPolicyService_CreatePolicy_4(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ forward_OrgPolicyService_CreatePolicy_2(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})mux.Handle(http.MethodPatch, pattern_OrgPolicyService_UpdatePolicy_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())@@ -1756,46 +1094,6 @@ func RegisterOrgPolicyServiceHandlerServer(ctx context.Context, mux *runtime.Ser}forward_OrgPolicyService_UpdatePolicy_2(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodPatch, pattern_OrgPolicyService_UpdatePolicy_3, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {- ctx, cancel := context.WithCancel(req.Context())- defer cancel()- var stream runtime.ServerTransportStream- ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)- inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.OrgPolicyService/UpdatePolicy", runtime.WithHTTPPathPattern("/v1/{policy.name=instances/*/policies/*}"))- if err != nil {- runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)- return- }- resp, md, err := local_request_OrgPolicyService_UpdatePolicy_3(annotatedContext, inboundMarshaler, server, req, pathParams)- md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())- annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)- if err != nil {- runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)- return- }- forward_OrgPolicyService_UpdatePolicy_3(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)- })- mux.Handle(http.MethodPatch, pattern_OrgPolicyService_UpdatePolicy_4, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {- ctx, cancel := context.WithCancel(req.Context())- defer cancel()- var stream runtime.ServerTransportStream- ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)- inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.OrgPolicyService/UpdatePolicy", runtime.WithHTTPPathPattern("/v1/{policy.name=instances/*/databases/*/policies/*}"))- if err != nil {- runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)- return- }- resp, md, err := local_request_OrgPolicyService_UpdatePolicy_4(annotatedContext, inboundMarshaler, server, req, pathParams)- md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())- annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)- if err != nil {- runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)- return- }- forward_OrgPolicyService_UpdatePolicy_4(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)- })mux.Handle(http.MethodDelete, pattern_OrgPolicyService_DeletePolicy_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()@@ -1856,46 +1154,6 @@ func RegisterOrgPolicyServiceHandlerServer(ctx context.Context, mux *runtime.Ser}forward_OrgPolicyService_DeletePolicy_2(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodDelete, pattern_OrgPolicyService_DeletePolicy_3, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {- ctx, cancel := context.WithCancel(req.Context())- defer cancel()- var stream runtime.ServerTransportStream- ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)- inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.OrgPolicyService/DeletePolicy", runtime.WithHTTPPathPattern("/v1/{name=instances/*/policies/*}"))- if err != nil {- runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)- return- }- resp, md, err := local_request_OrgPolicyService_DeletePolicy_3(annotatedContext, inboundMarshaler, server, req, pathParams)- md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())- annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)- if err != nil {- runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)- return- }- forward_OrgPolicyService_DeletePolicy_3(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)- })- mux.Handle(http.MethodDelete, pattern_OrgPolicyService_DeletePolicy_4, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {- ctx, cancel := context.WithCancel(req.Context())- defer cancel()- var stream runtime.ServerTransportStream- ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)- inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.OrgPolicyService/DeletePolicy", runtime.WithHTTPPathPattern("/v1/{name=instances/*/databases/*/policies/*}"))- if err != nil {- runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)- return- }- resp, md, err := local_request_OrgPolicyService_DeletePolicy_4(annotatedContext, inboundMarshaler, server, req, pathParams)- md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())- annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)- if err != nil {- runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)- return- }- forward_OrgPolicyService_DeletePolicy_4(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)- })return nil}@@ -1987,40 +1245,6 @@ func RegisterOrgPolicyServiceHandlerClient(ctx context.Context, mux *runtime.Ser}forward_OrgPolicyService_GetPolicy_2(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodGet, pattern_OrgPolicyService_GetPolicy_3, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {- ctx, cancel := context.WithCancel(req.Context())- defer cancel()- inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.OrgPolicyService/GetPolicy", runtime.WithHTTPPathPattern("/v1/{name=instances/*/policies/*}"))- if err != nil {- runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)- return- }- resp, md, err := request_OrgPolicyService_GetPolicy_3(annotatedContext, inboundMarshaler, client, req, pathParams)- annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)- if err != nil {- runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)- return- }- forward_OrgPolicyService_GetPolicy_3(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)- })- mux.Handle(http.MethodGet, pattern_OrgPolicyService_GetPolicy_4, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {- ctx, cancel := context.WithCancel(req.Context())- defer cancel()- inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.OrgPolicyService/GetPolicy", runtime.WithHTTPPathPattern("/v1/{name=instances/*/databases/*/policies/*}"))- if err != nil {- runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)- return- }- resp, md, err := request_OrgPolicyService_GetPolicy_4(annotatedContext, inboundMarshaler, client, req, pathParams)- annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)- if err != nil {- runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)- return- }- forward_OrgPolicyService_GetPolicy_4(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)- })mux.Handle(http.MethodGet, pattern_OrgPolicyService_ListPolicies_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()@@ -2072,40 +1296,6 @@ func RegisterOrgPolicyServiceHandlerClient(ctx context.Context, mux *runtime.Ser}forward_OrgPolicyService_ListPolicies_2(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodGet, pattern_OrgPolicyService_ListPolicies_3, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {- ctx, cancel := context.WithCancel(req.Context())- defer cancel()- inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.OrgPolicyService/ListPolicies", runtime.WithHTTPPathPattern("/v1/{parent=instances/*}/policies"))- if err != nil {- runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)- return- }- resp, md, err := request_OrgPolicyService_ListPolicies_3(annotatedContext, inboundMarshaler, client, req, pathParams)- annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)- if err != nil {- runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)- return- }- forward_OrgPolicyService_ListPolicies_3(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)- })- mux.Handle(http.MethodGet, pattern_OrgPolicyService_ListPolicies_4, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {- ctx, cancel := context.WithCancel(req.Context())- defer cancel()- inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.OrgPolicyService/ListPolicies", runtime.WithHTTPPathPattern("/v1/{parent=instances/*/databases/*}/policies"))- if err != nil {- runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)- return- }- resp, md, err := request_OrgPolicyService_ListPolicies_4(annotatedContext, inboundMarshaler, client, req, pathParams)- annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)- if err != nil {- runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)- return- }- forward_OrgPolicyService_ListPolicies_4(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)- })mux.Handle(http.MethodPost, pattern_OrgPolicyService_CreatePolicy_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()@@ -2157,40 +1347,6 @@ func RegisterOrgPolicyServiceHandlerClient(ctx context.Context, mux *runtime.Ser}forward_OrgPolicyService_CreatePolicy_2(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodPost, pattern_OrgPolicyService_CreatePolicy_3, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {- ctx, cancel := context.WithCancel(req.Context())- defer cancel()- inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.OrgPolicyService/CreatePolicy", runtime.WithHTTPPathPattern("/v1/{parent=instances/*}/policies"))- if err != nil {- runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)- return- }- resp, md, err := request_OrgPolicyService_CreatePolicy_3(annotatedContext, inboundMarshaler, client, req, pathParams)- annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)- if err != nil {- runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)- return- }- forward_OrgPolicyService_CreatePolicy_3(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)- })- mux.Handle(http.MethodPost, pattern_OrgPolicyService_CreatePolicy_4, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {- ctx, cancel := context.WithCancel(req.Context())- defer cancel()- inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.OrgPolicyService/CreatePolicy", runtime.WithHTTPPathPattern("/v1/{parent=instances/*/databases/*}/policies"))- if err != nil {- runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)- return- }- resp, md, err := request_OrgPolicyService_CreatePolicy_4(annotatedContext, inboundMarshaler, client, req, pathParams)- annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)- if err != nil {- runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)- return- }- forward_OrgPolicyService_CreatePolicy_4(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)- })mux.Handle(http.MethodPatch, pattern_OrgPolicyService_UpdatePolicy_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()@@ -2242,40 +1398,6 @@ func RegisterOrgPolicyServiceHandlerClient(ctx context.Context, mux *runtime.Ser}forward_OrgPolicyService_UpdatePolicy_2(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodPatch, pattern_OrgPolicyService_UpdatePolicy_3, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {- ctx, cancel := context.WithCancel(req.Context())- defer cancel()- inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.OrgPolicyService/UpdatePolicy", runtime.WithHTTPPathPattern("/v1/{policy.name=instances/*/policies/*}"))- if err != nil {- runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)- return- }- resp, md, err := request_OrgPolicyService_UpdatePolicy_3(annotatedContext, inboundMarshaler, client, req, pathParams)- annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)- if err != nil {- runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)- return- }- forward_OrgPolicyService_UpdatePolicy_3(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)- })- mux.Handle(http.MethodPatch, pattern_OrgPolicyService_UpdatePolicy_4, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {- ctx, cancel := context.WithCancel(req.Context())- defer cancel()- inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.OrgPolicyService/UpdatePolicy", runtime.WithHTTPPathPattern("/v1/{policy.name=instances/*/databases/*/policies/*}"))- if err != nil {- runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)- return- }- resp, md, err := request_OrgPolicyService_UpdatePolicy_4(annotatedContext, inboundMarshaler, client, req, pathParams)- annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)- if err != nil {- runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)- return- }- forward_OrgPolicyService_UpdatePolicy_4(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)- })mux.Handle(http.MethodDelete, pattern_OrgPolicyService_DeletePolicy_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()@@ -2327,40 +1449,6 @@ func RegisterOrgPolicyServiceHandlerClient(ctx context.Context, mux *runtime.Ser}forward_OrgPolicyService_DeletePolicy_2(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})- mux.Handle(http.MethodDelete, pattern_OrgPolicyService_DeletePolicy_3, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {- ctx, cancel := context.WithCancel(req.Context())- defer cancel()- inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.OrgPolicyService/DeletePolicy", runtime.WithHTTPPathPattern("/v1/{name=instances/*/policies/*}"))- if err != nil {- runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)- return- }- resp, md, err := request_OrgPolicyService_DeletePolicy_3(annotatedContext, inboundMarshaler, client, req, pathParams)- annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)- if err != nil {- runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)- return- }- forward_OrgPolicyService_DeletePolicy_3(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)- })- mux.Handle(http.MethodDelete, pattern_OrgPolicyService_DeletePolicy_4, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {- ctx, cancel := context.WithCancel(req.Context())- defer cancel()- inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)- annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.OrgPolicyService/DeletePolicy", runtime.WithHTTPPathPattern("/v1/{name=instances/*/databases/*/policies/*}"))- if err != nil {- runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)- return- }- resp, md, err := request_OrgPolicyService_DeletePolicy_4(annotatedContext, inboundMarshaler, client, req, pathParams)- annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)- if err != nil {- runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)- return- }- forward_OrgPolicyService_DeletePolicy_4(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)- })return nil}@@ -2368,54 +1456,34 @@ var (pattern_OrgPolicyService_GetPolicy_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3}, []string{"v1", "workspaces", "policies", "name"}, ""))pattern_OrgPolicyService_GetPolicy_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3}, []string{"v1", "projects", "policies", "name"}, ""))pattern_OrgPolicyService_GetPolicy_2 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3}, []string{"v1", "environments", "policies", "name"}, ""))- pattern_OrgPolicyService_GetPolicy_3 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3}, []string{"v1", "instances", "policies", "name"}, ""))- pattern_OrgPolicyService_GetPolicy_4 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 2, 3, 1, 0, 4, 6, 5, 4}, []string{"v1", "instances", "databases", "policies", "name"}, ""))pattern_OrgPolicyService_ListPolicies_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2, 2, 3}, []string{"v1", "workspaces", "parent", "policies"}, ""))pattern_OrgPolicyService_ListPolicies_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2, 2, 3}, []string{"v1", "projects", "parent", "policies"}, ""))pattern_OrgPolicyService_ListPolicies_2 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2, 2, 3}, []string{"v1", "environments", "parent", "policies"}, ""))- pattern_OrgPolicyService_ListPolicies_3 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2, 2, 3}, []string{"v1", "instances", "parent", "policies"}, ""))- pattern_OrgPolicyService_ListPolicies_4 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3, 2, 4}, []string{"v1", "instances", "databases", "parent", "policies"}, ""))pattern_OrgPolicyService_CreatePolicy_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2, 2, 3}, []string{"v1", "workspaces", "parent", "policies"}, ""))pattern_OrgPolicyService_CreatePolicy_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2, 2, 3}, []string{"v1", "projects", "parent", "policies"}, ""))pattern_OrgPolicyService_CreatePolicy_2 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2, 2, 3}, []string{"v1", "environments", "parent", "policies"}, ""))- pattern_OrgPolicyService_CreatePolicy_3 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2, 2, 3}, []string{"v1", "instances", "parent", "policies"}, ""))- pattern_OrgPolicyService_CreatePolicy_4 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3, 2, 4}, []string{"v1", "instances", "databases", "parent", "policies"}, ""))pattern_OrgPolicyService_UpdatePolicy_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3}, []string{"v1", "workspaces", "policies", "policy.name"}, ""))pattern_OrgPolicyService_UpdatePolicy_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3}, []string{"v1", "projects", "policies", "policy.name"}, ""))pattern_OrgPolicyService_UpdatePolicy_2 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3}, []string{"v1", "environments", "policies", "policy.name"}, ""))- pattern_OrgPolicyService_UpdatePolicy_3 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3}, []string{"v1", "instances", "policies", "policy.name"}, ""))- pattern_OrgPolicyService_UpdatePolicy_4 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 2, 3, 1, 0, 4, 6, 5, 4}, []string{"v1", "instances", "databases", "policies", "policy.name"}, ""))pattern_OrgPolicyService_DeletePolicy_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3}, []string{"v1", "workspaces", "policies", "name"}, ""))pattern_OrgPolicyService_DeletePolicy_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3}, []string{"v1", "projects", "policies", "name"}, ""))pattern_OrgPolicyService_DeletePolicy_2 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3}, []string{"v1", "environments", "policies", "name"}, ""))- pattern_OrgPolicyService_DeletePolicy_3 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3}, []string{"v1", "instances", "policies", "name"}, ""))- pattern_OrgPolicyService_DeletePolicy_4 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 2, 3, 1, 0, 4, 6, 5, 4}, []string{"v1", "instances", "databases", "policies", "name"}, "")))var (forward_OrgPolicyService_GetPolicy_0 = runtime.ForwardResponseMessageforward_OrgPolicyService_GetPolicy_1 = runtime.ForwardResponseMessageforward_OrgPolicyService_GetPolicy_2 = runtime.ForwardResponseMessage- forward_OrgPolicyService_GetPolicy_3 = runtime.ForwardResponseMessage- forward_OrgPolicyService_GetPolicy_4 = runtime.ForwardResponseMessageforward_OrgPolicyService_ListPolicies_0 = runtime.ForwardResponseMessageforward_OrgPolicyService_ListPolicies_1 = runtime.ForwardResponseMessageforward_OrgPolicyService_ListPolicies_2 = runtime.ForwardResponseMessage- forward_OrgPolicyService_ListPolicies_3 = runtime.ForwardResponseMessage- forward_OrgPolicyService_ListPolicies_4 = runtime.ForwardResponseMessageforward_OrgPolicyService_CreatePolicy_0 = runtime.ForwardResponseMessageforward_OrgPolicyService_CreatePolicy_1 = runtime.ForwardResponseMessageforward_OrgPolicyService_CreatePolicy_2 = runtime.ForwardResponseMessage- forward_OrgPolicyService_CreatePolicy_3 = runtime.ForwardResponseMessage- forward_OrgPolicyService_CreatePolicy_4 = runtime.ForwardResponseMessageforward_OrgPolicyService_UpdatePolicy_0 = runtime.ForwardResponseMessageforward_OrgPolicyService_UpdatePolicy_1 = runtime.ForwardResponseMessageforward_OrgPolicyService_UpdatePolicy_2 = runtime.ForwardResponseMessage- forward_OrgPolicyService_UpdatePolicy_3 = runtime.ForwardResponseMessage- forward_OrgPolicyService_UpdatePolicy_4 = runtime.ForwardResponseMessageforward_OrgPolicyService_DeletePolicy_0 = runtime.ForwardResponseMessageforward_OrgPolicyService_DeletePolicy_1 = runtime.ForwardResponseMessageforward_OrgPolicyService_DeletePolicy_2 = runtime.ForwardResponseMessage- forward_OrgPolicyService_DeletePolicy_3 = runtime.ForwardResponseMessage- forward_OrgPolicyService_DeletePolicy_4 = runtime.ForwardResponseMessage)diff --git a/backend/generated-go/v1/revision_service.pb.go b/backend/generated-go/v1/revision_service.pb.goindex 7aef9f18b8..0c386c0246 100644--- a/backend/generated-go/v1/revision_service.pb.go+++ b/backend/generated-go/v1/revision_service.pb.go@@ -80,7 +80,7 @@ func (Revision_Type) EnumDescriptor() ([]byte, []int) {type ListRevisionsRequest struct {state protoimpl.MessageState `protogen:"open.v1"`// The parent of the revisions.- // Format: instances/{instance}/databases/{database}+ // Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`// The maximum number of revisions to return. The service may return fewer// than this value. If unspecified, at most 10 revisions will be returned. The@@ -213,7 +213,7 @@ func (x *ListRevisionsResponse) GetNextPageToken() string {type CreateRevisionRequest struct {state protoimpl.MessageState `protogen:"open.v1"`- // Format: instances/{instance}/databases/{database}+ // Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`// The revision to create.Revision *Revision `protobuf:"bytes,2,opt,name=revision,proto3" json:"revision,omitempty"`@@ -268,7 +268,7 @@ func (x *CreateRevisionRequest) GetRevision() *Revision {type BatchCreateRevisionsRequest struct {state protoimpl.MessageState `protogen:"open.v1"`// The parent resource shared by all revisions being created.- // Format: instances/{instance}/databases/{database}+ // Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`// The request message specifying the revisions to create.// A maximum of 100 revisions can be created in a batch.@@ -369,7 +369,7 @@ func (x *BatchCreateRevisionsResponse) GetRevisions() []*Revision {type GetRevisionRequest struct {state protoimpl.MessageState `protogen:"open.v1"`// The name of the revision.- // Format: instances/{instance}/databases/{database}/revisions/{revision}+ // Format: instances/{instance}/databases/{database}/revisions/{revision} or projects/{project}/instances/{instance}/databases/{database}/revisions/{revision}Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`unknownFields protoimpl.UnknownFieldssizeCache protoimpl.SizeCache@@ -415,7 +415,7 @@ func (x *GetRevisionRequest) GetName() string {type DeleteRevisionRequest struct {state protoimpl.MessageState `protogen:"open.v1"`// The name of the revision to delete.- // Format: instances/{instance}/databases/{database}/revisions/{revision}+ // Format: instances/{instance}/databases/{database}/revisions/{revision} or projects/{project}/instances/{instance}/databases/{database}/revisions/{revision}Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`unknownFields protoimpl.UnknownFieldssizeCache protoimpl.SizeCache@@ -460,7 +460,7 @@ func (x *DeleteRevisionRequest) GetName() string {type Revision struct {state protoimpl.MessageState `protogen:"open.v1"`- // Format: instances/{instance}/databases/{database}/revisions/{revision}+ // Format: instances/{instance}/databases/{database}/revisions/{revision} or projects/{project}/instances/{instance}/databases/{database}/revisions/{revision}Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`// Format: projects/{project}/releases/{release}// Can be empty.@@ -629,7 +629,7 @@ const file_v1_revision_service_proto_rawDesc = "" +"\x15bytebase.com/RevisionR\x04name\"J\n" +"\x15DeleteRevisionRequest\x121\n" +"\x04name\x18\x01 \x01(\tB\x1d\xe0A\x02\xfaA\x17\n" +- "\x15bytebase.com/RevisionR\x04name\"\xfb\x04\n" ++ "\x15bytebase.com/RevisionR\x04name\"\xd0\x05\n" +"\bRevision\x12\x12\n" +"\x04name\x18\x01 \x01(\tR\x04name\x123\n" +"\arelease\x18\x02 \x01(\tB\x19\xfaA\x16\n" +@@ -650,13 +650,13 @@ const file_v1_revision_service_proto_rawDesc = "" +"\x04Type\x12\x14\n" +"\x10TYPE_UNSPECIFIED\x10\x00\x12\r\n" +"\tVERSIONED\x10\x01\x12\x0f\n" +- "\vDECLARATIVE\x10\x02:Z\xeaAW\n" +- "\x15bytebase.com/Revision\x12>instances/{instance}/databases/{database}/revisions/{revision}2\xdc\x05\n" +- "\x0fRevisionService\x12\xb0\x01\n" +- "\rListRevisions\x12!.bytebase.v1.ListRevisionsRequest\x1a\".bytebase.v1.ListRevisionsResponse\"X\xdaA\x06parent\x8a\xea0\x11bb.revisions.list\x90\xea0\x01\x82\xd3\xe4\x93\x020\x12./v1/{parent=instances/*/databases/*}/revisions\x12\x9c\x01\n" +- "\vGetRevision\x12\x1f.bytebase.v1.GetRevisionRequest\x1a\x15.bytebase.v1.Revision\"U\xdaA\x04name\x8a\xea0\x10bb.revisions.get\x90\xea0\x01\x82\xd3\xe4\x93\x020\x12./v1/{name=instances/*/databases/*/revisions/*}\x12\xcd\x01\n" +- "\x14BatchCreateRevisions\x12(.bytebase.v1.BatchCreateRevisionsRequest\x1a).bytebase.v1.BatchCreateRevisionsResponse\"`\x8a\xea0\x13bb.revisions.create\x90\xea0\x01\x82\xd3\xe4\x93\x02?:\x01*\":/v1/{parent=instances/*/databases/*}/revisions:batchCreate\x12\xa6\x01\n" +- "\x0eDeleteRevision\x12\".bytebase.v1.DeleteRevisionRequest\x1a\x16.google.protobuf.Empty\"X\xdaA\x04name\x8a\xea0\x13bb.revisions.delete\x90\xea0\x01\x82\xd3\xe4\x93\x020*./v1/{name=instances/*/databases/*/revisions/*}B\xaa\x01\n" ++ "\vDECLARATIVE\x10\x02:\xae\x01\xeaA\xaa\x01\n" ++ "\x15bytebase.com/Revision\x12>instances/{instance}/databases/{database}/revisions/{revision}\x12Qprojects/{project}/instances/{instance}/databases/{database}/revisions/{revision}2\xe4\a\n" ++ "\x0fRevisionService\x12\xee\x01\n" ++ "\rListRevisions\x12!.bytebase.v1.ListRevisionsRequest\x1a\".bytebase.v1.ListRevisionsResponse\"\x95\x01\xdaA\x06parent\x8a\xea0\x11bb.revisions.list\x90\xea0\x01\x82\xd3\xe4\x93\x02mZ;\x129/v1/{parent=projects/*/instances/*/databases/*}/revisions\x12./v1/{parent=instances/*/databases/*}/revisions\x12\xda\x01\n" ++ "\vGetRevision\x12\x1f.bytebase.v1.GetRevisionRequest\x1a\x15.bytebase.v1.Revision\"\x92\x01\xdaA\x04name\x8a\xea0\x10bb.revisions.get\x90\xea0\x01\x82\xd3\xe4\x93\x02mZ;\x129/v1/{name=projects/*/instances/*/databases/*/revisions/*}\x12./v1/{name=instances/*/databases/*/revisions/*}\x12\x9b\x02\n" ++ "\x14BatchCreateRevisions\x12(.bytebase.v1.BatchCreateRevisionsRequest\x1a).bytebase.v1.BatchCreateRevisionsResponse\"\xad\x01\x8a\xea0\x13bb.revisions.create\x90\xea0\x01\x82\xd3\xe4\x93\x02\x8b\x01:\x01*ZJ:\x01*\"E/v1/{parent=projects/*/instances/*/databases/*}/revisions:batchCreate\":/v1/{parent=instances/*/databases/*}/revisions:batchCreate\x12\xe4\x01\n" ++ "\x0eDeleteRevision\x12\".bytebase.v1.DeleteRevisionRequest\x1a\x16.google.protobuf.Empty\"\x95\x01\xdaA\x04name\x8a\xea0\x13bb.revisions.delete\x90\xea0\x01\x82\xd3\xe4\x93\x02mZ;*9/v1/{name=projects/*/instances/*/databases/*/revisions/*}*./v1/{name=instances/*/databases/*/revisions/*}B\xaa\x01\n" +"\x0fcom.bytebase.v1B\x14RevisionServiceProtoP\x01Z4github.com/bytebase/bytebase/backend/generated-go/v1\xa2\x02\x03BXX\xaa\x02\vBytebase.V1\xca\x02\vBytebase\\V1\xe2\x02\x17Bytebase\\V1\\GPBMetadata\xea\x02\fBytebase::V1b\x06proto3"var (diff --git a/backend/generated-go/v1/revision_service.pb.gw.go b/backend/generated-go/v1/revision_service.pb.gw.goindex c20445e5e8..3e92c1b91a 100644--- a/backend/generated-go/v1/revision_service.pb.gw.go+++ b/backend/generated-go/v1/revision_service.pb.gw.go@@ -88,6 +88,59 @@ func local_request_RevisionService_ListRevisions_0(ctx context.Context, marshalereturn msg, metadata, err}+var filter_RevisionService_ListRevisions_1 = &utilities.DoubleArray{Encoding: map[string]int{"parent": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}++func request_RevisionService_ListRevisions_1(ctx context.Context, marshaler runtime.Marshaler, client RevisionServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq ListRevisionsRequest+ metadata runtime.ServerMetadata+ err error+ )+ 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)+ }+ if err := req.ParseForm(); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_RevisionService_ListRevisions_1); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ msg, err := client.ListRevisions(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ return msg, metadata, err+}++func local_request_RevisionService_ListRevisions_1(ctx context.Context, marshaler runtime.Marshaler, server RevisionServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq ListRevisionsRequest+ metadata runtime.ServerMetadata+ err error+ )+ 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)+ }+ if err := req.ParseForm(); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_RevisionService_ListRevisions_1); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ msg, err := server.ListRevisions(ctx, &protoReq)+ return msg, metadata, err+}+func request_RevisionService_GetRevision_0(ctx context.Context, marshaler runtime.Marshaler, client RevisionServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (protoReq GetRevisionRequest@@ -127,6 +180,45 @@ func local_request_RevisionService_GetRevision_0(ctx context.Context, marshalerreturn msg, metadata, err}+func request_RevisionService_GetRevision_1(ctx context.Context, marshaler runtime.Marshaler, client RevisionServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq GetRevisionRequest+ metadata runtime.ServerMetadata+ err error+ )+ if req.Body != nil {+ _, _ = io.Copy(io.Discard, req.Body)+ }+ val, ok := pathParams["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ msg, err := client.GetRevision(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ return msg, metadata, err+}++func local_request_RevisionService_GetRevision_1(ctx context.Context, marshaler runtime.Marshaler, server RevisionServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq GetRevisionRequest+ metadata runtime.ServerMetadata+ err error+ )+ val, ok := pathParams["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ msg, err := server.GetRevision(ctx, &protoReq)+ return msg, metadata, err+}+func request_RevisionService_BatchCreateRevisions_0(ctx context.Context, marshaler runtime.Marshaler, client RevisionServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (protoReq BatchCreateRevisionsRequest@@ -172,6 +264,51 @@ func local_request_RevisionService_BatchCreateRevisions_0(ctx context.Context, mreturn msg, metadata, err}+func request_RevisionService_BatchCreateRevisions_1(ctx context.Context, marshaler runtime.Marshaler, client RevisionServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq BatchCreateRevisionsRequest+ 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)+ }+ 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.BatchCreateRevisions(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ return msg, metadata, err+}++func local_request_RevisionService_BatchCreateRevisions_1(ctx context.Context, marshaler runtime.Marshaler, server RevisionServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq BatchCreateRevisionsRequest+ 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.BatchCreateRevisions(ctx, &protoReq)+ return msg, metadata, err+}+func request_RevisionService_DeleteRevision_0(ctx context.Context, marshaler runtime.Marshaler, client RevisionServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {var (protoReq DeleteRevisionRequest@@ -211,6 +348,45 @@ func local_request_RevisionService_DeleteRevision_0(ctx context.Context, marshalreturn msg, metadata, err}+func request_RevisionService_DeleteRevision_1(ctx context.Context, marshaler runtime.Marshaler, client RevisionServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq DeleteRevisionRequest+ metadata runtime.ServerMetadata+ err error+ )+ if req.Body != nil {+ _, _ = io.Copy(io.Discard, req.Body)+ }+ val, ok := pathParams["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ msg, err := client.DeleteRevision(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ return msg, metadata, err+}++func local_request_RevisionService_DeleteRevision_1(ctx context.Context, marshaler runtime.Marshaler, server RevisionServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var (+ protoReq DeleteRevisionRequest+ metadata runtime.ServerMetadata+ err error+ )+ val, ok := pathParams["name"]+ if !ok {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")+ }+ protoReq.Name, err = runtime.String(val)+ if err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)+ }+ msg, err := server.DeleteRevision(ctx, &protoReq)+ return msg, metadata, err+}+// RegisterRevisionServiceHandlerServer registers the http handlers for service RevisionService to "mux".// UnaryRPC :call RevisionServiceServer directly.// StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906.@@ -237,6 +413,26 @@ func RegisterRevisionServiceHandlerServer(ctx context.Context, mux *runtime.Serv}forward_RevisionService_ListRevisions_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodGet, pattern_RevisionService_ListRevisions_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ var stream runtime.ServerTransportStream+ ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.RevisionService/ListRevisions", runtime.WithHTTPPathPattern("/v1/{parent=projects/*/instances/*/databases/*}/revisions"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := local_request_RevisionService_ListRevisions_1(annotatedContext, inboundMarshaler, server, req, pathParams)+ md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_RevisionService_ListRevisions_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })mux.Handle(http.MethodGet, pattern_RevisionService_GetRevision_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()@@ -257,6 +453,26 @@ func RegisterRevisionServiceHandlerServer(ctx context.Context, mux *runtime.Serv}forward_RevisionService_GetRevision_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodGet, pattern_RevisionService_GetRevision_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ var stream runtime.ServerTransportStream+ ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.RevisionService/GetRevision", runtime.WithHTTPPathPattern("/v1/{name=projects/*/instances/*/databases/*/revisions/*}"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := local_request_RevisionService_GetRevision_1(annotatedContext, inboundMarshaler, server, req, pathParams)+ md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_RevisionService_GetRevision_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })mux.Handle(http.MethodPost, pattern_RevisionService_BatchCreateRevisions_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()@@ -277,6 +493,26 @@ func RegisterRevisionServiceHandlerServer(ctx context.Context, mux *runtime.Serv}forward_RevisionService_BatchCreateRevisions_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodPost, pattern_RevisionService_BatchCreateRevisions_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ var stream runtime.ServerTransportStream+ ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.RevisionService/BatchCreateRevisions", runtime.WithHTTPPathPattern("/v1/{parent=projects/*/instances/*/databases/*}/revisions:batchCreate"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := local_request_RevisionService_BatchCreateRevisions_1(annotatedContext, inboundMarshaler, server, req, pathParams)+ md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_RevisionService_BatchCreateRevisions_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })mux.Handle(http.MethodDelete, pattern_RevisionService_DeleteRevision_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()@@ -297,6 +533,26 @@ func RegisterRevisionServiceHandlerServer(ctx context.Context, mux *runtime.Serv}forward_RevisionService_DeleteRevision_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodDelete, pattern_RevisionService_DeleteRevision_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ var stream runtime.ServerTransportStream+ ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.RevisionService/DeleteRevision", runtime.WithHTTPPathPattern("/v1/{name=projects/*/instances/*/databases/*/revisions/*}"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := local_request_RevisionService_DeleteRevision_1(annotatedContext, inboundMarshaler, server, req, pathParams)+ md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_RevisionService_DeleteRevision_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })return nil}@@ -354,6 +610,23 @@ func RegisterRevisionServiceHandlerClient(ctx context.Context, mux *runtime.Serv}forward_RevisionService_ListRevisions_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodGet, pattern_RevisionService_ListRevisions_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.RevisionService/ListRevisions", runtime.WithHTTPPathPattern("/v1/{parent=projects/*/instances/*/databases/*}/revisions"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := request_RevisionService_ListRevisions_1(annotatedContext, inboundMarshaler, client, req, pathParams)+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_RevisionService_ListRevisions_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })mux.Handle(http.MethodGet, pattern_RevisionService_GetRevision_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()@@ -371,6 +644,23 @@ func RegisterRevisionServiceHandlerClient(ctx context.Context, mux *runtime.Serv}forward_RevisionService_GetRevision_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodGet, pattern_RevisionService_GetRevision_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.RevisionService/GetRevision", runtime.WithHTTPPathPattern("/v1/{name=projects/*/instances/*/databases/*/revisions/*}"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := request_RevisionService_GetRevision_1(annotatedContext, inboundMarshaler, client, req, pathParams)+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_RevisionService_GetRevision_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })mux.Handle(http.MethodPost, pattern_RevisionService_BatchCreateRevisions_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()@@ -388,6 +678,23 @@ func RegisterRevisionServiceHandlerClient(ctx context.Context, mux *runtime.Serv}forward_RevisionService_BatchCreateRevisions_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodPost, pattern_RevisionService_BatchCreateRevisions_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.RevisionService/BatchCreateRevisions", runtime.WithHTTPPathPattern("/v1/{parent=projects/*/instances/*/databases/*}/revisions:batchCreate"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := request_RevisionService_BatchCreateRevisions_1(annotatedContext, inboundMarshaler, client, req, pathParams)+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_RevisionService_BatchCreateRevisions_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })mux.Handle(http.MethodDelete, pattern_RevisionService_DeleteRevision_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {ctx, cancel := context.WithCancel(req.Context())defer cancel()@@ -405,19 +712,44 @@ func RegisterRevisionServiceHandlerClient(ctx context.Context, mux *runtime.Serv}forward_RevisionService_DeleteRevision_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)})+ mux.Handle(http.MethodDelete, pattern_RevisionService_DeleteRevision_1, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.RevisionService/DeleteRevision", runtime.WithHTTPPathPattern("/v1/{name=projects/*/instances/*/databases/*/revisions/*}"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := request_RevisionService_DeleteRevision_1(annotatedContext, inboundMarshaler, client, req, pathParams)+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }+ forward_RevisionService_DeleteRevision_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)+ })return nil}var (pattern_RevisionService_ListRevisions_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3, 2, 4}, []string{"v1", "instances", "databases", "parent", "revisions"}, ""))+ pattern_RevisionService_ListRevisions_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 2, 3, 1, 0, 4, 6, 5, 4, 2, 5}, []string{"v1", "projects", "instances", "databases", "parent", "revisions"}, ""))pattern_RevisionService_GetRevision_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 2, 3, 1, 0, 4, 6, 5, 4}, []string{"v1", "instances", "databases", "revisions", "name"}, ""))+ pattern_RevisionService_GetRevision_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 2, 3, 1, 0, 2, 4, 1, 0, 4, 8, 5, 5}, []string{"v1", "projects", "instances", "databases", "revisions", "name"}, ""))pattern_RevisionService_BatchCreateRevisions_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 4, 4, 5, 3, 2, 4}, []string{"v1", "instances", "databases", "parent", "revisions"}, "batchCreate"))+ pattern_RevisionService_BatchCreateRevisions_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 2, 3, 1, 0, 4, 6, 5, 4, 2, 5}, []string{"v1", "projects", "instances", "databases", "parent", "revisions"}, "batchCreate"))pattern_RevisionService_DeleteRevision_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 2, 3, 1, 0, 4, 6, 5, 4}, []string{"v1", "instances", "databases", "revisions", "name"}, ""))+ pattern_RevisionService_DeleteRevision_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 2, 2, 1, 0, 2, 3, 1, 0, 2, 4, 1, 0, 4, 8, 5, 5}, []string{"v1", "projects", "instances", "databases", "revisions", "name"}, "")))var (forward_RevisionService_ListRevisions_0 = runtime.ForwardResponseMessage+ forward_RevisionService_ListRevisions_1 = runtime.ForwardResponseMessageforward_RevisionService_GetRevision_0 = runtime.ForwardResponseMessage+ forward_RevisionService_GetRevision_1 = runtime.ForwardResponseMessageforward_RevisionService_BatchCreateRevisions_0 = runtime.ForwardResponseMessage+ forward_RevisionService_BatchCreateRevisions_1 = runtime.ForwardResponseMessageforward_RevisionService_DeleteRevision_0 = runtime.ForwardResponseMessage+ forward_RevisionService_DeleteRevision_1 = runtime.ForwardResponseMessage)diff --git a/backend/generated-go/v1/v1connect/instance_service.connect.go b/backend/generated-go/v1/v1connect/instance_service.connect.goindex b6733eccbc..6a090ec344 100644--- a/backend/generated-go/v1/v1connect/instance_service.connect.go+++ b/backend/generated-go/v1/v1connect/instance_service.connect.go@@ -80,7 +80,7 @@ type InstanceServiceClient interface {// Gets a database instance by name.// Permissions required: bb.instances.getGetInstance(context.Context, *connect.Request[v1.GetInstanceRequest]) (*connect.Response[v1.Instance], error)- // Lists all database instances.+ // Lists database instances, optionally within a project.// Permissions required: bb.instances.listListInstances(context.Context, *connect.Request[v1.ListInstancesRequest]) (*connect.Response[v1.ListInstancesResponse], error)// Creates a new database instance.@@ -297,7 +297,7 @@ type InstanceServiceHandler interface {// Gets a database instance by name.// Permissions required: bb.instances.getGetInstance(context.Context, *connect.Request[v1.GetInstanceRequest]) (*connect.Response[v1.Instance], error)- // Lists all database instances.+ // Lists database instances, optionally within a project.// Permissions required: bb.instances.listListInstances(context.Context, *connect.Request[v1.ListInstancesRequest]) (*connect.Response[v1.ListInstancesResponse], error)// Creates a new database instance.diff --git a/backend/migrator/migration/3.22/0002##add_instance_project.sql b/backend/migrator/migration/3.22/0002##add_instance_project.sqlnew file mode 100644index 0000000000..9cbeabf2bb--- /dev/null+++ b/backend/migrator/migration/3.22/0002##add_instance_project.sql@@ -0,0 +1,3 @@+ALTER TABLE instance ADD COLUMN project text REFERENCES project(resource_id);++CREATE INDEX idx_instance_project ON instance(project) WHERE project IS NOT NULL;diff --git a/backend/migrator/migration/LATEST.sql b/backend/migrator/migration/LATEST.sqlindex 91f4703649..92250d9eec 100644--- a/backend/migrator/migration/LATEST.sql+++ b/backend/migrator/migration/LATEST.sql@@ -440,6 +440,8 @@ CREATE TABLE instance (-- global uniqueresource_id text NOT NULL PRIMARY KEY,workspace text NOT NULL REFERENCES workspace(resource_id),+ -- NULL for workspace instances; set for project instances.+ project text REFERENCES project(resource_id),deleted boolean NOT NULL DEFAULT FALSE,environment text,-- Stored as Instance (proto/store/store/instance.proto)@@ -447,6 +449,7 @@ CREATE TABLE instance ();CREATE INDEX idx_instance_workspace ON instance(workspace);+CREATE INDEX idx_instance_project ON instance(project) WHERE project IS NOT NULL;CREATE INDEX idx_instance_metadata_engine ON instance((metadata->>'engine'));-- db stores the databases for a particular instancediff --git a/backend/migrator/migrator_test.go b/backend/migrator/migrator_test.goindex 40ab650978..07e8e2a76f 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.22.1"), *files[len(files)-1].version)- require.Equal(t, "migration/3.22/0001##oauth2_refresh_token_config.sql", files[len(files)-1].path)+ require.Equal(t, semver.MustParse("3.22.2"), *files[len(files)-1].version)+ require.Equal(t, "migration/3.22/0002##add_instance_project.sql", files[len(files)-1].path)}func TestVersionUnique(t *testing.T) {@@ -90,6 +90,44 @@ func TestMigration3_21_2_MigrateInstanceSyncDatabases(t *testing.T) {require.JSONEq(t, `{"engine":"POSTGRES"}`, getMetadata("instance-without-sync-databases"))}+func TestMigration3_22_2_AddInstanceProject(t *testing.T) {+ ctx := context.Background()+ container := testcontainer.GetTestPgContainer(ctx, t)+ t.Cleanup(func() { container.Close(ctx) })++ db := container.GetDB()+ _, err := db.ExecContext(ctx, `+ CREATE TABLE project (+ resource_id TEXT PRIMARY KEY+ );+ CREATE TABLE instance (+ resource_id TEXT PRIMARY KEY,+ metadata JSONB NOT NULL DEFAULT '{}'+ );+ INSERT INTO instance (resource_id) VALUES ('legacy-workspace-instance');+ `)+ require.NoError(t, err)++ statement, err := migrationFS.ReadFile("migration/3.22/0002##add_instance_project.sql")+ require.NoError(t, err)+ _, err = db.ExecContext(ctx, string(statement))+ require.NoError(t, err)++ var projectID *string+ require.NoError(t, db.QueryRowContext(ctx, `+ SELECT project FROM instance WHERE resource_id = 'legacy-workspace-instance'+ `).Scan(&projectID))+ require.Nil(t, projectID)++ var indexDefinition string+ require.NoError(t, db.QueryRowContext(ctx, `+ SELECT indexdef+ FROM pg_indexes+ WHERE schemaname = 'public' AND indexname = 'idx_instance_project'+ `).Scan(&indexDefinition))+ require.Contains(t, indexDefinition, "WHERE (project IS NOT NULL)")+}+func TestMigration3_21_3_MigrateGCPDataSourceFields(t *testing.T) {ctx := context.Background()container := testcontainer.GetTestPgContainer(ctx, t)diff --git a/backend/runner/schemasync/syncer.go b/backend/runner/schemasync/syncer.goindex b2443d6668..cc90f1abe7 100644--- a/backend/runner/schemasync/syncer.go+++ b/backend/runner/schemasync/syncer.go@@ -338,10 +338,14 @@ func (s *Syncer) SyncInstanceWithOptions(ctx context.Context, instance *store.Invar filteredDatabaseMetadatas []*storepb.DatabaseSchemaMetadatadatabaseProjectID := options.InitialProjectIDif databaseProjectID == "" {- var err error- databaseProjectID, err = s.store.GetDefaultProjectID(ctx, instance.Workspace)- if err != nil {- return nil, nil, nil, errors.Wrapf(err, "failed to get default project ID for instance %q", instance.ResourceID)+ if instance.ProjectID != nil {+ databaseProjectID = *instance.ProjectID+ } else {+ var err error+ databaseProjectID, err = s.store.GetDefaultProjectID(ctx, instance.Workspace)+ if err != nil {+ return nil, nil, nil, errors.Wrapf(err, "failed to get default project ID for instance %q", instance.ResourceID)+ }}}diff --git a/backend/store/README.md b/backend/store/README.mdindex d93e94ee23..22542de85e 100644--- a/backend/store/README.md+++ b/backend/store/README.md@@ -11,11 +11,11 @@ PostgreSQL holds row locks until a transaction ends. Transactions that acquire t- `issue_comment -> issue -> plan -> project`- `plan_webhook_delivery -> plan -> project`- `plan_check_run -> plan -> project`- - `task_run_log -> task_run -> task -> plan -> project -> instance`+ - `task_run_log -> task_run -> task -> plan -> project`- `worksheet_organizer -> worksheet -> project`- - `changelog -> sync_history -> db -> instance`- - `revision -> db -> instance`- - `db_schema -> db -> instance`+ - `changelog -> sync_history -> db -> instance -> project`+ - `revision -> db -> instance -> project`+ - `db_schema -> db -> instance -> project`3. Identify project-scoped rows with every scope column plus either the remaining primary-key columns or every remaining column of a declared non-partial unique key. Verify alternate keys in `LATEST.sql`. Lock batches in full primary-key order; project-scoped `(project, id)` batches therefore use that order, not `id` alone.4. Treat locks acquired by `UPDATE`, `DELETE`, foreign-key checks, and `INSERT ... ON CONFLICT DO UPDATE` as part of the order. An upsert that can update an existing row is not a new-row-only insert.5. `nextProjectID` locks `project` and requires it to be active before allocating an ID. Call it after locking any existing descendants, and do not lock an existing descendant afterward. Creation is rejected when the project is missing or deleted.@@ -38,7 +38,7 @@ query_history -> policy -> worksheet_organizer -> worksheet-> issue_comment -> issue -> plan_webhook_delivery -> plan_check_run-> task_run_log -> task_run -> task -> plan -> access_grant -> release-> db_group -> changelog -> sync_history -> revision -> db_schema -> db--> project_webhook -> service_account -> workload_identity -> project -> instance+-> project_webhook -> service_account -> workload_identity -> instance -> project```Update this list, `DeleteProject`, and `DeleteInstance` together. A transaction that needs another sibling branch must establish its position here before implementation. When one table is touched by multiple predicates, keep those mutations contiguous at that table's position. Keep transactions short and preserve this order whether locks are acquired explicitly or by `UPDATE` and `DELETE` statements.diff --git a/backend/store/database.go b/backend/store/database.goindex f8351019d2..b256a76b8d 100644--- a/backend/store/database.go+++ b/backend/store/database.go@@ -12,7 +12,6 @@ import (celoverloads "github.com/google/cel-go/common/overloads""github.com/pkg/errors""google.golang.org/protobuf/encoding/protojson"- "google.golang.org/protobuf/proto""github.com/bytebase/bytebase/backend/common""github.com/bytebase/bytebase/backend/common/qb"@@ -256,93 +255,82 @@ func (s *Store) ListDatabases(ctx context.Context, find *FindDatabaseMessage) ([return databases, nil}-// CreateDatabaseDefault creates a new database in the default project.+// CreateDatabaseDefault creates a database discovered by schema sync.func (s *Store) CreateDatabaseDefault(ctx context.Context, create *DatabaseMessage) (*DatabaseMessage, error) {- q := qb.Q().Space(`- INSERT INTO db (- instance,- project,- name,- deleted- )+ ownership, err := s.getDatabaseOwnership(ctx, create.InstanceID, create.DatabaseName)+ if err != nil {+ return nil, err+ }+ projectID, err := ownership.projectForDefaultCreate(create.ProjectID)+ if err != nil {+ return nil, err+ }+ q := qb.Q().Space(`INSERT INTO db (instance, project, name, deleted)VALUES (?, ?, ?, ?)- ON CONFLICT (instance, name) DO UPDATE SET- deleted = EXCLUDED.deleted`,- create.InstanceID,- create.ProjectID,- create.DatabaseName,- false,- )-+ ON CONFLICT (instance, name) DO UPDATE SET deleted = EXCLUDED.deleted`,+ create.InstanceID, projectID, create.DatabaseName, false)query, args, err := q.ToSQL()if err != nil {- return nil, errors.Wrapf(err, "failed to build sql")+ return nil, errors.Wrap(err, "failed to build sql")}-if _, err := s.GetDB().ExecContext(ctx, query, args...); err != nil {return nil, err}-- // Invalidate and update the cache.s.removeDatabaseCache(ctx, create.InstanceID, create.DatabaseName)return s.GetDatabase(ctx, &FindDatabaseMessage{InstanceID: &create.InstanceID, DatabaseName: &create.DatabaseName, ShowDeleted: true})}// UpsertDatabase upserts a database.func (s *Store) UpsertDatabase(ctx context.Context, create *DatabaseMessage) (*DatabaseMessage, error) {- metadataString, err := protojson.Marshal(create.Metadata)+ metadata, err := protojson.Marshal(create.Metadata)+ if err != nil {+ return nil, err+ }+ ownership, err := s.getDatabaseOwnership(ctx, create.InstanceID, create.DatabaseName)+ if err != nil {+ return nil, err+ }+ projectID, err := ownership.projectForUpsert(create.ProjectID)if err != nil {return nil, err}-var environment *stringif create.EnvironmentID != nil && *create.EnvironmentID != "" {environment = create.EnvironmentID}-- q := qb.Q().Space(`- INSERT INTO db (- instance,- project,- environment,- name,- deleted,- metadata- )+ q := qb.Q().Space(`INSERT INTO db (instance, project, environment, name, deleted, metadata)VALUES (?, ?, ?, ?, ?, ?)ON CONFLICT (instance, name) DO UPDATE SET- project = EXCLUDED.project,- environment = EXCLUDED.environment,- name = EXCLUDED.name,- metadata = EXCLUDED.metadata`,- create.InstanceID,- create.ProjectID,- environment,- create.DatabaseName,- create.Deleted,- metadataString,- )-+ project = EXCLUDED.project, environment = EXCLUDED.environment,+ name = EXCLUDED.name, metadata = EXCLUDED.metadata`,+ create.InstanceID, projectID, environment, create.DatabaseName, create.Deleted, metadata)query, args, err := q.ToSQL()if err != nil {- return nil, errors.Wrapf(err, "failed to build sql")+ return nil, errors.Wrap(err, "failed to build sql")}-if _, err := s.GetDB().ExecContext(ctx, query, args...); err != nil {return nil, err}-- // Invalidate and update the cache.s.removeDatabaseCache(ctx, create.InstanceID, create.DatabaseName)return s.GetDatabase(ctx, &FindDatabaseMessage{InstanceID: &create.InstanceID, DatabaseName: &create.DatabaseName, ShowDeleted: true})}// UpdateDatabase updates a database.func (s *Store) UpdateDatabase(ctx context.Context, patch *UpdateDatabaseMessage) (*DatabaseMessage, error) {+ ownership, err := s.getDatabaseOwnership(ctx, patch.InstanceID, patch.DatabaseName)+ if err != nil {+ return nil, err+ }+ if !ownership.exists {+ return nil, common.Errorf(common.NotFound, "database %s not found", common.FormatDatabase(patch.InstanceID, patch.DatabaseName))+ }+ projectID, err := ownership.projectForUpdate(patch.ProjectID)+ if err != nil {+ return nil, err+ }set := qb.Q()-- if v := patch.ProjectID; v != nil {- set.Comma("project = ?", *v)+ if patch.ProjectID != nil {+ set.Comma("project = ?", projectID)}if v := patch.EnvironmentID; v != nil {if *v == "" {@@ -354,50 +342,42 @@ func (s *Store) UpdateDatabase(ctx context.Context, patch *UpdateDatabaseMessageif v := patch.Deleted; v != nil {set.Comma("deleted = ?", *v)}- if fs := patch.MetadataUpdates; len(fs) > 0 {- database, err := s.GetDatabase(ctx, &FindDatabaseMessage{- InstanceID: &patch.InstanceID,- DatabaseName: &patch.DatabaseName,- })- if err != nil {- return nil, errors.Wrapf(err, "failed to get database %q", common.FormatDatabase(patch.InstanceID, patch.DatabaseName))+ if len(patch.MetadataUpdates) > 0 {+ metadata := &storepb.DatabaseMetadata{}+ if err := common.ProtojsonUnmarshaler.Unmarshal(ownership.metadata, metadata); err != nil {+ return nil, errors.Wrapf(err, "failed to unmarshal metadata for database %q", common.FormatDatabase(patch.InstanceID, patch.DatabaseName))}- md := proto.CloneOf(database.Metadata)- for _, f := range fs {- f(md)+ for _, update := range patch.MetadataUpdates {+ update(metadata)}- metadataBytes, err := protojson.Marshal(md)+ metadataBytes, err := protojson.Marshal(metadata)if err != nil {return nil, err}set.Comma("metadata = ?", metadataBytes)}-if set.Len() == 0 {return nil, errors.New("no fields to update")}-q := qb.Q().Space("UPDATE db SET ? WHERE instance = ? AND name = ?", set, patch.InstanceID, patch.DatabaseName)-query, args, err := q.ToSQL()if err != nil {- return nil, errors.Wrapf(err, "failed to build sql")+ return nil, errors.Wrap(err, "failed to build sql")}-if _, err := s.GetDB().ExecContext(ctx, query, args...); err != nil {return nil, err}-- // Invalidate and update database cache.s.removeDatabaseCache(ctx, patch.InstanceID, patch.DatabaseName)return s.GetDatabase(ctx, &FindDatabaseMessage{InstanceID: &patch.InstanceID, DatabaseName: &patch.DatabaseName, ShowDeleted: true})}-// BatchUpdateDatabases update databases in batch.+// BatchUpdateDatabases updates databases in batch.func (s *Store) BatchUpdateDatabases(ctx context.Context, databases []*DatabaseMessage, update *BatchUpdateDatabases) error {set := qb.Q()-if update.ProjectID != nil {+ if *update.ProjectID == "" {+ return common.Errorf(common.Invalid, "database project cannot be empty")+ }set.Comma("project = ?", *update.ProjectID)}if v := update.EnvironmentID; v != nil {@@ -410,48 +390,167 @@ func (s *Store) BatchUpdateDatabases(ctx context.Context, databases []*DatabaseMif set.Len() == 0 {return errors.New("no update field specified")}-where := qb.Q()-if v := update.FindByEnvironmentID; v != nil {- where.Or("environment = ?", *v)+ where.Or("db.environment = ?", *v)}-if len(databases) > 0 {- var dbInstances, dbNames []string+ instances, names := make([]string, 0, len(databases)), make([]string, 0, len(databases))for _, database := range databases {- dbInstances = append(dbInstances, database.InstanceID)- dbNames = append(dbNames, database.DatabaseName)+ instances, names = append(instances, database.InstanceID), append(names, database.DatabaseName)}- where.Or(`(db.instance, db.name) IN (SELECT * FROM unnest(?::TEXT[], ?::TEXT[]))`, dbInstances, dbNames)+ where.Or(`(db.instance, db.name) IN (SELECT * FROM unnest(?::TEXT[], ?::TEXT[]))`, instances, names)}-if where.Len() == 0 {- return errors.Errorf("empty where")+ return errors.New("empty where")}-if update.Workspace != "" {where.And("db.instance IN (SELECT resource_id FROM instance WHERE workspace = ?)", update.Workspace)}- q := qb.Q().Space("UPDATE db SET ? WHERE ?", set, where)+ validOwnership := qb.Q().Space("TRUE")+ if update.ProjectID != nil {+ validOwnership = qb.Q().Space(`+ NOT EXISTS (+ SELECT 1 FROM targets+ WHERE instance_project IS NOT NULL+ AND (project <> instance_project OR instance_project <> ?)+ )+ `, *update.ProjectID)+ }+ q := qb.Q().Space(`+ WITH targets AS MATERIALIZED (+ SELECT db.instance, db.name, db.project, instance.project AS instance_project+ FROM db+ JOIN instance ON instance.resource_id = db.instance+ WHERE ?+ ),+ validation AS (+ SELECT ? AS valid+ ),+ updated AS (+ UPDATE db+ SET ?+ FROM targets, validation+ WHERE validation.valid+ AND db.instance = targets.instance+ AND db.name = targets.name+ RETURNING db.instance, db.name+ )+ SELECT validation.valid, updated.instance, updated.name+ FROM validation+ LEFT JOIN updated ON TRUE+ `, where, validOwnership, set)query, args, err := q.ToSQL()if err != nil {- return errors.Wrapf(err, "failed to build sql")+ return errors.Wrap(err, "failed to build sql")}-- if _, err := s.GetDB().ExecContext(ctx, query, args...); err != nil {- return err+ rows, err := s.GetDB().QueryContext(ctx, query, args...)+ if err != nil {+ return errors.Wrap(err, "failed to update databases")}+ defer rows.Close()- // Invalidate cache for updated databases- for _, database := range databases {+ var updated []*DatabaseMessage+ for rows.Next() {+ var valid bool+ var instanceID, databaseName sql.NullString+ if err := rows.Scan(&valid, &instanceID, &databaseName); err != nil {+ return errors.Wrap(err, "failed to scan updated database")+ }+ if !valid {+ return common.Errorf(common.Invalid, "cannot move a project instance database to another project")+ }+ if instanceID.Valid && databaseName.Valid {+ updated = append(updated, &DatabaseMessage{+ InstanceID: instanceID.String,+ DatabaseName: databaseName.String,+ })+ }+ }+ if err := rows.Err(); err != nil {+ return errors.Wrap(err, "failed to update databases")+ }+ for _, database := range updated {s.removeDatabaseCache(ctx, database.InstanceID, database.DatabaseName)}return nil}+type databaseOwnership struct {+ exists bool+ projectID string+ metadata []byte+ instanceProject *string+}++func (s *Store) getDatabaseOwnership(ctx context.Context, instanceID, databaseName string) (*databaseOwnership, error) {+ ownership := &databaseOwnership{}+ var databaseProject sql.NullString+ var instanceProject sql.NullString+ if err := s.GetDB().QueryRowContext(ctx, `+ SELECT db.project, db.metadata, instance.project+ FROM instance+ LEFT JOIN db ON db.instance = instance.resource_id AND db.name = $2+ WHERE instance.resource_id = $1+ `, instanceID, databaseName).Scan(&databaseProject, &ownership.metadata, &instanceProject); err != nil {+ if errors.Is(err, sql.ErrNoRows) {+ return nil, common.Errorf(common.NotFound, "instance %s not found", instanceID)+ }+ return nil, errors.Wrapf(err, "failed to get database ownership for instance %s", instanceID)+ }+ if databaseProject.Valid {+ ownership.exists = true+ ownership.projectID = databaseProject.String+ }+ if instanceProject.Valid {+ projectID := instanceProject.String+ ownership.instanceProject = &projectID+ }+ return ownership, nil+}++func (ownership *databaseOwnership) projectForDefaultCreate(requestedProjectID string) (string, error) {+ if ownership.instanceProject != nil {+ if ownership.exists && ownership.projectID != *ownership.instanceProject {+ return "", common.Errorf(common.Invalid, "database on project instance must belong to project %s", *ownership.instanceProject)+ }+ return *ownership.instanceProject, nil+ }+ if requestedProjectID == "" {+ return "", common.Errorf(common.Invalid, "database project cannot be empty")+ }+ return requestedProjectID, nil+}++func (ownership *databaseOwnership) projectForUpsert(requestedProjectID string) (string, error) {+ if ownership.instanceProject != nil {+ if ownership.exists && (requestedProjectID != *ownership.instanceProject || ownership.projectID != *ownership.instanceProject) {+ return "", common.Errorf(common.Invalid, "database on project instance must belong to project %s", *ownership.instanceProject)+ }+ return *ownership.instanceProject, nil+ }+ if requestedProjectID == "" {+ return "", common.Errorf(common.Invalid, "database project cannot be empty")+ }+ return requestedProjectID, nil+}++func (ownership *databaseOwnership) projectForUpdate(requestedProjectID *string) (string, error) {+ projectID := ownership.projectID+ if requestedProjectID != nil {+ projectID = *requestedProjectID+ }+ if projectID == "" {+ return "", common.Errorf(common.Invalid, "database project cannot be empty")+ }+ if ownership.instanceProject != nil && (ownership.projectID != *ownership.instanceProject || projectID != *ownership.instanceProject) {+ return "", common.Errorf(common.Invalid, "database on project instance must belong to project %s", *ownership.instanceProject)+ }+ return projectID, nil+}+func GetListDatabaseFilter(workspace, filter string) (*qb.Query, error) {if filter == "" {return nil, nildiff --git a/backend/store/database_ownership_test.go b/backend/store/database_ownership_test.gonew file mode 100644index 0000000000..6d043651de--- /dev/null+++ b/backend/store/database_ownership_test.go@@ -0,0 +1,169 @@+package store_test++import (+ "context"+ "testing"++ "github.com/stretchr/testify/require"++ storepb "github.com/bytebase/bytebase/backend/generated-go/store"+ "github.com/bytebase/bytebase/backend/store"+)++func TestDatabaseWritersRespectProjectInstanceOwnership(t *testing.T) {+ fixture := newProjectDeletionLockOrderFixture(t, `+ ALTER TABLE instance ADD COLUMN IF NOT EXISTS project TEXT REFERENCES project(resource_id);+ INSERT INTO project (resource_id, workspace, name) VALUES+ ('project-b', 'default', 'Project B'),+ ('project-c', 'default', 'Project C');+ INSERT INTO instance (resource_id, workspace, project) VALUES+ ('project-instance', 'default', 'project-b'),+ ('workspace-instance', 'default', NULL);+ `)+ ctx, s := fixture.ctx, fixture.store++ projectB, projectC := "project-b", "project-c"++ // Discovery always inherits the project-instance owner, even though schema+ // sync supplies the default project as its legacy assignment.+ database, err := s.CreateDatabaseDefault(ctx, &store.DatabaseMessage{+ InstanceID: "project-instance",+ DatabaseName: "discovered",+ ProjectID: "default",+ })+ require.NoError(t, err)+ require.Equal(t, projectB, database.ProjectID)++ database, err = s.UpsertDatabase(ctx, &store.DatabaseMessage{+ InstanceID: "project-instance",+ DatabaseName: "upsert-discovered",+ ProjectID: projectC,+ Metadata: &storepb.DatabaseMetadata{},+ })+ require.NoError(t, err)+ require.Equal(t, projectB, database.ProjectID)++ database, err = s.UpsertDatabase(ctx, &store.DatabaseMessage{+ InstanceID: "project-instance",+ DatabaseName: "discovered",+ ProjectID: projectB,+ Metadata: &storepb.DatabaseMetadata{},+ })+ require.NoError(t, err)+ require.Equal(t, projectB, database.ProjectID)++ _, err = s.UpdateDatabase(ctx, &store.UpdateDatabaseMessage{+ InstanceID: "project-instance",+ DatabaseName: "discovered",+ ProjectID: &projectB,+ })+ require.NoError(t, err)++ err = s.BatchUpdateDatabases(ctx, []*store.DatabaseMessage{{+ InstanceID: "project-instance",+ DatabaseName: "discovered",+ }}, &store.BatchUpdateDatabases{ProjectID: &projectB})+ require.NoError(t, err)++ // Every writer rejects changing a project-instance database's assignment.+ _, err = s.UpsertDatabase(ctx, &store.DatabaseMessage{+ InstanceID: "project-instance",+ DatabaseName: "discovered",+ ProjectID: projectC,+ Metadata: &storepb.DatabaseMetadata{},+ })+ require.Error(t, err)+ require.Equal(t, projectB, getDatabaseProject(ctx, t, s, "project-instance", "discovered"))++ _, err = s.UpdateDatabase(ctx, &store.UpdateDatabaseMessage{+ InstanceID: "project-instance",+ DatabaseName: "discovered",+ ProjectID: &projectC,+ })+ require.Error(t, err)+ require.Equal(t, projectB, getDatabaseProject(ctx, t, s, "project-instance", "discovered"))++ err = s.BatchUpdateDatabases(ctx, []*store.DatabaseMessage{{+ InstanceID: "project-instance",+ DatabaseName: "discovered",+ }}, &store.BatchUpdateDatabases{ProjectID: &projectC})+ require.Error(t, err)+ require.Equal(t, projectB, getDatabaseProject(ctx, t, s, "project-instance", "discovered"))++ // A workspace instance retains its existing independent database assignment.+ database, err = s.UpsertDatabase(ctx, &store.DatabaseMessage{+ InstanceID: "workspace-instance",+ DatabaseName: "independent",+ ProjectID: projectB,+ Metadata: &storepb.DatabaseMetadata{},+ })+ require.NoError(t, err)+ require.Equal(t, projectB, database.ProjectID)++ _, err = s.UpdateDatabase(ctx, &store.UpdateDatabaseMessage{+ InstanceID: "workspace-instance",+ DatabaseName: "independent",+ ProjectID: &projectC,+ })+ require.NoError(t, err)+ require.Equal(t, projectC, getDatabaseProject(ctx, t, s, "workspace-instance", "independent"))++ err = s.BatchUpdateDatabases(ctx, []*store.DatabaseMessage{{+ InstanceID: "workspace-instance",+ DatabaseName: "independent",+ }}, &store.BatchUpdateDatabases{ProjectID: &projectB})+ require.NoError(t, err)+ require.Equal(t, projectB, getDatabaseProject(ctx, t, s, "workspace-instance", "independent"))+}++func getDatabaseProject(ctx context.Context, t *testing.T, s *store.Store, instanceID, databaseName string) string {+ t.Helper()+ database, err := s.GetDatabase(ctx, &store.FindDatabaseMessage{+ InstanceID: &instanceID,+ DatabaseName: &databaseName,+ ShowDeleted: true,+ })+ require.NoError(t, err)+ require.NotNil(t, database)+ return database.ProjectID+}++func TestProjectInstanceDatabaseUpsertAllowsArchivedOwner(t *testing.T) {+ fixture := newProjectDeletionLockOrderFixture(t, `+ ALTER TABLE instance ADD COLUMN IF NOT EXISTS project TEXT REFERENCES project(resource_id);+ INSERT INTO project (resource_id, workspace, name, deleted)+ VALUES ('project-b', 'default', 'Project B', TRUE);+ INSERT INTO instance (resource_id, workspace, project)+ VALUES ('project-instance', 'default', 'project-b');+ `)++ database, err := fixture.store.UpsertDatabase(fixture.ctx, &store.DatabaseMessage{+ InstanceID: "project-instance",+ DatabaseName: "new-database",+ ProjectID: "project-b",+ Metadata: &storepb.DatabaseMetadata{},+ })+ require.NoError(t, err)+ require.Equal(t, "project-b", database.ProjectID)+}++func TestProjectInstanceDatabaseUpdateAllowsArchivedOwner(t *testing.T) {+ fixture := newProjectDeletionLockOrderFixture(t, `+ ALTER TABLE instance ADD COLUMN IF NOT EXISTS project TEXT REFERENCES project(resource_id);+ INSERT INTO project (resource_id, workspace, name, deleted)+ VALUES ('project-b', 'default', 'Project B', TRUE);+ INSERT INTO instance (resource_id, workspace, project)+ VALUES ('project-instance', 'default', 'project-b');+ INSERT INTO db (instance, name, project) VALUES+ ('project-instance', 'existing-database', 'project-b');+ `)++ deleted := true+ database, err := fixture.store.UpdateDatabase(fixture.ctx, &store.UpdateDatabaseMessage{+ InstanceID: "project-instance",+ DatabaseName: "existing-database",+ Deleted: &deleted,+ })+ require.NoError(t, err)+ require.True(t, database.Deleted)+}diff --git a/backend/store/instance.go b/backend/store/instance.goindex 18aac47eed..86c888f69c 100644--- a/backend/store/instance.go+++ b/backend/store/instance.go@@ -24,6 +24,7 @@ import (type InstanceMessage struct {ResourceID stringWorkspace string+ ProjectID *stringEnvironmentID *stringDeleted boolMetadata *storepb.Instance@@ -43,21 +44,33 @@ type UpdateInstanceMessage struct {// FindInstanceMessage is the message for finding instances.type FindInstanceMessage struct {- Workspace string- ResourceID *string- ResourceIDs *[]string- ShowDeleted bool- Limit *int- Offset *int- FilterQ *qb.Query- OrderByKeys []*OrderByKey+ Workspace string+ // ProjectID filters instances to this exact project.+ ProjectID *string+ // WorkspaceOnly filters workspace-level instances.+ WorkspaceOnly bool+ ResourceID *string+ ResourceIDs *[]string+ ShowDeleted bool+ Limit *int+ Offset *int+ FilterQ *qb.Query+ OrderByKeys []*OrderByKey}// GetInstance gets an instance by the resource_id.func (s *Store) GetInstance(ctx context.Context, find *FindInstanceMessage) (*InstanceMessage, error) {+ if find.ProjectID != nil && find.WorkspaceOnly {+ return nil, errors.New("project ID and workspace-only scope cannot both be set")+ }+if find.ResourceID != nil {if v, ok := s.instanceCache.Get(getInstanceCacheKey(*find.ResourceID)); ok && s.enableCache {- return v, nil+ if (find.ProjectID == nil && !find.WorkspaceOnly) ||+ (find.WorkspaceOnly && v.ProjectID == nil) ||+ (find.ProjectID != nil && v.ProjectID != nil && *find.ProjectID == *v.ProjectID) {+ return v, nil+ }}}@@ -82,7 +95,17 @@ func (s *Store) GetInstance(ctx context.Context, find *FindInstanceMessage) (*In// ListInstances lists all instance.func (s *Store) ListInstances(ctx context.Context, find *FindInstanceMessage) ([]*InstanceMessage, error) {+ if find.ProjectID != nil && find.WorkspaceOnly {+ return nil, errors.New("project ID and workspace-only scope cannot both be set")+ }+where := qb.Q().Space("instance.workspace = ?", find.Workspace)+ if v := find.ProjectID; v != nil {+ where.And("instance.project = ?", *v)+ }+ if find.WorkspaceOnly {+ where.And("instance.project IS NULL")+ }if filterQ := find.FilterQ; filterQ != nil {where.And("?", filterQ)}@@ -101,6 +124,7 @@ func (s *Store) ListInstances(ctx context.Context, find *FindInstanceMessage) ([SELECTinstance.resource_id,instance.workspace,+ instance.project,instance.environment,instance.deleted,instance.metadata@@ -138,11 +162,13 @@ func (s *Store) ListInstances(ctx context.Context, find *FindInstanceMessage) ([defer rows.Close()for rows.Next() {var instanceMessage InstanceMessage+ var project sql.NullStringvar environment sql.NullStringvar metadata []byteif err := rows.Scan(&instanceMessage.ResourceID,&instanceMessage.Workspace,+ &project,&environment,&instanceMessage.Deleted,&metadata,@@ -152,6 +178,9 @@ func (s *Store) ListInstances(ctx context.Context, find *FindInstanceMessage) ([if environment.Valid {instanceMessage.EnvironmentID = &environment.String}+ if project.Valid {+ instanceMessage.ProjectID = &project.String+ }instanceMetadata := &storepb.Instance{}if err := common.ProtojsonUnmarshaler.Unmarshal(metadata, instanceMetadata); err != nil {@@ -192,24 +221,56 @@ func (s *Store) CreateInstance(ctx context.Context, instanceCreate *InstanceMessenvironment = instanceCreate.EnvironmentID}+ tx, err := s.GetDB().BeginTx(ctx, nil)+ if err != nil {+ return nil, err+ }+ defer tx.Rollback()++ if instanceCreate.ProjectID != nil {+ if common.IsDefaultProject(instanceCreate.Workspace, *instanceCreate.ProjectID) {+ return nil, errors.Errorf("default project %s cannot own an instance", *instanceCreate.ProjectID)+ }+ var deleted bool+ if err := tx.QueryRowContext(ctx, `+ SELECT deleted+ FROM project+ WHERE resource_id = $1 AND workspace = $2+ FOR UPDATE+ `, *instanceCreate.ProjectID, instanceCreate.Workspace).Scan(&deleted); err != nil {+ if errors.Is(err, sql.ErrNoRows) {+ return nil, common.Errorf(common.NotFound, "project %s not found", *instanceCreate.ProjectID)+ }+ return nil, errors.Wrapf(err, "failed to lock project %s", *instanceCreate.ProjectID)+ }+ if deleted {+ return nil, common.Errorf(common.NotFound, "project %s is deleted", *instanceCreate.ProjectID)+ }+ }+q := qb.Q().Space(`INSERT INTO instance (resource_id,workspace,+ project,environment,metadata- ) VALUES (?, ?, ?, ?)- `, instanceCreate.ResourceID, instanceCreate.Workspace, environment, metadataBytes)+ ) VALUES (?, ?, ?, ?, ?)+ `, instanceCreate.ResourceID, instanceCreate.Workspace, instanceCreate.ProjectID, environment, metadataBytes)query, args, err := q.ToSQL()if err != nil {return nil, errors.Wrapf(err, "failed to build sql")}- if _, err := s.GetDB().ExecContext(ctx, query, args...); err != nil {+ if _, err := tx.ExecContext(ctx, query, args...); err != nil {+ return nil, err+ }+ if err := tx.Commit(); err != nil {return nil, err}instance := &InstanceMessage{EnvironmentID: instanceCreate.EnvironmentID,+ ProjectID: instanceCreate.ProjectID,ResourceID: instanceCreate.ResourceID,Workspace: instanceCreate.Workspace,Metadata: instanceCreate.Metadata,@@ -267,20 +328,35 @@ func (s *Store) UpdateInstance(ctx context.Context, patch *UpdateInstanceMessageq := qb.Q().Space("UPDATE instance SET ?", set).Space("WHERE ?", where)+ if v := patch.ResourceID; v != nil {+ q.Space("RETURNING workspace, project")+ query, args, err := q.ToSQL()+ if err != nil {+ return nil, errors.Wrapf(err, "failed to build sql")+ }+ var workspace string+ var project sql.NullString+ if err := s.GetDB().QueryRowContext(ctx, query, args...).Scan(&workspace, &project); err != nil {+ return nil, err+ }+ s.instanceCache.Remove(getInstanceCacheKey(*v))+ find := &FindInstanceMessage{Workspace: workspace, ResourceID: v}+ if project.Valid {+ find.ProjectID = &project.String+ } else {+ find.WorkspaceOnly = true+ }+ return s.GetInstance(ctx, find)+ }+query, args, err := q.ToSQL()if err != nil {return nil, errors.Wrapf(err, "failed to build sql")}-if _, err := s.GetDB().ExecContext(ctx, query, args...); err != nil {return nil, err}- if v := patch.ResourceID; v != nil {- s.instanceCache.Remove(getInstanceCacheKey(*v))- return s.GetInstance(ctx, &FindInstanceMessage{Workspace: patch.Workspace, ResourceID: v})- }-return nil, nil}@@ -549,9 +625,10 @@ func (s *Store) deobfuscateInstances(ctx context.Context, instances []*InstanceM// HasSampleInstances checks if there are sample instances in the database.func (s *Store) HasSampleInstances(ctx context.Context, workspaceID string) (bool, error) {instances, err := s.ListInstances(ctx, &FindInstanceMessage{- Workspace: workspaceID,- ResourceIDs: &[]string{"test-sample-instance", "prod-sample-instance"},- ShowDeleted: false,+ Workspace: workspaceID,+ WorkspaceOnly: true,+ ResourceIDs: &[]string{"test-sample-instance", "prod-sample-instance"},+ ShowDeleted: false,})if err != nil {return false, err@@ -571,18 +648,19 @@ func (s *Store) DeleteInstance(ctx context.Context, workspace string, resourceID}defer tx.Rollback()- // Delete query_history entries that reference this instance- // The database field contains instance reference like 'instances/{instance}/databases/{database}'+ // Delete query history before locking database-scoped rows to preserve the+ // canonical sibling-branch order.q := qb.Q().Space(`DELETE FROM query_historyWHERE database LIKE 'instances/' || ? || '/databases/%'- `, resourceID)+ OR database LIKE 'projects/%/instances/' || ? || '/databases/%'+ `, resourceID, resourceID)query, args, err := q.ToSQL()if err != nil {- return errors.Wrapf(err, "failed to build sql")+ return errors.Wrap(err, "failed to build query history delete query")}if _, err := tx.ExecContext(ctx, query, args...); err != nil {- return errors.Wrapf(err, "failed to delete query_history for instance %s", resourceID)+ return errors.Wrapf(err, "failed to delete query history for instance %s", resourceID)}// Update worksheets to nullify instance and db_name references@@ -633,6 +711,36 @@ func (s *Store) DeleteInstance(ctx context.Context, workspace string, resourceIDreturn errors.Wrapf(err, "failed to delete task_run for instance %s", resourceID)}+ // Lock tasks in full primary-key order before deleting them.+ q = qb.Q().Space(`+ SELECT project, id+ FROM task+ WHERE instance = ?+ ORDER BY project, id+ FOR UPDATE+ `, resourceID)+ query, args, err = q.ToSQL()+ if err != nil {+ return errors.Wrap(err, "failed to build instance task lock query")+ }+ if err := func() error {+ rows, err := tx.QueryContext(ctx, query, args...)+ if err != nil {+ return errors.Wrapf(err, "failed to lock tasks for instance %s", resourceID)+ }+ defer rows.Close()+ for rows.Next() {+ var projectID string+ var taskID int64+ if err := rows.Scan(&projectID, &taskID); err != nil {+ return errors.Wrap(err, "failed to scan locked task")+ }+ }+ return rows.Err()+ }(); err != nil {+ return err+ }+// Delete tasks associated with this instanceq = qb.Q().Space(`DELETE FROM task WHERE instance = ?@@ -705,7 +813,34 @@ func (s *Store) DeleteInstance(ctx context.Context, workspace string, resourceIDreturn errors.Wrapf(err, "failed to delete databases for instance %s", resourceID)}- // Finally, delete the instance itself (only if it's marked as deleted)+ // Lock the instance only after all descendant branches. A project owner is+ // locked after its instance, matching the canonical child-to-parent order.+ var projectID sql.NullString+ var deleted bool+ if err := tx.QueryRowContext(ctx, `+ SELECT project, deleted+ FROM instance+ WHERE resource_id = $1 AND workspace = $2+ FOR UPDATE+ `, resourceID, workspace).Scan(&projectID, &deleted); err != nil {+ if errors.Is(err, sql.ErrNoRows) {+ return errors.Errorf("instance %s not found or not marked as deleted", resourceID)+ }+ return errors.Wrapf(err, "failed to lock instance %s", resourceID)+ }+ if !deleted {+ return errors.Errorf("instance %s not found or not marked as deleted", resourceID)+ }+ if projectID.Valid {+ var lockedProjectID string+ if err := tx.QueryRowContext(ctx, `+ SELECT resource_id FROM project WHERE resource_id = $1 FOR UPDATE+ `, projectID.String).Scan(&lockedProjectID); err != nil {+ return errors.Wrapf(err, "failed to lock owning project %s", projectID.String)+ }+ }++ // Delete the soft-deleted instance after locking its owning project.q = qb.Q().Space(`DELETE FROM instanceWHERE resource_id = ? AND deleted = TRUE AND workspace = ?@@ -829,8 +964,8 @@ func GetListInstanceFilter(filter string) (*qb.Query, error) {return nil, errors.Errorf("invalid project filter %q", value)}return qb.Q().Space(- `EXISTS (SELECT 1 FROM db WHERE db.instance = instance.resource_id AND db.project = ?)`,- projectID), nil+ `(instance.project = ? OR EXISTS (SELECT 1 FROM db WHERE db.instance = instance.resource_id AND db.project = ?))`,+ projectID, projectID), nildefault:return nil, errors.Errorf("unsupport variable %q", variable)}diff --git a/backend/store/instance_project_test.go b/backend/store/instance_project_test.gonew file mode 100644index 0000000000..1ee49b7f1a--- /dev/null+++ b/backend/store/instance_project_test.go@@ -0,0 +1,222 @@+package store_test++import (+ "context"+ "database/sql"+ "fmt"+ "testing"+ "time"++ "github.com/stretchr/testify/require"++ "github.com/bytebase/bytebase/backend/common/testcontainer"+ storepb "github.com/bytebase/bytebase/backend/generated-go/store"+ "github.com/bytebase/bytebase/backend/migrator"+ "github.com/bytebase/bytebase/backend/store"+)++func newInstanceProjectFixture(t *testing.T) (context.Context, *sql.DB, *store.Store) {+ t.Helper()+ ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)+ t.Cleanup(cancel)+ container := testcontainer.GetTestPgContainer(ctx, t)+ t.Cleanup(func() { container.Close(context.Background()) })+ db := container.GetDB()+ require.NoError(t, migrator.MigrateSchema(ctx, db))+ _, err := db.ExecContext(ctx, `+ INSERT INTO workspace (resource_id) VALUES ('default');+ INSERT INTO project (resource_id, workspace, name, deleted) VALUES+ ('default', 'default', 'Default', FALSE),+ ('project-a', 'default', 'Project A', FALSE),+ ('deleted-project', 'default', 'Deleted Project', TRUE);+ `)+ require.NoError(t, err)+ pgURL := fmt.Sprintf(+ "host=%s port=%s user=postgres password=root-password database=postgres",+ container.GetHost(), container.GetPort(),+ )+ s, err := store.New(ctx, pgURL, false)+ require.NoError(t, err)+ t.Cleanup(func() { require.NoError(t, s.Close()) })+ return ctx, db, s+}++func testInstanceMetadata() *storepb.Instance {+ return &storepb.Instance{+ DataSources: []*storepb.DataSource{{+ Id: "admin",+ Type: storepb.DataSourceType_ADMIN,+ }},+ }+}++func TestCreateAndListProjectInstance(t *testing.T) {+ ctx, db, s := newInstanceProjectFixture(t)+ projectID := "project-a"+ instance, err := s.CreateInstance(ctx, &store.InstanceMessage{+ ResourceID: "project-instance",+ Workspace: "default",+ ProjectID: &projectID,+ Metadata: testInstanceMetadata(),+ })+ require.NoError(t, err)+ require.Equal(t, &projectID, instance.ProjectID)+ instanceID := "project-instance"+ updated, err := s.UpdateInstance(ctx, &store.UpdateInstanceMessage{+ ResourceID: &instanceID,+ Workspace: "default",+ Metadata: testInstanceMetadata(),+ })+ require.NoError(t, err)+ require.Equal(t, &projectID, updated.ProjectID)+ _, err = s.CreateInstance(ctx, &store.InstanceMessage{+ ResourceID: "workspace-instance",+ Workspace: "default",+ Metadata: testInstanceMetadata(),+ })+ require.NoError(t, err)++ var persistedProjectID string+ require.NoError(t, db.QueryRowContext(ctx, `+ SELECT project FROM instance WHERE resource_id = 'project-instance'+ `).Scan(&persistedProjectID))+ require.Equal(t, projectID, persistedProjectID)++ projectInstances, err := s.ListInstances(ctx, &store.FindInstanceMessage{+ Workspace: "default",+ ProjectID: &projectID,+ })+ require.NoError(t, err)+ require.Len(t, projectInstances, 1)+ require.Equal(t, "project-instance", projectInstances[0].ResourceID)+ wrongScope, err := s.GetInstance(ctx, &store.FindInstanceMessage{+ Workspace: "default",+ WorkspaceOnly: true,+ ResourceID: &instanceID,+ })+ require.NoError(t, err)+ require.Nil(t, wrongScope)++ unfilteredInstances, err := s.ListInstances(ctx, &store.FindInstanceMessage{Workspace: "default"})+ require.NoError(t, err)+ require.Len(t, unfilteredInstances, 2)++ workspaceInstances, err := s.ListInstances(ctx, &store.FindInstanceMessage{+ Workspace: "default",+ WorkspaceOnly: true,+ })+ require.NoError(t, err)+ require.Len(t, workspaceInstances, 1)+ require.Equal(t, "workspace-instance", workspaceInstances[0].ResourceID)++ _, err = s.ListInstances(ctx, &store.FindInstanceMessage{+ Workspace: "default",+ ProjectID: &projectID,+ WorkspaceOnly: true,+ })+ require.Error(t, err)++ _, err = s.GetInstance(ctx, &store.FindInstanceMessage{+ Workspace: "default",+ ProjectID: &projectID,+ WorkspaceOnly: true,+ ResourceID: &instanceID,+ })+ require.Error(t, err)++ instanceByResourceID, err := s.GetInstanceByResourceID(ctx, "project-instance")+ require.NoError(t, err)+ require.Equal(t, &projectID, instanceByResourceID.ProjectID)++ allInstances, err := s.ListAllInstances(ctx, false)+ require.NoError(t, err)+ require.Len(t, allInstances, 2)+ require.Equal(t, &projectID, allInstances[0].ProjectID)+}++func TestUpdateInstanceWithoutWorkspace(t *testing.T) {+ ctx, _, s := newInstanceProjectFixture(t)+ instance, err := s.CreateInstance(ctx, &store.InstanceMessage{+ ResourceID: "workspace-instance",+ Workspace: "default",+ Metadata: testInstanceMetadata(),+ })+ require.NoError(t, err)++ updated, err := s.UpdateInstance(ctx, &store.UpdateInstanceMessage{+ ResourceID: &instance.ResourceID,+ Metadata: testInstanceMetadata(),+ })+ require.NoError(t, err)+ require.Equal(t, "default", updated.Workspace)+ require.Nil(t, updated.ProjectID)+}++func TestCreateProjectInstanceRejectsDefaultDeletedAndMissingProject(t *testing.T) {+ ctx, _, s := newInstanceProjectFixture(t)+ for _, projectID := range []string{"default", "deleted-project", "missing-project"} {+ t.Run(projectID, func(t *testing.T) {+ _, err := s.CreateInstance(ctx, &store.InstanceMessage{+ ResourceID: projectID + "-instance",+ Workspace: "default",+ ProjectID: &projectID,+ Metadata: testInstanceMetadata(),+ })+ require.Error(t, err)+ })+ }+}++func TestDeleteProjectDeletesProjectInstancesAndKeepsWorkspaceInstanceDatabases(t *testing.T) {+ ctx, db, s := newInstanceProjectFixture(t)+ _, err := db.ExecContext(ctx, `+ UPDATE project SET deleted = TRUE WHERE resource_id = 'project-a';+ INSERT INTO instance (resource_id, workspace, project) VALUES+ ('project-instance', 'default', 'project-a'),+ ('workspace-instance', 'default', NULL);+ INSERT INTO db (instance, name, project) VALUES+ ('project-instance', 'project-db', 'project-a'),+ ('workspace-instance', 'workspace-db', 'project-a');+ `)+ require.NoError(t, err)++ require.NoError(t, s.DeleteProject(ctx, "default", "project-a"))++ var projectInstanceCount, projectDatabaseCount int+ require.NoError(t, db.QueryRowContext(ctx, `+ SELECT COUNT(*) FROM instance WHERE resource_id = 'project-instance'+ `).Scan(&projectInstanceCount))+ require.NoError(t, db.QueryRowContext(ctx, `+ SELECT COUNT(*) FROM db WHERE instance = 'project-instance'+ `).Scan(&projectDatabaseCount))+ require.Zero(t, projectInstanceCount)+ require.Zero(t, projectDatabaseCount)++ var workspaceDatabaseProject string+ require.NoError(t, db.QueryRowContext(ctx, `+ SELECT project FROM db WHERE instance = 'workspace-instance' AND name = 'workspace-db'+ `).Scan(&workspaceDatabaseProject))+ require.Equal(t, "default", workspaceDatabaseProject)+}++func TestDeleteProjectInstancePurgesHistory(t *testing.T) {+ ctx, db, s := newInstanceProjectFixture(t)+ _, err := db.ExecContext(ctx, `+ INSERT INTO instance (resource_id, workspace, project, deleted) VALUES+ ('project-instance', 'default', 'project-a', TRUE);+ INSERT INTO db (instance, name, project) VALUES+ ('project-instance', 'project-db', 'project-a');+ INSERT INTO query_history (resource_id, creator, project, database, statement, type) VALUES+ ('history-a', '[email protected]', 'project-a',+ 'projects/project-a/instances/project-instance/databases/project-db', '', 'QUERY');+ `)+ require.NoError(t, err)++ require.NoError(t, s.DeleteInstance(ctx, "default", "project-instance"))++ for _, table := range []string{"instance", "db", "query_history"} {+ var count int+ require.NoError(t, db.QueryRowContext(ctx, "SELECT COUNT(*) FROM "+table).Scan(&count))+ require.Zero(t, count, "%s should be removed", table)+ }+}diff --git a/backend/store/instance_purge_lock_order_test.go b/backend/store/instance_purge_lock_order_test.gonew file mode 100644index 0000000000..f024679f09--- /dev/null+++ b/backend/store/instance_purge_lock_order_test.go@@ -0,0 +1,115 @@+package store_test++import (+ "context"+ "database/sql"+ "testing"+ "time"++ "github.com/stretchr/testify/require"+)++func waitForBackendBlockedBy(ctx context.Context, t *testing.T, db *sql.DB, blockingPID, waitingPID int) {+ t.Helper()+ require.Eventually(t, func() bool {+ var blocked bool+ err := db.QueryRowContext(ctx, `+ SELECT $1 = ANY(pg_blocking_pids($2))+ `, blockingPID, waitingPID).Scan(&blocked)+ return err == nil && blocked+ }, maintenanceLockWait, 10*time.Millisecond, "backend %d should wait for backend %d", waitingPID, blockingPID)+}++func TestDeleteInstanceDatabaseLockOrder(t *testing.T) {+ const seedSQL = `+ INSERT INTO instance (resource_id, workspace, project, deleted)+ VALUES ('instance-a', 'default', 'project-a', TRUE);+ INSERT INTO db (instance, name, project) VALUES ('instance-a', 'db-a', 'project-a');+ `+ testPurgeDatabaseLockOrder(t, seedSQL, func(fixture *projectDeletionLockOrderFixture) error {+ return fixture.store.DeleteInstance(fixture.ctx, "default", "instance-a")+ }, func(t *testing.T, fixture *projectDeletionLockOrderFixture) {+ var projectCount int+ require.NoError(t, fixture.db.QueryRowContext(fixture.ctx, "SELECT COUNT(*) FROM project WHERE resource_id = 'project-a'").Scan(&projectCount))+ require.Equal(t, 1, projectCount, "instance purge must preserve its project owner")+ })+}++func TestDeleteProjectDatabaseLockOrder(t *testing.T) {+ const seedSQL = `+ INSERT INTO instance (resource_id, workspace, project, deleted)+ VALUES ('instance-a', 'default', 'project-a', TRUE);+ INSERT INTO db (instance, name, project) VALUES ('instance-a', 'db-a', 'project-a');+ `+ testPurgeDatabaseLockOrder(t, seedSQL, func(fixture *projectDeletionLockOrderFixture) error {+ return fixture.store.DeleteProject(fixture.ctx, "default", "project-a")+ }, func(t *testing.T, fixture *projectDeletionLockOrderFixture) {+ var projectCount int+ require.NoError(t, fixture.db.QueryRowContext(fixture.ctx, "SELECT COUNT(*) FROM project WHERE resource_id = 'project-a'").Scan(&projectCount))+ require.Zero(t, projectCount, "project purge must remove its project owner")+ })+}++func testPurgeDatabaseLockOrder(+ t *testing.T,+ seedSQL string,+ purge func(*projectDeletionLockOrderFixture) error,+ assertTerminalState func(*testing.T, *projectDeletionLockOrderFixture),+) {+ t.Run("purge locks database before instance", func(t *testing.T) {+ fixture := newProjectDeletionLockOrderFixture(t, seedSQL)+ instanceTx, err := fixture.db.BeginTx(fixture.ctx, nil)+ require.NoError(t, err)+ defer instanceTx.Rollback()++ var instanceLockPID int+ require.NoError(t, instanceTx.QueryRowContext(fixture.ctx, "SELECT pg_backend_pid()").Scan(&instanceLockPID))+ var instanceID string+ require.NoError(t, instanceTx.QueryRowContext(fixture.ctx, `+ SELECT resource_id FROM instance WHERE resource_id = 'instance-a' FOR UPDATE+ `).Scan(&instanceID))++ purgeResult := make(chan error, 1)+ go func() { purgeResult <- purge(fixture) }()+ var purgePID int+ require.Eventually(t, func() bool {+ return fixture.db.QueryRowContext(fixture.ctx, `+ SELECT COALESCE((+ SELECT pid FROM pg_stat_activity+ WHERE $1 = ANY(pg_blocking_pids(pid))+ ORDER BY pid LIMIT 1+ ), 0)+ `, instanceLockPID).Scan(&purgePID) == nil && purgePID != 0+ }, maintenanceLockWait, 10*time.Millisecond, "purge should wait for the instance lock")++ writerConn, err := fixture.db.Conn(fixture.ctx)+ require.NoError(t, err)+ defer writerConn.Close()+ writerTx, err := writerConn.BeginTx(fixture.ctx, nil)+ require.NoError(t, err)+ defer writerTx.Rollback()+ var writerPID int+ require.NoError(t, writerTx.QueryRowContext(fixture.ctx, "SELECT pg_backend_pid()").Scan(&writerPID))+ writerResult := make(chan error, 1)+ go func() {+ var name string+ writerResult <- writerTx.QueryRowContext(fixture.ctx, `+ SELECT name FROM db+ WHERE instance = 'instance-a' AND name = 'db-a'+ FOR UPDATE+ `).Scan(&name)+ }()+ waitForBackendBlockedBy(fixture.ctx, t, fixture.db, purgePID, writerPID)++ require.NoError(t, instanceTx.Commit())+ requireMaintenanceResult(t, purgeResult)+ require.ErrorIs(t, <-writerResult, sql.ErrNoRows)++ var databaseCount, instanceCount int+ require.NoError(t, fixture.db.QueryRowContext(fixture.ctx, "SELECT COUNT(*) FROM db WHERE instance = 'instance-a'").Scan(&databaseCount))+ require.NoError(t, fixture.db.QueryRowContext(fixture.ctx, "SELECT COUNT(*) FROM instance WHERE resource_id = 'instance-a'").Scan(&instanceCount))+ require.Zero(t, databaseCount, "the database should be removed after the waiting writer resumes")+ require.Zero(t, instanceCount, "the instance should be removed after the waiting writer resumes")+ assertTerminalState(t, fixture)+ })+}diff --git a/backend/store/maintenance_lock_order_test.go b/backend/store/maintenance_lock_order_test.goindex 0b22fcded9..eb5d8ea36a 100644--- a/backend/store/maintenance_lock_order_test.go+++ b/backend/store/maintenance_lock_order_test.go@@ -8,6 +8,8 @@ import ("time""github.com/stretchr/testify/require"++ "github.com/bytebase/bytebase/backend/store")const maintenanceLockWait = 10 * time.Second@@ -71,6 +73,37 @@ func waitForMaintenanceBarrier(ctx context.Context, t *testing.T, db *sql.DB, id}, maintenanceLockWait, 10*time.Millisecond, "operation should reach the advisory barrier")}+func maintenanceBarrierWaitingPID(ctx context.Context, t *testing.T, db *sql.DB, id int) int {+ t.Helper()+ var pid int+ require.NoError(t, db.QueryRowContext(ctx, `+ SELECT pid+ FROM pg_locks+ WHERE locktype = 'advisory'+ AND objid = $1+ AND NOT granted+ ORDER BY pid+ LIMIT 1+ `, id).Scan(&pid))+ return pid+}++func waitForBackendBlockedByPID(ctx context.Context, t *testing.T, db *sql.DB, blockingPID int) {+ t.Helper()+ var waitingPID int+ require.Eventually(t, func() bool {+ return db.QueryRowContext(ctx, `+ SELECT COALESCE((+ SELECT pid+ FROM pg_stat_activity+ WHERE $1 = ANY(pg_blocking_pids(pid))+ ORDER BY pid+ LIMIT 1+ ), 0)+ `, blockingPID).Scan(&waitingPID) == nil && waitingPID != 0+ }, maintenanceLockWait, 10*time.Millisecond, "operation should wait for backend %d", blockingPID)+}+func waitForOperationBehindMaintenanceBarrier(ctx context.Context, t *testing.T, db *sql.DB, id int) {t.Helper()require.Eventually(t, func() bool {@@ -158,7 +191,8 @@ func requireUserInstanceDeletionState(ctx context.Context, t *testing.T, db *sqlfunc TestDeleteProjectAndDeleteInstanceLockOrder(t *testing.T) {const seedSQL = `- INSERT INTO instance (resource_id, workspace, deleted) VALUES ('instance-a', 'default', TRUE);+ INSERT INTO instance (resource_id, workspace, project, deleted)+ VALUES ('instance-a', 'default', 'project-a', TRUE);INSERT INTO db (instance, name, project) VALUES ('instance-a', 'db-a', 'project-a');INSERT INTO service_account (name, email, workspace, service_key_hash, project)VALUES ('service account', '[email protected]', 'default', 'unused', 'project-a');@@ -182,14 +216,15 @@ func TestDeleteProjectAndDeleteInstanceLockOrder(t *testing.T) {projectResult := make(chan error, 1)go func() { projectResult <- fixture.store.DeleteProject(fixture.ctx, "default", "project-a") }()waitForMaintenanceBarrier(fixture.ctx, t, fixture.db, barrierID)+ projectPID := maintenanceBarrierWaitingPID(fixture.ctx, t, fixture.db, barrierID)instanceResult := make(chan error, 1)go func() { instanceResult <- fixture.store.DeleteInstance(fixture.ctx, "default", "instance-a") }()- waitForOperationBehindMaintenanceBarrier(fixture.ctx, t, fixture.db, barrierID)+ waitForBackendBlockedByPID(fixture.ctx, t, fixture.db, projectPID)barrier.release(t)requireMaintenanceResult(t, projectResult)- requireMaintenanceResult(t, instanceResult)+ require.ErrorContains(t, <-instanceResult, "not found or not marked as deleted")requireProjectInstanceDeletionState(fixture.ctx, t, fixture.db)})@@ -203,10 +238,11 @@ func TestDeleteProjectAndDeleteInstanceLockOrder(t *testing.T) {instanceResult := make(chan error, 1)go func() { instanceResult <- fixture.store.DeleteInstance(fixture.ctx, "default", "instance-a") }()waitForMaintenanceBarrier(fixture.ctx, t, fixture.db, barrierID)+ instancePID := maintenanceBarrierWaitingPID(fixture.ctx, t, fixture.db, barrierID)projectResult := make(chan error, 1)go func() { projectResult <- fixture.store.DeleteProject(fixture.ctx, "default", "project-a") }()- waitForOperationBehindMaintenanceBarrier(fixture.ctx, t, fixture.db, barrierID)+ waitForBackendBlockedByPID(fixture.ctx, t, fixture.db, instancePID)barrier.release(t)requireMaintenanceResult(t, instanceResult)@@ -215,6 +251,67 @@ func TestDeleteProjectAndDeleteInstanceLockOrder(t *testing.T) {})}+func TestCreateProjectInstanceAndDeleteProjectLockOrder(t *testing.T) {+ createProjectInstance := func(fixture *projectDeletionLockOrderFixture) error {+ projectID := "project-a"+ _, err := fixture.store.CreateInstance(fixture.ctx, &store.InstanceMessage{+ ResourceID: "instance-a",+ Workspace: "default",+ ProjectID: &projectID,+ Metadata: testInstanceMetadata(),+ })+ return err+ }++ requireNoProjectInstance := func(t *testing.T, fixture *projectDeletionLockOrderFixture) {+ t.Helper()+ var projectCount, instanceCount int+ require.NoError(t, fixture.db.QueryRowContext(fixture.ctx, "SELECT COUNT(*) FROM project").Scan(&projectCount))+ require.NoError(t, fixture.db.QueryRowContext(fixture.ctx, "SELECT COUNT(*) FROM instance WHERE resource_id = 'instance-a'").Scan(&instanceCount))+ require.Equal(t, 1, projectCount, "only the default project should remain")+ require.Zero(t, instanceCount, "the project instance should not survive project deletion")+ }++ t.Run("delete project first rejects an absent project instance", func(t *testing.T) {+ fixture := newProjectDeletionLockOrderFixture(t, `+ INSERT INTO worksheet (resource_id, creator, project, name, statement, visibility)+ VALUES ('worksheet-a', '[email protected]', 'project-a', 'Worksheet A', '', 'PROJECT_READ');+ `)+ const barrierID = 9927+ barrier := newMaintenanceLockBarrier(fixture.ctx, t, fixture.db, barrierID)+ installMaintenanceLockBarrier(t, fixture.db, barrierID,+ "AFTER UPDATE OF project ON worksheet FOR EACH ROW")++ deleteResult := make(chan error, 1)+ go func() { deleteResult <- fixture.store.DeleteProject(fixture.ctx, "default", "project-a") }()+ waitForMaintenanceBarrier(fixture.ctx, t, fixture.db, barrierID)++ createResult := make(chan error, 1)+ go func() { createResult <- createProjectInstance(fixture) }()+ select {+ case err := <-createResult:+ require.Error(t, err)+ case <-time.After(maintenanceLockWait):+ t.Fatal("project instance creation should reject a deleted project before purge completion")+ }+ barrier.release(t)++ requireMaintenanceResult(t, deleteResult)+ requireNoProjectInstance(t, fixture)+ })++ t.Run("new project instance is removed by project deletion", func(t *testing.T) {+ fixture := newProjectDeletionLockOrderFixture(t, "")+ _, err := fixture.db.ExecContext(fixture.ctx, `+ INSERT INTO instance (resource_id, workspace, project)+ VALUES ('instance-a', 'default', 'project-a')+ `)+ require.NoError(t, err)+ require.NoError(t, fixture.store.DeleteProject(fixture.ctx, "default", "project-a"))+ requireNoProjectInstance(t, fixture)+ })+}+func TestUpdateUserEmailAndDeleteProjectLockOrder(t *testing.T) {const seedSQL = `INSERT INTO principal (name, email, password_hash) VALUES ('User A', '[email protected]', 'unused');diff --git a/backend/store/predefined_roles.go b/backend/store/predefined_roles.goindex f8936e7da8..3d5037e296 100644--- a/backend/store/predefined_roles.go+++ b/backend/store/predefined_roles.go@@ -358,6 +358,13 @@ var PredefinedRoles = []*RoleMessage{permission.DatabasesList,permission.DatabasesSync,permission.DatabasesUpdate,+ permission.InstancesCreate,+ permission.InstancesDelete,+ permission.InstancesGet,+ permission.InstancesList,+ permission.InstancesSync,+ permission.InstancesUndelete,+ permission.InstancesUpdate,permission.IssueCommentsCreate,permission.IssueCommentsList,permission.IssueCommentsUpdate,diff --git a/backend/store/predefined_roles_test.go b/backend/store/predefined_roles_test.goindex fb7ff9e953..fca161aa46 100644--- a/backend/store/predefined_roles_test.go+++ b/backend/store/predefined_roles_test.go@@ -8,6 +8,24 @@ import ("github.com/bytebase/bytebase/backend/common/permission")+func TestProjectOwnerInstancePermissions(t *testing.T) {+ role := GetPredefinedRole(ProjectOwnerRole)+ require.NotNil(t, role)++ instancePermissions := []permission.Permission{+ permission.InstancesCreate,+ permission.InstancesDelete,+ permission.InstancesGet,+ permission.InstancesList,+ permission.InstancesSync,+ permission.InstancesUndelete,+ permission.InstancesUpdate,+ }+ for _, p := range instancePermissions {+ require.Truef(t, role.Permissions[p], "Project Owner must have %q", p)+ }+}+// Test that every permission in predefined roles is also defined in permission.yaml.func TestPredefinedRolesPermissionsExist(t *testing.T) {a := require.New(t)diff --git a/backend/store/project.go b/backend/store/project.goindex d055138c9b..57d2760612 100644--- a/backend/store/project.go+++ b/backend/store/project.go@@ -2,6 +2,7 @@ package storeimport ("context"+ stdsql "database/sql""fmt""strings"@@ -348,7 +349,8 @@ func (s *Store) DeleteProject(ctx context.Context, workspace string, resourceID}defer tx.Rollback()- // Delete query_history entries that reference this project+ // Delete query history before locking database-scoped rows to preserve the+ // canonical sibling-branch order.q := qb.Q().Space("DELETE FROM query_history WHERE project = ?", resourceID)sql, args, err := q.ToSQL()if err != nil {@@ -358,7 +360,7 @@ func (s *Store) DeleteProject(ctx context.Context, workspace string, resourceIDreturn errors.Wrapf(err, "failed to delete query_history for project %s", resourceID)}- // Delete policy entries that reference this project+ // Delete policy entries that reference this project.q = qb.Q().Space("DELETE FROM policy")q.Space("WHERE (resource_type = ? AND resource = 'projects/' || ?)", storepb.Policy_PROJECT.String(), resourceID)q.And("workspace = ?", workspace)@@ -367,7 +369,7 @@ func (s *Store) DeleteProject(ctx context.Context, workspace string, resourceIDreturn errors.Wrap(err, "failed to build policy delete query")}if _, err := tx.ExecContext(ctx, sql, args...); err != nil {- return errors.Wrapf(err, "failed to delete policies for project %s", resourceID)+ return errors.Wrapf(err, "failed to delete policy for project %s", resourceID)}// Delete worksheet_organizer entries referencing project principals.@@ -382,6 +384,20 @@ func (s *Store) DeleteProject(ctx context.Context, workspace string, resourceIDreturn errors.Wrapf(err, "failed to delete worksheet_organizer for project %s", resourceID)}+ // Clear project-instance references before deleting their instances.+ q = qb.Q().Space(`+ UPDATE worksheet+ SET instance = NULL, db_name = NULL+ WHERE instance IN (SELECT resource_id FROM instance WHERE project = ?)+ `, resourceID)+ sql, args, err = q.ToSQL()+ if err != nil {+ return errors.Wrap(err, "failed to build project instance worksheet update query")+ }+ if _, err := tx.ExecContext(ctx, sql, args...); err != nil {+ return errors.Wrapf(err, "failed to update worksheets for project instances in project %s", resourceID)+ }+// Delete worksheets created by project service accounts or workload identities.q = qb.Q().Space(`DELETE FROM worksheetWHERE creator IN (SELECT email FROM service_account WHERE project = ? AND workspace = ?)@@ -547,26 +563,52 @@ func (s *Store) DeleteProject(ctx context.Context, workspace string, resourceIDreturn errors.Wrapf(err, "failed to delete db_groups for project %s", resourceID)}- // Nullify revision.deleter references.- q = qb.Q().Space(`UPDATE revision SET deleter = NULL- WHERE deleter IN (SELECT email FROM service_account WHERE project = ? AND workspace = ?)- OR deleter IN (SELECT email FROM workload_identity WHERE project = ? AND workspace = ?)`, resourceID, workspace, resourceID, workspace)- sql, args, err = q.ToSQL()- if err != nil {- return errors.Wrap(err, "failed to build revision update query")- }- if _, err := tx.ExecContext(ctx, sql, args...); err != nil {- return errors.Wrapf(err, "failed to nullify revision.deleter for project %s", resourceID)+ // Purge the databases and database-scoped history of project instances.+ // Workspace instances remain shared infrastructure, so their databases are+ // reassigned to the default project below instead.+ for _, statement := range []struct {+ name string+ sql string+ }{+ {"changelog", "DELETE FROM changelog WHERE instance IN (SELECT resource_id FROM instance WHERE project = ?)"},+ {"sync_history", "DELETE FROM sync_history WHERE instance IN (SELECT resource_id FROM instance WHERE project = ?)"},+ {"revision deleter", `UPDATE revision SET deleter = NULL+ WHERE deleter IN (SELECT email FROM service_account WHERE project = ? AND workspace = ?)+ OR deleter IN (SELECT email FROM workload_identity WHERE project = ? AND workspace = ?)`},+ {"revision", "DELETE FROM revision WHERE instance IN (SELECT resource_id FROM instance WHERE project = ?)"},+ {"db_schema", "DELETE FROM db_schema WHERE instance IN (SELECT resource_id FROM instance WHERE project = ?)"},+ {"database", "DELETE FROM db WHERE instance IN (SELECT resource_id FROM instance WHERE project = ?)"},+ } {+ if statement.name == "revision deleter" {+ q = qb.Q().Space(statement.sql, resourceID, workspace, resourceID, workspace)+ } else {+ q = qb.Q().Space(statement.sql, resourceID)+ }+ sql, args, err = q.ToSQL()+ if err != nil {+ return errors.Wrapf(err, "failed to build %s delete query", statement.name)+ }+ if _, err := tx.ExecContext(ctx, sql, args...); err != nil {+ return errors.Wrapf(err, "failed to delete %s for project %s", statement.name, resourceID)+ }}- // Move databases to the default project instead of deleting them- q = qb.Q().Space("UPDATE db SET project = ? WHERE project = ?", defaultProjectID, resourceID)+ // Move only workspace-instance databases to the default project. Project+ // instance databases were deleted with their owning instance above.+ q = qb.Q().Space(`+ UPDATE db+ SET project = ?+ FROM instance+ WHERE db.instance = instance.resource_id+ AND db.project = ?+ AND instance.project IS NULL+ `, defaultProjectID, resourceID)sql, args, err = q.ToSQL()if err != nil {- return errors.Wrap(err, "failed to build db update query")+ return errors.Wrap(err, "failed to build workspace database update query")}if _, err := tx.ExecContext(ctx, sql, args...); err != nil {- return errors.Wrapf(err, "failed to move databases to default project for project %s", resourceID)+ return errors.Wrapf(err, "failed to move workspace databases to default project for project %s", resourceID)}// Delete project webhooks@@ -599,6 +641,63 @@ func (s *Store) DeleteProject(ctx context.Context, workspace string, resourceIDreturn errors.Wrapf(err, "failed to delete workload identities for project %s", resourceID)}+ // Lock existing project instances after all of their descendants. A new+ // project instance is rejected because this project is already soft-deleted.+ q = qb.Q().Space(`+ SELECT resource_id+ FROM instance+ WHERE project = ?+ ORDER BY resource_id+ FOR UPDATE+ `, resourceID)+ sql, args, err = q.ToSQL()+ if err != nil {+ return errors.Wrap(err, "failed to build project instance lock query")+ }+ if err := func() error {+ rows, err := tx.QueryContext(ctx, sql, args...)+ if err != nil {+ return errors.Wrapf(err, "failed to lock project instances for project %s", resourceID)+ }+ defer rows.Close()+ for rows.Next() {+ var instanceID string+ if err := rows.Scan(&instanceID); err != nil {+ return errors.Wrap(err, "failed to scan locked project instance")+ }+ }+ return rows.Err()+ }(); err != nil {+ return err+ }++ // Every project instance is deleted with its owner; they are never converted+ // into workspace instances.+ q = qb.Q().Space("DELETE FROM instance WHERE project = ?", resourceID)+ sql, args, err = q.ToSQL()+ if err != nil {+ return errors.Wrap(err, "failed to build project instance delete query")+ }+ if _, err := tx.ExecContext(ctx, sql, args...); err != nil {+ return errors.Wrapf(err, "failed to delete project instances for project %s", resourceID)+ }++ var projectDeleted bool+ if err := tx.QueryRowContext(ctx, `+ SELECT deleted+ FROM project+ WHERE resource_id = $1 AND workspace = $2+ FOR UPDATE+ `, resourceID, workspace).Scan(&projectDeleted); err != nil {+ if errors.Is(err, stdsql.ErrNoRows) {+ return errors.Errorf("project %s not found or not marked as deleted", resourceID)+ }+ return errors.Wrapf(err, "failed to lock project %s", resourceID)+ }+ if !projectDeleted {+ return errors.Errorf("project %s not found or not marked as deleted", resourceID)+ }+// Finally, delete the project itself (only if it's marked as deleted)q = qb.Q().Space("DELETE FROM project WHERE resource_id = ? AND deleted = TRUE AND workspace = ?", resourceID, workspace)sql, args, err = q.ToSQL()diff --git a/backend/store/runner_queries.go b/backend/store/runner_queries.goindex 82f79a41c6..ba535e8e28 100644--- a/backend/store/runner_queries.go+++ b/backend/store/runner_queries.go@@ -64,6 +64,7 @@ func (s *Store) GetInstanceByResourceID(ctx context.Context, resourceID string)SELECTinstance.resource_id,instance.workspace,+ instance.project,instance.environment,instance.deleted,instance.metadata@@ -76,11 +77,13 @@ func (s *Store) GetInstanceByResourceID(ctx context.Context, resourceID string)}var instance InstanceMessage+ var project sql.NullStringvar environment sql.NullStringvar metadata []byteif err := s.GetDB().QueryRowContext(ctx, query, args...).Scan(&instance.ResourceID,&instance.Workspace,+ &project,&environment,&instance.Deleted,&metadata,@@ -93,6 +96,9 @@ func (s *Store) GetInstanceByResourceID(ctx context.Context, resourceID string)if environment.Valid {instance.EnvironmentID = &environment.String}+ if project.Valid {+ instance.ProjectID = &project.String+ }instanceMetadata := &storepb.Instance{}if err := common.ProtojsonUnmarshaler.Unmarshal(metadata, instanceMetadata); err != nil {return nil, err@@ -118,6 +124,7 @@ func (s *Store) ListAllInstances(ctx context.Context, showDeleted bool) ([]*InstSELECTinstance.resource_id,instance.workspace,+ instance.project,instance.environment,instance.deleted,instance.metadata@@ -139,11 +146,13 @@ func (s *Store) ListAllInstances(ctx context.Context, showDeleted bool) ([]*Instdefer rows.Close()for rows.Next() {var instance InstanceMessage+ var project sql.NullStringvar environment sql.NullStringvar metadata []byteif err := rows.Scan(&instance.ResourceID,&instance.Workspace,+ &project,&environment,&instance.Deleted,&metadata,@@ -153,6 +162,9 @@ func (s *Store) ListAllInstances(ctx context.Context, showDeleted bool) ([]*Instif environment.Valid {instance.EnvironmentID = &environment.String}+ if project.Valid {+ instance.ProjectID = &project.String+ }instanceMetadata := &storepb.Instance{}if err := common.ProtojsonUnmarshaler.Unmarshal(metadata, instanceMetadata); err != nil {return nil, errdiff --git a/backend/tests/project_instance_iam_collision_test.go b/backend/tests/project_instance_iam_collision_test.gonew file mode 100644index 0000000000..a5564ae216--- /dev/null+++ b/backend/tests/project_instance_iam_collision_test.go@@ -0,0 +1,284 @@+package tests++import (+ "context"+ "fmt"+ "testing"+ "time"++ "connectrpc.com/connect"+ "github.com/stretchr/testify/require"+ "google.golang.org/protobuf/types/known/fieldmaskpb"++ v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"+)++func TestProjectInstanceIAM(t *testing.T) {+ t.Parallel()+ a := require.New(t)+ ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)+ defer cancel()+ ctl := &controller{}+ ctx, err := ctl.StartServerWithExternalPg(ctx)+ a.NoError(err)+ defer ctl.Close(ctx)++ ownerToken := ctl.authInterceptor.token+ pgContainer, err := provisionPgInstance(ctx, t)+ a.NoError(err)++ otherProjectResp, err := ctl.projectServiceClient.CreateProject(ctx, connect.NewRequest(&v1pb.CreateProjectRequest{+ ProjectId: generateRandomString("instance-other-project"),+ Project: &v1pb.Project{Title: "Other project", AllowSelfApproval: true},+ }))+ a.NoError(err)+ otherProject := otherProjectResp.Msg++ instanceAID := generateRandomString("project-instance-a")+ instanceB := bot35CreateProjectInstance(ctx, t, ctl, otherProject.Name, generateRandomString("project-instance-b"), "Project B instance", pgContainer.adminDataSource(), true)++ projectOwnerToken := bot35CreateProjectUser(ctx, t, ctl, ctl.project.Name, "roles/projectOwner", "project-owner")+ ctl.authInterceptor.token = projectOwnerToken+ instanceA := bot35CreateProjectInstance(ctx, t, ctl, ctl.project.Name, instanceAID, "Project A instance", pgContainer.adminDataSource(), true)++ listA, err := ctl.instanceServiceClient.ListInstances(ctx, connect.NewRequest(&v1pb.ListInstancesRequest{+ Parent: new(ctl.project.Name),+ }))+ a.NoError(err)+ a.Len(listA.Msg.Instances, 1)+ a.Equal(instanceA.Name, listA.Msg.Instances[0].Name)++ _, err = ctl.instanceServiceClient.ListInstances(ctx, connect.NewRequest(&v1pb.ListInstancesRequest{Parent: new(otherProject.Name)}))+ a.Error(err)+ a.Equal(connect.CodePermissionDenied, connect.CodeOf(err))+ _, err = ctl.instanceServiceClient.CreateInstance(ctx, connect.NewRequest(&v1pb.CreateInstanceRequest{+ Parent: new(otherProject.Name),+ InstanceId: generateRandomString("other-project-instance"),+ Instance: &v1pb.Instance{+ Title: "Must not create in another project",+ Engine: v1pb.Engine_POSTGRES,+ Environment: new("environments/prod"),+ DataSources: []*v1pb.DataSource{pgContainer.adminDataSource()},+ },+ }))+ a.Error(err)+ a.Equal(connect.CodePermissionDenied, connect.CodeOf(err))++ gotA, err := ctl.instanceServiceClient.GetInstance(ctx, connect.NewRequest(&v1pb.GetInstanceRequest{Name: instanceA.Name}))+ a.NoError(err)+ a.Equal(instanceA.Name, gotA.Msg.Name)++ _, err = ctl.instanceServiceClient.GetInstance(ctx, connect.NewRequest(&v1pb.GetInstanceRequest{Name: instanceB.Name}))+ a.Error(err)+ a.Equal(connect.CodePermissionDenied, connect.CodeOf(err))++ updatedA, err := ctl.instanceServiceClient.UpdateInstance(ctx, connect.NewRequest(&v1pb.UpdateInstanceRequest{+ Instance: &v1pb.Instance{Name: instanceA.Name, Title: "Project A instance updated"},+ UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"title"}},+ }))+ a.NoError(err)+ a.Equal("Project A instance updated", updatedA.Msg.Title)++ _, err = ctl.instanceServiceClient.UpdateInstance(ctx, connect.NewRequest(&v1pb.UpdateInstanceRequest{+ Instance: &v1pb.Instance{Name: instanceB.Name, Title: "must not update"},+ UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"title"}},+ }))+ a.Error(err)+ a.Equal(connect.CodePermissionDenied, connect.CodeOf(err))++ _, err = ctl.instanceServiceClient.SyncInstance(ctx, connect.NewRequest(&v1pb.SyncInstanceRequest{Name: instanceA.Name}))+ a.NoError(err)+ _, err = ctl.instanceServiceClient.SyncInstance(ctx, connect.NewRequest(&v1pb.SyncInstanceRequest{Name: instanceB.Name}))+ a.Error(err)+ a.Equal(connect.CodePermissionDenied, connect.CodeOf(err))++ _, err = ctl.instanceServiceClient.DeleteInstance(ctx, connect.NewRequest(&v1pb.DeleteInstanceRequest{Name: instanceA.Name}))+ a.NoError(err)+ _, err = ctl.instanceServiceClient.DeleteInstance(ctx, connect.NewRequest(&v1pb.DeleteInstanceRequest{Name: instanceB.Name}))+ a.Error(err)+ a.Equal(connect.CodePermissionDenied, connect.CodeOf(err))++ undeletedA, err := ctl.instanceServiceClient.UndeleteInstance(ctx, connect.NewRequest(&v1pb.UndeleteInstanceRequest{Name: instanceA.Name}))+ a.NoError(err)+ a.Equal(instanceA.Name, undeletedA.Msg.Name)+ _, err = ctl.instanceServiceClient.UndeleteInstance(ctx, connect.NewRequest(&v1pb.UndeleteInstanceRequest{Name: instanceB.Name}))+ a.Error(err)+ a.Equal(connect.CodePermissionDenied, connect.CodeOf(err))++ // A role containing only bb.instances.get grants that single operation on+ // its project, rather than inheriting project-owner permissions.+ ctl.authInterceptor.token = ownerToken+ roleID := generateRandomString("instance-reader")+ _, err = ctl.roleServiceClient.CreateRole(ctx, connect.NewRequest(&v1pb.CreateRoleRequest{+ RoleId: roleID,+ Role: &v1pb.Role{+ Title: "Project instance reader",+ Permissions: []string{"bb.instances.get"},+ },+ }))+ a.NoError(err)+ readerToken := bot35CreateProjectUser(ctx, t, ctl, ctl.project.Name, fmt.Sprintf("roles/%s", roleID), "project-instance-reader")+ ctl.authInterceptor.token = readerToken+ _, err = ctl.instanceServiceClient.GetInstance(ctx, connect.NewRequest(&v1pb.GetInstanceRequest{Name: instanceA.Name}))+ a.NoError(err)+ _, err = ctl.instanceServiceClient.ListInstances(ctx, connect.NewRequest(&v1pb.ListInstancesRequest{Parent: new(ctl.project.Name)}))+ a.Error(err)+ a.Equal(connect.CodePermissionDenied, connect.CodeOf(err))++ // Workspace-wide database roles retain authority over project instances.+ ctl.authInterceptor.token = ownerToken+ for _, role := range []string{"roles/workspaceAdmin", "roles/workspaceDBA"} {+ ctl.authInterceptor.token = ownerToken+ workspaceToken := bot35CreateWorkspaceUser(ctx, t, ctl, role, "project-instance-workspace")+ ctl.authInterceptor.token = workspaceToken+ _, err = ctl.instanceServiceClient.GetInstance(ctx, connect.NewRequest(&v1pb.GetInstanceRequest{Name: instanceA.Name}))+ a.NoError(err, "%s gets project instance", role)+ workspaceList, err := ctl.instanceServiceClient.ListInstances(ctx, connect.NewRequest(&v1pb.ListInstancesRequest{Parent: new(ctl.project.Name)}))+ a.NoError(err, "%s lists project instances", role)+ a.Len(workspaceList.Msg.Instances, 1)+ }+}++func TestProjectInstanceCollisionIsolation(t *testing.T) {+ t.Parallel()+ a := require.New(t)+ ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)+ defer cancel()+ ctl := &controller{}+ ctx, err := ctl.StartServerWithExternalPg(ctx)+ a.NoError(err)+ defer ctl.Close(ctx)++ pgContainer, err := provisionPgInstance(ctx, t)+ a.NoError(err)+ projectBResp, err := ctl.projectServiceClient.CreateProject(ctx, connect.NewRequest(&v1pb.CreateProjectRequest{+ ProjectId: generateRandomString("instance-collision-project"),+ Project: &v1pb.Project{Title: "Instance collision project", AllowSelfApproval: true},+ }))+ a.NoError(err)+ projectB := projectBResp.Msg++ instanceAID := generateRandomString("project-instance-a")+ instanceA := bot35CreateProjectInstance(ctx, t, ctl, ctl.project.Name, instanceAID, "Collision instance A", pgContainer.adminDataSource(), false)++ // Instance IDs are workspace-global, even though their resource names are+ // project nested. Reusing a local ID in another project is rejected.+ _, err = ctl.instanceServiceClient.CreateInstance(ctx, connect.NewRequest(&v1pb.CreateInstanceRequest{+ Parent: new(projectB.Name),+ InstanceId: instanceAID,+ Instance: &v1pb.Instance{+ Title: "Duplicate instance ID",+ Engine: v1pb.Engine_POSTGRES,+ Environment: new("environments/prod"),+ DataSources: []*v1pb.DataSource{pgContainer.adminDataSource()},+ },+ }))+ a.Error(err)+ a.Equal(connect.CodeAlreadyExists, connect.CodeOf(err))++ instanceBID := generateRandomString("project-instance-b")+ instanceB := bot35CreateProjectInstance(ctx, t, ctl, projectB.Name, instanceBID, "Collision instance B", pgContainer.adminDataSource(), false)++ // Both instances discover PostgreSQL's local "postgres" database. That+ // descendant-name collision must remain bound to the instance's project+ // prefix and must not permit a project A request to mutate B.+ const databaseID = "postgres"+ databaseBName := instanceB.Name + "/databases/" + databaseID+ databaseB, err := ctl.databaseServiceClient.GetDatabase(ctx, connect.NewRequest(&v1pb.GetDatabaseRequest{Name: databaseBName}))+ a.NoError(err)++ // The top-level form cannot resolve a project-owned instance either.+ _, err = ctl.instanceServiceClient.GetInstance(ctx, connect.NewRequest(&v1pb.GetInstanceRequest{+ Name: "instances/" + instanceAID,+ }))+ a.Error(err)++ // Pointing project A at B's instance ID is rejected before it can select+ // B's identically named descendant.+ wrongPrefixInstanceName := ctl.project.Name + "/instances/" + instanceBID+ _, err = ctl.instanceServiceClient.GetInstance(ctx, connect.NewRequest(&v1pb.GetInstanceRequest{Name: wrongPrefixInstanceName}))+ a.Error(err)+ wrongPrefixDatabaseName := wrongPrefixInstanceName + "/databases/" + databaseID+ _, err = ctl.databaseServiceClient.UpdateDatabase(ctx, connect.NewRequest(&v1pb.UpdateDatabaseRequest{+ Database: &v1pb.Database{Name: wrongPrefixDatabaseName, Labels: map[string]string{"bot35": "wrong-project"}},+ UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"labels"}},+ }))+ a.Error(err)++ databaseBAfter, err := ctl.databaseServiceClient.GetDatabase(ctx, connect.NewRequest(&v1pb.GetDatabaseRequest{Name: databaseBName}))+ a.NoError(err)+ a.Equal(databaseB.Msg.Labels, databaseBAfter.Msg.Labels, "project B database snapshot must remain untouched")++ // Keep a positive assertion for the correctly scoped sibling: otherwise a+ // broken setup that never created B's instance/database could still pass.+ a.Equal(projectB.Name+"/instances/", instanceB.Name[:len(projectB.Name+"/instances/")])+ a.Equal(ctl.project.Name+"/instances/", instanceA.Name[:len(ctl.project.Name+"/instances/")])+}++func bot35CreateProjectInstance(+ ctx context.Context,+ t *testing.T,+ ctl *controller,+ projectName, instanceID, title string,+ dataSource *v1pb.DataSource,+ skipDatabaseSync bool,+) *v1pb.Instance {+ t.Helper()+ a := require.New(t)+ instance := &v1pb.Instance{+ Title: title,+ Engine: v1pb.Engine_POSTGRES,+ Environment: new("environments/prod"),+ DataSources: []*v1pb.DataSource{dataSource},+ }+ if skipDatabaseSync {+ instance.SyncDatabases = &v1pb.SyncDatabases{}+ }+ resp, err := ctl.instanceServiceClient.CreateInstance(ctx, connect.NewRequest(&v1pb.CreateInstanceRequest{+ Parent: new(projectName),+ InstanceId: instanceID,+ Instance: instance,+ }))+ a.NoError(err)+ return resp.Msg+}++func bot35CreateProjectUser(ctx context.Context, t *testing.T, ctl *controller, projectName, role, prefix string) string {+ t.Helper()+ a := require.New(t)+ email := fmt.Sprintf("%s-%[email protected]", prefix, generateRandomString("user"))+ const password = "1024bytebase"+ user, err := ctl.userServiceClient.CreateUser(ctx, connect.NewRequest(&v1pb.CreateUserRequest{+ User: &v1pb.User{Email: email, Password: password, Title: prefix},+ }))+ a.NoError(err)+ _, err = ctl.addMemberToWorkspaceIAM(ctx, user.Msg.Workspace, fmt.Sprintf("user:%s", email), "roles/workspaceMember")+ a.NoError(err)++ policyResp, err := ctl.projectServiceClient.GetIamPolicy(ctx, connect.NewRequest(&v1pb.GetIamPolicyRequest{Resource: projectName}))+ a.NoError(err)+ policy := policyResp.Msg+ policy.Bindings = append(policy.Bindings, &v1pb.Binding{Role: role, Members: []string{fmt.Sprintf("user:%s", email)}})+ _, err = ctl.projectServiceClient.SetIamPolicy(ctx, connect.NewRequest(&v1pb.SetIamPolicyRequest{Resource: projectName, Policy: policy}))+ a.NoError(err)++ login, err := ctl.authServiceClient.Login(ctx, connect.NewRequest(&v1pb.LoginRequest{Email: email, Password: password}))+ a.NoError(err)+ return login.Msg.Token+}++func bot35CreateWorkspaceUser(ctx context.Context, t *testing.T, ctl *controller, role, prefix string) string {+ t.Helper()+ a := require.New(t)+ email := fmt.Sprintf("%s-%[email protected]", prefix, generateRandomString("user"))+ const password = "1024bytebase"+ user, err := ctl.userServiceClient.CreateUser(ctx, connect.NewRequest(&v1pb.CreateUserRequest{+ User: &v1pb.User{Email: email, Password: password, Title: prefix},+ }))+ a.NoError(err)+ _, err = ctl.addMemberToWorkspaceIAM(ctx, user.Msg.Workspace, fmt.Sprintf("user:%s", email), role)+ a.NoError(err)+ login, err := ctl.authServiceClient.Login(ctx, connect.NewRequest(&v1pb.LoginRequest{Email: email, Password: password}))+ a.NoError(err)+ return login.Msg.Token+}diff --git a/backend/tests/project_instance_test.go b/backend/tests/project_instance_test.gonew file mode 100644index 0000000000..6d1db72ca6--- /dev/null+++ b/backend/tests/project_instance_test.go@@ -0,0 +1,333 @@+package tests++import (+ "context"+ "fmt"+ "testing"++ "connectrpc.com/connect"+ "github.com/stretchr/testify/require"+ "google.golang.org/protobuf/types/known/fieldmaskpb"++ v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"+)++// TestProjectInstanceCoreBehavior exercises the public v1 collection contract+// against PostgreSQL, including database discovery and the nested resource names+// that clients use after an instance is assigned to a project.+func TestProjectInstanceCoreBehavior(t *testing.T) {+ t.Parallel()+ a := require.New(t)+ ctx := context.Background()+ ctl := &controller{}+ ctx, err := ctl.StartServerWithExternalPg(ctx)+ a.NoError(err)+ defer ctl.Close(ctx)++ pg, err := provisionPgInstance(ctx, t)+ a.NoError(err)+ const databaseID = "bot35_project_database"+ createPgDatabase(t, pg, databaseID)++ otherProject := createProjectForProjectInstanceTest(ctx, t, ctl, "bot35-other-project")++ workspaceID := "bot35-workspace-instance"+ workspace := createProjectInstanceTestInstance(ctx, t, ctl, nil, workspaceID, "workspace instance", pg)+ a.Equal("instances/"+workspaceID, workspace.Name)++ projectParent := ctl.project.Name+ projectID := "bot35-project-instance"+ projectInstance := createProjectInstanceTestInstance(ctx, t, ctl, &projectParent, projectID, "project instance", pg)+ a.Equal(fmt.Sprintf("%s/instances/%s", ctl.project.Name, projectID), projectInstance.Name)++ _, err = ctl.instanceServiceClient.SyncInstance(ctx, connect.NewRequest(&v1pb.SyncInstanceRequest{+ Name: projectInstance.Name,+ }))+ a.NoError(err)++ databaseName := fmt.Sprintf("%s/databases/%s", projectInstance.Name, databaseID)+ database, err := ctl.databaseServiceClient.GetDatabase(ctx, connect.NewRequest(&v1pb.GetDatabaseRequest{Name: databaseName}))+ a.NoError(err)+ a.Equal(databaseName, database.Msg.Name)+ a.Equal(ctl.project.Name, database.Msg.Project)++ for _, name := range []string{+ projectInstance.Name + "/databases/missing",+ workspace.Name + "/databases/missing",+ } {+ _, err := ctl.databaseServiceClient.GetDatabase(ctx, connect.NewRequest(&v1pb.GetDatabaseRequest{Name: name}))+ a.Error(err)+ a.Equal(connect.CodeNotFound, connect.CodeOf(err))+ }++ projectInstances, err := ctl.instanceServiceClient.ListInstances(ctx, connect.NewRequest(&v1pb.ListInstancesRequest{+ Parent: &projectParent,+ PageSize: 100,+ }))+ a.NoError(err)+ a.Len(projectInstances.Msg.Instances, 1)+ a.Equal(projectInstance.Name, projectInstances.Msg.Instances[0].Name)++ workspaceInstances, err := ctl.instanceServiceClient.ListInstances(ctx, connect.NewRequest(&v1pb.ListInstancesRequest{PageSize: 100}))+ a.NoError(err)+ a.Contains(projectInstanceTestInstanceNames(workspaceInstances.Msg.Instances), workspace.Name)+ a.NotContains(projectInstanceTestInstanceNames(workspaceInstances.Msg.Instances), projectInstance.Name)++ _, err = ctl.instanceServiceClient.ListInstances(ctx, connect.NewRequest(&v1pb.ListInstancesRequest{+ Parent: &projectParent,+ Filter: fmt.Sprintf("project == %q", otherProject.Name),+ }))+ a.Error(err)+ a.Equal(connect.CodeInvalidArgument, connect.CodeOf(err))++ // A project instance is never reachable through the workspace alias.+ _, err = ctl.instanceServiceClient.GetInstance(ctx, connect.NewRequest(&v1pb.GetInstanceRequest{+ Name: "instances/" + projectID,+ }))+ a.Error(err)+ a.Equal(connect.CodeNotFound, connect.CodeOf(err))+ a.Equal(fmt.Sprintf("not_found: instance %q not found", "instances/"+projectID), err.Error())++ // Instance IDs are workspace-global even though project instances have a+ // project-nested resource name.+ _, err = ctl.instanceServiceClient.CreateInstance(ctx, connect.NewRequest(&v1pb.CreateInstanceRequest{+ InstanceId: projectID,+ Instance: projectInstanceTestSpec("duplicate", pg),+ }))+ a.Error(err)+ a.Equal(connect.CodeAlreadyExists, connect.CodeOf(err))++ allowMissingID := "bot35-allow-missing"+ allowMissingName := fmt.Sprintf("%s/instances/%s", ctl.project.Name, allowMissingID)+ allowMissing, err := ctl.instanceServiceClient.UpdateInstance(ctx, connect.NewRequest(&v1pb.UpdateInstanceRequest{+ Instance: func() *v1pb.Instance {+ instance := projectInstanceTestSpec("created with allow missing", pg)+ instance.Name = allowMissingName+ // Keep this lifecycle target database-free. SyncDatabases is a+ // whitelist, and an empty list excludes every database the server+ // itself uses for this integration test.+ instance.SyncDatabases = &v1pb.SyncDatabases{}+ return instance+ }(),+ UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"title"}},+ AllowMissing: true,+ }))+ a.NoError(err)+ a.Equal(allowMissingName, allowMissing.Msg.Name)++ filteredProjectInstances, err := ctl.instanceServiceClient.ListInstances(ctx, connect.NewRequest(&v1pb.ListInstancesRequest{+ Parent: &projectParent,+ Filter: fmt.Sprintf("project == %q", projectParent),+ }))+ a.NoError(err)+ a.Contains(projectInstanceTestInstanceNames(filteredProjectInstances.Msg.Instances), allowMissingName)++ _, err = ctl.databaseServiceClient.UpdateDatabase(ctx, connect.NewRequest(&v1pb.UpdateDatabaseRequest{+ Database: &v1pb.Database{+ Name: databaseName,+ Project: otherProject.Name,+ },+ UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"project"}},+ }))+ a.Error(err)+ a.Equal(connect.CodeFailedPrecondition, connect.CodeOf(err))++ validateOnlyID := "bot35-validate-only"+ _, err = ctl.instanceServiceClient.CreateInstance(ctx, connect.NewRequest(&v1pb.CreateInstanceRequest{+ Parent: &projectParent,+ InstanceId: validateOnlyID,+ Instance: projectInstanceTestSpec("validate only", pg),+ ValidateOnly: true,+ }))+ a.NoError(err)+ _, err = ctl.instanceServiceClient.GetInstance(ctx, connect.NewRequest(&v1pb.GetInstanceRequest{+ Name: fmt.Sprintf("%s/instances/%s", ctl.project.Name, validateOnlyID),+ }))+ a.Error(err)+ a.Equal(connect.CodeNotFound, connect.CodeOf(err))++ // Batch requests validate every target against the exact parent collection+ // before updating anything.+ updated, err := ctl.instanceServiceClient.BatchUpdateInstances(ctx, connect.NewRequest(&v1pb.BatchUpdateInstancesRequest{+ Parent: &projectParent,+ Requests: []*v1pb.UpdateInstanceRequest{{+ Instance: &v1pb.Instance{Name: allowMissingName, Title: "exact batch parent"},+ UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"title"}},+ }},+ }))+ a.NoError(err)+ a.Len(updated.Msg.Instances, 1)+ a.Equal("exact batch parent", updated.Msg.Instances[0].Title)++ beforeProject, err := ctl.instanceServiceClient.GetInstance(ctx, connect.NewRequest(&v1pb.GetInstanceRequest{Name: allowMissingName}))+ a.NoError(err)+ beforeWorkspace, err := ctl.instanceServiceClient.GetInstance(ctx, connect.NewRequest(&v1pb.GetInstanceRequest{Name: workspace.Name}))+ a.NoError(err)+ _, err = ctl.instanceServiceClient.BatchUpdateInstances(ctx, connect.NewRequest(&v1pb.BatchUpdateInstancesRequest{+ Parent: &projectParent,+ Requests: []*v1pb.UpdateInstanceRequest{+ {+ Instance: &v1pb.Instance{Name: allowMissingName, Title: "must not update"},+ UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"title"}},+ },+ {+ Instance: &v1pb.Instance{Name: workspace.Name, Title: "must not update"},+ UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"title"}},+ },+ },+ }))+ a.Error(err)+ a.Equal(connect.CodeInvalidArgument, connect.CodeOf(err))+ afterProject, err := ctl.instanceServiceClient.GetInstance(ctx, connect.NewRequest(&v1pb.GetInstanceRequest{Name: allowMissingName}))+ a.NoError(err)+ afterWorkspace, err := ctl.instanceServiceClient.GetInstance(ctx, connect.NewRequest(&v1pb.GetInstanceRequest{Name: workspace.Name}))+ a.NoError(err)+ a.Equal(beforeProject.Msg.Title, afterProject.Msg.Title)+ a.Equal(beforeWorkspace.Msg.Title, afterWorkspace.Msg.Title)++ // A project instance cannot force-transfer its databases, but can be+ // archived normally even after synchronization discovers databases.+ _, err = ctl.instanceServiceClient.DeleteInstance(ctx, connect.NewRequest(&v1pb.DeleteInstanceRequest{+ Name: projectInstance.Name,+ Force: true,+ }))+ a.Error(err)+ a.Equal(connect.CodeInvalidArgument, connect.CodeOf(err))+ _, err = ctl.instanceServiceClient.DeleteInstance(ctx, connect.NewRequest(&v1pb.DeleteInstanceRequest{Name: projectInstance.Name}))+ a.NoError(err)+ archivedProjectInstance, err := ctl.instanceServiceClient.GetInstance(ctx, connect.NewRequest(&v1pb.GetInstanceRequest{Name: projectInstance.Name}))+ a.NoError(err)+ a.Equal(v1pb.State_DELETED, archivedProjectInstance.Msg.State)++ // A database-free project instance can still be archived and restored normally.+ _, err = ctl.instanceServiceClient.DeleteInstance(ctx, connect.NewRequest(&v1pb.DeleteInstanceRequest{Name: allowMissingName}))+ a.NoError(err)+ archived, err := ctl.instanceServiceClient.GetInstance(ctx, connect.NewRequest(&v1pb.GetInstanceRequest{Name: allowMissingName}))+ a.NoError(err)+ a.Equal(v1pb.State_DELETED, archived.Msg.State)+ restored, err := ctl.instanceServiceClient.UndeleteInstance(ctx, connect.NewRequest(&v1pb.UndeleteInstanceRequest{Name: allowMissingName}))+ a.NoError(err)+ a.Equal(v1pb.State_ACTIVE, restored.Msg.State)+}++func TestBatchUpdateProjectInstanceAllowMissing(t *testing.T) {+ t.Parallel()+ a := require.New(t)+ ctx := context.Background()+ ctl := &controller{}+ ctx, err := ctl.StartServerWithExternalPg(ctx)+ a.NoError(err)+ defer ctl.Close(ctx)++ pg, err := provisionPgInstance(ctx, t)+ a.NoError(err)++ const instanceID = "bot35-batch-allow-missing"+ parent := ctl.project.Name+ name := fmt.Sprintf("%s/instances/%s", parent, instanceID)+ created, err := ctl.instanceServiceClient.BatchUpdateInstances(ctx, connect.NewRequest(&v1pb.BatchUpdateInstancesRequest{+ Parent: &parent,+ Requests: []*v1pb.UpdateInstanceRequest{{+ Instance: func() *v1pb.Instance {+ instance := projectInstanceTestSpec("created by batch allow missing", pg)+ instance.Name = name+ instance.SyncDatabases = &v1pb.SyncDatabases{}+ return instance+ }(),+ UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{"title"}},+ AllowMissing: true,+ }},+ }))+ a.NoError(err)+ a.Len(created.Msg.Instances, 1)+ a.Equal(name, created.Msg.Instances[0].Name)+}++//nolint:tparallel // Subtests share one server lifecycle.+func TestProjectInstanceValidation(t *testing.T) {+ t.Parallel()+ a := require.New(t)+ ctx := context.Background()+ ctl := &controller{}+ ctx, err := ctl.StartServerWithExternalPg(ctx)+ a.NoError(err)+ defer ctl.Close(ctx)++ for _, parent := range []string{"projects/missing-bot35", "projects/default"} {+ parent := parent+ t.Run(parent, func(t *testing.T) {+ _, err := ctl.instanceServiceClient.CreateInstance(ctx, connect.NewRequest(&v1pb.CreateInstanceRequest{+ Parent: &parent,+ InstanceId: "bot35-invalid-parent",+ Instance: &v1pb.Instance{},+ }))+ require.Error(t, err)+ if parent == "projects/default" {+ require.Equal(t, connect.CodeInvalidArgument, connect.CodeOf(err))+ require.Equal(t, `invalid_argument: default project "projects/default" cannot own instances`, err.Error())+ } else {+ require.Equal(t, connect.CodeNotFound, connect.CodeOf(err))+ }+ })+ }++ deletedProject := createProjectForProjectInstanceTest(ctx, t, ctl, "bot35-deleted-project")+ _, err = ctl.projectServiceClient.DeleteProject(ctx, connect.NewRequest(&v1pb.DeleteProjectRequest{Name: deletedProject.Name}))+ a.NoError(err)+ _, err = ctl.instanceServiceClient.CreateInstance(ctx, connect.NewRequest(&v1pb.CreateInstanceRequest{+ Parent: &deletedProject.Name,+ InstanceId: "bot35-deleted-parent",+ Instance: &v1pb.Instance{},+ }))+ a.Error(err)+ a.Equal(connect.CodeNotFound, connect.CodeOf(err))++ parent := ctl.project.Name+ _, err = ctl.instanceServiceClient.CreateInstance(ctx, connect.NewRequest(&v1pb.CreateInstanceRequest{+ Parent: &parent,+ InitialDatabaseProject: ctl.project.Name,+ InstanceId: "bot35-conflicting-parent",+ Instance: &v1pb.Instance{},+ }))+ a.Error(err)+ a.Equal(connect.CodeInvalidArgument, connect.CodeOf(err))+}++func createProjectForProjectInstanceTest(ctx context.Context, t *testing.T, ctl *controller, projectID string) *v1pb.Project {+ t.Helper()+ project, err := ctl.projectServiceClient.CreateProject(ctx, connect.NewRequest(&v1pb.CreateProjectRequest{+ Project: &v1pb.Project{Title: projectID, AllowSelfApproval: true},+ ProjectId: projectID,+ }))+ require.NoError(t, err)+ return project.Msg+}++func createProjectInstanceTestInstance(ctx context.Context, t *testing.T, ctl *controller, parent *string, instanceID, title string, pg *Container) *v1pb.Instance {+ t.Helper()+ instance, err := ctl.instanceServiceClient.CreateInstance(ctx, connect.NewRequest(&v1pb.CreateInstanceRequest{+ Parent: parent,+ InstanceId: instanceID,+ Instance: projectInstanceTestSpec(title, pg),+ }))+ require.NoError(t, err)+ return instance.Msg+}++func projectInstanceTestSpec(title string, pg *Container) *v1pb.Instance {+ return &v1pb.Instance{+ Title: title,+ Engine: v1pb.Engine_POSTGRES,+ Environment: new("environments/prod"),+ Activation: true,+ DataSources: []*v1pb.DataSource{pg.adminDataSource()},+ }+}++func projectInstanceTestInstanceNames(instances []*v1pb.Instance) []string {+ names := make([]string, 0, len(instances))+ for _, instance := range instances {+ names = append(names, instance.Name)+ }+ return names+}diff --git a/frontend/src/types/proto-es/v1/changelog_service_pb.d.ts b/frontend/src/types/proto-es/v1/changelog_service_pb.d.tsindex 269e896c9f..cc98263578 100644--- a/frontend/src/types/proto-es/v1/changelog_service_pb.d.ts+++ b/frontend/src/types/proto-es/v1/changelog_service_pb.d.ts@@ -17,7 +17,7 @@ export declare const file_v1_changelog_service: GenFile;export declare type ListChangelogsRequest = Message<"bytebase.v1.ListChangelogsRequest"> & {/*** The parent of the changelogs.- * Format: instances/{instance}/databases/{database}+ * Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}** @generated from field: string parent = 1;*/@@ -104,7 +104,7 @@ export declare const ListChangelogsResponseSchema: GenMessage<ListChangelogsRespexport declare type GetChangelogRequest = Message<"bytebase.v1.GetChangelogRequest"> & {/*** The name of the changelog to retrieve.- * Format: instances/{instance}/databases/{database}/changelogs/{changelog}+ * Format: instances/{instance}/databases/{database}/changelogs/{changelog} or projects/{project}/instances/{instance}/databases/{database}/changelogs/{changelog}** @generated from field: string name = 1;*/@@ -127,7 +127,7 @@ export declare const GetChangelogRequestSchema: GenMessage<GetChangelogRequest>;*/export declare type Changelog = Message<"bytebase.v1.Changelog"> & {/**- * Format: instances/{instance}/databases/{database}/changelogs/{changelog}+ * Format: instances/{instance}/databases/{database}/changelogs/{changelog} or projects/{project}/instances/{instance}/databases/{database}/changelogs/{changelog}** @generated from field: string name = 1;*/diff --git a/frontend/src/types/proto-es/v1/changelog_service_pb.js b/frontend/src/types/proto-es/v1/changelog_service_pb.jsindex cbb6f3723a..8274d7a346 100644--- a/frontend/src/types/proto-es/v1/changelog_service_pb.js+++ b/frontend/src/types/proto-es/v1/changelog_service_pb.js@@ -14,7 +14,7 @@ import { file_v1_annotation } from "./annotation_pb";* Describes the file v1/changelog_service.proto.*/export const file_v1_changelog_service = /*@__PURE__*/- fileDesc("Chp2MS9jaGFuZ2Vsb2dfc2VydmljZS5wcm90bxILYnl0ZWJhc2UudjEipwEKFUxpc3RDaGFuZ2Vsb2dzUmVxdWVzdBItCgZwYXJlbnQYASABKAlCHeBBAvpBFwoVYnl0ZWJhc2UuY29tL0RhdGFiYXNlEhEKCXBhZ2Vfc2l6ZRgCIAEoBRISCgpwYWdlX3Rva2VuGAMgASgJEigKBHZpZXcYBCABKA4yGi5ieXRlYmFzZS52MS5DaGFuZ2Vsb2dWaWV3Eg4KBmZpbHRlchgFIAEoCSJdChZMaXN0Q2hhbmdlbG9nc1Jlc3BvbnNlEioKCmNoYW5nZWxvZ3MYASADKAsyFi5ieXRlYmFzZS52MS5DaGFuZ2Vsb2cSFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJInUKE0dldENoYW5nZWxvZ1JlcXVlc3QSNAoEbmFtZRgBIAEoCUIm4EEC+kEgCh5ieXRlYmFzZS5jb20vRGF0YWJhc2VDaGFuZ2Vsb2cSKAoEdmlldxgCIAEoDjIaLmJ5dGViYXNlLnYxLkNoYW5nZWxvZ1ZpZXci9QIKCUNoYW5nZWxvZxIMCgRuYW1lGAEgASgJEi8KC2NyZWF0ZV90aW1lGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBItCgZzdGF0dXMYAyABKA4yHS5ieXRlYmFzZS52MS5DaGFuZ2Vsb2cuU3RhdHVzEg4KBnNjaGVtYRgHIAEoCRITCgtzY2hlbWFfc2l6ZRgIIAEoAxIQCgh0YXNrX3J1bhgLIAEoCRIXCgpwbGFuX3RpdGxlGA8gASgJQgPgQQMiQwoGU3RhdHVzEhYKElNUQVRVU19VTlNQRUNJRklFRBAAEgsKB1BFTkRJTkcQARIICgRET05FEAISCgoGRkFJTEVEEAM6ZepBYgoeYnl0ZWJhc2UuY29tL0RhdGFiYXNlQ2hhbmdlbG9nEkBpbnN0YW5jZXMve2luc3RhbmNlfS9kYXRhYmFzZXMve2RhdGFiYXNlfS9jaGFuZ2Vsb2dzL3tjaGFuZ2Vsb2d9KmIKDUNoYW5nZWxvZ1ZpZXcSHgoaQ0hBTkdFTE9HX1ZJRVdfVU5TUEVDSUZJRUQQABIYChRDSEFOR0VMT0dfVklFV19CQVNJQxABEhcKE0NIQU5HRUxPR19WSUVXX0ZVTEwQAjLuAgoQQ2hhbmdlbG9nU2VydmljZRK1AQoOTGlzdENoYW5nZWxvZ3MSIi5ieXRlYmFzZS52MS5MaXN0Q2hhbmdlbG9nc1JlcXVlc3QaIy5ieXRlYmFzZS52MS5MaXN0Q2hhbmdlbG9nc1Jlc3BvbnNlIlraQQZwYXJlbnSK6jASYmIuY2hhbmdlbG9ncy5saXN0kOowAYLT5JMCMRIvL3YxL3twYXJlbnQ9aW5zdGFuY2VzLyovZGF0YWJhc2VzLyp9L2NoYW5nZWxvZ3MSoQEKDEdldENoYW5nZWxvZxIgLmJ5dGViYXNlLnYxLkdldENoYW5nZWxvZ1JlcXVlc3QaFi5ieXRlYmFzZS52MS5DaGFuZ2Vsb2ciV9pBBG5hbWWK6jARYmIuY2hhbmdlbG9ncy5nZXSQ6jABgtPkkwIxEi8vdjEve25hbWU9aW5zdGFuY2VzLyovZGF0YWJhc2VzLyovY2hhbmdlbG9ncy8qfUKrAQoPY29tLmJ5dGViYXNlLnYxQhVDaGFuZ2Vsb2dTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_timestamp, file_v1_annotation]);+ fileDesc("Chp2MS9jaGFuZ2Vsb2dfc2VydmljZS5wcm90bxILYnl0ZWJhc2UudjEipwEKFUxpc3RDaGFuZ2Vsb2dzUmVxdWVzdBItCgZwYXJlbnQYASABKAlCHeBBAvpBFwoVYnl0ZWJhc2UuY29tL0RhdGFiYXNlEhEKCXBhZ2Vfc2l6ZRgCIAEoBRISCgpwYWdlX3Rva2VuGAMgASgJEigKBHZpZXcYBCABKA4yGi5ieXRlYmFzZS52MS5DaGFuZ2Vsb2dWaWV3Eg4KBmZpbHRlchgFIAEoCSJdChZMaXN0Q2hhbmdlbG9nc1Jlc3BvbnNlEioKCmNoYW5nZWxvZ3MYASADKAsyFi5ieXRlYmFzZS52MS5DaGFuZ2Vsb2cSFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJInUKE0dldENoYW5nZWxvZ1JlcXVlc3QSNAoEbmFtZRgBIAEoCUIm4EEC+kEgCh5ieXRlYmFzZS5jb20vRGF0YWJhc2VDaGFuZ2Vsb2cSKAoEdmlldxgCIAEoDjIaLmJ5dGViYXNlLnYxLkNoYW5nZWxvZ1ZpZXcizAMKCUNoYW5nZWxvZxIMCgRuYW1lGAEgASgJEi8KC2NyZWF0ZV90aW1lGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBItCgZzdGF0dXMYAyABKA4yHS5ieXRlYmFzZS52MS5DaGFuZ2Vsb2cuU3RhdHVzEg4KBnNjaGVtYRgHIAEoCRITCgtzY2hlbWFfc2l6ZRgIIAEoAxIQCgh0YXNrX3J1bhgLIAEoCRIXCgpwbGFuX3RpdGxlGA8gASgJQgPgQQMiQwoGU3RhdHVzEhYKElNUQVRVU19VTlNQRUNJRklFRBAAEgsKB1BFTkRJTkcQARIICgRET05FEAISCgoGRkFJTEVEEAM6uwHqQbcBCh5ieXRlYmFzZS5jb20vRGF0YWJhc2VDaGFuZ2Vsb2cSQGluc3RhbmNlcy97aW5zdGFuY2V9L2RhdGFiYXNlcy97ZGF0YWJhc2V9L2NoYW5nZWxvZ3Mve2NoYW5nZWxvZ30SU3Byb2plY3RzL3twcm9qZWN0fS9pbnN0YW5jZXMve2luc3RhbmNlfS9kYXRhYmFzZXMve2RhdGFiYXNlfS9jaGFuZ2Vsb2dzL3tjaGFuZ2Vsb2d9KmIKDUNoYW5nZWxvZ1ZpZXcSHgoaQ0hBTkdFTE9HX1ZJRVdfVU5TUEVDSUZJRUQQABIYChRDSEFOR0VMT0dfVklFV19CQVNJQxABEhcKE0NIQU5HRUxPR19WSUVXX0ZVTEwQAjLsAwoQQ2hhbmdlbG9nU2VydmljZRL0AQoOTGlzdENoYW5nZWxvZ3MSIi5ieXRlYmFzZS52MS5MaXN0Q2hhbmdlbG9nc1JlcXVlc3QaIy5ieXRlYmFzZS52MS5MaXN0Q2hhbmdlbG9nc1Jlc3BvbnNlIpgB2kEGcGFyZW50iuowEmJiLmNoYW5nZWxvZ3MubGlzdJDqMAGC0+STAm9aPBI6L3YxL3twYXJlbnQ9cHJvamVjdHMvKi9pbnN0YW5jZXMvKi9kYXRhYmFzZXMvKn0vY2hhbmdlbG9ncxIvL3YxL3twYXJlbnQ9aW5zdGFuY2VzLyovZGF0YWJhc2VzLyp9L2NoYW5nZWxvZ3MS4AEKDEdldENoYW5nZWxvZxIgLmJ5dGViYXNlLnYxLkdldENoYW5nZWxvZ1JlcXVlc3QaFi5ieXRlYmFzZS52MS5DaGFuZ2Vsb2cilQHaQQRuYW1liuowEWJiLmNoYW5nZWxvZ3MuZ2V0kOowAYLT5JMCb1o8EjovdjEve25hbWU9cHJvamVjdHMvKi9pbnN0YW5jZXMvKi9kYXRhYmFzZXMvKi9jaGFuZ2Vsb2dzLyp9Ei8vdjEve25hbWU9aW5zdGFuY2VzLyovZGF0YWJhc2VzLyovY2hhbmdlbG9ncy8qfUKrAQoPY29tLmJ5dGViYXNlLnYxQhVDaGFuZ2Vsb2dTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_timestamp, file_v1_annotation]);/*** Describes the message bytebase.v1.ListChangelogsRequest.diff --git a/frontend/src/types/proto-es/v1/database_catalog_service_pb.d.ts b/frontend/src/types/proto-es/v1/database_catalog_service_pb.d.tsindex d8610ff290..9a2767f7c5 100644--- a/frontend/src/types/proto-es/v1/database_catalog_service_pb.d.ts+++ b/frontend/src/types/proto-es/v1/database_catalog_service_pb.d.ts@@ -18,7 +18,7 @@ export declare const file_v1_database_catalog_service: GenFile;export declare type GetDatabaseCatalogRequest = Message<"bytebase.v1.GetDatabaseCatalogRequest"> & {/*** The name of the database catalog to retrieve.- * Format: instances/{instance}/databases/{database}/catalog+ * Format: instances/{instance}/databases/{database}/catalog or projects/{project}/instances/{instance}/databases/{database}/catalog** @generated from field: string name = 1;*/@@ -41,7 +41,7 @@ export declare type UpdateDatabaseCatalogRequest = Message<"bytebase.v1.UpdateDa* The database catalog to update.** The catalog's `name` field is used to identify the database catalog to update.- * Format: instances/{instance}/databases/{database}/catalog+ * Format: instances/{instance}/databases/{database}/catalog or projects/{project}/instances/{instance}/databases/{database}/catalog** @generated from field: bytebase.v1.DatabaseCatalog catalog = 1;*/@@ -70,7 +70,7 @@ export declare const UpdateDatabaseCatalogRequestSchema: GenMessage<UpdateDatabaexport declare type DatabaseCatalog = Message<"bytebase.v1.DatabaseCatalog"> & {/*** The name of the database catalog.- * Format: instances/{instance}/databases/{database}/catalog+ * Format: instances/{instance}/databases/{database}/catalog or projects/{project}/instances/{instance}/databases/{database}/catalog** @generated from field: string name = 1;*/diff --git a/frontend/src/types/proto-es/v1/database_catalog_service_pb.js b/frontend/src/types/proto-es/v1/database_catalog_service_pb.jsindex f426ebd290..d17a31a369 100644--- a/frontend/src/types/proto-es/v1/database_catalog_service_pb.js+++ b/frontend/src/types/proto-es/v1/database_catalog_service_pb.js@@ -13,7 +13,7 @@ import { file_v1_annotation } from "./annotation_pb";* Describes the file v1/database_catalog_service.proto.*/export const file_v1_database_catalog_service = /*@__PURE__*/- fileDesc("CiF2MS9kYXRhYmFzZV9jYXRhbG9nX3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIk8KGUdldERhdGFiYXNlQ2F0YWxvZ1JlcXVlc3QSMgoEbmFtZRgBIAEoCUIk4EEC+kEeChxieXRlYmFzZS5jb20vRGF0YWJhc2VDYXRhbG9nImkKHFVwZGF0ZURhdGFiYXNlQ2F0YWxvZ1JlcXVlc3QSMgoHY2F0YWxvZxgBIAEoCzIcLmJ5dGViYXNlLnYxLkRhdGFiYXNlQ2F0YWxvZ0ID4EECEhUKDWFsbG93X21pc3NpbmcYAiABKAgiogEKD0RhdGFiYXNlQ2F0YWxvZxIMCgRuYW1lGAEgASgJEisKB3NjaGVtYXMYAiADKAsyGi5ieXRlYmFzZS52MS5TY2hlbWFDYXRhbG9nOlTqQVEKHGJ5dGViYXNlLmNvbS9EYXRhYmFzZUNhdGFsb2cSMWluc3RhbmNlcy97aW5zdGFuY2V9L2RhdGFiYXNlcy97ZGF0YWJhc2V9L2NhdGFsb2ciSAoNU2NoZW1hQ2F0YWxvZxIMCgRuYW1lGAEgASgJEikKBnRhYmxlcxgCIAMoCzIZLmJ5dGViYXNlLnYxLlRhYmxlQ2F0YWxvZyLeAQoMVGFibGVDYXRhbG9nEgwKBG5hbWUYASABKAkSNAoHY29sdW1ucxgCIAEoCzIhLmJ5dGViYXNlLnYxLlRhYmxlQ2F0YWxvZy5Db2x1bW5zSAASMgoNb2JqZWN0X3NjaGVtYRgDIAEoCzIZLmJ5dGViYXNlLnYxLk9iamVjdFNjaGVtYUgAEhYKDmNsYXNzaWZpY2F0aW9uGAQgASgJGjYKB0NvbHVtbnMSKwoHY29sdW1ucxgBIAMoCzIaLmJ5dGViYXNlLnYxLkNvbHVtbkNhdGFsb2dCBgoEa2luZCL8AQoNQ29sdW1uQ2F0YWxvZxIMCgRuYW1lGAEgASgJEhUKDXNlbWFudGljX3R5cGUYAiABKAkSNgoGbGFiZWxzGAMgAygLMiYuYnl0ZWJhc2UudjEuQ29sdW1uQ2F0YWxvZy5MYWJlbHNFbnRyeRIWCg5jbGFzc2lmaWNhdGlvbhgEIAEoCRI1Cg1vYmplY3Rfc2NoZW1hGAUgASgLMhkuYnl0ZWJhc2UudjEuT2JqZWN0U2NoZW1hSACIAQEaLQoLTGFiZWxzRW50cnkSCwoDa2V5GAEgASgJEg0KBXZhbHVlGAIgASgJOgI4AUIQCg5fb2JqZWN0X3NjaGVtYSKKBAoMT2JqZWN0U2NoZW1hEiwKBHR5cGUYASABKA4yHi5ieXRlYmFzZS52MS5PYmplY3RTY2hlbWEuVHlwZRI7CgtzdHJ1Y3Rfa2luZBgCIAEoCzIkLmJ5dGViYXNlLnYxLk9iamVjdFNjaGVtYS5TdHJ1Y3RLaW5kSAASOQoKYXJyYXlfa2luZBgDIAEoCzIjLmJ5dGViYXNlLnYxLk9iamVjdFNjaGVtYS5BcnJheUtpbmRIABIVCg1zZW1hbnRpY190eXBlGAQgASgJGqQBCgpTdHJ1Y3RLaW5kEkgKCnByb3BlcnRpZXMYASADKAsyNC5ieXRlYmFzZS52MS5PYmplY3RTY2hlbWEuU3RydWN0S2luZC5Qcm9wZXJ0aWVzRW50cnkaTAoPUHJvcGVydGllc0VudHJ5EgsKA2tleRgBIAEoCRIoCgV2YWx1ZRgCIAEoCzIZLmJ5dGViYXNlLnYxLk9iamVjdFNjaGVtYToCOAEaNAoJQXJyYXlLaW5kEicKBGtpbmQYASABKAsyGS5ieXRlYmFzZS52MS5PYmplY3RTY2hlbWEiWAoEVHlwZRIUChBUWVBFX1VOU1BFQ0lGSUVEEAASCgoGU1RSSU5HEAESCgoGTlVNQkVSEAISCwoHQk9PTEVBThADEgoKBk9CSkVDVBAEEgkKBUFSUkFZEAVCBgoEa2luZDKzAwoWRGF0YWJhc2VDYXRhbG9nU2VydmljZRK0AQoSR2V0RGF0YWJhc2VDYXRhbG9nEiYuYnl0ZWJhc2UudjEuR2V0RGF0YWJhc2VDYXRhbG9nUmVxdWVzdBocLmJ5dGViYXNlLnYxLkRhdGFiYXNlQ2F0YWxvZyJY2kEEbmFtZYrqMBdiYi5kYXRhYmFzZUNhdGFsb2dzLmdldJDqMAGC0+STAiwSKi92MS97bmFtZT1pbnN0YW5jZXMvKi9kYXRhYmFzZXMvKi9jYXRhbG9nfRLhAQoVVXBkYXRlRGF0YWJhc2VDYXRhbG9nEikuYnl0ZWJhc2UudjEuVXBkYXRlRGF0YWJhc2VDYXRhbG9nUmVxdWVzdBocLmJ5dGViYXNlLnYxLkRhdGFiYXNlQ2F0YWxvZyJ/2kETY2F0YWxvZyx1cGRhdGVfbWFza4rqMBpiYi5kYXRhYmFzZUNhdGFsb2dzLnVwZGF0ZZDqMAGY6jABgtPkkwI9OgdjYXRhbG9nMjIvdjEve2NhdGFsb2cubmFtZT1pbnN0YW5jZXMvKi9kYXRhYmFzZXMvKi9jYXRhbG9nfUKxAQoPY29tLmJ5dGViYXNlLnYxQhtEYXRhYmFzZUNhdGFsb2dTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_v1_annotation]);+ fileDesc("CiF2MS9kYXRhYmFzZV9jYXRhbG9nX3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIk8KGUdldERhdGFiYXNlQ2F0YWxvZ1JlcXVlc3QSMgoEbmFtZRgBIAEoCUIk4EEC+kEeChxieXRlYmFzZS5jb20vRGF0YWJhc2VDYXRhbG9nImkKHFVwZGF0ZURhdGFiYXNlQ2F0YWxvZ1JlcXVlc3QSMgoHY2F0YWxvZxgBIAEoCzIcLmJ5dGViYXNlLnYxLkRhdGFiYXNlQ2F0YWxvZ0ID4EECEhUKDWFsbG93X21pc3NpbmcYAiABKAgi6gEKD0RhdGFiYXNlQ2F0YWxvZxIMCgRuYW1lGAEgASgJEisKB3NjaGVtYXMYAiADKAsyGi5ieXRlYmFzZS52MS5TY2hlbWFDYXRhbG9nOpsB6kGXAQocYnl0ZWJhc2UuY29tL0RhdGFiYXNlQ2F0YWxvZxIxaW5zdGFuY2VzL3tpbnN0YW5jZX0vZGF0YWJhc2VzL3tkYXRhYmFzZX0vY2F0YWxvZxJEcHJvamVjdHMve3Byb2plY3R9L2luc3RhbmNlcy97aW5zdGFuY2V9L2RhdGFiYXNlcy97ZGF0YWJhc2V9L2NhdGFsb2ciSAoNU2NoZW1hQ2F0YWxvZxIMCgRuYW1lGAEgASgJEikKBnRhYmxlcxgCIAMoCzIZLmJ5dGViYXNlLnYxLlRhYmxlQ2F0YWxvZyLeAQoMVGFibGVDYXRhbG9nEgwKBG5hbWUYASABKAkSNAoHY29sdW1ucxgCIAEoCzIhLmJ5dGViYXNlLnYxLlRhYmxlQ2F0YWxvZy5Db2x1bW5zSAASMgoNb2JqZWN0X3NjaGVtYRgDIAEoCzIZLmJ5dGViYXNlLnYxLk9iamVjdFNjaGVtYUgAEhYKDmNsYXNzaWZpY2F0aW9uGAQgASgJGjYKB0NvbHVtbnMSKwoHY29sdW1ucxgBIAMoCzIaLmJ5dGViYXNlLnYxLkNvbHVtbkNhdGFsb2dCBgoEa2luZCL8AQoNQ29sdW1uQ2F0YWxvZxIMCgRuYW1lGAEgASgJEhUKDXNlbWFudGljX3R5cGUYAiABKAkSNgoGbGFiZWxzGAMgAygLMiYuYnl0ZWJhc2UudjEuQ29sdW1uQ2F0YWxvZy5MYWJlbHNFbnRyeRIWCg5jbGFzc2lmaWNhdGlvbhgEIAEoCRI1Cg1vYmplY3Rfc2NoZW1hGAUgASgLMhkuYnl0ZWJhc2UudjEuT2JqZWN0U2NoZW1hSACIAQEaLQoLTGFiZWxzRW50cnkSCwoDa2V5GAEgASgJEg0KBXZhbHVlGAIgASgJOgI4AUIQCg5fb2JqZWN0X3NjaGVtYSKKBAoMT2JqZWN0U2NoZW1hEiwKBHR5cGUYASABKA4yHi5ieXRlYmFzZS52MS5PYmplY3RTY2hlbWEuVHlwZRI7CgtzdHJ1Y3Rfa2luZBgCIAEoCzIkLmJ5dGViYXNlLnYxLk9iamVjdFNjaGVtYS5TdHJ1Y3RLaW5kSAASOQoKYXJyYXlfa2luZBgDIAEoCzIjLmJ5dGViYXNlLnYxLk9iamVjdFNjaGVtYS5BcnJheUtpbmRIABIVCg1zZW1hbnRpY190eXBlGAQgASgJGqQBCgpTdHJ1Y3RLaW5kEkgKCnByb3BlcnRpZXMYASADKAsyNC5ieXRlYmFzZS52MS5PYmplY3RTY2hlbWEuU3RydWN0S2luZC5Qcm9wZXJ0aWVzRW50cnkaTAoPUHJvcGVydGllc0VudHJ5EgsKA2tleRgBIAEoCRIoCgV2YWx1ZRgCIAEoCzIZLmJ5dGViYXNlLnYxLk9iamVjdFNjaGVtYToCOAEaNAoJQXJyYXlLaW5kEicKBGtpbmQYASABKAsyGS5ieXRlYmFzZS52MS5PYmplY3RTY2hlbWEiWAoEVHlwZRIUChBUWVBFX1VOU1BFQ0lGSUVEEAASCgoGU1RSSU5HEAESCgoGTlVNQkVSEAISCwoHQk9PTEVBThADEgoKBk9CSkVDVBAEEgkKBUFSUkFZEAVCBgoEa2luZDK5BAoWRGF0YWJhc2VDYXRhbG9nU2VydmljZRLuAQoSR2V0RGF0YWJhc2VDYXRhbG9nEiYuYnl0ZWJhc2UudjEuR2V0RGF0YWJhc2VDYXRhbG9nUmVxdWVzdBocLmJ5dGViYXNlLnYxLkRhdGFiYXNlQ2F0YWxvZyKRAdpBBG5hbWWK6jAXYmIuZGF0YWJhc2VDYXRhbG9ncy5nZXSQ6jABgtPkkwJlWjcSNS92MS97bmFtZT1wcm9qZWN0cy8qL2luc3RhbmNlcy8qL2RhdGFiYXNlcy8qL2NhdGFsb2d9EiovdjEve25hbWU9aW5zdGFuY2VzLyovZGF0YWJhc2VzLyovY2F0YWxvZ30SrQIKFVVwZGF0ZURhdGFiYXNlQ2F0YWxvZxIpLmJ5dGViYXNlLnYxLlVwZGF0ZURhdGFiYXNlQ2F0YWxvZ1JlcXVlc3QaHC5ieXRlYmFzZS52MS5EYXRhYmFzZUNhdGFsb2ciygHaQRNjYXRhbG9nLHVwZGF0ZV9tYXNriuowGmJiLmRhdGFiYXNlQ2F0YWxvZ3MudXBkYXRlkOowAZjqMAGC0+STAocBOgdjYXRhbG9nWkg6B2NhdGFsb2cyPS92MS97Y2F0YWxvZy5uYW1lPXByb2plY3RzLyovaW5zdGFuY2VzLyovZGF0YWJhc2VzLyovY2F0YWxvZ30yMi92MS97Y2F0YWxvZy5uYW1lPWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qL2NhdGFsb2d9QrEBCg9jb20uYnl0ZWJhc2UudjFCG0RhdGFiYXNlQ2F0YWxvZ1NlcnZpY2VQcm90b1ABWjRnaXRodWIuY29tL2J5dGViYXNlL2J5dGViYXNlL2JhY2tlbmQvZ2VuZXJhdGVkLWdvL3YxogIDQlhYqgILQnl0ZWJhc2UuVjHKAgtCeXRlYmFzZVxWMeICF0J5dGViYXNlXFYxXEdQQk1ldGFkYXRh6gIMQnl0ZWJhc2U6OlYxYgZwcm90bzM", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_v1_annotation]);/*** Describes the message bytebase.v1.GetDatabaseCatalogRequest.diff --git a/frontend/src/types/proto-es/v1/database_service_pb.d.ts b/frontend/src/types/proto-es/v1/database_service_pb.d.tsindex 56eba69379..acb0896870 100644--- a/frontend/src/types/proto-es/v1/database_service_pb.d.ts+++ b/frontend/src/types/proto-es/v1/database_service_pb.d.ts@@ -19,7 +19,7 @@ export declare const file_v1_database_service: GenFile;export declare type GetDatabaseRequest = Message<"bytebase.v1.GetDatabaseRequest"> & {/*** The name of the database to retrieve.- * Format: instances/{instance}/databases/{database}+ * Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}** @generated from field: string name = 1;*/@@ -39,7 +39,8 @@ export declare type BatchGetDatabasesRequest = Message<"bytebase.v1.BatchGetData/*** The parent resource shared by all databases being retrieved.* - projects/{project}: batch get databases in a project;- * - instances/{instances}: batch get databases in a instance;+ * - instances/{instance}: batch get databases in an instance;+ * - projects/{project}/instances/{instance}: batch get databases in a project instance;* Use "-" as wildcard to batch get databases across parent.** @generated from field: string parent = 1;@@ -85,7 +86,8 @@ export declare type ListDatabasesRequest = Message<"bytebase.v1.ListDatabasesReq/*** - projects/{project}: list databases in a project, require "bb.projects.get" permission.* - workspaces/{id}: list databases in the workspace, require "bb.databases.list" permission.- * - instances/{instances}: list databases in a instance, require "bb.instances.get" permission+ * - instances/{instance}: list databases in an instance, require "bb.instances.get" permission.+ * - projects/{project}/instances/{instance}: list databases in a project instance, require "bb.instances.get" permission.** @generated from field: string parent = 1;*/@@ -209,7 +211,7 @@ export declare type UpdateDatabaseRequest = Message<"bytebase.v1.UpdateDatabaseR* The database to update.** The database's `name` field is used to identify the database to update.- * Format: instances/{instance}/databases/{database}+ * Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}** @generated from field: bytebase.v1.Database database = 1;*/@@ -243,7 +245,7 @@ export declare const UpdateDatabaseRequestSchema: GenMessage<UpdateDatabaseRequeexport declare type BatchUpdateDatabasesRequest = Message<"bytebase.v1.BatchUpdateDatabasesRequest"> & {/*** The parent resource shared by all databases being updated.- * Format: instances/{instance}+ * Format: instances/{instance} or projects/{project}/instances/{instance}* If the operation spans parents, a dash (-) may be accepted as a wildcard.* We only support updating the project of databases for now.*@@ -290,7 +292,7 @@ export declare const BatchUpdateDatabasesResponseSchema: GenMessage<BatchUpdateDexport declare type BatchSyncDatabasesRequest = Message<"bytebase.v1.BatchSyncDatabasesRequest"> & {/*** The parent resource shared by all databases being updated.- * Format: instances/{instance}+ * Format: instances/{instance} or projects/{project}/instances/{instance}* If the operation spans parents, a dash (-) may be accepted as a wildcard.** @generated from field: string parent = 1;@@ -329,7 +331,7 @@ export declare const BatchSyncDatabasesResponseSchema: GenMessage<BatchSyncDatabexport declare type SyncDatabaseRequest = Message<"bytebase.v1.SyncDatabaseRequest"> & {/*** The name of the database to sync.- * Format: instances/{instance}/databases/{database}+ * Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}** @generated from field: string name = 1;*/@@ -360,7 +362,7 @@ export declare const SyncDatabaseResponseSchema: GenMessage<SyncDatabaseResponseexport declare type GetDatabaseMetadataRequest = Message<"bytebase.v1.GetDatabaseMetadataRequest"> & {/*** The name of the database to retrieve metadata.- * Format: instances/{instance}/databases/{database}/metadata+ * Format: instances/{instance}/databases/{database}/metadata or projects/{project}/instances/{instance}/databases/{database}/metadata** @generated from field: string name = 1;*/@@ -409,7 +411,7 @@ export declare const GetDatabaseMetadataRequestSchema: GenMessage<GetDatabaseMetexport declare type GetDatabaseSchemaRequest = Message<"bytebase.v1.GetDatabaseSchemaRequest"> & {/*** The name of the database to retrieve schema.- * Format: instances/{instance}/databases/{database}/schema+ * Format: instances/{instance}/databases/{database}/schema or projects/{project}/instances/{instance}/databases/{database}/schema** @generated from field: string name = 1;*/@@ -428,7 +430,7 @@ export declare const GetDatabaseSchemaRequestSchema: GenMessage<GetDatabaseSchemexport declare type GetDatabaseSDLSchemaRequest = Message<"bytebase.v1.GetDatabaseSDLSchemaRequest"> & {/*** The name of the database to retrieve SDL schema.- * Format: instances/{instance}/databases/{database}/sdlSchema+ * Format: instances/{instance}/databases/{database}/sdlSchema or projects/{project}/instances/{instance}/databases/{database}/sdlSchema** @generated from field: string name = 1;*/@@ -489,8 +491,8 @@ export declare type DiffSchemaRequest = Message<"bytebase.v1.DiffSchemaRequest">/*** The name of the database or changelog.* Format:- * database: instances/{instance}/databases/{database}- * changelog: instances/{instance}/databases/{database}/changelogs/{changelog}+ * database: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}+ * changelog: instances/{instance}/databases/{database}/changelogs/{changelog} or projects/{project}/instances/{instance}/databases/{database}/changelogs/{changelog}** @generated from field: string name = 1;*/@@ -511,7 +513,7 @@ export declare type DiffSchemaRequest = Message<"bytebase.v1.DiffSchemaRequest">/*** The resource name of the changelog* Format:- * instances/{instance}/databases/{database}/changelogs/{changelog}+ * instances/{instance}/databases/{database}/changelogs/{changelog} or projects/{project}/instances/{instance}/databases/{database}/changelogs/{changelog}** @generated from field: string changelog = 3;*/@@ -548,7 +550,7 @@ export declare const DiffSchemaResponseSchema: GenMessage<DiffSchemaResponse>;export declare type DiffMetadataRequest = Message<"bytebase.v1.DiffMetadataRequest"> & {/*** The database whose current schema is the diff source.- * Format: instances/{instance}/databases/{database}+ * Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}** @generated from field: string name = 1;*/@@ -596,7 +598,7 @@ export declare const DiffMetadataResponseSchema: GenMessage<DiffMetadataResponseexport declare type Database = Message<"bytebase.v1.Database"> & {/*** The name of the database.- * Format: instances/{instance}/databases/{database}+ * Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}* {database} is the database name in the instance.** @generated from field: string name = 1;@@ -702,7 +704,7 @@ export declare type DatabaseMetadata = Message<"bytebase.v1.DatabaseMetadata"> &/*** The database metadata name.*- * Format: instances/{instance}/databases/{database}/metadata+ * Format: instances/{instance}/databases/{database}/metadata or projects/{project}/instances/{instance}/databases/{database}/metadata** @generated from field: string name = 1;*/@@ -3068,7 +3070,7 @@ export declare const DatabaseSDLSchemaSchema: GenMessage<DatabaseSDLSchema>;export declare type GetSchemaStringRequest = Message<"bytebase.v1.GetSchemaStringRequest"> & {/*** The name of the database.- * Format: instances/{instance}/databases/{database}+ * Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}** @generated from field: string name = 1;*/diff --git a/frontend/src/types/proto-es/v1/database_service_pb.js b/frontend/src/types/proto-es/v1/database_service_pb.jsindex 557d08300b..fc22b00ea3 100644--- a/frontend/src/types/proto-es/v1/database_service_pb.js+++ b/frontend/src/types/proto-es/v1/database_service_pb.js@@ -16,7 +16,7 @@ import { file_v1_instance_service } from "./instance_service_pb";* Describes the file v1/database_service.proto.*/export const file_v1_database_service = /*@__PURE__*/- fileDesc("Chl2MS9kYXRhYmFzZV9zZXJ2aWNlLnByb3RvEgtieXRlYmFzZS52MSJBChJHZXREYXRhYmFzZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vRGF0YWJhc2UidwoYQmF0Y2hHZXREYXRhYmFzZXNSZXF1ZXN0Ei0KBnBhcmVudBgBIAEoCUId4EEC+kEXEhVieXRlYmFzZS5jb20vRGF0YWJhc2USLAoFbmFtZXMYAiADKAlCHeBBAvpBFwoVYnl0ZWJhc2UuY29tL0RhdGFiYXNlIkUKGUJhdGNoR2V0RGF0YWJhc2VzUmVzcG9uc2USKAoJZGF0YWJhc2VzGAEgAygLMhUuYnl0ZWJhc2UudjEuRGF0YWJhc2UipAEKFExpc3REYXRhYmFzZXNSZXF1ZXN0Ei0KBnBhcmVudBgBIAEoCUId4EEC+kEXEhVieXRlYmFzZS5jb20vRGF0YWJhc2USEQoJcGFnZV9zaXplGAIgASgFEhIKCnBhZ2VfdG9rZW4YAyABKAkSDgoGZmlsdGVyGAQgASgJEhQKDHNob3dfZGVsZXRlZBgFIAEoCBIQCghvcmRlcl9ieRgGIAEoCSJaChVMaXN0RGF0YWJhc2VzUmVzcG9uc2USKAoJZGF0YWJhc2VzGAEgAygLMhUuYnl0ZWJhc2UudjEuRGF0YWJhc2USFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJIo0BChVVcGRhdGVEYXRhYmFzZVJlcXVlc3QSLAoIZGF0YWJhc2UYASABKAsyFS5ieXRlYmFzZS52MS5EYXRhYmFzZUID4EECEi8KC3VwZGF0ZV9tYXNrGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFzaxIVCg1hbGxvd19taXNzaW5nGAMgASgIImgKG0JhdGNoVXBkYXRlRGF0YWJhc2VzUmVxdWVzdBIOCgZwYXJlbnQYASABKAkSOQoIcmVxdWVzdHMYAiADKAsyIi5ieXRlYmFzZS52MS5VcGRhdGVEYXRhYmFzZVJlcXVlc3RCA+BBAiJIChxCYXRjaFVwZGF0ZURhdGFiYXNlc1Jlc3BvbnNlEigKCWRhdGFiYXNlcxgBIAMoCzIVLmJ5dGViYXNlLnYxLkRhdGFiYXNlIlkKGUJhdGNoU3luY0RhdGFiYXNlc1JlcXVlc3QSDgoGcGFyZW50GAEgASgJEiwKBW5hbWVzGAIgAygJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9EYXRhYmFzZSIcChpCYXRjaFN5bmNEYXRhYmFzZXNSZXNwb25zZSJCChNTeW5jRGF0YWJhc2VSZXF1ZXN0EisKBG5hbWUYASABKAlCHeBBAvpBFwoVYnl0ZWJhc2UuY29tL0RhdGFiYXNlIhYKFFN5bmNEYXRhYmFzZVJlc3BvbnNlInAKGkdldERhdGFiYXNlTWV0YWRhdGFSZXF1ZXN0EjMKBG5hbWUYASABKAlCJeBBAvpBHwodYnl0ZWJhc2UuY29tL0RhdGFiYXNlTWV0YWRhdGESDgoGZmlsdGVyGAIgASgJEg0KBWxpbWl0GAMgASgFIk0KGEdldERhdGFiYXNlU2NoZW1hUmVxdWVzdBIxCgRuYW1lGAEgASgJQiPgQQL6QR0KG2J5dGViYXNlLmNvbS9EYXRhYmFzZVNjaGVtYSLYAQobR2V0RGF0YWJhc2VTRExTY2hlbWFSZXF1ZXN0EisKBG5hbWUYASABKAlCHeBBAvpBFwoVYnl0ZWJhc2UuY29tL0RhdGFiYXNlEkIKBmZvcm1hdBgCIAEoDjIyLmJ5dGViYXNlLnYxLkdldERhdGFiYXNlU0RMU2NoZW1hUmVxdWVzdC5TRExGb3JtYXQiSAoJU0RMRm9ybWF0EhoKFlNETF9GT1JNQVRfVU5TUEVDSUZJRUQQABIPCgtTSU5HTEVfRklMRRABEg4KCk1VTFRJX0ZJTEUQAiJxChFEaWZmU2NoZW1hUmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9EYXRhYmFzZRIQCgZzY2hlbWEYAiABKAlIABITCgljaGFuZ2Vsb2cYAyABKAlIAEIICgZ0YXJnZXQiIgoSRGlmZlNjaGVtYVJlc3BvbnNlEgwKBGRpZmYYASABKAkifwoTRGlmZk1ldGFkYXRhUmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9EYXRhYmFzZRI7Cg90YXJnZXRfbWV0YWRhdGEYAiABKAsyHS5ieXRlYmFzZS52MS5EYXRhYmFzZU1ldGFkYXRhQgPgQQIiJAoURGlmZk1ldGFkYXRhUmVzcG9uc2USDAoEZGlmZhgBIAEoCSLrBAoIRGF0YWJhc2USDAoEbmFtZRgBIAEoCRImCgVzdGF0ZRgCIAEoDjISLmJ5dGViYXNlLnYxLlN0YXRlQgPgQQMSPQoUc3VjY2Vzc2Z1bF9zeW5jX3RpbWUYAyABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSDwoHcHJvamVjdBgEIAEoCRIUCgdyZWxlYXNlGAUgASgJQgPgQQMSHQoLZW52aXJvbm1lbnQYBiABKAlCA+BBAUgAiAEBEicKFWVmZmVjdGl2ZV9lbnZpcm9ubWVudBgHIAEoCUID4EEDSAGIAQESMQoGbGFiZWxzGAggAygLMiEuYnl0ZWJhc2UudjEuRGF0YWJhc2UuTGFiZWxzRW50cnkSPQoRaW5zdGFuY2VfcmVzb3VyY2UYCSABKAsyHS5ieXRlYmFzZS52MS5JbnN0YW5jZVJlc291cmNlQgPgQQMSHQoQYmFja3VwX2F2YWlsYWJsZRgKIAEoCEID4EEDEjEKC3N5bmNfc3RhdHVzGAsgASgOMhcuYnl0ZWJhc2UudjEuU3luY1N0YXR1c0ID4EEDEhcKCnN5bmNfZXJyb3IYDCABKAlCA+BBAxotCgtMYWJlbHNFbnRyeRILCgNrZXkYASABKAkSDQoFdmFsdWUYAiABKAk6AjgBOkXqQUIKFWJ5dGViYXNlLmNvbS9EYXRhYmFzZRIpaW5zdGFuY2VzL3tpbnN0YW5jZX0vZGF0YWJhc2VzL3tkYXRhYmFzZX1CDgoMX2Vudmlyb25tZW50QhgKFl9lZmZlY3RpdmVfZW52aXJvbm1lbnQiqAIKEERhdGFiYXNlTWV0YWRhdGESDAoEbmFtZRgBIAEoCRIsCgdzY2hlbWFzGAIgAygLMhsuYnl0ZWJhc2UudjEuU2NoZW1hTWV0YWRhdGESFQoNY2hhcmFjdGVyX3NldBgDIAEoCRIRCgljb2xsYXRpb24YBCABKAkSMgoKZXh0ZW5zaW9ucxgFIAMoCzIeLmJ5dGViYXNlLnYxLkV4dGVuc2lvbk1ldGFkYXRhEg0KBW93bmVyGAYgASgJEhMKC3NlYXJjaF9wYXRoGAcgASgJOlbqQVMKHWJ5dGViYXNlLmNvbS9EYXRhYmFzZU1ldGFkYXRhEjJpbnN0YW5jZXMve2luc3RhbmNlfS9kYXRhYmFzZXMve2RhdGFiYXNlfS9tZXRhZGF0YSLjBQoOU2NoZW1hTWV0YWRhdGESDAoEbmFtZRgBIAEoCRIqCgZ0YWJsZXMYAiADKAsyGi5ieXRlYmFzZS52MS5UYWJsZU1ldGFkYXRhEjsKD2V4dGVybmFsX3RhYmxlcxgDIAMoCzIiLmJ5dGViYXNlLnYxLkV4dGVybmFsVGFibGVNZXRhZGF0YRIoCgV2aWV3cxgEIAMoCzIZLmJ5dGViYXNlLnYxLlZpZXdNZXRhZGF0YRIwCglmdW5jdGlvbnMYBSADKAsyHS5ieXRlYmFzZS52MS5GdW5jdGlvbk1ldGFkYXRhEjIKCnByb2NlZHVyZXMYBiADKAsyHi5ieXRlYmFzZS52MS5Qcm9jZWR1cmVNZXRhZGF0YRIsCgdzdHJlYW1zGAcgAygLMhsuYnl0ZWJhc2UudjEuU3RyZWFtTWV0YWRhdGESKAoFdGFza3MYCCADKAsyGS5ieXRlYmFzZS52MS5UYXNrTWV0YWRhdGESQQoSbWF0ZXJpYWxpemVkX3ZpZXdzGAkgAygLMiUuYnl0ZWJhc2UudjEuTWF0ZXJpYWxpemVkVmlld01ldGFkYXRhEi4KCHBhY2thZ2VzGAogAygLMhwuYnl0ZWJhc2UudjEuUGFja2FnZU1ldGFkYXRhEg0KBW93bmVyGAsgASgJEjAKCXNlcXVlbmNlcxgMIAMoCzIdLmJ5dGViYXNlLnYxLlNlcXVlbmNlTWV0YWRhdGESKgoGZXZlbnRzGA0gAygLMhouYnl0ZWJhc2UudjEuRXZlbnRNZXRhZGF0YRIxCgplbnVtX3R5cGVzGA4gAygLMh0uYnl0ZWJhc2UudjEuRW51bVR5cGVNZXRhZGF0YRIRCglza2lwX2R1bXAYDyABKAgSDwoHY29tbWVudBgQIAEoCRI7Cg9jb21wb3NpdGVfdHlwZXMYESADKAsyIi5ieXRlYmFzZS52MS5Db21wb3NpdGVUeXBlTWV0YWRhdGEiVAoQRW51bVR5cGVNZXRhZGF0YRIMCgRuYW1lGAEgASgJEg4KBnZhbHVlcxgCIAMoCRIPCgdjb21tZW50GAMgASgJEhEKCXNraXBfZHVtcBgEIAEoCCJvChVDb21wb3NpdGVUeXBlTWV0YWRhdGESDAoEbmFtZRgBIAEoCRI3CgphdHRyaWJ1dGVzGAIgAygLMiMuYnl0ZWJhc2UudjEuQ29tcG9zaXRlVHlwZUF0dHJpYnV0ZRIPCgdjb21tZW50GAMgASgJIlgKFkNvbXBvc2l0ZVR5cGVBdHRyaWJ1dGUSDAoEbmFtZRgBIAEoCRIMCgR0eXBlGAIgASgJEhEKCWNvbGxhdGlvbhgDIAEoCRIPCgdjb21tZW50GAQgASgJIqMBCg1FdmVudE1ldGFkYXRhEgwKBG5hbWUYASABKAkSEgoKZGVmaW5pdGlvbhgCIAEoCRIRCgl0aW1lX3pvbmUYAyABKAkSEAoIc3FsX21vZGUYBCABKAkSHAoUY2hhcmFjdGVyX3NldF9jbGllbnQYBSABKAkSHAoUY29sbGF0aW9uX2Nvbm5lY3Rpb24YBiABKAkSDwoHY29tbWVudBgHIAEoCSKBAgoQU2VxdWVuY2VNZXRhZGF0YRIMCgRuYW1lGAEgASgJEhEKCWRhdGFfdHlwZRgCIAEoCRINCgVzdGFydBgDIAEoCRIRCgltaW5fdmFsdWUYBCABKAkSEQoJbWF4X3ZhbHVlGAUgASgJEhEKCWluY3JlbWVudBgGIAEoCRINCgVjeWNsZRgHIAEoCBISCgpjYWNoZV9zaXplGAggASgJEhIKCmxhc3RfdmFsdWUYCSABKAkSEwoLb3duZXJfdGFibGUYCiABKAkSFAoMb3duZXJfY29sdW1uGAsgASgJEg8KB2NvbW1lbnQYDCABKAkSEQoJc2tpcF9kdW1wGA0gASgIIr4BCg9UcmlnZ2VyTWV0YWRhdGESDAoEbmFtZRgBIAEoCRINCgVldmVudBgCIAEoCRIOCgZ0aW1pbmcYAyABKAkSDAoEYm9keRgEIAEoCRIQCghzcWxfbW9kZRgFIAEoCRIcChRjaGFyYWN0ZXJfc2V0X2NsaWVudBgGIAEoCRIcChRjb2xsYXRpb25fY29ubmVjdGlvbhgHIAEoCRIPCgdjb21tZW50GAggASgJEhEKCXNraXBfZHVtcBgJIAEoCCKRAQoVRXh0ZXJuYWxUYWJsZU1ldGFkYXRhEgwKBG5hbWUYASABKAkSHAoUZXh0ZXJuYWxfc2VydmVyX25hbWUYAiABKAkSHgoWZXh0ZXJuYWxfZGF0YWJhc2VfbmFtZRgDIAEoCRIsCgdjb2x1bW5zGAQgAygLMhsuYnl0ZWJhc2UudjEuQ29sdW1uTWV0YWRhdGEi7AQKDVRhYmxlTWV0YWRhdGESDAoEbmFtZRgBIAEoCRIsCgdjb2x1bW5zGAIgAygLMhsuYnl0ZWJhc2UudjEuQ29sdW1uTWV0YWRhdGESKwoHaW5kZXhlcxgDIAMoCzIaLmJ5dGViYXNlLnYxLkluZGV4TWV0YWRhdGESDgoGZW5naW5lGAQgASgJEhEKCWNvbGxhdGlvbhgFIAEoCRIPCgdjaGFyc2V0GAYgASgJEhEKCXJvd19jb3VudBgHIAEoAxIRCglkYXRhX3NpemUYCCABKAMSEgoKaW5kZXhfc2l6ZRgJIAEoAxIRCglkYXRhX2ZyZWUYCiABKAMSFgoOY3JlYXRlX29wdGlvbnMYCyABKAkSDwoHY29tbWVudBgMIAEoCRI1Cgxmb3JlaWduX2tleXMYDSADKAsyHy5ieXRlYmFzZS52MS5Gb3JlaWduS2V5TWV0YWRhdGESNwoKcGFydGl0aW9ucxgOIAMoCzIjLmJ5dGViYXNlLnYxLlRhYmxlUGFydGl0aW9uTWV0YWRhdGESPwoRY2hlY2tfY29uc3RyYWludHMYDyADKAsyJC5ieXRlYmFzZS52MS5DaGVja0NvbnN0cmFpbnRNZXRhZGF0YRINCgVvd25lchgQIAEoCRIUCgxzb3J0aW5nX2tleXMYESADKAkSLgoIdHJpZ2dlcnMYEiADKAsyHC5ieXRlYmFzZS52MS5UcmlnZ2VyTWV0YWRhdGESEQoJc2tpcF9kdW1wGBMgASgIEhUKDXNoYXJkaW5nX2luZm8YFCABKAkSGAoQcHJpbWFyeV9rZXlfdHlwZRgVIAEoCSI7ChdDaGVja0NvbnN0cmFpbnRNZXRhZGF0YRIMCgRuYW1lGAEgASgJEhIKCmV4cHJlc3Npb24YAiABKAkizQMKFlRhYmxlUGFydGl0aW9uTWV0YWRhdGESDAoEbmFtZRgBIAEoCRI2CgR0eXBlGAIgASgOMiguYnl0ZWJhc2UudjEuVGFibGVQYXJ0aXRpb25NZXRhZGF0YS5UeXBlEhIKCmV4cHJlc3Npb24YAyABKAkSDQoFdmFsdWUYBCABKAkSEwoLdXNlX2RlZmF1bHQYBSABKAkSOgoNc3VicGFydGl0aW9ucxgGIAMoCzIjLmJ5dGViYXNlLnYxLlRhYmxlUGFydGl0aW9uTWV0YWRhdGESKwoHaW5kZXhlcxgHIAMoCzIaLmJ5dGViYXNlLnYxLkluZGV4TWV0YWRhdGESPwoRY2hlY2tfY29uc3RyYWludHMYCCADKAsyJC5ieXRlYmFzZS52MS5DaGVja0NvbnN0cmFpbnRNZXRhZGF0YSKKAQoEVHlwZRIUChBUWVBFX1VOU1BFQ0lGSUVEEAASCQoFUkFOR0UQARIRCg1SQU5HRV9DT0xVTU5TEAISCAoETElTVBADEhAKDExJU1RfQ09MVU1OUxAEEggKBEhBU0gQBRIPCgtMSU5FQVJfSEFTSBAGEgcKA0tFWRAHEg4KCkxJTkVBUl9LRVkQCCLRBAoOQ29sdW1uTWV0YWRhdGESDAoEbmFtZRgBIAEoCRIQCghwb3NpdGlvbhgCIAEoBRITCgtoYXNfZGVmYXVsdBgDIAEoCBIPCgdkZWZhdWx0GAQgASgJEhcKD2RlZmF1bHRfb25fbnVsbBgFIAEoCBIRCglvbl91cGRhdGUYBiABKAkSEAoIbnVsbGFibGUYByABKAgSDAoEdHlwZRgIIAEoCRIVCg1jaGFyYWN0ZXJfc2V0GAkgASgJEhEKCWNvbGxhdGlvbhgKIAEoCRIPCgdjb21tZW50GAsgASgJEjMKCmdlbmVyYXRpb24YDCABKAsyHy5ieXRlYmFzZS52MS5HZW5lcmF0aW9uTWV0YWRhdGESEwoLaXNfaWRlbnRpdHkYDSABKAgSSwoTaWRlbnRpdHlfZ2VuZXJhdGlvbhgOIAEoDjIuLmJ5dGViYXNlLnYxLkNvbHVtbk1ldGFkYXRhLklkZW50aXR5R2VuZXJhdGlvbhIVCg1pZGVudGl0eV9zZWVkGA8gASgDEhoKEmlkZW50aXR5X2luY3JlbWVudBgQIAEoAxIfChdkZWZhdWx0X2NvbnN0cmFpbnRfbmFtZRgRIAEoCRIRCgRzcmlkGBIgASgNSACIAQESFAoMaXNfaW52aXNpYmxlGBMgASgIIlUKEklkZW50aXR5R2VuZXJhdGlvbhIjCh9JREVOVElUWV9HRU5FUkFUSU9OX1VOU1BFQ0lGSUVEEAASCgoGQUxXQVlTEAESDgoKQllfREVGQVVMVBACQgcKBV9zcmlkIpMBChJHZW5lcmF0aW9uTWV0YWRhdGESMgoEdHlwZRgBIAEoDjIkLmJ5dGViYXNlLnYxLkdlbmVyYXRpb25NZXRhZGF0YS5UeXBlEhIKCmV4cHJlc3Npb24YAiABKAkiNQoEVHlwZRIUChBUWVBFX1VOU1BFQ0lGSUVEEAASCwoHVklSVFVBTBABEgoKBlNUT1JFRBACIu0BCgxWaWV3TWV0YWRhdGESDAoEbmFtZRgBIAEoCRISCgpkZWZpbml0aW9uGAIgASgJEg8KB2NvbW1lbnQYAyABKAkSOQoSZGVwZW5kZW5jeV9jb2x1bW5zGAQgAygLMh0uYnl0ZWJhc2UudjEuRGVwZW5kZW5jeUNvbHVtbhIsCgdjb2x1bW5zGAUgAygLMhsuYnl0ZWJhc2UudjEuQ29sdW1uTWV0YWRhdGESLgoIdHJpZ2dlcnMYBiADKAsyHC5ieXRlYmFzZS52MS5UcmlnZ2VyTWV0YWRhdGESEQoJc2tpcF9kdW1wGAcgASgIIkEKEERlcGVuZGVuY3lDb2x1bW4SDgoGc2NoZW1hGAEgASgJEg0KBXRhYmxlGAIgASgJEg4KBmNvbHVtbhgDIAEoCSL4AQoYTWF0ZXJpYWxpemVkVmlld01ldGFkYXRhEgwKBG5hbWUYASABKAkSEgoKZGVmaW5pdGlvbhgCIAEoCRIPCgdjb21tZW50GAMgASgJEjkKEmRlcGVuZGVuY3lfY29sdW1ucxgEIAMoCzIdLmJ5dGViYXNlLnYxLkRlcGVuZGVuY3lDb2x1bW4SLgoIdHJpZ2dlcnMYBSADKAsyHC5ieXRlYmFzZS52MS5UcmlnZ2VyTWV0YWRhdGESKwoHaW5kZXhlcxgGIAMoCzIaLmJ5dGViYXNlLnYxLkluZGV4TWV0YWRhdGESEQoJc2tpcF9kdW1wGAcgASgIIjAKD0RlcGVuZGVuY3lUYWJsZRIOCgZzY2hlbWEYASABKAkSDQoFdGFibGUYAiABKAkijgIKEEZ1bmN0aW9uTWV0YWRhdGESDAoEbmFtZRgBIAEoCRISCgpkZWZpbml0aW9uGAIgASgJEhEKCXNpZ25hdHVyZRgDIAEoCRIcChRjaGFyYWN0ZXJfc2V0X2NsaWVudBgEIAEoCRIcChRjb2xsYXRpb25fY29ubmVjdGlvbhgFIAEoCRIaChJkYXRhYmFzZV9jb2xsYXRpb24YBiABKAkSEAoIc3FsX21vZGUYByABKAkSDwoHY29tbWVudBgIIAEoCRI3ChFkZXBlbmRlbmN5X3RhYmxlcxgJIAMoCzIcLmJ5dGViYXNlLnYxLkRlcGVuZGVuY3lUYWJsZRIRCglza2lwX2R1bXAYCiABKAgi1gEKEVByb2NlZHVyZU1ldGFkYXRhEgwKBG5hbWUYASABKAkSEgoKZGVmaW5pdGlvbhgCIAEoCRIRCglzaWduYXR1cmUYAyABKAkSHAoUY2hhcmFjdGVyX3NldF9jbGllbnQYBCABKAkSHAoUY29sbGF0aW9uX2Nvbm5lY3Rpb24YBSABKAkSGgoSZGF0YWJhc2VfY29sbGF0aW9uGAYgASgJEhAKCHNxbF9tb2RlGAcgASgJEg8KB2NvbW1lbnQYCSABKAkSEQoJc2tpcF9kdW1wGAggASgIIjMKD1BhY2thZ2VNZXRhZGF0YRIMCgRuYW1lGAEgASgJEhIKCmRlZmluaXRpb24YAiABKAkilgIKDFRhc2tNZXRhZGF0YRIMCgRuYW1lGAEgASgJEgoKAmlkGAIgASgJEg0KBW93bmVyGAMgASgJEg8KB2NvbW1lbnQYBCABKAkSEQoJd2FyZWhvdXNlGAUgASgJEhAKCHNjaGVkdWxlGAYgASgJEhQKDHByZWRlY2Vzc29ycxgHIAMoCRIuCgVzdGF0ZRgIIAEoDjIfLmJ5dGViYXNlLnYxLlRhc2tNZXRhZGF0YS5TdGF0ZRIRCgljb25kaXRpb24YCSABKAkSEgoKZGVmaW5pdGlvbhgKIAEoCSI6CgVTdGF0ZRIVChFTVEFURV9VTlNQRUNJRklFRBAAEgsKB1NUQVJURUQQARINCglTVVNQRU5ERUQQAiLLAgoOU3RyZWFtTWV0YWRhdGESDAoEbmFtZRgBIAEoCRISCgp0YWJsZV9uYW1lGAIgASgJEg0KBW93bmVyGAMgASgJEg8KB2NvbW1lbnQYBCABKAkSLgoEdHlwZRgFIAEoDjIgLmJ5dGViYXNlLnYxLlN0cmVhbU1ldGFkYXRhLlR5cGUSDQoFc3RhbGUYBiABKAgSLgoEbW9kZRgHIAEoDjIgLmJ5dGViYXNlLnYxLlN0cmVhbU1ldGFkYXRhLk1vZGUSEgoKZGVmaW5pdGlvbhgIIAEoCSInCgRUeXBlEhQKEFRZUEVfVU5TUEVDSUZJRUQQABIJCgVERUxUQRABIksKBE1vZGUSFAoQTU9ERV9VTlNQRUNJRklFRBAAEgsKB0RFRkFVTFQQARIPCgtBUFBFTkRfT05MWRACEg8KC0lOU0VSVF9PTkxZEAMivQEKElNwYXRpYWxJbmRleENvbmZpZxIOCgZtZXRob2QYASABKAkSNQoMdGVzc2VsbGF0aW9uGAIgASgLMh8uYnl0ZWJhc2UudjEuVGVzc2VsbGF0aW9uQ29uZmlnEisKB3N0b3JhZ2UYAyABKAsyGi5ieXRlYmFzZS52MS5TdG9yYWdlQ29uZmlnEjMKC2RpbWVuc2lvbmFsGAQgASgLMh4uYnl0ZWJhc2UudjEuRGltZW5zaW9uYWxDb25maWcimwEKElRlc3NlbGxhdGlvbkNvbmZpZxIOCgZzY2hlbWUYASABKAkSKwoLZ3JpZF9sZXZlbHMYAiADKAsyFi5ieXRlYmFzZS52MS5HcmlkTGV2ZWwSGAoQY2VsbHNfcGVyX29iamVjdBgDIAEoBRIuCgxib3VuZGluZ19ib3gYBCABKAsyGC5ieXRlYmFzZS52MS5Cb3VuZGluZ0JveCIrCglHcmlkTGV2ZWwSDQoFbGV2ZWwYASABKAUSDwoHZGVuc2l0eRgCIAEoCSJFCgtCb3VuZGluZ0JveBIMCgR4bWluGAEgASgBEgwKBHltaW4YAiABKAESDAoEeG1heBgDIAEoARIMCgR5bWF4GAQgASgBIr4CCg1TdG9yYWdlQ29uZmlnEhIKCmZpbGxmYWN0b3IYASABKAUSEQoJYnVmZmVyaW5nGAIgASgJEhIKCnRhYmxlc3BhY2UYAyABKAkSFwoPd29ya190YWJsZXNwYWNlGAQgASgJEhEKCXNkb19sZXZlbBgFIAEoBRIXCg9jb21taXRfaW50ZXJ2YWwYBiABKAUSEQoJcGFkX2luZGV4GAcgASgIEhYKDnNvcnRfaW5fdGVtcGRiGAggASgJEhUKDWRyb3BfZXhpc3RpbmcYCSABKAgSDgoGb25saW5lGAogASgIEhcKD2FsbG93X3Jvd19sb2NrcxgLIAEoCBIYChBhbGxvd19wYWdlX2xvY2tzGAwgASgIEg4KBm1heGRvcBgNIAEoBRIYChBkYXRhX2NvbXByZXNzaW9uGA4gASgJIn8KEURpbWVuc2lvbmFsQ29uZmlnEhIKCmRpbWVuc2lvbnMYASABKAUSEQoJZGF0YV90eXBlGAIgASgJEgwKBHNyaWQYAyABKAUSNQoLY29uc3RyYWludHMYBCADKAsyIC5ieXRlYmFzZS52MS5EaW1lbnNpb25Db25zdHJhaW50ImEKE0RpbWVuc2lvbkNvbnN0cmFpbnQSEQoJZGltZW5zaW9uGAEgASgJEhEKCW1pbl92YWx1ZRgCIAEoARIRCgltYXhfdmFsdWUYAyABKAESEQoJdG9sZXJhbmNlGAQgASgBIo0DCg1JbmRleE1ldGFkYXRhEgwKBG5hbWUYASABKAkSEwoLZXhwcmVzc2lvbnMYAiADKAkSEgoKa2V5X2xlbmd0aBgDIAMoAxISCgpkZXNjZW5kaW5nGAQgAygIEgwKBHR5cGUYBSABKAkSDgoGdW5pcXVlGAYgASgIEg8KB3ByaW1hcnkYByABKAgSDwoHdmlzaWJsZRgIIAEoCBIPCgdjb21tZW50GAkgASgJEhIKCmRlZmluaXRpb24YCiABKAkSGwoTcGFyZW50X2luZGV4X3NjaGVtYRgLIAEoCRIZChFwYXJlbnRfaW5kZXhfbmFtZRgMIAEoCRITCgtncmFudWxhcml0eRgNIAEoAxIVCg1pc19jb25zdHJhaW50GA4gASgIEjcKDnNwYXRpYWxfY29uZmlnGA8gASgLMh8uYnl0ZWJhc2UudjEuU3BhdGlhbEluZGV4Q29uZmlnEhUKDW9wY2xhc3NfbmFtZXMYECADKAkSGAoQb3BjbGFzc19kZWZhdWx0cxgRIAMoCCJXChFFeHRlbnNpb25NZXRhZGF0YRIMCgRuYW1lGAEgASgJEg4KBnNjaGVtYRgCIAEoCRIPCgd2ZXJzaW9uGAMgASgJEhMKC2Rlc2NyaXB0aW9uGAQgASgJIr4BChJGb3JlaWduS2V5TWV0YWRhdGESDAoEbmFtZRgBIAEoCRIPCgdjb2x1bW5zGAIgAygJEhkKEXJlZmVyZW5jZWRfc2NoZW1hGAMgASgJEhgKEHJlZmVyZW5jZWRfdGFibGUYBCABKAkSGgoScmVmZXJlbmNlZF9jb2x1bW5zGAUgAygJEhEKCW9uX2RlbGV0ZRgGIAEoCRIRCglvbl91cGRhdGUYByABKAkSEgoKbWF0Y2hfdHlwZRgIIAEoCSIgCg5EYXRhYmFzZVNjaGVtYRIOCgZzY2hlbWEYASABKAkiPgoRRGF0YWJhc2VTRExTY2hlbWESDgoGc2NoZW1hGAEgASgMEhkKDGNvbnRlbnRfdHlwZRgCIAEoCUID4EEDIvECChZHZXRTY2hlbWFTdHJpbmdSZXF1ZXN0EisKBG5hbWUYASABKAlCHeBBAvpBFwoVYnl0ZWJhc2UuY29tL0RhdGFiYXNlEjwKBHR5cGUYAiABKA4yLi5ieXRlYmFzZS52MS5HZXRTY2hlbWFTdHJpbmdSZXF1ZXN0Lk9iamVjdFR5cGUSDgoGc2NoZW1hGAMgASgJEg4KBm9iamVjdBgEIAEoCRIvCghtZXRhZGF0YRgFIAEoCzIdLmJ5dGViYXNlLnYxLkRhdGFiYXNlTWV0YWRhdGEimgEKCk9iamVjdFR5cGUSGwoXT0JKRUNUX1RZUEVfVU5TUEVDSUZJRUQQABIMCghEQVRBQkFTRRABEgoKBlNDSEVNQRACEgkKBVRBQkxFEAMSCAoEVklFVxAEEhUKEU1BVEVSSUFMSVpFRF9WSUVXEAUSDAoIRlVOQ1RJT04QBhINCglQUk9DRURVUkUQBxIMCghTRVFVRU5DRRAIIjAKF0dldFNjaGVtYVN0cmluZ1Jlc3BvbnNlEhUKDXNjaGVtYV9zdHJpbmcYASABKAkqPQoKU3luY1N0YXR1cxIbChdTWU5DX1NUQVRVU19VTlNQRUNJRklFRBAAEgYKAk9LEAESCgoGRkFJTEVEEAIywxMKD0RhdGFiYXNlU2VydmljZRKQAQoLR2V0RGF0YWJhc2USHy5ieXRlYmFzZS52MS5HZXREYXRhYmFzZVJlcXVlc3QaFS5ieXRlYmFzZS52MS5EYXRhYmFzZSJJ2kEEbmFtZYrqMBBiYi5kYXRhYmFzZXMuZ2V0kOowAYLT5JMCJBIiL3YxL3tuYW1lPWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qfRLdAQoRQmF0Y2hHZXREYXRhYmFzZXMSJS5ieXRlYmFzZS52MS5CYXRjaEdldERhdGFiYXNlc1JlcXVlc3QaJi5ieXRlYmFzZS52MS5CYXRjaEdldERhdGFiYXNlc1Jlc3BvbnNlInmK6jAQYmIuZGF0YWJhc2VzLmdldJDqMAKC0+STAltaLRIrL3YxL3twYXJlbnQ9aW5zdGFuY2VzLyp9L2RhdGFiYXNlczpiYXRjaEdldBIqL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vZGF0YWJhc2VzOmJhdGNoR2V0EusBCg1MaXN0RGF0YWJhc2VzEiEuYnl0ZWJhc2UudjEuTGlzdERhdGFiYXNlc1JlcXVlc3QaIi5ieXRlYmFzZS52MS5MaXN0RGF0YWJhc2VzUmVzcG9uc2UikgHaQQCK6jARYmIuZGF0YWJhc2VzLmxpc3SQ6jACgtPkkwJwWiQSIi92MS97cGFyZW50PWluc3RhbmNlcy8qfS9kYXRhYmFzZXNaJRIjL3YxL3twYXJlbnQ9d29ya3NwYWNlcy8qfS9kYXRhYmFzZXMSIS92MS97cGFyZW50PXByb2plY3RzLyp9L2RhdGFiYXNlcxLAAQoOVXBkYXRlRGF0YWJhc2USIi5ieXRlYmFzZS52MS5VcGRhdGVEYXRhYmFzZVJlcXVlc3QaFS5ieXRlYmFzZS52MS5EYXRhYmFzZSJz2kEUZGF0YWJhc2UsdXBkYXRlX21hc2uK6jATYmIuZGF0YWJhc2VzLnVwZGF0ZZDqMAGY6jABgtPkkwI3OghkYXRhYmFzZTIrL3YxL3tkYXRhYmFzZS5uYW1lPWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qfRLFAQoUQmF0Y2hVcGRhdGVEYXRhYmFzZXMSKC5ieXRlYmFzZS52MS5CYXRjaFVwZGF0ZURhdGFiYXNlc1JlcXVlc3QaKS5ieXRlYmFzZS52MS5CYXRjaFVwZGF0ZURhdGFiYXNlc1Jlc3BvbnNlIliK6jATYmIuZGF0YWJhc2VzLnVwZGF0ZZDqMAGY6jABgtPkkwIzOgEqIi4vdjEve3BhcmVudD1pbnN0YW5jZXMvKn0vZGF0YWJhc2VzOmJhdGNoVXBkYXRlEqABCgxTeW5jRGF0YWJhc2USIC5ieXRlYmFzZS52MS5TeW5jRGF0YWJhc2VSZXF1ZXN0GiEuYnl0ZWJhc2UudjEuU3luY0RhdGFiYXNlUmVzcG9uc2UiS4rqMBFiYi5kYXRhYmFzZXMuc3luY5DqMAGC0+STAiw6ASoiJy92MS97bmFtZT1pbnN0YW5jZXMvKi9kYXRhYmFzZXMvKn06c3luYxK3AQoSQmF0Y2hTeW5jRGF0YWJhc2VzEiYuYnl0ZWJhc2UudjEuQmF0Y2hTeW5jRGF0YWJhc2VzUmVxdWVzdBonLmJ5dGViYXNlLnYxLkJhdGNoU3luY0RhdGFiYXNlc1Jlc3BvbnNlIlCK6jARYmIuZGF0YWJhc2VzLnN5bmOQ6jABgtPkkwIxOgEqIiwvdjEve3BhcmVudD1pbnN0YW5jZXMvKn0vZGF0YWJhc2VzOmJhdGNoU3luYxKwAQoTR2V0RGF0YWJhc2VNZXRhZGF0YRInLmJ5dGViYXNlLnYxLkdldERhdGFiYXNlTWV0YWRhdGFSZXF1ZXN0Gh0uYnl0ZWJhc2UudjEuRGF0YWJhc2VNZXRhZGF0YSJRiuowFmJiLmRhdGFiYXNlcy5nZXRTY2hlbWGQ6jABgtPkkwItEisvdjEve25hbWU9aW5zdGFuY2VzLyovZGF0YWJhc2VzLyovbWV0YWRhdGF9EqgBChFHZXREYXRhYmFzZVNjaGVtYRIlLmJ5dGViYXNlLnYxLkdldERhdGFiYXNlU2NoZW1hUmVxdWVzdBobLmJ5dGViYXNlLnYxLkRhdGFiYXNlU2NoZW1hIk+K6jAWYmIuZGF0YWJhc2VzLmdldFNjaGVtYZDqMAGC0+STAisSKS92MS97bmFtZT1pbnN0YW5jZXMvKi9kYXRhYmFzZXMvKi9zY2hlbWF9ErQBChRHZXREYXRhYmFzZVNETFNjaGVtYRIoLmJ5dGViYXNlLnYxLkdldERhdGFiYXNlU0RMU2NoZW1hUmVxdWVzdBoeLmJ5dGViYXNlLnYxLkRhdGFiYXNlU0RMU2NoZW1hIlKK6jAWYmIuZGF0YWJhc2VzLmdldFNjaGVtYZDqMAGC0+STAi4SLC92MS97bmFtZT1pbnN0YW5jZXMvKi9kYXRhYmFzZXMvKi9zZGxTY2hlbWF9EuEBCgpEaWZmU2NoZW1hEh4uYnl0ZWJhc2UudjEuRGlmZlNjaGVtYVJlcXVlc3QaHy5ieXRlYmFzZS52MS5EaWZmU2NoZW1hUmVzcG9uc2UikQGK6jAQYmIuZGF0YWJhc2VzLmdldJDqMAGC0+STAnM6ASpaPzoBKiI6L3YxL3tuYW1lPWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qL2NoYW5nZWxvZ3MvKn06ZGlmZlNjaGVtYSItL3YxL3tuYW1lPWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qfTpkaWZmU2NoZW1hErABCgxEaWZmTWV0YWRhdGESIC5ieXRlYmFzZS52MS5EaWZmTWV0YWRhdGFSZXF1ZXN0GiEuYnl0ZWJhc2UudjEuRGlmZk1ldGFkYXRhUmVzcG9uc2UiW4rqMBliYi5kYXRhYmFzZXMuZGlmZk1ldGFkYXRhkOowAYLT5JMCNDoBKiIvL3YxL3tuYW1lPWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qfTpkaWZmTWV0YWRhdGESugEKD0dldFNjaGVtYVN0cmluZxIjLmJ5dGViYXNlLnYxLkdldFNjaGVtYVN0cmluZ1JlcXVlc3QaJC5ieXRlYmFzZS52MS5HZXRTY2hlbWFTdHJpbmdSZXNwb25zZSJc2kEEbmFtZYrqMBZiYi5kYXRhYmFzZXMuZ2V0U2NoZW1hkOowAYLT5JMCMRIvL3YxL3tuYW1lPWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qL3NjaGVtYVN0cmluZ31CqgEKD2NvbS5ieXRlYmFzZS52MUIURGF0YWJhc2VTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_field_mask, file_google_protobuf_timestamp, file_v1_annotation, file_v1_common, file_v1_instance_service]);+ fileDesc("Chl2MS9kYXRhYmFzZV9zZXJ2aWNlLnByb3RvEgtieXRlYmFzZS52MSJBChJHZXREYXRhYmFzZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vRGF0YWJhc2UidwoYQmF0Y2hHZXREYXRhYmFzZXNSZXF1ZXN0Ei0KBnBhcmVudBgBIAEoCUId4EEC+kEXEhVieXRlYmFzZS5jb20vRGF0YWJhc2USLAoFbmFtZXMYAiADKAlCHeBBAvpBFwoVYnl0ZWJhc2UuY29tL0RhdGFiYXNlIkUKGUJhdGNoR2V0RGF0YWJhc2VzUmVzcG9uc2USKAoJZGF0YWJhc2VzGAEgAygLMhUuYnl0ZWJhc2UudjEuRGF0YWJhc2UipAEKFExpc3REYXRhYmFzZXNSZXF1ZXN0Ei0KBnBhcmVudBgBIAEoCUId4EEC+kEXEhVieXRlYmFzZS5jb20vRGF0YWJhc2USEQoJcGFnZV9zaXplGAIgASgFEhIKCnBhZ2VfdG9rZW4YAyABKAkSDgoGZmlsdGVyGAQgASgJEhQKDHNob3dfZGVsZXRlZBgFIAEoCBIQCghvcmRlcl9ieRgGIAEoCSJaChVMaXN0RGF0YWJhc2VzUmVzcG9uc2USKAoJZGF0YWJhc2VzGAEgAygLMhUuYnl0ZWJhc2UudjEuRGF0YWJhc2USFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJIo0BChVVcGRhdGVEYXRhYmFzZVJlcXVlc3QSLAoIZGF0YWJhc2UYASABKAsyFS5ieXRlYmFzZS52MS5EYXRhYmFzZUID4EECEi8KC3VwZGF0ZV9tYXNrGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFzaxIVCg1hbGxvd19taXNzaW5nGAMgASgIImgKG0JhdGNoVXBkYXRlRGF0YWJhc2VzUmVxdWVzdBIOCgZwYXJlbnQYASABKAkSOQoIcmVxdWVzdHMYAiADKAsyIi5ieXRlYmFzZS52MS5VcGRhdGVEYXRhYmFzZVJlcXVlc3RCA+BBAiJIChxCYXRjaFVwZGF0ZURhdGFiYXNlc1Jlc3BvbnNlEigKCWRhdGFiYXNlcxgBIAMoCzIVLmJ5dGViYXNlLnYxLkRhdGFiYXNlIlkKGUJhdGNoU3luY0RhdGFiYXNlc1JlcXVlc3QSDgoGcGFyZW50GAEgASgJEiwKBW5hbWVzGAIgAygJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9EYXRhYmFzZSIcChpCYXRjaFN5bmNEYXRhYmFzZXNSZXNwb25zZSJCChNTeW5jRGF0YWJhc2VSZXF1ZXN0EisKBG5hbWUYASABKAlCHeBBAvpBFwoVYnl0ZWJhc2UuY29tL0RhdGFiYXNlIhYKFFN5bmNEYXRhYmFzZVJlc3BvbnNlInAKGkdldERhdGFiYXNlTWV0YWRhdGFSZXF1ZXN0EjMKBG5hbWUYASABKAlCJeBBAvpBHwodYnl0ZWJhc2UuY29tL0RhdGFiYXNlTWV0YWRhdGESDgoGZmlsdGVyGAIgASgJEg0KBWxpbWl0GAMgASgFIk0KGEdldERhdGFiYXNlU2NoZW1hUmVxdWVzdBIxCgRuYW1lGAEgASgJQiPgQQL6QR0KG2J5dGViYXNlLmNvbS9EYXRhYmFzZVNjaGVtYSLYAQobR2V0RGF0YWJhc2VTRExTY2hlbWFSZXF1ZXN0EisKBG5hbWUYASABKAlCHeBBAvpBFwoVYnl0ZWJhc2UuY29tL0RhdGFiYXNlEkIKBmZvcm1hdBgCIAEoDjIyLmJ5dGViYXNlLnYxLkdldERhdGFiYXNlU0RMU2NoZW1hUmVxdWVzdC5TRExGb3JtYXQiSAoJU0RMRm9ybWF0EhoKFlNETF9GT1JNQVRfVU5TUEVDSUZJRUQQABIPCgtTSU5HTEVfRklMRRABEg4KCk1VTFRJX0ZJTEUQAiJxChFEaWZmU2NoZW1hUmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9EYXRhYmFzZRIQCgZzY2hlbWEYAiABKAlIABITCgljaGFuZ2Vsb2cYAyABKAlIAEIICgZ0YXJnZXQiIgoSRGlmZlNjaGVtYVJlc3BvbnNlEgwKBGRpZmYYASABKAkifwoTRGlmZk1ldGFkYXRhUmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9EYXRhYmFzZRI7Cg90YXJnZXRfbWV0YWRhdGEYAiABKAsyHS5ieXRlYmFzZS52MS5EYXRhYmFzZU1ldGFkYXRhQgPgQQIiJAoURGlmZk1ldGFkYXRhUmVzcG9uc2USDAoEZGlmZhgBIAEoCSKrBQoIRGF0YWJhc2USDAoEbmFtZRgBIAEoCRImCgVzdGF0ZRgCIAEoDjISLmJ5dGViYXNlLnYxLlN0YXRlQgPgQQMSPQoUc3VjY2Vzc2Z1bF9zeW5jX3RpbWUYAyABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSDwoHcHJvamVjdBgEIAEoCRIUCgdyZWxlYXNlGAUgASgJQgPgQQMSHQoLZW52aXJvbm1lbnQYBiABKAlCA+BBAUgAiAEBEicKFWVmZmVjdGl2ZV9lbnZpcm9ubWVudBgHIAEoCUID4EEDSAGIAQESMQoGbGFiZWxzGAggAygLMiEuYnl0ZWJhc2UudjEuRGF0YWJhc2UuTGFiZWxzRW50cnkSPQoRaW5zdGFuY2VfcmVzb3VyY2UYCSABKAsyHS5ieXRlYmFzZS52MS5JbnN0YW5jZVJlc291cmNlQgPgQQMSHQoQYmFja3VwX2F2YWlsYWJsZRgKIAEoCEID4EEDEjEKC3N5bmNfc3RhdHVzGAsgASgOMhcuYnl0ZWJhc2UudjEuU3luY1N0YXR1c0ID4EEDEhcKCnN5bmNfZXJyb3IYDCABKAlCA+BBAxotCgtMYWJlbHNFbnRyeRILCgNrZXkYASABKAkSDQoFdmFsdWUYAiABKAk6AjgBOoQB6kGAAQoVYnl0ZWJhc2UuY29tL0RhdGFiYXNlEilpbnN0YW5jZXMve2luc3RhbmNlfS9kYXRhYmFzZXMve2RhdGFiYXNlfRI8cHJvamVjdHMve3Byb2plY3R9L2luc3RhbmNlcy97aW5zdGFuY2V9L2RhdGFiYXNlcy97ZGF0YWJhc2V9Qg4KDF9lbnZpcm9ubWVudEIYChZfZWZmZWN0aXZlX2Vudmlyb25tZW50IvECChBEYXRhYmFzZU1ldGFkYXRhEgwKBG5hbWUYASABKAkSLAoHc2NoZW1hcxgCIAMoCzIbLmJ5dGViYXNlLnYxLlNjaGVtYU1ldGFkYXRhEhUKDWNoYXJhY3Rlcl9zZXQYAyABKAkSEQoJY29sbGF0aW9uGAQgASgJEjIKCmV4dGVuc2lvbnMYBSADKAsyHi5ieXRlYmFzZS52MS5FeHRlbnNpb25NZXRhZGF0YRINCgVvd25lchgGIAEoCRITCgtzZWFyY2hfcGF0aBgHIAEoCTqeAepBmgEKHWJ5dGViYXNlLmNvbS9EYXRhYmFzZU1ldGFkYXRhEjJpbnN0YW5jZXMve2luc3RhbmNlfS9kYXRhYmFzZXMve2RhdGFiYXNlfS9tZXRhZGF0YRJFcHJvamVjdHMve3Byb2plY3R9L2luc3RhbmNlcy97aW5zdGFuY2V9L2RhdGFiYXNlcy97ZGF0YWJhc2V9L21ldGFkYXRhIuMFCg5TY2hlbWFNZXRhZGF0YRIMCgRuYW1lGAEgASgJEioKBnRhYmxlcxgCIAMoCzIaLmJ5dGViYXNlLnYxLlRhYmxlTWV0YWRhdGESOwoPZXh0ZXJuYWxfdGFibGVzGAMgAygLMiIuYnl0ZWJhc2UudjEuRXh0ZXJuYWxUYWJsZU1ldGFkYXRhEigKBXZpZXdzGAQgAygLMhkuYnl0ZWJhc2UudjEuVmlld01ldGFkYXRhEjAKCWZ1bmN0aW9ucxgFIAMoCzIdLmJ5dGViYXNlLnYxLkZ1bmN0aW9uTWV0YWRhdGESMgoKcHJvY2VkdXJlcxgGIAMoCzIeLmJ5dGViYXNlLnYxLlByb2NlZHVyZU1ldGFkYXRhEiwKB3N0cmVhbXMYByADKAsyGy5ieXRlYmFzZS52MS5TdHJlYW1NZXRhZGF0YRIoCgV0YXNrcxgIIAMoCzIZLmJ5dGViYXNlLnYxLlRhc2tNZXRhZGF0YRJBChJtYXRlcmlhbGl6ZWRfdmlld3MYCSADKAsyJS5ieXRlYmFzZS52MS5NYXRlcmlhbGl6ZWRWaWV3TWV0YWRhdGESLgoIcGFja2FnZXMYCiADKAsyHC5ieXRlYmFzZS52MS5QYWNrYWdlTWV0YWRhdGESDQoFb3duZXIYCyABKAkSMAoJc2VxdWVuY2VzGAwgAygLMh0uYnl0ZWJhc2UudjEuU2VxdWVuY2VNZXRhZGF0YRIqCgZldmVudHMYDSADKAsyGi5ieXRlYmFzZS52MS5FdmVudE1ldGFkYXRhEjEKCmVudW1fdHlwZXMYDiADKAsyHS5ieXRlYmFzZS52MS5FbnVtVHlwZU1ldGFkYXRhEhEKCXNraXBfZHVtcBgPIAEoCBIPCgdjb21tZW50GBAgASgJEjsKD2NvbXBvc2l0ZV90eXBlcxgRIAMoCzIiLmJ5dGViYXNlLnYxLkNvbXBvc2l0ZVR5cGVNZXRhZGF0YSJUChBFbnVtVHlwZU1ldGFkYXRhEgwKBG5hbWUYASABKAkSDgoGdmFsdWVzGAIgAygJEg8KB2NvbW1lbnQYAyABKAkSEQoJc2tpcF9kdW1wGAQgASgIIm8KFUNvbXBvc2l0ZVR5cGVNZXRhZGF0YRIMCgRuYW1lGAEgASgJEjcKCmF0dHJpYnV0ZXMYAiADKAsyIy5ieXRlYmFzZS52MS5Db21wb3NpdGVUeXBlQXR0cmlidXRlEg8KB2NvbW1lbnQYAyABKAkiWAoWQ29tcG9zaXRlVHlwZUF0dHJpYnV0ZRIMCgRuYW1lGAEgASgJEgwKBHR5cGUYAiABKAkSEQoJY29sbGF0aW9uGAMgASgJEg8KB2NvbW1lbnQYBCABKAkiowEKDUV2ZW50TWV0YWRhdGESDAoEbmFtZRgBIAEoCRISCgpkZWZpbml0aW9uGAIgASgJEhEKCXRpbWVfem9uZRgDIAEoCRIQCghzcWxfbW9kZRgEIAEoCRIcChRjaGFyYWN0ZXJfc2V0X2NsaWVudBgFIAEoCRIcChRjb2xsYXRpb25fY29ubmVjdGlvbhgGIAEoCRIPCgdjb21tZW50GAcgASgJIoECChBTZXF1ZW5jZU1ldGFkYXRhEgwKBG5hbWUYASABKAkSEQoJZGF0YV90eXBlGAIgASgJEg0KBXN0YXJ0GAMgASgJEhEKCW1pbl92YWx1ZRgEIAEoCRIRCgltYXhfdmFsdWUYBSABKAkSEQoJaW5jcmVtZW50GAYgASgJEg0KBWN5Y2xlGAcgASgIEhIKCmNhY2hlX3NpemUYCCABKAkSEgoKbGFzdF92YWx1ZRgJIAEoCRITCgtvd25lcl90YWJsZRgKIAEoCRIUCgxvd25lcl9jb2x1bW4YCyABKAkSDwoHY29tbWVudBgMIAEoCRIRCglza2lwX2R1bXAYDSABKAgivgEKD1RyaWdnZXJNZXRhZGF0YRIMCgRuYW1lGAEgASgJEg0KBWV2ZW50GAIgASgJEg4KBnRpbWluZxgDIAEoCRIMCgRib2R5GAQgASgJEhAKCHNxbF9tb2RlGAUgASgJEhwKFGNoYXJhY3Rlcl9zZXRfY2xpZW50GAYgASgJEhwKFGNvbGxhdGlvbl9jb25uZWN0aW9uGAcgASgJEg8KB2NvbW1lbnQYCCABKAkSEQoJc2tpcF9kdW1wGAkgASgIIpEBChVFeHRlcm5hbFRhYmxlTWV0YWRhdGESDAoEbmFtZRgBIAEoCRIcChRleHRlcm5hbF9zZXJ2ZXJfbmFtZRgCIAEoCRIeChZleHRlcm5hbF9kYXRhYmFzZV9uYW1lGAMgASgJEiwKB2NvbHVtbnMYBCADKAsyGy5ieXRlYmFzZS52MS5Db2x1bW5NZXRhZGF0YSLsBAoNVGFibGVNZXRhZGF0YRIMCgRuYW1lGAEgASgJEiwKB2NvbHVtbnMYAiADKAsyGy5ieXRlYmFzZS52MS5Db2x1bW5NZXRhZGF0YRIrCgdpbmRleGVzGAMgAygLMhouYnl0ZWJhc2UudjEuSW5kZXhNZXRhZGF0YRIOCgZlbmdpbmUYBCABKAkSEQoJY29sbGF0aW9uGAUgASgJEg8KB2NoYXJzZXQYBiABKAkSEQoJcm93X2NvdW50GAcgASgDEhEKCWRhdGFfc2l6ZRgIIAEoAxISCgppbmRleF9zaXplGAkgASgDEhEKCWRhdGFfZnJlZRgKIAEoAxIWCg5jcmVhdGVfb3B0aW9ucxgLIAEoCRIPCgdjb21tZW50GAwgASgJEjUKDGZvcmVpZ25fa2V5cxgNIAMoCzIfLmJ5dGViYXNlLnYxLkZvcmVpZ25LZXlNZXRhZGF0YRI3CgpwYXJ0aXRpb25zGA4gAygLMiMuYnl0ZWJhc2UudjEuVGFibGVQYXJ0aXRpb25NZXRhZGF0YRI/ChFjaGVja19jb25zdHJhaW50cxgPIAMoCzIkLmJ5dGViYXNlLnYxLkNoZWNrQ29uc3RyYWludE1ldGFkYXRhEg0KBW93bmVyGBAgASgJEhQKDHNvcnRpbmdfa2V5cxgRIAMoCRIuCgh0cmlnZ2VycxgSIAMoCzIcLmJ5dGViYXNlLnYxLlRyaWdnZXJNZXRhZGF0YRIRCglza2lwX2R1bXAYEyABKAgSFQoNc2hhcmRpbmdfaW5mbxgUIAEoCRIYChBwcmltYXJ5X2tleV90eXBlGBUgASgJIjsKF0NoZWNrQ29uc3RyYWludE1ldGFkYXRhEgwKBG5hbWUYASABKAkSEgoKZXhwcmVzc2lvbhgCIAEoCSLNAwoWVGFibGVQYXJ0aXRpb25NZXRhZGF0YRIMCgRuYW1lGAEgASgJEjYKBHR5cGUYAiABKA4yKC5ieXRlYmFzZS52MS5UYWJsZVBhcnRpdGlvbk1ldGFkYXRhLlR5cGUSEgoKZXhwcmVzc2lvbhgDIAEoCRINCgV2YWx1ZRgEIAEoCRITCgt1c2VfZGVmYXVsdBgFIAEoCRI6Cg1zdWJwYXJ0aXRpb25zGAYgAygLMiMuYnl0ZWJhc2UudjEuVGFibGVQYXJ0aXRpb25NZXRhZGF0YRIrCgdpbmRleGVzGAcgAygLMhouYnl0ZWJhc2UudjEuSW5kZXhNZXRhZGF0YRI/ChFjaGVja19jb25zdHJhaW50cxgIIAMoCzIkLmJ5dGViYXNlLnYxLkNoZWNrQ29uc3RyYWludE1ldGFkYXRhIooBCgRUeXBlEhQKEFRZUEVfVU5TUEVDSUZJRUQQABIJCgVSQU5HRRABEhEKDVJBTkdFX0NPTFVNTlMQAhIICgRMSVNUEAMSEAoMTElTVF9DT0xVTU5TEAQSCAoESEFTSBAFEg8KC0xJTkVBUl9IQVNIEAYSBwoDS0VZEAcSDgoKTElORUFSX0tFWRAIItEECg5Db2x1bW5NZXRhZGF0YRIMCgRuYW1lGAEgASgJEhAKCHBvc2l0aW9uGAIgASgFEhMKC2hhc19kZWZhdWx0GAMgASgIEg8KB2RlZmF1bHQYBCABKAkSFwoPZGVmYXVsdF9vbl9udWxsGAUgASgIEhEKCW9uX3VwZGF0ZRgGIAEoCRIQCghudWxsYWJsZRgHIAEoCBIMCgR0eXBlGAggASgJEhUKDWNoYXJhY3Rlcl9zZXQYCSABKAkSEQoJY29sbGF0aW9uGAogASgJEg8KB2NvbW1lbnQYCyABKAkSMwoKZ2VuZXJhdGlvbhgMIAEoCzIfLmJ5dGViYXNlLnYxLkdlbmVyYXRpb25NZXRhZGF0YRITCgtpc19pZGVudGl0eRgNIAEoCBJLChNpZGVudGl0eV9nZW5lcmF0aW9uGA4gASgOMi4uYnl0ZWJhc2UudjEuQ29sdW1uTWV0YWRhdGEuSWRlbnRpdHlHZW5lcmF0aW9uEhUKDWlkZW50aXR5X3NlZWQYDyABKAMSGgoSaWRlbnRpdHlfaW5jcmVtZW50GBAgASgDEh8KF2RlZmF1bHRfY29uc3RyYWludF9uYW1lGBEgASgJEhEKBHNyaWQYEiABKA1IAIgBARIUCgxpc19pbnZpc2libGUYEyABKAgiVQoSSWRlbnRpdHlHZW5lcmF0aW9uEiMKH0lERU5USVRZX0dFTkVSQVRJT05fVU5TUEVDSUZJRUQQABIKCgZBTFdBWVMQARIOCgpCWV9ERUZBVUxUEAJCBwoFX3NyaWQikwEKEkdlbmVyYXRpb25NZXRhZGF0YRIyCgR0eXBlGAEgASgOMiQuYnl0ZWJhc2UudjEuR2VuZXJhdGlvbk1ldGFkYXRhLlR5cGUSEgoKZXhwcmVzc2lvbhgCIAEoCSI1CgRUeXBlEhQKEFRZUEVfVU5TUEVDSUZJRUQQABILCgdWSVJUVUFMEAESCgoGU1RPUkVEEAIi7QEKDFZpZXdNZXRhZGF0YRIMCgRuYW1lGAEgASgJEhIKCmRlZmluaXRpb24YAiABKAkSDwoHY29tbWVudBgDIAEoCRI5ChJkZXBlbmRlbmN5X2NvbHVtbnMYBCADKAsyHS5ieXRlYmFzZS52MS5EZXBlbmRlbmN5Q29sdW1uEiwKB2NvbHVtbnMYBSADKAsyGy5ieXRlYmFzZS52MS5Db2x1bW5NZXRhZGF0YRIuCgh0cmlnZ2VycxgGIAMoCzIcLmJ5dGViYXNlLnYxLlRyaWdnZXJNZXRhZGF0YRIRCglza2lwX2R1bXAYByABKAgiQQoQRGVwZW5kZW5jeUNvbHVtbhIOCgZzY2hlbWEYASABKAkSDQoFdGFibGUYAiABKAkSDgoGY29sdW1uGAMgASgJIvgBChhNYXRlcmlhbGl6ZWRWaWV3TWV0YWRhdGESDAoEbmFtZRgBIAEoCRISCgpkZWZpbml0aW9uGAIgASgJEg8KB2NvbW1lbnQYAyABKAkSOQoSZGVwZW5kZW5jeV9jb2x1bW5zGAQgAygLMh0uYnl0ZWJhc2UudjEuRGVwZW5kZW5jeUNvbHVtbhIuCgh0cmlnZ2VycxgFIAMoCzIcLmJ5dGViYXNlLnYxLlRyaWdnZXJNZXRhZGF0YRIrCgdpbmRleGVzGAYgAygLMhouYnl0ZWJhc2UudjEuSW5kZXhNZXRhZGF0YRIRCglza2lwX2R1bXAYByABKAgiMAoPRGVwZW5kZW5jeVRhYmxlEg4KBnNjaGVtYRgBIAEoCRINCgV0YWJsZRgCIAEoCSKOAgoQRnVuY3Rpb25NZXRhZGF0YRIMCgRuYW1lGAEgASgJEhIKCmRlZmluaXRpb24YAiABKAkSEQoJc2lnbmF0dXJlGAMgASgJEhwKFGNoYXJhY3Rlcl9zZXRfY2xpZW50GAQgASgJEhwKFGNvbGxhdGlvbl9jb25uZWN0aW9uGAUgASgJEhoKEmRhdGFiYXNlX2NvbGxhdGlvbhgGIAEoCRIQCghzcWxfbW9kZRgHIAEoCRIPCgdjb21tZW50GAggASgJEjcKEWRlcGVuZGVuY3lfdGFibGVzGAkgAygLMhwuYnl0ZWJhc2UudjEuRGVwZW5kZW5jeVRhYmxlEhEKCXNraXBfZHVtcBgKIAEoCCLWAQoRUHJvY2VkdXJlTWV0YWRhdGESDAoEbmFtZRgBIAEoCRISCgpkZWZpbml0aW9uGAIgASgJEhEKCXNpZ25hdHVyZRgDIAEoCRIcChRjaGFyYWN0ZXJfc2V0X2NsaWVudBgEIAEoCRIcChRjb2xsYXRpb25fY29ubmVjdGlvbhgFIAEoCRIaChJkYXRhYmFzZV9jb2xsYXRpb24YBiABKAkSEAoIc3FsX21vZGUYByABKAkSDwoHY29tbWVudBgJIAEoCRIRCglza2lwX2R1bXAYCCABKAgiMwoPUGFja2FnZU1ldGFkYXRhEgwKBG5hbWUYASABKAkSEgoKZGVmaW5pdGlvbhgCIAEoCSKWAgoMVGFza01ldGFkYXRhEgwKBG5hbWUYASABKAkSCgoCaWQYAiABKAkSDQoFb3duZXIYAyABKAkSDwoHY29tbWVudBgEIAEoCRIRCgl3YXJlaG91c2UYBSABKAkSEAoIc2NoZWR1bGUYBiABKAkSFAoMcHJlZGVjZXNzb3JzGAcgAygJEi4KBXN0YXRlGAggASgOMh8uYnl0ZWJhc2UudjEuVGFza01ldGFkYXRhLlN0YXRlEhEKCWNvbmRpdGlvbhgJIAEoCRISCgpkZWZpbml0aW9uGAogASgJIjoKBVN0YXRlEhUKEVNUQVRFX1VOU1BFQ0lGSUVEEAASCwoHU1RBUlRFRBABEg0KCVNVU1BFTkRFRBACIssCCg5TdHJlYW1NZXRhZGF0YRIMCgRuYW1lGAEgASgJEhIKCnRhYmxlX25hbWUYAiABKAkSDQoFb3duZXIYAyABKAkSDwoHY29tbWVudBgEIAEoCRIuCgR0eXBlGAUgASgOMiAuYnl0ZWJhc2UudjEuU3RyZWFtTWV0YWRhdGEuVHlwZRINCgVzdGFsZRgGIAEoCBIuCgRtb2RlGAcgASgOMiAuYnl0ZWJhc2UudjEuU3RyZWFtTWV0YWRhdGEuTW9kZRISCgpkZWZpbml0aW9uGAggASgJIicKBFR5cGUSFAoQVFlQRV9VTlNQRUNJRklFRBAAEgkKBURFTFRBEAEiSwoETW9kZRIUChBNT0RFX1VOU1BFQ0lGSUVEEAASCwoHREVGQVVMVBABEg8KC0FQUEVORF9PTkxZEAISDwoLSU5TRVJUX09OTFkQAyK9AQoSU3BhdGlhbEluZGV4Q29uZmlnEg4KBm1ldGhvZBgBIAEoCRI1Cgx0ZXNzZWxsYXRpb24YAiABKAsyHy5ieXRlYmFzZS52MS5UZXNzZWxsYXRpb25Db25maWcSKwoHc3RvcmFnZRgDIAEoCzIaLmJ5dGViYXNlLnYxLlN0b3JhZ2VDb25maWcSMwoLZGltZW5zaW9uYWwYBCABKAsyHi5ieXRlYmFzZS52MS5EaW1lbnNpb25hbENvbmZpZyKbAQoSVGVzc2VsbGF0aW9uQ29uZmlnEg4KBnNjaGVtZRgBIAEoCRIrCgtncmlkX2xldmVscxgCIAMoCzIWLmJ5dGViYXNlLnYxLkdyaWRMZXZlbBIYChBjZWxsc19wZXJfb2JqZWN0GAMgASgFEi4KDGJvdW5kaW5nX2JveBgEIAEoCzIYLmJ5dGViYXNlLnYxLkJvdW5kaW5nQm94IisKCUdyaWRMZXZlbBINCgVsZXZlbBgBIAEoBRIPCgdkZW5zaXR5GAIgASgJIkUKC0JvdW5kaW5nQm94EgwKBHhtaW4YASABKAESDAoEeW1pbhgCIAEoARIMCgR4bWF4GAMgASgBEgwKBHltYXgYBCABKAEivgIKDVN0b3JhZ2VDb25maWcSEgoKZmlsbGZhY3RvchgBIAEoBRIRCglidWZmZXJpbmcYAiABKAkSEgoKdGFibGVzcGFjZRgDIAEoCRIXCg93b3JrX3RhYmxlc3BhY2UYBCABKAkSEQoJc2RvX2xldmVsGAUgASgFEhcKD2NvbW1pdF9pbnRlcnZhbBgGIAEoBRIRCglwYWRfaW5kZXgYByABKAgSFgoOc29ydF9pbl90ZW1wZGIYCCABKAkSFQoNZHJvcF9leGlzdGluZxgJIAEoCBIOCgZvbmxpbmUYCiABKAgSFwoPYWxsb3dfcm93X2xvY2tzGAsgASgIEhgKEGFsbG93X3BhZ2VfbG9ja3MYDCABKAgSDgoGbWF4ZG9wGA0gASgFEhgKEGRhdGFfY29tcHJlc3Npb24YDiABKAkifwoRRGltZW5zaW9uYWxDb25maWcSEgoKZGltZW5zaW9ucxgBIAEoBRIRCglkYXRhX3R5cGUYAiABKAkSDAoEc3JpZBgDIAEoBRI1Cgtjb25zdHJhaW50cxgEIAMoCzIgLmJ5dGViYXNlLnYxLkRpbWVuc2lvbkNvbnN0cmFpbnQiYQoTRGltZW5zaW9uQ29uc3RyYWludBIRCglkaW1lbnNpb24YASABKAkSEQoJbWluX3ZhbHVlGAIgASgBEhEKCW1heF92YWx1ZRgDIAEoARIRCgl0b2xlcmFuY2UYBCABKAEijQMKDUluZGV4TWV0YWRhdGESDAoEbmFtZRgBIAEoCRITCgtleHByZXNzaW9ucxgCIAMoCRISCgprZXlfbGVuZ3RoGAMgAygDEhIKCmRlc2NlbmRpbmcYBCADKAgSDAoEdHlwZRgFIAEoCRIOCgZ1bmlxdWUYBiABKAgSDwoHcHJpbWFyeRgHIAEoCBIPCgd2aXNpYmxlGAggASgIEg8KB2NvbW1lbnQYCSABKAkSEgoKZGVmaW5pdGlvbhgKIAEoCRIbChNwYXJlbnRfaW5kZXhfc2NoZW1hGAsgASgJEhkKEXBhcmVudF9pbmRleF9uYW1lGAwgASgJEhMKC2dyYW51bGFyaXR5GA0gASgDEhUKDWlzX2NvbnN0cmFpbnQYDiABKAgSNwoOc3BhdGlhbF9jb25maWcYDyABKAsyHy5ieXRlYmFzZS52MS5TcGF0aWFsSW5kZXhDb25maWcSFQoNb3BjbGFzc19uYW1lcxgQIAMoCRIYChBvcGNsYXNzX2RlZmF1bHRzGBEgAygIIlcKEUV4dGVuc2lvbk1ldGFkYXRhEgwKBG5hbWUYASABKAkSDgoGc2NoZW1hGAIgASgJEg8KB3ZlcnNpb24YAyABKAkSEwoLZGVzY3JpcHRpb24YBCABKAkivgEKEkZvcmVpZ25LZXlNZXRhZGF0YRIMCgRuYW1lGAEgASgJEg8KB2NvbHVtbnMYAiADKAkSGQoRcmVmZXJlbmNlZF9zY2hlbWEYAyABKAkSGAoQcmVmZXJlbmNlZF90YWJsZRgEIAEoCRIaChJyZWZlcmVuY2VkX2NvbHVtbnMYBSADKAkSEQoJb25fZGVsZXRlGAYgASgJEhEKCW9uX3VwZGF0ZRgHIAEoCRISCgptYXRjaF90eXBlGAggASgJIiAKDkRhdGFiYXNlU2NoZW1hEg4KBnNjaGVtYRgBIAEoCSI+ChFEYXRhYmFzZVNETFNjaGVtYRIOCgZzY2hlbWEYASABKAwSGQoMY29udGVudF90eXBlGAIgASgJQgPgQQMi8QIKFkdldFNjaGVtYVN0cmluZ1JlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vRGF0YWJhc2USPAoEdHlwZRgCIAEoDjIuLmJ5dGViYXNlLnYxLkdldFNjaGVtYVN0cmluZ1JlcXVlc3QuT2JqZWN0VHlwZRIOCgZzY2hlbWEYAyABKAkSDgoGb2JqZWN0GAQgASgJEi8KCG1ldGFkYXRhGAUgASgLMh0uYnl0ZWJhc2UudjEuRGF0YWJhc2VNZXRhZGF0YSKaAQoKT2JqZWN0VHlwZRIbChdPQkpFQ1RfVFlQRV9VTlNQRUNJRklFRBAAEgwKCERBVEFCQVNFEAESCgoGU0NIRU1BEAISCQoFVEFCTEUQAxIICgRWSUVXEAQSFQoRTUFURVJJQUxJWkVEX1ZJRVcQBRIMCghGVU5DVElPThAGEg0KCVBST0NFRFVSRRAHEgwKCFNFUVVFTkNFEAgiMAoXR2V0U2NoZW1hU3RyaW5nUmVzcG9uc2USFQoNc2NoZW1hX3N0cmluZxgBIAEoCSo9CgpTeW5jU3RhdHVzEhsKF1NZTkNfU1RBVFVTX1VOU1BFQ0lGSUVEEAASBgoCT0sQARIKCgZGQUlMRUQQAjKeGgoPRGF0YWJhc2VTZXJ2aWNlEsEBCgtHZXREYXRhYmFzZRIfLmJ5dGViYXNlLnYxLkdldERhdGFiYXNlUmVxdWVzdBoVLmJ5dGViYXNlLnYxLkRhdGFiYXNlInraQQRuYW1liuowEGJiLmRhdGFiYXNlcy5nZXSQ6jABgtPkkwJVWi8SLS92MS97bmFtZT1wcm9qZWN0cy8qL2luc3RhbmNlcy8qL2RhdGFiYXNlcy8qfRIiL3YxL3tuYW1lPWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qfRKZAgoRQmF0Y2hHZXREYXRhYmFzZXMSJS5ieXRlYmFzZS52MS5CYXRjaEdldERhdGFiYXNlc1JlcXVlc3QaJi5ieXRlYmFzZS52MS5CYXRjaEdldERhdGFiYXNlc1Jlc3BvbnNlIrQBiuowEGJiLmRhdGFiYXNlcy5nZXSQ6jACgtPkkwKVAVotEisvdjEve3BhcmVudD1pbnN0YW5jZXMvKn0vZGF0YWJhc2VzOmJhdGNoR2V0WjgSNi92MS97cGFyZW50PXByb2plY3RzLyovaW5zdGFuY2VzLyp9L2RhdGFiYXNlczpiYXRjaEdldBIqL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vZGF0YWJhc2VzOmJhdGNoR2V0Ep0CCg1MaXN0RGF0YWJhc2VzEiEuYnl0ZWJhc2UudjEuTGlzdERhdGFiYXNlc1JlcXVlc3QaIi5ieXRlYmFzZS52MS5MaXN0RGF0YWJhc2VzUmVzcG9uc2UixAHaQQCK6jARYmIuZGF0YWJhc2VzLmxpc3SQ6jACgtPkkwKhAVokEiIvdjEve3BhcmVudD1pbnN0YW5jZXMvKn0vZGF0YWJhc2VzWiUSIy92MS97cGFyZW50PXdvcmtzcGFjZXMvKn0vZGF0YWJhc2VzWi8SLS92MS97cGFyZW50PXByb2plY3RzLyovaW5zdGFuY2VzLyp9L2RhdGFiYXNlcxIhL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vZGF0YWJhc2VzEoUCCg5VcGRhdGVEYXRhYmFzZRIiLmJ5dGViYXNlLnYxLlVwZGF0ZURhdGFiYXNlUmVxdWVzdBoVLmJ5dGViYXNlLnYxLkRhdGFiYXNlIrcB2kEUZGF0YWJhc2UsdXBkYXRlX21hc2uK6jATYmIuZGF0YWJhc2VzLnVwZGF0ZZDqMAGY6jABgtPkkwJ7OghkYXRhYmFzZVpCOghkYXRhYmFzZTI2L3YxL3tkYXRhYmFzZS5uYW1lPXByb2plY3RzLyovaW5zdGFuY2VzLyovZGF0YWJhc2VzLyp9MisvdjEve2RhdGFiYXNlLm5hbWU9aW5zdGFuY2VzLyovZGF0YWJhc2VzLyp9EoYCChRCYXRjaFVwZGF0ZURhdGFiYXNlcxIoLmJ5dGViYXNlLnYxLkJhdGNoVXBkYXRlRGF0YWJhc2VzUmVxdWVzdBopLmJ5dGViYXNlLnYxLkJhdGNoVXBkYXRlRGF0YWJhc2VzUmVzcG9uc2UimAGK6jATYmIuZGF0YWJhc2VzLnVwZGF0ZZDqMAGY6jABgtPkkwJzOgEqWj46ASoiOS92MS97cGFyZW50PXByb2plY3RzLyovaW5zdGFuY2VzLyp9L2RhdGFiYXNlczpiYXRjaFVwZGF0ZSIuL3YxL3twYXJlbnQ9aW5zdGFuY2VzLyp9L2RhdGFiYXNlczpiYXRjaFVwZGF0ZRLaAQoMU3luY0RhdGFiYXNlEiAuYnl0ZWJhc2UudjEuU3luY0RhdGFiYXNlUmVxdWVzdBohLmJ5dGViYXNlLnYxLlN5bmNEYXRhYmFzZVJlc3BvbnNlIoQBiuowEWJiLmRhdGFiYXNlcy5zeW5jkOowAYLT5JMCZToBKlo3OgEqIjIvdjEve25hbWU9cHJvamVjdHMvKi9pbnN0YW5jZXMvKi9kYXRhYmFzZXMvKn06c3luYyInL3YxL3tuYW1lPWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qfTpzeW5jEvYBChJCYXRjaFN5bmNEYXRhYmFzZXMSJi5ieXRlYmFzZS52MS5CYXRjaFN5bmNEYXRhYmFzZXNSZXF1ZXN0GicuYnl0ZWJhc2UudjEuQmF0Y2hTeW5jRGF0YWJhc2VzUmVzcG9uc2UijgGK6jARYmIuZGF0YWJhc2VzLnN5bmOQ6jABgtPkkwJvOgEqWjw6ASoiNy92MS97cGFyZW50PXByb2plY3RzLyovaW5zdGFuY2VzLyp9L2RhdGFiYXNlczpiYXRjaFN5bmMiLC92MS97cGFyZW50PWluc3RhbmNlcy8qfS9kYXRhYmFzZXM6YmF0Y2hTeW5jEusBChNHZXREYXRhYmFzZU1ldGFkYXRhEicuYnl0ZWJhc2UudjEuR2V0RGF0YWJhc2VNZXRhZGF0YVJlcXVlc3QaHS5ieXRlYmFzZS52MS5EYXRhYmFzZU1ldGFkYXRhIosBiuowFmJiLmRhdGFiYXNlcy5nZXRTY2hlbWGQ6jABgtPkkwJnWjgSNi92MS97bmFtZT1wcm9qZWN0cy8qL2luc3RhbmNlcy8qL2RhdGFiYXNlcy8qL21ldGFkYXRhfRIrL3YxL3tuYW1lPWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qL21ldGFkYXRhfRLhAQoRR2V0RGF0YWJhc2VTY2hlbWESJS5ieXRlYmFzZS52MS5HZXREYXRhYmFzZVNjaGVtYVJlcXVlc3QaGy5ieXRlYmFzZS52MS5EYXRhYmFzZVNjaGVtYSKHAYrqMBZiYi5kYXRhYmFzZXMuZ2V0U2NoZW1hkOowAYLT5JMCY1o2EjQvdjEve25hbWU9cHJvamVjdHMvKi9pbnN0YW5jZXMvKi9kYXRhYmFzZXMvKi9zY2hlbWF9EikvdjEve25hbWU9aW5zdGFuY2VzLyovZGF0YWJhc2VzLyovc2NoZW1hfRLwAQoUR2V0RGF0YWJhc2VTRExTY2hlbWESKC5ieXRlYmFzZS52MS5HZXREYXRhYmFzZVNETFNjaGVtYVJlcXVlc3QaHi5ieXRlYmFzZS52MS5EYXRhYmFzZVNETFNjaGVtYSKNAYrqMBZiYi5kYXRhYmFzZXMuZ2V0U2NoZW1hkOowAYLT5JMCaVo5EjcvdjEve25hbWU9cHJvamVjdHMvKi9pbnN0YW5jZXMvKi9kYXRhYmFzZXMvKi9zZGxTY2hlbWF9EiwvdjEve25hbWU9aW5zdGFuY2VzLyovZGF0YWJhc2VzLyovc2RsU2NoZW1hfRLtAgoKRGlmZlNjaGVtYRIeLmJ5dGViYXNlLnYxLkRpZmZTY2hlbWFSZXF1ZXN0Gh8uYnl0ZWJhc2UudjEuRGlmZlNjaGVtYVJlc3BvbnNlIp0CiuowEGJiLmRhdGFiYXNlcy5nZXSQ6jABgtPkkwL+AToBKlo9OgEqIjgvdjEve25hbWU9cHJvamVjdHMvKi9pbnN0YW5jZXMvKi9kYXRhYmFzZXMvKn06ZGlmZlNjaGVtYVo/OgEqIjovdjEve25hbWU9aW5zdGFuY2VzLyovZGF0YWJhc2VzLyovY2hhbmdlbG9ncy8qfTpkaWZmU2NoZW1hWko6ASoiRS92MS97bmFtZT1wcm9qZWN0cy8qL2luc3RhbmNlcy8qL2RhdGFiYXNlcy8qL2NoYW5nZWxvZ3MvKn06ZGlmZlNjaGVtYSItL3YxL3tuYW1lPWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qfTpkaWZmU2NoZW1hEvIBCgxEaWZmTWV0YWRhdGESIC5ieXRlYmFzZS52MS5EaWZmTWV0YWRhdGFSZXF1ZXN0GiEuYnl0ZWJhc2UudjEuRGlmZk1ldGFkYXRhUmVzcG9uc2UinAGK6jAZYmIuZGF0YWJhc2VzLmRpZmZNZXRhZGF0YZDqMAGC0+STAnU6ASpaPzoBKiI6L3YxL3tuYW1lPXByb2plY3RzLyovaW5zdGFuY2VzLyovZGF0YWJhc2VzLyp9OmRpZmZNZXRhZGF0YSIvL3YxL3tuYW1lPWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qfTpkaWZmTWV0YWRhdGES+QEKD0dldFNjaGVtYVN0cmluZxIjLmJ5dGViYXNlLnYxLkdldFNjaGVtYVN0cmluZ1JlcXVlc3QaJC5ieXRlYmFzZS52MS5HZXRTY2hlbWFTdHJpbmdSZXNwb25zZSKaAdpBBG5hbWWK6jAWYmIuZGF0YWJhc2VzLmdldFNjaGVtYZDqMAGC0+STAm9aPBI6L3YxL3tuYW1lPXByb2plY3RzLyovaW5zdGFuY2VzLyovZGF0YWJhc2VzLyovc2NoZW1hU3RyaW5nfRIvL3YxL3tuYW1lPWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qL3NjaGVtYVN0cmluZ31CqgEKD2NvbS5ieXRlYmFzZS52MUIURGF0YWJhc2VTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_field_mask, file_google_protobuf_timestamp, file_v1_annotation, file_v1_common, file_v1_instance_service]);/*** Describes the message bytebase.v1.GetDatabaseRequest.diff --git a/frontend/src/types/proto-es/v1/instance_role_service_pb.d.ts b/frontend/src/types/proto-es/v1/instance_role_service_pb.d.tsindex ecf8b367e7..f7241babab 100644--- a/frontend/src/types/proto-es/v1/instance_role_service_pb.d.ts+++ b/frontend/src/types/proto-es/v1/instance_role_service_pb.d.ts@@ -16,7 +16,7 @@ export declare const file_v1_instance_role_service: GenFile;export declare type ListInstanceRolesRequest = Message<"bytebase.v1.ListInstanceRolesRequest"> & {/*** The parent, which owns this collection of roles.- * Format: instances/{instance}+ * Format: instances/{instance} or projects/{project}/instances/{instance}** @generated from field: string parent = 1;*/@@ -93,7 +93,7 @@ export declare const ListInstanceRolesResponseSchema: GenMessage<ListInstanceRolexport declare type InstanceRole = Message<"bytebase.v1.InstanceRole"> & {/*** The name of the role.- * Format: instances/{instance}/roles/{role}+ * Format: instances/{instance}/roles/{role} or projects/{project}/instances/{instance}/roles/{role}* The role name is the unique name for the role.** @generated from field: string name = 1;diff --git a/frontend/src/types/proto-es/v1/instance_role_service_pb.js b/frontend/src/types/proto-es/v1/instance_role_service_pb.jsindex 901564cc9e..f7a300cc95 100644--- a/frontend/src/types/proto-es/v1/instance_role_service_pb.js+++ b/frontend/src/types/proto-es/v1/instance_role_service_pb.js@@ -13,7 +13,7 @@ import { file_v1_annotation } from "./annotation_pb";* Describes the file v1/instance_role_service.proto.*/export const file_v1_instance_role_service = /*@__PURE__*/- fileDesc("Ch52MS9pbnN0YW5jZV9yb2xlX3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIoEBChhMaXN0SW5zdGFuY2VSb2xlc1JlcXVlc3QSLQoGcGFyZW50GAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9JbnN0YW5jZRIRCglwYWdlX3NpemUYAiABKAUSEgoKcGFnZV90b2tlbhgDIAEoCRIPCgdyZWZyZXNoGAQgASgIIl4KGUxpc3RJbnN0YW5jZVJvbGVzUmVzcG9uc2USKAoFcm9sZXMYASADKAsyGS5ieXRlYmFzZS52MS5JbnN0YW5jZVJvbGUSFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJIp8CCgxJbnN0YW5jZVJvbGUSDAoEbmFtZRgBIAEoCRIRCglyb2xlX25hbWUYAiABKAkSGgoIcGFzc3dvcmQYAyABKAlCA+BBBEgAiAEBEh0KEGNvbm5lY3Rpb25fbGltaXQYBCABKAVIAYgBARIYCgt2YWxpZF91bnRpbBgFIAEoCUgCiAEBEhYKCWF0dHJpYnV0ZRgGIAEoCUgDiAEBOkHqQT4KGWJ5dGViYXNlLmNvbS9JbnN0YW5jZVJvbGUSIWluc3RhbmNlcy97aW5zdGFuY2V9L3JvbGVzL3tyb2xlfUILCglfcGFzc3dvcmRCEwoRX2Nvbm5lY3Rpb25fbGltaXRCDgoMX3ZhbGlkX3VudGlsQgwKCl9hdHRyaWJ1dGUyyAEKE0luc3RhbmNlUm9sZVNlcnZpY2USsAEKEUxpc3RJbnN0YW5jZVJvbGVzEiUuYnl0ZWJhc2UudjEuTGlzdEluc3RhbmNlUm9sZXNSZXF1ZXN0GiYuYnl0ZWJhc2UudjEuTGlzdEluc3RhbmNlUm9sZXNSZXNwb25zZSJM2kEGcGFyZW50iuowFWJiLmluc3RhbmNlUm9sZXMubGlzdJDqMAGC0+STAiASHi92MS97cGFyZW50PWluc3RhbmNlcy8qfS9yb2xlc0KuAQoPY29tLmJ5dGViYXNlLnYxQhhJbnN0YW5jZVJvbGVTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_v1_annotation]);+ fileDesc("Ch52MS9pbnN0YW5jZV9yb2xlX3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIoEBChhMaXN0SW5zdGFuY2VSb2xlc1JlcXVlc3QSLQoGcGFyZW50GAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9JbnN0YW5jZRIRCglwYWdlX3NpemUYAiABKAUSEgoKcGFnZV90b2tlbhgDIAEoCRIPCgdyZWZyZXNoGAQgASgIIl4KGUxpc3RJbnN0YW5jZVJvbGVzUmVzcG9uc2USKAoFcm9sZXMYASADKAsyGS5ieXRlYmFzZS52MS5JbnN0YW5jZVJvbGUSFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJItUCCgxJbnN0YW5jZVJvbGUSDAoEbmFtZRgBIAEoCRIRCglyb2xlX25hbWUYAiABKAkSGgoIcGFzc3dvcmQYAyABKAlCA+BBBEgAiAEBEh0KEGNvbm5lY3Rpb25fbGltaXQYBCABKAVIAYgBARIYCgt2YWxpZF91bnRpbBgFIAEoCUgCiAEBEhYKCWF0dHJpYnV0ZRgGIAEoCUgDiAEBOnfqQXQKGWJ5dGViYXNlLmNvbS9JbnN0YW5jZVJvbGUSIWluc3RhbmNlcy97aW5zdGFuY2V9L3JvbGVzL3tyb2xlfRI0cHJvamVjdHMve3Byb2plY3R9L2luc3RhbmNlcy97aW5zdGFuY2V9L3JvbGVzL3tyb2xlfUILCglfcGFzc3dvcmRCEwoRX2Nvbm5lY3Rpb25fbGltaXRCDgoMX3ZhbGlkX3VudGlsQgwKCl9hdHRyaWJ1dGUy9QEKE0luc3RhbmNlUm9sZVNlcnZpY2US3QEKEUxpc3RJbnN0YW5jZVJvbGVzEiUuYnl0ZWJhc2UudjEuTGlzdEluc3RhbmNlUm9sZXNSZXF1ZXN0GiYuYnl0ZWJhc2UudjEuTGlzdEluc3RhbmNlUm9sZXNSZXNwb25zZSJ52kEGcGFyZW50iuowFWJiLmluc3RhbmNlUm9sZXMubGlzdJDqMAGC0+STAk1aKxIpL3YxL3twYXJlbnQ9cHJvamVjdHMvKi9pbnN0YW5jZXMvKn0vcm9sZXMSHi92MS97cGFyZW50PWluc3RhbmNlcy8qfS9yb2xlc0KuAQoPY29tLmJ5dGViYXNlLnYxQhhJbnN0YW5jZVJvbGVTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_v1_annotation]);/*** Describes the message bytebase.v1.ListInstanceRolesRequest.diff --git a/frontend/src/types/proto-es/v1/instance_service_pb.d.ts b/frontend/src/types/proto-es/v1/instance_service_pb.d.tsindex 7736b2422b..9fc9648067 100644--- a/frontend/src/types/proto-es/v1/instance_service_pb.d.ts+++ b/frontend/src/types/proto-es/v1/instance_service_pb.d.ts@@ -19,7 +19,7 @@ export declare const file_v1_instance_service: GenFile;export declare type GetInstanceRequest = Message<"bytebase.v1.GetInstanceRequest"> & {/*** The name of the instance to retrieve.- * Format: instances/{instance}+ * Format: instances/{instance} or projects/{project}/instances/{instance}** @generated from field: string name = 1;*/@@ -36,6 +36,16 @@ export declare const GetInstanceRequestSchema: GenMessage<GetInstanceRequest>;* @generated from message bytebase.v1.ListInstancesRequest*/export declare type ListInstancesRequest = Message<"bytebase.v1.ListInstancesRequest"> & {+ /**+ * The parent, which owns this collection of instances.+ * Format: projects/{project}. If omitted, only workspace instances are+ * returned. Wildcard project parents are not supported. When set, the+ * `project` filter must be omitted or match this parent.+ *+ * @generated from field: optional string parent = 6;+ */+ parent?: string | undefined;+/*** The maximum number of instances to return. The service may return fewer than* this value.@@ -154,6 +164,15 @@ export declare const ListInstancesResponseSchema: GenMessage<ListInstancesRespon* @generated from message bytebase.v1.CreateInstanceRequest*/export declare type CreateInstanceRequest = Message<"bytebase.v1.CreateInstanceRequest"> & {+ /**+ * The parent, which owns this collection of instances.+ * Format: projects/{project}. If omitted, the instance is created in the+ * workspace collection.+ *+ * @generated from field: optional string parent = 5;+ */+ parent?: string | undefined;+/*** The instance to create.*@@ -181,7 +200,7 @@ export declare type CreateInstanceRequest = Message<"bytebase.v1.CreateInstanceR/*** The project to assign newly discovered databases to during initial sync.- * Format: projects/{project}+ * Format: projects/{project}. This must be unset when `parent` is set.** @generated from field: string initial_database_project = 4;*/@@ -202,7 +221,7 @@ export declare type UpdateInstanceRequest = Message<"bytebase.v1.UpdateInstanceR* The instance to update.** The instance's `name` field is used to identify the instance to update.- * Format: instances/{instance}+ * Format: instances/{instance} or projects/{project}/instances/{instance}** @generated from field: bytebase.v1.Instance instance = 1;*/@@ -217,7 +236,9 @@ export declare type UpdateInstanceRequest = Message<"bytebase.v1.UpdateInstanceR/*** If set to true, and the instance is not found, a new instance will be created.- * In this situation, `update_mask` is ignored.+ * In this situation, `update_mask` is ignored. A project-nested name creates+ * the instance only under its encoded active, non-default project; it never+ * falls back to a workspace instance.** @generated from field: bool allow_missing = 3;*/@@ -236,14 +257,16 @@ export declare const UpdateInstanceRequestSchema: GenMessage<UpdateInstanceRequeexport declare type DeleteInstanceRequest = Message<"bytebase.v1.DeleteInstanceRequest"> & {/*** The name of the instance to delete.- * Format: instances/{instance}+ * Format: instances/{instance} or projects/{project}/instances/{instance}** @generated from field: string name = 1;*/name: string;/**- * If set to true, any databases and sheets from this project will also be moved to default project, and all open issues will be closed.+ * If set to true, a workspace instance's databases are moved to the default+ * project before the instance is soft-deleted. Project instances reject this+ * option because their databases must remain in the owning project.** @generated from field: bool force = 2;*/@@ -272,7 +295,7 @@ export declare const DeleteInstanceRequestSchema: GenMessage<DeleteInstanceRequeexport declare type UndeleteInstanceRequest = Message<"bytebase.v1.UndeleteInstanceRequest"> & {/*** The name of the deleted instance.- * Format: instances/{instance}+ * Format: instances/{instance} or projects/{project}/instances/{instance}** @generated from field: string name = 1;*/@@ -291,7 +314,7 @@ export declare const UndeleteInstanceRequestSchema: GenMessage<UndeleteInstanceRexport declare type SyncInstanceRequest = Message<"bytebase.v1.SyncInstanceRequest"> & {/*** The name of instance.- * Format: instances/{instance}+ * Format: instances/{instance} or projects/{project}/instances/{instance}** @generated from field: string name = 1;*/@@ -318,7 +341,7 @@ export declare const SyncInstanceRequestSchema: GenMessage<SyncInstanceRequest>;export declare type ListInstanceDatabaseRequest = Message<"bytebase.v1.ListInstanceDatabaseRequest"> & {/*** The name of the instance.- * Format: instances/{instance}+ * Format: instances/{instance} or projects/{project}/instances/{instance}** @generated from field: string name = 1;*/@@ -378,6 +401,15 @@ export declare const SyncInstanceResponseSchema: GenMessage<SyncInstanceResponse* @generated from message bytebase.v1.BatchSyncInstancesRequest*/export declare type BatchSyncInstancesRequest = Message<"bytebase.v1.BatchSyncInstancesRequest"> & {+ /**+ * The parent, which owns this collection of instances.+ * Format: projects/{project}. If omitted, all targets must be workspace+ * instances; otherwise, every target must belong to this project collection.+ *+ * @generated from field: optional string parent = 2;+ */+ parent?: string | undefined;+/*** The request message specifying the instances to sync.* A maximum of 1000 instances can be synced in a batch.@@ -409,6 +441,15 @@ export declare const BatchSyncInstancesResponseSchema: GenMessage<BatchSyncInsta* @generated from message bytebase.v1.BatchUpdateInstancesRequest*/export declare type BatchUpdateInstancesRequest = Message<"bytebase.v1.BatchUpdateInstancesRequest"> & {+ /**+ * The parent, which owns this collection of instances.+ * Format: projects/{project}. If omitted, all targets must be workspace+ * instances; otherwise, every target must belong to this project collection.+ *+ * @generated from field: optional string parent = 2;+ */+ parent?: string | undefined;+/*** The request message specifying the resources to update.*@@ -445,7 +486,7 @@ export declare const BatchUpdateInstancesResponseSchema: GenMessage<BatchUpdateIexport declare type AddDataSourceRequest = Message<"bytebase.v1.AddDataSourceRequest"> & {/*** The name of the instance to add a data source to.- * Format: instances/{instance}+ * Format: instances/{instance} or projects/{project}/instances/{instance}** @generated from field: string name = 1;*/@@ -479,7 +520,7 @@ export declare const AddDataSourceRequestSchema: GenMessage<AddDataSourceRequestexport declare type RemoveDataSourceRequest = Message<"bytebase.v1.RemoveDataSourceRequest"> & {/*** The name of the instance to remove a data source from.- * Format: instances/{instance}+ * Format: instances/{instance} or projects/{project}/instances/{instance}** @generated from field: string name = 1;*/@@ -506,7 +547,7 @@ export declare const RemoveDataSourceRequestSchema: GenMessage<RemoveDataSourceRexport declare type UpdateDataSourceRequest = Message<"bytebase.v1.UpdateDataSourceRequest"> & {/*** The name of the instance to update a data source.- * Format: instances/{instance}+ * Format: instances/{instance} or projects/{project}/instances/{instance}** @generated from field: string name = 1;*/@@ -570,7 +611,7 @@ export declare const SyncDatabasesSchema: GenMessage<SyncDatabases>;export declare type Instance = Message<"bytebase.v1.Instance"> & {/*** The name of the instance.- * Format: instances/{instance}+ * Format: instances/{instance} or projects/{project}/instances/{instance}** @generated from field: string name = 1;*/@@ -1600,7 +1641,7 @@ export declare type InstanceResource = Message<"bytebase.v1.InstanceResource"> &/*** The name of the instance.- * Format: instances/{instance}+ * Format: instances/{instance} or projects/{project}/instances/{instance}** @generated from field: string name = 6;*/@@ -1754,7 +1795,7 @@ export declare const InstanceService: GenService<{output: typeof InstanceSchema;},/**- * Lists all database instances.+ * Lists database instances, optionally within a project.* Permissions required: bb.instances.list** @generated from rpc bytebase.v1.InstanceService.ListInstancesdiff --git a/frontend/src/types/proto-es/v1/instance_service_pb.js b/frontend/src/types/proto-es/v1/instance_service_pb.jsindex 772850004d..d9e7590745 100644--- a/frontend/src/types/proto-es/v1/instance_service_pb.js+++ b/frontend/src/types/proto-es/v1/instance_service_pb.js@@ -17,7 +17,7 @@ import { file_v1_instance_role_service } from "./instance_role_service_pb";* Describes the file v1/instance_service.proto.*/export const file_v1_instance_service = /*@__PURE__*/- fileDesc("Chl2MS9pbnN0YW5jZV9zZXJ2aWNlLnByb3RvEgtieXRlYmFzZS52MSJBChJHZXRJbnN0YW5jZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vSW5zdGFuY2UidQoUTGlzdEluc3RhbmNlc1JlcXVlc3QSEQoJcGFnZV9zaXplGAEgASgFEhIKCnBhZ2VfdG9rZW4YAiABKAkSFAoMc2hvd19kZWxldGVkGAMgASgIEg4KBmZpbHRlchgEIAEoCRIQCghvcmRlcl9ieRgFIAEoCSJaChVMaXN0SW5zdGFuY2VzUmVzcG9uc2USKAoJaW5zdGFuY2VzGAEgAygLMhUuYnl0ZWJhc2UudjEuSW5zdGFuY2USFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJIpMBChVDcmVhdGVJbnN0YW5jZVJlcXVlc3QSLAoIaW5zdGFuY2UYASABKAsyFS5ieXRlYmFzZS52MS5JbnN0YW5jZUID4EECEhMKC2luc3RhbmNlX2lkGAIgASgJEhUKDXZhbGlkYXRlX29ubHkYAyABKAgSIAoYaW5pdGlhbF9kYXRhYmFzZV9wcm9qZWN0GAQgASgJIo0BChVVcGRhdGVJbnN0YW5jZVJlcXVlc3QSLAoIaW5zdGFuY2UYASABKAsyFS5ieXRlYmFzZS52MS5JbnN0YW5jZUID4EECEi8KC3VwZGF0ZV9tYXNrGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFzaxIVCg1hbGxvd19taXNzaW5nGAMgASgIImIKFURlbGV0ZUluc3RhbmNlUmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9JbnN0YW5jZRINCgVmb3JjZRgCIAEoCBINCgVwdXJnZRgDIAEoCCJGChdVbmRlbGV0ZUluc3RhbmNlUmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9JbnN0YW5jZSJcChNTeW5jSW5zdGFuY2VSZXF1ZXN0EisKBG5hbWUYASABKAlCHeBBAvpBFwoVYnl0ZWJhc2UuY29tL0luc3RhbmNlEhgKEGVuYWJsZV9mdWxsX3N5bmMYAiABKAgiigEKG0xpc3RJbnN0YW5jZURhdGFiYXNlUmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9JbnN0YW5jZRIxCghpbnN0YW5jZRgCIAEoCzIVLmJ5dGViYXNlLnYxLkluc3RhbmNlQgPgQQJIAIgBAUILCglfaW5zdGFuY2UiMQocTGlzdEluc3RhbmNlRGF0YWJhc2VSZXNwb25zZRIRCglkYXRhYmFzZXMYASADKAkiKQoUU3luY0luc3RhbmNlUmVzcG9uc2USEQoJZGF0YWJhc2VzGAEgAygJIlQKGUJhdGNoU3luY0luc3RhbmNlc1JlcXVlc3QSNwoIcmVxdWVzdHMYASADKAsyIC5ieXRlYmFzZS52MS5TeW5jSW5zdGFuY2VSZXF1ZXN0QgPgQQIiHAoaQmF0Y2hTeW5jSW5zdGFuY2VzUmVzcG9uc2UiWAobQmF0Y2hVcGRhdGVJbnN0YW5jZXNSZXF1ZXN0EjkKCHJlcXVlc3RzGAEgAygLMiIuYnl0ZWJhc2UudjEuVXBkYXRlSW5zdGFuY2VSZXF1ZXN0QgPgQQIiSAocQmF0Y2hVcGRhdGVJbnN0YW5jZXNSZXNwb25zZRIoCglpbnN0YW5jZXMYASADKAsyFS5ieXRlYmFzZS52MS5JbnN0YW5jZSKNAQoUQWRkRGF0YVNvdXJjZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vSW5zdGFuY2USMQoLZGF0YV9zb3VyY2UYAiABKAsyFy5ieXRlYmFzZS52MS5EYXRhU291cmNlQgPgQQISFQoNdmFsaWRhdGVfb25seRgDIAEoCCJ5ChdSZW1vdmVEYXRhU291cmNlUmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9JbnN0YW5jZRIxCgtkYXRhX3NvdXJjZRgCIAEoCzIXLmJ5dGViYXNlLnYxLkRhdGFTb3VyY2VCA+BBAiLYAQoXVXBkYXRlRGF0YVNvdXJjZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vSW5zdGFuY2USMQoLZGF0YV9zb3VyY2UYAiABKAsyFy5ieXRlYmFzZS52MS5EYXRhU291cmNlQgPgQQISLwoLdXBkYXRlX21hc2sYAyABKAsyGi5nb29nbGUucHJvdG9idWYuRmllbGRNYXNrEhUKDXZhbGlkYXRlX29ubHkYBCABKAgSFQoNYWxsb3dfbWlzc2luZxgFIAEoCCIiCg1TeW5jRGF0YWJhc2VzEhEKCWRhdGFiYXNlcxgBIAMoCSKBBQoISW5zdGFuY2USDAoEbmFtZRgBIAEoCRIhCgVzdGF0ZRgDIAEoDjISLmJ5dGViYXNlLnYxLlN0YXRlEhcKBXRpdGxlGAQgASgJQgi6SAVyAxjIARIjCgZlbmdpbmUYBSABKA4yEy5ieXRlYmFzZS52MS5FbmdpbmUSGwoOZW5naW5lX3ZlcnNpb24YBiABKAlCA+BBAxIVCg1leHRlcm5hbF9saW5rGAcgASgJEi0KDGRhdGFfc291cmNlcxgIIAMoCzIXLmJ5dGViYXNlLnYxLkRhdGFTb3VyY2USHQoLZW52aXJvbm1lbnQYCSABKAlCA+BBAUgAiAEBEhIKCmFjdGl2YXRpb24YCiABKAgSLQoFcm9sZXMYCyADKAsyGS5ieXRlYmFzZS52MS5JbnN0YW5jZVJvbGVCA+BBAxIwCg1zeW5jX2ludGVydmFsGAwgASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uEjIKDnN5bmNfZGF0YWJhc2VzGA4gASgLMhouYnl0ZWJhc2UudjEuU3luY0RhdGFiYXNlcxI3Cg5sYXN0X3N5bmNfdGltZRgPIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxIxCgZsYWJlbHMYECADKAsyIS5ieXRlYmFzZS52MS5JbnN0YW5jZS5MYWJlbHNFbnRyeRotCgtMYWJlbHNFbnRyeRILCgNrZXkYASABKAkSDQoFdmFsdWUYAiABKAk6AjgBOjDqQS0KFWJ5dGViYXNlLmNvbS9JbnN0YW5jZRIUaW5zdGFuY2VzL3tpbnN0YW5jZX1CDgoMX2Vudmlyb25tZW50Iq8IChhEYXRhU291cmNlRXh0ZXJuYWxTZWNyZXQSRQoLc2VjcmV0X3R5cGUYASABKA4yMC5ieXRlYmFzZS52MS5EYXRhU291cmNlRXh0ZXJuYWxTZWNyZXQuU2VjcmV0VHlwZRILCgN1cmwYAiABKAkSQQoJYXV0aF90eXBlGAMgASgOMi4uYnl0ZWJhc2UudjEuRGF0YVNvdXJjZUV4dGVybmFsU2VjcmV0LkF1dGhUeXBlEksKCGFwcF9yb2xlGAQgASgLMjcuYnl0ZWJhc2UudjEuRGF0YVNvdXJjZUV4dGVybmFsU2VjcmV0LkFwcFJvbGVBdXRoT3B0aW9uSAASFAoFdG9rZW4YBSABKAlCA+BBBEgAEkMKCnRva2VuX3R5cGUYDSABKA4yLy5ieXRlYmFzZS52MS5EYXRhU291cmNlRXh0ZXJuYWxTZWNyZXQuVG9rZW5UeXBlEhMKC2VuZ2luZV9uYW1lGAYgASgJEhMKC3NlY3JldF9uYW1lGAcgASgJEhkKEXBhc3N3b3JkX2tleV9uYW1lGAggASgJEiMKG3NraXBfdmF1bHRfdGxzX3ZlcmlmaWNhdGlvbhgJIAEoCBIZCgx2YXVsdF9zc2xfY2EYCiABKAlCA+BBBBIbCg52YXVsdF9zc2xfY2VydBgLIAEoCUID4EEEEhoKDXZhdWx0X3NzbF9rZXkYDCABKAlCA+BBBBruAQoRQXBwUm9sZUF1dGhPcHRpb24SFAoHcm9sZV9pZBgBIAEoCUID4EEEEhYKCXNlY3JldF9pZBgCIAEoCUID4EEEElAKBHR5cGUYAyABKA4yQi5ieXRlYmFzZS52MS5EYXRhU291cmNlRXh0ZXJuYWxTZWNyZXQuQXBwUm9sZUF1dGhPcHRpb24uU2VjcmV0VHlwZRISCgptb3VudF9wYXRoGAQgASgJIkUKClNlY3JldFR5cGUSGwoXU0VDUkVUX1RZUEVfVU5TUEVDSUZJRUQQABIJCgVQTEFJThABEg8KC0VOVklST05NRU5UEAIigAEKClNlY3JldFR5cGUSGwoXU0VDUkVUX1RZUEVfVU5TUEVDSUZJRUQQABIPCgtWQVVMVF9LVl9WMhABEhcKE0FXU19TRUNSRVRTX01BTkFHRVIQAhIWChJHQ1BfU0VDUkVUX01BTkFHRVIQAxITCg9BWlVSRV9LRVlfVkFVTFQQBCJECghBdXRoVHlwZRIZChVBVVRIX1RZUEVfVU5TUEVDSUZJRUQQABIJCgVUT0tFThABEhIKDlZBVUxUX0FQUF9ST0xFEAIiTQoJVG9rZW5UeXBlEhoKFlRPS0VOX1RZUEVfVU5TUEVDSUZJRUQQABIJCgVQTEFJThABEg8KC0VOVklST05NRU5UEAISCAoERklMRRADQg0KC2F1dGhfb3B0aW9uItASCgpEYXRhU291cmNlEgoKAmlkGAEgASgJEikKBHR5cGUYAiABKA4yGy5ieXRlYmFzZS52MS5EYXRhU291cmNlVHlwZRIQCgh1c2VybmFtZRgDIAEoCRIVCghwYXNzd29yZBgEIAEoCUID4EEEEg8KB3VzZV9zc2wYHiABKAgSEwoGc3NsX2NhGAUgASgJQgPgQQQSFQoIc3NsX2NlcnQYBiABKAlCA+BBBBIUCgdzc2xfa2V5GAcgASgJQgPgQQQSGAoLc3NsX2NhX3BhdGgYKSABKAlCA+BBBBIaCg1zc2xfY2VydF9wYXRoGCogASgJQgPgQQQSGQoMc3NsX2tleV9wYXRoGCsgASgJQgPgQQQSFwoKc3NsX2NhX3NldBgsIAEoCEID4EEDEhkKDHNzbF9jZXJ0X3NldBgtIAEoCEID4EEDEhgKC3NzbF9rZXlfc2V0GC4gASgIQgPgQQMSHAoPc3NsX2NhX3BhdGhfc2V0GC8gASgIQgPgQQMSHgoRc3NsX2NlcnRfcGF0aF9zZXQYMCABKAhCA+BBAxIdChBzc2xfa2V5X3BhdGhfc2V0GDEgASgIQgPgQQMSHgoWdmVyaWZ5X3Rsc19jZXJ0aWZpY2F0ZRgnIAEoCBIMCgRob3N0GAggASgJEgwKBHBvcnQYCSABKAkSEAoIZGF0YWJhc2UYCiABKAkSCwoDc3J2GAsgASgIEh8KF2F1dGhlbnRpY2F0aW9uX2RhdGFiYXNlGAwgASgJEhMKC3JlcGxpY2Ffc2V0GBkgASgJEgsKA3NpZBgNIAEoCRIUCgxzZXJ2aWNlX25hbWUYDiABKAkSEAoIc3NoX2hvc3QYDyABKAkSEAoIc3NoX3BvcnQYECABKAkSEAoIc3NoX3VzZXIYESABKAkSGQoMc3NoX3Bhc3N3b3JkGBIgASgJQgPgQQQSHAoPc3NoX3ByaXZhdGVfa2V5GBMgASgJQgPgQQQSJwoaYXV0aGVudGljYXRpb25fcHJpdmF0ZV9rZXkYFCABKAlCA+BBBBIyCiVhdXRoZW50aWNhdGlvbl9wcml2YXRlX2tleV9wYXNzcGhyYXNlGCggASgJQgPgQQQSPgoPZXh0ZXJuYWxfc2VjcmV0GBUgASgLMiUuYnl0ZWJhc2UudjEuRGF0YVNvdXJjZUV4dGVybmFsU2VjcmV0EkcKE2F1dGhlbnRpY2F0aW9uX3R5cGUYFiABKA4yKi5ieXRlYmFzZS52MS5EYXRhU291cmNlLkF1dGhlbnRpY2F0aW9uVHlwZRJBChFjbG91ZF9zcWxfaXBfdHlwZRg4IAEoDjImLmJ5dGViYXNlLnYxLkRhdGFTb3VyY2UuQ2xvdWRTUUxJUFR5cGUSQwoQYXp1cmVfY3JlZGVudGlhbBgXIAEoCzInLmJ5dGViYXNlLnYxLkRhdGFTb3VyY2UuQXp1cmVDcmVkZW50aWFsSAASPwoOYXdzX2NyZWRlbnRpYWwYJSABKAsyJS5ieXRlYmFzZS52MS5EYXRhU291cmNlLkFXU0NyZWRlbnRpYWxIABI/Cg5nY3BfY3JlZGVudGlhbBgmIAEoCzIlLmJ5dGViYXNlLnYxLkRhdGFTb3VyY2UuR0NQQ3JlZGVudGlhbEgAEiwKC3Nhc2xfY29uZmlnGBggASgLMhcuYnl0ZWJhc2UudjEuU0FTTENvbmZpZxJCChRhZGRpdGlvbmFsX2FkZHJlc3NlcxgaIAMoCzIfLmJ5dGViYXNlLnYxLkRhdGFTb3VyY2UuQWRkcmVzc0ID4EEBEhkKEWRpcmVjdF9jb25uZWN0aW9uGBsgASgIEg4KBnJlZ2lvbhgcIAEoCRIUCgx3YXJlaG91c2VfaWQYHSABKAkSEwoLbWFzdGVyX25hbWUYHyABKAkSFwoPbWFzdGVyX3VzZXJuYW1lGCAgASgJEhcKD21hc3Rlcl9wYXNzd29yZBghIAEoCRI1CgpyZWRpc190eXBlGCIgASgOMiEuYnl0ZWJhc2UudjEuRGF0YVNvdXJjZS5SZWRpc1R5cGUSDwoHY2x1c3RlchgjIAEoCRJbChtleHRyYV9jb25uZWN0aW9uX3BhcmFtZXRlcnMYJCADKAsyNi5ieXRlYmFzZS52MS5EYXRhU291cmNlLkV4dHJhQ29ubmVjdGlvblBhcmFtZXRlcnNFbnRyeRISCgpwcm9qZWN0X2lkGDkgASgJEhMKC2luc3RhbmNlX2lkGDogASgJGlMKD0F6dXJlQ3JlZGVudGlhbBIRCgl0ZW5hbnRfaWQYASABKAkSEQoJY2xpZW50X2lkGAIgASgJEhoKDWNsaWVudF9zZWNyZXQYAyABKAlCA+BBBBqYAQoNQVdTQ3JlZGVudGlhbBIaCg1hY2Nlc3Nfa2V5X2lkGAEgASgJQgPgQQQSHgoRc2VjcmV0X2FjY2Vzc19rZXkYAiABKAlCA+BBBBIaCg1zZXNzaW9uX3Rva2VuGAMgASgJQgPgQQQSFQoIcm9sZV9hcm4YBCABKAlCA+BBBBIYCgtleHRlcm5hbF9pZBgFIAEoCUID4EEEGiUKDUdDUENyZWRlbnRpYWwSFAoHY29udGVudBgBIAEoCUID4EEEGiUKB0FkZHJlc3MSDAoEaG9zdBgBIAEoCRIMCgRwb3J0GAIgASgJGkAKHkV4dHJhQ29ubmVjdGlvblBhcmFtZXRlcnNFbnRyeRILCgNrZXkYASABKAkSDQoFdmFsdWUYAiABKAk6AjgBInwKEkF1dGhlbnRpY2F0aW9uVHlwZRIeChpBVVRIRU5USUNBVElPTl9VTlNQRUNJRklFRBAAEgwKCFBBU1NXT1JEEAESGAoUR09PR0xFX0NMT1VEX1NRTF9JQU0QAhIPCgtBV1NfUkRTX0lBTRADEg0KCUFaVVJFX0lBTRAEIlUKDkNsb3VkU1FMSVBUeXBlEiEKHUNMT1VEX1NRTF9JUF9UWVBFX1VOU1BFQ0lGSUVEEAASCgoGUFVCTElDEAESCwoHUFJJVkFURRACEgcKA1BTQxADIlIKCVJlZGlzVHlwZRIaChZSRURJU19UWVBFX1VOU1BFQ0lGSUVEEAASDgoKU1RBTkRBTE9ORRABEgwKCFNFTlRJTkVMEAISCwoHQ0xVU1RFUhADQg8KDWlhbV9leHRlbnNpb24i3gEKEEluc3RhbmNlUmVzb3VyY2USDQoFdGl0bGUYASABKAkSIwoGZW5naW5lGAIgASgOMhMuYnl0ZWJhc2UudjEuRW5naW5lEhsKDmVuZ2luZV92ZXJzaW9uGAMgASgJQgPgQQMSLQoMZGF0YV9zb3VyY2VzGAQgAygLMhcuYnl0ZWJhc2UudjEuRGF0YVNvdXJjZRISCgphY3RpdmF0aW9uGAUgASgIEgwKBG5hbWUYBiABKAkSGAoLZW52aXJvbm1lbnQYByABKAlIAIgBAUIOCgxfZW52aXJvbm1lbnQiTAoKU0FTTENvbmZpZxIxCgprcmJfY29uZmlnGAEgASgLMhsuYnl0ZWJhc2UudjEuS2VyYmVyb3NDb25maWdIAEILCgltZWNoYW5pc20ilgEKDktlcmJlcm9zQ29uZmlnEg8KB3ByaW1hcnkYASABKAkSEAoIaW5zdGFuY2UYAiABKAkSDQoFcmVhbG0YAyABKAkSDgoGa2V5dGFiGAQgASgMEhAKCGtkY19ob3N0GAUgASgJEhAKCGtkY19wb3J0GAYgASgJEh4KFmtkY190cmFuc3BvcnRfcHJvdG9jb2wYByABKAkqRwoORGF0YVNvdXJjZVR5cGUSGwoXREFUQV9TT1VSQ0VfVU5TUEVDSUZJRUQQABIJCgVBRE1JThABEg0KCVJFQURfT05MWRACMtQQCg9JbnN0YW5jZVNlcnZpY2UShAEKC0dldEluc3RhbmNlEh8uYnl0ZWJhc2UudjEuR2V0SW5zdGFuY2VSZXF1ZXN0GhUuYnl0ZWJhc2UudjEuSW5zdGFuY2UiPdpBBG5hbWWK6jAQYmIuaW5zdGFuY2VzLmdldJDqMAGC0+STAhgSFi92MS97bmFtZT1pbnN0YW5jZXMvKn0SiQEKDUxpc3RJbnN0YW5jZXMSIS5ieXRlYmFzZS52MS5MaXN0SW5zdGFuY2VzUmVxdWVzdBoiLmJ5dGViYXNlLnYxLkxpc3RJbnN0YW5jZXNSZXNwb25zZSIx2kEAiuowEWJiLmluc3RhbmNlcy5saXN0kOowAYLT5JMCDxINL3YxL2luc3RhbmNlcxKWAQoOQ3JlYXRlSW5zdGFuY2USIi5ieXRlYmFzZS52MS5DcmVhdGVJbnN0YW5jZVJlcXVlc3QaFS5ieXRlYmFzZS52MS5JbnN0YW5jZSJJ2kEIaW5zdGFuY2WK6jATYmIuaW5zdGFuY2VzLmNyZWF0ZZDqMAGY6jABgtPkkwIZOghpbnN0YW5jZSINL3YxL2luc3RhbmNlcxK0AQoOVXBkYXRlSW5zdGFuY2USIi5ieXRlYmFzZS52MS5VcGRhdGVJbnN0YW5jZVJlcXVlc3QaFS5ieXRlYmFzZS52MS5JbnN0YW5jZSJn2kEUaW5zdGFuY2UsdXBkYXRlX21hc2uK6jATYmIuaW5zdGFuY2VzLnVwZGF0ZZDqMAGY6jABgtPkkwIrOghpbnN0YW5jZTIfL3YxL3tpbnN0YW5jZS5uYW1lPWluc3RhbmNlcy8qfRKSAQoORGVsZXRlSW5zdGFuY2USIi5ieXRlYmFzZS52MS5EZWxldGVJbnN0YW5jZVJlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkiRNpBBG5hbWWK6jATYmIuaW5zdGFuY2VzLmRlbGV0ZZDqMAGY6jABgtPkkwIYKhYvdjEve25hbWU9aW5zdGFuY2VzLyp9EpwBChBVbmRlbGV0ZUluc3RhbmNlEiQuYnl0ZWJhc2UudjEuVW5kZWxldGVJbnN0YW5jZVJlcXVlc3QaFS5ieXRlYmFzZS52MS5JbnN0YW5jZSJLiuowFWJiLmluc3RhbmNlcy51bmRlbGV0ZZDqMAGY6jABgtPkkwIkOgEqIh8vdjEve25hbWU9aW5zdGFuY2VzLyp9OnVuZGVsZXRlEpQBCgxTeW5jSW5zdGFuY2USIC5ieXRlYmFzZS52MS5TeW5jSW5zdGFuY2VSZXF1ZXN0GiEuYnl0ZWJhc2UudjEuU3luY0luc3RhbmNlUmVzcG9uc2UiP4rqMBFiYi5pbnN0YW5jZXMuc3luY5DqMAGC0+STAiA6ASoiGy92MS97bmFtZT1pbnN0YW5jZXMvKn06c3luYxKwAQoUTGlzdEluc3RhbmNlRGF0YWJhc2USKC5ieXRlYmFzZS52MS5MaXN0SW5zdGFuY2VEYXRhYmFzZVJlcXVlc3QaKS5ieXRlYmFzZS52MS5MaXN0SW5zdGFuY2VEYXRhYmFzZVJlc3BvbnNlIkOK6jAQYmIuaW5zdGFuY2VzLmdldJDqMAGC0+STAiU6ASoiIC92MS97bmFtZT1pbnN0YW5jZXMvKn06ZGF0YWJhc2VzEqIBChJCYXRjaFN5bmNJbnN0YW5jZXMSJi5ieXRlYmFzZS52MS5CYXRjaFN5bmNJbnN0YW5jZXNSZXF1ZXN0GicuYnl0ZWJhc2UudjEuQmF0Y2hTeW5jSW5zdGFuY2VzUmVzcG9uc2UiO4rqMBFiYi5pbnN0YW5jZXMuc3luY5DqMAGC0+STAhw6ASoiFy92MS9pbnN0YW5jZXM6YmF0Y2hTeW5jErABChRCYXRjaFVwZGF0ZUluc3RhbmNlcxIoLmJ5dGViYXNlLnYxLkJhdGNoVXBkYXRlSW5zdGFuY2VzUmVxdWVzdBopLmJ5dGViYXNlLnYxLkJhdGNoVXBkYXRlSW5zdGFuY2VzUmVzcG9uc2UiQ4rqMBNiYi5pbnN0YW5jZXMudXBkYXRlkOowAZjqMAGC0+STAh46ASoiGS92MS9pbnN0YW5jZXM6YmF0Y2hVcGRhdGUSmQEKDUFkZERhdGFTb3VyY2USIS5ieXRlYmFzZS52MS5BZGREYXRhU291cmNlUmVxdWVzdBoVLmJ5dGViYXNlLnYxLkluc3RhbmNlIk6K6jATYmIuaW5zdGFuY2VzLnVwZGF0ZZDqMAGY6jABgtPkkwIpOgEqIiQvdjEve25hbWU9aW5zdGFuY2VzLyp9OmFkZERhdGFTb3VyY2USogEKEFJlbW92ZURhdGFTb3VyY2USJC5ieXRlYmFzZS52MS5SZW1vdmVEYXRhU291cmNlUmVxdWVzdBoVLmJ5dGViYXNlLnYxLkluc3RhbmNlIlGK6jATYmIuaW5zdGFuY2VzLnVwZGF0ZZDqMAGY6jABgtPkkwIsOgEqIicvdjEve25hbWU9aW5zdGFuY2VzLyp9OnJlbW92ZURhdGFTb3VyY2USxgEKEFVwZGF0ZURhdGFTb3VyY2USJC5ieXRlYmFzZS52MS5VcGRhdGVEYXRhU291cmNlUmVxdWVzdBoVLmJ5dGViYXNlLnYxLkluc3RhbmNlInXaQRdkYXRhX3NvdXJjZSx1cGRhdGVfbWFza4rqMBNiYi5pbnN0YW5jZXMudXBkYXRlkOowAZjqMAGC0+STAjY6C2RhdGFfc291cmNlMicvdjEve25hbWU9aW5zdGFuY2VzLyp9OnVwZGF0ZURhdGFTb3VyY2VCqgEKD2NvbS5ieXRlYmFzZS52MUIUSW5zdGFuY2VTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [file_buf_validate_validate, file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_duration, file_google_protobuf_empty, file_google_protobuf_field_mask, file_google_protobuf_timestamp, file_v1_annotation, file_v1_common, file_v1_instance_role_service]);+ fileDesc("Chl2MS9pbnN0YW5jZV9zZXJ2aWNlLnByb3RvEgtieXRlYmFzZS52MSJBChJHZXRJbnN0YW5jZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vSW5zdGFuY2UisQEKFExpc3RJbnN0YW5jZXNSZXF1ZXN0Ei8KBnBhcmVudBgGIAEoCUIa+kEXEhVieXRlYmFzZS5jb20vSW5zdGFuY2VIAIgBARIRCglwYWdlX3NpemUYASABKAUSEgoKcGFnZV90b2tlbhgCIAEoCRIUCgxzaG93X2RlbGV0ZWQYAyABKAgSDgoGZmlsdGVyGAQgASgJEhAKCG9yZGVyX2J5GAUgASgJQgkKB19wYXJlbnQiWgoVTGlzdEluc3RhbmNlc1Jlc3BvbnNlEigKCWluc3RhbmNlcxgBIAMoCzIVLmJ5dGViYXNlLnYxLkluc3RhbmNlEhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSLPAQoVQ3JlYXRlSW5zdGFuY2VSZXF1ZXN0Ei8KBnBhcmVudBgFIAEoCUIa+kEXEhVieXRlYmFzZS5jb20vSW5zdGFuY2VIAIgBARIsCghpbnN0YW5jZRgBIAEoCzIVLmJ5dGViYXNlLnYxLkluc3RhbmNlQgPgQQISEwoLaW5zdGFuY2VfaWQYAiABKAkSFQoNdmFsaWRhdGVfb25seRgDIAEoCBIgChhpbml0aWFsX2RhdGFiYXNlX3Byb2plY3QYBCABKAlCCQoHX3BhcmVudCKNAQoVVXBkYXRlSW5zdGFuY2VSZXF1ZXN0EiwKCGluc3RhbmNlGAEgASgLMhUuYnl0ZWJhc2UudjEuSW5zdGFuY2VCA+BBAhIvCgt1cGRhdGVfbWFzaxgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2sSFQoNYWxsb3dfbWlzc2luZxgDIAEoCCJiChVEZWxldGVJbnN0YW5jZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vSW5zdGFuY2USDQoFZm9yY2UYAiABKAgSDQoFcHVyZ2UYAyABKAgiRgoXVW5kZWxldGVJbnN0YW5jZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vSW5zdGFuY2UiXAoTU3luY0luc3RhbmNlUmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9JbnN0YW5jZRIYChBlbmFibGVfZnVsbF9zeW5jGAIgASgIIooBChtMaXN0SW5zdGFuY2VEYXRhYmFzZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vSW5zdGFuY2USMQoIaW5zdGFuY2UYAiABKAsyFS5ieXRlYmFzZS52MS5JbnN0YW5jZUID4EECSACIAQFCCwoJX2luc3RhbmNlIjEKHExpc3RJbnN0YW5jZURhdGFiYXNlUmVzcG9uc2USEQoJZGF0YWJhc2VzGAEgAygJIikKFFN5bmNJbnN0YW5jZVJlc3BvbnNlEhEKCWRhdGFiYXNlcxgBIAMoCSKQAQoZQmF0Y2hTeW5jSW5zdGFuY2VzUmVxdWVzdBIvCgZwYXJlbnQYAiABKAlCGvpBFxIVYnl0ZWJhc2UuY29tL0luc3RhbmNlSACIAQESNwoIcmVxdWVzdHMYASADKAsyIC5ieXRlYmFzZS52MS5TeW5jSW5zdGFuY2VSZXF1ZXN0QgPgQQJCCQoHX3BhcmVudCIcChpCYXRjaFN5bmNJbnN0YW5jZXNSZXNwb25zZSKUAQobQmF0Y2hVcGRhdGVJbnN0YW5jZXNSZXF1ZXN0Ei8KBnBhcmVudBgCIAEoCUIa+kEXEhVieXRlYmFzZS5jb20vSW5zdGFuY2VIAIgBARI5CghyZXF1ZXN0cxgBIAMoCzIiLmJ5dGViYXNlLnYxLlVwZGF0ZUluc3RhbmNlUmVxdWVzdEID4EECQgkKB19wYXJlbnQiSAocQmF0Y2hVcGRhdGVJbnN0YW5jZXNSZXNwb25zZRIoCglpbnN0YW5jZXMYASADKAsyFS5ieXRlYmFzZS52MS5JbnN0YW5jZSKNAQoUQWRkRGF0YVNvdXJjZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vSW5zdGFuY2USMQoLZGF0YV9zb3VyY2UYAiABKAsyFy5ieXRlYmFzZS52MS5EYXRhU291cmNlQgPgQQISFQoNdmFsaWRhdGVfb25seRgDIAEoCCJ5ChdSZW1vdmVEYXRhU291cmNlUmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9JbnN0YW5jZRIxCgtkYXRhX3NvdXJjZRgCIAEoCzIXLmJ5dGViYXNlLnYxLkRhdGFTb3VyY2VCA+BBAiLYAQoXVXBkYXRlRGF0YVNvdXJjZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vSW5zdGFuY2USMQoLZGF0YV9zb3VyY2UYAiABKAsyFy5ieXRlYmFzZS52MS5EYXRhU291cmNlQgPgQQISLwoLdXBkYXRlX21hc2sYAyABKAsyGi5nb29nbGUucHJvdG9idWYuRmllbGRNYXNrEhUKDXZhbGlkYXRlX29ubHkYBCABKAgSFQoNYWxsb3dfbWlzc2luZxgFIAEoCCIiCg1TeW5jRGF0YWJhc2VzEhEKCWRhdGFiYXNlcxgBIAMoCSKqBQoISW5zdGFuY2USDAoEbmFtZRgBIAEoCRIhCgVzdGF0ZRgDIAEoDjISLmJ5dGViYXNlLnYxLlN0YXRlEhcKBXRpdGxlGAQgASgJQgi6SAVyAxjIARIjCgZlbmdpbmUYBSABKA4yEy5ieXRlYmFzZS52MS5FbmdpbmUSGwoOZW5naW5lX3ZlcnNpb24YBiABKAlCA+BBAxIVCg1leHRlcm5hbF9saW5rGAcgASgJEi0KDGRhdGFfc291cmNlcxgIIAMoCzIXLmJ5dGViYXNlLnYxLkRhdGFTb3VyY2USHQoLZW52aXJvbm1lbnQYCSABKAlCA+BBAUgAiAEBEhIKCmFjdGl2YXRpb24YCiABKAgSLQoFcm9sZXMYCyADKAsyGS5ieXRlYmFzZS52MS5JbnN0YW5jZVJvbGVCA+BBAxIwCg1zeW5jX2ludGVydmFsGAwgASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uEjIKDnN5bmNfZGF0YWJhc2VzGA4gASgLMhouYnl0ZWJhc2UudjEuU3luY0RhdGFiYXNlcxI3Cg5sYXN0X3N5bmNfdGltZRgPIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxIxCgZsYWJlbHMYECADKAsyIS5ieXRlYmFzZS52MS5JbnN0YW5jZS5MYWJlbHNFbnRyeRotCgtMYWJlbHNFbnRyeRILCgNrZXkYASABKAkSDQoFdmFsdWUYAiABKAk6AjgBOlnqQVYKFWJ5dGViYXNlLmNvbS9JbnN0YW5jZRIUaW5zdGFuY2VzL3tpbnN0YW5jZX0SJ3Byb2plY3RzL3twcm9qZWN0fS9pbnN0YW5jZXMve2luc3RhbmNlfUIOCgxfZW52aXJvbm1lbnQirwgKGERhdGFTb3VyY2VFeHRlcm5hbFNlY3JldBJFCgtzZWNyZXRfdHlwZRgBIAEoDjIwLmJ5dGViYXNlLnYxLkRhdGFTb3VyY2VFeHRlcm5hbFNlY3JldC5TZWNyZXRUeXBlEgsKA3VybBgCIAEoCRJBCglhdXRoX3R5cGUYAyABKA4yLi5ieXRlYmFzZS52MS5EYXRhU291cmNlRXh0ZXJuYWxTZWNyZXQuQXV0aFR5cGUSSwoIYXBwX3JvbGUYBCABKAsyNy5ieXRlYmFzZS52MS5EYXRhU291cmNlRXh0ZXJuYWxTZWNyZXQuQXBwUm9sZUF1dGhPcHRpb25IABIUCgV0b2tlbhgFIAEoCUID4EEESAASQwoKdG9rZW5fdHlwZRgNIAEoDjIvLmJ5dGViYXNlLnYxLkRhdGFTb3VyY2VFeHRlcm5hbFNlY3JldC5Ub2tlblR5cGUSEwoLZW5naW5lX25hbWUYBiABKAkSEwoLc2VjcmV0X25hbWUYByABKAkSGQoRcGFzc3dvcmRfa2V5X25hbWUYCCABKAkSIwobc2tpcF92YXVsdF90bHNfdmVyaWZpY2F0aW9uGAkgASgIEhkKDHZhdWx0X3NzbF9jYRgKIAEoCUID4EEEEhsKDnZhdWx0X3NzbF9jZXJ0GAsgASgJQgPgQQQSGgoNdmF1bHRfc3NsX2tleRgMIAEoCUID4EEEGu4BChFBcHBSb2xlQXV0aE9wdGlvbhIUCgdyb2xlX2lkGAEgASgJQgPgQQQSFgoJc2VjcmV0X2lkGAIgASgJQgPgQQQSUAoEdHlwZRgDIAEoDjJCLmJ5dGViYXNlLnYxLkRhdGFTb3VyY2VFeHRlcm5hbFNlY3JldC5BcHBSb2xlQXV0aE9wdGlvbi5TZWNyZXRUeXBlEhIKCm1vdW50X3BhdGgYBCABKAkiRQoKU2VjcmV0VHlwZRIbChdTRUNSRVRfVFlQRV9VTlNQRUNJRklFRBAAEgkKBVBMQUlOEAESDwoLRU5WSVJPTk1FTlQQAiKAAQoKU2VjcmV0VHlwZRIbChdTRUNSRVRfVFlQRV9VTlNQRUNJRklFRBAAEg8KC1ZBVUxUX0tWX1YyEAESFwoTQVdTX1NFQ1JFVFNfTUFOQUdFUhACEhYKEkdDUF9TRUNSRVRfTUFOQUdFUhADEhMKD0FaVVJFX0tFWV9WQVVMVBAEIkQKCEF1dGhUeXBlEhkKFUFVVEhfVFlQRV9VTlNQRUNJRklFRBAAEgkKBVRPS0VOEAESEgoOVkFVTFRfQVBQX1JPTEUQAiJNCglUb2tlblR5cGUSGgoWVE9LRU5fVFlQRV9VTlNQRUNJRklFRBAAEgkKBVBMQUlOEAESDwoLRU5WSVJPTk1FTlQQAhIICgRGSUxFEANCDQoLYXV0aF9vcHRpb24i0BIKCkRhdGFTb3VyY2USCgoCaWQYASABKAkSKQoEdHlwZRgCIAEoDjIbLmJ5dGViYXNlLnYxLkRhdGFTb3VyY2VUeXBlEhAKCHVzZXJuYW1lGAMgASgJEhUKCHBhc3N3b3JkGAQgASgJQgPgQQQSDwoHdXNlX3NzbBgeIAEoCBITCgZzc2xfY2EYBSABKAlCA+BBBBIVCghzc2xfY2VydBgGIAEoCUID4EEEEhQKB3NzbF9rZXkYByABKAlCA+BBBBIYCgtzc2xfY2FfcGF0aBgpIAEoCUID4EEEEhoKDXNzbF9jZXJ0X3BhdGgYKiABKAlCA+BBBBIZCgxzc2xfa2V5X3BhdGgYKyABKAlCA+BBBBIXCgpzc2xfY2Ffc2V0GCwgASgIQgPgQQMSGQoMc3NsX2NlcnRfc2V0GC0gASgIQgPgQQMSGAoLc3NsX2tleV9zZXQYLiABKAhCA+BBAxIcCg9zc2xfY2FfcGF0aF9zZXQYLyABKAhCA+BBAxIeChFzc2xfY2VydF9wYXRoX3NldBgwIAEoCEID4EEDEh0KEHNzbF9rZXlfcGF0aF9zZXQYMSABKAhCA+BBAxIeChZ2ZXJpZnlfdGxzX2NlcnRpZmljYXRlGCcgASgIEgwKBGhvc3QYCCABKAkSDAoEcG9ydBgJIAEoCRIQCghkYXRhYmFzZRgKIAEoCRILCgNzcnYYCyABKAgSHwoXYXV0aGVudGljYXRpb25fZGF0YWJhc2UYDCABKAkSEwoLcmVwbGljYV9zZXQYGSABKAkSCwoDc2lkGA0gASgJEhQKDHNlcnZpY2VfbmFtZRgOIAEoCRIQCghzc2hfaG9zdBgPIAEoCRIQCghzc2hfcG9ydBgQIAEoCRIQCghzc2hfdXNlchgRIAEoCRIZCgxzc2hfcGFzc3dvcmQYEiABKAlCA+BBBBIcCg9zc2hfcHJpdmF0ZV9rZXkYEyABKAlCA+BBBBInChphdXRoZW50aWNhdGlvbl9wcml2YXRlX2tleRgUIAEoCUID4EEEEjIKJWF1dGhlbnRpY2F0aW9uX3ByaXZhdGVfa2V5X3Bhc3NwaHJhc2UYKCABKAlCA+BBBBI+Cg9leHRlcm5hbF9zZWNyZXQYFSABKAsyJS5ieXRlYmFzZS52MS5EYXRhU291cmNlRXh0ZXJuYWxTZWNyZXQSRwoTYXV0aGVudGljYXRpb25fdHlwZRgWIAEoDjIqLmJ5dGViYXNlLnYxLkRhdGFTb3VyY2UuQXV0aGVudGljYXRpb25UeXBlEkEKEWNsb3VkX3NxbF9pcF90eXBlGDggASgOMiYuYnl0ZWJhc2UudjEuRGF0YVNvdXJjZS5DbG91ZFNRTElQVHlwZRJDChBhenVyZV9jcmVkZW50aWFsGBcgASgLMicuYnl0ZWJhc2UudjEuRGF0YVNvdXJjZS5BenVyZUNyZWRlbnRpYWxIABI/Cg5hd3NfY3JlZGVudGlhbBglIAEoCzIlLmJ5dGViYXNlLnYxLkRhdGFTb3VyY2UuQVdTQ3JlZGVudGlhbEgAEj8KDmdjcF9jcmVkZW50aWFsGCYgASgLMiUuYnl0ZWJhc2UudjEuRGF0YVNvdXJjZS5HQ1BDcmVkZW50aWFsSAASLAoLc2FzbF9jb25maWcYGCABKAsyFy5ieXRlYmFzZS52MS5TQVNMQ29uZmlnEkIKFGFkZGl0aW9uYWxfYWRkcmVzc2VzGBogAygLMh8uYnl0ZWJhc2UudjEuRGF0YVNvdXJjZS5BZGRyZXNzQgPgQQESGQoRZGlyZWN0X2Nvbm5lY3Rpb24YGyABKAgSDgoGcmVnaW9uGBwgASgJEhQKDHdhcmVob3VzZV9pZBgdIAEoCRITCgttYXN0ZXJfbmFtZRgfIAEoCRIXCg9tYXN0ZXJfdXNlcm5hbWUYICABKAkSFwoPbWFzdGVyX3Bhc3N3b3JkGCEgASgJEjUKCnJlZGlzX3R5cGUYIiABKA4yIS5ieXRlYmFzZS52MS5EYXRhU291cmNlLlJlZGlzVHlwZRIPCgdjbHVzdGVyGCMgASgJElsKG2V4dHJhX2Nvbm5lY3Rpb25fcGFyYW1ldGVycxgkIAMoCzI2LmJ5dGViYXNlLnYxLkRhdGFTb3VyY2UuRXh0cmFDb25uZWN0aW9uUGFyYW1ldGVyc0VudHJ5EhIKCnByb2plY3RfaWQYOSABKAkSEwoLaW5zdGFuY2VfaWQYOiABKAkaUwoPQXp1cmVDcmVkZW50aWFsEhEKCXRlbmFudF9pZBgBIAEoCRIRCgljbGllbnRfaWQYAiABKAkSGgoNY2xpZW50X3NlY3JldBgDIAEoCUID4EEEGpgBCg1BV1NDcmVkZW50aWFsEhoKDWFjY2Vzc19rZXlfaWQYASABKAlCA+BBBBIeChFzZWNyZXRfYWNjZXNzX2tleRgCIAEoCUID4EEEEhoKDXNlc3Npb25fdG9rZW4YAyABKAlCA+BBBBIVCghyb2xlX2FybhgEIAEoCUID4EEEEhgKC2V4dGVybmFsX2lkGAUgASgJQgPgQQQaJQoNR0NQQ3JlZGVudGlhbBIUCgdjb250ZW50GAEgASgJQgPgQQQaJQoHQWRkcmVzcxIMCgRob3N0GAEgASgJEgwKBHBvcnQYAiABKAkaQAoeRXh0cmFDb25uZWN0aW9uUGFyYW1ldGVyc0VudHJ5EgsKA2tleRgBIAEoCRINCgV2YWx1ZRgCIAEoCToCOAEifAoSQXV0aGVudGljYXRpb25UeXBlEh4KGkFVVEhFTlRJQ0FUSU9OX1VOU1BFQ0lGSUVEEAASDAoIUEFTU1dPUkQQARIYChRHT09HTEVfQ0xPVURfU1FMX0lBTRACEg8KC0FXU19SRFNfSUFNEAMSDQoJQVpVUkVfSUFNEAQiVQoOQ2xvdWRTUUxJUFR5cGUSIQodQ0xPVURfU1FMX0lQX1RZUEVfVU5TUEVDSUZJRUQQABIKCgZQVUJMSUMQARILCgdQUklWQVRFEAISBwoDUFNDEAMiUgoJUmVkaXNUeXBlEhoKFlJFRElTX1RZUEVfVU5TUEVDSUZJRUQQABIOCgpTVEFOREFMT05FEAESDAoIU0VOVElORUwQAhILCgdDTFVTVEVSEANCDwoNaWFtX2V4dGVuc2lvbiLeAQoQSW5zdGFuY2VSZXNvdXJjZRINCgV0aXRsZRgBIAEoCRIjCgZlbmdpbmUYAiABKA4yEy5ieXRlYmFzZS52MS5FbmdpbmUSGwoOZW5naW5lX3ZlcnNpb24YAyABKAlCA+BBAxItCgxkYXRhX3NvdXJjZXMYBCADKAsyFy5ieXRlYmFzZS52MS5EYXRhU291cmNlEhIKCmFjdGl2YXRpb24YBSABKAgSDAoEbmFtZRgGIAEoCRIYCgtlbnZpcm9ubWVudBgHIAEoCUgAiAEBQg4KDF9lbnZpcm9ubWVudCJMCgpTQVNMQ29uZmlnEjEKCmtyYl9jb25maWcYASABKAsyGy5ieXRlYmFzZS52MS5LZXJiZXJvc0NvbmZpZ0gAQgsKCW1lY2hhbmlzbSKWAQoOS2VyYmVyb3NDb25maWcSDwoHcHJpbWFyeRgBIAEoCRIQCghpbnN0YW5jZRgCIAEoCRINCgVyZWFsbRgDIAEoCRIOCgZrZXl0YWIYBCABKAwSEAoIa2RjX2hvc3QYBSABKAkSEAoIa2RjX3BvcnQYBiABKAkSHgoWa2RjX3RyYW5zcG9ydF9wcm90b2NvbBgHIAEoCSpHCg5EYXRhU291cmNlVHlwZRIbChdEQVRBX1NPVVJDRV9VTlNQRUNJRklFRBAAEgkKBUFETUlOEAESDQoJUkVBRF9PTkxZEAIy1hUKD0luc3RhbmNlU2VydmljZRKpAQoLR2V0SW5zdGFuY2USHy5ieXRlYmFzZS52MS5HZXRJbnN0YW5jZVJlcXVlc3QaFS5ieXRlYmFzZS52MS5JbnN0YW5jZSJi2kEEbmFtZYrqMBBiYi5pbnN0YW5jZXMuZ2V0kOowAYLT5JMCPVojEiEvdjEve25hbWU9cHJvamVjdHMvKi9pbnN0YW5jZXMvKn0SFi92MS97bmFtZT1pbnN0YW5jZXMvKn0SrgEKDUxpc3RJbnN0YW5jZXMSIS5ieXRlYmFzZS52MS5MaXN0SW5zdGFuY2VzUmVxdWVzdBoiLmJ5dGViYXNlLnYxLkxpc3RJbnN0YW5jZXNSZXNwb25zZSJW2kEAiuowEWJiLmluc3RhbmNlcy5saXN0kOowAYLT5JMCNFojEiEvdjEve3BhcmVudD1wcm9qZWN0cy8qfS9pbnN0YW5jZXMSDS92MS9pbnN0YW5jZXMSxQEKDkNyZWF0ZUluc3RhbmNlEiIuYnl0ZWJhc2UudjEuQ3JlYXRlSW5zdGFuY2VSZXF1ZXN0GhUuYnl0ZWJhc2UudjEuSW5zdGFuY2UieNpBCGluc3RhbmNliuowE2JiLmluc3RhbmNlcy5jcmVhdGWQ6jABmOowAYLT5JMCSDoIaW5zdGFuY2VaLToIaW5zdGFuY2UiIS92MS97cGFyZW50PXByb2plY3RzLyp9L2luc3RhbmNlcyINL3YxL2luc3RhbmNlcxLtAQoOVXBkYXRlSW5zdGFuY2USIi5ieXRlYmFzZS52MS5VcGRhdGVJbnN0YW5jZVJlcXVlc3QaFS5ieXRlYmFzZS52MS5JbnN0YW5jZSKfAdpBFGluc3RhbmNlLHVwZGF0ZV9tYXNriuowE2JiLmluc3RhbmNlcy51cGRhdGWQ6jABmOowAYLT5JMCYzoIaW5zdGFuY2VaNjoIaW5zdGFuY2UyKi92MS97aW5zdGFuY2UubmFtZT1wcm9qZWN0cy8qL2luc3RhbmNlcy8qfTIfL3YxL3tpbnN0YW5jZS5uYW1lPWluc3RhbmNlcy8qfRK3AQoORGVsZXRlSW5zdGFuY2USIi5ieXRlYmFzZS52MS5EZWxldGVJbnN0YW5jZVJlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkiadpBBG5hbWWK6jATYmIuaW5zdGFuY2VzLmRlbGV0ZZDqMAGY6jABgtPkkwI9WiMqIS92MS97bmFtZT1wcm9qZWN0cy8qL2luc3RhbmNlcy8qfSoWL3YxL3tuYW1lPWluc3RhbmNlcy8qfRLNAQoQVW5kZWxldGVJbnN0YW5jZRIkLmJ5dGViYXNlLnYxLlVuZGVsZXRlSW5zdGFuY2VSZXF1ZXN0GhUuYnl0ZWJhc2UudjEuSW5zdGFuY2UifIrqMBViYi5pbnN0YW5jZXMudW5kZWxldGWQ6jABmOowAYLT5JMCVToBKlovOgEqIiovdjEve25hbWU9cHJvamVjdHMvKi9pbnN0YW5jZXMvKn06dW5kZWxldGUiHy92MS97bmFtZT1pbnN0YW5jZXMvKn06dW5kZWxldGUSwQEKDFN5bmNJbnN0YW5jZRIgLmJ5dGViYXNlLnYxLlN5bmNJbnN0YW5jZVJlcXVlc3QaIS5ieXRlYmFzZS52MS5TeW5jSW5zdGFuY2VSZXNwb25zZSJsiuowEWJiLmluc3RhbmNlcy5zeW5jkOowAYLT5JMCTToBKlorOgEqIiYvdjEve25hbWU9cHJvamVjdHMvKi9pbnN0YW5jZXMvKn06c3luYyIbL3YxL3tuYW1lPWluc3RhbmNlcy8qfTpzeW5jEuIBChRMaXN0SW5zdGFuY2VEYXRhYmFzZRIoLmJ5dGViYXNlLnYxLkxpc3RJbnN0YW5jZURhdGFiYXNlUmVxdWVzdBopLmJ5dGViYXNlLnYxLkxpc3RJbnN0YW5jZURhdGFiYXNlUmVzcG9uc2UidYrqMBBiYi5pbnN0YW5jZXMuZ2V0kOowAYLT5JMCVzoBKlowOgEqIisvdjEve25hbWU9cHJvamVjdHMvKi9pbnN0YW5jZXMvKn06ZGF0YWJhc2VzIiAvdjEve25hbWU9aW5zdGFuY2VzLyp9OmRhdGFiYXNlcxLUAQoSQmF0Y2hTeW5jSW5zdGFuY2VzEiYuYnl0ZWJhc2UudjEuQmF0Y2hTeW5jSW5zdGFuY2VzUmVxdWVzdBonLmJ5dGViYXNlLnYxLkJhdGNoU3luY0luc3RhbmNlc1Jlc3BvbnNlIm2K6jARYmIuaW5zdGFuY2VzLnN5bmOQ6jABgtPkkwJOOgEqWjA6ASoiKy92MS97cGFyZW50PXByb2plY3RzLyp9L2luc3RhbmNlczpiYXRjaFN5bmMiFy92MS9pbnN0YW5jZXM6YmF0Y2hTeW5jEuQBChRCYXRjaFVwZGF0ZUluc3RhbmNlcxIoLmJ5dGViYXNlLnYxLkJhdGNoVXBkYXRlSW5zdGFuY2VzUmVxdWVzdBopLmJ5dGViYXNlLnYxLkJhdGNoVXBkYXRlSW5zdGFuY2VzUmVzcG9uc2Uid4rqMBNiYi5pbnN0YW5jZXMudXBkYXRlkOowAZjqMAGC0+STAlI6ASpaMjoBKiItL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vaW5zdGFuY2VzOmJhdGNoVXBkYXRlIhkvdjEvaW5zdGFuY2VzOmJhdGNoVXBkYXRlEtABCg1BZGREYXRhU291cmNlEiEuYnl0ZWJhc2UudjEuQWRkRGF0YVNvdXJjZVJlcXVlc3QaFS5ieXRlYmFzZS52MS5JbnN0YW5jZSKEAYrqMBNiYi5pbnN0YW5jZXMudXBkYXRlkOowAZjqMAGC0+STAl86ASpaNDoBKiIvL3YxL3tuYW1lPXByb2plY3RzLyovaW5zdGFuY2VzLyp9OmFkZERhdGFTb3VyY2UiJC92MS97bmFtZT1pbnN0YW5jZXMvKn06YWRkRGF0YVNvdXJjZRLcAQoQUmVtb3ZlRGF0YVNvdXJjZRIkLmJ5dGViYXNlLnYxLlJlbW92ZURhdGFTb3VyY2VSZXF1ZXN0GhUuYnl0ZWJhc2UudjEuSW5zdGFuY2UiigGK6jATYmIuaW5zdGFuY2VzLnVwZGF0ZZDqMAGY6jABgtPkkwJlOgEqWjc6ASoiMi92MS97bmFtZT1wcm9qZWN0cy8qL2luc3RhbmNlcy8qfTpyZW1vdmVEYXRhU291cmNlIicvdjEve25hbWU9aW5zdGFuY2VzLyp9OnJlbW92ZURhdGFTb3VyY2USigIKEFVwZGF0ZURhdGFTb3VyY2USJC5ieXRlYmFzZS52MS5VcGRhdGVEYXRhU291cmNlUmVxdWVzdBoVLmJ5dGViYXNlLnYxLkluc3RhbmNlIrgB2kEXZGF0YV9zb3VyY2UsdXBkYXRlX21hc2uK6jATYmIuaW5zdGFuY2VzLnVwZGF0ZZDqMAGY6jABgtPkkwJ5OgtkYXRhX3NvdXJjZVpBOgtkYXRhX3NvdXJjZTIyL3YxL3tuYW1lPXByb2plY3RzLyovaW5zdGFuY2VzLyp9OnVwZGF0ZURhdGFTb3VyY2UyJy92MS97bmFtZT1pbnN0YW5jZXMvKn06dXBkYXRlRGF0YVNvdXJjZUKqAQoPY29tLmJ5dGViYXNlLnYxQhRJbnN0YW5jZVNlcnZpY2VQcm90b1ABWjRnaXRodWIuY29tL2J5dGViYXNlL2J5dGViYXNlL2JhY2tlbmQvZ2VuZXJhdGVkLWdvL3YxogIDQlhYqgILQnl0ZWJhc2UuVjHKAgtCeXRlYmFzZVxWMeICF0J5dGViYXNlXFYxXEdQQk1ldGFkYXRh6gIMQnl0ZWJhc2U6OlYxYgZwcm90bzM", [file_buf_validate_validate, file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_duration, file_google_protobuf_empty, file_google_protobuf_field_mask, file_google_protobuf_timestamp, file_v1_annotation, file_v1_common, file_v1_instance_role_service]);/*** Describes the message bytebase.v1.GetInstanceRequest.diff --git a/frontend/src/types/proto-es/v1/org_policy_service_pb.d.ts b/frontend/src/types/proto-es/v1/org_policy_service_pb.d.tsindex ab8b7f4205..376ec985fe 100644--- a/frontend/src/types/proto-es/v1/org_policy_service_pb.d.ts+++ b/frontend/src/types/proto-es/v1/org_policy_service_pb.d.ts@@ -20,8 +20,6 @@ export declare type CreatePolicyRequest = Message<"bytebase.v1.CreatePolicyReque* The parent resource where this instance will be created.* Workspace resource name: workspaces/{workspace-id}.* Environment resource name: environments/environment-id.- * Instance resource name: instances/instance-id.- * Database resource name: instances/instance-id/databases/database-name.** @generated from field: string parent = 1;*/@@ -59,8 +57,6 @@ export declare type UpdatePolicyRequest = Message<"bytebase.v1.UpdatePolicyReque* Format: {resource name}/policies/{policy type}* Workspace resource name: workspaces/{workspace-id}.* Environment resource name: environments/environment-id.- * Instance resource name: instances/instance-id.- * Database resource name: instances/instance-id/databases/database-name.** @generated from field: bytebase.v1.Policy policy = 1;*/@@ -97,8 +93,6 @@ export declare type DeletePolicyRequest = Message<"bytebase.v1.DeletePolicyReque* Format: {resource name}/policies/{policy type}* Workspace resource name: workspaces/{workspace-id}.* Environment resource name: environments/environment-id.- * Instance resource name: instances/instance-id.- * Database resource name: instances/instance-id/databases/database-name.** @generated from field: string name = 1;*/@@ -190,8 +184,6 @@ export declare type Policy = Message<"bytebase.v1.Policy"> & {* Format: {resource name}/policies/{policy type}* Workspace resource name: workspaces/{workspace-id}.* Environment resource name: environments/environment-id.- * Instance resource name: instances/instance-id.- * Database resource name: instances/instance-id/databases/database-name.** @generated from field: string name = 1;*/diff --git a/frontend/src/types/proto-es/v1/org_policy_service_pb.js b/frontend/src/types/proto-es/v1/org_policy_service_pb.jsindex 96b252b338..6b57d0af83 100644--- a/frontend/src/types/proto-es/v1/org_policy_service_pb.js+++ b/frontend/src/types/proto-es/v1/org_policy_service_pb.js@@ -15,7 +15,7 @@ import { file_v1_annotation } from "./annotation_pb";* Describes the file v1/org_policy_service.proto.*/export const file_v1_org_policy_service = /*@__PURE__*/- fileDesc("Cht2MS9vcmdfcG9saWN5X3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIpMBChNDcmVhdGVQb2xpY3lSZXF1ZXN0EisKBnBhcmVudBgBIAEoCUIb4EEC+kEVEhNieXRlYmFzZS5jb20vUG9saWN5EigKBnBvbGljeRgCIAEoCzITLmJ5dGViYXNlLnYxLlBvbGljeUID4EECEiUKBHR5cGUYAyABKA4yFy5ieXRlYmFzZS52MS5Qb2xpY3lUeXBlIocBChNVcGRhdGVQb2xpY3lSZXF1ZXN0EigKBnBvbGljeRgBIAEoCzITLmJ5dGViYXNlLnYxLlBvbGljeUID4EECEi8KC3VwZGF0ZV9tYXNrGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFzaxIVCg1hbGxvd19taXNzaW5nGAMgASgIIkAKE0RlbGV0ZVBvbGljeVJlcXVlc3QSKQoEbmFtZRgBIAEoCUIb4EEC+kEVChNieXRlYmFzZS5jb20vUG9saWN5Ij0KEEdldFBvbGljeVJlcXVlc3QSKQoEbmFtZRgBIAEoCUIb4EEC+kEVChNieXRlYmFzZS5jb20vUG9saWN5IpsBChNMaXN0UG9saWNpZXNSZXF1ZXN0EisKBnBhcmVudBgBIAEoCUIb4EEC+kEVEhNieXRlYmFzZS5jb20vUG9saWN5EjEKC3BvbGljeV90eXBlGAIgASgOMhcuYnl0ZWJhc2UudjEuUG9saWN5VHlwZUgAiAEBEhQKDHNob3dfZGVsZXRlZBgDIAEoCEIOCgxfcG9saWN5X3R5cGUiPQoUTGlzdFBvbGljaWVzUmVzcG9uc2USJQoIcG9saWNpZXMYASADKAsyEy5ieXRlYmFzZS52MS5Qb2xpY3ki2AUKBlBvbGljeRIMCgRuYW1lGAEgASgJEhsKE2luaGVyaXRfZnJvbV9wYXJlbnQYAiABKAgSJQoEdHlwZRgDIAEoDjIXLmJ5dGViYXNlLnYxLlBvbGljeVR5cGUSNAoOcm9sbG91dF9wb2xpY3kYBCABKAsyGi5ieXRlYmFzZS52MS5Sb2xsb3V0UG9saWN5SAASPQoTbWFza2luZ19ydWxlX3BvbGljeRgFIAEoCzIeLmJ5dGViYXNlLnYxLk1hc2tpbmdSdWxlUG9saWN5SAASRwoYbWFza2luZ19leGVtcHRpb25fcG9saWN5GAYgASgLMiMuYnl0ZWJhc2UudjEuTWFza2luZ0V4ZW1wdGlvblBvbGljeUgAEiwKCnRhZ19wb2xpY3kYByABKAsyFi5ieXRlYmFzZS52MS5UYWdQb2xpY3lIABI5ChFxdWVyeV9kYXRhX3BvbGljeRgJIAEoCzIcLmJ5dGViYXNlLnYxLlF1ZXJ5RGF0YVBvbGljeUgAEg8KB2VuZm9yY2UYCiABKAgSOwoNcmVzb3VyY2VfdHlwZRgLIAEoDjIfLmJ5dGViYXNlLnYxLlBvbGljeVJlc291cmNlVHlwZUID4EEDOvwB6kH4AQoTYnl0ZWJhc2UuY29tL1BvbGljeRIod29ya3NwYWNlcy97d29ya3NwYWNlfS9wb2xpY2llcy97cG9saWN5fRIkcHJvamVjdHMve3Byb2plY3R9L3BvbGljaWVzL3twb2xpY3l9EixlbnZpcm9ubWVudHMve2Vudmlyb25tZW50fS9wb2xpY2llcy97cG9saWN5fRImaW5zdGFuY2VzL3tpbnN0YW5jZX0vcG9saWNpZXMve3BvbGljeX0SO2luc3RhbmNlcy97aW5zdGFuY2V9L2RhdGFiYXNlcy97ZGF0YWJhc2V9L3BvbGljaWVzL3twb2xpY3l9QggKBnBvbGljeSIxCg1Sb2xsb3V0UG9saWN5EhEKCWF1dG9tYXRpYxgBIAEoCBINCgVyb2xlcxgCIAMoCSKCAQoPUXVlcnlEYXRhUG9saWN5EhsKE21heGltdW1fcmVzdWx0X3Jvd3MYASABKAUSFgoOZGlzYWJsZV9leHBvcnQYAiABKAgSGQoRZGlzYWJsZV9jb3B5X2RhdGEYAyABKAgSHwoXYWxsb3dfYWRtaW5fZGF0YV9zb3VyY2UYBCABKAginwEKFk1hc2tpbmdFeGVtcHRpb25Qb2xpY3kSQQoKZXhlbXB0aW9ucxgBIAMoCzItLmJ5dGViYXNlLnYxLk1hc2tpbmdFeGVtcHRpb25Qb2xpY3kuRXhlbXB0aW9uGkIKCUV4ZW1wdGlvbhIPCgdtZW1iZXJzGAEgAygJEiQKCWNvbmRpdGlvbhgCIAEoCzIRLmdvb2dsZS50eXBlLkV4cHIipgEKEU1hc2tpbmdSdWxlUG9saWN5EjkKBXJ1bGVzGAEgAygLMiouYnl0ZWJhc2UudjEuTWFza2luZ1J1bGVQb2xpY3kuTWFza2luZ1J1bGUaVgoLTWFza2luZ1J1bGUSCgoCaWQYASABKAkSJAoJY29uZGl0aW9uGAIgASgLMhEuZ29vZ2xlLnR5cGUuRXhwchIVCg1zZW1hbnRpY190eXBlGAMgASgJImgKCVRhZ1BvbGljeRIuCgR0YWdzGAEgAygLMiAuYnl0ZWJhc2UudjEuVGFnUG9saWN5LlRhZ3NFbnRyeRorCglUYWdzRW50cnkSCwoDa2V5GAEgASgJEg0KBXZhbHVlGAIgASgJOgI4ASp/CgpQb2xpY3lUeXBlEhsKF1BPTElDWV9UWVBFX1VOU1BFQ0lGSUVEEAASEAoMTUFTS0lOR19SVUxFEAESFQoRTUFTS0lOR19FWEVNUFRJT04QAhISCg5ST0xMT1VUX1BPTElDWRADEgcKA1RBRxAEEg4KCkRBVEFfUVVFUlkQBipgChJQb2xpY3lSZXNvdXJjZVR5cGUSHQoZUkVTT1VSQ0VfVFlQRV9VTlNQRUNJRklFRBAAEg0KCVdPUktTUEFDRRABEg8KC0VOVklST05NRU5UEAISCwoHUFJPSkVDVBADMscNChBPcmdQb2xpY3lTZXJ2aWNlEq0CCglHZXRQb2xpY3kSHS5ieXRlYmFzZS52MS5HZXRQb2xpY3lSZXF1ZXN0GhMuYnl0ZWJhc2UudjEuUG9saWN5IusB2kEEbmFtZYrqMA9iYi5wb2xpY2llcy5nZXSQ6jACgtPkkwLGAVoiEiAvdjEve25hbWU9cHJvamVjdHMvKi9wb2xpY2llcy8qfVomEiQvdjEve25hbWU9ZW52aXJvbm1lbnRzLyovcG9saWNpZXMvKn1aIxIhL3YxL3tuYW1lPWluc3RhbmNlcy8qL3BvbGljaWVzLyp9Wi8SLS92MS97bmFtZT1pbnN0YW5jZXMvKi9kYXRhYmFzZXMvKi9wb2xpY2llcy8qfRIiL3YxL3tuYW1lPXdvcmtzcGFjZXMvKi9wb2xpY2llcy8qfRK+AgoMTGlzdFBvbGljaWVzEiAuYnl0ZWJhc2UudjEuTGlzdFBvbGljaWVzUmVxdWVzdBohLmJ5dGViYXNlLnYxLkxpc3RQb2xpY2llc1Jlc3BvbnNlIugB2kEAiuowEGJiLnBvbGljaWVzLmxpc3SQ6jABgtPkkwLGAVoiEiAvdjEve3BhcmVudD1wcm9qZWN0cy8qfS9wb2xpY2llc1omEiQvdjEve3BhcmVudD1lbnZpcm9ubWVudHMvKn0vcG9saWNpZXNaIxIhL3YxL3twYXJlbnQ9aW5zdGFuY2VzLyp9L3BvbGljaWVzWi8SLS92MS97cGFyZW50PWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qfS9wb2xpY2llcxIiL3YxL3twYXJlbnQ9d29ya3NwYWNlcy8qfS9wb2xpY2llcxLrAgoMQ3JlYXRlUG9saWN5EiAuYnl0ZWJhc2UudjEuQ3JlYXRlUG9saWN5UmVxdWVzdBoTLmJ5dGViYXNlLnYxLlBvbGljeSKjAtpBDXBhcmVudCxwb2xpY3mK6jASYmIucG9saWNpZXMuY3JlYXRlkOowApjqMAGC0+STAu4BOgZwb2xpY3laKjoGcG9saWN5IiAvdjEve3BhcmVudD1wcm9qZWN0cy8qfS9wb2xpY2llc1ouOgZwb2xpY3kiJC92MS97cGFyZW50PWVudmlyb25tZW50cy8qfS9wb2xpY2llc1orOgZwb2xpY3kiIS92MS97cGFyZW50PWluc3RhbmNlcy8qfS9wb2xpY2llc1o3OgZwb2xpY3kiLS92MS97cGFyZW50PWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qfS9wb2xpY2llcyIiL3YxL3twYXJlbnQ9d29ya3NwYWNlcy8qfS9wb2xpY2llcxKTAwoMVXBkYXRlUG9saWN5EiAuYnl0ZWJhc2UudjEuVXBkYXRlUG9saWN5UmVxdWVzdBoTLmJ5dGViYXNlLnYxLlBvbGljeSLLAtpBEnBvbGljeSx1cGRhdGVfbWFza4rqMBJiYi5wb2xpY2llcy51cGRhdGWQ6jACmOowAYLT5JMCkQI6BnBvbGljeVoxOgZwb2xpY3kyJy92MS97cG9saWN5Lm5hbWU9cHJvamVjdHMvKi9wb2xpY2llcy8qfVo1OgZwb2xpY3kyKy92MS97cG9saWN5Lm5hbWU9ZW52aXJvbm1lbnRzLyovcG9saWNpZXMvKn1aMjoGcG9saWN5MigvdjEve3BvbGljeS5uYW1lPWluc3RhbmNlcy8qL3BvbGljaWVzLyp9Wj46BnBvbGljeTI0L3YxL3twb2xpY3kubmFtZT1pbnN0YW5jZXMvKi9kYXRhYmFzZXMvKi9wb2xpY2llcy8qfTIpL3YxL3twb2xpY3kubmFtZT13b3Jrc3BhY2VzLyovcG9saWNpZXMvKn0SvQIKDERlbGV0ZVBvbGljeRIgLmJ5dGViYXNlLnYxLkRlbGV0ZVBvbGljeVJlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHki8gHaQQRuYW1liuowEmJiLnBvbGljaWVzLmRlbGV0ZZDqMAKY6jABgtPkkwLGAVoiKiAvdjEve25hbWU9cHJvamVjdHMvKi9wb2xpY2llcy8qfVomKiQvdjEve25hbWU9ZW52aXJvbm1lbnRzLyovcG9saWNpZXMvKn1aIyohL3YxL3tuYW1lPWluc3RhbmNlcy8qL3BvbGljaWVzLyp9Wi8qLS92MS97bmFtZT1pbnN0YW5jZXMvKi9kYXRhYmFzZXMvKi9wb2xpY2llcy8qfSoiL3YxL3tuYW1lPXdvcmtzcGFjZXMvKi9wb2xpY2llcy8qfUKrAQoPY29tLmJ5dGViYXNlLnYxQhVPcmdQb2xpY3lTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_empty, file_google_protobuf_field_mask, file_google_type_expr, file_v1_annotation]);+ fileDesc("Cht2MS9vcmdfcG9saWN5X3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIpMBChNDcmVhdGVQb2xpY3lSZXF1ZXN0EisKBnBhcmVudBgBIAEoCUIb4EEC+kEVEhNieXRlYmFzZS5jb20vUG9saWN5EigKBnBvbGljeRgCIAEoCzITLmJ5dGViYXNlLnYxLlBvbGljeUID4EECEiUKBHR5cGUYAyABKA4yFy5ieXRlYmFzZS52MS5Qb2xpY3lUeXBlIocBChNVcGRhdGVQb2xpY3lSZXF1ZXN0EigKBnBvbGljeRgBIAEoCzITLmJ5dGViYXNlLnYxLlBvbGljeUID4EECEi8KC3VwZGF0ZV9tYXNrGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFzaxIVCg1hbGxvd19taXNzaW5nGAMgASgIIkAKE0RlbGV0ZVBvbGljeVJlcXVlc3QSKQoEbmFtZRgBIAEoCUIb4EEC+kEVChNieXRlYmFzZS5jb20vUG9saWN5Ij0KEEdldFBvbGljeVJlcXVlc3QSKQoEbmFtZRgBIAEoCUIb4EEC+kEVChNieXRlYmFzZS5jb20vUG9saWN5IpsBChNMaXN0UG9saWNpZXNSZXF1ZXN0EisKBnBhcmVudBgBIAEoCUIb4EEC+kEVEhNieXRlYmFzZS5jb20vUG9saWN5EjEKC3BvbGljeV90eXBlGAIgASgOMhcuYnl0ZWJhc2UudjEuUG9saWN5VHlwZUgAiAEBEhQKDHNob3dfZGVsZXRlZBgDIAEoCEIOCgxfcG9saWN5X3R5cGUiPQoUTGlzdFBvbGljaWVzUmVzcG9uc2USJQoIcG9saWNpZXMYASADKAsyEy5ieXRlYmFzZS52MS5Qb2xpY3ki8wQKBlBvbGljeRIMCgRuYW1lGAEgASgJEhsKE2luaGVyaXRfZnJvbV9wYXJlbnQYAiABKAgSJQoEdHlwZRgDIAEoDjIXLmJ5dGViYXNlLnYxLlBvbGljeVR5cGUSNAoOcm9sbG91dF9wb2xpY3kYBCABKAsyGi5ieXRlYmFzZS52MS5Sb2xsb3V0UG9saWN5SAASPQoTbWFza2luZ19ydWxlX3BvbGljeRgFIAEoCzIeLmJ5dGViYXNlLnYxLk1hc2tpbmdSdWxlUG9saWN5SAASRwoYbWFza2luZ19leGVtcHRpb25fcG9saWN5GAYgASgLMiMuYnl0ZWJhc2UudjEuTWFza2luZ0V4ZW1wdGlvblBvbGljeUgAEiwKCnRhZ19wb2xpY3kYByABKAsyFi5ieXRlYmFzZS52MS5UYWdQb2xpY3lIABI5ChFxdWVyeV9kYXRhX3BvbGljeRgJIAEoCzIcLmJ5dGViYXNlLnYxLlF1ZXJ5RGF0YVBvbGljeUgAEg8KB2VuZm9yY2UYCiABKAgSOwoNcmVzb3VyY2VfdHlwZRgLIAEoDjIfLmJ5dGViYXNlLnYxLlBvbGljeVJlc291cmNlVHlwZUID4EEDOpcB6kGTAQoTYnl0ZWJhc2UuY29tL1BvbGljeRIod29ya3NwYWNlcy97d29ya3NwYWNlfS9wb2xpY2llcy97cG9saWN5fRIkcHJvamVjdHMve3Byb2plY3R9L3BvbGljaWVzL3twb2xpY3l9EixlbnZpcm9ubWVudHMve2Vudmlyb25tZW50fS9wb2xpY2llcy97cG9saWN5fUIICgZwb2xpY3kiMQoNUm9sbG91dFBvbGljeRIRCglhdXRvbWF0aWMYASABKAgSDQoFcm9sZXMYAiADKAkiggEKD1F1ZXJ5RGF0YVBvbGljeRIbChNtYXhpbXVtX3Jlc3VsdF9yb3dzGAEgASgFEhYKDmRpc2FibGVfZXhwb3J0GAIgASgIEhkKEWRpc2FibGVfY29weV9kYXRhGAMgASgIEh8KF2FsbG93X2FkbWluX2RhdGFfc291cmNlGAQgASgIIp8BChZNYXNraW5nRXhlbXB0aW9uUG9saWN5EkEKCmV4ZW1wdGlvbnMYASADKAsyLS5ieXRlYmFzZS52MS5NYXNraW5nRXhlbXB0aW9uUG9saWN5LkV4ZW1wdGlvbhpCCglFeGVtcHRpb24SDwoHbWVtYmVycxgBIAMoCRIkCgljb25kaXRpb24YAiABKAsyES5nb29nbGUudHlwZS5FeHByIqYBChFNYXNraW5nUnVsZVBvbGljeRI5CgVydWxlcxgBIAMoCzIqLmJ5dGViYXNlLnYxLk1hc2tpbmdSdWxlUG9saWN5Lk1hc2tpbmdSdWxlGlYKC01hc2tpbmdSdWxlEgoKAmlkGAEgASgJEiQKCWNvbmRpdGlvbhgCIAEoCzIRLmdvb2dsZS50eXBlLkV4cHISFQoNc2VtYW50aWNfdHlwZRgDIAEoCSJoCglUYWdQb2xpY3kSLgoEdGFncxgBIAMoCzIgLmJ5dGViYXNlLnYxLlRhZ1BvbGljeS5UYWdzRW50cnkaKwoJVGFnc0VudHJ5EgsKA2tleRgBIAEoCRINCgV2YWx1ZRgCIAEoCToCOAEqfwoKUG9saWN5VHlwZRIbChdQT0xJQ1lfVFlQRV9VTlNQRUNJRklFRBAAEhAKDE1BU0tJTkdfUlVMRRABEhUKEU1BU0tJTkdfRVhFTVBUSU9OEAISEgoOUk9MTE9VVF9QT0xJQ1kQAxIHCgNUQUcQBBIOCgpEQVRBX1FVRVJZEAYqYAoSUG9saWN5UmVzb3VyY2VUeXBlEh0KGVJFU09VUkNFX1RZUEVfVU5TUEVDSUZJRUQQABINCglXT1JLU1BBQ0UQARIPCgtFTlZJUk9OTUVOVBACEgsKB1BST0pFQ1QQAzLoCQoQT3JnUG9saWN5U2VydmljZRLWAQoJR2V0UG9saWN5Eh0uYnl0ZWJhc2UudjEuR2V0UG9saWN5UmVxdWVzdBoTLmJ5dGViYXNlLnYxLlBvbGljeSKUAdpBBG5hbWWK6jAPYmIucG9saWNpZXMuZ2V0kOowAoLT5JMCcFoiEiAvdjEve25hbWU9cHJvamVjdHMvKi9wb2xpY2llcy8qfVomEiQvdjEve25hbWU9ZW52aXJvbm1lbnRzLyovcG9saWNpZXMvKn0SIi92MS97bmFtZT13b3Jrc3BhY2VzLyovcG9saWNpZXMvKn0S5wEKDExpc3RQb2xpY2llcxIgLmJ5dGViYXNlLnYxLkxpc3RQb2xpY2llc1JlcXVlc3QaIS5ieXRlYmFzZS52MS5MaXN0UG9saWNpZXNSZXNwb25zZSKRAdpBAIrqMBBiYi5wb2xpY2llcy5saXN0kOowAYLT5JMCcFoiEiAvdjEve3BhcmVudD1wcm9qZWN0cy8qfS9wb2xpY2llc1omEiQvdjEve3BhcmVudD1lbnZpcm9ubWVudHMvKn0vcG9saWNpZXMSIi92MS97cGFyZW50PXdvcmtzcGFjZXMvKn0vcG9saWNpZXMShQIKDENyZWF0ZVBvbGljeRIgLmJ5dGViYXNlLnYxLkNyZWF0ZVBvbGljeVJlcXVlc3QaEy5ieXRlYmFzZS52MS5Qb2xpY3kivQHaQQ1wYXJlbnQscG9saWN5iuowEmJiLnBvbGljaWVzLmNyZWF0ZZDqMAKY6jABgtPkkwKIAToGcG9saWN5Wio6BnBvbGljeSIgL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vcG9saWNpZXNaLjoGcG9saWN5IiQvdjEve3BhcmVudD1lbnZpcm9ubWVudHMvKn0vcG9saWNpZXMiIi92MS97cGFyZW50PXdvcmtzcGFjZXMvKn0vcG9saWNpZXMSnwIKDFVwZGF0ZVBvbGljeRIgLmJ5dGViYXNlLnYxLlVwZGF0ZVBvbGljeVJlcXVlc3QaEy5ieXRlYmFzZS52MS5Qb2xpY3ki1wHaQRJwb2xpY3ksdXBkYXRlX21hc2uK6jASYmIucG9saWNpZXMudXBkYXRlkOowApjqMAGC0+STAp0BOgZwb2xpY3laMToGcG9saWN5MicvdjEve3BvbGljeS5uYW1lPXByb2plY3RzLyovcG9saWNpZXMvKn1aNToGcG9saWN5MisvdjEve3BvbGljeS5uYW1lPWVudmlyb25tZW50cy8qL3BvbGljaWVzLyp9MikvdjEve3BvbGljeS5uYW1lPXdvcmtzcGFjZXMvKi9wb2xpY2llcy8qfRLmAQoMRGVsZXRlUG9saWN5EiAuYnl0ZWJhc2UudjEuRGVsZXRlUG9saWN5UmVxdWVzdBoWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eSKbAdpBBG5hbWWK6jASYmIucG9saWNpZXMuZGVsZXRlkOowApjqMAGC0+STAnBaIiogL3YxL3tuYW1lPXByb2plY3RzLyovcG9saWNpZXMvKn1aJiokL3YxL3tuYW1lPWVudmlyb25tZW50cy8qL3BvbGljaWVzLyp9KiIvdjEve25hbWU9d29ya3NwYWNlcy8qL3BvbGljaWVzLyp9QqsBCg9jb20uYnl0ZWJhc2UudjFCFU9yZ1BvbGljeVNlcnZpY2VQcm90b1ABWjRnaXRodWIuY29tL2J5dGViYXNlL2J5dGViYXNlL2JhY2tlbmQvZ2VuZXJhdGVkLWdvL3YxogIDQlhYqgILQnl0ZWJhc2UuVjHKAgtCeXRlYmFzZVxWMeICF0J5dGViYXNlXFYxXEdQQk1ldGFkYXRh6gIMQnl0ZWJhc2U6OlYxYgZwcm90bzM", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_empty, file_google_protobuf_field_mask, file_google_type_expr, file_v1_annotation]);/*** Describes the message bytebase.v1.CreatePolicyRequest.diff --git a/frontend/src/types/proto-es/v1/revision_service_pb.d.ts b/frontend/src/types/proto-es/v1/revision_service_pb.d.tsindex d9b4b47e8f..271afc3b46 100644--- a/frontend/src/types/proto-es/v1/revision_service_pb.d.ts+++ b/frontend/src/types/proto-es/v1/revision_service_pb.d.ts@@ -17,7 +17,7 @@ export declare const file_v1_revision_service: GenFile;export declare type ListRevisionsRequest = Message<"bytebase.v1.ListRevisionsRequest"> & {/*** The parent of the revisions.- * Format: instances/{instance}/databases/{database}+ * Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}** @generated from field: string parent = 1;*/@@ -88,7 +88,7 @@ export declare const ListRevisionsResponseSchema: GenMessage<ListRevisionsRespon*/export declare type CreateRevisionRequest = Message<"bytebase.v1.CreateRevisionRequest"> & {/**- * Format: instances/{instance}/databases/{database}+ * Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}** @generated from field: string parent = 1;*/@@ -114,7 +114,7 @@ export declare const CreateRevisionRequestSchema: GenMessage<CreateRevisionRequeexport declare type BatchCreateRevisionsRequest = Message<"bytebase.v1.BatchCreateRevisionsRequest"> & {/*** The parent resource shared by all revisions being created.- * Format: instances/{instance}/databases/{database}+ * Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}** @generated from field: string parent = 1;*/@@ -159,7 +159,7 @@ export declare const BatchCreateRevisionsResponseSchema: GenMessage<BatchCreateRexport declare type GetRevisionRequest = Message<"bytebase.v1.GetRevisionRequest"> & {/*** The name of the revision.- * Format: instances/{instance}/databases/{database}/revisions/{revision}+ * Format: instances/{instance}/databases/{database}/revisions/{revision} or projects/{project}/instances/{instance}/databases/{database}/revisions/{revision}** @generated from field: string name = 1;*/@@ -178,7 +178,7 @@ export declare const GetRevisionRequestSchema: GenMessage<GetRevisionRequest>;export declare type DeleteRevisionRequest = Message<"bytebase.v1.DeleteRevisionRequest"> & {/*** The name of the revision to delete.- * Format: instances/{instance}/databases/{database}/revisions/{revision}+ * Format: instances/{instance}/databases/{database}/revisions/{revision} or projects/{project}/instances/{instance}/databases/{database}/revisions/{revision}** @generated from field: string name = 1;*/@@ -196,7 +196,7 @@ export declare const DeleteRevisionRequestSchema: GenMessage<DeleteRevisionReque*/export declare type Revision = Message<"bytebase.v1.Revision"> & {/**- * Format: instances/{instance}/databases/{database}/revisions/{revision}+ * Format: instances/{instance}/databases/{database}/revisions/{revision} or projects/{project}/instances/{instance}/databases/{database}/revisions/{revision}** @generated from field: string name = 1;*/diff --git a/frontend/src/types/proto-es/v1/revision_service_pb.js b/frontend/src/types/proto-es/v1/revision_service_pb.jsindex e9a7700ab9..cb265e3686 100644--- a/frontend/src/types/proto-es/v1/revision_service_pb.js+++ b/frontend/src/types/proto-es/v1/revision_service_pb.js@@ -14,7 +14,7 @@ import { file_v1_annotation } from "./annotation_pb";* Describes the file v1/revision_service.proto.*/export const file_v1_revision_service = /*@__PURE__*/- fileDesc("Chl2MS9yZXZpc2lvbl9zZXJ2aWNlLnByb3RvEgtieXRlYmFzZS52MSKCAQoUTGlzdFJldmlzaW9uc1JlcXVlc3QSLQoGcGFyZW50GAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9EYXRhYmFzZRIRCglwYWdlX3NpemUYAiABKAUSEgoKcGFnZV90b2tlbhgDIAEoCRIUCgxzaG93X2RlbGV0ZWQYBCABKAgiWgoVTGlzdFJldmlzaW9uc1Jlc3BvbnNlEigKCXJldmlzaW9ucxgBIAMoCzIVLmJ5dGViYXNlLnYxLlJldmlzaW9uEhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSJ0ChVDcmVhdGVSZXZpc2lvblJlcXVlc3QSLQoGcGFyZW50GAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9EYXRhYmFzZRIsCghyZXZpc2lvbhgCIAEoCzIVLmJ5dGViYXNlLnYxLlJldmlzaW9uQgPgQQIihwEKG0JhdGNoQ3JlYXRlUmV2aXNpb25zUmVxdWVzdBItCgZwYXJlbnQYASABKAlCHeBBAvpBFwoVYnl0ZWJhc2UuY29tL0RhdGFiYXNlEjkKCHJlcXVlc3RzGAIgAygLMiIuYnl0ZWJhc2UudjEuQ3JlYXRlUmV2aXNpb25SZXF1ZXN0QgPgQQIiSAocQmF0Y2hDcmVhdGVSZXZpc2lvbnNSZXNwb25zZRIoCglyZXZpc2lvbnMYASADKAsyFS5ieXRlYmFzZS52MS5SZXZpc2lvbiJBChJHZXRSZXZpc2lvblJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vUmV2aXNpb24iRAoVRGVsZXRlUmV2aXNpb25SZXF1ZXN0EisKBG5hbWUYASABKAlCHeBBAvpBFwoVYnl0ZWJhc2UuY29tL1JldmlzaW9uIpkECghSZXZpc2lvbhIMCgRuYW1lGAEgASgJEioKB3JlbGVhc2UYAiABKAlCGfpBFgoUYnl0ZWJhc2UuY29tL1JlbGVhc2USNAoLY3JlYXRlX3RpbWUYAyABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSFAoHZGVsZXRlchgEIAEoCUID4EEDEjQKC2RlbGV0ZV90aW1lGAUgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEgwKBGZpbGUYBiABKAkSDwoHdmVyc2lvbhgHIAEoCRImCgVzaGVldBgIIAEoCUIX+kEUChJieXRlYmFzZS5jb20vU2hlZXQSGQoMc2hlZXRfc2hhMjU2GAkgASgJQgPgQQMSKwoIdGFza19ydW4YDSABKAlCGfpBFgoUYnl0ZWJhc2UuY29tL1Rhc2tSdW4SKAoEdHlwZRgOIAEoDjIaLmJ5dGViYXNlLnYxLlJldmlzaW9uLlR5cGUiPAoEVHlwZRIUChBUWVBFX1VOU1BFQ0lGSUVEEAASDQoJVkVSU0lPTkVEEAESDwoLREVDTEFSQVRJVkUQAjpa6kFXChVieXRlYmFzZS5jb20vUmV2aXNpb24SPmluc3RhbmNlcy97aW5zdGFuY2V9L2RhdGFiYXNlcy97ZGF0YWJhc2V9L3JldmlzaW9ucy97cmV2aXNpb259MtwFCg9SZXZpc2lvblNlcnZpY2USsAEKDUxpc3RSZXZpc2lvbnMSIS5ieXRlYmFzZS52MS5MaXN0UmV2aXNpb25zUmVxdWVzdBoiLmJ5dGViYXNlLnYxLkxpc3RSZXZpc2lvbnNSZXNwb25zZSJY2kEGcGFyZW50iuowEWJiLnJldmlzaW9ucy5saXN0kOowAYLT5JMCMBIuL3YxL3twYXJlbnQ9aW5zdGFuY2VzLyovZGF0YWJhc2VzLyp9L3JldmlzaW9ucxKcAQoLR2V0UmV2aXNpb24SHy5ieXRlYmFzZS52MS5HZXRSZXZpc2lvblJlcXVlc3QaFS5ieXRlYmFzZS52MS5SZXZpc2lvbiJV2kEEbmFtZYrqMBBiYi5yZXZpc2lvbnMuZ2V0kOowAYLT5JMCMBIuL3YxL3tuYW1lPWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qL3JldmlzaW9ucy8qfRLNAQoUQmF0Y2hDcmVhdGVSZXZpc2lvbnMSKC5ieXRlYmFzZS52MS5CYXRjaENyZWF0ZVJldmlzaW9uc1JlcXVlc3QaKS5ieXRlYmFzZS52MS5CYXRjaENyZWF0ZVJldmlzaW9uc1Jlc3BvbnNlImCK6jATYmIucmV2aXNpb25zLmNyZWF0ZZDqMAGC0+STAj86ASoiOi92MS97cGFyZW50PWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qfS9yZXZpc2lvbnM6YmF0Y2hDcmVhdGUSpgEKDkRlbGV0ZVJldmlzaW9uEiIuYnl0ZWJhc2UudjEuRGVsZXRlUmV2aXNpb25SZXF1ZXN0GhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5IljaQQRuYW1liuowE2JiLnJldmlzaW9ucy5kZWxldGWQ6jABgtPkkwIwKi4vdjEve25hbWU9aW5zdGFuY2VzLyovZGF0YWJhc2VzLyovcmV2aXNpb25zLyp9QqoBCg9jb20uYnl0ZWJhc2UudjFCFFJldmlzaW9uU2VydmljZVByb3RvUAFaNGdpdGh1Yi5jb20vYnl0ZWJhc2UvYnl0ZWJhc2UvYmFja2VuZC9nZW5lcmF0ZWQtZ28vdjGiAgNCWFiqAgtCeXRlYmFzZS5WMcoCC0J5dGViYXNlXFYx4gIXQnl0ZWJhc2VcVjFcR1BCTWV0YWRhdGHqAgxCeXRlYmFzZTo6VjFiBnByb3RvMw", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_empty, file_google_protobuf_timestamp, file_v1_annotation]);+ fileDesc("Chl2MS9yZXZpc2lvbl9zZXJ2aWNlLnByb3RvEgtieXRlYmFzZS52MSKCAQoUTGlzdFJldmlzaW9uc1JlcXVlc3QSLQoGcGFyZW50GAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9EYXRhYmFzZRIRCglwYWdlX3NpemUYAiABKAUSEgoKcGFnZV90b2tlbhgDIAEoCRIUCgxzaG93X2RlbGV0ZWQYBCABKAgiWgoVTGlzdFJldmlzaW9uc1Jlc3BvbnNlEigKCXJldmlzaW9ucxgBIAMoCzIVLmJ5dGViYXNlLnYxLlJldmlzaW9uEhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSJ0ChVDcmVhdGVSZXZpc2lvblJlcXVlc3QSLQoGcGFyZW50GAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9EYXRhYmFzZRIsCghyZXZpc2lvbhgCIAEoCzIVLmJ5dGViYXNlLnYxLlJldmlzaW9uQgPgQQIihwEKG0JhdGNoQ3JlYXRlUmV2aXNpb25zUmVxdWVzdBItCgZwYXJlbnQYASABKAlCHeBBAvpBFwoVYnl0ZWJhc2UuY29tL0RhdGFiYXNlEjkKCHJlcXVlc3RzGAIgAygLMiIuYnl0ZWJhc2UudjEuQ3JlYXRlUmV2aXNpb25SZXF1ZXN0QgPgQQIiSAocQmF0Y2hDcmVhdGVSZXZpc2lvbnNSZXNwb25zZRIoCglyZXZpc2lvbnMYASADKAsyFS5ieXRlYmFzZS52MS5SZXZpc2lvbiJBChJHZXRSZXZpc2lvblJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vUmV2aXNpb24iRAoVRGVsZXRlUmV2aXNpb25SZXF1ZXN0EisKBG5hbWUYASABKAlCHeBBAvpBFwoVYnl0ZWJhc2UuY29tL1JldmlzaW9uIu4ECghSZXZpc2lvbhIMCgRuYW1lGAEgASgJEioKB3JlbGVhc2UYAiABKAlCGfpBFgoUYnl0ZWJhc2UuY29tL1JlbGVhc2USNAoLY3JlYXRlX3RpbWUYAyABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSFAoHZGVsZXRlchgEIAEoCUID4EEDEjQKC2RlbGV0ZV90aW1lGAUgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEgwKBGZpbGUYBiABKAkSDwoHdmVyc2lvbhgHIAEoCRImCgVzaGVldBgIIAEoCUIX+kEUChJieXRlYmFzZS5jb20vU2hlZXQSGQoMc2hlZXRfc2hhMjU2GAkgASgJQgPgQQMSKwoIdGFza19ydW4YDSABKAlCGfpBFgoUYnl0ZWJhc2UuY29tL1Rhc2tSdW4SKAoEdHlwZRgOIAEoDjIaLmJ5dGViYXNlLnYxLlJldmlzaW9uLlR5cGUiPAoEVHlwZRIUChBUWVBFX1VOU1BFQ0lGSUVEEAASDQoJVkVSU0lPTkVEEAESDwoLREVDTEFSQVRJVkUQAjquAepBqgEKFWJ5dGViYXNlLmNvbS9SZXZpc2lvbhI+aW5zdGFuY2VzL3tpbnN0YW5jZX0vZGF0YWJhc2VzL3tkYXRhYmFzZX0vcmV2aXNpb25zL3tyZXZpc2lvbn0SUXByb2plY3RzL3twcm9qZWN0fS9pbnN0YW5jZXMve2luc3RhbmNlfS9kYXRhYmFzZXMve2RhdGFiYXNlfS9yZXZpc2lvbnMve3JldmlzaW9ufTLkBwoPUmV2aXNpb25TZXJ2aWNlEu4BCg1MaXN0UmV2aXNpb25zEiEuYnl0ZWJhc2UudjEuTGlzdFJldmlzaW9uc1JlcXVlc3QaIi5ieXRlYmFzZS52MS5MaXN0UmV2aXNpb25zUmVzcG9uc2UilQHaQQZwYXJlbnSK6jARYmIucmV2aXNpb25zLmxpc3SQ6jABgtPkkwJtWjsSOS92MS97cGFyZW50PXByb2plY3RzLyovaW5zdGFuY2VzLyovZGF0YWJhc2VzLyp9L3JldmlzaW9ucxIuL3YxL3twYXJlbnQ9aW5zdGFuY2VzLyovZGF0YWJhc2VzLyp9L3JldmlzaW9ucxLaAQoLR2V0UmV2aXNpb24SHy5ieXRlYmFzZS52MS5HZXRSZXZpc2lvblJlcXVlc3QaFS5ieXRlYmFzZS52MS5SZXZpc2lvbiKSAdpBBG5hbWWK6jAQYmIucmV2aXNpb25zLmdldJDqMAGC0+STAm1aOxI5L3YxL3tuYW1lPXByb2plY3RzLyovaW5zdGFuY2VzLyovZGF0YWJhc2VzLyovcmV2aXNpb25zLyp9Ei4vdjEve25hbWU9aW5zdGFuY2VzLyovZGF0YWJhc2VzLyovcmV2aXNpb25zLyp9EpsCChRCYXRjaENyZWF0ZVJldmlzaW9ucxIoLmJ5dGViYXNlLnYxLkJhdGNoQ3JlYXRlUmV2aXNpb25zUmVxdWVzdBopLmJ5dGViYXNlLnYxLkJhdGNoQ3JlYXRlUmV2aXNpb25zUmVzcG9uc2UirQGK6jATYmIucmV2aXNpb25zLmNyZWF0ZZDqMAGC0+STAosBOgEqWko6ASoiRS92MS97cGFyZW50PXByb2plY3RzLyovaW5zdGFuY2VzLyovZGF0YWJhc2VzLyp9L3JldmlzaW9uczpiYXRjaENyZWF0ZSI6L3YxL3twYXJlbnQ9aW5zdGFuY2VzLyovZGF0YWJhc2VzLyp9L3JldmlzaW9uczpiYXRjaENyZWF0ZRLkAQoORGVsZXRlUmV2aXNpb24SIi5ieXRlYmFzZS52MS5EZWxldGVSZXZpc2lvblJlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkilQHaQQRuYW1liuowE2JiLnJldmlzaW9ucy5kZWxldGWQ6jABgtPkkwJtWjsqOS92MS97bmFtZT1wcm9qZWN0cy8qL2luc3RhbmNlcy8qL2RhdGFiYXNlcy8qL3JldmlzaW9ucy8qfSouL3YxL3tuYW1lPWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qL3JldmlzaW9ucy8qfUKqAQoPY29tLmJ5dGViYXNlLnYxQhRSZXZpc2lvblNlcnZpY2VQcm90b1ABWjRnaXRodWIuY29tL2J5dGViYXNlL2J5dGViYXNlL2JhY2tlbmQvZ2VuZXJhdGVkLWdvL3YxogIDQlhYqgILQnl0ZWJhc2UuVjHKAgtCeXRlYmFzZVxWMeICF0J5dGViYXNlXFYxXEdQQk1ldGFkYXRh6gIMQnl0ZWJhc2U6OlYxYgZwcm90bzM", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_empty, file_google_protobuf_timestamp, file_v1_annotation]);/*** Describes the message bytebase.v1.ListRevisionsRequest.diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yamlindex 6322dc88bf..884a5a0fe7 100644--- a/proto/gen/grpc-doc/openapi.yaml+++ b/proto/gen/grpc-doc/openapi.yaml@@ -869,8 +869,6 @@ paths:Format: {resource name}/policies/{policy type}Workspace resource name: workspaces/{workspace-id}.Environment resource name: environments/environment-id.- Instance resource name: instances/instance-id.- Database resource name: instances/instance-id/databases/database-name.content:application/json:schema:@@ -882,8 +880,6 @@ paths:Format: {resource name}/policies/{policy type}Workspace resource name: workspaces/{workspace-id}.Environment resource name: environments/environment-id.- Instance resource name: instances/instance-id.- Database resource name: instances/instance-id/databases/database-name.$ref: '#/components/schemas/bytebase.v1.Policy'responses:"200":@@ -1703,10 +1699,20 @@ paths:- InstanceServicesummary: ListInstancesdescription: |-- Lists all database instances.+ Lists database instances, optionally within a project.Permissions required: bb.instances.listoperationId: InstanceService_ListInstancesparameters:+ - name: parent+ in: query+ description: |-+ The parent, which owns this collection of instances.+ Format: projects/{project}. If omitted, only workspace instances are+ returned. Wildcard project parents are not supported. When set, the+ `project` filter must be omitted or match this parent.+ schema:+ type: string+ title: parent- name: pageSizein: querydescription: |-@@ -1804,6 +1810,15 @@ paths:Permissions required: bb.instances.createoperationId: InstanceService_CreateInstanceparameters:+ - name: parent+ in: query+ description: |-+ The parent, which owns this collection of instances.+ Format: projects/{project}. If omitted, the instance is created in the+ workspace collection.+ schema:+ type: string+ title: parent- name: instanceIdin: querydescription: |-@@ -1825,7 +1840,7 @@ paths:in: querydescription: |-The project to assign newly discovered databases to during initial sync.- Format: projects/{project}+ Format: projects/{project}. This must be unset when `parent` is set.schema:type: stringtitle: initial_database_project@@ -1884,7 +1899,10 @@ paths:type: string- name: forcein: query- description: If set to true, any databases and sheets from this project will also be moved to default project, and all open issues will be closed.+ description: |-+ If set to true, a workspace instance's databases are moved to the default+ project before the instance is soft-deleted. Project instances reject this+ option because their databases must remain in the owning project.schema:type: booleantitle: force@@ -2128,7 +2146,9 @@ paths:in: querydescription: |-If set to true, and the instance is not found, a new instance will be created.- In this situation, `update_mask` is ignored.+ In this situation, `update_mask` is ignored. A project-nested name creates+ the instance only under its encoded active, non-default project; it never+ falls back to a workspace instance.schema:type: booleantitle: allow_missing@@ -2137,7 +2157,7 @@ paths:The instance to update.The instance's `name` field is used to identify the instance to update.- Format: instances/{instance}+ Format: instances/{instance} or projects/{project}/instances/{instance}content:application/json:schema:@@ -2146,7 +2166,7 @@ paths:The instance to update.The instance's `name` field is used to identify the instance to update.- Format: instances/{instance}+ Format: instances/{instance} or projects/{project}/instances/{instance}$ref: '#/components/schemas/bytebase.v1.Instance'responses:"200":@@ -2522,7 +2542,7 @@ paths:The database to update.The database's `name` field is used to identify the database to update.- Format: instances/{instance}/databases/{database}+ Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}content:application/json:schema:@@ -2531,7 +2551,7 @@ paths:The database to update.The database's `name` field is used to identify the database to update.- Format: instances/{instance}/databases/{database}+ Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}$ref: '#/components/schemas/bytebase.v1.Database'responses:"200":@@ -2603,7 +2623,7 @@ paths:The database catalog to update.The catalog's `name` field is used to identify the database catalog to update.- Format: instances/{instance}/databases/{database}/catalog+ Format: instances/{instance}/databases/{database}/catalog or projects/{project}/instances/{instance}/databases/{database}/catalogcontent:application/json:schema:@@ -2612,7 +2632,7 @@ paths:The database catalog to update.The catalog's `name` field is used to identify the database catalog to update.- Format: instances/{instance}/databases/{database}/catalog+ Format: instances/{instance}/databases/{database}/catalog or projects/{project}/instances/{instance}/databases/{database}/catalog$ref: '#/components/schemas/bytebase.v1.DatabaseCatalog'responses:"200":@@ -2741,7 +2761,7 @@ paths:description: |-Compares and generates migration statements between two schemas.Permissions required: bb.databases.get- operationId: DatabaseService_DiffSchema2+ operationId: DatabaseService_DiffSchema3parameters:- name: instancein: path@@ -2777,7 +2797,7 @@ paths:description: |-The resource name of the changelogFormat:- instances/{instance}/databases/{database}/changelogs/{changelog}+ instances/{instance}/databases/{database}/changelogs/{changelog} or projects/{project}/instances/{instance}/databases/{database}/changelogs/{changelog}title: changelogrequired:- changelog@@ -2860,15 +2880,15 @@ paths:application/json:schema:$ref: '#/components/schemas/bytebase.v1.DatabaseMetadata'- /v1/instances/{instance}/databases/{database}/policies:+ /v1/instances/{instance}/databases/{database}/revisions:get:tags:- - OrgPolicyService- summary: ListPolicies+ - RevisionService+ summary: ListRevisionsdescription: |-- Lists policies at a specified resource level.- Permissions required: bb.policies.list- operationId: OrgPolicyService_ListPolicies5+ Lists schema revisions for a database.+ Permissions required: bb.revisions.list+ operationId: RevisionService_ListRevisionsparameters:- name: instancein: path@@ -2882,17 +2902,30 @@ paths:required: trueschema:type: string- - name: policyType+ - name: pageSizein: query- description: Filter by specific policy type.+ description: |-+ The maximum number of revisions to return. The service may return fewer+ than this value. If unspecified, at most 10 revisions will be returned. The+ maximum value is 1000; values above 1000 will be coerced to 1000.schema:- oneOf:- - $ref: '#/components/schemas/bytebase.v1.PolicyType'- - type: "null"- title: policy_type+ type: integer+ title: page_size+ format: int32+ - name: pageToken+ in: query+ description: |-+ A page token, received from a previous `ListRevisions` call.+ Provide this to retrieve the subsequent page.++ When paginating, all other parameters provided to `ListRevisions` must+ match the call that provided the page token.+ schema:+ type: string+ title: page_token- name: showDeletedin: query- description: Show deleted policies if specified.+ description: Whether to include deleted revisions in the results.schema:type: booleantitle: show_deleted@@ -2902,15 +2935,16 @@ paths:content:application/json:schema:- $ref: '#/components/schemas/bytebase.v1.ListPoliciesResponse'- post:+ $ref: '#/components/schemas/bytebase.v1.ListRevisionsResponse'+ /v1/instances/{instance}/databases/{database}/revisions/{revision}:+ get:tags:- - OrgPolicyService- summary: CreatePolicy+ - RevisionService+ summary: GetRevisiondescription: |-- Creates a new organizational policy.- Permissions required: bb.policies.create- operationId: OrgPolicyService_CreatePolicy5+ Retrieves a schema revision by name.+ Permissions required: bb.revisions.get+ operationId: RevisionService_GetRevisionparameters:- name: instancein: path@@ -2924,36 +2958,27 @@ paths:required: trueschema:type: string- - name: type- in: query- description: The type of policy to create.+ - name: revision+ in: path+ description: The revision id.+ required: trueschema:- title: type- $ref: '#/components/schemas/bytebase.v1.PolicyType'- requestBody:- description: The policy to create.- content:- application/json:- schema:- title: policy- description: The policy to create.- $ref: '#/components/schemas/bytebase.v1.Policy'+ type: stringresponses:"200":description: Successcontent:application/json:schema:- $ref: '#/components/schemas/bytebase.v1.Policy'- /v1/instances/{instance}/databases/{database}/policies/{policy}:- get:+ $ref: '#/components/schemas/bytebase.v1.Revision'+ delete:tags:- - OrgPolicyService- summary: GetPolicy+ - RevisionService+ summary: DeleteRevisiondescription: |-- Retrieves a policy by name.- Permissions required: bb.policies.get- operationId: OrgPolicyService_GetPolicy5+ Deletes a schema revision.+ Permissions required: bb.revisions.delete+ operationId: RevisionService_DeleteRevisionparameters:- name: instancein: path@@ -2967,9 +2992,9 @@ paths:required: trueschema:type: string- - name: policy+ - name: revisionin: path- description: The policy id.+ description: The revision id.required: trueschema:type: string@@ -2979,15 +3004,16 @@ paths:content:application/json:schema:- $ref: '#/components/schemas/bytebase.v1.Policy'- delete:+ $ref: '#/components/schemas/google.protobuf.Empty'+ /v1/instances/{instance}/databases/{database}/revisions:batchCreate:+ post:tags:- - OrgPolicyService- summary: DeletePolicy+ - RevisionService+ summary: BatchCreateRevisionsdescription: |-- Deletes an organizational policy.- Permissions required: bb.policies.delete- operationId: OrgPolicyService_DeletePolicy5+ Creates multiple schema revisions in a single operation.+ Permissions required: bb.revisions.create+ operationId: RevisionService_BatchCreateRevisionsparameters:- name: instancein: path@@ -3001,9 +3027,51 @@ paths:required: trueschema:type: string- - name: policy+ requestBody:+ content:+ application/json:+ schema:+ type: object+ properties:+ requests:+ type: array+ items:+ $ref: '#/components/schemas/bytebase.v1.CreateRevisionRequest'+ title: requests+ description: |-+ The request message specifying the revisions to create.+ A maximum of 100 revisions can be created in a batch.+ title: BatchCreateRevisionsRequest+ required:+ - requests+ additionalProperties: false+ required: true+ responses:+ "200":+ description: Success+ content:+ application/json:+ schema:+ $ref: '#/components/schemas/bytebase.v1.BatchCreateRevisionsResponse'+ /v1/instances/{instance}/databases/{database}/schema:+ get:+ tags:+ - DatabaseService+ summary: GetDatabaseSchema+ description: |-+ Retrieves database schema as DDL statements.+ Permissions required: bb.databases.getSchema+ operationId: DatabaseService_GetDatabaseSchema+ parameters:+ - name: instancein: path- description: The policy id.+ description: The instance id.+ required: true+ schema:+ type: string+ - name: database+ in: path+ description: The database id.required: trueschema:type: string@@ -3013,15 +3081,16 @@ paths:content:application/json:schema:- $ref: '#/components/schemas/google.protobuf.Empty'- patch:+ $ref: '#/components/schemas/bytebase.v1.DatabaseSchema'+ /v1/instances/{instance}/databases/{database}/schemaString:+ get:tags:- - OrgPolicyService- summary: UpdatePolicy+ - DatabaseService+ summary: GetSchemaStringdescription: |-- Updates an existing organizational policy.- Permissions required: bb.policies.update- operationId: OrgPolicyService_UpdatePolicy5+ Generates schema DDL for a database object.+ Permissions required: bb.databases.getSchema+ operationId: DatabaseService_GetSchemaStringparameters:- name: instancein: path@@ -3035,563 +3104,90 @@ paths:required: trueschema:type: string- - name: policy- in: path- description: The policy id.- required: true+ - name: type+ in: query+ schema:+ title: type+ $ref: '#/components/schemas/bytebase.v1.GetSchemaStringRequest.ObjectType'+ - name: schema+ in: query+ description: It's empty for DATABASE.schema:type: string- - name: updateMask+ title: schema+ - name: object+ in: query+ description: It's empty for DATABASE and SCHEMA.+ schema:+ type: string+ title: object+ - name: metadata.namein: querydescription: |-- `FieldMask` represents a set of symbolic field paths, for example:-- paths: "f.a"- paths: "f.b.d"-- Here `f` represents a field in some root message, `a` and `b`- fields in the message found in `f`, and `d` a field found in the- message in `f.b`.-- Field masks are used to specify a subset of fields that should be- returned by a get operation or modified by an update operation.- Field masks also have a custom JSON encoding (see below).-- # Field Masks in Projections-- When used in the context of a projection, a response message or- sub-message is filtered by the API to only contain those fields as- specified in the mask. For example, if the mask in the previous- example is applied to a response message as follows:-- f {- a : 22- b {- d : 1- x : 2- }- y : 13- }- z: 8-- The result will not contain specific values for fields x,y and z- (their value will be set to the default, and omitted in proto text- output):--- f {- a : 22- b {- d : 1- }- }-- A repeated field is not allowed except at the last position of a- paths string.-- If a FieldMask object is not present in a get operation, the- operation applies to all fields (as if a FieldMask of all fields- had been specified).+ The database metadata name.- Note that a field mask does not necessarily apply to the- top-level response message. In case of a REST get operation, the- field mask applies directly to the response, but in case of a REST- list operation, the mask instead applies to each individual message- in the returned resource list. In case of a REST custom method,- other definitions may be used. Where the mask applies will be- clearly documented together with its declaration in the API. In- any case, the effect on the returned resource/resources is required- behavior for APIs.-- # Field Masks in Update Operations-- A field mask in update operations specifies which fields of the- targeted resource are going to be updated. The API is required- to only change the values of the fields as specified in the mask- and leave the others untouched. If a resource is passed in to- describe the updated values, the API ignores the values of all- fields not covered by the mask.-- If a repeated field is specified for an update operation, new values will- be appended to the existing repeated field in the target resource. Note that- a repeated field is only allowed in the last position of a `paths` string.-- If a sub-message is specified in the last position of the field mask for an- update operation, then new value will be merged into the existing sub-message- in the target resource.-- For example, given the target message:-- f {- b {- d: 1- x: 2- }- c: [1]- }-- And an update message:-- f {- b {- d: 10- }- c: [2]- }-- then if the field mask is:-- paths: ["f.b", "f.c"]-- then the result will be:-- f {- b {- d: 10- x: 2- }- c: [1, 2]- }-- An implementation may provide options to override this default behavior for- repeated and message fields.-- In order to reset a field's value to the default, the field must- be in the mask and set to the default value in the provided resource.- Hence, in order to reset all fields of a resource, provide a default- instance of the resource and set all fields in the mask, or do- not provide a mask as described below.-- If a field mask is not present on update, the operation applies to- all fields (as if a field mask of all fields has been specified).- Note that in the presence of schema evolution, this may mean that- fields the client does not know and has therefore not filled into- the request will be reset to their default. If this is unwanted- behavior, a specific service may require a client to always specify- a field mask, producing an error if not.-- As with get operations, the location of the resource which- describes the updated values in the request message depends on the- operation kind. In any case, the effect of the field mask is- required to be honored by the API.-- ## Considerations for HTTP REST-- The HTTP kind of an update operation which uses a field mask must- be set to PATCH instead of PUT in order to satisfy HTTP semantics- (PUT must only be used for full updates).-- # JSON Encoding of Field Masks-- In JSON, a field mask is encoded as a single string where paths are- separated by a comma. Fields name in each path are converted- to/from lower-camel naming conventions.-- As an example, consider the following message declarations:-- message Profile {- User user = 1;- Photo photo = 2;- }- message User {- string display_name = 1;- string address = 2;- }-- In proto a field mask for `Profile` may look as such:-- mask {- paths: "user.display_name"- paths: "photo"- }-- In JSON, the same mask is represented as below:-- {- mask: "user.displayName,photo"- }-- # Field Masks and Oneof Fields-- Field masks treat fields in oneofs just as regular fields. Consider the- following message:-- message SampleMessage {- oneof test_oneof {- string name = 4;- SubMessage sub_message = 9;- }- }-- The field mask can be:-- mask {- paths: "name"- }-- Or:-- mask {- paths: "sub_message"- }-- Note that oneof type names ("test_oneof" in this case) cannot be used in- paths.-- ## Field Mask Verification-- The implementation of any API method which has a FieldMask type field in the- request should verify the included field paths, and return an- `INVALID_ARGUMENT` error if any path is unmappable.+ Format: instances/{instance}/databases/{database}/metadata or projects/{project}/instances/{instance}/databases/{database}/metadataschema:type: string- - name: allowMissing+ title: name+ - name: metadata.schemas.namein: querydescription: |-- If set to true, and the policy is not found, a new policy will be created.- In this situation, `update_mask` is ignored.+ The name is the schema name.+ It is an empty string for databases without such concept such as MySQL.schema:- type: boolean- title: allow_missing- requestBody:- description: |-- The policy to update.-- The policy's `name` field is used to identify the instance to update.- Format: {resource name}/policies/{policy type}- Workspace resource name: workspaces/{workspace-id}.- Environment resource name: environments/environment-id.- Instance resource name: instances/instance-id.- Database resource name: instances/instance-id/databases/database-name.- content:- application/json:- schema:- title: policy- description: |-- The policy to update.-- The policy's `name` field is used to identify the instance to update.- Format: {resource name}/policies/{policy type}- Workspace resource name: workspaces/{workspace-id}.- Environment resource name: environments/environment-id.- Instance resource name: instances/instance-id.- Database resource name: instances/instance-id/databases/database-name.- $ref: '#/components/schemas/bytebase.v1.Policy'- responses:- "200":- description: Success- content:- application/json:- schema:- $ref: '#/components/schemas/bytebase.v1.Policy'- /v1/instances/{instance}/databases/{database}/revisions:- get:- tags:- - RevisionService- summary: ListRevisions- description: |-- Lists schema revisions for a database.- Permissions required: bb.revisions.list- operationId: RevisionService_ListRevisions- parameters:- - name: instance- in: path- description: The instance id.- required: true+ type: string+ title: name+ - name: metadata.schemas.tables.name+ in: query+ description: The name is the name of a table.schema:type: string- - name: database- in: path- description: The database id.- required: true+ title: name+ - name: metadata.schemas.tables.columns.name+ in: query+ description: The name is the name of a column.schema:type: string- - name: pageSize+ title: name+ - name: metadata.schemas.tables.columns.positionin: query- description: |-- The maximum number of revisions to return. The service may return fewer- than this value. If unspecified, at most 10 revisions will be returned. The- maximum value is 1000; values above 1000 will be coerced to 1000.+ description: The position is the position in columns.schema:type: integer- title: page_size+ title: positionformat: int32- - name: pageToken+ - name: metadata.schemas.tables.columns.hasDefault+ in: query+ schema:+ type: boolean+ title: has_default+ - name: metadata.schemas.tables.columns.default+ in: query+ description: The default value of column.+ schema:+ type: string+ title: default+ - name: metadata.schemas.tables.columns.defaultOnNullin: querydescription: |-- A page token, received from a previous `ListRevisions` call.- Provide this to retrieve the subsequent page.-- When paginating, all other parameters provided to `ListRevisions` must- match the call that provided the page token.+ Oracle specific metadata.+ The default_on_null is the default on null of a column.+ schema:+ type: boolean+ title: default_on_null+ - name: metadata.schemas.tables.columns.onUpdate+ in: query+ description: |-+ The on_update is the on update action of a column.+ For MySQL like databases, it's only supported for TIMESTAMP columns with+ CURRENT_TIMESTAMP as on update value.schema:type: string- title: page_token- - name: showDeleted+ title: on_update+ - name: metadata.schemas.tables.columns.nullablein: query- description: Whether to include deleted revisions in the results.- schema:- type: boolean- title: show_deleted- responses:- "200":- description: Success- content:- application/json:- schema:- $ref: '#/components/schemas/bytebase.v1.ListRevisionsResponse'- /v1/instances/{instance}/databases/{database}/revisions/{revision}:- get:- tags:- - RevisionService- summary: GetRevision- description: |-- Retrieves a schema revision by name.- Permissions required: bb.revisions.get- operationId: RevisionService_GetRevision- parameters:- - name: instance- in: path- description: The instance id.- required: true- schema:- type: string- - name: database- in: path- description: The database id.- required: true- schema:- type: string- - name: revision- in: path- description: The revision id.- required: true- schema:- type: string- responses:- "200":- description: Success- content:- application/json:- schema:- $ref: '#/components/schemas/bytebase.v1.Revision'- delete:- tags:- - RevisionService- summary: DeleteRevision- description: |-- Deletes a schema revision.- Permissions required: bb.revisions.delete- operationId: RevisionService_DeleteRevision- parameters:- - name: instance- in: path- description: The instance id.- required: true- schema:- type: string- - name: database- in: path- description: The database id.- required: true- schema:- type: string- - name: revision- in: path- description: The revision id.- required: true- schema:- type: string- responses:- "200":- description: Success- content:- application/json:- schema:- $ref: '#/components/schemas/google.protobuf.Empty'- /v1/instances/{instance}/databases/{database}/revisions:batchCreate:- post:- tags:- - RevisionService- summary: BatchCreateRevisions- description: |-- Creates multiple schema revisions in a single operation.- Permissions required: bb.revisions.create- operationId: RevisionService_BatchCreateRevisions- parameters:- - name: instance- in: path- description: The instance id.- required: true- schema:- type: string- - name: database- in: path- description: The database id.- required: true- schema:- type: string- requestBody:- content:- application/json:- schema:- type: object- properties:- requests:- type: array- items:- $ref: '#/components/schemas/bytebase.v1.CreateRevisionRequest'- title: requests- description: |-- The request message specifying the revisions to create.- A maximum of 100 revisions can be created in a batch.- title: BatchCreateRevisionsRequest- required:- - requests- additionalProperties: false- required: true- responses:- "200":- description: Success- content:- application/json:- schema:- $ref: '#/components/schemas/bytebase.v1.BatchCreateRevisionsResponse'- /v1/instances/{instance}/databases/{database}/schema:- get:- tags:- - DatabaseService- summary: GetDatabaseSchema- description: |-- Retrieves database schema as DDL statements.- Permissions required: bb.databases.getSchema- operationId: DatabaseService_GetDatabaseSchema- parameters:- - name: instance- in: path- description: The instance id.- required: true- schema:- type: string- - name: database- in: path- description: The database id.- required: true- schema:- type: string- responses:- "200":- description: Success- content:- application/json:- schema:- $ref: '#/components/schemas/bytebase.v1.DatabaseSchema'- /v1/instances/{instance}/databases/{database}/schemaString:- get:- tags:- - DatabaseService- summary: GetSchemaString- description: |-- Generates schema DDL for a database object.- Permissions required: bb.databases.getSchema- operationId: DatabaseService_GetSchemaString- parameters:- - name: instance- in: path- description: The instance id.- required: true- schema:- type: string- - name: database- in: path- description: The database id.- required: true- schema:- type: string- - name: type- in: query- schema:- title: type- $ref: '#/components/schemas/bytebase.v1.GetSchemaStringRequest.ObjectType'- - name: schema- in: query- description: It's empty for DATABASE.- schema:- type: string- title: schema- - name: object- in: query- description: It's empty for DATABASE and SCHEMA.- schema:- type: string- title: object- - name: metadata.name- in: query- description: |-- The database metadata name.-- Format: instances/{instance}/databases/{database}/metadata- schema:- type: string- title: name- - name: metadata.schemas.name- in: query- description: |-- The name is the schema name.- It is an empty string for databases without such concept such as MySQL.- schema:- type: string- title: name- - name: metadata.schemas.tables.name- in: query- description: The name is the name of a table.- schema:- type: string- title: name- - name: metadata.schemas.tables.columns.name- in: query- description: The name is the name of a column.- schema:- type: string- title: name- - name: metadata.schemas.tables.columns.position- in: query- description: The position is the position in columns.- schema:- type: integer- title: position- format: int32- - name: metadata.schemas.tables.columns.hasDefault- in: query- schema:- type: boolean- title: has_default- - name: metadata.schemas.tables.columns.default- in: query- description: The default value of column.- schema:- type: string- title: default- - name: metadata.schemas.tables.columns.defaultOnNull- in: query- description: |-- Oracle specific metadata.- The default_on_null is the default on null of a column.- schema:- type: boolean- title: default_on_null- - name: metadata.schemas.tables.columns.onUpdate- in: query- description: |-- The on_update is the on update action of a column.- For MySQL like databases, it's only supported for TIMESTAMP columns with- CURRENT_TIMESTAMP as on update value.- schema:- type: string- title: on_update- - name: metadata.schemas.tables.columns.nullable- in: query- description: The nullable is the nullable of a column.+ description: The nullable is the nullable of a column.schema:type: booleantitle: nullable@@ -4990,7 +4586,7 @@ paths:description: |-The resource name of the changelogFormat:- instances/{instance}/databases/{database}/changelogs/{changelog}+ instances/{instance}/databases/{database}/changelogs/{changelog} or projects/{project}/instances/{instance}/databases/{database}/changelogs/{changelog}title: changelogrequired:- changelog@@ -5313,15 +4909,15 @@ paths:application/json:schema:$ref: '#/components/schemas/bytebase.v1.BatchUpdateDatabasesResponse'- /v1/instances/{instance}/policies:+ /v1/instances/{instance}/roles:get:tags:- - OrgPolicyService- summary: ListPolicies+ - InstanceRoleService+ summary: ListInstanceRolesdescription: |-- Lists policies at a specified resource level.- Permissions required: bb.policies.list- operationId: OrgPolicyService_ListPolicies4+ Lists all database roles in an instance.+ Permissions required: bb.instanceRoles.list+ operationId: InstanceRoleService_ListInstanceRolesparameters:- name: instancein: path@@ -5329,35 +4925,52 @@ paths:required: trueschema:type: string- - name: policyType+ - name: pageSizein: query- description: Filter by specific policy type.+ description: |-+ Not used.+ The maximum number of roles to return. The service may return fewer than+ this value.+ If unspecified, at most 10 roles will be returned.+ The maximum value is 1000; values above 1000 will be coerced to 1000.schema:- oneOf:- - $ref: '#/components/schemas/bytebase.v1.PolicyType'- - type: "null"- title: policy_type- - name: showDeleted+ type: integer+ title: page_size+ format: int32+ - name: pageTokenin: query- description: Show deleted policies if specified.+ description: |-+ Not used.+ A page token, received from a previous `ListInstanceRoles` call.+ Provide this to retrieve the subsequent page.++ When paginating, all other parameters provided to `ListInstanceRoles` must match+ the call that provided the page token.+ schema:+ type: string+ title: page_token+ - name: refresh+ in: query+ description: Refresh will refresh and return the latest data.schema:type: boolean- title: show_deleted+ title: refreshresponses:"200":description: Successcontent:application/json:schema:- $ref: '#/components/schemas/bytebase.v1.ListPoliciesResponse'+ $ref: '#/components/schemas/bytebase.v1.ListInstanceRolesResponse'+ /v1/instances/{instance}:addDataSource:post:tags:- - OrgPolicyService- summary: CreatePolicy+ - InstanceService+ summary: AddDataSourcedescription: |-- Creates a new organizational policy.- Permissions required: bb.policies.create- operationId: OrgPolicyService_CreatePolicy4+ Adds a read-only data source to an instance.+ Permissions required: bb.instances.update+ operationId: InstanceService_AddDataSourceparameters:- name: instancein: path@@ -5365,36 +4978,43 @@ paths:required: trueschema:type: string- - name: type- in: query- description: The type of policy to create.- schema:- title: type- $ref: '#/components/schemas/bytebase.v1.PolicyType'requestBody:- description: The policy to create.content:application/json:schema:- title: policy- description: The policy to create.- $ref: '#/components/schemas/bytebase.v1.Policy'+ type: object+ properties:+ dataSource:+ title: data_source+ description: |-+ Identified by data source ID.+ Only READ_ONLY data source can be added.+ $ref: '#/components/schemas/bytebase.v1.DataSource'+ validateOnly:+ type: boolean+ title: validate_only+ description: Validate only also tests the data source connection.+ title: AddDataSourceRequest+ required:+ - dataSource+ additionalProperties: false+ required: trueresponses:"200":description: Successcontent:application/json:schema:- $ref: '#/components/schemas/bytebase.v1.Policy'- /v1/instances/{instance}/policies/{policy}:- get:+ $ref: '#/components/schemas/bytebase.v1.Instance'+ /v1/instances/{instance}:databases:+ post:tags:- - OrgPolicyService- summary: GetPolicy+ - InstanceService+ summary: ListInstanceDatabasedescription: |-- Retrieves a policy by name.- Permissions required: bb.policies.get- operationId: OrgPolicyService_GetPolicy4+ Lists all databases within an instance without creating them.+ Permissions required: bb.instances.get+ operationId: InstanceService_ListInstanceDatabaseparameters:- name: instancein: path@@ -5402,27 +5022,79 @@ paths:required: trueschema:type: string- - name: policy+ requestBody:+ content:+ application/json:+ schema:+ type: object+ properties:+ instance:+ oneOf:+ - $ref: '#/components/schemas/bytebase.v1.Instance'+ - type: "null"+ title: instance+ description: The target instance. We need to set this field if the target instance is not created yet.+ title: ListInstanceDatabaseRequest+ required:+ - instance+ additionalProperties: false+ required: true+ responses:+ "200":+ description: Success+ content:+ application/json:+ schema:+ $ref: '#/components/schemas/bytebase.v1.ListInstanceDatabaseResponse'+ /v1/instances/{instance}:removeDataSource:+ post:+ tags:+ - InstanceService+ summary: RemoveDataSource+ description: |-+ Removes a read-only data source from an instance.+ Permissions required: bb.instances.update+ operationId: InstanceService_RemoveDataSource+ parameters:+ - name: instancein: path- description: The policy id.+ description: The instance id.required: trueschema:type: string+ requestBody:+ content:+ application/json:+ schema:+ type: object+ properties:+ dataSource:+ title: data_source+ description: |-+ Identified by data source ID.+ Only READ_ONLY data source can be removed.+ $ref: '#/components/schemas/bytebase.v1.DataSource'+ title: RemoveDataSourceRequest+ required:+ - dataSource+ additionalProperties: false+ required: trueresponses:"200":description: Successcontent:application/json:schema:- $ref: '#/components/schemas/bytebase.v1.Policy'- delete:+ $ref: '#/components/schemas/bytebase.v1.Instance'+ /v1/instances/{instance}:sync:+ post:tags:- - OrgPolicyService- summary: DeletePolicy+ - InstanceService+ summary: SyncInstancedescription: |-- Deletes an organizational policy.- Permissions required: bb.policies.delete- operationId: OrgPolicyService_DeletePolicy4+ Syncs database schemas and metadata from an instance.+ Permissions required: bb.instances.sync+ operationId: InstanceService_SyncInstanceparameters:- name: instancein: path@@ -5430,9 +5102,41 @@ paths:required: trueschema:type: string- - name: policy+ requestBody:+ content:+ application/json:+ schema:+ type: object+ properties:+ enableFullSync:+ type: boolean+ title: enable_full_sync+ description: |-+ When full sync is enabled, all databases in the instance will be synchronized. Otherwise, only+ the instance metadata (such as the database list) and any newly discovered databases will be synced.+ title: SyncInstanceRequest+ additionalProperties: false+ required: true+ responses:+ "200":+ description: Success+ content:+ application/json:+ schema:+ $ref: '#/components/schemas/bytebase.v1.SyncInstanceResponse'+ /v1/instances/{instance}:undelete:+ post:+ tags:+ - InstanceService+ summary: UndeleteInstance+ description: |-+ Restores a soft-deleted database instance.+ Permissions required: bb.instances.undelete+ operationId: InstanceService_UndeleteInstance+ parameters:+ - name: instancein: path- description: The policy id.+ description: The instance id.required: trueschema:type: string@@ -5442,15 +5146,16 @@ paths:content:application/json:schema:- $ref: '#/components/schemas/google.protobuf.Empty'+ $ref: '#/components/schemas/bytebase.v1.Instance'+ /v1/instances/{instance}:updateDataSource:patch:tags:- - OrgPolicyService- summary: UpdatePolicy+ - InstanceService+ summary: UpdateDataSourcedescription: |-- Updates an existing organizational policy.- Permissions required: bb.policies.update- operationId: OrgPolicyService_UpdatePolicy4+ Updates a data source configuration.+ Permissions required: bb.instances.update+ operationId: InstanceService_UpdateDataSourceparameters:- name: instancein: path@@ -5458,12 +5163,6 @@ paths:required: trueschema:type: string- - name: policy- in: path- description: The policy id.- required: true- schema:- type: string- name: updateMaskin: querydescription: |-@@ -5668,68 +5367,95 @@ paths:`INVALID_ARGUMENT` error if any path is unmappable.schema:type: string+ - name: validateOnly+ in: query+ description: Validate only also tests the data source connection.+ schema:+ type: boolean+ title: validate_only- name: allowMissingin: querydescription: |-- If set to true, and the policy is not found, a new policy will be created.+ If set to true, and the data source is not found, a new data source will be created.In this situation, `update_mask` is ignored.schema:type: booleantitle: allow_missingrequestBody:- description: |-- The policy to update.-- The policy's `name` field is used to identify the instance to update.- Format: {resource name}/policies/{policy type}- Workspace resource name: workspaces/{workspace-id}.- Environment resource name: environments/environment-id.- Instance resource name: instances/instance-id.- Database resource name: instances/instance-id/databases/database-name.+ description: Identified by data source ID.content:application/json:schema:- title: policy- description: |-- The policy to update.-- The policy's `name` field is used to identify the instance to update.- Format: {resource name}/policies/{policy type}- Workspace resource name: workspaces/{workspace-id}.- Environment resource name: environments/environment-id.- Instance resource name: instances/instance-id.- Database resource name: instances/instance-id/databases/database-name.- $ref: '#/components/schemas/bytebase.v1.Policy'+ title: data_source+ description: Identified by data source ID.+ $ref: '#/components/schemas/bytebase.v1.DataSource'responses:"200":description: Successcontent:application/json:schema:- $ref: '#/components/schemas/bytebase.v1.Policy'- /v1/instances/{instance}/roles:- get:+ $ref: '#/components/schemas/bytebase.v1.Instance'+ /v1/instances:batchSync:+ post:tags:- - InstanceRoleService- summary: ListInstanceRoles+ - InstanceService+ summary: BatchSyncInstancesdescription: |-- Lists all database roles in an instance.- Permissions required: bb.instanceRoles.list- operationId: InstanceRoleService_ListInstanceRoles+ Syncs multiple instances in a single request.+ Permissions required: bb.instances.sync+ operationId: InstanceService_BatchSyncInstances+ requestBody:+ content:+ application/json:+ schema:+ $ref: '#/components/schemas/bytebase.v1.BatchSyncInstancesRequest'+ required: true+ responses:+ "200":+ description: Success+ content:+ application/json:+ schema:+ $ref: '#/components/schemas/bytebase.v1.BatchSyncInstancesResponse'+ /v1/instances:batchUpdate:+ post:+ tags:+ - InstanceService+ summary: BatchUpdateInstances+ description: |-+ Updates multiple instances in a single request.+ Permissions required: bb.instances.update+ operationId: InstanceService_BatchUpdateInstances+ requestBody:+ content:+ application/json:+ schema:+ $ref: '#/components/schemas/bytebase.v1.BatchUpdateInstancesRequest'+ required: true+ responses:+ "200":+ description: Success+ content:+ application/json:+ schema:+ $ref: '#/components/schemas/bytebase.v1.BatchUpdateInstancesResponse'+ /v1/projects:+ get:+ tags:+ - ProjectService+ summary: ListProjects+ description: |-+ Lists all projects in the workspace with optional filtering.+ Permissions required: bb.projects.list+ operationId: ProjectService_ListProjectsparameters:- - name: instance- in: path- description: The instance id.- required: true- schema:- type: string- name: pageSizein: querydescription: |-- Not used.- The maximum number of roles to return. The service may return fewer than+ The maximum number of projects to return. The service may return fewer thanthis value.- If unspecified, at most 10 roles will be returned.+ If unspecified, at most 10 projects will be returned.The maximum value is 1000; values above 1000 will be coerced to 1000.schema:type: integer@@ -5738,226 +5464,153 @@ paths:- name: pageTokenin: querydescription: |-- Not used.- A page token, received from a previous `ListInstanceRoles` call.+ A page token, received from a previous `ListProjects` call.Provide this to retrieve the subsequent page.- When paginating, all other parameters provided to `ListInstanceRoles` must match+ When paginating, all other parameters provided to `ListProjects` must matchthe call that provided the page token.schema:type: stringtitle: page_token- - name: refresh+ - name: showDeletedin: query- description: Refresh will refresh and return the latest data.+ description: Show deleted projects if specified.schema:type: boolean- title: refresh+ title: show_deleted+ - name: filter+ in: query+ description: |-+ Filter the project.+ Check filter for SearchProjectsRequest for details.+ Supports filtering by name, resource_id, state, and labels (e.g., labels.environment == "production").+ schema:+ type: string+ title: filter+ - name: orderBy+ in: query+ description: |-+ The order by of projects.+ Support title. The default sorting order is ascending.+ For example:+ - order_by = "title"+ - order_by = "title desc"+ - order_by = "title asc"+ schema:+ type: string+ title: order_byresponses:"200":description: Successcontent:application/json:schema:- $ref: '#/components/schemas/bytebase.v1.ListInstanceRolesResponse'- /v1/instances/{instance}:addDataSource:+ $ref: '#/components/schemas/bytebase.v1.ListProjectsResponse'post:tags:- - InstanceService- summary: AddDataSource+ - ProjectService+ summary: CreateProjectdescription: |-- Adds a read-only data source to an instance.- Permissions required: bb.instances.update- operationId: InstanceService_AddDataSource+ Creates a new project in the workspace.+ Permissions required: bb.projects.create+ operationId: ProjectService_CreateProjectparameters:- - name: instance- in: path- description: The instance id.- required: true+ - name: projectId+ in: query+ description: |-+ The ID to use for the project, which will become the final component of+ the project's resource name.++ This value should be 4-63 characters, and valid characters+ are /[a-z][0-9]-/.schema:type: string+ title: project_idrequestBody:+ description: The project to create.content:application/json:schema:- type: object- properties:- dataSource:- title: data_source- description: |-- Identified by data source ID.- Only READ_ONLY data source can be added.- $ref: '#/components/schemas/bytebase.v1.DataSource'- validateOnly:- type: boolean- title: validate_only- description: Validate only also tests the data source connection.- title: AddDataSourceRequest- required:- - dataSource- additionalProperties: false- required: true+ title: project+ description: The project to create.+ $ref: '#/components/schemas/bytebase.v1.Project'responses:"200":description: Successcontent:application/json:schema:- $ref: '#/components/schemas/bytebase.v1.Instance'- /v1/instances/{instance}:databases:- post:+ $ref: '#/components/schemas/bytebase.v1.Project'+ /v1/projects/{project}:+ get:tags:- - InstanceService- summary: ListInstanceDatabase+ - ProjectService+ summary: GetProjectdescription: |-- Lists all databases within an instance without creating them.- Permissions required: bb.instances.get- operationId: InstanceService_ListInstanceDatabase+ GetProject retrieves a project by name.+ Users with "bb.projects.get" permission on the workspace or the project owner can access this method.+ Permissions required: bb.projects.get+ operationId: ProjectService_GetProjectparameters:- - name: instance+ - name: projectin: path- description: The instance id.+ description: The project id.required: trueschema:type: string- requestBody:- content:- application/json:- schema:- type: object- properties:- instance:- oneOf:- - $ref: '#/components/schemas/bytebase.v1.Instance'- - type: "null"- title: instance- description: The target instance. We need to set this field if the target instance is not created yet.- title: ListInstanceDatabaseRequest- required:- - instance- additionalProperties: false- required: trueresponses:"200":description: Successcontent:application/json:schema:- $ref: '#/components/schemas/bytebase.v1.ListInstanceDatabaseResponse'- /v1/instances/{instance}:removeDataSource:- post:+ $ref: '#/components/schemas/bytebase.v1.Project'+ delete:tags:- - InstanceService- summary: RemoveDataSource+ - ProjectService+ summary: DeleteProjectdescription: |-- Removes a read-only data source from an instance.- Permissions required: bb.instances.update- operationId: InstanceService_RemoveDataSource+ Deletes (soft-delete or purge) a project.+ Permissions required: bb.projects.delete+ operationId: ProjectService_DeleteProjectparameters:- - name: instance+ - name: projectin: path- description: The instance id.+ description: The project id.required: trueschema:type: string- requestBody:- content:- application/json:- schema:- type: object- properties:- dataSource:- title: data_source- description: |-- Identified by data source ID.- Only READ_ONLY data source can be removed.- $ref: '#/components/schemas/bytebase.v1.DataSource'- title: RemoveDataSourceRequest- required:- - dataSource- additionalProperties: false- required: true+ - name: purge+ in: query+ description: |-+ If set to true, permanently purge the soft-deleted project and all related resources.+ This operation is irreversible. Following AIP-165, this should only be used for+ administrative cleanup of old soft-deleted projects.+ The project must already be soft-deleted for this to work.+ When purge=true, all databases will be moved to the default project before deletion.+ When purge=false (soft delete/archive), the project and its databases/issues remain unchanged.+ schema:+ type: boolean+ title: purgeresponses:"200":description: Successcontent:application/json:schema:- $ref: '#/components/schemas/bytebase.v1.Instance'- /v1/instances/{instance}:sync:- post:+ $ref: '#/components/schemas/google.protobuf.Empty'+ patch:tags:- - InstanceService- summary: SyncInstance+ - ProjectService+ summary: UpdateProjectdescription: |-- Syncs database schemas and metadata from an instance.- Permissions required: bb.instances.sync- operationId: InstanceService_SyncInstance+ Updates an existing project's properties.+ Permissions required: bb.projects.update+ operationId: ProjectService_UpdateProjectparameters:- - name: instance+ - name: projectin: path- description: The instance id.- required: true- schema:- type: string- requestBody:- content:- application/json:- schema:- type: object- properties:- enableFullSync:- type: boolean- title: enable_full_sync- description: |-- When full sync is enabled, all databases in the instance will be synchronized. Otherwise, only- the instance metadata (such as the database list) and any newly discovered databases will be synced.- title: SyncInstanceRequest- additionalProperties: false- required: true- responses:- "200":- description: Success- content:- application/json:- schema:- $ref: '#/components/schemas/bytebase.v1.SyncInstanceResponse'- /v1/instances/{instance}:undelete:- post:- tags:- - InstanceService- summary: UndeleteInstance- description: |-- Restores a soft-deleted database instance.- Permissions required: bb.instances.undelete- operationId: InstanceService_UndeleteInstance- parameters:- - name: instance- in: path- description: The instance id.- required: true- schema:- type: string- responses:- "200":- description: Success- content:- application/json:- schema:- $ref: '#/components/schemas/bytebase.v1.Instance'- /v1/instances/{instance}:updateDataSource:- patch:- tags:- - InstanceService- summary: UpdateDataSource- description: |-- Updates a data source configuration.- Permissions required: bb.instances.update- operationId: InstanceService_UpdateDataSource- parameters:- - name: instance- in: path- description: The instance id.+ description: The project id.required: trueschema:type: string@@ -6165,135 +5818,102 @@ paths:`INVALID_ARGUMENT` error if any path is unmappable.schema:type: string- - name: validateOnly- in: query- description: Validate only also tests the data source connection.- schema:- type: boolean- title: validate_only- name: allowMissingin: querydescription: |-- If set to true, and the data source is not found, a new data source will be created.+ If set to true, and the project is not found, a new project will be created.In this situation, `update_mask` is ignored.schema:type: booleantitle: allow_missingrequestBody:- description: Identified by data source ID.- content:- application/json:- schema:- title: data_source- description: Identified by data source ID.- $ref: '#/components/schemas/bytebase.v1.DataSource'- responses:- "200":- description: Success- content:- application/json:- schema:- $ref: '#/components/schemas/bytebase.v1.Instance'- /v1/instances:batchSync:- post:- tags:- - InstanceService- summary: BatchSyncInstances- description: |-- Syncs multiple instances in a single request.- Permissions required: bb.instances.sync- operationId: InstanceService_BatchSyncInstances- requestBody:- content:- application/json:- schema:- $ref: '#/components/schemas/bytebase.v1.BatchSyncInstancesRequest'- required: true- responses:- "200":- description: Success- content:- application/json:- schema:- $ref: '#/components/schemas/bytebase.v1.BatchSyncInstancesResponse'- /v1/instances:batchUpdate:- post:- tags:- - InstanceService- summary: BatchUpdateInstances- description: |-- Updates multiple instances in a single request.- Permissions required: bb.instances.update- operationId: InstanceService_BatchUpdateInstances- requestBody:+ description: |-+ The project to update.++ The project's `name` field is used to identify the project to update.+ Format: projects/{project}content:application/json:schema:- $ref: '#/components/schemas/bytebase.v1.BatchUpdateInstancesRequest'- required: true+ title: project+ description: |-+ The project to update.++ The project's `name` field is used to identify the project to update.+ Format: projects/{project}+ $ref: '#/components/schemas/bytebase.v1.Project'responses:"200":description: Successcontent:application/json:schema:- $ref: '#/components/schemas/bytebase.v1.BatchUpdateInstancesResponse'- /v1/projects:+ $ref: '#/components/schemas/bytebase.v1.Project'+ /v1/projects/{project}/accessGrants:get:tags:- - ProjectService- summary: ListProjects- description: |-- Lists all projects in the workspace with optional filtering.- Permissions required: bb.projects.list- operationId: ProjectService_ListProjects+ - AccessGrantService+ summary: ListAccessGrants+ description: Lists access grants in a project.+ operationId: AccessGrantService_ListAccessGrantsparameters:+ - name: project+ in: path+ description: The project id.+ required: true+ schema:+ type: string- name: pageSizein: query- description: |-- The maximum number of projects to return. The service may return fewer than- this value.- If unspecified, at most 10 projects will be returned.- The maximum value is 1000; values above 1000 will be coerced to 1000.+ description: The maximum number of access grants to return.schema:type: integertitle: page_sizeformat: int32- name: pageTokenin: query- description: |-- A page token, received from a previous `ListProjects` call.- Provide this to retrieve the subsequent page.-- When paginating, all other parameters provided to `ListProjects` must match- the call that provided the page token.+ description: A page token from a previous ListAccessGrants call.schema:type: stringtitle: page_token- - name: showDeleted- in: query- description: Show deleted projects if specified.- schema:- type: boolean- title: show_deleted- name: filterin: querydescription: |-- Filter the project.- Check filter for SearchProjectsRequest for details.- Supports filtering by name, resource_id, state, and labels (e.g., labels.environment == "production").+ Filter expression using AIP-160 syntax.+ Supported fields:+ - name: the fullname in "projects/{project}/accessGrants/{access_grant}" format, support "==" operator.+ - creator: the creator name in "users/{email}" format, support "==" operator.+ - status: the access status, support "==" and "in" operator.+ - issue: the access issue fullname, support "==" operator.+ - expire_time: the access expire time in "2006-01-02T15:04:05Z07:00" format, support ">=", ">", "<=" and "<" operator.+ - create_time: the access creation time in "2006-01-02T15:04:05Z07:00" format, support ">=", ">", "<=" and "<" operator.+ - query: the access query, support "==" and ".contains(xx)" operator+ - target: the target database fullname, support "==" operator.+ - unmask: whether the grant allows unmasking sensitive data, support "==" operator with a boolean literal.+ - export: whether the grant allows exporting the query result, support "==" operator with a boolean literal.++ Examples:+ - creator == "users/[email protected]"+ - status == "ACTIVE"+ - status in ["ACTIVE", "PENDING"]+ - creator == "users/[email protected]" && status == "ACTIVE"+ - issue == "projects/x/issues/123"+ - status == "ACTIVE" && expire_time > "2024-02-01T00:00:00Z"+ - target == "instances/sample/databases/employee"+ - unmask == true+ - export == true && status == "ACTIVE"schema:type: stringtitle: filter- name: orderByin: querydescription: |-- The order by of projects.- Support title. The default sorting order is ascending.+ The order by of access grants.+ Support creator, expire_time, create_time. The default sorting order is ascending.For example:- - order_by = "title"- - order_by = "title desc"- - order_by = "title asc"+ - order_by = "creator"+ - order_by = "expire_time desc"+ - order_by = "expire_time asc, create_time desc"schema:type: stringtitle: order_by@@ -6303,52 +5923,42 @@ paths:content:application/json:schema:- $ref: '#/components/schemas/bytebase.v1.ListProjectsResponse'+ $ref: '#/components/schemas/bytebase.v1.ListAccessGrantsResponse'post:tags:- - ProjectService- summary: CreateProject- description: |-- Creates a new project in the workspace.- Permissions required: bb.projects.create- operationId: ProjectService_CreateProject+ - AccessGrantService+ summary: CreateAccessGrant+ description: Creates an access grant.+ operationId: AccessGrantService_CreateAccessGrantparameters:- - name: projectId- in: query- description: |-- The ID to use for the project, which will become the final component of- the project's resource name.-- This value should be 4-63 characters, and valid characters- are /[a-z][0-9]-/.+ - name: project+ in: path+ description: The project id.+ required: trueschema:type: string- title: project_idrequestBody:- description: The project to create.+ description: The access grant to create.content:application/json:schema:- title: project- description: The project to create.- $ref: '#/components/schemas/bytebase.v1.Project'+ title: access_grant+ description: The access grant to create.+ $ref: '#/components/schemas/bytebase.v1.AccessGrant'responses:"200":description: Successcontent:application/json:schema:- $ref: '#/components/schemas/bytebase.v1.Project'- /v1/projects/{project}:+ $ref: '#/components/schemas/bytebase.v1.AccessGrant'+ /v1/projects/{project}/accessGrants/{accessGrant}:get:tags:- - ProjectService- summary: GetProject- description: |-- GetProject retrieves a project by name.- Users with "bb.projects.get" permission on the workspace or the project owner can access this method.- Permissions required: bb.projects.get- operationId: ProjectService_GetProject+ - AccessGrantService+ summary: GetAccessGrant+ description: Gets an access grant by name.+ operationId: AccessGrantService_GetAccessGrantparameters:- name: projectin: path@@ -6356,21 +5966,26 @@ paths:required: trueschema:type: string+ - name: accessGrant+ in: path+ description: The accessGrant id.+ required: true+ schema:+ type: stringresponses:"200":description: Successcontent:application/json:schema:- $ref: '#/components/schemas/bytebase.v1.Project'- delete:+ $ref: '#/components/schemas/bytebase.v1.AccessGrant'+ /v1/projects/{project}/accessGrants/{accessGrant}:activate:+ post:tags:- - ProjectService- summary: DeleteProject- description: |-- Deletes (soft-delete or purge) a project.- Permissions required: bb.projects.delete- operationId: ProjectService_DeleteProject+ - AccessGrantService+ summary: ActivateAccessGrant+ description: Activates a pending access grant.+ operationId: AccessGrantService_ActivateAccessGrantparameters:- name: projectin: path@@ -6378,33 +5993,102 @@ paths:required: trueschema:type: string- - name: purge- in: query- description: |-- If set to true, permanently purge the soft-deleted project and all related resources.- This operation is irreversible. Following AIP-165, this should only be used for- administrative cleanup of old soft-deleted projects.- The project must already be soft-deleted for this to work.- When purge=true, all databases will be moved to the default project before deletion.- When purge=false (soft delete/archive), the project and its databases/issues remain unchanged.+ - name: accessGrant+ in: path+ description: The accessGrant id.+ required: trueschema:- type: boolean- title: purge+ type: stringresponses:"200":description: Successcontent:application/json:schema:- $ref: '#/components/schemas/google.protobuf.Empty'- patch:+ $ref: '#/components/schemas/bytebase.v1.AccessGrant'+ /v1/projects/{project}/accessGrants/{accessGrant}:revoke:+ post:tags:- - ProjectService- summary: UpdateProject+ - AccessGrantService+ summary: RevokeAccessGrant+ description: Revokes an active access grant.+ operationId: AccessGrantService_RevokeAccessGrant+ parameters:+ - name: project+ in: path+ description: The project id.+ required: true+ schema:+ type: string+ - name: accessGrant+ in: path+ description: The accessGrant id.+ required: true+ schema:+ type: string+ responses:+ "200":+ description: Success+ content:+ application/json:+ schema:+ $ref: '#/components/schemas/bytebase.v1.AccessGrant'+ /v1/projects/{project}/accessGrants:searchMy:+ post:+ tags:+ - AccessGrantService+ summary: SearchMyAccessGrants+ description: Searches access grants created by the caller.+ operationId: AccessGrantService_SearchMyAccessGrants+ 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 access grants to return.+ pageToken:+ type: string+ title: page_token+ description: A page token from a previous SearchMyAccessGrants call.+ filter:+ type: string+ title: filter+ description: Check the filter field in the ListAccessGrantsRequest message.+ orderBy:+ type: string+ title: order_by+ description: Check the order_by field in the ListAccessGrantsRequest message.+ title: SearchMyAccessGrantsRequest+ additionalProperties: false+ required: true+ responses:+ "200":+ description: Success+ content:+ application/json:+ schema:+ $ref: '#/components/schemas/bytebase.v1.SearchMyAccessGrantsResponse'+ /v1/projects/{project}/auditLogs:export:+ post:+ tags:+ - AuditLogService+ summary: ExportAuditLogsdescription: |-- Updates an existing project's properties.- Permissions required: bb.projects.update- operationId: ProjectService_UpdateProject+ Exports audit logs in a specified format for external analysis.+ Permissions required: bb.auditLogs.export+ operationId: AuditLogService_ExportAuditLogsparameters:- name: projectin: path@@ -6412,107 +6096,394 @@ paths:required: trueschema:type: string- - name: updateMask- in: query- description: |-- `FieldMask` represents a set of symbolic field paths, for example:-- paths: "f.a"- paths: "f.b.d"-- Here `f` represents a field in some root message, `a` and `b`- fields in the message found in `f`, and `d` a field found in the- message in `f.b`.-- Field masks are used to specify a subset of fields that should be- returned by a get operation or modified by an update operation.- Field masks also have a custom JSON encoding (see below).-- # Field Masks in Projections-- When used in the context of a projection, a response message or- sub-message is filtered by the API to only contain those fields as- specified in the mask. For example, if the mask in the previous- example is applied to a response message as follows:-- f {- a : 22- b {- d : 1- x : 2- }- y : 13- }- z: 8-- The result will not contain specific values for fields x,y and z- (their value will be set to the default, and omitted in proto text- output):--- f {- a : 22- b {- d : 1- }- }-- A repeated field is not allowed except at the last position of a- paths string.-- If a FieldMask object is not present in a get operation, the- operation applies to all fields (as if a FieldMask of all fields- had been specified).+ requestBody:+ content:+ application/json:+ schema:+ type: object+ properties:+ filter:+ type: string+ title: filter+ description: |-+ The filter of the log. It should be a valid CEL expression.+ Check the filter field in the SearchAuditLogsRequest message.+ orderBy:+ type: string+ title: order_by+ description: |-+ The order by of the log.+ Only support order by create_time. The default sorting order is ascending.+ For example:+ - order_by = "create_time asc"+ - order_by = "create_time desc"+ format:+ title: format+ description: The export format.+ $ref: '#/components/schemas/bytebase.v1.ExportFormat'+ pageSize:+ type: integer+ title: page_size+ format: int32+ description: |-+ The maximum number of logs to return.+ The service may return fewer than this value.+ If unspecified, at most 10 log entries will be returned.+ The maximum value is 5000; values above 5000 will be coerced to 5000.+ pageToken:+ type: string+ title: page_token+ description: |-+ A page token, received from a previous `ExportAuditLogs` call.+ Provide this to retrieve the subsequent page.+ title: ExportAuditLogsRequest+ additionalProperties: false+ description: Request message for exporting audit logs.+ required: true+ responses:+ "200":+ description: Success+ content:+ application/json:+ schema:+ $ref: '#/components/schemas/bytebase.v1.ExportAuditLogsResponse'+ /v1/projects/{project}/auditLogs:search:+ post:+ tags:+ - AuditLogService+ summary: SearchAuditLogs+ description: |-+ Searches audit logs with optional filtering and pagination.+ Permissions required: bb.auditLogs.search+ operationId: AuditLogService_SearchAuditLogs+ parameters:+ - name: project+ in: path+ description: The project id.+ required: true+ schema:+ type: string+ requestBody:+ content:+ application/json:+ schema:+ type: object+ properties:+ filter:+ type: string+ title: filter+ description: |-+ The filter of the log. It should be a valid CEL expression.+ The syntax and semantics of CEL are documented at https://github.com/google/cel-spec- Note that a field mask does not necessarily apply to the- top-level response message. In case of a REST get operation, the- field mask applies directly to the response, but in case of a REST- list operation, the mask instead applies to each individual message- in the returned resource list. In case of a REST custom method,- other definitions may be used. Where the mask applies will be- clearly documented together with its declaration in the API. In- any case, the effect on the returned resource/resources is required- behavior for APIs.+ Supported filter:+ - method: the API name, can be found in the docs, should start with "/bytebase.v1." prefix. For example "/bytebase.v1.UserService/CreateUser". Support "==" operator.+ - severity: support "==" operator, check Severity enum in AuditLog message for values.+ - user: the actor, should in "users/{email}" format, support "==" operator.+ - create_time: support ">=" and "<=" operator.- # Field Masks in Update Operations+ For example:+ - filter = "method == '/bytebase.v1.SQLService/Query'"+ - filter = "method == '/bytebase.v1.SQLService/Query' && severity == 'ERROR'"+ - filter = "method == '/bytebase.v1.SQLService/Query' && severity == 'ERROR' && user == 'users/[email protected]'"+ - filter = "method == '/bytebase.v1.SQLService/Query' && severity == 'ERROR' && create_time <= '2021-01-01T00:00:00Z' && create_time >= '2020-01-01T00:00:00Z'"+ orderBy:+ type: string+ title: order_by+ description: |-+ The order by of the log.+ Only support order by create_time. The default sorting order is ascending.+ For example:+ - order_by = "create_time asc"+ - order_by = "create_time desc"+ pageSize:+ type: integer+ title: page_size+ format: int32+ description: |-+ The maximum number of logs to return.+ The service may return fewer than this value.+ If unspecified, at most 10 log entries will be returned.+ The maximum value is 5000; values above 5000 will be coerced to 5000.+ pageToken:+ type: string+ title: page_token+ description: |-+ A page token, received from a previous `SearchLogs` call.+ Provide this to retrieve the subsequent page.+ title: SearchAuditLogsRequest+ additionalProperties: false+ description: Request message for searching audit logs.+ required: true+ responses:+ "200":+ description: Success+ content:+ application/json:+ schema:+ $ref: '#/components/schemas/bytebase.v1.SearchAuditLogsResponse'+ /v1/projects/{project}/databaseGroups:+ get:+ tags:+ - DatabaseGroupService+ summary: ListDatabaseGroups+ description: |-+ Lists database groups in a project.+ Permissions required: bb.databaseGroups.list+ operationId: DatabaseGroupService_ListDatabaseGroups+ parameters:+ - name: project+ in: path+ description: The project id.+ required: true+ schema:+ type: string+ - name: view+ in: query+ description: The view to return. Defaults to DATABASE_GROUP_VIEW_BASIC.+ schema:+ title: view+ $ref: '#/components/schemas/bytebase.v1.DatabaseGroupView'+ responses:+ "200":+ description: Success+ content:+ application/json:+ schema:+ $ref: '#/components/schemas/bytebase.v1.ListDatabaseGroupsResponse'+ post:+ tags:+ - DatabaseGroupService+ summary: CreateDatabaseGroup+ description: |-+ Creates a new database group.+ Permissions required: bb.databaseGroups.create+ operationId: DatabaseGroupService_CreateDatabaseGroup+ parameters:+ - name: project+ in: path+ description: The project id.+ required: true+ schema:+ type: string+ - name: databaseGroupId+ in: query+ description: |-+ The ID to use for the database group, which will become the final component of+ the database group's resource name.- A field mask in update operations specifies which fields of the- targeted resource are going to be updated. The API is required- to only change the values of the fields as specified in the mask- and leave the others untouched. If a resource is passed in to- describe the updated values, the API ignores the values of all- fields not covered by the mask.+ This value should be 4-63 characters, and valid characters+ are /[a-z][0-9]-/.+ schema:+ type: string+ title: database_group_id+ - name: validateOnly+ in: query+ description: If set, validate the create request and preview the full database group response, but do not actually create it.+ schema:+ type: boolean+ title: validate_only+ requestBody:+ description: The database group to create.+ content:+ application/json:+ schema:+ title: database_group+ description: The database group to create.+ $ref: '#/components/schemas/bytebase.v1.DatabaseGroup'+ responses:+ "200":+ description: Success+ content:+ application/json:+ schema:+ $ref: '#/components/schemas/bytebase.v1.DatabaseGroup'+ /v1/projects/{project}/databaseGroups/{databaseGroup}:+ get:+ tags:+ - DatabaseGroupService+ summary: GetDatabaseGroup+ description: |-+ Gets a database group by name.+ Permissions required: bb.databaseGroups.get+ operationId: DatabaseGroupService_GetDatabaseGroup+ parameters:+ - name: project+ in: path+ description: The project id.+ required: true+ schema:+ type: string+ - name: databaseGroup+ in: path+ description: The databaseGroup id.+ required: true+ schema:+ type: string+ - name: view+ in: query+ description: The view to return. Defaults to DATABASE_GROUP_VIEW_BASIC.+ schema:+ title: view+ $ref: '#/components/schemas/bytebase.v1.DatabaseGroupView'+ responses:+ "200":+ description: Success+ content:+ application/json:+ schema:+ $ref: '#/components/schemas/bytebase.v1.DatabaseGroup'+ delete:+ tags:+ - DatabaseGroupService+ summary: DeleteDatabaseGroup+ description: |-+ Deletes a database group.+ Permissions required: bb.databaseGroups.delete+ operationId: DatabaseGroupService_DeleteDatabaseGroup+ parameters:+ - name: project+ in: path+ description: The project id.+ required: true+ schema:+ type: string+ - name: databaseGroup+ in: path+ description: The databaseGroup id.+ required: true+ schema:+ type: string+ responses:+ "200":+ description: Success+ content:+ application/json:+ schema:+ $ref: '#/components/schemas/google.protobuf.Empty'+ patch:+ tags:+ - DatabaseGroupService+ summary: UpdateDatabaseGroup+ description: |-+ Updates a database group.+ Permissions required: bb.databaseGroups.update+ When allow_missing=true, also requires: bb.databaseGroups.create+ operationId: DatabaseGroupService_UpdateDatabaseGroup+ parameters:+ - name: project+ in: path+ description: The project id.+ required: true+ schema:+ type: string+ - name: databaseGroup+ in: path+ description: The databaseGroup id.+ required: true+ schema:+ type: string+ - name: updateMask+ in: query+ description: |-+ `FieldMask` represents a set of symbolic field paths, for example:- If a repeated field is specified for an update operation, new values will- be appended to the existing repeated field in the target resource. Note that- a repeated field is only allowed in the last position of a `paths` string.+ paths: "f.a"+ paths: "f.b.d"- If a sub-message is specified in the last position of the field mask for an- update operation, then new value will be merged into the existing sub-message- in the target resource.+ Here `f` represents a field in some root message, `a` and `b`+ fields in the message found in `f`, and `d` a field found in the+ message in `f.b`.- For example, given the target message:+ Field masks are used to specify a subset of fields that should be+ returned by a get operation or modified by an update operation.+ Field masks also have a custom JSON encoding (see below).++ # Field Masks in Projections++ When used in the context of a projection, a response message or+ sub-message is filtered by the API to only contain those fields as+ specified in the mask. For example, if the mask in the previous+ example is applied to a response message as follows:f {+ a : 22b {- d: 1- x: 2+ d : 1+ x : 2}- c: [1]+ y : 13}+ z: 8++ The result will not contain specific values for fields x,y and z+ (their value will be set to the default, and omitted in proto text+ output):- And an update message:f {+ a : 22b {- d: 10+ d : 1}- c: [2]}- then if the field mask is:+ A repeated field is not allowed except at the last position of a+ paths string.- paths: ["f.b", "f.c"]+ If a FieldMask object is not present in a get operation, the+ operation applies to all fields (as if a FieldMask of all fields+ had been specified).++ Note that a field mask does not necessarily apply to the+ top-level response message. In case of a REST get operation, the+ field mask applies directly to the response, but in case of a REST+ list operation, the mask instead applies to each individual message+ in the returned resource list. In case of a REST custom method,+ other definitions may be used. Where the mask applies will be+ clearly documented together with its declaration in the API. In+ any case, the effect on the returned resource/resources is required+ behavior for APIs.++ # Field Masks in Update Operations++ A field mask in update operations specifies which fields of the+ targeted resource are going to be updated. The API is required+ to only change the values of the fields as specified in the mask+ and leave the others untouched. If a resource is passed in to+ describe the updated values, the API ignores the values of all+ fields not covered by the mask.++ If a repeated field is specified for an update operation, new values will+ be appended to the existing repeated field in the target resource. Note that+ a repeated field is only allowed in the last position of a `paths` string.++ If a sub-message is specified in the last position of the field mask for an+ update operation, then new value will be merged into the existing sub-message+ in the target resource.++ For example, given the target message:++ f {+ b {+ d: 1+ x: 2+ }+ c: [1]+ }++ And an update message:++ f {+ b {+ d: 10+ }+ c: [2]+ }++ then if the field mask is:++ paths: ["f.b", "f.c"]then the result will be:@@ -6616,44 +6587,3049 @@ paths:`INVALID_ARGUMENT` error if any path is unmappable.schema:type: string- - name: allowMissing+ - name: allowMissing+ in: query+ description: |-+ If set to true, and the database group is not found, a new database group will be created.+ In this situation, `update_mask` is ignored.+ schema:+ type: boolean+ title: allow_missing+ requestBody:+ description: |-+ The database group to update.++ The database group's `name` field is used to identify the database group to update.+ Format: projects/{project}/databaseGroups/{databaseGroup}+ content:+ application/json:+ schema:+ title: database_group+ description: |-+ The database group to update.++ The database group's `name` field is used to identify the database group to update.+ Format: projects/{project}/databaseGroups/{databaseGroup}+ $ref: '#/components/schemas/bytebase.v1.DatabaseGroup'+ responses:+ "200":+ description: Success+ content:+ application/json:+ schema:+ $ref: '#/components/schemas/bytebase.v1.DatabaseGroup'+ /v1/projects/{project}/databases:+ get:+ tags:+ - DatabaseService+ summary: ListDatabases+ description: |-+ Lists databases in a project, instance, or workspace.+ Permissions required: bb.projects.get (for project parent), bb.databases.list (for workspace parent), or bb.instances.get (for instance parent)+ operationId: DatabaseService_ListDatabases+ parameters:+ - name: project+ in: path+ description: The project id.+ required: true+ schema:+ type: string+ - name: pageSize+ in: query+ description: |-+ The maximum number of databases to return. The service may return fewer+ than this value.+ If unspecified, at most 10 databases will be returned.+ The maximum value is 1000; values above 1000 will be coerced to 1000.+ schema:+ type: integer+ title: page_size+ format: int32+ - name: pageToken+ in: query+ description: |-+ A page token, received from a previous `ListDatabases` call.+ Provide this to retrieve the subsequent page.++ When paginating, all other parameters provided to `ListDatabases` must+ match the call that provided the page token.+ schema:+ type: string+ title: page_token+ - name: filter+ in: query+ description: |-+ Filter is used to filter databases returned in the list.+ The syntax and semantics of CEL are documented at https://github.com/google/cel-spec++ Supported filter:+ - environment: the environment full name in "environments/{id}" format, support "==" operator.+ - name: the database name, support ".contains()" operator.+ - project: the project full name in "projects/{id}" format, support "==" operator.+ - instance: the instance full name in "instances/{id}" format, support "==" operator.+ - engine: the database engine, check Engine enum for values. Support "==", "in [xx]", "!(in [xx])" operator.+ - exclude_unassigned: should be "true" or "false", will not show unassigned databases if it's true, support "==" operator.+ - table: filter by the database table, support "==" and ".contains()" operator.+ - labels.{key}: the database label, support "==" and "in" operators.++ For example:+ environment == "environments/{environment resource id}"+ environment == "" (find databases which environment is not set)+ project == "projects/{project resource id}"+ instance == "instances/{instance resource id}"+ name.contains("database name")+ engine == "MYSQL"+ engine in ["MYSQL", "POSTGRES"]+ !(engine in ["MYSQL", "POSTGRES"])+ exclude_unassigned == true+ table == "sample"+ table.contains("sam")+ labels.environment == "production"+ labels.region == "asia"+ labels.region in ["asia", "europe"]++ You can combine filter conditions like:+ environment == "environments/prod" && name.contains("employee")+ schema:+ type: string+ title: filter+ - name: showDeleted+ in: query+ description: Show deleted database if specified.+ schema:+ type: boolean+ title: show_deleted+ - name: orderBy+ in: query+ description: |-+ The order by of databases.+ Support name, project, instance. The default sorting order is ascending.+ For example:+ - order_by = "name" - order by name ascending+ - order_by = "name desc"+ - order_by = "name desc, project asc"+ schema:+ type: string+ title: order_by+ responses:+ "200":+ description: Success+ content:+ application/json:+ schema:+ $ref: '#/components/schemas/bytebase.v1.ListDatabasesResponse'+ /v1/projects/{project}/databases:batchGet:+ get:+ tags:+ - DatabaseService+ summary: BatchGetDatabases+ description: |-+ Retrieves multiple databases by their names.+ Permissions required: bb.databases.get+ operationId: DatabaseService_BatchGetDatabases+ parameters:+ - name: project+ in: path+ description: The project id.+ required: true+ schema:+ type: string+ - name: names+ in: query+ description: The list of database names to retrieve.+ required: true+ schema:+ type: array+ items:+ type: string+ title: names+ responses:+ "200":+ description: Success+ content:+ application/json:+ schema:+ $ref: '#/components/schemas/bytebase.v1.BatchGetDatabasesResponse'+ /v1/projects/{project}/instances:+ get:+ tags:+ - InstanceService+ summary: ListInstances+ description: |-+ Lists database instances, optionally within a project.+ Permissions required: bb.instances.list+ operationId: InstanceService_ListInstances2+ parameters:+ - name: project+ in: path+ description: The project id.+ required: true+ schema:+ type: string+ - name: pageSize+ in: query+ description: |-+ The maximum number of instances to return. The service may return fewer than+ this value.+ If unspecified, at most 10 instances will be returned.+ The maximum value is 1000; values above 1000 will be coerced to 1000.+ schema:+ type: integer+ title: page_size+ format: int32+ - name: pageToken+ in: query+ description: |-+ A page token, received from a previous `ListInstances` call.+ Provide this to retrieve the subsequent page.++ When paginating, all other parameters provided to `ListInstances` must match+ the call that provided the page token.+ schema:+ type: string+ title: page_token+ - name: showDeleted+ in: query+ description: Show deleted instances if specified.+ schema:+ type: boolean+ title: show_deleted+ - name: filter+ in: query+ description: |-+ Filter the instance.+ The syntax and semantics of CEL are documented at https://github.com/google/cel-spec++ Supported filters:+ - name: the instance name, support "==" and ".contains()" operator.+ - resource_id: the instance id, support "==" and ".contains()" operator.+ - environment: the environment full name in "environments/{id}" format, support "==" operator.+ - state: the instance state, check State enum for values, support "==" operator.+ - engine: the instance engine, check Engine enum for values. Support "==", "in [xx]", "!(in [xx])" operator.+ - host: the instance host, support "==" and ".contains()" operator.+ - port: the instance port, support "==" and ".contains()" operator.+ - project: the project full name in "projects/{id}" format, support "==" operator.+ - labels.{key}: the instance label, support "==" and "in" operators.++ For example:+ name == "sample instance"+ name.contains("sample")+ resource_id == "sample-instance"+ resource_id.contains("sample")+ state == "DELETED"+ environment == "environments/test"+ environment == "" (find instances which environment is not set)+ engine == "MYSQL"+ engine in ["MYSQL", "POSTGRES"]+ !(engine in ["MYSQL", "POSTGRES"])+ host == "127.0.0.1"+ host.contains("127.0")+ port == "54321"+ port.contains("543")+ labels.org_group == "infrastructure"+ labels.environment in ["prod", "production"]+ project == "projects/sample-project"+ You can combine filter conditions like:+ name.contains("sample") && environment == "environments/test"+ host == "127.0.0.1" && port == "54321"+ schema:+ type: string+ title: filter+ - name: orderBy+ in: query+ description: |-+ The order by of instances.+ Support title, environment. The default sorting order is ascending.+ For example:+ - order_by = "title"+ - order_by = "title desc"+ - order_by = "title desc, environment asc"+ schema:+ type: string+ title: order_by+ responses:+ "200":+ description: Success+ content:+ application/json:+ schema:+ $ref: '#/components/schemas/bytebase.v1.ListInstancesResponse'+ post:+ tags:+ - InstanceService+ summary: CreateInstance+ description: |-+ Creates a new database instance.+ Permissions required: bb.instances.create+ operationId: InstanceService_CreateInstance2+ parameters:+ - name: project+ in: path+ description: The project id.+ required: true+ schema:+ type: string+ - name: instanceId+ in: query+ description: |-+ The ID to use for the instance, which will become the final component of+ the instance's resource name.++ This value should be 4-63 characters, and valid characters+ are /[a-z][0-9]-/.+ schema:+ type: string+ title: instance_id+ - name: validateOnly+ in: query+ description: Validate only also tests the data source connection.+ schema:+ type: boolean+ title: validate_only+ - name: initialDatabaseProject+ in: query+ description: |-+ The project to assign newly discovered databases to during initial sync.+ Format: projects/{project}. This must be unset when `parent` is set.+ schema:+ type: string+ title: initial_database_project+ requestBody:+ description: The instance to create.+ content:+ application/json:+ schema:+ title: instance+ description: The instance to create.+ $ref: '#/components/schemas/bytebase.v1.Instance'+ responses:+ "200":+ description: Success+ content:+ application/json:+ schema:+ $ref: '#/components/schemas/bytebase.v1.Instance'+ /v1/projects/{project}/instances/{instance}:+ get:+ tags:+ - InstanceService+ summary: GetInstance+ description: |-+ Gets a database instance by name.+ Permissions required: bb.instances.get+ operationId: InstanceService_GetInstance2+ parameters:+ - name: project+ in: path+ description: The project id.+ required: true+ schema:+ type: string+ - name: instance+ in: path+ description: The instance id.+ required: true+ schema:+ type: string+ responses:+ "200":+ description: Success+ content:+ application/json:+ schema:+ $ref: '#/components/schemas/bytebase.v1.Instance'+ delete:+ tags:+ - InstanceService+ summary: DeleteInstance+ description: |-+ Deletes or soft-deletes a database instance.+ Permissions required: bb.instances.delete+ operationId: InstanceService_DeleteInstance2+ parameters:+ - name: project+ in: path+ description: The project id.+ required: true+ schema:+ type: string+ - name: instance+ in: path+ description: The instance id.+ required: true+ schema:+ type: string+ - name: force+ in: query+ description: |-+ If set to true, a workspace instance's databases are moved to the default+ project before the instance is soft-deleted. Project instances reject this+ option because their databases must remain in the owning project.+ schema:+ type: boolean+ title: force+ - name: purge+ in: query+ description: |-+ If set to true, permanently purge the soft-deleted instance and all related resources.+ This operation is irreversible. Following AIP-165, this should only be used for+ administrative cleanup of old soft-deleted instances.+ The instance must already be soft-deleted for this to work.+ schema:+ type: boolean+ title: purge+ responses:+ "200":+ description: Success+ content:+ application/json:+ schema:+ $ref: '#/components/schemas/google.protobuf.Empty'+ patch:+ tags:+ - InstanceService+ summary: UpdateInstance+ description: |-+ Updates a database instance.+ Permissions required: bb.instances.update+ operationId: InstanceService_UpdateInstance2+ parameters:+ - name: project+ in: path+ description: The project id.+ required: true+ schema:+ type: string+ - name: instance+ in: path+ description: The instance id.+ required: true+ schema:+ type: string+ - name: updateMask+ in: query+ description: |-+ `FieldMask` represents a set of symbolic field paths, for example:++ paths: "f.a"+ paths: "f.b.d"++ Here `f` represents a field in some root message, `a` and `b`+ fields in the message found in `f`, and `d` a field found in the+ message in `f.b`.++ Field masks are used to specify a subset of fields that should be+ returned by a get operation or modified by an update operation.+ Field masks also have a custom JSON encoding (see below).++ # Field Masks in Projections++ When used in the context of a projection, a response message or+ sub-message is filtered by the API to only contain those fields as+ specified in the mask. For example, if the mask in the previous+ example is applied to a response message as follows:++ f {+ a : 22+ b {+ d : 1+ x : 2+ }+ y : 13+ }+ z: 8++ The result will not contain specific values for fields x,y and z+ (their value will be set to the default, and omitted in proto text+ output):+++ f {+ a : 22+ b {+ d : 1+ }+ }++ A repeated field is not allowed except at the last position of a+ paths string.++ If a FieldMask object is not present in a get operation, the+ operation applies to all fields (as if a FieldMask of all fields+ had been specified).++ Note that a field mask does not necessarily apply to the+ top-level response message. In case of a REST get operation, the+ field mask applies directly to the response, but in case of a REST+ list operation, the mask instead applies to each individual message+ in the returned resource list. In case of a REST custom method,+ other definitions may be used. Where the mask applies will be+ clearly documented together with its declaration in the API. In+ any case, the effect on the returned resource/resources is required+ behavior for APIs.++ # Field Masks in Update Operations++ A field mask in update operations specifies which fields of the+ targeted resource are going to be updated. The API is required+ to only change the values of the fields as specified in the mask+ and leave the others untouched. If a resource is passed in to+ describe the updated values, the API ignores the values of all+ fields not covered by the mask.++ If a repeated field is specified for an update operation, new values will+ be appended to the existing repeated field in the target resource. Note that+ a repeated field is only allowed in the last position of a `paths` string.++ If a sub-message is specified in the last position of the field mask for an+ update operation, then new value will be merged into the existing sub-message+ in the target resource.++ For example, given the target message:++ f {+ b {+ d: 1+ x: 2+ }+ c: [1]+ }++ And an update message:++ f {+ b {+ d: 10+ }+ c: [2]+ }++ then if the field mask is:++ paths: ["f.b", "f.c"]++ then the result will be:++ f {+ b {+ d: 10+ x: 2+ }+ c: [1, 2]+ }++ An implementation may provide options to override this default behavior for+ repeated and message fields.++ In order to reset a field's value to the default, the field must+ be in the mask and set to the default value in the provided resource.+ Hence, in order to reset all fields of a resource, provide a default+ instance of the resource and set all fields in the mask, or do+ not provide a mask as described below.++ If a field mask is not present on update, the operation applies to+ all fields (as if a field mask of all fields has been specified).+ Note that in the presence of schema evolution, this may mean that+ fields the client does not know and has therefore not filled into+ the request will be reset to their default. If this is unwanted+ behavior, a specific service may require a client to always specify+ a field mask, producing an error if not.++ As with get operations, the location of the resource which+ describes the updated values in the request message depends on the+ operation kind. In any case, the effect of the field mask is+ required to be honored by the API.++ ## Considerations for HTTP REST++ The HTTP kind of an update operation which uses a field mask must+ be set to PATCH instead of PUT in order to satisfy HTTP semantics+ (PUT must only be used for full updates).++ # JSON Encoding of Field Masks++ In JSON, a field mask is encoded as a single string where paths are+ separated by a comma. Fields name in each path are converted+ to/from lower-camel naming conventions.++ As an example, consider the following message declarations:++ message Profile {+ User user = 1;+ Photo photo = 2;+ }+ message User {+ string display_name = 1;+ string address = 2;+ }++ In proto a field mask for `Profile` may look as such:++ mask {+ paths: "user.display_name"+ paths: "photo"+ }++ In JSON, the same mask is represented as below:++ {+ mask: "user.displayName,photo"+ }++ # Field Masks and Oneof Fields++ Field masks treat fields in oneofs just as regular fields. Consider the+ following message:++ message SampleMessage {+ oneof test_oneof {+ string name = 4;+ SubMessage sub_message = 9;+ }+ }++ The field mask can be:++ mask {+ paths: "name"+ }++ Or:++ mask {+ paths: "sub_message"+ }++ Note that oneof type names ("test_oneof" in this case) cannot be used in+ paths.++ ## Field Mask Verification++ The implementation of any API method which has a FieldMask type field in the+ request should verify the included field paths, and return an+ `INVALID_ARGUMENT` error if any path is unmappable.+ schema:+ type: string+ - name: allowMissing+ in: query+ description: |-+ If set to true, and the instance is not found, a new instance will be created.+ In this situation, `update_mask` is ignored. A project-nested name creates+ the instance only under its encoded active, non-default project; it never+ falls back to a workspace instance.+ schema:+ type: boolean+ title: allow_missing+ requestBody:+ description: |-+ The instance to update.++ The instance's `name` field is used to identify the instance to update.+ Format: instances/{instance} or projects/{project}/instances/{instance}+ content:+ application/json:+ schema:+ title: instance+ description: |-+ The instance to update.++ The instance's `name` field is used to identify the instance to update.+ Format: instances/{instance} or projects/{project}/instances/{instance}+ $ref: '#/components/schemas/bytebase.v1.Instance'+ responses:+ "200":+ description: Success+ content:+ application/json:+ schema:+ $ref: '#/components/schemas/bytebase.v1.Instance'+ /v1/projects/{project}/instances/{instance}/databases:+ get:+ tags:+ - DatabaseService+ summary: ListDatabases+ description: |-+ Lists databases in a project, instance, or workspace.+ Permissions required: bb.projects.get (for project parent), bb.databases.list (for workspace parent), or bb.instances.get (for instance parent)+ operationId: DatabaseService_ListDatabases4+ parameters:+ - name: project+ in: path+ description: The project id.+ required: true+ schema:+ type: string+ - name: instance+ in: path+ description: The instance id.+ required: true+ schema:+ type: string+ - name: pageSize+ in: query+ description: |-+ The maximum number of databases to return. The service may return fewer+ than this value.+ If unspecified, at most 10 databases will be returned.+ The maximum value is 1000; values above 1000 will be coerced to 1000.+ schema:+ type: integer+ title: page_size+ format: int32+ - name: pageToken+ in: query+ description: |-+ A page token, received from a previous `ListDatabases` call.+ Provide this to retrieve the subsequent page.++ When paginating, all other parameters provided to `ListDatabases` must+ match the call that provided the page token.+ schema:+ type: string+ title: page_token+ - name: filter+ in: query+ description: |-+ Filter is used to filter databases returned in the list.+ The syntax and semantics of CEL are documented at https://github.com/google/cel-spec++ Supported filter:+ - environment: the environment full name in "environments/{id}" format, support "==" operator.+ - name: the database name, support ".contains()" operator.+ - project: the project full name in "projects/{id}" format, support "==" operator.+ - instance: the instance full name in "instances/{id}" format, support "==" operator.+ - engine: the database engine, check Engine enum for values. Support "==", "in [xx]", "!(in [xx])" operator.+ - exclude_unassigned: should be "true" or "false", will not show unassigned databases if it's true, support "==" operator.+ - table: filter by the database table, support "==" and ".contains()" operator.+ - labels.{key}: the database label, support "==" and "in" operators.++ For example:+ environment == "environments/{environment resource id}"+ environment == "" (find databases which environment is not set)+ project == "projects/{project resource id}"+ instance == "instances/{instance resource id}"+ name.contains("database name")+ engine == "MYSQL"+ engine in ["MYSQL", "POSTGRES"]+ !(engine in ["MYSQL", "POSTGRES"])+ exclude_unassigned == true+ table == "sample"+ table.contains("sam")+ labels.environment == "production"+ labels.region == "asia"+ labels.region in ["asia", "europe"]++ You can combine filter conditions like:+ environment == "environments/prod" && name.contains("employee")+ schema:+ type: string+ title: filter+ - name: showDeleted+ in: query+ description: Show deleted database if specified.+ schema:+ type: boolean+ title: show_deleted+ - name: orderBy+ in: query+ description: |-+ The order by of databases.+ Support name, project, instance. The default sorting order is ascending.+ For example:+ - order_by = "name" - order by name ascending+ - order_by = "name desc"+ - order_by = "name desc, project asc"+ schema:+ type: string+ title: order_by+ responses:+ "200":+ description: Success+ content:+ application/json:+ schema:+ $ref: '#/components/schemas/bytebase.v1.ListDatabasesResponse'+ /v1/projects/{project}/instances/{instance}/databases/{database}:+ get:+ tags:+ - DatabaseService+ summary: GetDatabase+ description: |-+ Retrieves a database by name.+ Permissions required: bb.databases.get+ operationId: DatabaseService_GetDatabase2+ parameters:+ - name: project+ in: path+ description: The project id.+ required: true+ schema:+ type: string+ - name: instance+ in: path+ description: The instance id.+ required: true+ schema:+ type: string+ - name: database+ in: path+ description: The database id.+ required: true+ schema:+ type: string+ responses:+ "200":+ description: Success+ content:+ application/json:+ schema:+ $ref: '#/components/schemas/bytebase.v1.Database'+ patch:+ tags:+ - DatabaseService+ summary: UpdateDatabase+ description: |-+ Updates database properties such as labels and project assignment.+ Permissions required: bb.databases.update+ operationId: DatabaseService_UpdateDatabase2+ parameters:+ - name: project+ in: path+ description: The project id.+ required: true+ schema:+ type: string+ - name: instance+ in: path+ description: The instance id.+ required: true+ schema:+ type: string+ - name: database+ in: path+ description: The database id.+ required: true+ schema:+ type: string+ - name: updateMask+ in: query+ description: |-+ `FieldMask` represents a set of symbolic field paths, for example:++ paths: "f.a"+ paths: "f.b.d"++ Here `f` represents a field in some root message, `a` and `b`+ fields in the message found in `f`, and `d` a field found in the+ message in `f.b`.++ Field masks are used to specify a subset of fields that should be+ returned by a get operation or modified by an update operation.+ Field masks also have a custom JSON encoding (see below).++ # Field Masks in Projections++ When used in the context of a projection, a response message or+ sub-message is filtered by the API to only contain those fields as+ specified in the mask. For example, if the mask in the previous+ example is applied to a response message as follows:++ f {+ a : 22+ b {+ d : 1+ x : 2+ }+ y : 13+ }+ z: 8++ The result will not contain specific values for fields x,y and z+ (their value will be set to the default, and omitted in proto text+ output):+++ f {+ a : 22+ b {+ d : 1+ }+ }++ A repeated field is not allowed except at the last position of a+ paths string.++ If a FieldMask object is not present in a get operation, the+ operation applies to all fields (as if a FieldMask of all fields+ had been specified).++ Note that a field mask does not necessarily apply to the+ top-level response message. In case of a REST get operation, the+ field mask applies directly to the response, but in case of a REST+ list operation, the mask instead applies to each individual message+ in the returned resource list. In case of a REST custom method,+ other definitions may be used. Where the mask applies will be+ clearly documented together with its declaration in the API. In+ any case, the effect on the returned resource/resources is required+ behavior for APIs.++ # Field Masks in Update Operations++ A field mask in update operations specifies which fields of the+ targeted resource are going to be updated. The API is required+ to only change the values of the fields as specified in the mask+ and leave the others untouched. If a resource is passed in to+ describe the updated values, the API ignores the values of all+ fields not covered by the mask.++ If a repeated field is specified for an update operation, new values will+ be appended to the existing repeated field in the target resource. Note that+ a repeated field is only allowed in the last position of a `paths` string.++ If a sub-message is specified in the last position of the field mask for an+ update operation, then new value will be merged into the existing sub-message+ in the target resource.++ For example, given the target message:++ f {+ b {+ d: 1+ x: 2+ }+ c: [1]+ }++ And an update message:++ f {+ b {+ d: 10+ }+ c: [2]+ }++ then if the field mask is:++ paths: ["f.b", "f.c"]++ then the result will be:++ f {+ b {+ d: 10+ x: 2+ }+ c: [1, 2]+ }++ An implementation may provide options to override this default behavior for+ repeated and message fields.++ In order to reset a field's value to the default, the field must+ be in the mask and set to the default value in the provided resource.+ Hence, in order to reset all fields of a resource, provide a default+ instance of the resource and set all fields in the mask, or do+ not provide a mask as described below.++ If a field mask is not present on update, the operation applies to+ all fields (as if a field mask of all fields has been specified).+ Note that in the presence of schema evolution, this may mean that+ fields the client does not know and has therefore not filled into+ the request will be reset to their default. If this is unwanted+ behavior, a specific service may require a client to always specify+ a field mask, producing an error if not.++ As with get operations, the location of the resource which+ describes the updated values in the request message depends on the+ operation kind. In any case, the effect of the field mask is+ required to be honored by the API.++ ## Considerations for HTTP REST++ The HTTP kind of an update operation which uses a field mask must+ be set to PATCH instead of PUT in order to satisfy HTTP semantics+ (PUT must only be used for full updates).++ # JSON Encoding of Field Masks++ In JSON, a field mask is encoded as a single string where paths are+ separated by a comma. Fields name in each path are converted+ to/from lower-camel naming conventions.++ As an example, consider the following message declarations:++ message Profile {+ User user = 1;+ Photo photo = 2;+ }+ message User {+ string display_name = 1;+ string address = 2;+ }++ In proto a field mask for `Profile` may look as such:++ mask {+ paths: "user.display_name"+ paths: "photo"+ }++ In JSON, the same mask is represented as below:++ {+ mask: "user.displayName,photo"+ }++ # Field Masks and Oneof Fields++ Field masks treat fields in oneofs just as regular fields. Consider the+ following message:++ message SampleMessage {+ oneof test_oneof {+ string name = 4;+ SubMessage sub_message = 9;+ }+ }++ The field mask can be:++ mask {+ paths: "name"+ }++ Or:++ mask {+ paths: "sub_message"+ }++ Note that oneof type names ("test_oneof" in this case) cannot be used in+ paths.++ ## Field Mask Verification++ The implementation of any API method which has a FieldMask type field in the+ request should verify the included field paths, and return an+ `INVALID_ARGUMENT` error if any path is unmappable.+ schema:+ type: string+ - name: allowMissing+ in: query+ description: |-+ If set to true, and the database is not found, a new database will be created.+ In this situation, `update_mask` is ignored.+ schema:+ type: boolean+ title: allow_missing+ requestBody:+ description: |-+ The database to update.++ The database's `name` field is used to identify the database to update.+ Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}+ content:+ application/json:+ schema:+ title: database+ description: |-+ The database to update.++ The database's `name` field is used to identify the database to update.+ Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}+ $ref: '#/components/schemas/bytebase.v1.Database'+ responses:+ "200":+ description: Success+ content:+ application/json:+ schema:+ $ref: '#/components/schemas/bytebase.v1.Database'+ /v1/projects/{project}/instances/{instance}/databases/{database}/catalog:+ get:+ tags:+ - DatabaseCatalogService+ summary: GetDatabaseCatalog+ description: |-+ Gets the catalog metadata for a database.+ Permissions required: bb.databaseCatalogs.get+ operationId: DatabaseCatalogService_GetDatabaseCatalog2+ parameters:+ - name: project+ in: path+ description: The project id.+ required: true+ schema:+ type: string+ - name: instance+ in: path+ description: The instance id.+ required: true+ schema:+ type: string+ - name: database+ in: path+ description: The database id.+ required: true+ schema:+ type: string+ responses:+ "200":+ description: Success+ content:+ application/json:+ schema:+ $ref: '#/components/schemas/bytebase.v1.DatabaseCatalog'+ patch:+ tags:+ - DatabaseCatalogService+ summary: UpdateDatabaseCatalog+ description: |-+ Updates catalog metadata such as classifications and labels.+ Permissions required: bb.databaseCatalogs.update+ operationId: DatabaseCatalogService_UpdateDatabaseCatalog2+ parameters:+ - name: project+ in: path+ description: The project id.+ required: true+ schema:+ type: string+ - name: instance+ in: path+ description: The instance id.+ required: true+ schema:+ type: string+ - name: database+ in: path+ description: The database id.+ required: true+ schema:+ type: string+ - name: allowMissing+ in: query+ description: |-+ If set to true, and the database catalog is not found, a new database catalog will be created.+ In this situation, `update_mask` is ignored.+ schema:+ type: boolean+ title: allow_missing+ requestBody:+ description: |-+ The database catalog to update.++ The catalog's `name` field is used to identify the database catalog to update.+ Format: instances/{instance}/databases/{database}/catalog or projects/{project}/instances/{instance}/databases/{database}/catalog+ content:+ application/json:+ schema:+ title: catalog+ description: |-+ The database catalog to update.++ The catalog's `name` field is used to identify the database catalog to update.+ Format: instances/{instance}/databases/{database}/catalog or projects/{project}/instances/{instance}/databases/{database}/catalog+ $ref: '#/components/schemas/bytebase.v1.DatabaseCatalog'+ responses:+ "200":+ description: Success+ content:+ application/json:+ schema:+ $ref: '#/components/schemas/bytebase.v1.DatabaseCatalog'+ /v1/projects/{project}/instances/{instance}/databases/{database}/changelogs:+ get:+ tags:+ - ChangelogService+ summary: ListChangelogs+ description: |-+ Lists migration history for a database.+ Permissions required: bb.changelogs.list+ operationId: ChangelogService_ListChangelogs2+ parameters:+ - name: project+ in: path+ description: The project id.+ required: true+ schema:+ type: string+ - name: instance+ in: path+ description: The instance id.+ required: true+ schema:+ type: string+ - name: database+ in: path+ description: The database id.+ required: true+ schema:+ type: string+ - name: pageSize+ in: query+ description: |-+ The maximum number of changelogs to return. The service may return fewer+ than this value. If unspecified, at most 10 changelogs will be returned.+ The maximum value is 1000; values above 1000 will be coerced to 1000.+ schema:+ type: integer+ title: page_size+ format: int32+ - name: pageToken+ in: query+ description: |-+ A page token, received from the previous call.+ Provide this to retrieve the subsequent page.++ When paginating, all other parameters provided must match+ the call that provided the page token.+ schema:+ type: string+ title: page_token+ - name: view+ in: query+ schema:+ title: view+ $ref: '#/components/schemas/bytebase.v1.ChangelogView'+ - name: filter+ in: query+ description: |-+ Filter is used to filter changelogs returned in the list.+ The syntax and semantics of CEL are documented at https://github.com/google/cel-spec++ Supported filter:+ - status: the changelog status, support "==" operation. check Changelog.Status for available values.+ - create_time: the changelog create time in "2006-01-02T15:04:05Z07:00" format, support ">=" or "<=" operator.++ Example:+ status == "DONE"+ status == "FAILED" && type == "SDL"+ create_time >= "2024-01-01T00:00:00Z" && create_time <= "2024-01-02T00:00:00Z"+ schema:+ type: string+ title: filter+ responses:+ "200":+ description: Success+ content:+ application/json:+ schema:+ $ref: '#/components/schemas/bytebase.v1.ListChangelogsResponse'+ /v1/projects/{project}/instances/{instance}/databases/{database}/changelogs/{changelog}:+ get:+ tags:+ - ChangelogService+ summary: GetChangelog+ description: |-+ Retrieves a specific changelog entry.+ Permissions required: bb.changelogs.get+ operationId: ChangelogService_GetChangelog2+ parameters:+ - name: project+ in: path+ description: The project id.+ required: true+ schema:+ type: string+ - name: instance+ in: path+ description: The instance id.+ required: true+ schema:+ type: string+ - name: database+ in: path+ description: The database id.+ required: true+ schema:+ type: string+ - name: changelog+ in: path+ description: The changelog id.+ required: true+ schema:+ type: string+ - name: view+ in: query+ schema:+ title: view+ $ref: '#/components/schemas/bytebase.v1.ChangelogView'+ responses:+ "200":+ description: Success+ content:+ application/json:+ schema:+ $ref: '#/components/schemas/bytebase.v1.Changelog'+ /v1/projects/{project}/instances/{instance}/databases/{database}/changelogs/{changelog}:diffSchema:+ post:+ tags:+ - DatabaseService+ summary: DiffSchema+ description: |-+ Compares and generates migration statements between two schemas.+ Permissions required: bb.databases.get+ operationId: DatabaseService_DiffSchema4+ parameters:+ - name: project+ in: path+ description: The project id.+ required: true+ schema:+ type: string+ - name: instance+ in: path+ description: The instance id.+ required: true+ schema:+ type: string+ - name: database+ in: path+ description: The database id.+ required: true+ schema:+ type: string+ - name: changelog+ in: path+ description: The changelog id.+ required: true+ schema:+ type: string+ requestBody:+ content:+ application/json:+ schema:+ type: object+ allOf:+ - {}+ - oneOf:+ - type: object+ properties:+ changelog:+ type: string+ title: changelog+ description: |-+ The resource name of the changelog+ Format:+ instances/{instance}/databases/{database}/changelogs/{changelog} or projects/{project}/instances/{instance}/databases/{database}/changelogs/{changelog}+ title: changelog+ required:+ - changelog+ - type: object+ properties:+ schema:+ type: string+ title: schema+ description: The target schema.+ title: schema+ required:+ - schema+ title: DiffSchemaRequest+ additionalProperties: false+ required: true+ responses:+ "200":+ description: Success+ content:+ application/json:+ schema:+ $ref: '#/components/schemas/bytebase.v1.DiffSchemaResponse'+ /v1/projects/{project}/instances/{instance}/databases/{database}/metadata:+ get:+ tags:+ - DatabaseService+ summary: GetDatabaseMetadata+ description: |-+ Retrieves database metadata including tables, columns, and indexes.+ Permissions required: bb.databases.getSchema+ operationId: DatabaseService_GetDatabaseMetadata2+ parameters:+ - name: project+ in: path+ description: The project id.+ required: true+ schema:+ type: string+ - name: instance+ in: path+ description: The instance id.+ required: true+ schema:+ type: string+ - name: database+ in: path+ description: The database id.+ required: true+ schema:+ type: string+ - name: filter+ in: query+ description: |-+ Filter is used to filter databases returned in the list.+ The syntax and semantics of CEL are documented at https://github.com/google/cel-spec++ Supported filter:+ - schema: the schema name, support "==" operator.+ - table: the table name, support "==" and ".contains()" operator.++ For example:+ schema == "schema-a"+ table == "table-a"+ table.contains("table-a")+ schema == "schema-a" && table.contains("sample")+ The filter is used to search for tables containing "sample" in the schema "schemas/schema-a".+ The column masking level will only be returned when a table filter is used.+ schema:+ type: string+ title: filter+ - name: limit+ in: query+ description: |-+ Limit the response size of returned table metadata per schema.+ For example, if the database has 3 schemas, and each schema has 100 tables,+ if limit is 20, then only 20 tables will be returned for each schema, total 60 tables.+ Default 0, means no limit.+ schema:+ type: integer+ title: limit+ format: int32+ responses:+ "200":+ description: Success+ content:+ application/json:+ schema:+ $ref: '#/components/schemas/bytebase.v1.DatabaseMetadata'+ /v1/projects/{project}/instances/{instance}/databases/{database}/revisions:+ get:+ tags:+ - RevisionService+ summary: ListRevisions+ description: |-+ Lists schema revisions for a database.+ Permissions required: bb.revisions.list+ operationId: RevisionService_ListRevisions2+ parameters:+ - name: project+ in: path+ description: The project id.+ required: true+ schema:+ type: string+ - name: instance+ in: path+ description: The instance id.+ required: true+ schema:+ type: string+ - name: database+ in: path+ description: The database id.+ required: true+ schema:+ type: string+ - name: pageSize+ in: query+ description: |-+ The maximum number of revisions to return. The service may return fewer+ than this value. If unspecified, at most 10 revisions will be returned. The+ maximum value is 1000; values above 1000 will be coerced to 1000.+ schema:+ type: integer+ title: page_size+ format: int32+ - name: pageToken+ in: query+ description: |-+ A page token, received from a previous `ListRevisions` call.+ Provide this to retrieve the subsequent page.++ When paginating, all other parameters provided to `ListRevisions` must+ match the call that provided the page token.+ schema:+ type: string+ title: page_token+ - name: showDeleted+ in: query+ description: Whether to include deleted revisions in the results.+ schema:+ type: boolean+ title: show_deleted+ responses:+ "200":+ description: Success+ content:+ application/json:+ schema:+ $ref: '#/components/schemas/bytebase.v1.ListRevisionsResponse'+ /v1/projects/{project}/instances/{instance}/databases/{database}/revisions/{revision}:+ get:+ tags:+ - RevisionService+ summary: GetRevision+ description: |-+ Retrieves a schema revision by name.+ Permissions required: bb.revisions.get+ operationId: RevisionService_GetRevision2+ parameters:+ - name: project+ in: path+ description: The project id.+ required: true+ schema:+ type: string+ - name: instance+ in: path+ description: The instance id.+ required: true+ schema:+ type: string+ - name: database+ in: path+ description: The database id.+ required: true+ schema:+ type: string+ - name: revision+ in: path+ description: The revision id.+ required: true+ schema:+ type: string+ responses:+ "200":+ description: Success+ content:+ application/json:+ schema:+ $ref: '#/components/schemas/bytebase.v1.Revision'+ delete:+ tags:+ - RevisionService+ summary: DeleteRevision+ description: |-+ Deletes a schema revision.+ Permissions required: bb.revisions.delete+ operationId: RevisionService_DeleteRevision2+ parameters:+ - name: project+ in: path+ description: The project id.+ required: true+ schema:+ type: string+ - name: instance+ in: path+ description: The instance id.+ required: true+ schema:+ type: string+ - name: database+ in: path+ description: The database id.+ required: true+ schema:+ type: string+ - name: revision+ in: path+ description: The revision id.+ required: true+ schema:+ type: string+ responses:+ "200":+ description: Success+ content:+ application/json:+ schema:+ $ref: '#/components/schemas/google.protobuf.Empty'+ /v1/projects/{project}/instances/{instance}/databases/{database}/revisions:batchCreate:+ post:+ tags:+ - RevisionService+ summary: BatchCreateRevisions+ description: |-+ Creates multiple schema revisions in a single operation.+ Permissions required: bb.revisions.create+ operationId: RevisionService_BatchCreateRevisions2+ parameters:+ - name: project+ in: path+ description: The project id.+ required: true+ schema:+ type: string+ - name: instance+ in: path+ description: The instance id.+ required: true+ schema:+ type: string+ - name: database+ in: path+ description: The database id.+ required: true+ schema:+ type: string+ requestBody:+ content:+ application/json:+ schema:+ type: object+ properties:+ requests:+ type: array+ items:+ $ref: '#/components/schemas/bytebase.v1.CreateRevisionRequest'+ title: requests+ description: |-+ The request message specifying the revisions to create.+ A maximum of 100 revisions can be created in a batch.+ title: BatchCreateRevisionsRequest+ required:+ - requests+ additionalProperties: false+ required: true+ responses:+ "200":+ description: Success+ content:+ application/json:+ schema:+ $ref: '#/components/schemas/bytebase.v1.BatchCreateRevisionsResponse'+ /v1/projects/{project}/instances/{instance}/databases/{database}/schema:+ get:+ tags:+ - DatabaseService+ summary: GetDatabaseSchema+ description: |-+ Retrieves database schema as DDL statements.+ Permissions required: bb.databases.getSchema+ operationId: DatabaseService_GetDatabaseSchema2+ parameters:+ - name: project+ in: path+ description: The project id.+ required: true+ schema:+ type: string+ - name: instance+ in: path+ description: The instance id.+ required: true+ schema:+ type: string+ - name: database+ in: path+ description: The database id.+ required: true+ schema:+ type: string+ responses:+ "200":+ description: Success+ content:+ application/json:+ schema:+ $ref: '#/components/schemas/bytebase.v1.DatabaseSchema'+ /v1/projects/{project}/instances/{instance}/databases/{database}/schemaString:+ get:+ tags:+ - DatabaseService+ summary: GetSchemaString+ description: |-+ Generates schema DDL for a database object.+ Permissions required: bb.databases.getSchema+ operationId: DatabaseService_GetSchemaString2+ parameters:+ - name: project+ in: path+ description: The project id.+ required: true+ schema:+ type: string+ - name: instance+ in: path+ description: The instance id.+ required: true+ schema:+ type: string+ - name: database+ in: path+ description: The database id.+ required: true+ schema:+ type: string+ - name: type+ in: query+ schema:+ title: type+ $ref: '#/components/schemas/bytebase.v1.GetSchemaStringRequest.ObjectType'+ - name: schema+ in: query+ description: It's empty for DATABASE.+ schema:+ type: string+ title: schema+ - name: object+ in: query+ description: It's empty for DATABASE and SCHEMA.+ schema:+ type: string+ title: object+ - name: metadata.name+ in: query+ description: |-+ The database metadata name.++ Format: instances/{instance}/databases/{database}/metadata or projects/{project}/instances/{instance}/databases/{database}/metadata+ schema:+ type: string+ title: name+ - name: metadata.schemas.name+ in: query+ description: |-+ The name is the schema name.+ It is an empty string for databases without such concept such as MySQL.+ schema:+ type: string+ title: name+ - name: metadata.schemas.tables.name+ in: query+ description: The name is the name of a table.+ schema:+ type: string+ title: name+ - name: metadata.schemas.tables.columns.name+ in: query+ description: The name is the name of a column.+ schema:+ type: string+ title: name+ - name: metadata.schemas.tables.columns.position+ in: query+ description: The position is the position in columns.+ schema:+ type: integer+ title: position+ format: int32+ - name: metadata.schemas.tables.columns.hasDefault+ in: query+ schema:+ type: boolean+ title: has_default+ - name: metadata.schemas.tables.columns.default+ in: query+ description: The default value of column.+ schema:+ type: string+ title: default+ - name: metadata.schemas.tables.columns.defaultOnNull+ in: query+ description: |-+ Oracle specific metadata.+ The default_on_null is the default on null of a column.+ schema:+ type: boolean+ title: default_on_null+ - name: metadata.schemas.tables.columns.onUpdate+ in: query+ description: |-+ The on_update is the on update action of a column.+ For MySQL like databases, it's only supported for TIMESTAMP columns with+ CURRENT_TIMESTAMP as on update value.+ schema:+ type: string+ title: on_update+ - name: metadata.schemas.tables.columns.nullable+ in: query+ description: The nullable is the nullable of a column.+ schema:+ type: boolean+ title: nullable+ - name: metadata.schemas.tables.columns.type+ in: query+ description: The type is the type of a column.+ schema:+ type: string+ title: type+ - name: metadata.schemas.tables.columns.characterSet+ in: query+ description: The character_set is the character_set of a column.+ schema:+ type: string+ title: character_set+ - name: metadata.schemas.tables.columns.collation+ in: query+ description: The collation is the collation of a column.+ schema:+ type: string+ title: collation+ - name: metadata.schemas.tables.columns.comment+ in: query+ description: The comment is the comment of a column.+ schema:+ type: string+ title: comment+ - name: metadata.schemas.tables.columns.generation.type+ in: query+ schema:+ title: type+ $ref: '#/components/schemas/bytebase.v1.GenerationMetadata.Type'+ - name: metadata.schemas.tables.columns.generation.expression+ in: query+ schema:+ type: string+ title: expression+ - name: metadata.schemas.tables.columns.isIdentity+ in: query+ schema:+ type: boolean+ title: is_identity+ - name: metadata.schemas.tables.columns.identityGeneration+ in: query+ description: The identity_generation is for identity columns, PG only.+ schema:+ title: identity_generation+ $ref: '#/components/schemas/bytebase.v1.ColumnMetadata.IdentityGeneration'+ - name: metadata.schemas.tables.columns.identitySeed+ in: query+ description: The identity_seed is for identity columns, MSSQL only.+ schema:+ type:+ - integer+ - string+ title: identity_seed+ format: int64+ - name: metadata.schemas.tables.columns.identityIncrement+ in: query+ description: The identity_increment is for identity columns, MSSQL only.+ schema:+ type:+ - integer+ - string+ title: identity_increment+ format: int64+ - name: metadata.schemas.tables.columns.defaultConstraintName+ in: query+ description: |-+ The default_constraint_name is the name of the default constraint, MSSQL only.+ In MSSQL, default values are implemented as named constraints. When modifying or+ dropping a column's default value, you must reference the constraint by name.+ This field stores the actual constraint name from the database.++ Example: A column definition like:+ CREATE TABLE employees (+ status NVARCHAR(20) DEFAULT 'active'+ )++ Will create a constraint with an auto-generated name like 'DF__employees__statu__3B75D760'+ or a user-defined name if specified:+ ALTER TABLE employees ADD CONSTRAINT DF_employees_status DEFAULT 'active' FOR status++ To modify the default, you must first drop the existing constraint by name:+ ALTER TABLE employees DROP CONSTRAINT DF__employees__statu__3B75D760+ ALTER TABLE employees ADD CONSTRAINT DF_employees_status DEFAULT 'inactive' FOR status++ This field is populated when syncing from the database. When empty (e.g., when parsing+ from SQL files), the system cannot automatically drop the constraint.+ schema:+ type: string+ title: default_constraint_name+ - name: metadata.schemas.tables.columns.srid+ in: query+ description: |-+ The spatial reference system identifier of a spatial column, MySQL 8.0 only.+ Unset means the column declares no SRID; presence carries the explicit SRID,+ including the valid SRID 0. SRS_IDs are unsigned 32-bit (custom SRSs may exceed+ int32).+ schema:+ type: integer+ title: srid+ - name: metadata.schemas.tables.columns.isInvisible+ in: query+ description: Whether the column is invisible (hidden from SELECT *), MySQL 8.0.23+ only.+ schema:+ type: boolean+ title: is_invisible+ - name: metadata.schemas.tables.indexes.name+ in: query+ description: The name is the name of an index.+ schema:+ type: string+ title: name+ - name: metadata.schemas.tables.indexes.expressions+ in: query+ description: |-+ The expressions are the ordered columns or expressions of an index.+ This could refer to a column or an expression.+ schema:+ type: array+ items:+ type: string+ title: expressions+ - name: metadata.schemas.tables.indexes.keyLength+ in: query+ description: |-+ The key_lengths are the ordered key lengths of an index.+ If the key length is not specified, it's -1.+ schema:+ type: array+ items:+ type:+ - integer+ - string+ format: int64+ title: key_length+ - name: metadata.schemas.tables.indexes.descending+ in: query+ description: The descending is the ordered descending of an index.+ schema:+ type: array+ items:+ type: boolean+ title: descending+ - name: metadata.schemas.tables.indexes.type+ in: query+ description: The type is the type of an index.+ schema:+ type: string+ title: type+ - name: metadata.schemas.tables.indexes.unique+ in: query+ description: The unique is whether the index is unique.+ schema:+ type: boolean+ title: unique+ - name: metadata.schemas.tables.indexes.primary+ in: query+ description: The primary is whether the index is a primary key index.+ schema:+ type: boolean+ title: primary+ - name: metadata.schemas.tables.indexes.visible+ in: query+ description: The visible is whether the index is visible.+ schema:+ type: boolean+ title: visible+ - name: metadata.schemas.tables.indexes.comment+ in: query+ description: The comment is the comment of an index.+ schema:+ type: string+ title: comment+ - name: metadata.schemas.tables.indexes.definition+ in: query+ description: The definition of an index.+ schema:+ type: string+ title: definition+ - name: metadata.schemas.tables.indexes.parentIndexSchema+ in: query+ description: The schema name of the parent index.+ schema:+ type: string+ title: parent_index_schema+ - name: metadata.schemas.tables.indexes.parentIndexName+ in: query+ description: The index name of the parent index.+ schema:+ type: string+ title: parent_index_name+ - name: metadata.schemas.tables.indexes.granularity+ in: query+ description: The number of granules in the block. It's a ClickHouse specific field.+ schema:+ type:+ - integer+ - string+ title: granularity+ format: int64+ - name: metadata.schemas.tables.indexes.isConstraint+ in: query+ description: |-+ It's a PostgreSQL specific field.+ The unique constraint and unique index are not the same thing in PostgreSQL.+ schema:+ type: boolean+ title: is_constraint+ - name: metadata.schemas.tables.indexes.spatialConfig.method+ in: query+ description: Spatial indexing method (e.g., "SPATIAL", "R-TREE", "GIST")+ schema:+ type: string+ title: method+ - name: metadata.schemas.tables.indexes.spatialConfig.tessellation.scheme+ in: query+ description: Tessellation scheme (e.g., "GEOMETRY_GRID", "GEOGRAPHY_GRID", "GEOMETRY_AUTO_GRID")+ schema:+ type: string+ title: scheme+ - name: metadata.schemas.tables.indexes.spatialConfig.tessellation.gridLevels.level+ in: query+ description: Grid level number (1-4 for SQL Server)+ schema:+ type: integer+ title: level+ format: int32+ - name: metadata.schemas.tables.indexes.spatialConfig.tessellation.gridLevels.density+ in: query+ description: Grid density (LOW, MEDIUM, HIGH)+ schema:+ type: string+ title: density+ - name: metadata.schemas.tables.indexes.spatialConfig.tessellation.cellsPerObject+ in: query+ description: Number of cells per object (1-8192 for SQL Server)+ schema:+ type: integer+ title: cells_per_object+ format: int32+ - name: metadata.schemas.tables.indexes.spatialConfig.tessellation.boundingBox.xmin+ in: query+ description: Minimum X coordinate+ schema:+ type: number+ title: xmin+ format: double+ - name: metadata.schemas.tables.indexes.spatialConfig.tessellation.boundingBox.ymin+ in: query+ description: Minimum Y coordinate+ schema:+ type: number+ title: ymin+ format: double+ - name: metadata.schemas.tables.indexes.spatialConfig.tessellation.boundingBox.xmax+ in: query+ description: Maximum X coordinate+ schema:+ type: number+ title: xmax+ format: double+ - name: metadata.schemas.tables.indexes.spatialConfig.tessellation.boundingBox.ymax+ in: query+ description: Maximum Y coordinate+ schema:+ type: number+ title: ymax+ format: double+ - name: metadata.schemas.tables.indexes.spatialConfig.storage.fillfactor+ in: query+ description: Fill factor percentage (1-100)+ schema:+ type: integer+ title: fillfactor+ format: int32+ - name: metadata.schemas.tables.indexes.spatialConfig.storage.buffering+ in: query+ description: Buffering mode for PostgreSQL (auto, on, off)+ schema:+ type: string+ title: buffering+ - name: metadata.schemas.tables.indexes.spatialConfig.storage.tablespace+ in: query+ description: Tablespace configuration for Oracle+ schema:+ type: string+ title: tablespace+ - name: metadata.schemas.tables.indexes.spatialConfig.storage.workTablespace+ in: query+ schema:+ type: string+ title: work_tablespace+ - name: metadata.schemas.tables.indexes.spatialConfig.storage.sdoLevel+ in: query+ schema:+ type: integer+ title: sdo_level+ format: int32+ - name: metadata.schemas.tables.indexes.spatialConfig.storage.commitInterval+ in: query+ schema:+ type: integer+ title: commit_interval+ format: int32+ - name: metadata.schemas.tables.indexes.spatialConfig.storage.padIndex+ in: query+ description: SQL Server specific parameters+ schema:+ type: boolean+ title: pad_index+ - name: metadata.schemas.tables.indexes.spatialConfig.storage.sortInTempdb+ in: query+ description: ON, OFF+ schema:+ type: string+ title: sort_in_tempdb+ - name: metadata.schemas.tables.indexes.spatialConfig.storage.dropExisting+ in: query+ schema:+ type: boolean+ title: drop_existing+ - name: metadata.schemas.tables.indexes.spatialConfig.storage.online+ in: query+ schema:+ type: boolean+ title: online+ - name: metadata.schemas.tables.indexes.spatialConfig.storage.allowRowLocks+ in: query+ schema:+ type: boolean+ title: allow_row_locks+ - name: metadata.schemas.tables.indexes.spatialConfig.storage.allowPageLocks+ in: query+ schema:+ type: boolean+ title: allow_page_locks+ - name: metadata.schemas.tables.indexes.spatialConfig.storage.maxdop+ in: query+ schema:+ type: integer+ title: maxdop+ format: int32+ - name: metadata.schemas.tables.indexes.spatialConfig.storage.dataCompression+ in: query+ description: NONE, ROW, PAGE+ schema:+ type: string+ title: data_compression+ - name: metadata.schemas.tables.indexes.spatialConfig.dimensional.dimensions+ in: query+ description: Number of dimensions (2-4, default 2)+ schema:+ type: integer+ title: dimensions+ format: int32+ - name: metadata.schemas.tables.indexes.spatialConfig.dimensional.dataType+ in: query+ description: Spatial data type (GEOMETRY, GEOGRAPHY, POINT, POLYGON, etc.)+ schema:+ type: string+ title: data_type+ - name: metadata.schemas.tables.indexes.spatialConfig.dimensional.srid+ in: query+ description: Spatial reference system identifier (SRID)+ schema:+ type: integer+ title: srid+ format: int32+ - name: metadata.schemas.tables.indexes.spatialConfig.dimensional.constraints.dimension+ in: query+ description: Dimension name/type (X, Y, Z, M, etc.)+ schema:+ type: string+ title: dimension+ - name: metadata.schemas.tables.indexes.spatialConfig.dimensional.constraints.minValue+ in: query+ description: Minimum value for this dimension+ schema:+ type: number+ title: min_value+ format: double+ - name: metadata.schemas.tables.indexes.spatialConfig.dimensional.constraints.maxValue+ in: query+ description: Maximum value for this dimension+ schema:+ type: number+ title: max_value+ format: double+ - name: metadata.schemas.tables.indexes.spatialConfig.dimensional.constraints.tolerance+ in: query+ description: Tolerance for this dimension+ schema:+ type: number+ title: tolerance+ format: double+ - name: metadata.schemas.tables.indexes.opclassNames+ in: query+ description: |-+ https://www.postgresql.org/docs/current/catalog-pg-opclass.html+ Name of the operator class for each column. (PostgreSQL specific).+ schema:+ type: array+ items:+ type: string+ title: opclass_names+ - name: metadata.schemas.tables.indexes.opclassDefaults+ in: query+ description: True if the operator class is the default. (PostgreSQL specific).+ schema:+ type: array+ items:+ type: boolean+ title: opclass_defaults+ - name: metadata.schemas.tables.engine+ in: query+ description: The engine is the engine of a table.+ schema:+ type: string+ title: engine+ - name: metadata.schemas.tables.collation+ in: query+ description: The collation is the collation of a table.+ schema:+ type: string+ title: collation+ - name: metadata.schemas.tables.charset+ in: query+ description: The character set of table.+ schema:+ type: string+ title: charset+ - name: metadata.schemas.tables.rowCount+ in: query+ description: The row_count is the estimated number of rows of a table.+ schema:+ type:+ - integer+ - string+ title: row_count+ format: int64+ - name: metadata.schemas.tables.dataSize+ in: query+ description: The data_size is the estimated data size of a table.+ schema:+ type:+ - integer+ - string+ title: data_size+ format: int64+ - name: metadata.schemas.tables.indexSize+ in: query+ description: The index_size is the estimated index size of a table.+ schema:+ type:+ - integer+ - string+ title: index_size+ format: int64+ - name: metadata.schemas.tables.dataFree+ in: query+ description: The data_free is the estimated free data size of a table.+ schema:+ type:+ - integer+ - string+ title: data_free+ format: int64+ - name: metadata.schemas.tables.createOptions+ in: query+ description: The create_options is the create option of a table.+ schema:+ type: string+ title: create_options+ - name: metadata.schemas.tables.comment+ in: query+ description: The comment is the comment of a table.+ schema:+ type: string+ title: comment+ - name: metadata.schemas.tables.foreignKeys.name+ in: query+ description: The name is the name of a foreign key.+ schema:+ type: string+ title: name+ - name: metadata.schemas.tables.foreignKeys.columns+ in: query+ description: The columns are the ordered referencing columns of a foreign key.+ schema:+ type: array+ items:+ type: string+ title: columns+ - name: metadata.schemas.tables.foreignKeys.referencedSchema+ in: query+ description: |-+ The referenced_schema is the referenced schema name of a foreign key.+ It is an empty string for databases without such concept such as MySQL.+ schema:+ type: string+ title: referenced_schema+ - name: metadata.schemas.tables.foreignKeys.referencedTable+ in: query+ description: The referenced_table is the referenced table name of a foreign key.+ schema:+ type: string+ title: referenced_table+ - name: metadata.schemas.tables.foreignKeys.referencedColumns+ in: query+ description: The referenced_columns are the ordered referenced columns of a foreign key.+ schema:+ type: array+ items:+ type: string+ title: referenced_columns+ - name: metadata.schemas.tables.foreignKeys.onDelete+ in: query+ description: The on_delete is the on delete action of a foreign key.+ schema:+ type: string+ title: on_delete+ - name: metadata.schemas.tables.foreignKeys.onUpdate+ in: query+ description: The on_update is the on update action of a foreign key.+ schema:+ type: string+ title: on_update+ - name: metadata.schemas.tables.foreignKeys.matchType+ in: query+ description: |-+ The match_type is the match type of a foreign key.+ The match_type is the PostgreSQL specific field.+ It's empty string for other databases.+ schema:+ type: string+ title: match_type+ - name: metadata.schemas.tables.partitions.name+ in: query+ description: The name is the name of a table partition.+ schema:+ type: string+ title: name+ - name: metadata.schemas.tables.partitions.type+ in: query+ description: The type of a table partition.+ schema:+ title: type+ $ref: '#/components/schemas/bytebase.v1.TablePartitionMetadata.Type'+ - name: metadata.schemas.tables.partitions.expression+ in: query+ description: |-+ The expression is the expression of a table partition.+ For PostgreSQL, the expression is the text of {FOR VALUES+ partition_bound_spec}, see+ https://www.postgresql.org/docs/current/sql-createtable.html. For MySQL,+ the expression is the `expr` or `column_list` of the following syntax.+ PARTITION BY+ { [LINEAR] HASH(expr)+ | [LINEAR] KEY [ALGORITHM={1 | 2}] (column_list)+ | RANGE{(expr) | COLUMNS(column_list)}+ | LIST{(expr) | COLUMNS(column_list)} }.+ schema:+ type: string+ title: expression+ - name: metadata.schemas.tables.partitions.value+ in: query+ description: |-+ The value is the value of a table partition.+ For MySQL, the value is for RANGE and LIST partition types,+ - For a RANGE partition, it contains the value set in the partition's+ VALUES LESS THAN clause, which can be either an integer or MAXVALUE.+ - For a LIST partition, this column contains the values defined in the+ partition's VALUES IN clause, which is a list of comma-separated integer+ values.+ - For others, it's an empty string.+ schema:+ type: string+ title: value+ - name: metadata.schemas.tables.partitions.useDefault+ in: query+ description: |-+ The use_default is whether the users use the default partition, it stores+ the different value for different database engines. For MySQL, it's [INT]+ type, 0 means not use default partition, otherwise, it's equals to number+ in syntax [SUB]PARTITION {number}.+ schema:+ type: string+ title: use_default+ - name: metadata.schemas.tables.partitions.subpartitions.checkConstraints.name+ in: query+ description: The name is the name of a check constraint.+ schema:+ type: string+ title: name+ - name: metadata.schemas.tables.partitions.subpartitions.checkConstraints.expression+ in: query+ description: The expression is the expression of a check constraint.+ schema:+ type: string+ title: expression+ - name: metadata.schemas.tables.owner+ in: query+ description: The owner of the table.+ schema:+ type: string+ title: owner+ - name: metadata.schemas.tables.sortingKeys+ in: query+ description: |-+ The sorting_keys is a tuple of column names or arbitrary expressions. ClickHouse specific field.+ Reference: https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/mergetree#order_by+ schema:+ type: array+ items:+ type: string+ title: sorting_keys+ - name: metadata.schemas.tables.triggers.name+ in: query+ description: The name is the name of the trigger.+ schema:+ type: string+ title: name+ - name: metadata.schemas.tables.triggers.event+ in: query+ description: |-+ The event is the event of the trigger, such as INSERT, UPDATE, DELETE,+ TRUNCATE.+ schema:+ type: string+ title: event+ - name: metadata.schemas.tables.triggers.timing+ in: query+ description: The timing is the timing of the trigger, such as BEFORE, AFTER.+ schema:+ type: string+ title: timing+ - name: metadata.schemas.tables.triggers.body+ in: query+ description: The body is the body of the trigger.+ schema:+ type: string+ title: body+ - name: metadata.schemas.tables.triggers.sqlMode+ in: query+ description: The SQL mode setting for the trigger.+ schema:+ type: string+ title: sql_mode+ - name: metadata.schemas.tables.triggers.characterSetClient+ in: query+ description: The character set used by the client creating the trigger.+ schema:+ type: string+ title: character_set_client+ - name: metadata.schemas.tables.triggers.collationConnection+ in: query+ description: The collation used for the connection when creating the trigger.+ schema:+ type: string+ title: collation_connection+ - name: metadata.schemas.tables.triggers.comment+ in: query+ description: The comment describing the trigger.+ schema:+ type: string+ title: comment+ - name: metadata.schemas.tables.triggers.skipDump+ in: query+ description: Whether to skip this trigger during schema dump operations.+ schema:+ type: boolean+ title: skip_dump+ - name: metadata.schemas.tables.skipDump+ in: query+ description: Whether to skip this table during schema dump operations.+ schema:+ type: boolean+ title: skip_dump+ - name: metadata.schemas.tables.shardingInfo+ in: query+ description: https://docs.pingcap.com/tidb/stable/information-schema-tables/+ schema:+ type: string+ title: sharding_info+ - name: metadata.schemas.tables.primaryKeyType+ in: query+ description: |-+ https://docs.pingcap.com/tidb/stable/clustered-indexes/#clustered-indexes+ CLUSTERED or NONCLUSTERED.+ schema:+ type: string+ title: primary_key_type+ - name: metadata.schemas.externalTables.name+ in: query+ description: The name is the name of a external table.+ schema:+ type: string+ title: name+ - name: metadata.schemas.externalTables.externalServerName+ in: query+ description: The external_server_name is the name of the external server.+ schema:+ type: string+ title: external_server_name+ - name: metadata.schemas.externalTables.externalDatabaseName+ in: query+ description: The external_database_name is the name of the external database.+ schema:+ type: string+ title: external_database_name+ - name: metadata.schemas.views.name+ in: query+ description: The name is the name of a view.+ schema:+ type: string+ title: name+ - name: metadata.schemas.views.definition+ in: query+ description: The definition is the definition of a view.+ schema:+ type: string+ title: definition+ - name: metadata.schemas.views.comment+ in: query+ description: The comment is the comment of a view.+ schema:+ type: string+ title: comment+ - name: metadata.schemas.views.dependencyColumns.schema+ in: query+ description: The schema is the schema of a reference column.+ schema:+ type: string+ title: schema+ - name: metadata.schemas.views.dependencyColumns.table+ in: query+ description: The table is the table of a reference column.+ schema:+ type: string+ title: table+ - name: metadata.schemas.views.dependencyColumns.column+ in: query+ description: The column is the name of a reference column.+ schema:+ type: string+ title: column+ - name: metadata.schemas.views.skipDump+ in: query+ schema:+ type: boolean+ title: skip_dump+ - name: metadata.schemas.functions.name+ in: query+ description: The name is the name of a function.+ schema:+ type: string+ title: name+ - name: metadata.schemas.functions.definition+ in: query+ description: The definition is the definition of a function.+ schema:+ type: string+ title: definition+ - name: metadata.schemas.functions.signature+ in: query+ description: |-+ The signature is the name with the number and type of input arguments the+ function takes.+ schema:+ type: string+ title: signature+ - name: metadata.schemas.functions.characterSetClient+ in: query+ description: MySQL specific metadata.+ schema:+ type: string+ title: character_set_client+ - name: metadata.schemas.functions.collationConnection+ in: query+ schema:+ type: string+ title: collation_connection+ - name: metadata.schemas.functions.databaseCollation+ in: query+ schema:+ type: string+ title: database_collation+ - name: metadata.schemas.functions.sqlMode+ in: query+ schema:+ type: string+ title: sql_mode+ - name: metadata.schemas.functions.comment+ in: query+ schema:+ type: string+ title: comment+ - name: metadata.schemas.functions.dependencyTables.schema+ in: query+ description: The schema is the schema of a reference table.+ schema:+ type: string+ title: schema+ - name: metadata.schemas.functions.dependencyTables.table+ in: query+ description: The table is the name of a reference table.+ schema:+ type: string+ title: table+ - name: metadata.schemas.functions.skipDump+ in: query+ schema:+ type: boolean+ title: skip_dump+ - name: metadata.schemas.procedures.name+ in: query+ description: The name is the name of a procedure.+ schema:+ type: string+ title: name+ - name: metadata.schemas.procedures.definition+ in: query+ description: The definition is the definition of a procedure.+ schema:+ type: string+ title: definition+ - name: metadata.schemas.procedures.signature+ in: query+ description: |-+ The signature is the name with the number and type of input arguments the+ procedure takes.+ schema:+ type: string+ title: signature+ - name: metadata.schemas.procedures.characterSetClient+ in: query+ description: MySQL specific metadata.+ schema:+ type: string+ title: character_set_client+ - name: metadata.schemas.procedures.collationConnection+ in: query+ schema:+ type: string+ title: collation_connection+ - name: metadata.schemas.procedures.databaseCollation+ in: query+ schema:+ type: string+ title: database_collation+ - name: metadata.schemas.procedures.sqlMode+ in: query+ schema:+ type: string+ title: sql_mode+ - name: metadata.schemas.procedures.comment+ in: query+ description: The comment is the comment of a procedure.+ schema:+ type: string+ title: comment+ - name: metadata.schemas.procedures.skipDump+ in: query+ schema:+ type: boolean+ title: skip_dump+ - name: metadata.schemas.streams.name+ in: query+ description: The name is the name of a stream.+ schema:+ type: string+ title: name+ - name: metadata.schemas.streams.tableName+ in: query+ description: The table_name is the name of the table/view that the stream is created on.+ schema:+ type: string+ title: table_name+ - name: metadata.schemas.streams.owner+ in: query+ description: The owner of the stream.+ schema:+ type: string+ title: owner+ - name: metadata.schemas.streams.comment+ in: query+ description: The comment of the stream.+ schema:+ type: string+ title: comment+ - name: metadata.schemas.streams.type+ in: query+ description: The type of the stream.+ schema:+ title: type+ $ref: '#/components/schemas/bytebase.v1.StreamMetadata.Type'+ - name: metadata.schemas.streams.stale+ in: query+ description: Indicates whether the stream was last read before the `stale_after` time.+ schema:+ type: boolean+ title: stale+ - name: metadata.schemas.streams.mode+ in: query+ description: The mode of the stream.+ schema:+ title: mode+ $ref: '#/components/schemas/bytebase.v1.StreamMetadata.Mode'+ - name: metadata.schemas.streams.definition+ in: query+ description: The definition of the stream.+ schema:+ type: string+ title: definition+ - name: metadata.schemas.tasks.name+ in: query+ description: The name is the name of a task.+ schema:+ type: string+ title: name+ - name: metadata.schemas.tasks.id+ in: query+ description: |-+ The id is the snowflake-generated id of a task.+ Example: 01ad32a0-1bb6-5e93-0000-000000000001+ schema:+ type: string+ title: id+ - name: metadata.schemas.tasks.owner+ in: query+ description: The owner of the task.+ schema:+ type: string+ title: owner+ - name: metadata.schemas.tasks.comment+ in: query+ description: The comment of the task.+ schema:+ type: string+ title: comment+ - name: metadata.schemas.tasks.warehouse+ in: query+ description: The warehouse of the task.+ schema:+ type: string+ title: warehouse+ - name: metadata.schemas.tasks.schedule+ in: query+ description: The schedule interval of the task.+ schema:+ type: string+ title: schedule+ - name: metadata.schemas.tasks.predecessors+ in: query+ description: The predecessor tasks of the task.+ schema:+ type: array+ items:+ type: string+ title: predecessors+ - name: metadata.schemas.tasks.state+ in: query+ description: The state of the task.+ schema:+ title: state+ $ref: '#/components/schemas/bytebase.v1.TaskMetadata.State'+ - name: metadata.schemas.tasks.condition+ in: query+ description: The condition of the task.+ schema:+ type: string+ title: condition+ - name: metadata.schemas.tasks.definition+ in: query+ description: The definition of the task.+ schema:+ type: string+ title: definition+ - name: metadata.schemas.materializedViews.name+ in: query+ description: The name is the name of a materialized view.+ schema:+ type: string+ title: name+ - name: metadata.schemas.materializedViews.definition+ in: query+ description: The definition is the definition of a materialized view.+ schema:+ type: string+ title: definition+ - name: metadata.schemas.materializedViews.comment+ in: query+ description: The comment is the comment of a materialized view.+ schema:+ type: string+ title: comment+ - name: metadata.schemas.materializedViews.skipDump+ in: query+ schema:+ type: boolean+ title: skip_dump+ - name: metadata.schemas.packages.name+ in: query+ description: The name is the name of a package.+ schema:+ type: string+ title: name+ - name: metadata.schemas.packages.definition+ in: query+ description: The definition is the definition of a package.+ schema:+ type: string+ title: definition+ - name: metadata.schemas.owner+ in: query+ description: The owner of the schema.+ schema:+ type: string+ title: owner+ - name: metadata.schemas.sequences.name+ in: query+ description: The name of a sequence.+ schema:+ type: string+ title: name+ - name: metadata.schemas.sequences.dataType+ in: query+ description: The data type of a sequence.+ schema:+ type: string+ title: data_type+ - name: metadata.schemas.sequences.start+ in: query+ description: The start value of a sequence.+ schema:+ type: string+ title: start+ - name: metadata.schemas.sequences.minValue+ in: query+ description: The minimum value of a sequence.+ schema:+ type: string+ title: min_value+ - name: metadata.schemas.sequences.maxValue+ in: query+ description: The maximum value of a sequence.+ schema:+ type: string+ title: max_value+ - name: metadata.schemas.sequences.increment+ in: query+ description: Increment value of a sequence.+ schema:+ type: string+ title: increment+ - name: metadata.schemas.sequences.cycle+ in: query+ description: Cycle is whether the sequence cycles.+ schema:+ type: boolean+ title: cycle+ - name: metadata.schemas.sequences.cacheSize+ in: query+ description: Cache size of a sequence.+ schema:+ type: string+ title: cache_size+ - name: metadata.schemas.sequences.lastValue+ in: query+ description: Last value of a sequence.+ schema:+ type: string+ title: last_value+ - name: metadata.schemas.sequences.ownerTable+ in: query+ description: The owner table of the sequence.+ schema:+ type: string+ title: owner_table+ - name: metadata.schemas.sequences.ownerColumn+ in: query+ description: The owner column of the sequence.+ schema:+ type: string+ title: owner_column+ - name: metadata.schemas.sequences.comment+ in: query+ description: The comment describing the sequence.+ schema:+ type: string+ title: comment+ - name: metadata.schemas.sequences.skipDump+ in: query+ description: Whether to skip this sequence during schema dump operations.+ schema:+ type: boolean+ title: skip_dump+ - name: metadata.schemas.events.name+ in: query+ description: The name of the event.+ schema:+ type: string+ title: name+ - name: metadata.schemas.events.definition+ in: query+ description: The schedule of the event.+ schema:+ type: string+ title: definition+ - name: metadata.schemas.events.timeZone+ in: query+ description: The time zone of the event.+ schema:+ type: string+ title: time_zone+ - name: metadata.schemas.events.sqlMode+ in: query+ description: The SQL mode setting for the event.+ schema:+ type: string+ title: sql_mode+ - name: metadata.schemas.events.characterSetClient+ in: query+ description: The character set used by the client creating the event.+ schema:+ type: string+ title: character_set_client+ - name: metadata.schemas.events.collationConnectionin: query- description: |-- If set to true, and the project is not found, a new project will be created.- In this situation, `update_mask` is ignored.+ description: The collation used for the connection when creating the event.+ schema:+ type: string+ title: collation_connection+ - name: metadata.schemas.events.comment+ in: query+ description: The comment is the comment of an event.+ schema:+ type: string+ title: comment+ - name: metadata.schemas.enumTypes.name+ in: query+ description: The name of a type.+ schema:+ type: string+ title: name+ - name: metadata.schemas.enumTypes.values+ in: query+ description: The enum values of a type.+ schema:+ type: array+ items:+ type: string+ title: values+ - name: metadata.schemas.enumTypes.comment+ in: query+ description: The comment describing the enum type.+ schema:+ type: string+ title: comment+ - name: metadata.schemas.enumTypes.skipDump+ in: query+ description: Whether to skip this enum type during schema dump operations.schema:type: boolean- title: allow_missing- requestBody:- description: |-- The project to update.-- The project's `name` field is used to identify the project to update.- Format: projects/{project}- content:- application/json:- schema:- title: project- description: |-- The project to update.-- The project's `name` field is used to identify the project to update.- Format: projects/{project}- $ref: '#/components/schemas/bytebase.v1.Project'+ title: skip_dump+ - name: metadata.schemas.skipDump+ in: query+ description: Whether to skip this schema during schema dump operations.+ schema:+ type: boolean+ title: skip_dump+ - name: metadata.schemas.comment+ in: query+ description: The comment is the comment of a schema.+ schema:+ type: string+ title: comment+ - name: metadata.schemas.compositeTypes.name+ in: query+ description: The name of the composite type.+ schema:+ type: string+ title: name+ - name: metadata.schemas.compositeTypes.attributes.name+ in: query+ description: The name of the attribute.+ schema:+ type: string+ title: name+ - name: metadata.schemas.compositeTypes.attributes.type+ in: query+ description: The attribute type. User-defined types are always schema-qualified.+ schema:+ type: string+ title: type+ - name: metadata.schemas.compositeTypes.attributes.collation+ in: query+ description: |-+ The non-default collation of the attribute as an emit-ready SQL+ identifier reference (quoted as needed, schema-qualified when outside+ pg_catalog), empty otherwise. e.g. `"C"` or `locale.en_us`.+ schema:+ type: string+ title: collation+ - name: metadata.schemas.compositeTypes.attributes.comment+ in: query+ description: The comment describing the attribute.+ schema:+ type: string+ title: comment+ - name: metadata.schemas.compositeTypes.comment+ in: query+ description: The comment describing the composite type.+ schema:+ type: string+ title: comment+ - name: metadata.characterSet+ in: query+ description: The character_set is the character set of a database.+ schema:+ type: string+ title: character_set+ - name: metadata.collation+ in: query+ description: The collation is the collation of a database.+ schema:+ type: string+ title: collation+ - name: metadata.extensions.name+ in: query+ description: The name is the name of an extension.+ schema:+ type: string+ title: name+ - name: metadata.extensions.schema+ in: query+ description: |-+ The schema is the extension that is installed to. But the extension usage+ is not limited to the schema.+ schema:+ type: string+ title: schema+ - name: metadata.extensions.version+ in: query+ description: The version is the version of an extension.+ schema:+ type: string+ title: version+ - name: metadata.extensions.description+ in: query+ description: The description is the description of an extension.+ schema:+ type: string+ title: description+ - name: metadata.owner+ in: query+ description: The owner of the database.+ schema:+ type: string+ title: owner+ - name: metadata.searchPath+ in: query+ description: The search_path is the search path of a PostgreSQL database.+ schema:+ type: string+ title: search_pathresponses:"200":description: Successcontent:application/json:schema:- $ref: '#/components/schemas/bytebase.v1.Project'- /v1/projects/{project}/accessGrants:+ $ref: '#/components/schemas/bytebase.v1.GetSchemaStringResponse'+ /v1/projects/{project}/instances/{instance}/databases/{database}/sdlSchema:get:tags:- - AccessGrantService- summary: ListAccessGrants- description: Lists access grants in a project.- operationId: AccessGrantService_ListAccessGrants+ - DatabaseService+ summary: GetDatabaseSDLSchema+ description: |-+ Retrieves database schema in SDL (Schema Definition Language) format.+ Permissions required: bb.databases.getSchema+ operationId: DatabaseService_GetDatabaseSDLSchema2parameters:- name: projectin: path@@ -6661,73 +9637,96 @@ paths:required: trueschema:type: string- - name: pageSize- in: query- description: The maximum number of access grants to return.+ - name: instance+ in: path+ description: The instance id.+ required: trueschema:- type: integer- title: page_size- format: int32- - name: pageToken- in: query- description: A page token from a previous ListAccessGrants call.+ type: string+ - name: database+ in: path+ description: The database id.+ required: trueschema:type: string- title: page_token- - name: filter+ - name: formatin: query- description: |-- Filter expression using AIP-160 syntax.- Supported fields:- - name: the fullname in "projects/{project}/accessGrants/{access_grant}" format, support "==" operator.- - creator: the creator name in "users/{email}" format, support "==" operator.- - status: the access status, support "==" and "in" operator.- - issue: the access issue fullname, support "==" operator.- - expire_time: the access expire time in "2006-01-02T15:04:05Z07:00" format, support ">=", ">", "<=" and "<" operator.- - create_time: the access creation time in "2006-01-02T15:04:05Z07:00" format, support ">=", ">", "<=" and "<" operator.- - query: the access query, support "==" and ".contains(xx)" operator- - target: the target database fullname, support "==" operator.- - unmask: whether the grant allows unmasking sensitive data, support "==" operator with a boolean literal.- - export: whether the grant allows exporting the query result, support "==" operator with a boolean literal.-- Examples:- - creator == "users/[email protected]"- - status == "ACTIVE"- - status in ["ACTIVE", "PENDING"]- - creator == "users/[email protected]" && status == "ACTIVE"- - issue == "projects/x/issues/123"- - status == "ACTIVE" && expire_time > "2024-02-01T00:00:00Z"- - target == "instances/sample/databases/employee"- - unmask == true- - export == true && status == "ACTIVE"+ description: The format of the SDL schema output.+ schema:+ title: format+ $ref: '#/components/schemas/bytebase.v1.GetDatabaseSDLSchemaRequest.SDLFormat'+ responses:+ "200":+ description: Success+ content:+ application/json:+ schema:+ $ref: '#/components/schemas/bytebase.v1.DatabaseSDLSchema'+ /v1/projects/{project}/instances/{instance}/databases/{database}:diffMetadata:+ post:+ tags:+ - DatabaseService+ summary: DiffMetadata+ description: |-+ Generates migration statements from the database's current schema to the+ given target metadata.+ Permissions required: bb.databases.diffMetadata+ operationId: DatabaseService_DiffMetadata2+ parameters:+ - name: project+ in: path+ description: The project id.+ required: trueschema:type: string- title: filter- - name: orderBy- in: query- description: |-- The order by of access grants.- Support creator, expire_time, create_time. The default sorting order is ascending.- For example:- - order_by = "creator"- - order_by = "expire_time desc"- - order_by = "expire_time asc, create_time desc"+ - name: instance+ in: path+ description: The instance id.+ required: true+ schema:+ type: string+ - name: database+ in: path+ description: The database id.+ required: trueschema:type: string- title: order_by+ requestBody:+ content:+ application/json:+ schema:+ type: object+ properties:+ targetMetadata:+ title: target_metadata+ description: |-+ The metadata of the target schema. The source metadata and the engine are+ read from the database, so only the target travels in the request.+ Must describe the COMPLETE target schema: the diff runs against the full+ stored source, so any object omitted from the target (for example by a+ truncated metadata fetch) is treated as dropped.+ $ref: '#/components/schemas/bytebase.v1.DatabaseMetadata'+ title: DiffMetadataRequest+ required:+ - targetMetadata+ additionalProperties: false+ required: trueresponses:"200":description: Successcontent:application/json:schema:- $ref: '#/components/schemas/bytebase.v1.ListAccessGrantsResponse'+ $ref: '#/components/schemas/bytebase.v1.DiffMetadataResponse'+ /v1/projects/{project}/instances/{instance}/databases/{database}:diffSchema:post:tags:- - AccessGrantService- summary: CreateAccessGrant- description: Creates an access grant.- operationId: AccessGrantService_CreateAccessGrant+ - DatabaseService+ summary: DiffSchema+ description: |-+ Compares and generates migration statements between two schemas.+ Permissions required: bb.databases.get+ operationId: DatabaseService_DiffSchema2parameters:- name: projectin: path@@ -6735,28 +9734,66 @@ paths:required: trueschema:type: string+ - name: instance+ in: path+ description: The instance id.+ required: true+ schema:+ type: string+ - name: database+ in: path+ description: The database id.+ required: true+ schema:+ type: stringrequestBody:- description: The access grant to create.content:application/json:schema:- title: access_grant- description: The access grant to create.- $ref: '#/components/schemas/bytebase.v1.AccessGrant'+ type: object+ allOf:+ - {}+ - oneOf:+ - type: object+ properties:+ changelog:+ type: string+ title: changelog+ description: |-+ The resource name of the changelog+ Format:+ instances/{instance}/databases/{database}/changelogs/{changelog} or projects/{project}/instances/{instance}/databases/{database}/changelogs/{changelog}+ title: changelog+ required:+ - changelog+ - type: object+ properties:+ schema:+ type: string+ title: schema+ description: The target schema.+ title: schema+ required:+ - schema+ title: DiffSchemaRequest+ additionalProperties: false+ required: trueresponses:"200":description: Successcontent:application/json:schema:- $ref: '#/components/schemas/bytebase.v1.AccessGrant'- /v1/projects/{project}/accessGrants/{accessGrant}:- get:+ $ref: '#/components/schemas/bytebase.v1.DiffSchemaResponse'+ /v1/projects/{project}/instances/{instance}/databases/{database}:sync:+ post:tags:- - AccessGrantService- summary: GetAccessGrant- description: Gets an access grant by name.- operationId: AccessGrantService_GetAccessGrant+ - DatabaseService+ summary: SyncDatabase+ description: |-+ Synchronizes database schema from the instance.+ Permissions required: bb.databases.sync+ operationId: DatabaseService_SyncDatabase2parameters:- name: projectin: path@@ -6764,9 +9801,15 @@ paths:required: trueschema:type: string- - name: accessGrant+ - name: instancein: path- description: The accessGrant id.+ description: The instance id.+ required: true+ schema:+ type: string+ - name: database+ in: path+ description: The database id.required: trueschema:type: string@@ -6776,14 +9819,16 @@ paths:content:application/json:schema:- $ref: '#/components/schemas/bytebase.v1.AccessGrant'- /v1/projects/{project}/accessGrants/{accessGrant}:activate:- post:+ $ref: '#/components/schemas/bytebase.v1.SyncDatabaseResponse'+ /v1/projects/{project}/instances/{instance}/databases:batchGet:+ get:tags:- - AccessGrantService- summary: ActivateAccessGrant- description: Activates a pending access grant.- operationId: AccessGrantService_ActivateAccessGrant+ - DatabaseService+ summary: BatchGetDatabases+ description: |-+ Retrieves multiple databases by their names.+ Permissions required: bb.databases.get+ operationId: DatabaseService_BatchGetDatabases3parameters:- name: projectin: path@@ -6791,26 +9836,37 @@ paths:required: trueschema:type: string- - name: accessGrant+ - name: instancein: path- description: The accessGrant id.+ description: The instance id.required: trueschema:type: string+ - name: names+ in: query+ description: The list of database names to retrieve.+ required: true+ schema:+ type: array+ items:+ type: string+ title: namesresponses:"200":description: Successcontent:application/json:schema:- $ref: '#/components/schemas/bytebase.v1.AccessGrant'- /v1/projects/{project}/accessGrants/{accessGrant}:revoke:+ $ref: '#/components/schemas/bytebase.v1.BatchGetDatabasesResponse'+ /v1/projects/{project}/instances/{instance}/databases:batchSync:post:tags:- - AccessGrantService- summary: RevokeAccessGrant- description: Revokes an active access grant.- operationId: AccessGrantService_RevokeAccessGrant+ - DatabaseService+ summary: BatchSyncDatabases+ description: |-+ Synchronizes multiple databases in a single batch operation.+ Permissions required: bb.databases.sync+ operationId: DatabaseService_BatchSyncDatabases2parameters:- name: projectin: path@@ -6818,26 +9874,45 @@ paths:required: trueschema:type: string- - name: accessGrant+ - name: instancein: path- description: The accessGrant id.+ description: The instance id.required: trueschema:type: string+ requestBody:+ content:+ application/json:+ schema:+ type: object+ properties:+ names:+ type: array+ items:+ type: string+ title: names+ description: The list of database names to sync.+ title: BatchSyncDatabasesRequest+ required:+ - names+ additionalProperties: false+ required: trueresponses:"200":description: Successcontent:application/json:schema:- $ref: '#/components/schemas/bytebase.v1.AccessGrant'- /v1/projects/{project}/accessGrants:searchMy:+ $ref: '#/components/schemas/bytebase.v1.BatchSyncDatabasesResponse'+ /v1/projects/{project}/instances/{instance}/databases:batchUpdate:post:tags:- - AccessGrantService- summary: SearchMyAccessGrants- description: Searches access grants created by the caller.- operationId: AccessGrantService_SearchMyAccessGrants+ - DatabaseService+ summary: BatchUpdateDatabases+ description: |-+ Updates multiple databases in a single batch operation.+ Permissions required: bb.databases.update+ operationId: DatabaseService_BatchUpdateDatabases2parameters:- name: projectin: path@@ -6845,30 +9920,29 @@ paths:required: trueschema:type: string+ - name: instance+ in: path+ description: The instance id.+ required: true+ schema:+ type: stringrequestBody:content:application/json:schema:type: objectproperties:- pageSize:- type: integer- title: page_size- format: int32- description: The maximum number of access grants to return.- pageToken:- type: string- title: page_token- description: A page token from a previous SearchMyAccessGrants call.- filter:- type: string- title: filter- description: Check the filter field in the ListAccessGrantsRequest message.- orderBy:- type: string- title: order_by- description: Check the order_by field in the ListAccessGrantsRequest message.- title: SearchMyAccessGrantsRequest+ requests:+ type: array+ items:+ $ref: '#/components/schemas/bytebase.v1.UpdateDatabaseRequest'+ title: requests+ description: |-+ The request message specifying the resources to update.+ A maximum of 1000 databases can be modified in a batch.+ title: BatchUpdateDatabasesRequest+ required:+ - requestsadditionalProperties: falserequired: trueresponses:@@ -6877,16 +9951,75 @@ paths:content:application/json:schema:- $ref: '#/components/schemas/bytebase.v1.SearchMyAccessGrantsResponse'- /v1/projects/{project}/auditLogs:export:+ $ref: '#/components/schemas/bytebase.v1.BatchUpdateDatabasesResponse'+ /v1/projects/{project}/instances/{instance}/roles:+ get:+ tags:+ - InstanceRoleService+ summary: ListInstanceRoles+ description: |-+ Lists all database roles in an instance.+ Permissions required: bb.instanceRoles.list+ operationId: InstanceRoleService_ListInstanceRoles2+ parameters:+ - name: project+ in: path+ description: The project id.+ required: true+ schema:+ type: string+ - name: instance+ in: path+ description: The instance id.+ required: true+ schema:+ type: string+ - name: pageSize+ in: query+ description: |-+ Not used.+ The maximum number of roles to return. The service may return fewer than+ this value.+ If unspecified, at most 10 roles will be returned.+ The maximum value is 1000; values above 1000 will be coerced to 1000.+ schema:+ type: integer+ title: page_size+ format: int32+ - name: pageToken+ in: query+ description: |-+ Not used.+ A page token, received from a previous `ListInstanceRoles` call.+ Provide this to retrieve the subsequent page.++ When paginating, all other parameters provided to `ListInstanceRoles` must match+ the call that provided the page token.+ schema:+ type: string+ title: page_token+ - name: refresh+ in: query+ description: Refresh will refresh and return the latest data.+ schema:+ type: boolean+ title: refresh+ responses:+ "200":+ description: Success+ content:+ application/json:+ schema:+ $ref: '#/components/schemas/bytebase.v1.ListInstanceRolesResponse'+ /v1/projects/{project}/instances/{instance}:addDataSource:post:tags:- - AuditLogService- summary: ExportAuditLogs+ - InstanceService+ summary: AddDataSourcedescription: |-- Exports audit logs in a specified format for external analysis.- Permissions required: bb.auditLogs.export- operationId: AuditLogService_ExportAuditLogs+ Adds a read-only data source to an instance.+ Permissions required: bb.instances.update+ operationId: InstanceService_AddDataSource2parameters:- name: projectin: path@@ -6894,49 +10027,32 @@ paths:required: trueschema:type: string+ - name: instance+ in: path+ description: The instance id.+ required: true+ schema:+ type: stringrequestBody:content:application/json:schema:type: objectproperties:- filter:- type: string- title: filter- description: |-- The filter of the log. It should be a valid CEL expression.- Check the filter field in the SearchAuditLogsRequest message.- orderBy:- type: string- title: order_by- description: |-- The order by of the log.- Only support order by create_time. The default sorting order is ascending.- For example:- - order_by = "create_time asc"- - order_by = "create_time desc"- format:- title: format- description: The export format.- $ref: '#/components/schemas/bytebase.v1.ExportFormat'- pageSize:- type: integer- title: page_size- format: int32- description: |-- The maximum number of logs to return.- The service may return fewer than this value.- If unspecified, at most 10 log entries will be returned.- The maximum value is 5000; values above 5000 will be coerced to 5000.- pageToken:- type: string- title: page_token+ dataSource:+ title: data_sourcedescription: |-- A page token, received from a previous `ExportAuditLogs` call.- Provide this to retrieve the subsequent page.- title: ExportAuditLogsRequest+ Identified by data source ID.+ Only READ_ONLY data source can be added.+ $ref: '#/components/schemas/bytebase.v1.DataSource'+ validateOnly:+ type: boolean+ title: validate_only+ description: Validate only also tests the data source connection.+ title: AddDataSourceRequest+ required:+ - dataSourceadditionalProperties: false- description: Request message for exporting audit logs.required: trueresponses:"200":@@ -6944,16 +10060,16 @@ paths:content:application/json:schema:- $ref: '#/components/schemas/bytebase.v1.ExportAuditLogsResponse'- /v1/projects/{project}/auditLogs:search:+ $ref: '#/components/schemas/bytebase.v1.Instance'+ /v1/projects/{project}/instances/{instance}:databases:post:tags:- - AuditLogService- summary: SearchAuditLogs+ - InstanceService+ summary: ListInstanceDatabasedescription: |-- Searches audit logs with optional filtering and pagination.- Permissions required: bb.auditLogs.search- operationId: AuditLogService_SearchAuditLogs+ Lists all databases within an instance without creating them.+ Permissions required: bb.instances.get+ operationId: InstanceService_ListInstanceDatabase2parameters:- name: projectin: path@@ -6961,57 +10077,28 @@ paths:required: trueschema:type: string+ - name: instance+ in: path+ description: The instance id.+ required: true+ schema:+ type: stringrequestBody:content:application/json:schema:type: objectproperties:- filter:- type: string- title: filter- description: |-- The filter of the log. It should be a valid CEL expression.- The syntax and semantics of CEL are documented at https://github.com/google/cel-spec-- Supported filter:- - method: the API name, can be found in the docs, should start with "/bytebase.v1." prefix. For example "/bytebase.v1.UserService/CreateUser". Support "==" operator.- - severity: support "==" operator, check Severity enum in AuditLog message for values.- - user: the actor, should in "users/{email}" format, support "==" operator.- - create_time: support ">=" and "<=" operator.-- For example:- - filter = "method == '/bytebase.v1.SQLService/Query'"- - filter = "method == '/bytebase.v1.SQLService/Query' && severity == 'ERROR'"- - filter = "method == '/bytebase.v1.SQLService/Query' && severity == 'ERROR' && user == 'users/[email protected]'"- - filter = "method == '/bytebase.v1.SQLService/Query' && severity == 'ERROR' && create_time <= '2021-01-01T00:00:00Z' && create_time >= '2020-01-01T00:00:00Z'"- orderBy:- type: string- title: order_by- description: |-- The order by of the log.- Only support order by create_time. The default sorting order is ascending.- For example:- - order_by = "create_time asc"- - order_by = "create_time desc"- pageSize:- type: integer- title: page_size- format: int32- description: |-- The maximum number of logs to return.- The service may return fewer than this value.- If unspecified, at most 10 log entries will be returned.- The maximum value is 5000; values above 5000 will be coerced to 5000.- pageToken:- type: string- title: page_token- description: |-- A page token, received from a previous `SearchLogs` call.- Provide this to retrieve the subsequent page.- title: SearchAuditLogsRequest+ instance:+ oneOf:+ - $ref: '#/components/schemas/bytebase.v1.Instance'+ - type: "null"+ title: instance+ description: The target instance. We need to set this field if the target instance is not created yet.+ title: ListInstanceDatabaseRequest+ required:+ - instanceadditionalProperties: false- description: Request message for searching audit logs.required: trueresponses:"200":@@ -7019,16 +10106,16 @@ paths:content:application/json:schema:- $ref: '#/components/schemas/bytebase.v1.SearchAuditLogsResponse'- /v1/projects/{project}/databaseGroups:- get:+ $ref: '#/components/schemas/bytebase.v1.ListInstanceDatabaseResponse'+ /v1/projects/{project}/instances/{instance}:removeDataSource:+ post:tags:- - DatabaseGroupService- summary: ListDatabaseGroups+ - InstanceService+ summary: RemoveDataSourcedescription: |-- Lists database groups in a project.- Permissions required: bb.databaseGroups.list- operationId: DatabaseGroupService_ListDatabaseGroups+ Removes a read-only data source from an instance.+ Permissions required: bb.instances.update+ operationId: InstanceService_RemoveDataSource2parameters:- name: projectin: path@@ -7036,75 +10123,45 @@ paths:required: trueschema:type: string- - name: view- in: query- description: The view to return. Defaults to DATABASE_GROUP_VIEW_BASIC.- schema:- title: view- $ref: '#/components/schemas/bytebase.v1.DatabaseGroupView'- responses:- "200":- description: Success- content:- application/json:- schema:- $ref: '#/components/schemas/bytebase.v1.ListDatabaseGroupsResponse'- post:- tags:- - DatabaseGroupService- summary: CreateDatabaseGroup- description: |-- Creates a new database group.- Permissions required: bb.databaseGroups.create- operationId: DatabaseGroupService_CreateDatabaseGroup- parameters:- - name: project+ - name: instancein: path- description: The project id.+ description: The instance id.required: trueschema:type: string- - name: databaseGroupId- in: query- description: |-- The ID to use for the database group, which will become the final component of- the database group's resource name.-- This value should be 4-63 characters, and valid characters- are /[a-z][0-9]-/.- schema:- type: string- title: database_group_id- - name: validateOnly- in: query- description: If set, validate the create request and preview the full database group response, but do not actually create it.- schema:- type: boolean- title: validate_onlyrequestBody:- description: The database group to create.content:application/json:schema:- title: database_group- description: The database group to create.- $ref: '#/components/schemas/bytebase.v1.DatabaseGroup'+ type: object+ properties:+ dataSource:+ title: data_source+ description: |-+ Identified by data source ID.+ Only READ_ONLY data source can be removed.+ $ref: '#/components/schemas/bytebase.v1.DataSource'+ title: RemoveDataSourceRequest+ required:+ - dataSource+ additionalProperties: false+ required: trueresponses:"200":description: Successcontent:application/json:schema:- $ref: '#/components/schemas/bytebase.v1.DatabaseGroup'- /v1/projects/{project}/databaseGroups/{databaseGroup}:- get:+ $ref: '#/components/schemas/bytebase.v1.Instance'+ /v1/projects/{project}/instances/{instance}:sync:+ post:tags:- - DatabaseGroupService- summary: GetDatabaseGroup+ - InstanceService+ summary: SyncInstancedescription: |-- Gets a database group by name.- Permissions required: bb.databaseGroups.get- operationId: DatabaseGroupService_GetDatabaseGroup+ Syncs database schemas and metadata from an instance.+ Permissions required: bb.instances.sync+ operationId: InstanceService_SyncInstance2parameters:- name: projectin: path@@ -7112,33 +10169,43 @@ paths:required: trueschema:type: string- - name: databaseGroup+ - name: instancein: path- description: The databaseGroup id.+ description: The instance id.required: trueschema:type: string- - name: view- in: query- description: The view to return. Defaults to DATABASE_GROUP_VIEW_BASIC.- schema:- title: view- $ref: '#/components/schemas/bytebase.v1.DatabaseGroupView'+ requestBody:+ content:+ application/json:+ schema:+ type: object+ properties:+ enableFullSync:+ type: boolean+ title: enable_full_sync+ description: |-+ When full sync is enabled, all databases in the instance will be synchronized. Otherwise, only+ the instance metadata (such as the database list) and any newly discovered databases will be synced.+ title: SyncInstanceRequest+ additionalProperties: false+ required: trueresponses:"200":description: Successcontent:application/json:schema:- $ref: '#/components/schemas/bytebase.v1.DatabaseGroup'- delete:+ $ref: '#/components/schemas/bytebase.v1.SyncInstanceResponse'+ /v1/projects/{project}/instances/{instance}:undelete:+ post:tags:- - DatabaseGroupService- summary: DeleteDatabaseGroup+ - InstanceService+ summary: UndeleteInstancedescription: |-- Deletes a database group.- Permissions required: bb.databaseGroups.delete- operationId: DatabaseGroupService_DeleteDatabaseGroup+ Restores a soft-deleted database instance.+ Permissions required: bb.instances.undelete+ operationId: InstanceService_UndeleteInstance2parameters:- name: projectin: path@@ -7146,9 +10213,9 @@ paths:required: trueschema:type: string- - name: databaseGroup+ - name: instancein: path- description: The databaseGroup id.+ description: The instance id.required: trueschema:type: string@@ -7158,16 +10225,16 @@ paths:content:application/json:schema:- $ref: '#/components/schemas/google.protobuf.Empty'+ $ref: '#/components/schemas/bytebase.v1.Instance'+ /v1/projects/{project}/instances/{instance}:updateDataSource:patch:tags:- - DatabaseGroupService- summary: UpdateDatabaseGroup+ - InstanceService+ summary: UpdateDataSourcedescription: |-- Updates a database group.- Permissions required: bb.databaseGroups.update- When allow_missing=true, also requires: bb.databaseGroups.create- operationId: DatabaseGroupService_UpdateDatabaseGroup+ Updates a data source configuration.+ Permissions required: bb.instances.update+ operationId: InstanceService_UpdateDataSource2parameters:- name: projectin: path@@ -7175,9 +10242,9 @@ paths:required: trueschema:type: string- - name: databaseGroup+ - name: instancein: path- description: The databaseGroup id.+ description: The instance id.required: trueschema:type: string@@ -7385,46 +10452,44 @@ paths:`INVALID_ARGUMENT` error if any path is unmappable.schema:type: string+ - name: validateOnly+ in: query+ description: Validate only also tests the data source connection.+ schema:+ type: boolean+ title: validate_only- name: allowMissingin: querydescription: |-- If set to true, and the database group is not found, a new database group will be created.+ If set to true, and the data source is not found, a new data source will be created.In this situation, `update_mask` is ignored.schema:type: booleantitle: allow_missingrequestBody:- description: |-- The database group to update.-- The database group's `name` field is used to identify the database group to update.- Format: projects/{project}/databaseGroups/{databaseGroup}+ description: Identified by data source ID.content:application/json:schema:- title: database_group- description: |-- The database group to update.-- The database group's `name` field is used to identify the database group to update.- Format: projects/{project}/databaseGroups/{databaseGroup}- $ref: '#/components/schemas/bytebase.v1.DatabaseGroup'+ title: data_source+ description: Identified by data source ID.+ $ref: '#/components/schemas/bytebase.v1.DataSource'responses:"200":description: Successcontent:application/json:schema:- $ref: '#/components/schemas/bytebase.v1.DatabaseGroup'- /v1/projects/{project}/databases:- get:+ $ref: '#/components/schemas/bytebase.v1.Instance'+ /v1/projects/{project}/instances:batchSync:+ post:tags:- - DatabaseService- summary: ListDatabases+ - InstanceService+ summary: BatchSyncInstancesdescription: |-- Lists databases in a project, instance, or workspace.- Permissions required: bb.projects.get (for project parent), bb.databases.list (for workspace parent), or bb.instances.get (for instance parent)- operationId: DatabaseService_ListDatabases+ Syncs multiple instances in a single request.+ Permissions required: bb.instances.sync+ operationId: InstanceService_BatchSyncInstances2parameters:- name: projectin: path@@ -7432,99 +10497,41 @@ paths:required: trueschema:type: string- - name: pageSize- in: query- description: |-- The maximum number of databases to return. The service may return fewer- than this value.- If unspecified, at most 10 databases will be returned.- The maximum value is 1000; values above 1000 will be coerced to 1000.- schema:- type: integer- title: page_size- format: int32- - name: pageToken- in: query- description: |-- A page token, received from a previous `ListDatabases` call.- Provide this to retrieve the subsequent page.-- When paginating, all other parameters provided to `ListDatabases` must- match the call that provided the page token.- schema:- type: string- title: page_token- - name: filter- in: query- description: |-- Filter is used to filter databases returned in the list.- The syntax and semantics of CEL are documented at https://github.com/google/cel-spec-- Supported filter:- - environment: the environment full name in "environments/{id}" format, support "==" operator.- - name: the database name, support ".contains()" operator.- - project: the project full name in "projects/{id}" format, support "==" operator.- - instance: the instance full name in "instances/{id}" format, support "==" operator.- - engine: the database engine, check Engine enum for values. Support "==", "in [xx]", "!(in [xx])" operator.- - exclude_unassigned: should be "true" or "false", will not show unassigned databases if it's true, support "==" operator.- - table: filter by the database table, support "==" and ".contains()" operator.- - labels.{key}: the database label, support "==" and "in" operators.-- For example:- environment == "environments/{environment resource id}"- environment == "" (find databases which environment is not set)- project == "projects/{project resource id}"- instance == "instances/{instance resource id}"- name.contains("database name")- engine == "MYSQL"- engine in ["MYSQL", "POSTGRES"]- !(engine in ["MYSQL", "POSTGRES"])- exclude_unassigned == true- table == "sample"- table.contains("sam")- labels.environment == "production"- labels.region == "asia"- labels.region in ["asia", "europe"]-- You can combine filter conditions like:- environment == "environments/prod" && name.contains("employee")- schema:- type: string- title: filter- - name: showDeleted- in: query- description: Show deleted database if specified.- schema:- type: boolean- title: show_deleted- - name: orderBy- in: query- description: |-- The order by of databases.- Support name, project, instance. The default sorting order is ascending.- For example:- - order_by = "name" - order by name ascending- - order_by = "name desc"- - order_by = "name desc, project asc"- schema:- type: string- title: order_by+ requestBody:+ content:+ application/json:+ schema:+ type: object+ properties:+ requests:+ type: array+ items:+ $ref: '#/components/schemas/bytebase.v1.SyncInstanceRequest'+ title: requests+ description: |-+ The request message specifying the instances to sync.+ A maximum of 1000 instances can be synced in a batch.+ title: BatchSyncInstancesRequest+ required:+ - requests+ additionalProperties: false+ required: trueresponses:"200":description: Successcontent:application/json:schema:- $ref: '#/components/schemas/bytebase.v1.ListDatabasesResponse'- /v1/projects/{project}/databases:batchGet:- get:+ $ref: '#/components/schemas/bytebase.v1.BatchSyncInstancesResponse'+ /v1/projects/{project}/instances:batchUpdate:+ post:tags:- - DatabaseService- summary: BatchGetDatabases+ - InstanceService+ summary: BatchUpdateInstancesdescription: |-- Retrieves multiple databases by their names.- Permissions required: bb.databases.get- operationId: DatabaseService_BatchGetDatabases+ Updates multiple instances in a single request.+ Permissions required: bb.instances.update+ operationId: InstanceService_BatchUpdateInstances2parameters:- name: projectin: path@@ -7532,22 +10539,30 @@ paths:required: trueschema:type: string- - name: names- in: query- description: The list of database names to retrieve.- required: true- schema:- type: array- items:- type: string- title: names+ requestBody:+ content:+ application/json:+ schema:+ type: object+ properties:+ requests:+ type: array+ items:+ $ref: '#/components/schemas/bytebase.v1.UpdateInstanceRequest'+ title: requests+ description: The request message specifying the resources to update.+ title: BatchUpdateInstancesRequest+ required:+ - requests+ additionalProperties: false+ required: trueresponses:"200":description: Successcontent:application/json:schema:- $ref: '#/components/schemas/bytebase.v1.BatchGetDatabasesResponse'+ $ref: '#/components/schemas/bytebase.v1.BatchUpdateInstancesResponse'/v1/projects/{project}/issues:get:tags:@@ -9925,8 +12940,6 @@ paths:Format: {resource name}/policies/{policy type}Workspace resource name: workspaces/{workspace-id}.Environment resource name: environments/environment-id.- Instance resource name: instances/instance-id.- Database resource name: instances/instance-id/databases/database-name.content:application/json:schema:@@ -9938,8 +12951,6 @@ paths:Format: {resource name}/policies/{policy type}Workspace resource name: workspaces/{workspace-id}.Environment resource name: environments/environment-id.- Instance resource name: instances/instance-id.- Database resource name: instances/instance-id/databases/database-name.$ref: '#/components/schemas/bytebase.v1.Policy'responses:"200":@@ -15250,8 +18261,6 @@ paths:Format: {resource name}/policies/{policy type}Workspace resource name: workspaces/{workspace-id}.Environment resource name: environments/environment-id.- Instance resource name: instances/instance-id.- Database resource name: instances/instance-id/databases/database-name.content:application/json:schema:@@ -15263,8 +18272,6 @@ paths:Format: {resource name}/policies/{policy type}Workspace resource name: workspaces/{workspace-id}.Environment resource name: environments/environment-id.- Instance resource name: instances/instance-id.- Database resource name: instances/instance-id/databases/database-name.$ref: '#/components/schemas/bytebase.v1.Policy'responses:"200":@@ -16117,7 +19124,7 @@ components:title: namedescription: |-The name of the instance to add a data source to.- Format: instances/{instance}+ Format: instances/{instance} or projects/{project}/instances/{instance}dataSource:title: data_sourcedescription: |-@@ -16750,7 +19757,7 @@ components:title: parentdescription: |-The parent resource shared by all revisions being created.- Format: instances/{instance}/databases/{database}+ Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}requests:type: arrayitems:@@ -16862,7 +19869,8 @@ components:description: |-The parent resource shared by all databases being retrieved.- projects/{project}: batch get databases in a project;- - instances/{instances}: batch get databases in a instance;+ - instances/{instance}: batch get databases in an instance;+ - projects/{project}/instances/{instance}: batch get databases in a project instance;Use "-" as wildcard to batch get databases across parent.names:type: array@@ -17063,7 +20071,7 @@ components:title: parentdescription: |-The parent resource shared by all databases being updated.- Format: instances/{instance}+ Format: instances/{instance} or projects/{project}/instances/{instance}If the operation spans parents, a dash (-) may be accepted as a wildcard.names:type: array@@ -17082,6 +20090,15 @@ components:bytebase.v1.BatchSyncInstancesRequest:type: objectproperties:+ parent:+ type:+ - string+ - "null"+ title: parent+ description: |-+ The parent, which owns this collection of instances.+ Format: projects/{project}. If omitted, all targets must be workspace+ instances; otherwise, every target must belong to this project collection.requests:type: arrayitems:@@ -17106,7 +20123,7 @@ components:title: parentdescription: |-The parent resource shared by all databases being updated.- Format: instances/{instance}+ Format: instances/{instance} or projects/{project}/instances/{instance}If the operation spans parents, a dash (-) may be accepted as a wildcard.We only support updating the project of databases for now.requests:@@ -17135,6 +20152,15 @@ components:bytebase.v1.BatchUpdateInstancesRequest:type: objectproperties:+ parent:+ type:+ - string+ - "null"+ title: parent+ description: |-+ The parent, which owns this collection of instances.+ Format: projects/{project}. If omitted, all targets must be workspace+ instances; otherwise, every target must belong to this project collection.requests:type: arrayitems:@@ -17413,7 +20439,7 @@ components:name:type: stringtitle: name- description: 'Format: instances/{instance}/databases/{database}/changelogs/{changelog}'+ description: 'Format: instances/{instance}/databases/{database}/changelogs/{changelog} or projects/{project}/instances/{instance}/databases/{database}/changelogs/{changelog}'createTime:title: create_time$ref: '#/components/schemas/google.protobuf.Timestamp'@@ -17873,6 +20899,15 @@ components:bytebase.v1.CreateInstanceRequest:type: objectproperties:+ parent:+ type:+ - string+ - "null"+ title: parent+ description: |-+ The parent, which owns this collection of instances.+ Format: projects/{project}. If omitted, the instance is created in the+ workspace collection.instance:title: instancedescription: The instance to create.@@ -17895,7 +20930,7 @@ components:title: initial_database_projectdescription: |-The project to assign newly discovered databases to during initial sync.- Format: projects/{project}+ Format: projects/{project}. This must be unset when `parent` is set.title: CreateInstanceRequestrequired:- instance@@ -17963,8 +20998,6 @@ components:The parent resource where this instance will be created.Workspace resource name: workspaces/{workspace-id}.Environment resource name: environments/environment-id.- Instance resource name: instances/instance-id.- Database resource name: instances/instance-id/databases/database-name.policy:title: policydescription: The policy to create.@@ -18061,7 +21094,7 @@ components:parent:type: stringtitle: parent- description: 'Format: instances/{instance}/databases/{database}'+ description: 'Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}'revision:title: revisiondescription: The revision to create.@@ -18814,7 +21847,7 @@ components:title: namedescription: |-The name of the database.- Format: instances/{instance}/databases/{database}+ Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}{database} is the database name in the instance.state:title: state@@ -18906,7 +21939,7 @@ components:title: namedescription: |-The name of the database catalog.- Format: instances/{instance}/databases/{database}/catalog+ Format: instances/{instance}/databases/{database}/catalog or projects/{project}/instances/{instance}/databases/{database}/catalogschemas:type: arrayitems:@@ -18995,7 +22028,7 @@ components:description: |-The database metadata name.- Format: instances/{instance}/databases/{database}/metadata+ Format: instances/{instance}/databases/{database}/metadata or projects/{project}/instances/{instance}/databases/{database}/metadataschemas:type: arrayitems:@@ -19115,11 +22148,14 @@ components:title: namedescription: |-The name of the instance to delete.- Format: instances/{instance}+ Format: instances/{instance} or projects/{project}/instances/{instance}force:type: booleantitle: force- description: If set to true, any databases and sheets from this project will also be moved to default project, and all open issues will be closed.+ description: |-+ If set to true, a workspace instance's databases are moved to the default+ project before the instance is soft-deleted. Project instances reject this+ option because their databases must remain in the owning project.purge:type: booleantitle: purge@@ -19143,8 +22179,6 @@ components:Format: {resource name}/policies/{policy type}Workspace resource name: workspaces/{workspace-id}.Environment resource name: environments/environment-id.- Instance resource name: instances/instance-id.- Database resource name: instances/instance-id/databases/database-name.title: DeletePolicyRequestrequired:- name@@ -19206,7 +22240,7 @@ components:title: namedescription: |-The name of the revision to delete.- Format: instances/{instance}/databases/{database}/revisions/{revision}+ Format: instances/{instance}/databases/{database}/revisions/{revision} or projects/{project}/instances/{instance}/databases/{database}/revisions/{revision}title: DeleteRevisionRequestrequired:- name@@ -19328,7 +22362,7 @@ components:title: namedescription: |-The database whose current schema is the diff source.- Format: instances/{instance}/databases/{database}+ Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}targetMetadata:title: target_metadatadescription: |-@@ -19362,8 +22396,8 @@ components:description: |-The name of the database or changelog.Format:- database: instances/{instance}/databases/{database}- changelog: instances/{instance}/databases/{database}/changelogs/{changelog}+ database: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}+ changelog: instances/{instance}/databases/{database}/changelogs/{changelog} or projects/{project}/instances/{instance}/databases/{database}/changelogs/{changelog}- oneOf:- type: objectproperties:@@ -19373,7 +22407,7 @@ components:description: |-The resource name of the changelogFormat:- instances/{instance}/databases/{database}/changelogs/{changelog}+ instances/{instance}/databases/{database}/changelogs/{changelog} or projects/{project}/instances/{instance}/databases/{database}/changelogs/{changelog}title: changelogrequired:- changelog@@ -20054,7 +23088,7 @@ components:title: namedescription: |-The name of the changelog to retrieve.- Format: instances/{instance}/databases/{database}/changelogs/{changelog}+ Format: instances/{instance}/databases/{database}/changelogs/{changelog} or projects/{project}/instances/{instance}/databases/{database}/changelogs/{changelog}view:title: view$ref: '#/components/schemas/bytebase.v1.ChangelogView'@@ -20070,7 +23104,7 @@ components:title: namedescription: |-The name of the database catalog to retrieve.- Format: instances/{instance}/databases/{database}/catalog+ Format: instances/{instance}/databases/{database}/catalog or projects/{project}/instances/{instance}/databases/{database}/catalogtitle: GetDatabaseCatalogRequestrequired:- name@@ -20102,7 +23136,7 @@ components:title: namedescription: |-The name of the database to retrieve metadata.- Format: instances/{instance}/databases/{database}/metadata+ Format: instances/{instance}/databases/{database}/metadata or projects/{project}/instances/{instance}/databases/{database}/metadatafilter:type: stringtitle: filter@@ -20142,7 +23176,7 @@ components:title: namedescription: |-The name of the database to retrieve.- Format: instances/{instance}/databases/{database}+ Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}title: GetDatabaseRequestrequired:- name@@ -20155,7 +23189,7 @@ components:title: namedescription: |-The name of the database to retrieve SDL schema.- Format: instances/{instance}/databases/{database}/sdlSchema+ Format: instances/{instance}/databases/{database}/sdlSchema or projects/{project}/instances/{instance}/databases/{database}/sdlSchemaformat:title: formatdescription: The format of the SDL schema output.@@ -20180,7 +23214,7 @@ components:title: namedescription: |-The name of the database to retrieve schema.- Format: instances/{instance}/databases/{database}/schema+ Format: instances/{instance}/databases/{database}/schema or projects/{project}/instances/{instance}/databases/{database}/schematitle: GetDatabaseSchemaRequestrequired:- name@@ -20235,7 +23269,7 @@ components:title: namedescription: |-The name of the instance to retrieve.- Format: instances/{instance}+ Format: instances/{instance} or projects/{project}/instances/{instance}title: GetInstanceRequestrequired:- name@@ -20358,7 +23392,7 @@ components:title: namedescription: |-The name of the revision.- Format: instances/{instance}/databases/{database}/revisions/{revision}+ Format: instances/{instance}/databases/{database}/revisions/{revision} or projects/{project}/instances/{instance}/databases/{database}/revisions/{revision}title: GetRevisionRequestrequired:- name@@ -20398,7 +23432,7 @@ components:title: namedescription: |-The name of the database.- Format: instances/{instance}/databases/{database}+ Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}type:title: type$ref: '#/components/schemas/bytebase.v1.GetSchemaStringRequest.ObjectType'@@ -20877,7 +23911,7 @@ components:title: namedescription: |-The name of the instance.- Format: instances/{instance}+ Format: instances/{instance} or projects/{project}/instances/{instance}state:title: statedescription: The lifecycle state of the instance.@@ -20993,7 +24027,7 @@ components:title: namedescription: |-The name of the instance.- Format: instances/{instance}+ Format: instances/{instance} or projects/{project}/instances/{instance}environment:type:- string@@ -21012,7 +24046,7 @@ components:title: namedescription: |-The name of the role.- Format: instances/{instance}/roles/{role}+ Format: instances/{instance}/roles/{role} or projects/{project}/instances/{instance}/roles/{role}The role name is the unique name for the role.roleName:type: string@@ -21547,7 +24581,7 @@ components:title: parentdescription: |-The parent of the changelogs.- Format: instances/{instance}/databases/{database}+ Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}pageSize:type: integertitle: page_size@@ -21643,7 +24677,8 @@ components:description: |-- projects/{project}: list databases in a project, require "bb.projects.get" permission.- workspaces/{id}: list databases in the workspace, require "bb.databases.list" permission.- - instances/{instances}: list databases in a instance, require "bb.instances.get" permission+ - instances/{instance}: list databases in an instance, require "bb.instances.get" permission.+ - projects/{project}/instances/{instance}: list databases in a project instance, require "bb.instances.get" permission.pageSize:type: integertitle: page_size@@ -21825,7 +24860,7 @@ components:title: namedescription: |-The name of the instance.- Format: instances/{instance}+ Format: instances/{instance} or projects/{project}/instances/{instance}instance:oneOf:- $ref: '#/components/schemas/bytebase.v1.Instance'@@ -21856,7 +24891,7 @@ components:title: parentdescription: |-The parent, which owns this collection of roles.- Format: instances/{instance}+ Format: instances/{instance} or projects/{project}/instances/{instance}pageSize:type: integertitle: page_size@@ -21905,6 +24940,16 @@ components:bytebase.v1.ListInstancesRequest:type: objectproperties:+ parent:+ type:+ - string+ - "null"+ title: parent+ description: |-+ The parent, which owns this collection of instances.+ Format: projects/{project}. If omitted, only workspace instances are+ returned. Wildcard project parents are not supported. When set, the+ `project` filter must be omitted or match this parent.pageSize:type: integertitle: page_size@@ -22475,7 +25520,7 @@ components:title: parentdescription: |-The parent of the revisions.- Format: instances/{instance}/databases/{database}+ Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}pageSize:type: integertitle: page_size@@ -23992,8 +27037,6 @@ components:Format: {resource name}/policies/{policy type}Workspace resource name: workspaces/{workspace-id}.Environment resource name: environments/environment-id.- Instance resource name: instances/instance-id.- Database resource name: instances/instance-id/databases/database-name.inheritFromParent:type: booleantitle: inherit_from_parent@@ -24953,7 +27996,7 @@ components:title: namedescription: |-The name of the instance to remove a data source from.- Format: instances/{instance}+ Format: instances/{instance} or projects/{project}/instances/{instance}dataSource:title: data_sourcedescription: |-@@ -25131,7 +28174,7 @@ components:name:type: stringtitle: name- description: 'Format: instances/{instance}/databases/{database}/revisions/{revision}'+ description: 'Format: instances/{instance}/databases/{database}/revisions/{revision} or projects/{project}/instances/{instance}/databases/{database}/revisions/{revision}'release:type: stringtitle: release@@ -26986,7 +30029,7 @@ components:title: namedescription: |-The name of the database to sync.- Format: instances/{instance}/databases/{database}+ Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}title: SyncDatabaseRequestrequired:- name@@ -27013,7 +30056,7 @@ components:title: namedescription: |-The name of instance.- Format: instances/{instance}+ Format: instances/{instance} or projects/{project}/instances/{instance}enableFullSync:type: booleantitle: enable_full_sync@@ -28263,7 +31306,7 @@ components:title: namedescription: |-The name of the deleted instance.- Format: instances/{instance}+ Format: instances/{instance} or projects/{project}/instances/{instance}title: UndeleteInstanceRequestrequired:- name@@ -28343,7 +31386,7 @@ components:title: namedescription: |-The name of the instance to update a data source.- Format: instances/{instance}+ Format: instances/{instance} or projects/{project}/instances/{instance}dataSource:title: data_sourcedescription: Identified by data source ID.@@ -28376,7 +31419,7 @@ components:The database catalog to update.The catalog's `name` field is used to identify the database catalog to update.- Format: instances/{instance}/databases/{database}/catalog+ Format: instances/{instance}/databases/{database}/catalog or projects/{project}/instances/{instance}/databases/{database}/catalog$ref: '#/components/schemas/bytebase.v1.DatabaseCatalog'allowMissing:type: boolean@@ -28424,7 +31467,7 @@ components:The database to update.The database's `name` field is used to identify the database to update.- Format: instances/{instance}/databases/{database}+ Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}$ref: '#/components/schemas/bytebase.v1.Database'updateMask:title: update_mask@@ -28519,7 +31562,7 @@ components:The instance to update.The instance's `name` field is used to identify the instance to update.- Format: instances/{instance}+ Format: instances/{instance} or projects/{project}/instances/{instance}$ref: '#/components/schemas/bytebase.v1.Instance'updateMask:title: update_mask@@ -28530,7 +31573,9 @@ components:title: allow_missingdescription: |-If set to true, and the instance is not found, a new instance will be created.- In this situation, `update_mask` is ignored.+ In this situation, `update_mask` is ignored. A project-nested name creates+ the instance only under its encoded active, non-default project; it never+ falls back to a workspace instance.title: UpdateInstanceRequestrequired:- instance@@ -28627,8 +31672,6 @@ components:Format: {resource name}/policies/{policy type}Workspace resource name: workspaces/{workspace-id}.Environment resource name: environments/environment-id.- Instance resource name: instances/instance-id.- Database resource name: instances/instance-id/databases/database-name.$ref: '#/components/schemas/bytebase.v1.Policy'updateMask:title: update_maskdiff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.mdindex aa6d23e967..f890abfcd6 100644--- a/proto/gen/grpc-doc/v1/README.md+++ b/proto/gen/grpc-doc/v1/README.md@@ -5863,7 +5863,7 @@ CelService manages CEL (Common Expression Language) parsing and formatting opera| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | Format: instances/{instance}/databases/{database}/changelogs/{changelog} |+| name | [string](#string) | | Format: instances/{instance}/databases/{database}/changelogs/{changelog} or projects/{project}/instances/{instance}/databases/{database}/changelogs/{changelog} || create_time | [google.protobuf.Timestamp](#google-protobuf-Timestamp) | | || status | [Changelog.Status](#bytebase-v1-Changelog-Status) | | || schema | [string](#string) | | |@@ -5884,7 +5884,7 @@ CelService manages CEL (Common Expression Language) parsing and formatting opera| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of the changelog to retrieve. Format: instances/{instance}/databases/{database}/changelogs/{changelog} |+| name | [string](#string) | | The name of the changelog to retrieve. Format: instances/{instance}/databases/{database}/changelogs/{changelog} or projects/{project}/instances/{instance}/databases/{database}/changelogs/{changelog} || view | [ChangelogView](#bytebase-v1-ChangelogView) | | |@@ -5900,7 +5900,7 @@ CelService manages CEL (Common Expression Language) parsing and formatting opera| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| parent | [string](#string) | | The parent of the changelogs. Format: instances/{instance}/databases/{database} |+| parent | [string](#string) | | The parent of the changelogs. Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database} || page_size | [int32](#int32) | | The maximum number of changelogs to return. The service may return fewer than this value. If unspecified, at most 10 changelogs 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 the previous call. Provide this to retrieve the subsequent page.@@ -6030,7 +6030,7 @@ Catalog metadata for a database including schemas, tables, and columns.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of the database catalog. Format: instances/{instance}/databases/{database}/catalog |+| name | [string](#string) | | The name of the database catalog. Format: instances/{instance}/databases/{database}/catalog or projects/{project}/instances/{instance}/databases/{database}/catalog || schemas | [SchemaCatalog](#bytebase-v1-SchemaCatalog) | repeated | The schemas in the database. |@@ -6046,7 +6046,7 @@ Request message for getting a database catalog.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of the database catalog to retrieve. Format: instances/{instance}/databases/{database}/catalog |+| name | [string](#string) | | The name of the database catalog to retrieve. Format: instances/{instance}/databases/{database}/catalog or projects/{project}/instances/{instance}/databases/{database}/catalog |@@ -6176,7 +6176,7 @@ Request message for updating a database catalog.| ----- | ---- | ----- | ----------- || catalog | [DatabaseCatalog](#bytebase-v1-DatabaseCatalog) | | The database catalog to update.-The catalog's `name` field is used to identify the database catalog to update. Format: instances/{instance}/databases/{database}/catalog |+The catalog's `name` field is used to identify the database catalog to update. Format: instances/{instance}/databases/{database}/catalog or projects/{project}/instances/{instance}/databases/{database}/catalog || allow_missing | [bool](#bool) | | If set to true, and the database catalog is not found, a new database catalog will be created. In this situation, `update_mask` is ignored. |@@ -6416,7 +6416,7 @@ InstanceRole is the API message for instance role.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of the role. Format: instances/{instance}/roles/{role} The role name is the unique name for the role. |+| name | [string](#string) | | The name of the role. Format: instances/{instance}/roles/{role} or projects/{project}/instances/{instance}/roles/{role} The role name is the unique name for the role. || role_name | [string](#string) | | The role name. It's unique within the instance. || password | [string](#string) | optional | The role password. || connection_limit | [int32](#int32) | optional | The connection count limit for this role. |@@ -6436,7 +6436,7 @@ InstanceRole is the API message for instance role.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| parent | [string](#string) | | The parent, which owns this collection of roles. Format: instances/{instance} |+| parent | [string](#string) | | The parent, which owns this collection of roles. Format: instances/{instance} or projects/{project}/instances/{instance} || page_size | [int32](#int32) | | Not used. The maximum number of roles to return. The service may return fewer than this value. If unspecified, at most 10 roles will be returned. The maximum value is 1000; values above 1000 will be coerced to 1000. || page_token | [string](#string) | | Not used. A page token, received from a previous `ListInstanceRoles` call. Provide this to retrieve the subsequent page.@@ -6498,7 +6498,7 @@ InstanceRoleService manages database roles within instances.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of the instance to add a data source to. Format: instances/{instance} |+| name | [string](#string) | | The name of the instance to add a data source to. Format: instances/{instance} or projects/{project}/instances/{instance} || data_source | [DataSource](#bytebase-v1-DataSource) | | Identified by data source ID. Only READ_ONLY data source can be added. || validate_only | [bool](#bool) | | Validate only also tests the data source connection. |@@ -6515,6 +6515,7 @@ InstanceRoleService manages database roles within instances.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |+| parent | [string](#string) | optional | The parent, which owns this collection of instances. Format: projects/{project}. If omitted, all targets must be workspace instances; otherwise, every target must belong to this project collection. || requests | [SyncInstanceRequest](#bytebase-v1-SyncInstanceRequest) | repeated | The request message specifying the instances to sync. A maximum of 1000 instances can be synced in a batch. |@@ -6540,6 +6541,7 @@ InstanceRoleService manages database roles within instances.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |+| parent | [string](#string) | optional | The parent, which owns this collection of instances. Format: projects/{project}. If omitted, all targets must be workspace instances; otherwise, every target must belong to this project collection. || requests | [UpdateInstanceRequest](#bytebase-v1-UpdateInstanceRequest) | repeated | The request message specifying the resources to update. |@@ -6570,12 +6572,13 @@ InstanceRoleService manages database roles within instances.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |+| parent | [string](#string) | optional | The parent, which owns this collection of instances. Format: projects/{project}. If omitted, the instance is created in the workspace collection. || instance | [Instance](#bytebase-v1-Instance) | | The instance to create. || instance_id | [string](#string) | | The ID to use for the instance, which will become the final component of the instance's resource name.This value should be 4-63 characters, and valid characters are /[a-z][0-9]-/. || validate_only | [bool](#bool) | | Validate only also tests the data source connection. |-| initial_database_project | [string](#string) | | The project to assign newly discovered databases to during initial sync. Format: projects/{project} |+| initial_database_project | [string](#string) | | The project to assign newly discovered databases to during initial sync. Format: projects/{project}. This must be unset when `parent` is set. |@@ -6784,8 +6787,8 @@ This value should be 4-63 characters, and valid characters are /[a-z][0-9]-/. || Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of the instance to delete. Format: instances/{instance} |-| force | [bool](#bool) | | If set to true, any databases and sheets from this project will also be moved to default project, and all open issues will be closed. |+| name | [string](#string) | | The name of the instance to delete. Format: instances/{instance} or projects/{project}/instances/{instance} |+| force | [bool](#bool) | | If set to true, a workspace instance's databases are moved to the default project before the instance is soft-deleted. Project instances reject this option because their databases must remain in the owning project. || purge | [bool](#bool) | | If set to true, permanently purge the soft-deleted instance and all related resources. This operation is irreversible. Following AIP-165, this should only be used for administrative cleanup of old soft-deleted instances. The instance must already be soft-deleted for this to work. |@@ -6801,7 +6804,7 @@ This value should be 4-63 characters, and valid characters are /[a-z][0-9]-/. || Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of the instance to retrieve. Format: instances/{instance} |+| name | [string](#string) | | The name of the instance to retrieve. Format: instances/{instance} or projects/{project}/instances/{instance} |@@ -6816,7 +6819,7 @@ This value should be 4-63 characters, and valid characters are /[a-z][0-9]-/. || Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of the instance. Format: instances/{instance} |+| name | [string](#string) | | The name of the instance. Format: instances/{instance} or projects/{project}/instances/{instance} || state | [State](#bytebase-v1-State) | | The lifecycle state of the instance. || title | [string](#string) | | The display title of the instance. || engine | [Engine](#bytebase-v1-Engine) | | The database engine type. |@@ -6865,7 +6868,7 @@ This value should be 4-63 characters, and valid characters are /[a-z][0-9]-/. || engine_version | [string](#string) | | The version of the database engine. || data_sources | [DataSource](#bytebase-v1-DataSource) | repeated | Data source configurations for the instance. || activation | [bool](#bool) | | Whether the instance is activated. |-| name | [string](#string) | | The name of the instance. Format: instances/{instance} |+| name | [string](#string) | | The name of the instance. Format: instances/{instance} or projects/{project}/instances/{instance} || environment | [string](#string) | optional | The environment resource. Format: environments/prod where prod is the environment resource ID. |@@ -6902,7 +6905,7 @@ This value should be 4-63 characters, and valid characters are /[a-z][0-9]-/. || Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of the instance. Format: instances/{instance} |+| name | [string](#string) | | The name of the instance. Format: instances/{instance} or projects/{project}/instances/{instance} || instance | [Instance](#bytebase-v1-Instance) | optional | The target instance. We need to set this field if the target instance is not created yet. |@@ -6933,6 +6936,7 @@ This value should be 4-63 characters, and valid characters are /[a-z][0-9]-/. || Field | Type | Label | Description || ----- | ---- | ----- | ----------- |+| parent | [string](#string) | optional | The parent, which owns this collection of instances. Format: projects/{project}. If omitted, only workspace instances are returned. Wildcard project parents are not supported. When set, the `project` filter must be omitted or match this parent. || page_size | [int32](#int32) | | The maximum number of instances to return. The service may return fewer than this value. If unspecified, at most 10 instances 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 `ListInstances` call. Provide this to retrieve the subsequent page.@@ -6974,7 +6978,7 @@ For example: name == "sample instance" name.contains("sample") r| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of the instance to remove a data source from. Format: instances/{instance} |+| name | [string](#string) | | The name of the instance to remove a data source from. Format: instances/{instance} or projects/{project}/instances/{instance} || data_source | [DataSource](#bytebase-v1-DataSource) | | Identified by data source ID. Only READ_ONLY data source can be removed. |@@ -7020,7 +7024,7 @@ For example: name == "sample instance" name.contains("sample") r| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of instance. Format: instances/{instance} |+| name | [string](#string) | | The name of instance. Format: instances/{instance} or projects/{project}/instances/{instance} || enable_full_sync | [bool](#bool) | | When full sync is enabled, all databases in the instance will be synchronized. Otherwise, only the instance metadata (such as the database list) and any newly discovered databases will be synced. |@@ -7051,7 +7055,7 @@ For example: name == "sample instance" name.contains("sample") r| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of the deleted instance. Format: instances/{instance} |+| name | [string](#string) | | The name of the deleted instance. Format: instances/{instance} or projects/{project}/instances/{instance} |@@ -7066,7 +7070,7 @@ For example: name == "sample instance" name.contains("sample") r| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of the instance to update a data source. Format: instances/{instance} |+| name | [string](#string) | | The name of the instance to update a data source. Format: instances/{instance} or projects/{project}/instances/{instance} || data_source | [DataSource](#bytebase-v1-DataSource) | | Identified by data source ID. || update_mask | [google.protobuf.FieldMask](#google-protobuf-FieldMask) | | The list of fields to update. || validate_only | [bool](#bool) | | Validate only also tests the data source connection. |@@ -7087,9 +7091,9 @@ For example: name == "sample instance" name.contains("sample") r| ----- | ---- | ----- | ----------- || instance | [Instance](#bytebase-v1-Instance) | | The instance to update.-The instance's `name` field is used to identify the instance to update. Format: instances/{instance} |+The instance's `name` field is used to identify the instance to update. Format: instances/{instance} or projects/{project}/instances/{instance} || update_mask | [google.protobuf.FieldMask](#google-protobuf-FieldMask) | | The list of fields to update. |-| allow_missing | [bool](#bool) | | If set to true, and the instance is not found, a new instance will be created. In this situation, `update_mask` is ignored. |+| allow_missing | [bool](#bool) | | If set to true, and the instance is not found, a new instance will be created. In this situation, `update_mask` is ignored. A project-nested name creates the instance only under its encoded active, non-default project; it never falls back to a workspace instance. |@@ -7221,7 +7225,7 @@ InstanceService manages database instances and their connections.| Method Name | Request Type | Response Type | Description || ----------- | ------------ | ------------- | ------------|| GetInstance | [GetInstanceRequest](#bytebase-v1-GetInstanceRequest) | [Instance](#bytebase-v1-Instance) | Gets a database instance by name. Permissions required: bb.instances.get |-| ListInstances | [ListInstancesRequest](#bytebase-v1-ListInstancesRequest) | [ListInstancesResponse](#bytebase-v1-ListInstancesResponse) | Lists all database instances. Permissions required: bb.instances.list |+| ListInstances | [ListInstancesRequest](#bytebase-v1-ListInstancesRequest) | [ListInstancesResponse](#bytebase-v1-ListInstancesResponse) | Lists database instances, optionally within a project. Permissions required: bb.instances.list || CreateInstance | [CreateInstanceRequest](#bytebase-v1-CreateInstanceRequest) | [Instance](#bytebase-v1-Instance) | Creates a new database instance. Permissions required: bb.instances.create || UpdateInstance | [UpdateInstanceRequest](#bytebase-v1-UpdateInstanceRequest) | [Instance](#bytebase-v1-Instance) | Updates a database instance. Permissions required: bb.instances.update || DeleteInstance | [DeleteInstanceRequest](#bytebase-v1-DeleteInstanceRequest) | [.google.protobuf.Empty](#google-protobuf-Empty) | Deletes or soft-deletes a database instance. Permissions required: bb.instances.delete |@@ -7253,7 +7257,7 @@ InstanceService manages database instances and their connections.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| parent | [string](#string) | | The parent resource shared by all databases being retrieved. - projects/{project}: batch get databases in a project; - instances/{instances}: batch get databases in a instance; Use "-" as wildcard to batch get databases across parent. |+| parent | [string](#string) | | The parent resource shared by all databases being retrieved. - projects/{project}: batch get databases in a project; - instances/{instance}: batch get databases in an instance; - projects/{project}/instances/{instance}: batch get databases in a project instance; Use "-" as wildcard to batch get databases across parent. || names | [string](#string) | repeated | The list of database names to retrieve. |@@ -7284,7 +7288,7 @@ InstanceService manages database instances and their connections.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| parent | [string](#string) | | The parent resource shared by all databases being updated. Format: instances/{instance} If the operation spans parents, a dash (-) may be accepted as a wildcard. |+| parent | [string](#string) | | The parent resource shared by all databases being updated. Format: instances/{instance} or projects/{project}/instances/{instance} If the operation spans parents, a dash (-) may be accepted as a wildcard. || names | [string](#string) | repeated | The list of database names to sync. |@@ -7310,7 +7314,7 @@ InstanceService manages database instances and their connections.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| parent | [string](#string) | | The parent resource shared by all databases being updated. Format: instances/{instance} If the operation spans parents, a dash (-) may be accepted as a wildcard. We only support updating the project of databases for now. |+| parent | [string](#string) | | The parent resource shared by all databases being updated. Format: instances/{instance} or projects/{project}/instances/{instance} If the operation spans parents, a dash (-) may be accepted as a wildcard. We only support updating the project of databases for now. || requests | [UpdateDatabaseRequest](#bytebase-v1-UpdateDatabaseRequest) | repeated | The request message specifying the resources to update. A maximum of 1000 databases can be modified in a batch. |@@ -7451,7 +7455,7 @@ This field is populated when syncing from the database. When empty (e.g., when p| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of the database. Format: instances/{instance}/databases/{database} {database} is the database name in the instance. |+| name | [string](#string) | | The name of the database. Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database} {database} is the database name in the instance. || state | [State](#bytebase-v1-State) | | The existence of a database. || successful_sync_time | [google.protobuf.Timestamp](#google-protobuf-Timestamp) | | The latest synchronization time. || project | [string](#string) | | The project for a database. Format: projects/{project} |@@ -7495,7 +7499,7 @@ DatabaseMetadata is the metadata for databases.| ----- | ---- | ----- | ----------- || name | [string](#string) | | The database metadata name.-Format: instances/{instance}/databases/{database}/metadata |+Format: instances/{instance}/databases/{database}/metadata or projects/{project}/instances/{instance}/databases/{database}/metadata || schemas | [SchemaMetadata](#bytebase-v1-SchemaMetadata) | repeated | The schemas is the list of schemas in a database. || character_set | [string](#string) | | The character_set is the character set of a database. || collation | [string](#string) | | The collation is the collation of a database. |@@ -7580,7 +7584,7 @@ DependencyColumn is the metadata for dependency columns.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The database whose current schema is the diff source. Format: instances/{instance}/databases/{database} |+| name | [string](#string) | | The database whose current schema is the diff source. Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database} || target_metadata | [DatabaseMetadata](#bytebase-v1-DatabaseMetadata) | | The metadata of the target schema. The source metadata and the engine are read from the database, so only the target travels in the request. Must describe the COMPLETE target schema: the diff runs against the full stored source, so any object omitted from the target (for example by a truncated metadata fetch) is treated as dropped. |@@ -7611,9 +7615,9 @@ DependencyColumn is the metadata for dependency columns.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of the database or changelog. Format: database: instances/{instance}/databases/{database} changelog: instances/{instance}/databases/{database}/changelogs/{changelog} |+| name | [string](#string) | | The name of the database or changelog. Format: database: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database} changelog: instances/{instance}/databases/{database}/changelogs/{changelog} or projects/{project}/instances/{instance}/databases/{database}/changelogs/{changelog} || schema | [string](#string) | | The target schema. |-| changelog | [string](#string) | | The resource name of the changelog Format: instances/{instance}/databases/{database}/changelogs/{changelog} |+| changelog | [string](#string) | | The resource name of the changelog Format: instances/{instance}/databases/{database}/changelogs/{changelog} or projects/{project}/instances/{instance}/databases/{database}/changelogs/{changelog} |@@ -7816,7 +7820,7 @@ FunctionMetadata is the metadata for functions.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of the database to retrieve metadata. Format: instances/{instance}/databases/{database}/metadata |+| name | [string](#string) | | The name of the database to retrieve metadata. Format: instances/{instance}/databases/{database}/metadata or projects/{project}/instances/{instance}/databases/{database}/metadata || filter | [string](#string) | | Filter is used to filter databases returned in the list. The syntax and semantics of CEL are documented at https://github.com/google/cel-specSupported filter: - schema: the schema name, support "==" operator. - table: the table name, support "==" and ".contains()" operator.@@ -7837,7 +7841,7 @@ For example: schema == "schema-a" table == "table-a" table.conta| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of the database to retrieve. Format: instances/{instance}/databases/{database} |+| name | [string](#string) | | The name of the database to retrieve. Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database} |@@ -7852,7 +7856,7 @@ For example: schema == "schema-a" table == "table-a" table.conta| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of the database to retrieve SDL schema. Format: instances/{instance}/databases/{database}/sdlSchema |+| name | [string](#string) | | The name of the database to retrieve SDL schema. Format: instances/{instance}/databases/{database}/sdlSchema or projects/{project}/instances/{instance}/databases/{database}/sdlSchema || format | [GetDatabaseSDLSchemaRequest.SDLFormat](#bytebase-v1-GetDatabaseSDLSchemaRequest-SDLFormat) | | The format of the SDL schema output. |@@ -7868,7 +7872,7 @@ For example: schema == "schema-a" table == "table-a" table.conta| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of the database to retrieve schema. Format: instances/{instance}/databases/{database}/schema |+| name | [string](#string) | | The name of the database to retrieve schema. Format: instances/{instance}/databases/{database}/schema or projects/{project}/instances/{instance}/databases/{database}/schema |@@ -7883,7 +7887,7 @@ For example: schema == "schema-a" table == "table-a" table.conta| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of the database. Format: instances/{instance}/databases/{database} |+| name | [string](#string) | | The name of the database. Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database} || type | [GetSchemaStringRequest.ObjectType](#bytebase-v1-GetSchemaStringRequest-ObjectType) | | || schema | [string](#string) | | It's empty for DATABASE. || object | [string](#string) | | It's empty for DATABASE and SCHEMA. |@@ -7964,7 +7968,7 @@ IndexMetadata is the metadata for indexes.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| parent | [string](#string) | | - projects/{project}: list databases in a project, require "bb.projects.get" permission. - workspaces/{id}: list databases in the workspace, require "bb.databases.list" permission. - instances/{instances}: list databases in a instance, require "bb.instances.get" permission |+| parent | [string](#string) | | - projects/{project}: list databases in a project, require "bb.projects.get" permission. - workspaces/{id}: list databases in the workspace, require "bb.databases.list" permission. - instances/{instance}: list databases in an instance, require "bb.instances.get" permission. - projects/{project}/instances/{instance}: list databases in a project instance, require "bb.instances.get" permission. || page_size | [int32](#int32) | | The maximum number of databases to return. The service may return fewer than this value. If unspecified, at most 10 databases 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 `ListDatabases` call. Provide this to retrieve the subsequent page.@@ -8195,7 +8199,7 @@ StorageConfig defines storage and performance parameters for spatial indexes.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of the database to sync. Format: instances/{instance}/databases/{database} |+| name | [string](#string) | | The name of the database to sync. Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database} |@@ -8344,7 +8348,7 @@ TessellationConfig defines tessellation parameters for spatial indexes.| ----- | ---- | ----- | ----------- || database | [Database](#bytebase-v1-Database) | | The database to update.-The database's `name` field is used to identify the database to update. Format: instances/{instance}/databases/{database} |+The database's `name` field is used to identify the database to update. Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database} || update_mask | [google.protobuf.FieldMask](#google-protobuf-FieldMask) | | The list of fields to update. || allow_missing | [bool](#bool) | | If set to true, and the database is not found, a new database will be created. In this situation, `update_mask` is ignored. |@@ -9159,7 +9163,7 @@ IdentityProviderService manages external identity providers for SSO authenticati| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| parent | [string](#string) | | The parent resource where this instance will be created. Workspace resource name: workspaces/{workspace-id}. Environment resource name: environments/environment-id. Instance resource name: instances/instance-id. Database resource name: instances/instance-id/databases/database-name. |+| parent | [string](#string) | | The parent resource where this instance will be created. Workspace resource name: workspaces/{workspace-id}. Environment resource name: environments/environment-id. || policy | [Policy](#bytebase-v1-Policy) | | The policy to create. || type | [PolicyType](#bytebase-v1-PolicyType) | | The type of policy to create. |@@ -9176,7 +9180,7 @@ IdentityProviderService manages external identity providers for SSO authenticati| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The policy's `name` field is used to identify the instance to update. Format: {resource name}/policies/{policy type} Workspace resource name: workspaces/{workspace-id}. Environment resource name: environments/environment-id. Instance resource name: instances/instance-id. Database resource name: instances/instance-id/databases/database-name. |+| name | [string](#string) | | The policy's `name` field is used to identify the instance to update. Format: {resource name}/policies/{policy type} Workspace resource name: workspaces/{workspace-id}. Environment resource name: environments/environment-id. |@@ -9311,7 +9315,7 @@ For example: resource.environment_id == "test" && resource.proje| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of the policy. Format: {resource name}/policies/{policy type} Workspace resource name: workspaces/{workspace-id}. Environment resource name: environments/environment-id. Instance resource name: instances/instance-id. Database resource name: instances/instance-id/databases/database-name. |+| name | [string](#string) | | The name of the policy. Format: {resource name}/policies/{policy type} Workspace resource name: workspaces/{workspace-id}. Environment resource name: environments/environment-id. || inherit_from_parent | [bool](#bool) | | Whether this policy inherits from its parent resource. || type | [PolicyType](#bytebase-v1-PolicyType) | | The type of policy. || rollout_policy | [RolloutPolicy](#bytebase-v1-RolloutPolicy) | | |@@ -9402,7 +9406,7 @@ Policy for tagging resources with metadata.| ----- | ---- | ----- | ----------- || policy | [Policy](#bytebase-v1-Policy) | | The policy to update.-The policy's `name` field is used to identify the instance to update. Format: {resource name}/policies/{policy type} Workspace resource name: workspaces/{workspace-id}. Environment resource name: environments/environment-id. Instance resource name: instances/instance-id. Database resource name: instances/instance-id/databases/database-name. |+The policy's `name` field is used to identify the instance to update. Format: {resource name}/policies/{policy type} Workspace resource name: workspaces/{workspace-id}. Environment resource name: environments/environment-id. || update_mask | [google.protobuf.FieldMask](#google-protobuf-FieldMask) | | The list of fields to update. || allow_missing | [bool](#bool) | | If set to true, and the policy is not found, a new policy will be created. In this situation, `update_mask` is ignored. |@@ -10643,7 +10647,7 @@ ReviewConfigService manages approval flow configurations.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| parent | [string](#string) | | The parent resource shared by all revisions being created. Format: instances/{instance}/databases/{database} |+| parent | [string](#string) | | The parent resource shared by all revisions being created. Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database} || requests | [CreateRevisionRequest](#bytebase-v1-CreateRevisionRequest) | repeated | The request message specifying the revisions to create. A maximum of 100 revisions can be created in a batch. |@@ -10674,7 +10678,7 @@ ReviewConfigService manages approval flow configurations.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| parent | [string](#string) | | Format: instances/{instance}/databases/{database} |+| parent | [string](#string) | | Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database} || revision | [Revision](#bytebase-v1-Revision) | | The revision to create. |@@ -10690,7 +10694,7 @@ ReviewConfigService manages approval flow configurations.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of the revision to delete. Format: instances/{instance}/databases/{database}/revisions/{revision} |+| name | [string](#string) | | The name of the revision to delete. Format: instances/{instance}/databases/{database}/revisions/{revision} or projects/{project}/instances/{instance}/databases/{database}/revisions/{revision} |@@ -10705,7 +10709,7 @@ ReviewConfigService manages approval flow configurations.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The name of the revision. Format: instances/{instance}/databases/{database}/revisions/{revision} |+| name | [string](#string) | | The name of the revision. Format: instances/{instance}/databases/{database}/revisions/{revision} or projects/{project}/instances/{instance}/databases/{database}/revisions/{revision} |@@ -10720,7 +10724,7 @@ ReviewConfigService manages approval flow configurations.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| parent | [string](#string) | | The parent of the revisions. Format: instances/{instance}/databases/{database} |+| parent | [string](#string) | | The parent of the revisions. Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database} || page_size | [int32](#int32) | | The maximum number of revisions to return. The service may return fewer than this value. If unspecified, at most 10 revisions 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 `ListRevisions` call. Provide this to retrieve the subsequent page.@@ -10756,7 +10760,7 @@ When paginating, all other parameters provided to `ListRevisions` must match the| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | Format: instances/{instance}/databases/{database}/revisions/{revision} |+| name | [string](#string) | | Format: instances/{instance}/databases/{database}/revisions/{revision} or projects/{project}/instances/{instance}/databases/{database}/revisions/{revision} || release | [string](#string) | | Format: projects/{project}/releases/{release} Can be empty. || create_time | [google.protobuf.Timestamp](#google-protobuf-Timestamp) | | || deleter | [string](#string) | | Format: users/[email protected] Can be empty. |diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.htmlindex e60bbd398e..7168ad6692 100644--- a/proto/gen/grpc-doc/v1/index.html+++ b/proto/gen/grpc-doc/v1/index.html@@ -16714,7 +16714,7 @@ Permissions required: None</p></td><td>name</td><td><a href="#string">string</a></td><td></td>- <td><p>Format: instances/{instance}/databases/{database}/changelogs/{changelog} </p></td>+ <td><p>Format: instances/{instance}/databases/{database}/changelogs/{changelog} or projects/{project}/instances/{instance}/databases/{database}/changelogs/{changelog} </p></td></tr><tr>@@ -16782,7 +16782,7 @@ This field is populated by deriving the plan from task_run for display purposes.<td><a href="#string">string</a></td><td></td><td><p>The name of the changelog to retrieve.-Format: instances/{instance}/databases/{database}/changelogs/{changelog} </p></td>+Format: instances/{instance}/databases/{database}/changelogs/{changelog} or projects/{project}/instances/{instance}/databases/{database}/changelogs/{changelog} </p></td></tr><tr>@@ -16814,7 +16814,7 @@ Format: instances/{instance}/databases/{database}/changelogs/{changelog} </p></t<td><a href="#string">string</a></td><td></td><td><p>The parent of the changelogs.-Format: instances/{instance}/databases/{database} </p></td>+Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database} </p></td></tr><tr>@@ -17022,6 +17022,13 @@ Permissions required: bb.changelogs.get</p></td><td></td></tr>+ <tr>+ <td>ListChangelogs</td>+ <td>GET</td>+ <td>/v1/{parent=projects/*/instances/*/databases/*}/changelogs</td>+ <td></td>+ </tr>+@@ -17032,6 +17039,13 @@ Permissions required: bb.changelogs.get</p></td><td></td></tr>+ <tr>+ <td>GetChangelog</td>+ <td>GET</td>+ <td>/v1/{name=projects/*/instances/*/databases/*/changelogs/*}</td>+ <td></td>+ </tr>+</tbody></table>@@ -17143,7 +17157,7 @@ Permissions required: bb.changelogs.get</p></td><td><a href="#string">string</a></td><td></td><td><p>The name of the database catalog.-Format: instances/{instance}/databases/{database}/catalog </p></td>+Format: instances/{instance}/databases/{database}/catalog or projects/{project}/instances/{instance}/databases/{database}/catalog </p></td></tr><tr>@@ -17175,7 +17189,7 @@ Format: instances/{instance}/databases/{database}/catalog </p></td><td><a href="#string">string</a></td><td></td><td><p>The name of the database catalog to retrieve.-Format: instances/{instance}/databases/{database}/catalog </p></td>+Format: instances/{instance}/databases/{database}/catalog or projects/{project}/instances/{instance}/databases/{database}/catalog </p></td></tr></tbody>@@ -17426,7 +17440,7 @@ Format: instances/{instance}/databases/{database}/catalog </p></td><td><p>The database catalog to update.The catalog's `name` field is used to identify the database catalog to update.-Format: instances/{instance}/databases/{database}/catalog </p></td>+Format: instances/{instance}/databases/{database}/catalog or projects/{project}/instances/{instance}/databases/{database}/catalog </p></td></tr><tr>@@ -17548,6 +17562,13 @@ Permissions required: bb.databaseCatalogs.update</p></td><td></td></tr>+ <tr>+ <td>GetDatabaseCatalog</td>+ <td>GET</td>+ <td>/v1/{name=projects/*/instances/*/databases/*/catalog}</td>+ <td></td>+ </tr>+@@ -17558,6 +17579,13 @@ Permissions required: bb.databaseCatalogs.update</p></td><td>catalog</td></tr>+ <tr>+ <td>UpdateDatabaseCatalog</td>+ <td>PATCH</td>+ <td>/v1/{catalog.name=projects/*/instances/*/databases/*/catalog}</td>+ <td>catalog</td>+ </tr>+</tbody></table>@@ -18039,7 +18067,7 @@ Permissions required: bb.databaseGroups.delete</p></td><td><a href="#string">string</a></td><td></td><td><p>The name of the role.-Format: instances/{instance}/roles/{role}+Format: instances/{instance}/roles/{role} or projects/{project}/instances/{instance}/roles/{role}The role name is the unique name for the role. </p></td></tr>@@ -18102,7 +18130,7 @@ For MySQL, it's the global privileges as GRANT statements, which means it on<td><a href="#string">string</a></td><td></td><td><p>The parent, which owns this collection of roles.-Format: instances/{instance} </p></td>+Format: instances/{instance} or projects/{project}/instances/{instance} </p></td></tr><tr>@@ -18223,6 +18251,13 @@ Permissions required: bb.instanceRoles.list</p></td><td></td></tr>+ <tr>+ <td>ListInstanceRoles</td>+ <td>GET</td>+ <td>/v1/{parent=projects/*/instances/*}/roles</td>+ <td></td>+ </tr>+</tbody></table>@@ -18251,7 +18286,7 @@ Permissions required: bb.instanceRoles.list</p></td><td><a href="#string">string</a></td><td></td><td><p>The name of the instance to add a data source to.-Format: instances/{instance} </p></td>+Format: instances/{instance} or projects/{project}/instances/{instance} </p></td></tr><tr>@@ -18286,6 +18321,15 @@ Only READ_ONLY data source can be added. </p></td></thead><tbody>+ <tr>+ <td>parent</td>+ <td><a href="#string">string</a></td>+ <td>optional</td>+ <td><p>The parent, which owns this collection of instances.+Format: projects/{project}. If omitted, all targets must be workspace+instances; otherwise, every target must belong to this project collection. </p></td>+ </tr>+<tr><td>requests</td><td><a href="#bytebase.v1.SyncInstanceRequest">SyncInstanceRequest</a></td>@@ -18318,6 +18362,15 @@ A maximum of 1000 instances can be synced in a batch. </p></td></thead><tbody>+ <tr>+ <td>parent</td>+ <td><a href="#string">string</a></td>+ <td>optional</td>+ <td><p>The parent, which owns this collection of instances.+Format: projects/{project}. If omitted, all targets must be workspace+instances; otherwise, every target must belong to this project collection. </p></td>+ </tr>+<tr><td>requests</td><td><a href="#bytebase.v1.UpdateInstanceRequest">UpdateInstanceRequest</a></td>@@ -18366,6 +18419,15 @@ A maximum of 1000 instances can be synced in a batch. </p></td></thead><tbody>+ <tr>+ <td>parent</td>+ <td><a href="#string">string</a></td>+ <td>optional</td>+ <td><p>The parent, which owns this collection of instances.+Format: projects/{project}. If omitted, the instance is created in the+workspace collection. </p></td>+ </tr>+<tr><td>instance</td><td><a href="#bytebase.v1.Instance">Instance</a></td>@@ -18396,7 +18458,7 @@ are /[a-z][0-9]-/. </p></td><td><a href="#string">string</a></td><td></td><td><p>The project to assign newly discovered databases to during initial sync.-Format: projects/{project} </p></td>+Format: projects/{project}. This must be unset when `parent` is set. </p></td></tr></tbody>@@ -19155,14 +19217,16 @@ Only set to true for development or when certificates cannot be properly validat<td><a href="#string">string</a></td><td></td><td><p>The name of the instance to delete.-Format: instances/{instance} </p></td>+Format: instances/{instance} or projects/{project}/instances/{instance} </p></td></tr><tr><td>force</td><td><a href="#bool">bool</a></td><td></td>- <td><p>If set to true, any databases and sheets from this project will also be moved to default project, and all open issues will be closed. </p></td>+ <td><p>If set to true, a workspace instance's databases are moved to the default+project before the instance is soft-deleted. Project instances reject this+option because their databases must remain in the owning project. </p></td></tr><tr>@@ -19197,7 +19261,7 @@ The instance must already be soft-deleted for this to work. </p></td><td><a href="#string">string</a></td><td></td><td><p>The name of the instance to retrieve.-Format: instances/{instance} </p></td>+Format: instances/{instance} or projects/{project}/instances/{instance} </p></td></tr></tbody>@@ -19222,7 +19286,7 @@ Format: instances/{instance} </p></td><td><a href="#string">string</a></td><td></td><td><p>The name of the instance.-Format: instances/{instance} </p></td>+Format: instances/{instance} or projects/{project}/instances/{instance} </p></td></tr><tr>@@ -19407,7 +19471,7 @@ For example, { "org_group": "infrastructure", "environment&#<td><a href="#string">string</a></td><td></td><td><p>The name of the instance.-Format: instances/{instance} </p></td>+Format: instances/{instance} or projects/{project}/instances/{instance} </p></td></tr><tr>@@ -19506,7 +19570,7 @@ Format: environments/prod where prod is the environment resource ID. </p></td><td><a href="#string">string</a></td><td></td><td><p>The name of the instance.-Format: instances/{instance} </p></td>+Format: instances/{instance} or projects/{project}/instances/{instance} </p></td></tr><tr>@@ -19557,6 +19621,16 @@ Format: instances/{instance} </p></td></thead><tbody>+ <tr>+ <td>parent</td>+ <td><a href="#string">string</a></td>+ <td>optional</td>+ <td><p>The parent, which owns this collection of instances.+Format: projects/{project}. If omitted, only workspace instances are+returned. Wildcard project parents are not supported. When set, the+`project` filter must be omitted or match this parent. </p></td>+ </tr>+<tr><td>page_size</td><td><a href="#int32">int32</a></td>@@ -19692,7 +19766,7 @@ If this field is omitted, there are no subsequent pages. </p></td><td><a href="#string">string</a></td><td></td><td><p>The name of the instance to remove a data source from.-Format: instances/{instance} </p></td>+Format: instances/{instance} or projects/{project}/instances/{instance} </p></td></tr><tr>@@ -19773,7 +19847,7 @@ Only READ_ONLY data source can be removed. </p></td><td><a href="#string">string</a></td><td></td><td><p>The name of instance.-Format: instances/{instance} </p></td>+Format: instances/{instance} or projects/{project}/instances/{instance} </p></td></tr><tr>@@ -19830,7 +19904,7 @@ the instance metadata (such as the database list) and any newly discovered datab<td><a href="#string">string</a></td><td></td><td><p>The name of the deleted instance.-Format: instances/{instance} </p></td>+Format: instances/{instance} or projects/{project}/instances/{instance} </p></td></tr></tbody>@@ -19855,7 +19929,7 @@ Format: instances/{instance} </p></td><td><a href="#string">string</a></td><td></td><td><p>The name of the instance to update a data source.-Format: instances/{instance} </p></td>+Format: instances/{instance} or projects/{project}/instances/{instance} </p></td></tr><tr>@@ -19911,7 +19985,7 @@ In this situation, `update_mask` is ignored. </p></td><td><p>The instance to update.The instance's `name` field is used to identify the instance to update.-Format: instances/{instance} </p></td>+Format: instances/{instance} or projects/{project}/instances/{instance} </p></td></tr><tr>@@ -19926,7 +20000,9 @@ Format: instances/{instance} </p></td><td><a href="#bool">bool</a></td><td></td><td><p>If set to true, and the instance is not found, a new instance will be created.-In this situation, `update_mask` is ignored. </p></td>+In this situation, `update_mask` is ignored. A project-nested name creates+the instance only under its encoded active, non-default project; it never+falls back to a workspace instance. </p></td></tr></tbody>@@ -20238,7 +20314,7 @@ Permissions required: bb.instances.get</p></td><td>ListInstances</td><td><a href="#bytebase.v1.ListInstancesRequest">ListInstancesRequest</a></td><td><a href="#bytebase.v1.ListInstancesResponse">ListInstancesResponse</a></td>- <td><p>Lists all database instances.+ <td><p>Lists database instances, optionally within a project.Permissions required: bb.instances.list</p></td></tr>@@ -20357,6 +20433,13 @@ Permissions required: bb.instances.update</p></td><td></td></tr>+ <tr>+ <td>GetInstance</td>+ <td>GET</td>+ <td>/v1/{name=projects/*/instances/*}</td>+ <td></td>+ </tr>+@@ -20367,6 +20450,13 @@ Permissions required: bb.instances.update</p></td><td></td></tr>+ <tr>+ <td>ListInstances</td>+ <td>GET</td>+ <td>/v1/{parent=projects/*}/instances</td>+ <td></td>+ </tr>+@@ -20377,6 +20467,13 @@ Permissions required: bb.instances.update</p></td><td>instance</td></tr>+ <tr>+ <td>CreateInstance</td>+ <td>POST</td>+ <td>/v1/{parent=projects/*}/instances</td>+ <td>instance</td>+ </tr>+@@ -20387,6 +20484,13 @@ Permissions required: bb.instances.update</p></td><td>instance</td></tr>+ <tr>+ <td>UpdateInstance</td>+ <td>PATCH</td>+ <td>/v1/{instance.name=projects/*/instances/*}</td>+ <td>instance</td>+ </tr>+@@ -20397,6 +20501,13 @@ Permissions required: bb.instances.update</p></td><td></td></tr>+ <tr>+ <td>DeleteInstance</td>+ <td>DELETE</td>+ <td>/v1/{name=projects/*/instances/*}</td>+ <td></td>+ </tr>+@@ -20407,6 +20518,13 @@ Permissions required: bb.instances.update</p></td><td>*</td></tr>+ <tr>+ <td>UndeleteInstance</td>+ <td>POST</td>+ <td>/v1/{name=projects/*/instances/*}:undelete</td>+ <td>*</td>+ </tr>+@@ -20417,6 +20535,13 @@ Permissions required: bb.instances.update</p></td><td>*</td></tr>+ <tr>+ <td>SyncInstance</td>+ <td>POST</td>+ <td>/v1/{name=projects/*/instances/*}:sync</td>+ <td>*</td>+ </tr>+@@ -20427,6 +20552,13 @@ Permissions required: bb.instances.update</p></td><td>*</td></tr>+ <tr>+ <td>ListInstanceDatabase</td>+ <td>POST</td>+ <td>/v1/{name=projects/*/instances/*}:databases</td>+ <td>*</td>+ </tr>+@@ -20437,6 +20569,13 @@ Permissions required: bb.instances.update</p></td><td>*</td></tr>+ <tr>+ <td>BatchSyncInstances</td>+ <td>POST</td>+ <td>/v1/{parent=projects/*}/instances:batchSync</td>+ <td>*</td>+ </tr>+@@ -20447,6 +20586,13 @@ Permissions required: bb.instances.update</p></td><td>*</td></tr>+ <tr>+ <td>BatchUpdateInstances</td>+ <td>POST</td>+ <td>/v1/{parent=projects/*}/instances:batchUpdate</td>+ <td>*</td>+ </tr>+@@ -20457,6 +20603,13 @@ Permissions required: bb.instances.update</p></td><td>*</td></tr>+ <tr>+ <td>AddDataSource</td>+ <td>POST</td>+ <td>/v1/{name=projects/*/instances/*}:addDataSource</td>+ <td>*</td>+ </tr>+@@ -20467,6 +20620,13 @@ Permissions required: bb.instances.update</p></td><td>*</td></tr>+ <tr>+ <td>RemoveDataSource</td>+ <td>POST</td>+ <td>/v1/{name=projects/*/instances/*}:removeDataSource</td>+ <td>*</td>+ </tr>+@@ -20477,6 +20637,13 @@ Permissions required: bb.instances.update</p></td><td>data_source</td></tr>+ <tr>+ <td>UpdateDataSource</td>+ <td>PATCH</td>+ <td>/v1/{name=projects/*/instances/*}:updateDataSource</td>+ <td>data_source</td>+ </tr>+</tbody></table>@@ -20506,7 +20673,8 @@ Permissions required: bb.instances.update</p></td><td></td><td><p>The parent resource shared by all databases being retrieved.- projects/{project}: batch get databases in a project;-- instances/{instances}: batch get databases in a instance;+- instances/{instance}: batch get databases in an instance;+- projects/{project}/instances/{instance}: batch get databases in a project instance;Use "-" as wildcard to batch get databases across parent. </p></td></tr>@@ -20563,7 +20731,7 @@ Use "-" as wildcard to batch get databases across parent. </p></td><td><a href="#string">string</a></td><td></td><td><p>The parent resource shared by all databases being updated.-Format: instances/{instance}+Format: instances/{instance} or projects/{project}/instances/{instance}If the operation spans parents, a dash (-) may be accepted as a wildcard. </p></td></tr>@@ -20603,7 +20771,7 @@ If the operation spans parents, a dash (-) may be accepted as a wildcard. </p></<td><a href="#string">string</a></td><td></td><td><p>The parent resource shared by all databases being updated.-Format: instances/{instance}+Format: instances/{instance} or projects/{project}/instances/{instance}If the operation spans parents, a dash (-) may be accepted as a wildcard.We only support updating the project of databases for now. </p></td></tr>@@ -20998,7 +21166,7 @@ pg_catalog), empty otherwise. e.g. `"C"` or `locale.en_us`. </p></td><td><a href="#string">string</a></td><td></td><td><p>The name of the database.-Format: instances/{instance}/databases/{database}+Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}{database} is the database name in the instance. </p></td></tr>@@ -21139,7 +21307,7 @@ https://cloud.google.com/resource-manager/docs/tags/tags-overview. </p></td><td></td><td><p>The database metadata name.-Format: instances/{instance}/databases/{database}/metadata </p></td>+Format: instances/{instance}/databases/{database}/metadata or projects/{project}/instances/{instance}/databases/{database}/metadata </p></td></tr><tr>@@ -21336,7 +21504,7 @@ Examples:<td><a href="#string">string</a></td><td></td><td><p>The database whose current schema is the diff source.-Format: instances/{instance}/databases/{database} </p></td>+Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database} </p></td></tr><tr>@@ -21397,8 +21565,8 @@ truncated metadata fetch) is treated as dropped. </p></td><td></td><td><p>The name of the database or changelog.Format:-database: instances/{instance}/databases/{database}-changelog: instances/{instance}/databases/{database}/changelogs/{changelog} </p></td>+database: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}+changelog: instances/{instance}/databases/{database}/changelogs/{changelog} or projects/{project}/instances/{instance}/databases/{database}/changelogs/{changelog} </p></td></tr><tr>@@ -21414,7 +21582,7 @@ changelog: instances/{instance}/databases/{database}/changelogs/{changelog} </p><td></td><td><p>The resource name of the changelogFormat:-instances/{instance}/databases/{database}/changelogs/{changelog} </p></td>+instances/{instance}/databases/{database}/changelogs/{changelog} or projects/{project}/instances/{instance}/databases/{database}/changelogs/{changelog} </p></td></tr></tbody>@@ -21951,7 +22119,7 @@ For PostgreSQL, it's the list of tables that the function depends on the ret<td><a href="#string">string</a></td><td></td><td><p>The name of the database to retrieve metadata.-Format: instances/{instance}/databases/{database}/metadata </p></td>+Format: instances/{instance}/databases/{database}/metadata or projects/{project}/instances/{instance}/databases/{database}/metadata </p></td></tr><tr>@@ -22006,7 +22174,7 @@ Default 0, means no limit. </p></td><td><a href="#string">string</a></td><td></td><td><p>The name of the database to retrieve.-Format: instances/{instance}/databases/{database} </p></td>+Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database} </p></td></tr></tbody>@@ -22031,7 +22199,7 @@ Format: instances/{instance}/databases/{database} </p></td><td><a href="#string">string</a></td><td></td><td><p>The name of the database to retrieve SDL schema.-Format: instances/{instance}/databases/{database}/sdlSchema </p></td>+Format: instances/{instance}/databases/{database}/sdlSchema or projects/{project}/instances/{instance}/databases/{database}/sdlSchema </p></td></tr><tr>@@ -22063,7 +22231,7 @@ Format: instances/{instance}/databases/{database}/sdlSchema </p></td><td><a href="#string">string</a></td><td></td><td><p>The name of the database to retrieve schema.-Format: instances/{instance}/databases/{database}/schema </p></td>+Format: instances/{instance}/databases/{database}/schema or projects/{project}/instances/{instance}/databases/{database}/schema </p></td></tr></tbody>@@ -22088,7 +22256,7 @@ Format: instances/{instance}/databases/{database}/schema </p></td><td><a href="#string">string</a></td><td></td><td><p>The name of the database.-Format: instances/{instance}/databases/{database} </p></td>+Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database} </p></td></tr><tr>@@ -22338,7 +22506,8 @@ Name of the operator class for each column. (PostgreSQL specific). </p></td><td></td><td><p>- projects/{project}: list databases in a project, require "bb.projects.get" permission.- workspaces/{id}: list databases in the workspace, require "bb.databases.list" permission.-- instances/{instances}: list databases in a instance, require "bb.instances.get" permission </p></td>+- instances/{instance}: list databases in an instance, require "bb.instances.get" permission.+- projects/{project}/instances/{instance}: list databases in a project instance, require "bb.instances.get" permission. </p></td></tr><tr>@@ -23133,7 +23302,7 @@ types and derived types. </p></td><td><a href="#string">string</a></td><td></td><td><p>The name of the database to sync.-Format: instances/{instance}/databases/{database} </p></td>+Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database} </p></td></tr></tbody>@@ -23639,7 +23808,7 @@ TRUNCATE. </p></td><td><p>The database to update.The database's `name` field is used to identify the database to update.-Format: instances/{instance}/databases/{database} </p></td>+Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database} </p></td></tr><tr>@@ -24210,6 +24379,13 @@ Permissions required: bb.databases.getSchema</p></td><td></td></tr>+ <tr>+ <td>GetDatabase</td>+ <td>GET</td>+ <td>/v1/{name=projects/*/instances/*/databases/*}</td>+ <td></td>+ </tr>+@@ -24227,6 +24403,13 @@ Permissions required: bb.databases.getSchema</p></td><td></td></tr>+ <tr>+ <td>BatchGetDatabases</td>+ <td>GET</td>+ <td>/v1/{parent=projects/*/instances/*}/databases:batchGet</td>+ <td></td>+ </tr>+@@ -24251,6 +24434,13 @@ Permissions required: bb.databases.getSchema</p></td><td></td></tr>+ <tr>+ <td>ListDatabases</td>+ <td>GET</td>+ <td>/v1/{parent=projects/*/instances/*}/databases</td>+ <td></td>+ </tr>+@@ -24261,6 +24451,13 @@ Permissions required: bb.databases.getSchema</p></td><td>database</td></tr>+ <tr>+ <td>UpdateDatabase</td>+ <td>PATCH</td>+ <td>/v1/{database.name=projects/*/instances/*/databases/*}</td>+ <td>database</td>+ </tr>+@@ -24271,6 +24468,13 @@ Permissions required: bb.databases.getSchema</p></td><td>*</td></tr>+ <tr>+ <td>BatchUpdateDatabases</td>+ <td>POST</td>+ <td>/v1/{parent=projects/*/instances/*}/databases:batchUpdate</td>+ <td>*</td>+ </tr>+@@ -24281,6 +24485,13 @@ Permissions required: bb.databases.getSchema</p></td><td>*</td></tr>+ <tr>+ <td>SyncDatabase</td>+ <td>POST</td>+ <td>/v1/{name=projects/*/instances/*/databases/*}:sync</td>+ <td>*</td>+ </tr>+@@ -24291,6 +24502,13 @@ Permissions required: bb.databases.getSchema</p></td><td>*</td></tr>+ <tr>+ <td>BatchSyncDatabases</td>+ <td>POST</td>+ <td>/v1/{parent=projects/*/instances/*}/databases:batchSync</td>+ <td>*</td>+ </tr>+@@ -24301,6 +24519,13 @@ Permissions required: bb.databases.getSchema</p></td><td></td></tr>+ <tr>+ <td>GetDatabaseMetadata</td>+ <td>GET</td>+ <td>/v1/{name=projects/*/instances/*/databases/*/metadata}</td>+ <td></td>+ </tr>+@@ -24311,6 +24536,13 @@ Permissions required: bb.databases.getSchema</p></td><td></td></tr>+ <tr>+ <td>GetDatabaseSchema</td>+ <td>GET</td>+ <td>/v1/{name=projects/*/instances/*/databases/*/schema}</td>+ <td></td>+ </tr>+@@ -24321,6 +24553,13 @@ Permissions required: bb.databases.getSchema</p></td><td></td></tr>+ <tr>+ <td>GetDatabaseSDLSchema</td>+ <td>GET</td>+ <td>/v1/{name=projects/*/instances/*/databases/*/sdlSchema}</td>+ <td></td>+ </tr>+@@ -24331,6 +24570,13 @@ Permissions required: bb.databases.getSchema</p></td><td>*</td></tr>+ <tr>+ <td>DiffSchema</td>+ <td>POST</td>+ <td>/v1/{name=projects/*/instances/*/databases/*}:diffSchema</td>+ <td>*</td>+ </tr>+<tr><td>DiffSchema</td><td>POST</td>@@ -24338,6 +24584,13 @@ Permissions required: bb.databases.getSchema</p></td><td>*</td></tr>+ <tr>+ <td>DiffSchema</td>+ <td>POST</td>+ <td>/v1/{name=projects/*/instances/*/databases/*/changelogs/*}:diffSchema</td>+ <td>*</td>+ </tr>+@@ -24348,6 +24601,13 @@ Permissions required: bb.databases.getSchema</p></td><td>*</td></tr>+ <tr>+ <td>DiffMetadata</td>+ <td>POST</td>+ <td>/v1/{name=projects/*/instances/*/databases/*}:diffMetadata</td>+ <td>*</td>+ </tr>+@@ -24358,6 +24618,13 @@ Permissions required: bb.databases.getSchema</p></td><td></td></tr>+ <tr>+ <td>GetSchemaString</td>+ <td>GET</td>+ <td>/v1/{name=projects/*/instances/*/databases/*/schemaString}</td>+ <td></td>+ </tr>+</tbody></table>@@ -25925,9 +26192,7 @@ Permissions required: bb.identityProviders.update</p></td><td></td><td><p>The parent resource where this instance will be created.Workspace resource name: workspaces/{workspace-id}.-Environment resource name: environments/environment-id.-Instance resource name: instances/instance-id.-Database resource name: instances/instance-id/databases/database-name. </p></td>+Environment resource name: environments/environment-id. </p></td></tr><tr>@@ -25968,9 +26233,7 @@ Database resource name: instances/instance-id/databases/database-name. </p></td><td><p>The policy's `name` field is used to identify the instance to update.Format: {resource name}/policies/{policy type}Workspace resource name: workspaces/{workspace-id}.-Environment resource name: environments/environment-id.-Instance resource name: instances/instance-id.-Database resource name: instances/instance-id/databases/database-name. </p></td>+Environment resource name: environments/environment-id. </p></td></tr></tbody>@@ -26244,9 +26507,7 @@ resource.instance_id == "sample-instance" && (resource.database_<td><p>The name of the policy.Format: {resource name}/policies/{policy type}Workspace resource name: workspaces/{workspace-id}.-Environment resource name: environments/environment-id.-Instance resource name: instances/instance-id.-Database resource name: instances/instance-id/databases/database-name. </p></td>+Environment resource name: environments/environment-id. </p></td></tr><tr>@@ -26479,9 +26740,7 @@ for example, the environment resource can have the sql review config tag, like &The policy's `name` field is used to identify the instance to update.Format: {resource name}/policies/{policy type}Workspace resource name: workspaces/{workspace-id}.-Environment resource name: environments/environment-id.-Instance resource name: instances/instance-id.-Database resource name: instances/instance-id/databases/database-name. </p></td>+Environment resource name: environments/environment-id. </p></td></tr><tr>@@ -26683,20 +26942,6 @@ Permissions required: bb.policies.delete</p></td><td></td></tr>- <tr>- <td>GetPolicy</td>- <td>GET</td>- <td>/v1/{name=instances/*/policies/*}</td>- <td></td>- </tr>-- <tr>- <td>GetPolicy</td>- <td>GET</td>- <td>/v1/{name=instances/*/databases/*/policies/*}</td>- <td></td>- </tr>-@@ -26721,20 +26966,6 @@ Permissions required: bb.policies.delete</p></td><td></td></tr>- <tr>- <td>ListPolicies</td>- <td>GET</td>- <td>/v1/{parent=instances/*}/policies</td>- <td></td>- </tr>-- <tr>- <td>ListPolicies</td>- <td>GET</td>- <td>/v1/{parent=instances/*/databases/*}/policies</td>- <td></td>- </tr>-@@ -26759,20 +26990,6 @@ Permissions required: bb.policies.delete</p></td><td>policy</td></tr>- <tr>- <td>CreatePolicy</td>- <td>POST</td>- <td>/v1/{parent=instances/*}/policies</td>- <td>policy</td>- </tr>-- <tr>- <td>CreatePolicy</td>- <td>POST</td>- <td>/v1/{parent=instances/*/databases/*}/policies</td>- <td>policy</td>- </tr>-@@ -26797,20 +27014,6 @@ Permissions required: bb.policies.delete</p></td><td>policy</td></tr>- <tr>- <td>UpdatePolicy</td>- <td>PATCH</td>- <td>/v1/{policy.name=instances/*/policies/*}</td>- <td>policy</td>- </tr>-- <tr>- <td>UpdatePolicy</td>- <td>PATCH</td>- <td>/v1/{policy.name=instances/*/databases/*/policies/*}</td>- <td>policy</td>- </tr>-@@ -26835,20 +27038,6 @@ Permissions required: bb.policies.delete</p></td><td></td></tr>- <tr>- <td>DeletePolicy</td>- <td>DELETE</td>- <td>/v1/{name=instances/*/policies/*}</td>- <td></td>- </tr>-- <tr>- <td>DeletePolicy</td>- <td>DELETE</td>- <td>/v1/{name=instances/*/databases/*/policies/*}</td>- <td></td>- </tr>-</tbody></table>@@ -30313,7 +30502,7 @@ Permissions required: bb.reviewConfigs.delete</p></td><td><a href="#string">string</a></td><td></td><td><p>The parent resource shared by all revisions being created.-Format: instances/{instance}/databases/{database} </p></td>+Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database} </p></td></tr><tr>@@ -30369,7 +30558,7 @@ A maximum of 100 revisions can be created in a batch. </p></td><td>parent</td><td><a href="#string">string</a></td><td></td>- <td><p>Format: instances/{instance}/databases/{database} </p></td>+ <td><p>Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database} </p></td></tr><tr>@@ -30401,7 +30590,7 @@ A maximum of 100 revisions can be created in a batch. </p></td><td><a href="#string">string</a></td><td></td><td><p>The name of the revision to delete.-Format: instances/{instance}/databases/{database}/revisions/{revision} </p></td>+Format: instances/{instance}/databases/{database}/revisions/{revision} or projects/{project}/instances/{instance}/databases/{database}/revisions/{revision} </p></td></tr></tbody>@@ -30426,7 +30615,7 @@ Format: instances/{instance}/databases/{database}/revisions/{revision} </p></td><td><a href="#string">string</a></td><td></td><td><p>The name of the revision.-Format: instances/{instance}/databases/{database}/revisions/{revision} </p></td>+Format: instances/{instance}/databases/{database}/revisions/{revision} or projects/{project}/instances/{instance}/databases/{database}/revisions/{revision} </p></td></tr></tbody>@@ -30451,7 +30640,7 @@ Format: instances/{instance}/databases/{database}/revisions/{revision} </p></td><td><a href="#string">string</a></td><td></td><td><p>The parent of the revisions.-Format: instances/{instance}/databases/{database} </p></td>+Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database} </p></td></tr><tr>@@ -30534,7 +30723,7 @@ If this field is omitted, there are no subsequent pages. </p></td><td>name</td><td><a href="#string">string</a></td><td></td>- <td><p>Format: instances/{instance}/databases/{database}/revisions/{revision} </p></td>+ <td><p>Format: instances/{instance}/databases/{database}/revisions/{revision} or projects/{project}/instances/{instance}/databases/{database}/revisions/{revision} </p></td></tr><tr>@@ -30723,6 +30912,13 @@ Permissions required: bb.revisions.delete</p></td><td></td></tr>+ <tr>+ <td>ListRevisions</td>+ <td>GET</td>+ <td>/v1/{parent=projects/*/instances/*/databases/*}/revisions</td>+ <td></td>+ </tr>+@@ -30733,6 +30929,13 @@ Permissions required: bb.revisions.delete</p></td><td></td></tr>+ <tr>+ <td>GetRevision</td>+ <td>GET</td>+ <td>/v1/{name=projects/*/instances/*/databases/*/revisions/*}</td>+ <td></td>+ </tr>+@@ -30743,6 +30946,13 @@ Permissions required: bb.revisions.delete</p></td><td>*</td></tr>+ <tr>+ <td>BatchCreateRevisions</td>+ <td>POST</td>+ <td>/v1/{parent=projects/*/instances/*/databases/*}/revisions:batchCreate</td>+ <td>*</td>+ </tr>+@@ -30753,6 +30963,13 @@ Permissions required: bb.revisions.delete</p></td><td></td></tr>+ <tr>+ <td>DeleteRevision</td>+ <td>DELETE</td>+ <td>/v1/{name=projects/*/instances/*/databases/*/revisions/*}</td>+ <td></td>+ </tr>+</tbody></table>diff --git a/proto/v1/v1/changelog_service.proto b/proto/v1/v1/changelog_service.protoindex fa24d3dab1..6bfbea5b34 100644--- a/proto/v1/v1/changelog_service.proto+++ b/proto/v1/v1/changelog_service.proto@@ -16,7 +16,10 @@ service ChangelogService {// Lists migration history for a database.// Permissions required: bb.changelogs.listrpc ListChangelogs(ListChangelogsRequest) returns (ListChangelogsResponse) {- option (google.api.http) = {get: "/v1/{parent=instances/*/databases/*}/changelogs"};+ option (google.api.http) = {+ get: "/v1/{parent=instances/*/databases/*}/changelogs"+ additional_bindings: {get: "/v1/{parent=projects/*/instances/*/databases/*}/changelogs"}+ };option (google.api.method_signature) = "parent";option (bytebase.v1.permission) = "bb.changelogs.list";option (bytebase.v1.auth_method) = IAM;@@ -25,7 +28,10 @@ service ChangelogService {// Retrieves a specific changelog entry.// Permissions required: bb.changelogs.getrpc GetChangelog(GetChangelogRequest) returns (Changelog) {- option (google.api.http) = {get: "/v1/{name=instances/*/databases/*/changelogs/*}"};+ option (google.api.http) = {+ get: "/v1/{name=instances/*/databases/*/changelogs/*}"+ additional_bindings: {get: "/v1/{name=projects/*/instances/*/databases/*/changelogs/*}"}+ };option (google.api.method_signature) = "name";option (bytebase.v1.permission) = "bb.changelogs.get";option (bytebase.v1.auth_method) = IAM;@@ -42,7 +48,7 @@ enum ChangelogView {message ListChangelogsRequest {// The parent of the changelogs.- // Format: instances/{instance}/databases/{database}+ // Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}string parent = 1 [(google.api.field_behavior) = REQUIRED,(google.api.resource_reference) = {type: "bytebase.com/Database"}@@ -87,7 +93,7 @@ message ListChangelogsResponse {message GetChangelogRequest {// The name of the changelog to retrieve.- // Format: instances/{instance}/databases/{database}/changelogs/{changelog}+ // Format: instances/{instance}/databases/{database}/changelogs/{changelog} or projects/{project}/instances/{instance}/databases/{database}/changelogs/{changelog}string name = 1 [(google.api.field_behavior) = REQUIRED,(google.api.resource_reference) = {type: "bytebase.com/DatabaseChangelog"}@@ -100,9 +106,10 @@ message Changelog {option (google.api.resource) = {type: "bytebase.com/DatabaseChangelog"pattern: "instances/{instance}/databases/{database}/changelogs/{changelog}"+ pattern: "projects/{project}/instances/{instance}/databases/{database}/changelogs/{changelog}"};- // Format: instances/{instance}/databases/{database}/changelogs/{changelog}+ // Format: instances/{instance}/databases/{database}/changelogs/{changelog} or projects/{project}/instances/{instance}/databases/{database}/changelogs/{changelog}string name = 1;google.protobuf.Timestamp create_time = 2;diff --git a/proto/v1/v1/database_catalog_service.proto b/proto/v1/v1/database_catalog_service.protoindex df47b43371..0a8f8fa9d3 100644--- a/proto/v1/v1/database_catalog_service.proto+++ b/proto/v1/v1/database_catalog_service.proto@@ -15,7 +15,10 @@ service DatabaseCatalogService {// Gets the catalog metadata for a database.// Permissions required: bb.databaseCatalogs.getrpc GetDatabaseCatalog(GetDatabaseCatalogRequest) returns (DatabaseCatalog) {- option (google.api.http) = {get: "/v1/{name=instances/*/databases/*/catalog}"};+ option (google.api.http) = {+ get: "/v1/{name=instances/*/databases/*/catalog}"+ additional_bindings: {get: "/v1/{name=projects/*/instances/*/databases/*/catalog}"}+ };option (google.api.method_signature) = "name";option (bytebase.v1.permission) = "bb.databaseCatalogs.get";option (bytebase.v1.auth_method) = IAM;@@ -27,6 +30,10 @@ service DatabaseCatalogService {option (google.api.http) = {patch: "/v1/{catalog.name=instances/*/databases/*/catalog}"body: "catalog"+ additional_bindings: {+ patch: "/v1/{catalog.name=projects/*/instances/*/databases/*/catalog}"+ body: "catalog"+ }};option (google.api.method_signature) = "catalog,update_mask";option (bytebase.v1.permission) = "bb.databaseCatalogs.update";@@ -38,7 +45,7 @@ service DatabaseCatalogService {// Request message for getting a database catalog.message GetDatabaseCatalogRequest {// The name of the database catalog to retrieve.- // Format: instances/{instance}/databases/{database}/catalog+ // Format: instances/{instance}/databases/{database}/catalog or projects/{project}/instances/{instance}/databases/{database}/catalogstring name = 1 [(google.api.field_behavior) = REQUIRED,(google.api.resource_reference) = {type: "bytebase.com/DatabaseCatalog"}@@ -50,7 +57,7 @@ message UpdateDatabaseCatalogRequest {// The database catalog to update.//// The catalog's `name` field is used to identify the database catalog to update.- // Format: instances/{instance}/databases/{database}/catalog+ // Format: instances/{instance}/databases/{database}/catalog or projects/{project}/instances/{instance}/databases/{database}/catalogDatabaseCatalog catalog = 1 [(google.api.field_behavior) = REQUIRED];// If set to true, and the database catalog is not found, a new database catalog will be created.@@ -63,10 +70,11 @@ message DatabaseCatalog {option (google.api.resource) = {type: "bytebase.com/DatabaseCatalog"pattern: "instances/{instance}/databases/{database}/catalog"+ pattern: "projects/{project}/instances/{instance}/databases/{database}/catalog"};// The name of the database catalog.- // Format: instances/{instance}/databases/{database}/catalog+ // Format: instances/{instance}/databases/{database}/catalog or projects/{project}/instances/{instance}/databases/{database}/catalogstring name = 1;// The schemas in the database.diff --git a/proto/v1/v1/database_service.proto b/proto/v1/v1/database_service.protoindex d6a6433282..d88cee9059 100644--- a/proto/v1/v1/database_service.proto+++ b/proto/v1/v1/database_service.proto@@ -19,7 +19,10 @@ service DatabaseService {// Retrieves a database by name.// Permissions required: bb.databases.getrpc GetDatabase(GetDatabaseRequest) returns (Database) {- option (google.api.http) = {get: "/v1/{name=instances/*/databases/*}"};+ option (google.api.http) = {+ get: "/v1/{name=instances/*/databases/*}"+ additional_bindings: {get: "/v1/{name=projects/*/instances/*/databases/*}"}+ };option (google.api.method_signature) = "name";option (bytebase.v1.permission) = "bb.databases.get";option (bytebase.v1.auth_method) = IAM;@@ -31,6 +34,7 @@ service DatabaseService {option (google.api.http) = {get: "/v1/{parent=projects/*}/databases:batchGet"additional_bindings: {get: "/v1/{parent=instances/*}/databases:batchGet"}+ additional_bindings: {get: "/v1/{parent=projects/*/instances/*}/databases:batchGet"}};option (bytebase.v1.permission) = "bb.databases.get";option (bytebase.v1.auth_method) = CUSTOM;@@ -44,6 +48,7 @@ service DatabaseService {additional_bindings: {get: "/v1/{parent=instances/*}/databases"}additional_bindings: {get: "/v1/{parent=workspaces/*}/databases"}+ additional_bindings: {get: "/v1/{parent=projects/*/instances/*}/databases"}};option (google.api.method_signature) = "";@@ -57,6 +62,10 @@ service DatabaseService {option (google.api.http) = {patch: "/v1/{database.name=instances/*/databases/*}"body: "database"+ additional_bindings: {+ patch: "/v1/{database.name=projects/*/instances/*/databases/*}"+ body: "database"+ }};option (google.api.method_signature) = "database,update_mask";option (bytebase.v1.permission) = "bb.databases.update";@@ -70,6 +79,10 @@ service DatabaseService {option (google.api.http) = {post: "/v1/{parent=instances/*}/databases:batchUpdate"body: "*"+ additional_bindings: {+ post: "/v1/{parent=projects/*/instances/*}/databases:batchUpdate"+ body: "*"+ }};option (bytebase.v1.permission) = "bb.databases.update";option (bytebase.v1.auth_method) = IAM;@@ -82,6 +95,10 @@ service DatabaseService {option (google.api.http) = {post: "/v1/{name=instances/*/databases/*}:sync"body: "*"+ additional_bindings: {+ post: "/v1/{name=projects/*/instances/*/databases/*}:sync"+ body: "*"+ }};option (bytebase.v1.permission) = "bb.databases.sync";option (bytebase.v1.auth_method) = IAM;@@ -93,6 +110,10 @@ service DatabaseService {option (google.api.http) = {post: "/v1/{parent=instances/*}/databases:batchSync"body: "*"+ additional_bindings: {+ post: "/v1/{parent=projects/*/instances/*}/databases:batchSync"+ body: "*"+ }};option (bytebase.v1.permission) = "bb.databases.sync";option (bytebase.v1.auth_method) = IAM;@@ -101,7 +122,10 @@ service DatabaseService {// Retrieves database metadata including tables, columns, and indexes.// Permissions required: bb.databases.getSchemarpc GetDatabaseMetadata(GetDatabaseMetadataRequest) returns (DatabaseMetadata) {- option (google.api.http) = {get: "/v1/{name=instances/*/databases/*/metadata}"};+ option (google.api.http) = {+ get: "/v1/{name=instances/*/databases/*/metadata}"+ additional_bindings: {get: "/v1/{name=projects/*/instances/*/databases/*/metadata}"}+ };option (bytebase.v1.permission) = "bb.databases.getSchema";option (bytebase.v1.auth_method) = IAM;}@@ -109,7 +133,10 @@ service DatabaseService {// Retrieves database schema as DDL statements.// Permissions required: bb.databases.getSchemarpc GetDatabaseSchema(GetDatabaseSchemaRequest) returns (DatabaseSchema) {- option (google.api.http) = {get: "/v1/{name=instances/*/databases/*/schema}"};+ option (google.api.http) = {+ get: "/v1/{name=instances/*/databases/*/schema}"+ additional_bindings: {get: "/v1/{name=projects/*/instances/*/databases/*/schema}"}+ };option (bytebase.v1.permission) = "bb.databases.getSchema";option (bytebase.v1.auth_method) = IAM;}@@ -117,7 +144,10 @@ service DatabaseService {// Retrieves database schema in SDL (Schema Definition Language) format.// Permissions required: bb.databases.getSchemarpc GetDatabaseSDLSchema(GetDatabaseSDLSchemaRequest) returns (DatabaseSDLSchema) {- option (google.api.http) = {get: "/v1/{name=instances/*/databases/*/sdlSchema}"};+ option (google.api.http) = {+ get: "/v1/{name=instances/*/databases/*/sdlSchema}"+ additional_bindings: {get: "/v1/{name=projects/*/instances/*/databases/*/sdlSchema}"}+ };option (bytebase.v1.permission) = "bb.databases.getSchema";option (bytebase.v1.auth_method) = IAM;}@@ -127,12 +157,21 @@ service DatabaseService {rpc DiffSchema(DiffSchemaRequest) returns (DiffSchemaResponse) {option (google.api.http) = {post: "/v1/{name=instances/*/databases/*}:diffSchema"+body: "*"+ additional_bindings: {+ post: "/v1/{name=projects/*/instances/*/databases/*}:diffSchema"+ body: "*"+ }additional_bindings: {post: "/v1/{name=instances/*/databases/*/changelogs/*}:diffSchema"body: "*"}+ additional_bindings: {+ post: "/v1/{name=projects/*/instances/*/databases/*/changelogs/*}:diffSchema"+ body: "*"+ }};// TODO(d): secure it.option (bytebase.v1.permission) = "bb.databases.get";@@ -146,6 +185,10 @@ service DatabaseService {option (google.api.http) = {post: "/v1/{name=instances/*/databases/*}:diffMetadata"body: "*"+ additional_bindings: {+ post: "/v1/{name=projects/*/instances/*/databases/*}:diffMetadata"+ body: "*"+ }};option (bytebase.v1.permission) = "bb.databases.diffMetadata";option (bytebase.v1.auth_method) = IAM;@@ -154,7 +197,10 @@ service DatabaseService {// Generates schema DDL for a database object.// Permissions required: bb.databases.getSchemarpc GetSchemaString(GetSchemaStringRequest) returns (GetSchemaStringResponse) {- option (google.api.http) = {get: "/v1/{name=instances/*/databases/*/schemaString}"};+ option (google.api.http) = {+ get: "/v1/{name=instances/*/databases/*/schemaString}"+ additional_bindings: {get: "/v1/{name=projects/*/instances/*/databases/*/schemaString}"}+ };option (google.api.method_signature) = "name";option (bytebase.v1.permission) = "bb.databases.getSchema";option (bytebase.v1.auth_method) = IAM;@@ -163,7 +209,7 @@ service DatabaseService {message GetDatabaseRequest {// The name of the database to retrieve.- // Format: instances/{instance}/databases/{database}+ // Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}string name = 1 [(google.api.field_behavior) = REQUIRED,(google.api.resource_reference) = {type: "bytebase.com/Database"}@@ -173,7 +219,8 @@ message GetDatabaseRequest {message BatchGetDatabasesRequest {// The parent resource shared by all databases being retrieved.// - projects/{project}: batch get databases in a project;- // - instances/{instances}: batch get databases in a instance;+ // - instances/{instance}: batch get databases in an instance;+ // - projects/{project}/instances/{instance}: batch get databases in a project instance;// Use "-" as wildcard to batch get databases across parent.string parent = 1 [(google.api.field_behavior) = REQUIRED,@@ -195,7 +242,8 @@ message BatchGetDatabasesResponse {message ListDatabasesRequest {// - projects/{project}: list databases in a project, require "bb.projects.get" permission.// - workspaces/{id}: list databases in the workspace, require "bb.databases.list" permission.- // - instances/{instances}: list databases in a instance, require "bb.instances.get" permission+ // - instances/{instance}: list databases in an instance, require "bb.instances.get" permission.+ // - projects/{project}/instances/{instance}: list databases in a project instance, require "bb.instances.get" permission.string parent = 1 [(google.api.field_behavior) = REQUIRED,(google.api.resource_reference) = {child_type: "bytebase.com/Database"}@@ -272,7 +320,7 @@ message UpdateDatabaseRequest {// The database to update.//// The database's `name` field is used to identify the database to update.- // Format: instances/{instance}/databases/{database}+ // Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}Database database = 1 [(google.api.field_behavior) = REQUIRED];// The list of fields to update.@@ -285,7 +333,7 @@ message UpdateDatabaseRequest {message BatchUpdateDatabasesRequest {// The parent resource shared by all databases being updated.- // Format: instances/{instance}+ // Format: instances/{instance} or projects/{project}/instances/{instance}// If the operation spans parents, a dash (-) may be accepted as a wildcard.// We only support updating the project of databases for now.string parent = 1;@@ -302,7 +350,7 @@ message BatchUpdateDatabasesResponse {message BatchSyncDatabasesRequest {// The parent resource shared by all databases being updated.- // Format: instances/{instance}+ // Format: instances/{instance} or projects/{project}/instances/{instance}// If the operation spans parents, a dash (-) may be accepted as a wildcard.string parent = 1;@@ -317,7 +365,7 @@ message BatchSyncDatabasesResponse {}message SyncDatabaseRequest {// The name of the database to sync.- // Format: instances/{instance}/databases/{database}+ // Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}string name = 1 [(google.api.field_behavior) = REQUIRED,(google.api.resource_reference) = {type: "bytebase.com/Database"}@@ -328,7 +376,7 @@ message SyncDatabaseResponse {}message GetDatabaseMetadataRequest {// The name of the database to retrieve metadata.- // Format: instances/{instance}/databases/{database}/metadata+ // Format: instances/{instance}/databases/{database}/metadata or projects/{project}/instances/{instance}/databases/{database}/metadatastring name = 1 [(google.api.field_behavior) = REQUIRED,(google.api.resource_reference) = {type: "bytebase.com/DatabaseMetadata"}@@ -359,7 +407,7 @@ message GetDatabaseMetadataRequest {message GetDatabaseSchemaRequest {// The name of the database to retrieve schema.- // Format: instances/{instance}/databases/{database}/schema+ // Format: instances/{instance}/databases/{database}/schema or projects/{project}/instances/{instance}/databases/{database}/schemastring name = 1 [(google.api.field_behavior) = REQUIRED,(google.api.resource_reference) = {type: "bytebase.com/DatabaseSchema"}@@ -368,7 +416,7 @@ message GetDatabaseSchemaRequest {message GetDatabaseSDLSchemaRequest {// The name of the database to retrieve SDL schema.- // Format: instances/{instance}/databases/{database}/sdlSchema+ // Format: instances/{instance}/databases/{database}/sdlSchema or projects/{project}/instances/{instance}/databases/{database}/sdlSchemastring name = 1 [(google.api.field_behavior) = REQUIRED,(google.api.resource_reference) = {type: "bytebase.com/Database"}@@ -394,8 +442,8 @@ message GetDatabaseSDLSchemaRequest {message DiffSchemaRequest {// The name of the database or changelog.// Format:- // database: instances/{instance}/databases/{database}- // changelog: instances/{instance}/databases/{database}/changelogs/{changelog}+ // database: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}+ // changelog: instances/{instance}/databases/{database}/changelogs/{changelog} or projects/{project}/instances/{instance}/databases/{database}/changelogs/{changelog}string name = 1 [(google.api.field_behavior) = REQUIRED,(google.api.resource_reference) = {type: "bytebase.com/Database"}@@ -407,7 +455,7 @@ message DiffSchemaRequest {// The resource name of the changelog// Format:- // instances/{instance}/databases/{database}/changelogs/{changelog}+ // instances/{instance}/databases/{database}/changelogs/{changelog} or projects/{project}/instances/{instance}/databases/{database}/changelogs/{changelog}string changelog = 3;}}@@ -418,7 +466,7 @@ message DiffSchemaResponse {message DiffMetadataRequest {// The database whose current schema is the diff source.- // Format: instances/{instance}/databases/{database}+ // Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}string name = 1 [(google.api.field_behavior) = REQUIRED,(google.api.resource_reference) = {type: "bytebase.com/Database"}@@ -441,10 +489,11 @@ message Database {option (google.api.resource) = {type: "bytebase.com/Database"pattern: "instances/{instance}/databases/{database}"+ pattern: "projects/{project}/instances/{instance}/databases/{database}"};// The name of the database.- // Format: instances/{instance}/databases/{database}+ // Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}// {database} is the database name in the instance.string name = 1;@@ -502,11 +551,12 @@ message DatabaseMetadata {option (google.api.resource) = {type: "bytebase.com/DatabaseMetadata"pattern: "instances/{instance}/databases/{database}/metadata"+ pattern: "projects/{project}/instances/{instance}/databases/{database}/metadata"};// The database metadata name.//- // Format: instances/{instance}/databases/{database}/metadata+ // Format: instances/{instance}/databases/{database}/metadata or projects/{project}/instances/{instance}/databases/{database}/metadatastring name = 1;// The schemas is the list of schemas in a database.@@ -1419,7 +1469,7 @@ message DatabaseSDLSchema {message GetSchemaStringRequest {// The name of the database.- // Format: instances/{instance}/databases/{database}+ // Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}string name = 1 [(google.api.field_behavior) = REQUIRED,(google.api.resource_reference) = {type: "bytebase.com/Database"}diff --git a/proto/v1/v1/instance_role_service.proto b/proto/v1/v1/instance_role_service.protoindex 1460d6e86d..236518ee7a 100644--- a/proto/v1/v1/instance_role_service.proto+++ b/proto/v1/v1/instance_role_service.proto@@ -15,7 +15,10 @@ service InstanceRoleService {// Lists all database roles in an instance.// Permissions required: bb.instanceRoles.listrpc ListInstanceRoles(ListInstanceRolesRequest) returns (ListInstanceRolesResponse) {- option (google.api.http) = {get: "/v1/{parent=instances/*}/roles"};+ option (google.api.http) = {+ get: "/v1/{parent=instances/*}/roles"+ additional_bindings: {get: "/v1/{parent=projects/*/instances/*}/roles"}+ };option (google.api.method_signature) = "parent";option (bytebase.v1.permission) = "bb.instanceRoles.list";option (bytebase.v1.auth_method) = IAM;@@ -24,7 +27,7 @@ service InstanceRoleService {message ListInstanceRolesRequest {// The parent, which owns this collection of roles.- // Format: instances/{instance}+ // Format: instances/{instance} or projects/{project}/instances/{instance}string parent = 1 [(google.api.field_behavior) = REQUIRED,(google.api.resource_reference) = {type: "bytebase.com/Instance"}@@ -63,10 +66,11 @@ message InstanceRole {option (google.api.resource) = {type: "bytebase.com/InstanceRole"pattern: "instances/{instance}/roles/{role}"+ pattern: "projects/{project}/instances/{instance}/roles/{role}"};// The name of the role.- // Format: instances/{instance}/roles/{role}+ // Format: instances/{instance}/roles/{role} or projects/{project}/instances/{instance}/roles/{role}// The role name is the unique name for the role.string name = 1;diff --git a/proto/v1/v1/instance_service.proto b/proto/v1/v1/instance_service.protoindex d4dfac5c68..8a2273297d 100644--- a/proto/v1/v1/instance_service.proto+++ b/proto/v1/v1/instance_service.proto@@ -22,16 +22,22 @@ service InstanceService {// Gets a database instance by name.// Permissions required: bb.instances.getrpc GetInstance(GetInstanceRequest) returns (Instance) {- option (google.api.http) = {get: "/v1/{name=instances/*}"};+ option (google.api.http) = {+ get: "/v1/{name=instances/*}"+ additional_bindings: {get: "/v1/{name=projects/*/instances/*}"}+ };option (google.api.method_signature) = "name";option (bytebase.v1.permission) = "bb.instances.get";option (bytebase.v1.auth_method) = IAM;}- // Lists all database instances.+ // Lists database instances, optionally within a project.// Permissions required: bb.instances.listrpc ListInstances(ListInstancesRequest) returns (ListInstancesResponse) {- option (google.api.http) = {get: "/v1/instances"};+ option (google.api.http) = {+ get: "/v1/instances"+ additional_bindings: {get: "/v1/{parent=projects/*}/instances"}+ };option (google.api.method_signature) = "";option (bytebase.v1.permission) = "bb.instances.list";option (bytebase.v1.auth_method) = IAM;@@ -43,6 +49,10 @@ service InstanceService {option (google.api.http) = {post: "/v1/instances"body: "instance"+ additional_bindings: {+ post: "/v1/{parent=projects/*}/instances"+ body: "instance"+ }};option (google.api.method_signature) = "instance";option (bytebase.v1.permission) = "bb.instances.create";@@ -56,6 +66,10 @@ service InstanceService {option (google.api.http) = {patch: "/v1/{instance.name=instances/*}"body: "instance"+ additional_bindings: {+ patch: "/v1/{instance.name=projects/*/instances/*}"+ body: "instance"+ }};option (google.api.method_signature) = "instance,update_mask";option (bytebase.v1.permission) = "bb.instances.update";@@ -66,7 +80,10 @@ service InstanceService {// Deletes or soft-deletes a database instance.// Permissions required: bb.instances.deleterpc DeleteInstance(DeleteInstanceRequest) returns (google.protobuf.Empty) {- option (google.api.http) = {delete: "/v1/{name=instances/*}"};+ option (google.api.http) = {+ delete: "/v1/{name=instances/*}"+ additional_bindings: {delete: "/v1/{name=projects/*/instances/*}"}+ };option (google.api.method_signature) = "name";option (bytebase.v1.permission) = "bb.instances.delete";option (bytebase.v1.auth_method) = IAM;@@ -79,6 +96,10 @@ service InstanceService {option (google.api.http) = {post: "/v1/{name=instances/*}:undelete"body: "*"+ additional_bindings: {+ post: "/v1/{name=projects/*/instances/*}:undelete"+ body: "*"+ }};option (bytebase.v1.permission) = "bb.instances.undelete";option (bytebase.v1.auth_method) = IAM;@@ -91,6 +112,10 @@ service InstanceService {option (google.api.http) = {post: "/v1/{name=instances/*}:sync"body: "*"+ additional_bindings: {+ post: "/v1/{name=projects/*/instances/*}:sync"+ body: "*"+ }};option (bytebase.v1.permission) = "bb.instances.sync";option (bytebase.v1.auth_method) = IAM;@@ -102,6 +127,10 @@ service InstanceService {option (google.api.http) = {post: "/v1/{name=instances/*}:databases"body: "*"+ additional_bindings: {+ post: "/v1/{name=projects/*/instances/*}:databases"+ body: "*"+ }};option (bytebase.v1.permission) = "bb.instances.get";option (bytebase.v1.auth_method) = IAM;@@ -113,6 +142,10 @@ service InstanceService {option (google.api.http) = {post: "/v1/instances:batchSync"body: "*"+ additional_bindings: {+ post: "/v1/{parent=projects/*}/instances:batchSync"+ body: "*"+ }};option (bytebase.v1.permission) = "bb.instances.sync";option (bytebase.v1.auth_method) = IAM;@@ -124,6 +157,10 @@ service InstanceService {option (google.api.http) = {post: "/v1/instances:batchUpdate"body: "*"+ additional_bindings: {+ post: "/v1/{parent=projects/*}/instances:batchUpdate"+ body: "*"+ }};option (bytebase.v1.permission) = "bb.instances.update";option (bytebase.v1.auth_method) = IAM;@@ -136,6 +173,10 @@ service InstanceService {option (google.api.http) = {post: "/v1/{name=instances/*}:addDataSource"body: "*"+ additional_bindings: {+ post: "/v1/{name=projects/*/instances/*}:addDataSource"+ body: "*"+ }};option (bytebase.v1.permission) = "bb.instances.update";option (bytebase.v1.auth_method) = IAM;@@ -148,6 +189,10 @@ service InstanceService {option (google.api.http) = {post: "/v1/{name=instances/*}:removeDataSource"body: "*"+ additional_bindings: {+ post: "/v1/{name=projects/*/instances/*}:removeDataSource"+ body: "*"+ }};option (bytebase.v1.permission) = "bb.instances.update";option (bytebase.v1.auth_method) = IAM;@@ -160,6 +205,10 @@ service InstanceService {option (google.api.http) = {patch: "/v1/{name=instances/*}:updateDataSource"body: "data_source"+ additional_bindings: {+ patch: "/v1/{name=projects/*/instances/*}:updateDataSource"+ body: "data_source"+ }};option (google.api.method_signature) = "data_source,update_mask";option (bytebase.v1.permission) = "bb.instances.update";@@ -170,7 +219,7 @@ service InstanceService {message GetInstanceRequest {// The name of the instance to retrieve.- // Format: instances/{instance}+ // Format: instances/{instance} or projects/{project}/instances/{instance}string name = 1 [(google.api.field_behavior) = REQUIRED,(google.api.resource_reference) = {type: "bytebase.com/Instance"}@@ -178,6 +227,12 @@ message GetInstanceRequest {}message ListInstancesRequest {+ // The parent, which owns this collection of instances.+ // Format: projects/{project}. If omitted, only workspace instances are+ // returned. Wildcard project parents are not supported. When set, the+ // `project` filter must be omitted or match this parent.+ optional string parent = 6 [(google.api.resource_reference) = {child_type: "bytebase.com/Instance"}];+// The maximum number of instances to return. The service may return fewer than// this value.// If unspecified, at most 10 instances will be returned.@@ -250,6 +305,11 @@ message ListInstancesResponse {}message CreateInstanceRequest {+ // The parent, which owns this collection of instances.+ // Format: projects/{project}. If omitted, the instance is created in the+ // workspace collection.+ optional string parent = 5 [(google.api.resource_reference) = {child_type: "bytebase.com/Instance"}];+// The instance to create.Instance instance = 1 [(google.api.field_behavior) = REQUIRED];@@ -264,7 +324,7 @@ message CreateInstanceRequest {bool validate_only = 3;// The project to assign newly discovered databases to during initial sync.- // Format: projects/{project}+ // Format: projects/{project}. This must be unset when `parent` is set.string initial_database_project = 4;}@@ -272,26 +332,30 @@ message UpdateInstanceRequest {// The instance to update.//// The instance's `name` field is used to identify the instance to update.- // Format: instances/{instance}+ // Format: instances/{instance} or projects/{project}/instances/{instance}Instance instance = 1 [(google.api.field_behavior) = REQUIRED];// The list of fields to update.google.protobuf.FieldMask update_mask = 2;// If set to true, and the instance is not found, a new instance will be created.- // In this situation, `update_mask` is ignored.+ // In this situation, `update_mask` is ignored. A project-nested name creates+ // the instance only under its encoded active, non-default project; it never+ // falls back to a workspace instance.bool allow_missing = 3;}message DeleteInstanceRequest {// The name of the instance to delete.- // Format: instances/{instance}+ // Format: instances/{instance} or projects/{project}/instances/{instance}string name = 1 [(google.api.field_behavior) = REQUIRED,(google.api.resource_reference) = {type: "bytebase.com/Instance"}];- // If set to true, any databases and sheets from this project will also be moved to default project, and all open issues will be closed.+ // If set to true, a workspace instance's databases are moved to the default+ // project before the instance is soft-deleted. Project instances reject this+ // option because their databases must remain in the owning project.bool force = 2;// If set to true, permanently purge the soft-deleted instance and all related resources.@@ -303,7 +367,7 @@ message DeleteInstanceRequest {message UndeleteInstanceRequest {// The name of the deleted instance.- // Format: instances/{instance}+ // Format: instances/{instance} or projects/{project}/instances/{instance}string name = 1 [(google.api.field_behavior) = REQUIRED,(google.api.resource_reference) = {type: "bytebase.com/Instance"}@@ -312,7 +376,7 @@ message UndeleteInstanceRequest {message SyncInstanceRequest {// The name of instance.- // Format: instances/{instance}+ // Format: instances/{instance} or projects/{project}/instances/{instance}string name = 1 [(google.api.field_behavior) = REQUIRED,(google.api.resource_reference) = {type: "bytebase.com/Instance"}@@ -325,7 +389,7 @@ message SyncInstanceRequest {message ListInstanceDatabaseRequest {// The name of the instance.- // Format: instances/{instance}+ // Format: instances/{instance} or projects/{project}/instances/{instance}string name = 1 [(google.api.field_behavior) = REQUIRED,(google.api.resource_reference) = {type: "bytebase.com/Instance"}@@ -346,6 +410,11 @@ message SyncInstanceResponse {}message BatchSyncInstancesRequest {+ // The parent, which owns this collection of instances.+ // Format: projects/{project}. If omitted, all targets must be workspace+ // instances; otherwise, every target must belong to this project collection.+ optional string parent = 2 [(google.api.resource_reference) = {child_type: "bytebase.com/Instance"}];+// The request message specifying the instances to sync.// A maximum of 1000 instances can be synced in a batch.repeated SyncInstanceRequest requests = 1 [(google.api.field_behavior) = REQUIRED];@@ -354,6 +423,11 @@ message BatchSyncInstancesRequest {message BatchSyncInstancesResponse {}message BatchUpdateInstancesRequest {+ // The parent, which owns this collection of instances.+ // Format: projects/{project}. If omitted, all targets must be workspace+ // instances; otherwise, every target must belong to this project collection.+ optional string parent = 2 [(google.api.resource_reference) = {child_type: "bytebase.com/Instance"}];+// The request message specifying the resources to update.repeated UpdateInstanceRequest requests = 1 [(google.api.field_behavior) = REQUIRED];}@@ -364,7 +438,7 @@ message BatchUpdateInstancesResponse {message AddDataSourceRequest {// The name of the instance to add a data source to.- // Format: instances/{instance}+ // Format: instances/{instance} or projects/{project}/instances/{instance}string name = 1 [(google.api.field_behavior) = REQUIRED,(google.api.resource_reference) = {type: "bytebase.com/Instance"}@@ -380,7 +454,7 @@ message AddDataSourceRequest {message RemoveDataSourceRequest {// The name of the instance to remove a data source from.- // Format: instances/{instance}+ // Format: instances/{instance} or projects/{project}/instances/{instance}string name = 1 [(google.api.field_behavior) = REQUIRED,(google.api.resource_reference) = {type: "bytebase.com/Instance"}@@ -393,7 +467,7 @@ message RemoveDataSourceRequest {message UpdateDataSourceRequest {// The name of the instance to update a data source.- // Format: instances/{instance}+ // Format: instances/{instance} or projects/{project}/instances/{instance}string name = 1 [(google.api.field_behavior) = REQUIRED,(google.api.resource_reference) = {type: "bytebase.com/Instance"}@@ -421,10 +495,11 @@ message Instance {option (google.api.resource) = {type: "bytebase.com/Instance"pattern: "instances/{instance}"+ pattern: "projects/{project}/instances/{instance}"};// The name of the instance.- // Format: instances/{instance}+ // Format: instances/{instance} or projects/{project}/instances/{instance}string name = 1;// The lifecycle state of the instance.@@ -767,7 +842,7 @@ message InstanceResource {bool activation = 5;// The name of the instance.- // Format: instances/{instance}+ // Format: instances/{instance} or projects/{project}/instances/{instance}string name = 6;// The environment resource.diff --git a/proto/v1/v1/org_policy_service.proto b/proto/v1/v1/org_policy_service.protoindex 41a159b131..40e44ec149 100644--- a/proto/v1/v1/org_policy_service.proto+++ b/proto/v1/v1/org_policy_service.proto@@ -23,8 +23,6 @@ service OrgPolicyService {additional_bindings: {get: "/v1/{name=projects/*/policies/*}"}additional_bindings: {get: "/v1/{name=environments/*/policies/*}"}- additional_bindings: {get: "/v1/{name=instances/*/policies/*}"}- additional_bindings: {get: "/v1/{name=instances/*/databases/*/policies/*}"}};option (google.api.method_signature) = "name";option (bytebase.v1.permission) = "bb.policies.get";@@ -39,8 +37,6 @@ service OrgPolicyService {additional_bindings: {get: "/v1/{parent=projects/*}/policies"}additional_bindings: {get: "/v1/{parent=environments/*}/policies"}- additional_bindings: {get: "/v1/{parent=instances/*}/policies"}- additional_bindings: {get: "/v1/{parent=instances/*/databases/*}/policies"}};option (google.api.method_signature) = "";option (bytebase.v1.permission) = "bb.policies.list";@@ -62,14 +58,6 @@ service OrgPolicyService {post: "/v1/{parent=environments/*}/policies"body: "policy"}- additional_bindings: {- post: "/v1/{parent=instances/*}/policies"- body: "policy"- }- additional_bindings: {- post: "/v1/{parent=instances/*/databases/*}/policies"- body: "policy"- }};option (google.api.method_signature) = "parent,policy";option (bytebase.v1.permission) = "bb.policies.create";@@ -92,14 +80,6 @@ service OrgPolicyService {patch: "/v1/{policy.name=environments/*/policies/*}"body: "policy"}- additional_bindings: {- patch: "/v1/{policy.name=instances/*/policies/*}"- body: "policy"- }- additional_bindings: {- patch: "/v1/{policy.name=instances/*/databases/*/policies/*}"- body: "policy"- }};option (google.api.method_signature) = "policy,update_mask";option (bytebase.v1.permission) = "bb.policies.update";@@ -115,8 +95,6 @@ service OrgPolicyService {additional_bindings: {delete: "/v1/{name=projects/*/policies/*}"}additional_bindings: {delete: "/v1/{name=environments/*/policies/*}"}- additional_bindings: {delete: "/v1/{name=instances/*/policies/*}"}- additional_bindings: {delete: "/v1/{name=instances/*/databases/*/policies/*}"}};option (google.api.method_signature) = "name";option (bytebase.v1.permission) = "bb.policies.delete";@@ -129,8 +107,6 @@ message CreatePolicyRequest {// The parent resource where this instance will be created.// Workspace resource name: workspaces/{workspace-id}.// Environment resource name: environments/environment-id.- // Instance resource name: instances/instance-id.- // Database resource name: instances/instance-id/databases/database-name.string parent = 1 [(google.api.field_behavior) = REQUIRED,(google.api.resource_reference) = {child_type: "bytebase.com/Policy"}@@ -150,8 +126,6 @@ message UpdatePolicyRequest {// Format: {resource name}/policies/{policy type}// Workspace resource name: workspaces/{workspace-id}.// Environment resource name: environments/environment-id.- // Instance resource name: instances/instance-id.- // Database resource name: instances/instance-id/databases/database-name.Policy policy = 1 [(google.api.field_behavior) = REQUIRED];// The list of fields to update.@@ -167,8 +141,6 @@ message DeletePolicyRequest {// Format: {resource name}/policies/{policy type}// Workspace resource name: workspaces/{workspace-id}.// Environment resource name: environments/environment-id.- // Instance resource name: instances/instance-id.- // Database resource name: instances/instance-id/databases/database-name.string name = 1 [(google.api.field_behavior) = REQUIRED,(google.api.resource_reference) = {type: "bytebase.com/Policy"}@@ -210,16 +182,12 @@ message Policy {pattern: "workspaces/{workspace}/policies/{policy}"pattern: "projects/{project}/policies/{policy}"pattern: "environments/{environment}/policies/{policy}"- pattern: "instances/{instance}/policies/{policy}"- pattern: "instances/{instance}/databases/{database}/policies/{policy}"};// The name of the policy.// Format: {resource name}/policies/{policy type}// Workspace resource name: workspaces/{workspace-id}.// Environment resource name: environments/environment-id.- // Instance resource name: instances/instance-id.- // Database resource name: instances/instance-id/databases/database-name.string name = 1;// Whether this policy inherits from its parent resource.diff --git a/proto/v1/v1/revision_service.proto b/proto/v1/v1/revision_service.protoindex c6a11d7819..dd56169674 100644--- a/proto/v1/v1/revision_service.proto+++ b/proto/v1/v1/revision_service.proto@@ -17,7 +17,10 @@ service RevisionService {// Lists schema revisions for a database.// Permissions required: bb.revisions.listrpc ListRevisions(ListRevisionsRequest) returns (ListRevisionsResponse) {- option (google.api.http) = {get: "/v1/{parent=instances/*/databases/*}/revisions"};+ option (google.api.http) = {+ get: "/v1/{parent=instances/*/databases/*}/revisions"+ additional_bindings: {get: "/v1/{parent=projects/*/instances/*/databases/*}/revisions"}+ };option (google.api.method_signature) = "parent";option (bytebase.v1.permission) = "bb.revisions.list";option (bytebase.v1.auth_method) = IAM;@@ -26,7 +29,10 @@ service RevisionService {// Retrieves a schema revision by name.// Permissions required: bb.revisions.getrpc GetRevision(GetRevisionRequest) returns (Revision) {- option (google.api.http) = {get: "/v1/{name=instances/*/databases/*/revisions/*}"};+ option (google.api.http) = {+ get: "/v1/{name=instances/*/databases/*/revisions/*}"+ additional_bindings: {get: "/v1/{name=projects/*/instances/*/databases/*/revisions/*}"}+ };option (google.api.method_signature) = "name";option (bytebase.v1.permission) = "bb.revisions.get";option (bytebase.v1.auth_method) = IAM;@@ -38,6 +44,10 @@ service RevisionService {option (google.api.http) = {post: "/v1/{parent=instances/*/databases/*}/revisions:batchCreate"body: "*"+ additional_bindings: {+ post: "/v1/{parent=projects/*/instances/*/databases/*}/revisions:batchCreate"+ body: "*"+ }};option (bytebase.v1.permission) = "bb.revisions.create";option (bytebase.v1.auth_method) = IAM;@@ -46,7 +56,10 @@ service RevisionService {// Deletes a schema revision.// Permissions required: bb.revisions.deleterpc DeleteRevision(DeleteRevisionRequest) returns (google.protobuf.Empty) {- option (google.api.http) = {delete: "/v1/{name=instances/*/databases/*/revisions/*}"};+ option (google.api.http) = {+ delete: "/v1/{name=instances/*/databases/*/revisions/*}"+ additional_bindings: {delete: "/v1/{name=projects/*/instances/*/databases/*/revisions/*}"}+ };option (google.api.method_signature) = "name";option (bytebase.v1.permission) = "bb.revisions.delete";option (bytebase.v1.auth_method) = IAM;@@ -55,7 +68,7 @@ service RevisionService {message ListRevisionsRequest {// The parent of the revisions.- // Format: instances/{instance}/databases/{database}+ // Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}string parent = 1 [(google.api.field_behavior) = REQUIRED,(google.api.resource_reference) = {type: "bytebase.com/Database"}@@ -87,7 +100,7 @@ message ListRevisionsResponse {}message CreateRevisionRequest {- // Format: instances/{instance}/databases/{database}+ // Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}string parent = 1 [(google.api.field_behavior) = REQUIRED,(google.api.resource_reference) = {type: "bytebase.com/Database"}@@ -99,7 +112,7 @@ message CreateRevisionRequest {message BatchCreateRevisionsRequest {// The parent resource shared by all revisions being created.- // Format: instances/{instance}/databases/{database}+ // Format: instances/{instance}/databases/{database} or projects/{project}/instances/{instance}/databases/{database}string parent = 1 [(google.api.field_behavior) = REQUIRED,(google.api.resource_reference) = {type: "bytebase.com/Database"}@@ -117,7 +130,7 @@ message BatchCreateRevisionsResponse {message GetRevisionRequest {// The name of the revision.- // Format: instances/{instance}/databases/{database}/revisions/{revision}+ // Format: instances/{instance}/databases/{database}/revisions/{revision} or projects/{project}/instances/{instance}/databases/{database}/revisions/{revision}string name = 1 [(google.api.field_behavior) = REQUIRED,(google.api.resource_reference) = {type: "bytebase.com/Revision"}@@ -126,7 +139,7 @@ message GetRevisionRequest {message DeleteRevisionRequest {// The name of the revision to delete.- // Format: instances/{instance}/databases/{database}/revisions/{revision}+ // Format: instances/{instance}/databases/{database}/revisions/{revision} or projects/{project}/instances/{instance}/databases/{database}/revisions/{revision}string name = 1 [(google.api.field_behavior) = REQUIRED,(google.api.resource_reference) = {type: "bytebase.com/Revision"}@@ -137,9 +150,10 @@ message Revision {option (google.api.resource) = {type: "bytebase.com/Revision"pattern: "instances/{instance}/databases/{database}/revisions/{revision}"+ pattern: "projects/{project}/instances/{instance}/databases/{database}/revisions/{revision}"};- // Format: instances/{instance}/databases/{database}/revisions/{revision}+ // Format: instances/{instance}/databases/{database}/revisions/{revision} or projects/{project}/instances/{instance}/databases/{database}/revisions/{revision}string name = 1;// Format: projects/{project}/releases/{release}