Skip to content

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

refactor: additional_bindings for GetActuatorInfo and ListIdentityProviders (#19954)

ecmadao29c0803c56dc
diff --git a/backend/api/mcp/gen/openapi.yaml b/backend/api/mcp/gen/openapi.yaml
index 96715d2c56..25d7f0ff16 100644
--- a/backend/api/mcp/gen/openapi.yaml
+++ b/backend/api/mcp/gen/openapi.yaml
@@ -300,6 +300,8 @@ paths:
summary: GetActuatorInfo
description: |-
Gets system information and health status of the Bytebase instance.
+ When `name` is provided (or the workspace-scoped binding is used), the
+ response includes workspace-scoped fields for that workspace.
Permissions required: None
operationId: bytebase.v1.ActuatorService.GetActuatorInfo
parameters:
@@ -331,42 +333,6 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/bytebase.v1.ActuatorInfo'
- /bytebase.v1.ActuatorService/GetWorkspaceActuatorInfo:
- post:
- tags:
- - bytebase.v1.ActuatorService
- summary: GetWorkspaceActuatorInfo
- description: Gets workspace-scoped actuator info. Requires authentication.
- operationId: bytebase.v1.ActuatorService.GetWorkspaceActuatorInfo
- parameters:
- - name: Connect-Protocol-Version
- in: header
- required: true
- schema:
- $ref: '#/components/schemas/connect-protocol-version'
- - name: Connect-Timeout-Ms
- in: header
- schema:
- $ref: '#/components/schemas/connect-timeout-header'
- requestBody:
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/bytebase.v1.GetWorkspaceActuatorInfoRequest'
- required: true
- responses:
- default:
- description: Error
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/connect.error'
- "200":
- description: Success
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/bytebase.v1.ActuatorInfo'
/bytebase.v1.ActuatorService/SetupSample:
post:
tags:
@@ -11161,6 +11127,15 @@ components:
additionalProperties: false
bytebase.v1.GetActuatorInfoRequest:
type: object
+ properties:
+ name:
+ type: string
+ title: name
+ description: |-
+ Optional. The workspace to scope the response to.
+ Format: workspaces/{workspace}
+ When unset, the workspace is resolved from the request context (self-hosted)
+ or no workspace-scoped fields are returned (SaaS).
title: GetActuatorInfoRequest
additionalProperties: false
description: Request message for getting actuator information.
@@ -11613,16 +11588,6 @@ components:
Format: projects/{project}/worksheets/{worksheet}
title: GetWorksheetRequest
additionalProperties: false
- bytebase.v1.GetWorkspaceActuatorInfoRequest:
- type: object
- properties:
- name:
- type: string
- title: name
- description: 'The workspace name, format: workspaces/{workspace}.'
- title: GetWorkspaceActuatorInfoRequest
- additionalProperties: false
- description: Request message for getting workspace-scoped actuator information.
bytebase.v1.GetWorkspaceRequest:
type: object
properties:
@@ -12814,6 +12779,14 @@ components:
description: Response message for listing groups.
bytebase.v1.ListIdentityProvidersRequest:
type: object
+ properties:
+ parent:
+ type: string
+ title: parent
+ description: |-
+ The parent workspace whose identity providers should be listed.
+ Format: workspaces/{workspace}
+ When unset, the workspace is resolved from the request context.
title: ListIdentityProvidersRequest
additionalProperties: false
bytebase.v1.ListIdentityProvidersResponse:
diff --git a/backend/api/v1/actuator_service.go b/backend/api/v1/actuator_service.go
index 4902f73864..58bc835462 100644
--- a/backend/api/v1/actuator_service.go
+++ b/backend/api/v1/actuator_service.go
@@ -52,12 +52,23 @@ func NewActuatorService(
}
// GetActuatorInfo gets the actuator info.
+// Workspace resolution order: request.name -> JWT context -> default workspace (self-hosted).
func (s *ActuatorService) GetActuatorInfo(
ctx context.Context,
- _ *connect.Request[v1pb.GetActuatorInfoRequest],
+ req *connect.Request[v1pb.GetActuatorInfoRequest],
) (*connect.Response[v1pb.ActuatorInfo], error) {
var workspaceID string
- if !s.profile.SaaS {
+ if req.Msg.Name != "" {
+ id, err := common.GetWorkspaceID(req.Msg.Name)
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInvalidArgument, err)
+ }
+ workspaceID = id
+ }
+ if workspaceID == "" {
+ workspaceID = common.GetWorkspaceIDFromContext(ctx)
+ }
+ if workspaceID == "" && !s.profile.SaaS {
ws, err := s.store.GetWorkspaceID(ctx)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
@@ -71,19 +82,6 @@ func (s *ActuatorService) GetActuatorInfo(
return connect.NewResponse(info), nil
}
-// GetWorkspaceActuatorInfo gets workspace-scoped actuator info. Requires authentication.
-// Workspace validation is handled by the ACL layer (resource_reference on name field).
-func (s *ActuatorService) GetWorkspaceActuatorInfo(
- ctx context.Context,
- _ *connect.Request[v1pb.GetWorkspaceActuatorInfoRequest],
-) (*connect.Response[v1pb.ActuatorInfo], error) {
- info, err := s.getServerInfo(ctx, common.GetWorkspaceIDFromContext(ctx))
- if err != nil {
- return nil, err
- }
- return connect.NewResponse(info), nil
-}
-
// DeleteCache deletes the cache.
func (s *ActuatorService) DeleteCache(
_ context.Context,
diff --git a/backend/api/v1/idp_service.go b/backend/api/v1/idp_service.go
index a1a4589b5e..aa76d7f0ac 100644
--- a/backend/api/v1/idp_service.go
+++ b/backend/api/v1/idp_service.go
@@ -52,13 +52,22 @@ func (s *IdentityProviderService) GetIdentityProvider(ctx context.Context, req *
}
// ListIdentityProviders lists all identity providers.
-func (s *IdentityProviderService) ListIdentityProviders(ctx context.Context, _ *connect.Request[v1pb.ListIdentityProvidersRequest]) (*connect.Response[v1pb.ListIdentityProvidersResponse], error) {
+func (s *IdentityProviderService) ListIdentityProviders(ctx context.Context, req *connect.Request[v1pb.ListIdentityProvidersRequest]) (*connect.Response[v1pb.ListIdentityProvidersResponse], error) {
// allow_without_credential: workspace may not be in context (login page).
- // List global IDPs (workspace IS NULL) and workspace-scoped IDPs separately.
+ // Workspace resolution order: request.parent -> JWT context -> default workspace (self-hosted).
var identityProviders []*store.IdentityProviderMessage
- // TODO(ed): how to let SaaS users get their workspace IDPs before login?
- workspaceID := common.GetWorkspaceIDFromContext(ctx)
+ var workspaceID string
+ if req.Msg.Parent != "" {
+ id, err := common.GetWorkspaceID(req.Msg.Parent)
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInvalidArgument, err)
+ }
+ workspaceID = id
+ }
+ if workspaceID == "" {
+ workspaceID = common.GetWorkspaceIDFromContext(ctx)
+ }
if workspaceID == "" && !s.profile.SaaS {
defaultWorkspaceID, err := s.store.GetWorkspaceID(ctx)
if err != nil {
diff --git a/backend/generated-go/v1/actuator_service.pb.go b/backend/generated-go/v1/actuator_service.pb.go
index ef7cfe4c50..39380cf779 100644
--- a/backend/generated-go/v1/actuator_service.pb.go
+++ b/backend/generated-go/v1/actuator_service.pb.go
@@ -63,7 +63,12 @@ func (*SetupSampleRequest) Descriptor() ([]byte, []int) {
// Request message for getting actuator information.
type GetActuatorInfoRequest struct {
- state protoimpl.MessageState `protogen:"open.v1"`
+ state protoimpl.MessageState `protogen:"open.v1"`
+ // Optional. The workspace to scope the response to.
+ // Format: workspaces/{workspace}
+ // When unset, the workspace is resolved from the request context (self-hosted)
+ // or no workspace-scoped fields are returned (SaaS).
+ Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
@@ -98,46 +103,7 @@ func (*GetActuatorInfoRequest) Descriptor() ([]byte, []int) {
return file_v1_actuator_service_proto_rawDescGZIP(), []int{1}
}
-// Request message for getting workspace-scoped actuator information.
-type GetWorkspaceActuatorInfoRequest struct {
- state protoimpl.MessageState `protogen:"open.v1"`
- // The workspace name, format: workspaces/{workspace}.
- Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
- unknownFields protoimpl.UnknownFields
- sizeCache protoimpl.SizeCache
-}
-
-func (x *GetWorkspaceActuatorInfoRequest) Reset() {
- *x = GetWorkspaceActuatorInfoRequest{}
- mi := &file_v1_actuator_service_proto_msgTypes[2]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
-}
-
-func (x *GetWorkspaceActuatorInfoRequest) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GetWorkspaceActuatorInfoRequest) ProtoMessage() {}
-
-func (x *GetWorkspaceActuatorInfoRequest) ProtoReflect() protoreflect.Message {
- mi := &file_v1_actuator_service_proto_msgTypes[2]
- if x != nil {
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- if ms.LoadMessageInfo() == nil {
- ms.StoreMessageInfo(mi)
- }
- return ms
- }
- return mi.MessageOf(x)
-}
-
-// Deprecated: Use GetWorkspaceActuatorInfoRequest.ProtoReflect.Descriptor instead.
-func (*GetWorkspaceActuatorInfoRequest) Descriptor() ([]byte, []int) {
- return file_v1_actuator_service_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *GetWorkspaceActuatorInfoRequest) GetName() string {
+func (x *GetActuatorInfoRequest) GetName() string {
if x != nil {
return x.Name
}
@@ -153,7 +119,7 @@ type DeleteCacheRequest struct {
func (x *DeleteCacheRequest) Reset() {
*x = DeleteCacheRequest{}
- mi := &file_v1_actuator_service_proto_msgTypes[3]
+ mi := &file_v1_actuator_service_proto_msgTypes[2]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -165,7 +131,7 @@ func (x *DeleteCacheRequest) String() string {
func (*DeleteCacheRequest) ProtoMessage() {}
func (x *DeleteCacheRequest) ProtoReflect() protoreflect.Message {
- mi := &file_v1_actuator_service_proto_msgTypes[3]
+ mi := &file_v1_actuator_service_proto_msgTypes[2]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -178,7 +144,7 @@ func (x *DeleteCacheRequest) ProtoReflect() protoreflect.Message {
// Deprecated: Use DeleteCacheRequest.ProtoReflect.Descriptor instead.
func (*DeleteCacheRequest) Descriptor() ([]byte, []int) {
- return file_v1_actuator_service_proto_rawDescGZIP(), []int{3}
+ return file_v1_actuator_service_proto_rawDescGZIP(), []int{2}
}
type Restriction struct {
@@ -195,7 +161,7 @@ type Restriction struct {
func (x *Restriction) Reset() {
*x = Restriction{}
- mi := &file_v1_actuator_service_proto_msgTypes[4]
+ mi := &file_v1_actuator_service_proto_msgTypes[3]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -207,7 +173,7 @@ func (x *Restriction) String() string {
func (*Restriction) ProtoMessage() {}
func (x *Restriction) ProtoReflect() protoreflect.Message {
- mi := &file_v1_actuator_service_proto_msgTypes[4]
+ mi := &file_v1_actuator_service_proto_msgTypes[3]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -220,7 +186,7 @@ func (x *Restriction) ProtoReflect() protoreflect.Message {
// Deprecated: Use Restriction.ProtoReflect.Descriptor instead.
func (*Restriction) Descriptor() ([]byte, []int) {
- return file_v1_actuator_service_proto_rawDescGZIP(), []int{4}
+ return file_v1_actuator_service_proto_rawDescGZIP(), []int{3}
}
func (x *Restriction) GetDisallowSignup() bool {
@@ -297,7 +263,7 @@ type ActuatorInfo struct {
func (x *ActuatorInfo) Reset() {
*x = ActuatorInfo{}
- mi := &file_v1_actuator_service_proto_msgTypes[5]
+ mi := &file_v1_actuator_service_proto_msgTypes[4]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -309,7 +275,7 @@ func (x *ActuatorInfo) String() string {
func (*ActuatorInfo) ProtoMessage() {}
func (x *ActuatorInfo) ProtoReflect() protoreflect.Message {
- mi := &file_v1_actuator_service_proto_msgTypes[5]
+ mi := &file_v1_actuator_service_proto_msgTypes[4]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -322,7 +288,7 @@ func (x *ActuatorInfo) ProtoReflect() protoreflect.Message {
// Deprecated: Use ActuatorInfo.ProtoReflect.Descriptor instead.
func (*ActuatorInfo) Descriptor() ([]byte, []int) {
- return file_v1_actuator_service_proto_rawDescGZIP(), []int{5}
+ return file_v1_actuator_service_proto_rawDescGZIP(), []int{4}
}
func (x *ActuatorInfo) GetVersion() string {
@@ -477,10 +443,9 @@ var File_v1_actuator_service_proto protoreflect.FileDescriptor
const file_v1_actuator_service_proto_rawDesc = "" +
"\n" +
"\x19v1/actuator_service.proto\x12\vbytebase.v1\x1a\x1cgoogle/api/annotations.proto\x1a\x17google/api/client.proto\x1a\x1fgoogle/api/field_behavior.proto\x1a\x19google/api/resource.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x13v1/annotation.proto\x1a\x18v1/setting_service.proto\"\x14\n" +
- "\x12SetupSampleRequest\"\x18\n" +
- "\x16GetActuatorInfoRequest\"U\n" +
- "\x1fGetWorkspaceActuatorInfoRequest\x122\n" +
- "\x04name\x18\x01 \x01(\tB\x1e\xe0A\x02\xfaA\x18\n" +
+ "\x12SetupSampleRequest\"I\n" +
+ "\x16GetActuatorInfoRequest\x12/\n" +
+ "\x04name\x18\x01 \x01(\tB\x1b\xfaA\x18\n" +
"\x16bytebase.com/WorkspaceR\x04name\"\x14\n" +
"\x12DeleteCacheRequest\"\xec\x01\n" +
"\vRestriction\x12,\n" +
@@ -511,12 +476,11 @@ const file_v1_actuator_service_proto_rawDesc = "" +
"\x0fdefault_project\x18\x1a \x01(\tB\x03\xe0A\x03R\x0edefaultProject\x12.\n" +
"\x11user_count_in_iam\x18\x1b \x01(\x05B\x03\xe0A\x03R\x0euserCountInIamJ\x04\b\t\x10\n" +
"J\x04\b\n" +
- "\x10\vJ\x04\b\f\x10\rJ\x04\b\x10\x10\x11J\x04\b\x11\x10\x12J\x04\b\x0e\x10\x0f2\xb6\x04\n" +
- "\x0fActuatorService\x12s\n" +
- "\x0fGetActuatorInfo\x12#.bytebase.v1.GetActuatorInfoRequest\x1a\x19.bytebase.v1.ActuatorInfo\" \xdaA\x00\x80\xea0\x01\x82\xd3\xe4\x93\x02\x13\x12\x11/v1/actuator/info\x12\x82\x01\n" +
+ "\x10\vJ\x04\b\f\x10\rJ\x04\b\x10\x10\x11J\x04\b\x11\x10\x12J\x04\b\x0e\x10\x0f2\x9d\x03\n" +
+ "\x0fActuatorService\x12\x9c\x01\n" +
+ "\x0fGetActuatorInfo\x12#.bytebase.v1.GetActuatorInfoRequest\x1a\x19.bytebase.v1.ActuatorInfo\"I\xdaA\x00\x80\xea0\x01\x82\xd3\xe4\x93\x02<Z'\x12%/v1/{name=workspaces/*}/actuator/info\x12\x11/v1/actuator/info\x12\x82\x01\n" +
"\vSetupSample\x12\x1f.bytebase.v1.SetupSampleRequest\x1a\x16.google.protobuf.Empty\":\x8a\xea0\x12bb.projects.create\x90\xea0\x01\x82\xd3\xe4\x93\x02\x1a\"\x18/v1/actuator:setupSample\x12f\n" +
- "\vDeleteCache\x12\x1f.bytebase.v1.DeleteCacheRequest\x1a\x16.google.protobuf.Empty\"\x1e\x80\xea0\x01\x82\xd3\xe4\x93\x02\x14*\x12/v1/actuator/cache\x12\xc0\x01\n" +
- "\x18GetWorkspaceActuatorInfo\x12,.bytebase.v1.GetWorkspaceActuatorInfoRequest\x1a\x19.bytebase.v1.ActuatorInfo\"[\xdaA\x04name\x8a\xea0\x1fbb.settings.getWorkspaceProfile\x90\xea0\x01\x82\xd3\xe4\x93\x02'\x12%/v1/{name=workspaces/*}/actuator/infoB\xaa\x01\n" +
+ "\vDeleteCache\x12\x1f.bytebase.v1.DeleteCacheRequest\x1a\x16.google.protobuf.Empty\"\x1e\x80\xea0\x01\x82\xd3\xe4\x93\x02\x14*\x12/v1/actuator/cacheB\xaa\x01\n" +
"\x0fcom.bytebase.v1B\x14ActuatorServiceProtoP\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 (
@@ -531,32 +495,29 @@ func file_v1_actuator_service_proto_rawDescGZIP() []byte {
return file_v1_actuator_service_proto_rawDescData
}
-var file_v1_actuator_service_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
+var file_v1_actuator_service_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
var file_v1_actuator_service_proto_goTypes = []any{
(*SetupSampleRequest)(nil), // 0: bytebase.v1.SetupSampleRequest
(*GetActuatorInfoRequest)(nil), // 1: bytebase.v1.GetActuatorInfoRequest
- (*GetWorkspaceActuatorInfoRequest)(nil), // 2: bytebase.v1.GetWorkspaceActuatorInfoRequest
- (*DeleteCacheRequest)(nil), // 3: bytebase.v1.DeleteCacheRequest
- (*Restriction)(nil), // 4: bytebase.v1.Restriction
- (*ActuatorInfo)(nil), // 5: bytebase.v1.ActuatorInfo
- (*WorkspaceProfileSetting_PasswordRestriction)(nil), // 6: bytebase.v1.WorkspaceProfileSetting.PasswordRestriction
- (*timestamppb.Timestamp)(nil), // 7: google.protobuf.Timestamp
- (*emptypb.Empty)(nil), // 8: google.protobuf.Empty
+ (*DeleteCacheRequest)(nil), // 2: bytebase.v1.DeleteCacheRequest
+ (*Restriction)(nil), // 3: bytebase.v1.Restriction
+ (*ActuatorInfo)(nil), // 4: bytebase.v1.ActuatorInfo
+ (*WorkspaceProfileSetting_PasswordRestriction)(nil), // 5: bytebase.v1.WorkspaceProfileSetting.PasswordRestriction
+ (*timestamppb.Timestamp)(nil), // 6: google.protobuf.Timestamp
+ (*emptypb.Empty)(nil), // 7: google.protobuf.Empty
}
var file_v1_actuator_service_proto_depIdxs = []int32{
- 6, // 0: bytebase.v1.Restriction.password_restriction:type_name -> bytebase.v1.WorkspaceProfileSetting.PasswordRestriction
- 7, // 1: bytebase.v1.ActuatorInfo.last_active_time:type_name -> google.protobuf.Timestamp
- 4, // 2: bytebase.v1.ActuatorInfo.restriction:type_name -> bytebase.v1.Restriction
+ 5, // 0: bytebase.v1.Restriction.password_restriction:type_name -> bytebase.v1.WorkspaceProfileSetting.PasswordRestriction
+ 6, // 1: bytebase.v1.ActuatorInfo.last_active_time:type_name -> google.protobuf.Timestamp
+ 3, // 2: bytebase.v1.ActuatorInfo.restriction:type_name -> bytebase.v1.Restriction
1, // 3: bytebase.v1.ActuatorService.GetActuatorInfo:input_type -> bytebase.v1.GetActuatorInfoRequest
0, // 4: bytebase.v1.ActuatorService.SetupSample:input_type -> bytebase.v1.SetupSampleRequest
- 3, // 5: bytebase.v1.ActuatorService.DeleteCache:input_type -> bytebase.v1.DeleteCacheRequest
- 2, // 6: bytebase.v1.ActuatorService.GetWorkspaceActuatorInfo:input_type -> bytebase.v1.GetWorkspaceActuatorInfoRequest
- 5, // 7: bytebase.v1.ActuatorService.GetActuatorInfo:output_type -> bytebase.v1.ActuatorInfo
- 8, // 8: bytebase.v1.ActuatorService.SetupSample:output_type -> google.protobuf.Empty
- 8, // 9: bytebase.v1.ActuatorService.DeleteCache:output_type -> google.protobuf.Empty
- 5, // 10: bytebase.v1.ActuatorService.GetWorkspaceActuatorInfo:output_type -> bytebase.v1.ActuatorInfo
- 7, // [7:11] is the sub-list for method output_type
- 3, // [3:7] is the sub-list for method input_type
+ 2, // 5: bytebase.v1.ActuatorService.DeleteCache:input_type -> bytebase.v1.DeleteCacheRequest
+ 4, // 6: bytebase.v1.ActuatorService.GetActuatorInfo:output_type -> bytebase.v1.ActuatorInfo
+ 7, // 7: bytebase.v1.ActuatorService.SetupSample:output_type -> google.protobuf.Empty
+ 7, // 8: bytebase.v1.ActuatorService.DeleteCache:output_type -> google.protobuf.Empty
+ 6, // [6:9] is the sub-list for method output_type
+ 3, // [3:6] is the sub-list for method input_type
3, // [3:3] is the sub-list for extension type_name
3, // [3:3] is the sub-list for extension extendee
0, // [0:3] is the sub-list for field type_name
@@ -575,7 +536,7 @@ func file_v1_actuator_service_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: unsafe.Slice(unsafe.StringData(file_v1_actuator_service_proto_rawDesc), len(file_v1_actuator_service_proto_rawDesc)),
NumEnums: 0,
- NumMessages: 6,
+ NumMessages: 5,
NumExtensions: 0,
NumServices: 1,
},
diff --git a/backend/generated-go/v1/actuator_service.pb.gw.go b/backend/generated-go/v1/actuator_service.pb.gw.go
index 093416c909..8da4a47f7a 100644
--- a/backend/generated-go/v1/actuator_service.pb.gw.go
+++ b/backend/generated-go/v1/actuator_service.pb.gw.go
@@ -35,6 +35,8 @@ var (
_ = metadata.Join
)
+var filter_ActuatorService_GetActuatorInfo_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
+
func request_ActuatorService_GetActuatorInfo_0(ctx context.Context, marshaler runtime.Marshaler, client ActuatorServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
var (
protoReq GetActuatorInfoRequest
@@ -43,6 +45,12 @@ func request_ActuatorService_GetActuatorInfo_0(ctx context.Context, marshaler ru
if req.Body != nil {
_, _ = io.Copy(io.Discard, req.Body)
}
+ if err := req.ParseForm(); err != nil {
+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+ }
+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_ActuatorService_GetActuatorInfo_0); err != nil {
+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+ }
msg, err := client.GetActuatorInfo(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
return msg, metadata, err
}
@@ -52,88 +60,94 @@ func local_request_ActuatorService_GetActuatorInfo_0(ctx context.Context, marsha
protoReq GetActuatorInfoRequest
metadata runtime.ServerMetadata
)
+ if err := req.ParseForm(); err != nil {
+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+ }
+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_ActuatorService_GetActuatorInfo_0); err != nil {
+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+ }
msg, err := server.GetActuatorInfo(ctx, &protoReq)
return msg, metadata, err
}
-func request_ActuatorService_SetupSample_0(ctx context.Context, marshaler runtime.Marshaler, client ActuatorServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+func request_ActuatorService_GetActuatorInfo_1(ctx context.Context, marshaler runtime.Marshaler, client ActuatorServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
var (
- protoReq SetupSampleRequest
+ protoReq GetActuatorInfoRequest
metadata runtime.ServerMetadata
+ err error
)
if req.Body != nil {
_, _ = io.Copy(io.Discard, req.Body)
}
- msg, err := client.SetupSample(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.GetActuatorInfo(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
return msg, metadata, err
}
-func local_request_ActuatorService_SetupSample_0(ctx context.Context, marshaler runtime.Marshaler, server ActuatorServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+func local_request_ActuatorService_GetActuatorInfo_1(ctx context.Context, marshaler runtime.Marshaler, server ActuatorServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
var (
- protoReq SetupSampleRequest
+ protoReq GetActuatorInfoRequest
metadata runtime.ServerMetadata
+ err error
)
- msg, err := server.SetupSample(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.GetActuatorInfo(ctx, &protoReq)
return msg, metadata, err
}
-func request_ActuatorService_DeleteCache_0(ctx context.Context, marshaler runtime.Marshaler, client ActuatorServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+func request_ActuatorService_SetupSample_0(ctx context.Context, marshaler runtime.Marshaler, client ActuatorServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
var (
- protoReq DeleteCacheRequest
+ protoReq SetupSampleRequest
metadata runtime.ServerMetadata
)
if req.Body != nil {
_, _ = io.Copy(io.Discard, req.Body)
}
- msg, err := client.DeleteCache(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+ msg, err := client.SetupSample(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
return msg, metadata, err
}
-func local_request_ActuatorService_DeleteCache_0(ctx context.Context, marshaler runtime.Marshaler, server ActuatorServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+func local_request_ActuatorService_SetupSample_0(ctx context.Context, marshaler runtime.Marshaler, server ActuatorServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
var (
- protoReq DeleteCacheRequest
+ protoReq SetupSampleRequest
metadata runtime.ServerMetadata
)
- msg, err := server.DeleteCache(ctx, &protoReq)
+ msg, err := server.SetupSample(ctx, &protoReq)
return msg, metadata, err
}
-func request_ActuatorService_GetWorkspaceActuatorInfo_0(ctx context.Context, marshaler runtime.Marshaler, client ActuatorServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+func request_ActuatorService_DeleteCache_0(ctx context.Context, marshaler runtime.Marshaler, client ActuatorServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
var (
- protoReq GetWorkspaceActuatorInfoRequest
+ protoReq DeleteCacheRequest
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.GetWorkspaceActuatorInfo(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+ msg, err := client.DeleteCache(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
return msg, metadata, err
}
-func local_request_ActuatorService_GetWorkspaceActuatorInfo_0(ctx context.Context, marshaler runtime.Marshaler, server ActuatorServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+func local_request_ActuatorService_DeleteCache_0(ctx context.Context, marshaler runtime.Marshaler, server ActuatorServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
var (
- protoReq GetWorkspaceActuatorInfoRequest
+ protoReq DeleteCacheRequest
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.GetWorkspaceActuatorInfo(ctx, &protoReq)
+ msg, err := server.DeleteCache(ctx, &protoReq)
return msg, metadata, err
}
@@ -163,65 +177,65 @@ func RegisterActuatorServiceHandlerServer(ctx context.Context, mux *runtime.Serv
}
forward_ActuatorService_GetActuatorInfo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
})
- mux.Handle(http.MethodPost, pattern_ActuatorService_SetupSample_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+ mux.Handle(http.MethodGet, pattern_ActuatorService_GetActuatorInfo_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.ActuatorService/SetupSample", runtime.WithHTTPPathPattern("/v1/actuator:setupSample"))
+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.ActuatorService/GetActuatorInfo", runtime.WithHTTPPathPattern("/v1/{name=workspaces/*}/actuator/info"))
if err != nil {
runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
return
}
- resp, md, err := local_request_ActuatorService_SetupSample_0(annotatedContext, inboundMarshaler, server, req, pathParams)
+ resp, md, err := local_request_ActuatorService_GetActuatorInfo_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_ActuatorService_SetupSample_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+ forward_ActuatorService_GetActuatorInfo_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
})
- mux.Handle(http.MethodDelete, pattern_ActuatorService_DeleteCache_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+ mux.Handle(http.MethodPost, pattern_ActuatorService_SetupSample_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.ActuatorService/DeleteCache", runtime.WithHTTPPathPattern("/v1/actuator/cache"))
+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.ActuatorService/SetupSample", runtime.WithHTTPPathPattern("/v1/actuator:setupSample"))
if err != nil {
runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
return
}
- resp, md, err := local_request_ActuatorService_DeleteCache_0(annotatedContext, inboundMarshaler, server, req, pathParams)
+ resp, md, err := local_request_ActuatorService_SetupSample_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_ActuatorService_DeleteCache_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+ forward_ActuatorService_SetupSample_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
})
- mux.Handle(http.MethodGet, pattern_ActuatorService_GetWorkspaceActuatorInfo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+ mux.Handle(http.MethodDelete, pattern_ActuatorService_DeleteCache_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.ActuatorService/GetWorkspaceActuatorInfo", runtime.WithHTTPPathPattern("/v1/{name=workspaces/*}/actuator/info"))
+ annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/bytebase.v1.ActuatorService/DeleteCache", runtime.WithHTTPPathPattern("/v1/actuator/cache"))
if err != nil {
runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
return
}
- resp, md, err := local_request_ActuatorService_GetWorkspaceActuatorInfo_0(annotatedContext, inboundMarshaler, server, req, pathParams)
+ resp, md, err := local_request_ActuatorService_DeleteCache_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_ActuatorService_GetWorkspaceActuatorInfo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+ forward_ActuatorService_DeleteCache_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
})
return nil
@@ -280,70 +294,70 @@ func RegisterActuatorServiceHandlerClient(ctx context.Context, mux *runtime.Serv
}
forward_ActuatorService_GetActuatorInfo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
})
- mux.Handle(http.MethodPost, pattern_ActuatorService_SetupSample_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+ mux.Handle(http.MethodGet, pattern_ActuatorService_GetActuatorInfo_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.ActuatorService/SetupSample", runtime.WithHTTPPathPattern("/v1/actuator:setupSample"))
+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.ActuatorService/GetActuatorInfo", runtime.WithHTTPPathPattern("/v1/{name=workspaces/*}/actuator/info"))
if err != nil {
runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
return
}
- resp, md, err := request_ActuatorService_SetupSample_0(annotatedContext, inboundMarshaler, client, req, pathParams)
+ resp, md, err := request_ActuatorService_GetActuatorInfo_1(annotatedContext, inboundMarshaler, client, req, pathParams)
annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
if err != nil {
runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
return
}
- forward_ActuatorService_SetupSample_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+ forward_ActuatorService_GetActuatorInfo_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
})
- mux.Handle(http.MethodDelete, pattern_ActuatorService_DeleteCache_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+ mux.Handle(http.MethodPost, pattern_ActuatorService_SetupSample_0, 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.ActuatorService/DeleteCache", runtime.WithHTTPPathPattern("/v1/actuator/cache"))
+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.ActuatorService/SetupSample", runtime.WithHTTPPathPattern("/v1/actuator:setupSample"))
if err != nil {
runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
return
}
- resp, md, err := request_ActuatorService_DeleteCache_0(annotatedContext, inboundMarshaler, client, req, pathParams)
+ resp, md, err := request_ActuatorService_SetupSample_0(annotatedContext, inboundMarshaler, client, req, pathParams)
annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
if err != nil {
runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
return
}
- forward_ActuatorService_DeleteCache_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+ forward_ActuatorService_SetupSample_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
})
- mux.Handle(http.MethodGet, pattern_ActuatorService_GetWorkspaceActuatorInfo_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+ mux.Handle(http.MethodDelete, pattern_ActuatorService_DeleteCache_0, 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.ActuatorService/GetWorkspaceActuatorInfo", runtime.WithHTTPPathPattern("/v1/{name=workspaces/*}/actuator/info"))
+ annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/bytebase.v1.ActuatorService/DeleteCache", runtime.WithHTTPPathPattern("/v1/actuator/cache"))
if err != nil {
runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
return
}
- resp, md, err := request_ActuatorService_GetWorkspaceActuatorInfo_0(annotatedContext, inboundMarshaler, client, req, pathParams)
+ resp, md, err := request_ActuatorService_DeleteCache_0(annotatedContext, inboundMarshaler, client, req, pathParams)
annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
if err != nil {
runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
return
}
- forward_ActuatorService_GetWorkspaceActuatorInfo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+ forward_ActuatorService_DeleteCache_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
})
return nil
}
var (
- pattern_ActuatorService_GetActuatorInfo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v1", "actuator", "info"}, ""))
- pattern_ActuatorService_SetupSample_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "actuator"}, "setupSample"))
- pattern_ActuatorService_DeleteCache_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v1", "actuator", "cache"}, ""))
- pattern_ActuatorService_GetWorkspaceActuatorInfo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2, 2, 3, 2, 4}, []string{"v1", "workspaces", "name", "actuator", "info"}, ""))
+ pattern_ActuatorService_GetActuatorInfo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v1", "actuator", "info"}, ""))
+ pattern_ActuatorService_GetActuatorInfo_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2, 2, 3, 2, 4}, []string{"v1", "workspaces", "name", "actuator", "info"}, ""))
+ pattern_ActuatorService_SetupSample_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "actuator"}, "setupSample"))
+ pattern_ActuatorService_DeleteCache_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v1", "actuator", "cache"}, ""))
)
var (
- forward_ActuatorService_GetActuatorInfo_0 = runtime.ForwardResponseMessage
- forward_ActuatorService_SetupSample_0 = runtime.ForwardResponseMessage
- forward_ActuatorService_DeleteCache_0 = runtime.ForwardResponseMessage
- forward_ActuatorService_GetWorkspaceActuatorInfo_0 = runtime.ForwardResponseMessage
+ forward_ActuatorService_GetActuatorInfo_0 = runtime.ForwardResponseMessage
+ forward_ActuatorService_GetActuatorInfo_1 = runtime.ForwardResponseMessage
+ forward_ActuatorService_SetupSample_0 = runtime.ForwardResponseMessage
+ forward_ActuatorService_DeleteCache_0 = runtime.ForwardResponseMessage
)
diff --git a/backend/generated-go/v1/actuator_service_equal.pb.go b/backend/generated-go/v1/actuator_service_equal.pb.go
index 8c20f112db..c1955957a1 100644
--- a/backend/generated-go/v1/actuator_service_equal.pb.go
+++ b/backend/generated-go/v1/actuator_service_equal.pb.go
@@ -14,16 +14,6 @@ func (x *SetupSampleRequest) Equal(y *SetupSampleRequest) bool {
}
func (x *GetActuatorInfoRequest) Equal(y *GetActuatorInfoRequest) bool {
- if x == y {
- return true
- }
- if x == nil || y == nil {
- return x == nil && y == nil
- }
- return true
-}
-
-func (x *GetWorkspaceActuatorInfoRequest) Equal(y *GetWorkspaceActuatorInfoRequest) bool {
if x == y {
return true
}
diff --git a/backend/generated-go/v1/actuator_service_grpc.pb.go b/backend/generated-go/v1/actuator_service_grpc.pb.go
index 5ae57c782c..c47e0f1e22 100644
--- a/backend/generated-go/v1/actuator_service_grpc.pb.go
+++ b/backend/generated-go/v1/actuator_service_grpc.pb.go
@@ -20,10 +20,9 @@ import (
const _ = grpc.SupportPackageIsVersion9
const (
- ActuatorService_GetActuatorInfo_FullMethodName = "/bytebase.v1.ActuatorService/GetActuatorInfo"
- ActuatorService_SetupSample_FullMethodName = "/bytebase.v1.ActuatorService/SetupSample"
- ActuatorService_DeleteCache_FullMethodName = "/bytebase.v1.ActuatorService/DeleteCache"
- ActuatorService_GetWorkspaceActuatorInfo_FullMethodName = "/bytebase.v1.ActuatorService/GetWorkspaceActuatorInfo"
+ ActuatorService_GetActuatorInfo_FullMethodName = "/bytebase.v1.ActuatorService/GetActuatorInfo"
+ ActuatorService_SetupSample_FullMethodName = "/bytebase.v1.ActuatorService/SetupSample"
+ ActuatorService_DeleteCache_FullMethodName = "/bytebase.v1.ActuatorService/DeleteCache"
)
// ActuatorServiceClient is the client API for ActuatorService service.
@@ -33,6 +32,8 @@ const (
// ActuatorService manages system health and operational information.
type ActuatorServiceClient interface {
// Gets system information and health status of the Bytebase instance.
+ // When `name` is provided (or the workspace-scoped binding is used), the
+ // response includes workspace-scoped fields for that workspace.
// Permissions required: None
GetActuatorInfo(ctx context.Context, in *GetActuatorInfoRequest, opts ...grpc.CallOption) (*ActuatorInfo, error)
// Sets up sample data for demonstration and testing purposes.
@@ -41,8 +42,6 @@ type ActuatorServiceClient interface {
// Clears the system cache to force data refresh.
// Permissions required: None
DeleteCache(ctx context.Context, in *DeleteCacheRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
- // Gets workspace-scoped actuator info. Requires authentication.
- GetWorkspaceActuatorInfo(ctx context.Context, in *GetWorkspaceActuatorInfoRequest, opts ...grpc.CallOption) (*ActuatorInfo, error)
}
type actuatorServiceClient struct {
@@ -83,16 +82,6 @@ func (c *actuatorServiceClient) DeleteCache(ctx context.Context, in *DeleteCache
return out, nil
}
-func (c *actuatorServiceClient) GetWorkspaceActuatorInfo(ctx context.Context, in *GetWorkspaceActuatorInfoRequest, opts ...grpc.CallOption) (*ActuatorInfo, error) {
- cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
- out := new(ActuatorInfo)
- err := c.cc.Invoke(ctx, ActuatorService_GetWorkspaceActuatorInfo_FullMethodName, in, out, cOpts...)
- if err != nil {
- return nil, err
- }
- return out, nil
-}
-
// ActuatorServiceServer is the server API for ActuatorService service.
// All implementations must embed UnimplementedActuatorServiceServer
// for forward compatibility.
@@ -100,6 +89,8 @@ func (c *actuatorServiceClient) GetWorkspaceActuatorInfo(ctx context.Context, in
// ActuatorService manages system health and operational information.
type ActuatorServiceServer interface {
// Gets system information and health status of the Bytebase instance.
+ // When `name` is provided (or the workspace-scoped binding is used), the
+ // response includes workspace-scoped fields for that workspace.
// Permissions required: None
GetActuatorInfo(context.Context, *GetActuatorInfoRequest) (*ActuatorInfo, error)
// Sets up sample data for demonstration and testing purposes.
@@ -108,8 +99,6 @@ type ActuatorServiceServer interface {
// Clears the system cache to force data refresh.
// Permissions required: None
DeleteCache(context.Context, *DeleteCacheRequest) (*emptypb.Empty, error)
- // Gets workspace-scoped actuator info. Requires authentication.
- GetWorkspaceActuatorInfo(context.Context, *GetWorkspaceActuatorInfoRequest) (*ActuatorInfo, error)
mustEmbedUnimplementedActuatorServiceServer()
}
@@ -129,9 +118,6 @@ func (UnimplementedActuatorServiceServer) SetupSample(context.Context, *SetupSam
func (UnimplementedActuatorServiceServer) DeleteCache(context.Context, *DeleteCacheRequest) (*emptypb.Empty, error) {
return nil, status.Error(codes.Unimplemented, "method DeleteCache not implemented")
}
-func (UnimplementedActuatorServiceServer) GetWorkspaceActuatorInfo(context.Context, *GetWorkspaceActuatorInfoRequest) (*ActuatorInfo, error) {
- return nil, status.Error(codes.Unimplemented, "method GetWorkspaceActuatorInfo not implemented")
-}
func (UnimplementedActuatorServiceServer) mustEmbedUnimplementedActuatorServiceServer() {}
func (UnimplementedActuatorServiceServer) testEmbeddedByValue() {}
@@ -207,24 +193,6 @@ func _ActuatorService_DeleteCache_Handler(srv interface{}, ctx context.Context,
return interceptor(ctx, in, info, handler)
}
-func _ActuatorService_GetWorkspaceActuatorInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
- in := new(GetWorkspaceActuatorInfoRequest)
- if err := dec(in); err != nil {
- return nil, err
- }
- if interceptor == nil {
- return srv.(ActuatorServiceServer).GetWorkspaceActuatorInfo(ctx, in)
- }
- info := &grpc.UnaryServerInfo{
- Server: srv,
- FullMethod: ActuatorService_GetWorkspaceActuatorInfo_FullMethodName,
- }
- handler := func(ctx context.Context, req interface{}) (interface{}, error) {
- return srv.(ActuatorServiceServer).GetWorkspaceActuatorInfo(ctx, req.(*GetWorkspaceActuatorInfoRequest))
- }
- return interceptor(ctx, in, info, handler)
-}
-
// ActuatorService_ServiceDesc is the grpc.ServiceDesc for ActuatorService service.
// It's only intended for direct use with grpc.RegisterService,
// and not to be introspected or modified (even as a copy)
@@ -244,10 +212,6 @@ var ActuatorService_ServiceDesc = grpc.ServiceDesc{
MethodName: "DeleteCache",
Handler: _ActuatorService_DeleteCache_Handler,
},
- {
- MethodName: "GetWorkspaceActuatorInfo",
- Handler: _ActuatorService_GetWorkspaceActuatorInfo_Handler,
- },
},
Streams: []grpc.StreamDesc{},
Metadata: "v1/actuator_service.proto",
diff --git a/backend/generated-go/v1/idp_service.pb.go b/backend/generated-go/v1/idp_service.pb.go
index 57dfbbb1c2..6b98ccf660 100644
--- a/backend/generated-go/v1/idp_service.pb.go
+++ b/backend/generated-go/v1/idp_service.pb.go
@@ -230,7 +230,11 @@ func (x *GetIdentityProviderRequest) GetName() string {
}
type ListIdentityProvidersRequest struct {
- state protoimpl.MessageState `protogen:"open.v1"`
+ state protoimpl.MessageState `protogen:"open.v1"`
+ // The parent workspace whose identity providers should be listed.
+ // Format: workspaces/{workspace}
+ // When unset, the workspace is resolved from the request context.
+ Parent string `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
@@ -265,6 +269,13 @@ func (*ListIdentityProvidersRequest) Descriptor() ([]byte, []int) {
return file_v1_idp_service_proto_rawDescGZIP(), []int{1}
}
+func (x *ListIdentityProvidersRequest) GetParent() string {
+ if x != nil {
+ return x.Parent
+ }
+ return ""
+}
+
type ListIdentityProvidersResponse struct {
state protoimpl.MessageState `protogen:"open.v1"`
// The identity providers from the specified request.
@@ -1345,8 +1356,10 @@ const file_v1_idp_service_proto_rawDesc = "" +
"\x14v1/idp_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\x1bgoogle/protobuf/empty.proto\x1a google/protobuf/field_mask.proto\x1a\x13v1/annotation.proto\"J\n" +
"\x1aGetIdentityProviderRequest\x12,\n" +
"\x04name\x18\x01 \x01(\tB\x18\xe0A\x02\xfaA\x12\n" +
- "\x10bytebase.com/IdPR\x04name\"\x1e\n" +
- "\x1cListIdentityProvidersRequest\"m\n" +
+ "\x10bytebase.com/IdPR\x04name\"S\n" +
+ "\x1cListIdentityProvidersRequest\x123\n" +
+ "\x06parent\x18\x01 \x01(\tB\x1b\xfaA\x18\n" +
+ "\x16bytebase.com/WorkspaceR\x06parent\"m\n" +
"\x1dListIdentityProvidersResponse\x12L\n" +
"\x12identity_providers\x18\x01 \x03(\v2\x1d.bytebase.v1.IdentityProviderR\x11identityProviders\"\xc7\x01\n" +
"\x1dCreateIdentityProviderRequest\x12O\n" +
@@ -1446,11 +1459,10 @@ const file_v1_idp_service_proto_rawDesc = "" +
"\x0fOAuth2AuthStyle\x12!\n" +
"\x1dOAUTH2_AUTH_STYLE_UNSPECIFIED\x10\x00\x12\r\n" +
"\tIN_PARAMS\x10\x01\x12\r\n" +
- "\tIN_HEADER\x10\x022\xbd\b\n" +
+ "\tIN_HEADER\x10\x022\xdf\b\n" +
"\x17IdentityProviderService\x12\x9f\x01\n" +
- "\x13GetIdentityProvider\x12'.bytebase.v1.GetIdentityProviderRequest\x1a\x1d.bytebase.v1.IdentityProvider\"@\xdaA\x04name\x8a\xea0\x18bb.identityProviders.get\x90\xea0\x01\x82\xd3\xe4\x93\x02\x13\x12\x11/v1/{name=idps/*}\x12\x87\x01\n" +
- "\x15ListIdentityProviders\x12).bytebase.v1.ListIdentityProvidersRequest\x1a*.bytebase.v1.ListIdentityProvidersResponse\"\x17\xdaA\x00\x80\xea0\x01\x82\xd3\xe4\x93\x02\n" +
- "\x12\b/v1/idps\x12\xb2\x01\n" +
+ "\x13GetIdentityProvider\x12'.bytebase.v1.GetIdentityProviderRequest\x1a\x1d.bytebase.v1.IdentityProvider\"@\xdaA\x04name\x8a\xea0\x18bb.identityProviders.get\x90\xea0\x01\x82\xd3\xe4\x93\x02\x13\x12\x11/v1/{name=idps/*}\x12\xa9\x01\n" +
+ "\x15ListIdentityProviders\x12).bytebase.v1.ListIdentityProvidersRequest\x1a*.bytebase.v1.ListIdentityProvidersResponse\"9\xdaA\x00\x80\xea0\x01\x82\xd3\xe4\x93\x02,Z \x12\x1e/v1/{parent=workspaces/*}/idps\x12\b/v1/idps\x12\xb2\x01\n" +
"\x16CreateIdentityProvider\x12*.bytebase.v1.CreateIdentityProviderRequest\x1a\x1d.bytebase.v1.IdentityProvider\"M\xdaA\x00\x8a\xea0\x1bbb.identityProviders.create\x90\xea0\x01\x98\xea0\x01\x82\xd3\xe4\x93\x02\x1d:\x11identity_provider\"\b/v1/idps\x12\xeb\x01\n" +
"\x16UpdateIdentityProvider\x12*.bytebase.v1.UpdateIdentityProviderRequest\x1a\x1d.bytebase.v1.IdentityProvider\"\x85\x01\xdaA\x1didentity_provider,update_mask\x8a\xea0\x1bbb.identityProviders.update\x90\xea0\x01\x98\xea0\x01\x82\xd3\xe4\x93\x028:\x11identity_provider2#/v1/{identity_provider.name=idps/*}\x12\xa5\x01\n" +
"\x16DeleteIdentityProvider\x12*.bytebase.v1.DeleteIdentityProviderRequest\x1a\x16.google.protobuf.Empty\"G\xdaA\x04name\x8a\xea0\x1bbb.identityProviders.delete\x90\xea0\x01\x98\xea0\x01\x82\xd3\xe4\x93\x02\x13*\x11/v1/{name=idps/*}\x12\xaa\x01\n" +
diff --git a/backend/generated-go/v1/idp_service.pb.gw.go b/backend/generated-go/v1/idp_service.pb.gw.go
index 5cd4e530dd..8ec94e2350 100644
--- a/backend/generated-go/v1/idp_service.pb.gw.go
+++ b/backend/generated-go/v1/idp_service.pb.gw.go
@@ -74,6 +74,8 @@ func local_request_IdentityProviderService_GetIdentityProvider_0(ctx context.Con
return msg, metadata, err
}
+var filter_IdentityProviderService_ListIdentityProviders_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
+
func request_IdentityProviderService_ListIdentityProviders_0(ctx context.Context, marshaler runtime.Marshaler, client IdentityProviderServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
var (
protoReq ListIdentityProvidersRequest
@@ -82,6 +84,12 @@ func request_IdentityProviderService_ListIdentityProviders_0(ctx context.Context
if req.Body != nil {
_, _ = io.Copy(io.Discard, req.Body)
}
+ if err := req.ParseForm(); err != nil {
+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+ }
+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_IdentityProviderService_ListIdentityProviders_0); err != nil {
+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+ }
msg, err := client.ListIdentityProviders(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
return msg, metadata, err
}
@@ -91,6 +99,51 @@ func local_request_IdentityProviderService_ListIdentityProviders_0(ctx context.C
protoReq ListIdentityProvidersRequest
metadata runtime.ServerMetadata
)
+ if err := req.ParseForm(); err != nil {
+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+ }
+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_IdentityProviderService_ListIdentityProviders_0); err != nil {
+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+ }
+ msg, err := server.ListIdentityProviders(ctx, &protoReq)
+ return msg, metadata, err
+}
+
+func request_IdentityProviderService_ListIdentityProviders_1(ctx context.Context, marshaler runtime.Marshaler, client IdentityProviderServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+ var (
+ protoReq ListIdentityProvidersRequest
+ 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)
+ }
+ msg, err := client.ListIdentityProviders(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+ return msg, metadata, err
+}
+
+func local_request_IdentityProviderService_ListIdentityProviders_1(ctx context.Context, marshaler runtime.Marshaler, server IdentityProviderServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+ var (
+ protoReq ListIdentityProvidersRequest
+ 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)
+ }
msg, err := server.ListIdentityProviders(ctx, &protoReq)
return msg, metadata, err
}
@@ -329,6 +382,26 @@ func RegisterIdentityProviderServiceHandlerServer(ctx context.Context, mux *runt
}
forward_IdentityProviderService_ListIdentityProviders_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
})
+ mux.Handle(http.MethodGet, pattern_IdentityProviderService_ListIdentityProviders_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.IdentityProviderService/ListIdentityProviders", runtime.WithHTTPPathPattern("/v1/{parent=workspaces/*}/idps"))
+ if err != nil {
+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+ return
+ }
+ resp, md, err := local_request_IdentityProviderService_ListIdentityProviders_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_IdentityProviderService_ListIdentityProviders_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+ })
mux.Handle(http.MethodPost, pattern_IdentityProviderService_CreateIdentityProvider_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
ctx, cancel := context.WithCancel(req.Context())
defer cancel()
@@ -483,6 +556,23 @@ func RegisterIdentityProviderServiceHandlerClient(ctx context.Context, mux *runt
}
forward_IdentityProviderService_ListIdentityProviders_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
})
+ mux.Handle(http.MethodGet, pattern_IdentityProviderService_ListIdentityProviders_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.IdentityProviderService/ListIdentityProviders", runtime.WithHTTPPathPattern("/v1/{parent=workspaces/*}/idps"))
+ if err != nil {
+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+ return
+ }
+ resp, md, err := request_IdentityProviderService_ListIdentityProviders_1(annotatedContext, inboundMarshaler, client, req, pathParams)
+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
+ if err != nil {
+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
+ return
+ }
+ forward_IdentityProviderService_ListIdentityProviders_1(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+ })
mux.Handle(http.MethodPost, pattern_IdentityProviderService_CreateIdentityProvider_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
ctx, cancel := context.WithCancel(req.Context())
defer cancel()
@@ -557,6 +647,7 @@ func RegisterIdentityProviderServiceHandlerClient(ctx context.Context, mux *runt
var (
pattern_IdentityProviderService_GetIdentityProvider_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2}, []string{"v1", "idps", "name"}, ""))
pattern_IdentityProviderService_ListIdentityProviders_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "idps"}, ""))
+ pattern_IdentityProviderService_ListIdentityProviders_1 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2, 2, 3}, []string{"v1", "workspaces", "parent", "idps"}, ""))
pattern_IdentityProviderService_CreateIdentityProvider_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "idps"}, ""))
pattern_IdentityProviderService_UpdateIdentityProvider_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2}, []string{"v1", "idps", "identity_provider.name"}, ""))
pattern_IdentityProviderService_DeleteIdentityProvider_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 2, 5, 2}, []string{"v1", "idps", "name"}, ""))
@@ -566,6 +657,7 @@ var (
var (
forward_IdentityProviderService_GetIdentityProvider_0 = runtime.ForwardResponseMessage
forward_IdentityProviderService_ListIdentityProviders_0 = runtime.ForwardResponseMessage
+ forward_IdentityProviderService_ListIdentityProviders_1 = runtime.ForwardResponseMessage
forward_IdentityProviderService_CreateIdentityProvider_0 = runtime.ForwardResponseMessage
forward_IdentityProviderService_UpdateIdentityProvider_0 = runtime.ForwardResponseMessage
forward_IdentityProviderService_DeleteIdentityProvider_0 = runtime.ForwardResponseMessage
diff --git a/backend/generated-go/v1/idp_service_equal.pb.go b/backend/generated-go/v1/idp_service_equal.pb.go
index 715052d3c2..3d82996723 100644
--- a/backend/generated-go/v1/idp_service_equal.pb.go
+++ b/backend/generated-go/v1/idp_service_equal.pb.go
@@ -28,6 +28,9 @@ func (x *ListIdentityProvidersRequest) Equal(y *ListIdentityProvidersRequest) bo
if x == nil || y == nil {
return x == nil && y == nil
}
+ if x.Parent != y.Parent {
+ return false
+ }
return true
}
diff --git a/backend/generated-go/v1/v1connect/actuator_service.connect.go b/backend/generated-go/v1/v1connect/actuator_service.connect.go
index 5a062a233a..45e0051bb5 100644
--- a/backend/generated-go/v1/v1connect/actuator_service.connect.go
+++ b/backend/generated-go/v1/v1connect/actuator_service.connect.go
@@ -43,14 +43,13 @@ const (
// ActuatorServiceDeleteCacheProcedure is the fully-qualified name of the ActuatorService's
// DeleteCache RPC.
ActuatorServiceDeleteCacheProcedure = "/bytebase.v1.ActuatorService/DeleteCache"
- // ActuatorServiceGetWorkspaceActuatorInfoProcedure is the fully-qualified name of the
- // ActuatorService's GetWorkspaceActuatorInfo RPC.
- ActuatorServiceGetWorkspaceActuatorInfoProcedure = "/bytebase.v1.ActuatorService/GetWorkspaceActuatorInfo"
)
// ActuatorServiceClient is a client for the bytebase.v1.ActuatorService service.
type ActuatorServiceClient interface {
// Gets system information and health status of the Bytebase instance.
+ // When `name` is provided (or the workspace-scoped binding is used), the
+ // response includes workspace-scoped fields for that workspace.
// Permissions required: None
GetActuatorInfo(context.Context, *connect.Request[v1.GetActuatorInfoRequest]) (*connect.Response[v1.ActuatorInfo], error)
// Sets up sample data for demonstration and testing purposes.
@@ -59,8 +58,6 @@ type ActuatorServiceClient interface {
// Clears the system cache to force data refresh.
// Permissions required: None
DeleteCache(context.Context, *connect.Request[v1.DeleteCacheRequest]) (*connect.Response[emptypb.Empty], error)
- // Gets workspace-scoped actuator info. Requires authentication.
- GetWorkspaceActuatorInfo(context.Context, *connect.Request[v1.GetWorkspaceActuatorInfoRequest]) (*connect.Response[v1.ActuatorInfo], error)
}
// NewActuatorServiceClient constructs a client for the bytebase.v1.ActuatorService service. By
@@ -92,21 +89,14 @@ func NewActuatorServiceClient(httpClient connect.HTTPClient, baseURL string, opt
connect.WithSchema(actuatorServiceMethods.ByName("DeleteCache")),
connect.WithClientOptions(opts...),
),
- getWorkspaceActuatorInfo: connect.NewClient[v1.GetWorkspaceActuatorInfoRequest, v1.ActuatorInfo](
- httpClient,
- baseURL+ActuatorServiceGetWorkspaceActuatorInfoProcedure,
- connect.WithSchema(actuatorServiceMethods.ByName("GetWorkspaceActuatorInfo")),
- connect.WithClientOptions(opts...),
- ),
}
}
// actuatorServiceClient implements ActuatorServiceClient.
type actuatorServiceClient struct {
- getActuatorInfo *connect.Client[v1.GetActuatorInfoRequest, v1.ActuatorInfo]
- setupSample *connect.Client[v1.SetupSampleRequest, emptypb.Empty]
- deleteCache *connect.Client[v1.DeleteCacheRequest, emptypb.Empty]
- getWorkspaceActuatorInfo *connect.Client[v1.GetWorkspaceActuatorInfoRequest, v1.ActuatorInfo]
+ getActuatorInfo *connect.Client[v1.GetActuatorInfoRequest, v1.ActuatorInfo]
+ setupSample *connect.Client[v1.SetupSampleRequest, emptypb.Empty]
+ deleteCache *connect.Client[v1.DeleteCacheRequest, emptypb.Empty]
}
// GetActuatorInfo calls bytebase.v1.ActuatorService.GetActuatorInfo.
@@ -124,14 +114,11 @@ func (c *actuatorServiceClient) DeleteCache(ctx context.Context, req *connect.Re
return c.deleteCache.CallUnary(ctx, req)
}
-// GetWorkspaceActuatorInfo calls bytebase.v1.ActuatorService.GetWorkspaceActuatorInfo.
-func (c *actuatorServiceClient) GetWorkspaceActuatorInfo(ctx context.Context, req *connect.Request[v1.GetWorkspaceActuatorInfoRequest]) (*connect.Response[v1.ActuatorInfo], error) {
- return c.getWorkspaceActuatorInfo.CallUnary(ctx, req)
-}
-
// ActuatorServiceHandler is an implementation of the bytebase.v1.ActuatorService service.
type ActuatorServiceHandler interface {
// Gets system information and health status of the Bytebase instance.
+ // When `name` is provided (or the workspace-scoped binding is used), the
+ // response includes workspace-scoped fields for that workspace.
// Permissions required: None
GetActuatorInfo(context.Context, *connect.Request[v1.GetActuatorInfoRequest]) (*connect.Response[v1.ActuatorInfo], error)
// Sets up sample data for demonstration and testing purposes.
@@ -140,8 +127,6 @@ type ActuatorServiceHandler interface {
// Clears the system cache to force data refresh.
// Permissions required: None
DeleteCache(context.Context, *connect.Request[v1.DeleteCacheRequest]) (*connect.Response[emptypb.Empty], error)
- // Gets workspace-scoped actuator info. Requires authentication.
- GetWorkspaceActuatorInfo(context.Context, *connect.Request[v1.GetWorkspaceActuatorInfoRequest]) (*connect.Response[v1.ActuatorInfo], error)
}
// NewActuatorServiceHandler builds an HTTP handler from the service implementation. It returns the
@@ -169,12 +154,6 @@ func NewActuatorServiceHandler(svc ActuatorServiceHandler, opts ...connect.Handl
connect.WithSchema(actuatorServiceMethods.ByName("DeleteCache")),
connect.WithHandlerOptions(opts...),
)
- actuatorServiceGetWorkspaceActuatorInfoHandler := connect.NewUnaryHandler(
- ActuatorServiceGetWorkspaceActuatorInfoProcedure,
- svc.GetWorkspaceActuatorInfo,
- connect.WithSchema(actuatorServiceMethods.ByName("GetWorkspaceActuatorInfo")),
- connect.WithHandlerOptions(opts...),
- )
return "/bytebase.v1.ActuatorService/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
switch r.URL.Path {
case ActuatorServiceGetActuatorInfoProcedure:
@@ -183,8 +162,6 @@ func NewActuatorServiceHandler(svc ActuatorServiceHandler, opts ...connect.Handl
actuatorServiceSetupSampleHandler.ServeHTTP(w, r)
case ActuatorServiceDeleteCacheProcedure:
actuatorServiceDeleteCacheHandler.ServeHTTP(w, r)
- case ActuatorServiceGetWorkspaceActuatorInfoProcedure:
- actuatorServiceGetWorkspaceActuatorInfoHandler.ServeHTTP(w, r)
default:
http.NotFound(w, r)
}
@@ -205,7 +182,3 @@ func (UnimplementedActuatorServiceHandler) SetupSample(context.Context, *connect
func (UnimplementedActuatorServiceHandler) DeleteCache(context.Context, *connect.Request[v1.DeleteCacheRequest]) (*connect.Response[emptypb.Empty], error) {
return nil, connect.NewError(connect.CodeUnimplemented, errors.New("bytebase.v1.ActuatorService.DeleteCache is not implemented"))
}
-
-func (UnimplementedActuatorServiceHandler) GetWorkspaceActuatorInfo(context.Context, *connect.Request[v1.GetWorkspaceActuatorInfoRequest]) (*connect.Response[v1.ActuatorInfo], error) {
- return nil, connect.NewError(connect.CodeUnimplemented, errors.New("bytebase.v1.ActuatorService.GetWorkspaceActuatorInfo is not implemented"))
-}
diff --git a/backend/tests/user_test.go b/backend/tests/user_test.go
index 797fc33892..f9c1e913a6 100644
--- a/backend/tests/user_test.go
+++ b/backend/tests/user_test.go
@@ -47,7 +47,7 @@ func TestDeleteUser(t *testing.T) {
a.Error(err)
a.ErrorContains(err, expectErrorMsg)
- actuator, err := ctl.actuatorServiceClient.GetWorkspaceActuatorInfo(ctx, connect.NewRequest(&v1pb.GetWorkspaceActuatorInfoRequest{
+ actuator, err := ctl.actuatorServiceClient.GetActuatorInfo(ctx, connect.NewRequest(&v1pb.GetActuatorInfoRequest{
Name: memberResp.Msg.Workspace,
}))
a.NoError(err)
diff --git a/frontend/src/store/modules/v1/actuator.ts b/frontend/src/store/modules/v1/actuator.ts
index a17fa70f80..04497c14fc 100644
--- a/frontend/src/store/modules/v1/actuator.ts
+++ b/frontend/src/store/modules/v1/actuator.ts
@@ -137,11 +137,8 @@ export const useActuatorV1Store = defineStore("actuator_v1", () => {
};
const fetchActuatorInfo = async (workspace?: string) => {
- if (!workspace) {
- return actuatorServiceClientConnect.getActuatorInfo({});
- }
- return actuatorServiceClientConnect.getWorkspaceActuatorInfo({
- name: workspace,
+ return actuatorServiceClientConnect.getActuatorInfo({
+ name: workspace ?? "",
});
};
diff --git a/frontend/src/types/proto-es/v1/actuator_service_pb.d.ts b/frontend/src/types/proto-es/v1/actuator_service_pb.d.ts
index 73f6132a15..608b018447 100644
--- a/frontend/src/types/proto-es/v1/actuator_service_pb.d.ts
+++ b/frontend/src/types/proto-es/v1/actuator_service_pb.d.ts
@@ -32,22 +32,11 @@ export declare const SetupSampleRequestSchema: GenMessage<SetupSampleRequest>;
* @generated from message bytebase.v1.GetActuatorInfoRequest
*/
export declare type GetActuatorInfoRequest = Message<"bytebase.v1.GetActuatorInfoRequest"> & {
-};
-
-/**
- * Describes the message bytebase.v1.GetActuatorInfoRequest.
- * Use `create(GetActuatorInfoRequestSchema)` to create a new message.
- */
-export declare const GetActuatorInfoRequestSchema: GenMessage<GetActuatorInfoRequest>;
-
-/**
- * Request message for getting workspace-scoped actuator information.
- *
- * @generated from message bytebase.v1.GetWorkspaceActuatorInfoRequest
- */
-export declare type GetWorkspaceActuatorInfoRequest = Message<"bytebase.v1.GetWorkspaceActuatorInfoRequest"> & {
/**
- * The workspace name, format: workspaces/{workspace}.
+ * Optional. The workspace to scope the response to.
+ * Format: workspaces/{workspace}
+ * When unset, the workspace is resolved from the request context (self-hosted)
+ * or no workspace-scoped fields are returned (SaaS).
*
* @generated from field: string name = 1;
*/
@@ -55,10 +44,10 @@ export declare type GetWorkspaceActuatorInfoRequest = Message<"bytebase.v1.GetWo
};
/**
- * Describes the message bytebase.v1.GetWorkspaceActuatorInfoRequest.
- * Use `create(GetWorkspaceActuatorInfoRequestSchema)` to create a new message.
+ * Describes the message bytebase.v1.GetActuatorInfoRequest.
+ * Use `create(GetActuatorInfoRequestSchema)` to create a new message.
*/
-export declare const GetWorkspaceActuatorInfoRequestSchema: GenMessage<GetWorkspaceActuatorInfoRequest>;
+export declare const GetActuatorInfoRequestSchema: GenMessage<GetActuatorInfoRequest>;
/**
* Request message for deleting cache.
@@ -275,6 +264,8 @@ export declare const ActuatorInfoSchema: GenMessage<ActuatorInfo>;
export declare const ActuatorService: GenService<{
/**
* Gets system information and health status of the Bytebase instance.
+ * When `name` is provided (or the workspace-scoped binding is used), the
+ * response includes workspace-scoped fields for that workspace.
* Permissions required: None
*
* @generated from rpc bytebase.v1.ActuatorService.GetActuatorInfo
@@ -306,15 +297,5 @@ export declare const ActuatorService: GenService<{
input: typeof DeleteCacheRequestSchema;
output: typeof EmptySchema;
},
- /**
- * Gets workspace-scoped actuator info. Requires authentication.
- *
- * @generated from rpc bytebase.v1.ActuatorService.GetWorkspaceActuatorInfo
- */
- getWorkspaceActuatorInfo: {
- methodKind: "unary";
- input: typeof GetWorkspaceActuatorInfoRequestSchema;
- output: typeof ActuatorInfoSchema;
- },
}>;
diff --git a/frontend/src/types/proto-es/v1/actuator_service_pb.js b/frontend/src/types/proto-es/v1/actuator_service_pb.js
index 0f2ca8d529..42912e345b 100644
--- a/frontend/src/types/proto-es/v1/actuator_service_pb.js
+++ b/frontend/src/types/proto-es/v1/actuator_service_pb.js
@@ -15,7 +15,7 @@ import { file_v1_setting_service } from "./setting_service_pb";
* Describes the file v1/actuator_service.proto.
*/
export const file_v1_actuator_service = /*@__PURE__*/
- fileDesc("Chl2MS9hY3R1YXRvcl9zZXJ2aWNlLnByb3RvEgtieXRlYmFzZS52MSIUChJTZXR1cFNhbXBsZVJlcXVlc3QiGAoWR2V0QWN0dWF0b3JJbmZvUmVxdWVzdCJPCh9HZXRXb3Jrc3BhY2VBY3R1YXRvckluZm9SZXF1ZXN0EiwKBG5hbWUYASABKAlCHuBBAvpBGAoWYnl0ZWJhc2UuY29tL1dvcmtzcGFjZSIUChJEZWxldGVDYWNoZVJlcXVlc3QirwEKC1Jlc3RyaWN0aW9uEhwKD2Rpc2FsbG93X3NpZ251cBgBIAEoCEID4EEDEiUKGGRpc2FsbG93X3Bhc3N3b3JkX3NpZ25pbhgCIAEoCEID4EEDElsKFHBhc3N3b3JkX3Jlc3RyaWN0aW9uGAMgASgLMjguYnl0ZWJhc2UudjEuV29ya3NwYWNlUHJvZmlsZVNldHRpbmcuUGFzc3dvcmRSZXN0cmljdGlvbkID4EEDIqUFCgxBY3R1YXRvckluZm8SFAoHdmVyc2lvbhgBIAEoCUID4EEDEhcKCmdpdF9jb21taXQYAiABKAlCA+BBAxIVCghyZWFkb25seRgDIAEoCEID4EEDEhEKBHNhYXMYBCABKAhCA+BBAxIRCgRkZW1vGAUgASgIQgPgQQMSEQoEaG9zdBgGIAEoCUID4EEDEhEKBHBvcnQYByABKAlCA+BBAxIZCgxleHRlcm5hbF91cmwYCCABKAlCA+BBAxI5ChBsYXN0X2FjdGl2ZV90aW1lGAsgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEhYKCXdvcmtzcGFjZRgNIAEoCUID4EEDEiAKE3VubGljZW5zZWRfZmVhdHVyZXMYDyADKAlCA+BBAxITCgZkb2NrZXIYEiABKAhCA+BBAxIhChRhY3RpdmF0ZWRfdXNlcl9jb3VudBgTIAEoBUID4EEDEiUKGGFjdGl2YXRlZF9pbnN0YW5jZV9jb3VudBgUIAEoBUID4EEDEiEKFHRvdGFsX2luc3RhbmNlX2NvdW50GBUgASgFQgPgQQMSGgoNZW5hYmxlX3NhbXBsZRgWIAEoCEID4EEDEiMKFmV4dGVybmFsX3VybF9mcm9tX2ZsYWcYFyABKAhCA+BBAxIaCg1yZXBsaWNhX2NvdW50GBggASgFQgPgQQMSMgoLcmVzdHJpY3Rpb24YGSABKAsyGC5ieXRlYmFzZS52MS5SZXN0cmljdGlvbkID4EEDEhwKD2RlZmF1bHRfcHJvamVjdBgaIAEoCUID4EEDEh4KEXVzZXJfY291bnRfaW5faWFtGBsgASgFQgPgQQNKBAgJEApKBAgKEAtKBAgMEA1KBAgQEBFKBAgREBJKBAgOEA8ytgQKD0FjdHVhdG9yU2VydmljZRJzCg9HZXRBY3R1YXRvckluZm8SIy5ieXRlYmFzZS52MS5HZXRBY3R1YXRvckluZm9SZXF1ZXN0GhkuYnl0ZWJhc2UudjEuQWN0dWF0b3JJbmZvIiDaQQCA6jABgtPkkwITEhEvdjEvYWN0dWF0b3IvaW5mbxKCAQoLU2V0dXBTYW1wbGUSHy5ieXRlYmFzZS52MS5TZXR1cFNhbXBsZVJlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkiOorqMBJiYi5wcm9qZWN0cy5jcmVhdGWQ6jABgtPkkwIaIhgvdjEvYWN0dWF0b3I6c2V0dXBTYW1wbGUSZgoLRGVsZXRlQ2FjaGUSHy5ieXRlYmFzZS52MS5EZWxldGVDYWNoZVJlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkiHoDqMAGC0+STAhQqEi92MS9hY3R1YXRvci9jYWNoZRLAAQoYR2V0V29ya3NwYWNlQWN0dWF0b3JJbmZvEiwuYnl0ZWJhc2UudjEuR2V0V29ya3NwYWNlQWN0dWF0b3JJbmZvUmVxdWVzdBoZLmJ5dGViYXNlLnYxLkFjdHVhdG9ySW5mbyJb2kEEbmFtZYrqMB9iYi5zZXR0aW5ncy5nZXRXb3Jrc3BhY2VQcm9maWxlkOowAYLT5JMCJxIlL3YxL3tuYW1lPXdvcmtzcGFjZXMvKn0vYWN0dWF0b3IvaW5mb0KqAQoPY29tLmJ5dGViYXNlLnYxQhRBY3R1YXRvclNlcnZpY2VQcm90b1ABWjRnaXRodWIuY29tL2J5dGViYXNlL2J5dGViYXNlL2JhY2tlbmQvZ2VuZXJhdGVkLWdvL3YxogIDQlhYqgILQnl0ZWJhc2UuVjHKAgtCeXRlYmFzZVxWMeICF0J5dGViYXNlXFYxXEdQQk1ldGFkYXRh6gIMQnl0ZWJhc2U6OlYxYgZwcm90bzM", [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, file_v1_setting_service]);
+ fileDesc("Chl2MS9hY3R1YXRvcl9zZXJ2aWNlLnByb3RvEgtieXRlYmFzZS52MSIUChJTZXR1cFNhbXBsZVJlcXVlc3QiQwoWR2V0QWN0dWF0b3JJbmZvUmVxdWVzdBIpCgRuYW1lGAEgASgJQhv6QRgKFmJ5dGViYXNlLmNvbS9Xb3Jrc3BhY2UiFAoSRGVsZXRlQ2FjaGVSZXF1ZXN0Iq8BCgtSZXN0cmljdGlvbhIcCg9kaXNhbGxvd19zaWdudXAYASABKAhCA+BBAxIlChhkaXNhbGxvd19wYXNzd29yZF9zaWduaW4YAiABKAhCA+BBAxJbChRwYXNzd29yZF9yZXN0cmljdGlvbhgDIAEoCzI4LmJ5dGViYXNlLnYxLldvcmtzcGFjZVByb2ZpbGVTZXR0aW5nLlBhc3N3b3JkUmVzdHJpY3Rpb25CA+BBAyKlBQoMQWN0dWF0b3JJbmZvEhQKB3ZlcnNpb24YASABKAlCA+BBAxIXCgpnaXRfY29tbWl0GAIgASgJQgPgQQMSFQoIcmVhZG9ubHkYAyABKAhCA+BBAxIRCgRzYWFzGAQgASgIQgPgQQMSEQoEZGVtbxgFIAEoCEID4EEDEhEKBGhvc3QYBiABKAlCA+BBAxIRCgRwb3J0GAcgASgJQgPgQQMSGQoMZXh0ZXJuYWxfdXJsGAggASgJQgPgQQMSOQoQbGFzdF9hY3RpdmVfdGltZRgLIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxIWCgl3b3Jrc3BhY2UYDSABKAlCA+BBAxIgChN1bmxpY2Vuc2VkX2ZlYXR1cmVzGA8gAygJQgPgQQMSEwoGZG9ja2VyGBIgASgIQgPgQQMSIQoUYWN0aXZhdGVkX3VzZXJfY291bnQYEyABKAVCA+BBAxIlChhhY3RpdmF0ZWRfaW5zdGFuY2VfY291bnQYFCABKAVCA+BBAxIhChR0b3RhbF9pbnN0YW5jZV9jb3VudBgVIAEoBUID4EEDEhoKDWVuYWJsZV9zYW1wbGUYFiABKAhCA+BBAxIjChZleHRlcm5hbF91cmxfZnJvbV9mbGFnGBcgASgIQgPgQQMSGgoNcmVwbGljYV9jb3VudBgYIAEoBUID4EEDEjIKC3Jlc3RyaWN0aW9uGBkgASgLMhguYnl0ZWJhc2UudjEuUmVzdHJpY3Rpb25CA+BBAxIcCg9kZWZhdWx0X3Byb2plY3QYGiABKAlCA+BBAxIeChF1c2VyX2NvdW50X2luX2lhbRgbIAEoBUID4EEDSgQICRAKSgQIChALSgQIDBANSgQIEBARSgQIERASSgQIDhAPMp0DCg9BY3R1YXRvclNlcnZpY2USnAEKD0dldEFjdHVhdG9ySW5mbxIjLmJ5dGViYXNlLnYxLkdldEFjdHVhdG9ySW5mb1JlcXVlc3QaGS5ieXRlYmFzZS52MS5BY3R1YXRvckluZm8iSdpBAIDqMAGC0+STAjxaJxIlL3YxL3tuYW1lPXdvcmtzcGFjZXMvKn0vYWN0dWF0b3IvaW5mbxIRL3YxL2FjdHVhdG9yL2luZm8SggEKC1NldHVwU2FtcGxlEh8uYnl0ZWJhc2UudjEuU2V0dXBTYW1wbGVSZXF1ZXN0GhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5IjqK6jASYmIucHJvamVjdHMuY3JlYXRlkOowAYLT5JMCGiIYL3YxL2FjdHVhdG9yOnNldHVwU2FtcGxlEmYKC0RlbGV0ZUNhY2hlEh8uYnl0ZWJhc2UudjEuRGVsZXRlQ2FjaGVSZXF1ZXN0GhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5Ih6A6jABgtPkkwIUKhIvdjEvYWN0dWF0b3IvY2FjaGVCqgEKD2NvbS5ieXRlYmFzZS52MUIUQWN0dWF0b3JTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [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, file_v1_setting_service]);
/**
* Describes the message bytebase.v1.SetupSampleRequest.
@@ -31,33 +31,26 @@ export const SetupSampleRequestSchema = /*@__PURE__*/
export const GetActuatorInfoRequestSchema = /*@__PURE__*/
messageDesc(file_v1_actuator_service, 1);
-/**
- * Describes the message bytebase.v1.GetWorkspaceActuatorInfoRequest.
- * Use `create(GetWorkspaceActuatorInfoRequestSchema)` to create a new message.
- */
-export const GetWorkspaceActuatorInfoRequestSchema = /*@__PURE__*/
- messageDesc(file_v1_actuator_service, 2);
-
/**
* Describes the message bytebase.v1.DeleteCacheRequest.
* Use `create(DeleteCacheRequestSchema)` to create a new message.
*/
export const DeleteCacheRequestSchema = /*@__PURE__*/
- messageDesc(file_v1_actuator_service, 3);
+ messageDesc(file_v1_actuator_service, 2);
/**
* Describes the message bytebase.v1.Restriction.
* Use `create(RestrictionSchema)` to create a new message.
*/
export const RestrictionSchema = /*@__PURE__*/
- messageDesc(file_v1_actuator_service, 4);
+ messageDesc(file_v1_actuator_service, 3);
/**
* Describes the message bytebase.v1.ActuatorInfo.
* Use `create(ActuatorInfoSchema)` to create a new message.
*/
export const ActuatorInfoSchema = /*@__PURE__*/
- messageDesc(file_v1_actuator_service, 5);
+ messageDesc(file_v1_actuator_service, 4);
/**
* ActuatorService manages system health and operational information.
diff --git a/frontend/src/types/proto-es/v1/idp_service_pb.d.ts b/frontend/src/types/proto-es/v1/idp_service_pb.d.ts
index e972f5cc63..96e1257652 100644
--- a/frontend/src/types/proto-es/v1/idp_service_pb.d.ts
+++ b/frontend/src/types/proto-es/v1/idp_service_pb.d.ts
@@ -34,6 +34,14 @@ export declare const GetIdentityProviderRequestSchema: GenMessage<GetIdentityPro
* @generated from message bytebase.v1.ListIdentityProvidersRequest
*/
export declare type ListIdentityProvidersRequest = Message<"bytebase.v1.ListIdentityProvidersRequest"> & {
+ /**
+ * The parent workspace whose identity providers should be listed.
+ * Format: workspaces/{workspace}
+ * When unset, the workspace is resolved from the request context.
+ *
+ * @generated from field: string parent = 1;
+ */
+ parent: string;
};
/**
diff --git a/frontend/src/types/proto-es/v1/idp_service_pb.js b/frontend/src/types/proto-es/v1/idp_service_pb.js
index 0bb03907ef..1d1ccf2174 100644
--- a/frontend/src/types/proto-es/v1/idp_service_pb.js
+++ b/frontend/src/types/proto-es/v1/idp_service_pb.js
@@ -15,7 +15,7 @@ import { file_v1_annotation } from "./annotation_pb";
* Describes the file v1/idp_service.proto.
*/
export const file_v1_idp_service = /*@__PURE__*/
- fileDesc("ChR2MS9pZHBfc2VydmljZS5wcm90bxILYnl0ZWJhc2UudjEiRAoaR2V0SWRlbnRpdHlQcm92aWRlclJlcXVlc3QSJgoEbmFtZRgBIAEoCUIY4EEC+kESChBieXRlYmFzZS5jb20vSWRQIh4KHExpc3RJZGVudGl0eVByb3ZpZGVyc1JlcXVlc3QiWgodTGlzdElkZW50aXR5UHJvdmlkZXJzUmVzcG9uc2USOQoSaWRlbnRpdHlfcHJvdmlkZXJzGAEgAygLMh0uYnl0ZWJhc2UudjEuSWRlbnRpdHlQcm92aWRlciKTAQodQ3JlYXRlSWRlbnRpdHlQcm92aWRlclJlcXVlc3QSPQoRaWRlbnRpdHlfcHJvdmlkZXIYASABKAsyHS5ieXRlYmFzZS52MS5JZGVudGl0eVByb3ZpZGVyQgPgQQISHAoUaWRlbnRpdHlfcHJvdmlkZXJfaWQYAiABKAkSFQoNdmFsaWRhdGVfb25seRgDIAEoCCKmAQodVXBkYXRlSWRlbnRpdHlQcm92aWRlclJlcXVlc3QSPQoRaWRlbnRpdHlfcHJvdmlkZXIYASABKAsyHS5ieXRlYmFzZS52MS5JZGVudGl0eVByb3ZpZGVyQgPgQQISLwoLdXBkYXRlX21hc2sYAiABKAsyGi5nb29nbGUucHJvdG9idWYuRmllbGRNYXNrEhUKDWFsbG93X21pc3NpbmcYAyABKAgiRwodRGVsZXRlSWRlbnRpdHlQcm92aWRlclJlcXVlc3QSJgoEbmFtZRgBIAEoCUIY4EEC+kESChBieXRlYmFzZS5jb20vSWRQIoACChtUZXN0SWRlbnRpdHlQcm92aWRlclJlcXVlc3QSOAoRaWRlbnRpdHlfcHJvdmlkZXIYASABKAsyHS5ieXRlYmFzZS52MS5JZGVudGl0eVByb3ZpZGVyEk8KDm9hdXRoMl9jb250ZXh0GAIgASgLMjUuYnl0ZWJhc2UudjEuT0F1dGgySWRlbnRpdHlQcm92aWRlclRlc3RSZXF1ZXN0Q29udGV4dEgAEksKDG9pZGNfY29udGV4dBgDIAEoCzIzLmJ5dGViYXNlLnYxLk9JRENJZGVudGl0eVByb3ZpZGVyVGVzdFJlcXVlc3RDb250ZXh0SABCCQoHY29udGV4dCI4CihPQXV0aDJJZGVudGl0eVByb3ZpZGVyVGVzdFJlcXVlc3RDb250ZXh0EgwKBGNvZGUYASABKAkiNgomT0lEQ0lkZW50aXR5UHJvdmlkZXJUZXN0UmVxdWVzdENvbnRleHQSDAoEY29kZRgBIAEoCSKRAgocVGVzdElkZW50aXR5UHJvdmlkZXJSZXNwb25zZRJFCgZjbGFpbXMYASADKAsyNS5ieXRlYmFzZS52MS5UZXN0SWRlbnRpdHlQcm92aWRlclJlc3BvbnNlLkNsYWltc0VudHJ5EkoKCXVzZXJfaW5mbxgCIAMoCzI3LmJ5dGViYXNlLnYxLlRlc3RJZGVudGl0eVByb3ZpZGVyUmVzcG9uc2UuVXNlckluZm9FbnRyeRotCgtDbGFpbXNFbnRyeRILCgNrZXkYASABKAkSDQoFdmFsdWUYAiABKAk6AjgBGi8KDVVzZXJJbmZvRW50cnkSCwoDa2V5GAEgASgJEg0KBXZhbHVlGAIgASgJOgI4ASLSAQoQSWRlbnRpdHlQcm92aWRlchIMCgRuYW1lGAEgASgJEhcKBXRpdGxlGAIgASgJQgi6SAVyAxjIARIOCgZkb21haW4YAyABKAkSLwoEdHlwZRgEIAEoDjIhLmJ5dGViYXNlLnYxLklkZW50aXR5UHJvdmlkZXJUeXBlEjMKBmNvbmZpZxgFIAEoCzIjLmJ5dGViYXNlLnYxLklkZW50aXR5UHJvdmlkZXJDb25maWc6IepBHgoQYnl0ZWJhc2UuY29tL0lkUBIKaWRwcy97aWRwfSLmAQoWSWRlbnRpdHlQcm92aWRlckNvbmZpZxJCCg1vYXV0aDJfY29uZmlnGAEgASgLMikuYnl0ZWJhc2UudjEuT0F1dGgySWRlbnRpdHlQcm92aWRlckNvbmZpZ0gAEj4KC29pZGNfY29uZmlnGAIgASgLMicuYnl0ZWJhc2UudjEuT0lEQ0lkZW50aXR5UHJvdmlkZXJDb25maWdIABI+CgtsZGFwX2NvbmZpZxgDIAEoCzInLmJ5dGViYXNlLnYxLkxEQVBJZGVudGl0eVByb3ZpZGVyQ29uZmlnSABCCAoGY29uZmlnIpECChxPQXV0aDJJZGVudGl0eVByb3ZpZGVyQ29uZmlnEhAKCGF1dGhfdXJsGAEgASgJEhEKCXRva2VuX3VybBgCIAEoCRIVCg11c2VyX2luZm9fdXJsGAMgASgJEhEKCWNsaWVudF9pZBgEIAEoCRIVCg1jbGllbnRfc2VjcmV0GAUgASgJEg4KBnNjb3BlcxgGIAMoCRIwCg1maWVsZF9tYXBwaW5nGAcgASgLMhkuYnl0ZWJhc2UudjEuRmllbGRNYXBwaW5nEhcKD3NraXBfdGxzX3ZlcmlmeRgIIAEoCBIwCgphdXRoX3N0eWxlGAkgASgOMhwuYnl0ZWJhc2UudjEuT0F1dGgyQXV0aFN0eWxlIv8BChpPSURDSWRlbnRpdHlQcm92aWRlckNvbmZpZxIOCgZpc3N1ZXIYASABKAkSEQoJY2xpZW50X2lkGAIgASgJEhUKDWNsaWVudF9zZWNyZXQYAyABKAkSDgoGc2NvcGVzGAQgAygJEjAKDWZpZWxkX21hcHBpbmcYBSABKAsyGS5ieXRlYmFzZS52MS5GaWVsZE1hcHBpbmcSFwoPc2tpcF90bHNfdmVyaWZ5GAYgASgIEjAKCmF1dGhfc3R5bGUYByABKA4yHC5ieXRlYmFzZS52MS5PQXV0aDJBdXRoU3R5bGUSGgoNYXV0aF9lbmRwb2ludBgIIAEoCUID4EEDIvcCChpMREFQSWRlbnRpdHlQcm92aWRlckNvbmZpZxIMCgRob3N0GAEgASgJEgwKBHBvcnQYAiABKAUSFwoPc2tpcF90bHNfdmVyaWZ5GAMgASgIEg8KB2JpbmRfZG4YBCABKAkSFQoNYmluZF9wYXNzd29yZBgFIAEoCRIPCgdiYXNlX2RuGAYgASgJEhMKC3VzZXJfZmlsdGVyGAcgASgJElMKEXNlY3VyaXR5X3Byb3RvY29sGAggASgOMjguYnl0ZWJhc2UudjEuTERBUElkZW50aXR5UHJvdmlkZXJDb25maWcuU2VjdXJpdHlQcm90b2NvbBIwCg1maWVsZF9tYXBwaW5nGAkgASgLMhkuYnl0ZWJhc2UudjEuRmllbGRNYXBwaW5nIk8KEFNlY3VyaXR5UHJvdG9jb2wSIQodU0VDVVJJVFlfUFJPVE9DT0xfVU5TUEVDSUZJRUQQABINCglTVEFSVF9UTFMQARIJCgVMREFQUxACIlcKDEZpZWxkTWFwcGluZxISCgppZGVudGlmaWVyGAEgASgJEhQKDGRpc3BsYXlfbmFtZRgCIAEoCRINCgVwaG9uZRgDIAEoCRIOCgZncm91cHMYBCABKAkqXgoUSWRlbnRpdHlQcm92aWRlclR5cGUSJgoiSURFTlRJVFlfUFJPVklERVJfVFlQRV9VTlNQRUNJRklFRBAAEgoKBk9BVVRIMhABEggKBE9JREMQAhIICgRMREFQEAMqUgoPT0F1dGgyQXV0aFN0eWxlEiEKHU9BVVRIMl9BVVRIX1NUWUxFX1VOU1BFQ0lGSUVEEAASDQoJSU5fUEFSQU1TEAESDQoJSU5fSEVBREVSEAIyvQgKF0lkZW50aXR5UHJvdmlkZXJTZXJ2aWNlEp8BChNHZXRJZGVudGl0eVByb3ZpZGVyEicuYnl0ZWJhc2UudjEuR2V0SWRlbnRpdHlQcm92aWRlclJlcXVlc3QaHS5ieXRlYmFzZS52MS5JZGVudGl0eVByb3ZpZGVyIkDaQQRuYW1liuowGGJiLmlkZW50aXR5UHJvdmlkZXJzLmdldJDqMAGC0+STAhMSES92MS97bmFtZT1pZHBzLyp9EocBChVMaXN0SWRlbnRpdHlQcm92aWRlcnMSKS5ieXRlYmFzZS52MS5MaXN0SWRlbnRpdHlQcm92aWRlcnNSZXF1ZXN0GiouYnl0ZWJhc2UudjEuTGlzdElkZW50aXR5UHJvdmlkZXJzUmVzcG9uc2UiF9pBAIDqMAGC0+STAgoSCC92MS9pZHBzErIBChZDcmVhdGVJZGVudGl0eVByb3ZpZGVyEiouYnl0ZWJhc2UudjEuQ3JlYXRlSWRlbnRpdHlQcm92aWRlclJlcXVlc3QaHS5ieXRlYmFzZS52MS5JZGVudGl0eVByb3ZpZGVyIk3aQQCK6jAbYmIuaWRlbnRpdHlQcm92aWRlcnMuY3JlYXRlkOowAZjqMAGC0+STAh06EWlkZW50aXR5X3Byb3ZpZGVyIggvdjEvaWRwcxLrAQoWVXBkYXRlSWRlbnRpdHlQcm92aWRlchIqLmJ5dGViYXNlLnYxLlVwZGF0ZUlkZW50aXR5UHJvdmlkZXJSZXF1ZXN0Gh0uYnl0ZWJhc2UudjEuSWRlbnRpdHlQcm92aWRlciKFAdpBHWlkZW50aXR5X3Byb3ZpZGVyLHVwZGF0ZV9tYXNriuowG2JiLmlkZW50aXR5UHJvdmlkZXJzLnVwZGF0ZZDqMAGY6jABgtPkkwI4OhFpZGVudGl0eV9wcm92aWRlcjIjL3YxL3tpZGVudGl0eV9wcm92aWRlci5uYW1lPWlkcHMvKn0SpQEKFkRlbGV0ZUlkZW50aXR5UHJvdmlkZXISKi5ieXRlYmFzZS52MS5EZWxldGVJZGVudGl0eVByb3ZpZGVyUmVxdWVzdBoWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eSJH2kEEbmFtZYrqMBtiYi5pZGVudGl0eVByb3ZpZGVycy5kZWxldGWQ6jABmOowAYLT5JMCEyoRL3YxL3tuYW1lPWlkcHMvKn0SqgEKFFRlc3RJZGVudGl0eVByb3ZpZGVyEiguYnl0ZWJhc2UudjEuVGVzdElkZW50aXR5UHJvdmlkZXJSZXF1ZXN0GikuYnl0ZWJhc2UudjEuVGVzdElkZW50aXR5UHJvdmlkZXJSZXNwb25zZSI9iuowG2JiLmlkZW50aXR5UHJvdmlkZXJzLnVwZGF0ZZDqMAGC0+STAhQ6ASoiDy92MS9pZHBzLyo6dGVzdEKlAQoPY29tLmJ5dGViYXNlLnYxQg9JZHBTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [file_buf_validate_validate, file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_empty, file_google_protobuf_field_mask, file_v1_annotation]);
+ fileDesc("ChR2MS9pZHBfc2VydmljZS5wcm90bxILYnl0ZWJhc2UudjEiRAoaR2V0SWRlbnRpdHlQcm92aWRlclJlcXVlc3QSJgoEbmFtZRgBIAEoCUIY4EEC+kESChBieXRlYmFzZS5jb20vSWRQIksKHExpc3RJZGVudGl0eVByb3ZpZGVyc1JlcXVlc3QSKwoGcGFyZW50GAEgASgJQhv6QRgKFmJ5dGViYXNlLmNvbS9Xb3Jrc3BhY2UiWgodTGlzdElkZW50aXR5UHJvdmlkZXJzUmVzcG9uc2USOQoSaWRlbnRpdHlfcHJvdmlkZXJzGAEgAygLMh0uYnl0ZWJhc2UudjEuSWRlbnRpdHlQcm92aWRlciKTAQodQ3JlYXRlSWRlbnRpdHlQcm92aWRlclJlcXVlc3QSPQoRaWRlbnRpdHlfcHJvdmlkZXIYASABKAsyHS5ieXRlYmFzZS52MS5JZGVudGl0eVByb3ZpZGVyQgPgQQISHAoUaWRlbnRpdHlfcHJvdmlkZXJfaWQYAiABKAkSFQoNdmFsaWRhdGVfb25seRgDIAEoCCKmAQodVXBkYXRlSWRlbnRpdHlQcm92aWRlclJlcXVlc3QSPQoRaWRlbnRpdHlfcHJvdmlkZXIYASABKAsyHS5ieXRlYmFzZS52MS5JZGVudGl0eVByb3ZpZGVyQgPgQQISLwoLdXBkYXRlX21hc2sYAiABKAsyGi5nb29nbGUucHJvdG9idWYuRmllbGRNYXNrEhUKDWFsbG93X21pc3NpbmcYAyABKAgiRwodRGVsZXRlSWRlbnRpdHlQcm92aWRlclJlcXVlc3QSJgoEbmFtZRgBIAEoCUIY4EEC+kESChBieXRlYmFzZS5jb20vSWRQIoACChtUZXN0SWRlbnRpdHlQcm92aWRlclJlcXVlc3QSOAoRaWRlbnRpdHlfcHJvdmlkZXIYASABKAsyHS5ieXRlYmFzZS52MS5JZGVudGl0eVByb3ZpZGVyEk8KDm9hdXRoMl9jb250ZXh0GAIgASgLMjUuYnl0ZWJhc2UudjEuT0F1dGgySWRlbnRpdHlQcm92aWRlclRlc3RSZXF1ZXN0Q29udGV4dEgAEksKDG9pZGNfY29udGV4dBgDIAEoCzIzLmJ5dGViYXNlLnYxLk9JRENJZGVudGl0eVByb3ZpZGVyVGVzdFJlcXVlc3RDb250ZXh0SABCCQoHY29udGV4dCI4CihPQXV0aDJJZGVudGl0eVByb3ZpZGVyVGVzdFJlcXVlc3RDb250ZXh0EgwKBGNvZGUYASABKAkiNgomT0lEQ0lkZW50aXR5UHJvdmlkZXJUZXN0UmVxdWVzdENvbnRleHQSDAoEY29kZRgBIAEoCSKRAgocVGVzdElkZW50aXR5UHJvdmlkZXJSZXNwb25zZRJFCgZjbGFpbXMYASADKAsyNS5ieXRlYmFzZS52MS5UZXN0SWRlbnRpdHlQcm92aWRlclJlc3BvbnNlLkNsYWltc0VudHJ5EkoKCXVzZXJfaW5mbxgCIAMoCzI3LmJ5dGViYXNlLnYxLlRlc3RJZGVudGl0eVByb3ZpZGVyUmVzcG9uc2UuVXNlckluZm9FbnRyeRotCgtDbGFpbXNFbnRyeRILCgNrZXkYASABKAkSDQoFdmFsdWUYAiABKAk6AjgBGi8KDVVzZXJJbmZvRW50cnkSCwoDa2V5GAEgASgJEg0KBXZhbHVlGAIgASgJOgI4ASLSAQoQSWRlbnRpdHlQcm92aWRlchIMCgRuYW1lGAEgASgJEhcKBXRpdGxlGAIgASgJQgi6SAVyAxjIARIOCgZkb21haW4YAyABKAkSLwoEdHlwZRgEIAEoDjIhLmJ5dGViYXNlLnYxLklkZW50aXR5UHJvdmlkZXJUeXBlEjMKBmNvbmZpZxgFIAEoCzIjLmJ5dGViYXNlLnYxLklkZW50aXR5UHJvdmlkZXJDb25maWc6IepBHgoQYnl0ZWJhc2UuY29tL0lkUBIKaWRwcy97aWRwfSLmAQoWSWRlbnRpdHlQcm92aWRlckNvbmZpZxJCCg1vYXV0aDJfY29uZmlnGAEgASgLMikuYnl0ZWJhc2UudjEuT0F1dGgySWRlbnRpdHlQcm92aWRlckNvbmZpZ0gAEj4KC29pZGNfY29uZmlnGAIgASgLMicuYnl0ZWJhc2UudjEuT0lEQ0lkZW50aXR5UHJvdmlkZXJDb25maWdIABI+CgtsZGFwX2NvbmZpZxgDIAEoCzInLmJ5dGViYXNlLnYxLkxEQVBJZGVudGl0eVByb3ZpZGVyQ29uZmlnSABCCAoGY29uZmlnIpECChxPQXV0aDJJZGVudGl0eVByb3ZpZGVyQ29uZmlnEhAKCGF1dGhfdXJsGAEgASgJEhEKCXRva2VuX3VybBgCIAEoCRIVCg11c2VyX2luZm9fdXJsGAMgASgJEhEKCWNsaWVudF9pZBgEIAEoCRIVCg1jbGllbnRfc2VjcmV0GAUgASgJEg4KBnNjb3BlcxgGIAMoCRIwCg1maWVsZF9tYXBwaW5nGAcgASgLMhkuYnl0ZWJhc2UudjEuRmllbGRNYXBwaW5nEhcKD3NraXBfdGxzX3ZlcmlmeRgIIAEoCBIwCgphdXRoX3N0eWxlGAkgASgOMhwuYnl0ZWJhc2UudjEuT0F1dGgyQXV0aFN0eWxlIv8BChpPSURDSWRlbnRpdHlQcm92aWRlckNvbmZpZxIOCgZpc3N1ZXIYASABKAkSEQoJY2xpZW50X2lkGAIgASgJEhUKDWNsaWVudF9zZWNyZXQYAyABKAkSDgoGc2NvcGVzGAQgAygJEjAKDWZpZWxkX21hcHBpbmcYBSABKAsyGS5ieXRlYmFzZS52MS5GaWVsZE1hcHBpbmcSFwoPc2tpcF90bHNfdmVyaWZ5GAYgASgIEjAKCmF1dGhfc3R5bGUYByABKA4yHC5ieXRlYmFzZS52MS5PQXV0aDJBdXRoU3R5bGUSGgoNYXV0aF9lbmRwb2ludBgIIAEoCUID4EEDIvcCChpMREFQSWRlbnRpdHlQcm92aWRlckNvbmZpZxIMCgRob3N0GAEgASgJEgwKBHBvcnQYAiABKAUSFwoPc2tpcF90bHNfdmVyaWZ5GAMgASgIEg8KB2JpbmRfZG4YBCABKAkSFQoNYmluZF9wYXNzd29yZBgFIAEoCRIPCgdiYXNlX2RuGAYgASgJEhMKC3VzZXJfZmlsdGVyGAcgASgJElMKEXNlY3VyaXR5X3Byb3RvY29sGAggASgOMjguYnl0ZWJhc2UudjEuTERBUElkZW50aXR5UHJvdmlkZXJDb25maWcuU2VjdXJpdHlQcm90b2NvbBIwCg1maWVsZF9tYXBwaW5nGAkgASgLMhkuYnl0ZWJhc2UudjEuRmllbGRNYXBwaW5nIk8KEFNlY3VyaXR5UHJvdG9jb2wSIQodU0VDVVJJVFlfUFJPVE9DT0xfVU5TUEVDSUZJRUQQABINCglTVEFSVF9UTFMQARIJCgVMREFQUxACIlcKDEZpZWxkTWFwcGluZxISCgppZGVudGlmaWVyGAEgASgJEhQKDGRpc3BsYXlfbmFtZRgCIAEoCRINCgVwaG9uZRgDIAEoCRIOCgZncm91cHMYBCABKAkqXgoUSWRlbnRpdHlQcm92aWRlclR5cGUSJgoiSURFTlRJVFlfUFJPVklERVJfVFlQRV9VTlNQRUNJRklFRBAAEgoKBk9BVVRIMhABEggKBE9JREMQAhIICgRMREFQEAMqUgoPT0F1dGgyQXV0aFN0eWxlEiEKHU9BVVRIMl9BVVRIX1NUWUxFX1VOU1BFQ0lGSUVEEAASDQoJSU5fUEFSQU1TEAESDQoJSU5fSEVBREVSEAIy3wgKF0lkZW50aXR5UHJvdmlkZXJTZXJ2aWNlEp8BChNHZXRJZGVudGl0eVByb3ZpZGVyEicuYnl0ZWJhc2UudjEuR2V0SWRlbnRpdHlQcm92aWRlclJlcXVlc3QaHS5ieXRlYmFzZS52MS5JZGVudGl0eVByb3ZpZGVyIkDaQQRuYW1liuowGGJiLmlkZW50aXR5UHJvdmlkZXJzLmdldJDqMAGC0+STAhMSES92MS97bmFtZT1pZHBzLyp9EqkBChVMaXN0SWRlbnRpdHlQcm92aWRlcnMSKS5ieXRlYmFzZS52MS5MaXN0SWRlbnRpdHlQcm92aWRlcnNSZXF1ZXN0GiouYnl0ZWJhc2UudjEuTGlzdElkZW50aXR5UHJvdmlkZXJzUmVzcG9uc2UiOdpBAIDqMAGC0+STAixaIBIeL3YxL3twYXJlbnQ9d29ya3NwYWNlcy8qfS9pZHBzEggvdjEvaWRwcxKyAQoWQ3JlYXRlSWRlbnRpdHlQcm92aWRlchIqLmJ5dGViYXNlLnYxLkNyZWF0ZUlkZW50aXR5UHJvdmlkZXJSZXF1ZXN0Gh0uYnl0ZWJhc2UudjEuSWRlbnRpdHlQcm92aWRlciJN2kEAiuowG2JiLmlkZW50aXR5UHJvdmlkZXJzLmNyZWF0ZZDqMAGY6jABgtPkkwIdOhFpZGVudGl0eV9wcm92aWRlciIIL3YxL2lkcHMS6wEKFlVwZGF0ZUlkZW50aXR5UHJvdmlkZXISKi5ieXRlYmFzZS52MS5VcGRhdGVJZGVudGl0eVByb3ZpZGVyUmVxdWVzdBodLmJ5dGViYXNlLnYxLklkZW50aXR5UHJvdmlkZXIihQHaQR1pZGVudGl0eV9wcm92aWRlcix1cGRhdGVfbWFza4rqMBtiYi5pZGVudGl0eVByb3ZpZGVycy51cGRhdGWQ6jABmOowAYLT5JMCODoRaWRlbnRpdHlfcHJvdmlkZXIyIy92MS97aWRlbnRpdHlfcHJvdmlkZXIubmFtZT1pZHBzLyp9EqUBChZEZWxldGVJZGVudGl0eVByb3ZpZGVyEiouYnl0ZWJhc2UudjEuRGVsZXRlSWRlbnRpdHlQcm92aWRlclJlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkiR9pBBG5hbWWK6jAbYmIuaWRlbnRpdHlQcm92aWRlcnMuZGVsZXRlkOowAZjqMAGC0+STAhMqES92MS97bmFtZT1pZHBzLyp9EqoBChRUZXN0SWRlbnRpdHlQcm92aWRlchIoLmJ5dGViYXNlLnYxLlRlc3RJZGVudGl0eVByb3ZpZGVyUmVxdWVzdBopLmJ5dGViYXNlLnYxLlRlc3RJZGVudGl0eVByb3ZpZGVyUmVzcG9uc2UiPYrqMBtiYi5pZGVudGl0eVByb3ZpZGVycy51cGRhdGWQ6jABgtPkkwIUOgEqIg8vdjEvaWRwcy8qOnRlc3RCpQEKD2NvbS5ieXRlYmFzZS52MUIPSWRwU2VydmljZVByb3RvUAFaNGdpdGh1Yi5jb20vYnl0ZWJhc2UvYnl0ZWJhc2UvYmFja2VuZC9nZW5lcmF0ZWQtZ28vdjGiAgNCWFiqAgtCeXRlYmFzZS5WMcoCC0J5dGViYXNlXFYx4gIXQnl0ZWJhc2VcVjFcR1BCTWV0YWRhdGHqAgxCeXRlYmFzZTo6VjFiBnByb3RvMw", [file_buf_validate_validate, file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_empty, file_google_protobuf_field_mask, file_v1_annotation]);
/**
* Describes the message bytebase.v1.GetIdentityProviderRequest.
diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yaml
index 54a06b9fdb..f3f8376cc3 100644
--- a/proto/gen/grpc-doc/openapi.yaml
+++ b/proto/gen/grpc-doc/openapi.yaml
@@ -24,8 +24,26 @@ paths:
summary: GetActuatorInfo
description: |-
Gets system information and health status of the Bytebase instance.
+ When `name` is provided (or the workspace-scoped binding is used), the
+ response includes workspace-scoped fields for that workspace.
Permissions required: None
operationId: ActuatorService_GetActuatorInfo
+ parameters:
+ - name: name
+ in: query
+ description: |-
+ Optional. The workspace to scope the response to.
+ Format: workspaces/{workspace}
+ When unset, the workspace is resolved from the request context (self-hosted)
+ or no workspace-scoped fields are returned (SaaS).
+ schema:
+ type: string
+ title: name
+ description: |-
+ Optional. The workspace to scope the response to.
+ Format: workspaces/{workspace}
+ When unset, the workspace is resolved from the request context (self-hosted)
+ or no workspace-scoped fields are returned (SaaS).
responses:
"200":
description: Success
@@ -1162,6 +1180,20 @@ paths:
Lists all configured identity providers (public endpoint for login page).
Permissions required: None
operationId: IdentityProviderService_ListIdentityProviders
+ parameters:
+ - name: parent
+ in: query
+ description: |-
+ The parent workspace whose identity providers should be listed.
+ Format: workspaces/{workspace}
+ When unset, the workspace is resolved from the request context.
+ schema:
+ type: string
+ title: parent
+ description: |-
+ The parent workspace whose identity providers should be listed.
+ Format: workspaces/{workspace}
+ When unset, the workspace is resolved from the request context.
responses:
"200":
description: Success
@@ -15225,9 +15257,13 @@ paths:
get:
tags:
- ActuatorService
- summary: GetWorkspaceActuatorInfo
- description: Gets workspace-scoped actuator info. Requires authentication.
- operationId: ActuatorService_GetWorkspaceActuatorInfo
+ summary: GetActuatorInfo
+ description: |-
+ Gets system information and health status of the Bytebase instance.
+ When `name` is provided (or the workspace-scoped binding is used), the
+ response includes workspace-scoped fields for that workspace.
+ Permissions required: None
+ operationId: ActuatorService_GetActuatorInfo2
parameters:
- name: workspace
in: path
@@ -15393,6 +15429,29 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/bytebase.v1.ListDatabasesResponse'
+ /v1/workspaces/{workspace}/idps:
+ get:
+ tags:
+ - IdentityProviderService
+ summary: ListIdentityProviders
+ description: |-
+ Lists all configured identity providers (public endpoint for login page).
+ Permissions required: None
+ operationId: IdentityProviderService_ListIdentityProviders2
+ parameters:
+ - name: workspace
+ in: path
+ description: The workspace id.
+ required: true
+ schema:
+ type: string
+ responses:
+ "200":
+ description: Success
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/bytebase.v1.ListIdentityProvidersResponse'
/v1/workspaces/{workspace}/policies:
get:
tags:
@@ -20291,6 +20350,15 @@ components:
additionalProperties: false
bytebase.v1.GetActuatorInfoRequest:
type: object
+ properties:
+ name:
+ type: string
+ title: name
+ description: |-
+ Optional. The workspace to scope the response to.
+ Format: workspaces/{workspace}
+ When unset, the workspace is resolved from the request context (self-hosted)
+ or no workspace-scoped fields are returned (SaaS).
title: GetActuatorInfoRequest
additionalProperties: false
description: Request message for getting actuator information.
@@ -20805,18 +20873,6 @@ components:
required:
- name
additionalProperties: false
- bytebase.v1.GetWorkspaceActuatorInfoRequest:
- type: object
- properties:
- name:
- type: string
- title: name
- description: 'The workspace name, format: workspaces/{workspace}.'
- title: GetWorkspaceActuatorInfoRequest
- required:
- - name
- additionalProperties: false
- description: Request message for getting workspace-scoped actuator information.
bytebase.v1.GetWorkspaceRequest:
type: object
properties:
@@ -22030,6 +22086,14 @@ components:
description: Response message for listing groups.
bytebase.v1.ListIdentityProvidersRequest:
type: object
+ properties:
+ parent:
+ type: string
+ title: parent
+ description: |-
+ The parent workspace whose identity providers should be listed.
+ Format: workspaces/{workspace}
+ When unset, the workspace is resolved from the request context.
title: ListIdentityProvidersRequest
additionalProperties: false
bytebase.v1.ListIdentityProvidersResponse:
diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.md
index 6f82561471..feded79a02 100644
--- a/proto/gen/grpc-doc/v1/README.md
+++ b/proto/gen/grpc-doc/v1/README.md
@@ -126,7 +126,6 @@
- [ActuatorInfo](#bytebase-v1-ActuatorInfo)
- [DeleteCacheRequest](#bytebase-v1-DeleteCacheRequest)
- [GetActuatorInfoRequest](#bytebase-v1-GetActuatorInfoRequest)
- - [GetWorkspaceActuatorInfoRequest](#bytebase-v1-GetWorkspaceActuatorInfoRequest)
- [Restriction](#bytebase-v1-Restriction)
- [SetupSampleRequest](#bytebase-v1-SetupSampleRequest)
@@ -2606,19 +2605,9 @@ Request message for deleting cache.
Request message for getting actuator information.
-
-
-
-
-<a name="bytebase-v1-GetWorkspaceActuatorInfoRequest"></a>
-
-### GetWorkspaceActuatorInfoRequest
-Request message for getting workspace-scoped actuator information.
-
-
| Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- |
-| name | [string](#string) | | The workspace name, format: workspaces/{workspace}. |
+| name | [string](#string) | | Optional. The workspace to scope the response to. Format: workspaces/{workspace} When unset, the workspace is resolved from the request context (self-hosted) or no workspace-scoped fields are returned (SaaS). |
@@ -2665,10 +2654,9 @@ ActuatorService manages system health and operational information.
| Method Name | Request Type | Response Type | Description |
| ----------- | ------------ | ------------- | ------------|
-| GetActuatorInfo | [GetActuatorInfoRequest](#bytebase-v1-GetActuatorInfoRequest) | [ActuatorInfo](#bytebase-v1-ActuatorInfo) | Gets system information and health status of the Bytebase instance. Permissions required: None |
+| GetActuatorInfo | [GetActuatorInfoRequest](#bytebase-v1-GetActuatorInfoRequest) | [ActuatorInfo](#bytebase-v1-ActuatorInfo) | Gets system information and health status of the Bytebase instance. When `name` is provided (or the workspace-scoped binding is used), the response includes workspace-scoped fields for that workspace. Permissions required: None |
| SetupSample | [SetupSampleRequest](#bytebase-v1-SetupSampleRequest) | [.google.protobuf.Empty](#google-protobuf-Empty) | Sets up sample data for demonstration and testing purposes. Permissions required: bb.projects.create |
| DeleteCache | [DeleteCacheRequest](#bytebase-v1-DeleteCacheRequest) | [.google.protobuf.Empty](#google-protobuf-Empty) | Clears the system cache to force data refresh. Permissions required: None |
-| GetWorkspaceActuatorInfo | [GetWorkspaceActuatorInfoRequest](#bytebase-v1-GetWorkspaceActuatorInfoRequest) | [ActuatorInfo](#bytebase-v1-ActuatorInfo) | Gets workspace-scoped actuator info. Requires authentication. |
@@ -6571,6 +6559,11 @@ LDAPIdentityProviderConfig is the structure for LDAP identity provider config.
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| parent | [string](#string) | | The parent workspace whose identity providers should be listed. Format: workspaces/{workspace} When unset, the workspace is resolved from the request context. |
+
+
diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.html
index f23ebf3d79..85c3a67dbb 100644
--- a/proto/gen/grpc-doc/v1/index.html
+++ b/proto/gen/grpc-doc/v1/index.html
@@ -649,10 +649,6 @@
<a href="#bytebase.v1.GetActuatorInfoRequest"><span class="badge">M</span>GetActuatorInfoRequest</a>
</li>
- <li>
- <a href="#bytebase.v1.GetWorkspaceActuatorInfoRequest"><span class="badge">M</span>GetWorkspaceActuatorInfoRequest</a>
- </li>
-
<li>
<a href="#bytebase.v1.Restriction"><span class="badge">M</span>Restriction</a>
</li>
@@ -8028,13 +8024,6 @@ Format: projects/{id} </p></td>
<p>Request message for getting actuator information.</p>
-
-
-
- <h3 id="bytebase.v1.GetWorkspaceActuatorInfoRequest">GetWorkspaceActuatorInfoRequest</h3>
- <p>Request message for getting workspace-scoped actuator information.</p>
-
-
<table class="field-table">
<thead>
<tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
@@ -8045,7 +8034,10 @@ Format: projects/{id} </p></td>
<td>name</td>
<td><a href="#string">string</a></td>
<td></td>
- <td><p>The workspace name, format: workspaces/{workspace}. </p></td>
+ <td><p>Optional. The workspace to scope the response to.
+Format: workspaces/{workspace}
+When unset, the workspace is resolved from the request context (self-hosted)
+or no workspace-scoped fields are returned (SaaS). </p></td>
</tr>
</tbody>
@@ -8119,6 +8111,8 @@ Format: projects/{id} </p></td>
<td><a href="#bytebase.v1.GetActuatorInfoRequest">GetActuatorInfoRequest</a></td>
<td><a href="#bytebase.v1.ActuatorInfo">ActuatorInfo</a></td>
<td><p>Gets system information and health status of the Bytebase instance.
+When `name` is provided (or the workspace-scoped binding is used), the
+response includes workspace-scoped fields for that workspace.
Permissions required: None</p></td>
</tr>
@@ -8138,13 +8132,6 @@ Permissions required: bb.projects.create</p></td>
Permissions required: None</p></td>
</tr>
- <tr>
- <td>GetWorkspaceActuatorInfo</td>
- <td><a href="#bytebase.v1.GetWorkspaceActuatorInfoRequest">GetWorkspaceActuatorInfoRequest</a></td>
- <td><a href="#bytebase.v1.ActuatorInfo">ActuatorInfo</a></td>
- <td><p>Gets workspace-scoped actuator info. Requires authentication.</p></td>
- </tr>
-
</tbody>
</table>
@@ -8172,6 +8159,13 @@ Permissions required: None</p></td>
<td></td>
</tr>
+ <tr>
+ <td>GetActuatorInfo</td>
+ <td>GET</td>
+ <td>/v1/{name=workspaces/*}/actuator/info</td>
+ <td></td>
+ </tr>
+
@@ -8193,16 +8187,6 @@ Permissions required: None</p></td>
</tr>
-
-
- <tr>
- <td>GetWorkspaceActuatorInfo</td>
- <td>GET</td>
- <td>/v1/{name=workspaces/*}/actuator/info</td>
- <td></td>
- </tr>
-
-
</tbody>
</table>
@@ -18858,6 +18842,25 @@ server. </p></td>
<p></p>
+ <table class="field-table">
+ <thead>
+ <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+ </thead>
+ <tbody>
+
+ <tr>
+ <td>parent</td>
+ <td><a href="#string">string</a></td>
+ <td></td>
+ <td><p>The parent workspace whose identity providers should be listed.
+Format: workspaces/{workspace}
+When unset, the workspace is resolved from the request context. </p></td>
+ </tr>
+
+ </tbody>
+ </table>
+
+
@@ -19456,6 +19459,13 @@ Permissions required: bb.identityProviders.update</p></td>
<td></td>
</tr>
+ <tr>
+ <td>ListIdentityProviders</td>
+ <td>GET</td>
+ <td>/v1/{parent=workspaces/*}/idps</td>
+ <td></td>
+ </tr>
+
diff --git a/proto/v1/v1/actuator_service.proto b/proto/v1/v1/actuator_service.proto
index 88fc32f287..6ccb125393 100644
--- a/proto/v1/v1/actuator_service.proto
+++ b/proto/v1/v1/actuator_service.proto
@@ -16,9 +16,14 @@ option go_package = "github.com/bytebase/bytebase/backend/generated-go/v1";
// ActuatorService manages system health and operational information.
service ActuatorService {
// Gets system information and health status of the Bytebase instance.
+ // When `name` is provided (or the workspace-scoped binding is used), the
+ // response includes workspace-scoped fields for that workspace.
// Permissions required: None
rpc GetActuatorInfo(GetActuatorInfoRequest) returns (ActuatorInfo) {
- option (google.api.http) = {get: "/v1/actuator/info"};
+ option (google.api.http) = {
+ get: "/v1/actuator/info"
+ additional_bindings: {get: "/v1/{name=workspaces/*}/actuator/info"}
+ };
option (google.api.method_signature) = "";
option (bytebase.v1.allow_without_credential) = true;
}
@@ -40,29 +45,18 @@ service ActuatorService {
option (google.api.http) = {delete: "/v1/actuator/cache"};
option (bytebase.v1.allow_without_credential) = true;
}
-
- // Gets workspace-scoped actuator info. Requires authentication.
- rpc GetWorkspaceActuatorInfo(GetWorkspaceActuatorInfoRequest) returns (ActuatorInfo) {
- option (google.api.http) = {get: "/v1/{name=workspaces/*}/actuator/info"};
- option (google.api.method_signature) = "name";
- option (bytebase.v1.permission) = "bb.settings.getWorkspaceProfile";
- option (bytebase.v1.auth_method) = IAM;
- }
}
// Request message for setting up sample data.
message SetupSampleRequest {}
// Request message for getting actuator information.
-message GetActuatorInfoRequest {}
-
-// Request message for getting workspace-scoped actuator information.
-message GetWorkspaceActuatorInfoRequest {
- // The workspace name, format: workspaces/{workspace}.
- string name = 1 [
- (google.api.field_behavior) = REQUIRED,
- (google.api.resource_reference) = {type: "bytebase.com/Workspace"}
- ];
+message GetActuatorInfoRequest {
+ // Optional. The workspace to scope the response to.
+ // Format: workspaces/{workspace}
+ // When unset, the workspace is resolved from the request context (self-hosted)
+ // or no workspace-scoped fields are returned (SaaS).
+ string name = 1 [(google.api.resource_reference) = {type: "bytebase.com/Workspace"}];
}
// Request message for deleting cache.
diff --git a/proto/v1/v1/idp_service.proto b/proto/v1/v1/idp_service.proto
index f61401a41f..1c7fd9a58a 100644
--- a/proto/v1/v1/idp_service.proto
+++ b/proto/v1/v1/idp_service.proto
@@ -27,7 +27,10 @@ service IdentityProviderService {
// Lists all configured identity providers (public endpoint for login page).
// Permissions required: None
rpc ListIdentityProviders(ListIdentityProvidersRequest) returns (ListIdentityProvidersResponse) {
- option (google.api.http) = {get: "/v1/idps"};
+ option (google.api.http) = {
+ get: "/v1/idps"
+ additional_bindings: {get: "/v1/{parent=workspaces/*}/idps"}
+ };
option (google.api.method_signature) = "";
option (bytebase.v1.allow_without_credential) = true;
// The method requires no authentication thus no authorization.
@@ -91,7 +94,12 @@ message GetIdentityProviderRequest {
];
}
-message ListIdentityProvidersRequest {}
+message ListIdentityProvidersRequest {
+ // The parent workspace whose identity providers should be listed.
+ // Format: workspaces/{workspace}
+ // When unset, the workspace is resolved from the request context.
+ string parent = 1 [(google.api.resource_reference) = {type: "bytebase.com/Workspace"}];
+}
message ListIdentityProvidersResponse {
// The identity providers from the specified request.