Skip to content

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

refactor(iam/ha): move debug to workspace profile setting (#18823)

ecmadaob24cc81286bf
diff --git a/backend/api/mcp/gen/openapi.yaml b/backend/api/mcp/gen/openapi.yaml
index db0a2e623b..35a5aaf8c3 100644
--- a/backend/api/mcp/gen/openapi.yaml
+++ b/backend/api/mcp/gen/openapi.yaml
@@ -153,44 +153,6 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/google.protobuf.Empty'
- /bytebase.v1.ActuatorService/UpdateActuatorInfo:
- post:
- tags:
- - bytebase.v1.ActuatorService
- summary: 'Updates system configuration settings for the Bytebase instance. Permissions required: bb.settings.set'
- description: |-
- Updates system configuration settings for the Bytebase instance.
- Permissions required: bb.settings.set
- operationId: bytebase.v1.ActuatorService.UpdateActuatorInfo
- 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.UpdateActuatorInfoRequest'
- 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.AuditLogService/ExportAuditLogs:
post:
tags:
@@ -6344,10 +6306,6 @@ components:
type: string
title: workspace_id
description: The unique identifier for the workspace.
- debug:
- type: boolean
- title: debug
- description: Whether debug mode is enabled.
unlicensedFeatures:
type: array
items:
@@ -16636,26 +16594,6 @@ components:
Format: users/{email}
title: UndeleteUserRequest
additionalProperties: false
- bytebase.v1.UpdateActuatorInfoRequest:
- type: object
- properties:
- actuator:
- title: actuator
- description: The actuator to update.
- $ref: '#/components/schemas/bytebase.v1.ActuatorInfo'
- updateMask:
- title: update_mask
- description: The list of fields to update.
- $ref: '#/components/schemas/google.protobuf.FieldMask'
- allowMissing:
- type: boolean
- title: allow_missing
- description: |-
- If set to true, and the actuator is not found, a new actuator will be created.
- In this situation, `update_mask` is ignored.
- title: UpdateActuatorInfoRequest
- additionalProperties: false
- description: Request message for updating actuator information.
bytebase.v1.UpdateDataSourceRequest:
type: object
properties:
@@ -17587,10 +17525,6 @@ components:
title: refresh_token_duration
description: The duration for refresh token. Default is 7 days.
$ref: '#/components/schemas/google.protobuf.Duration'
- accessTokenDuration:
- title: access_token_duration
- description: The duration for access token. Default is 1 hour.
- $ref: '#/components/schemas/google.protobuf.Duration'
announcement:
title: announcement
description: The setting of custom announcement
@@ -17649,6 +17583,14 @@ components:
title: password_restriction
description: Password restriction settings.
$ref: '#/components/schemas/bytebase.v1.WorkspaceProfileSetting.PasswordRestriction'
+ accessTokenDuration:
+ title: access_token_duration
+ description: The duration for access token. Default is 1 hour.
+ $ref: '#/components/schemas/google.protobuf.Duration'
+ enableDebug:
+ type: boolean
+ title: enable_debug
+ description: Whether debug mode is enabled.
title: WorkspaceProfileSetting
additionalProperties: false
bytebase.v1.WorkspaceProfileSetting.PasswordRestriction:
diff --git a/backend/api/v1/actuator_service.go b/backend/api/v1/actuator_service.go
index c6fbc2e53a..63254d37db 100644
--- a/backend/api/v1/actuator_service.go
+++ b/backend/api/v1/actuator_service.go
@@ -61,32 +61,6 @@ func (s *ActuatorService) GetActuatorInfo(
return connect.NewResponse(info), nil
}
-// UpdateActuatorInfo updates the actuator info.
-func (s *ActuatorService) UpdateActuatorInfo(
- ctx context.Context,
- req *connect.Request[v1pb.UpdateActuatorInfoRequest],
-) (*connect.Response[v1pb.ActuatorInfo], error) {
- request := req.Msg
- for _, path := range request.UpdateMask.Paths {
- if path == "debug" {
- debug := request.GetActuator().GetDebug()
-
- s.profile.RuntimeDebug.Store(debug)
- level := slog.LevelInfo
- if debug {
- level = slog.LevelDebug
- }
- log.LogLevel.Set(level)
- }
- }
-
- info, err := s.getServerInfo(ctx)
- if err != nil {
- return nil, err
- }
- return connect.NewResponse(info), nil
-}
-
// DeleteCache deletes the cache.
func (s *ActuatorService) DeleteCache(
_ context.Context,
@@ -175,7 +149,6 @@ func (s *ActuatorService) getServerInfo(ctx context.Context) (*v1pb.ActuatorInfo
ExternalUrl: externalURL,
LastActiveTime: timestamppb.New(time.Unix(s.profile.LastActiveTS.Load(), 0)),
WorkspaceId: workspaceID,
- Debug: s.profile.RuntimeDebug.Load(),
Docker: s.profile.IsDocker,
UnlicensedFeatures: unlicensedFeaturesString,
EnableSample: hasSampleInstances,
diff --git a/backend/api/v1/setting_service.go b/backend/api/v1/setting_service.go
index 828c66dc7f..eb78571df2 100644
--- a/backend/api/v1/setting_service.go
+++ b/backend/api/v1/setting_service.go
@@ -205,6 +205,13 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Req
for _, path := range request.Msg.UpdateMask.Paths {
switch path {
+ case "value.workspace_profile.enable_debug":
+ oldSetting.EnableDebug = payload.EnableDebug
+ level := slog.LevelInfo
+ if payload.EnableDebug {
+ level = slog.LevelDebug
+ }
+ log.LogLevel.Set(level)
case "value.workspace_profile.disallow_signup":
if s.profile.SaaS {
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("feature %s is unavailable in current mode", settingName))
diff --git a/backend/api/v1/setting_service_converter.go b/backend/api/v1/setting_service_converter.go
index 0102ef2b82..32c5e783bb 100644
--- a/backend/api/v1/setting_service_converter.go
+++ b/backend/api/v1/setting_service_converter.go
@@ -253,6 +253,7 @@ func convertWorkspaceProfileSetting(v1Setting *v1pb.WorkspaceProfileSetting) *st
DirectorySyncToken: v1Setting.DirectorySyncToken,
BrandingLogo: v1Setting.BrandingLogo,
PasswordRestriction: convertPasswordRestrictionSetting(v1Setting.PasswordRestriction),
+ EnableDebug: v1Setting.EnableDebug,
}
// Convert announcement if present
@@ -305,7 +306,7 @@ func convertToWorkspaceProfileSetting(storeSetting *storepb.WorkspaceProfileSett
return nil
}
- v1Setting := &v1pb.WorkspaceProfileSetting{
+ return &v1pb.WorkspaceProfileSetting{
ExternalUrl: storeSetting.ExternalUrl,
DisallowSignup: storeSetting.DisallowSignup,
Require_2Fa: storeSetting.Require_2Fa,
@@ -324,9 +325,8 @@ func convertToWorkspaceProfileSetting(storeSetting *storepb.WorkspaceProfileSett
BrandingLogo: storeSetting.BrandingLogo,
PasswordRestriction: convertToPasswordRestrictionSetting(storeSetting.PasswordRestriction),
Announcement: convertToV1Announcement(storeSetting.Announcement),
+ EnableDebug: storeSetting.EnableDebug,
}
-
- return v1Setting
}
func convertApprovalFlow(v1Flow *v1pb.ApprovalFlow) *storepb.ApprovalFlow {
diff --git a/backend/bin/server/cmd/profile.go b/backend/bin/server/cmd/profile.go
index a027f6278b..bac784140a 100644
--- a/backend/bin/server/cmd/profile.go
+++ b/backend/bin/server/cmd/profile.go
@@ -27,7 +27,6 @@ func getBaseProfile(dataDir string) *config.Profile {
}
config.LastActiveTS.Store(time.Now().Unix())
- config.RuntimeDebug.Store(flags.debug)
config.RuntimeMemoryProfileThreshold.Store(flags.memoryProfileThreshold)
return config
}
diff --git a/backend/bin/server/cmd/root.go b/backend/bin/server/cmd/root.go
index d4113dedc2..da84d35723 100644
--- a/backend/bin/server/cmd/root.go
+++ b/backend/bin/server/cmd/root.go
@@ -67,8 +67,7 @@ var (
// output logs in json format
enableJSONLogging bool
// demo mode.
- demo bool
- debug bool
+ demo bool
// memoryProfileThreshold is the threshold of memory usage in bytes to trigger a memory profile.
memoryProfileThreshold uint64
}
@@ -112,7 +111,6 @@ func init() {
rootCmd.PersistentFlags().BoolVar(&flags.enableJSONLogging, "enable-json-logging", false, "enable output logs in bytebase in json format")
// Must be one of the subpath name in the ../migrator/demo directory
rootCmd.PersistentFlags().BoolVar(&flags.demo, "demo", false, "run in demo mode.")
- rootCmd.PersistentFlags().BoolVar(&flags.debug, "debug", false, "whether to enable debug level logging")
rootCmd.PersistentFlags().Uint64Var(&flags.memoryProfileThreshold, "memory-profile-threshold", 0, "the threshold of memory usage in bytes to trigger a memory profile")
}
@@ -148,9 +146,6 @@ func checkPort(port int) error {
}
func start() {
- if flags.debug {
- log.LogLevel.Set(slog.LevelDebug)
- }
if flags.saas || flags.enableJSONLogging {
slog.SetDefault(slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{AddSource: true, Level: log.LogLevel, ReplaceAttr: log.Replace})))
} else {
diff --git a/backend/generated-go/store/setting.pb.go b/backend/generated-go/store/setting.pb.go
index 87a3f3755f..ef16d90f9f 100644
--- a/backend/generated-go/store/setting.pb.go
+++ b/backend/generated-go/store/setting.pb.go
@@ -428,8 +428,6 @@ type WorkspaceProfileSetting struct {
Require_2Fa bool `protobuf:"varint,3,opt,name=require_2fa,json=require2fa,proto3" json:"require_2fa,omitempty"`
// The duration for refresh token. Default is 7 days.
RefreshTokenDuration *durationpb.Duration `protobuf:"bytes,4,opt,name=refresh_token_duration,json=refreshTokenDuration,proto3" json:"refresh_token_duration,omitempty"`
- // The duration for access token. Default is 1 hour.
- AccessTokenDuration *durationpb.Duration `protobuf:"bytes,18,opt,name=access_token_duration,json=accessTokenDuration,proto3" json:"access_token_duration,omitempty"`
// The setting of custom announcement
Announcement *WorkspaceProfileSetting_Announcement `protobuf:"bytes,5,opt,name=announcement,proto3" json:"announcement,omitempty"`
// The max duration for role expired.
@@ -458,8 +456,12 @@ type WorkspaceProfileSetting struct {
BrandingLogo string `protobuf:"bytes,16,opt,name=branding_logo,json=brandingLogo,proto3" json:"branding_logo,omitempty"`
// Password restriction settings.
PasswordRestriction *WorkspaceProfileSetting_PasswordRestriction `protobuf:"bytes,17,opt,name=password_restriction,json=passwordRestriction,proto3" json:"password_restriction,omitempty"`
- unknownFields protoimpl.UnknownFields
- sizeCache protoimpl.SizeCache
+ // The duration for access token. Default is 1 hour.
+ AccessTokenDuration *durationpb.Duration `protobuf:"bytes,18,opt,name=access_token_duration,json=accessTokenDuration,proto3" json:"access_token_duration,omitempty"`
+ // Whether debug mode is enabled.
+ EnableDebug bool `protobuf:"varint,19,opt,name=enable_debug,json=enableDebug,proto3" json:"enable_debug,omitempty"`
+ unknownFields protoimpl.UnknownFields
+ sizeCache protoimpl.SizeCache
}
func (x *WorkspaceProfileSetting) Reset() {
@@ -520,13 +522,6 @@ func (x *WorkspaceProfileSetting) GetRefreshTokenDuration() *durationpb.Duration
return nil
}
-func (x *WorkspaceProfileSetting) GetAccessTokenDuration() *durationpb.Duration {
- if x != nil {
- return x.AccessTokenDuration
- }
- return nil
-}
-
func (x *WorkspaceProfileSetting) GetAnnouncement() *WorkspaceProfileSetting_Announcement {
if x != nil {
return x.Announcement
@@ -618,6 +613,20 @@ func (x *WorkspaceProfileSetting) GetPasswordRestriction() *WorkspaceProfileSett
return nil
}
+func (x *WorkspaceProfileSetting) GetAccessTokenDuration() *durationpb.Duration {
+ if x != nil {
+ return x.AccessTokenDuration
+ }
+ return nil
+}
+
+func (x *WorkspaceProfileSetting) GetEnableDebug() bool {
+ if x != nil {
+ return x.EnableDebug
+ }
+ return false
+}
+
type WorkspaceApprovalSetting struct {
state protoimpl.MessageState `protogen:"open.v1"`
Rules []*WorkspaceApprovalSetting_Rule `protobuf:"bytes,1,rep,name=rules,proto3" json:"rules,omitempty"`
@@ -2386,14 +2395,13 @@ const file_store_setting_proto_rawDesc = "" +
"\vauth_secret\x18\x01 \x01(\tR\n" +
"authSecret\x12!\n" +
"\fworkspace_id\x18\x02 \x01(\tR\vworkspaceId\x12\x18\n" +
- "\alicense\x18\x03 \x01(\tR\alicense\"\xc4\x0e\n" +
+ "\alicense\x18\x03 \x01(\tR\alicense\"\xe7\x0e\n" +
"\x17WorkspaceProfileSetting\x12!\n" +
"\fexternal_url\x18\x01 \x01(\tR\vexternalUrl\x12'\n" +
"\x0fdisallow_signup\x18\x02 \x01(\bR\x0edisallowSignup\x12\x1f\n" +
"\vrequire_2fa\x18\x03 \x01(\bR\n" +
"require2fa\x12O\n" +
- "\x16refresh_token_duration\x18\x04 \x01(\v2\x19.google.protobuf.DurationR\x14refreshTokenDuration\x12M\n" +
- "\x15access_token_duration\x18\x12 \x01(\v2\x19.google.protobuf.DurationR\x13accessTokenDuration\x12X\n" +
+ "\x16refresh_token_duration\x18\x04 \x01(\v2\x19.google.protobuf.DurationR\x14refreshTokenDuration\x12X\n" +
"\fannouncement\x18\x05 \x01(\v24.bytebase.store.WorkspaceProfileSetting.AnnouncementR\fannouncement\x12Q\n" +
"\x17maximum_role_expiration\x18\x06 \x01(\v2\x19.google.protobuf.DurationR\x15maximumRoleExpiration\x12\x18\n" +
"\adomains\x18\a \x03(\tR\adomains\x126\n" +
@@ -2407,7 +2415,9 @@ const file_store_setting_proto_rawDesc = "" +
"\twatermark\x18\x0e \x01(\bR\twatermark\x120\n" +
"\x14directory_sync_token\x18\x0f \x01(\tR\x12directorySyncToken\x12#\n" +
"\rbranding_logo\x18\x10 \x01(\tR\fbrandingLogo\x12n\n" +
- "\x14password_restriction\x18\x11 \x01(\v2;.bytebase.store.WorkspaceProfileSetting.PasswordRestrictionR\x13passwordRestriction\x1a\xdd\x01\n" +
+ "\x14password_restriction\x18\x11 \x01(\v2;.bytebase.store.WorkspaceProfileSetting.PasswordRestrictionR\x13passwordRestriction\x12M\n" +
+ "\x15access_token_duration\x18\x12 \x01(\v2\x19.google.protobuf.DurationR\x13accessTokenDuration\x12!\n" +
+ "\fenable_debug\x18\x13 \x01(\bR\venableDebug\x1a\xdd\x01\n" +
"\fAnnouncement\x12U\n" +
"\x05level\x18\x01 \x01(\x0e2?.bytebase.store.WorkspaceProfileSetting.Announcement.AlertLevelR\x05level\x12\x12\n" +
"\x04text\x18\x02 \x01(\tR\x04text\x12\x12\n" +
@@ -2633,12 +2643,12 @@ var file_store_setting_proto_goTypes = []any{
}
var file_store_setting_proto_depIdxs = []int32{
37, // 0: bytebase.store.WorkspaceProfileSetting.refresh_token_duration:type_name -> google.protobuf.Duration
- 37, // 1: bytebase.store.WorkspaceProfileSetting.access_token_duration:type_name -> google.protobuf.Duration
- 15, // 2: bytebase.store.WorkspaceProfileSetting.announcement:type_name -> bytebase.store.WorkspaceProfileSetting.Announcement
- 37, // 3: bytebase.store.WorkspaceProfileSetting.maximum_role_expiration:type_name -> google.protobuf.Duration
- 1, // 4: bytebase.store.WorkspaceProfileSetting.database_change_mode:type_name -> bytebase.store.WorkspaceProfileSetting.DatabaseChangeMode
- 37, // 5: bytebase.store.WorkspaceProfileSetting.inactive_session_timeout:type_name -> google.protobuf.Duration
- 16, // 6: bytebase.store.WorkspaceProfileSetting.password_restriction:type_name -> bytebase.store.WorkspaceProfileSetting.PasswordRestriction
+ 15, // 1: bytebase.store.WorkspaceProfileSetting.announcement:type_name -> bytebase.store.WorkspaceProfileSetting.Announcement
+ 37, // 2: bytebase.store.WorkspaceProfileSetting.maximum_role_expiration:type_name -> google.protobuf.Duration
+ 1, // 3: bytebase.store.WorkspaceProfileSetting.database_change_mode:type_name -> bytebase.store.WorkspaceProfileSetting.DatabaseChangeMode
+ 37, // 4: bytebase.store.WorkspaceProfileSetting.inactive_session_timeout:type_name -> google.protobuf.Duration
+ 16, // 5: bytebase.store.WorkspaceProfileSetting.password_restriction:type_name -> bytebase.store.WorkspaceProfileSetting.PasswordRestriction
+ 37, // 6: bytebase.store.WorkspaceProfileSetting.access_token_duration:type_name -> google.protobuf.Duration
17, // 7: bytebase.store.WorkspaceApprovalSetting.rules:type_name -> bytebase.store.WorkspaceApprovalSetting.Rule
18, // 8: bytebase.store.DataClassificationSetting.configs:type_name -> bytebase.store.DataClassificationSetting.DataClassificationConfig
22, // 9: bytebase.store.Algorithm.full_mask:type_name -> bytebase.store.Algorithm.FullMask
diff --git a/backend/generated-go/store/setting_equal.pb.go b/backend/generated-go/store/setting_equal.pb.go
index c55285c5c4..3d0e346c9a 100644
--- a/backend/generated-go/store/setting_equal.pb.go
+++ b/backend/generated-go/store/setting_equal.pb.go
@@ -96,9 +96,6 @@ func (x *WorkspaceProfileSetting) Equal(y *WorkspaceProfileSetting) bool {
if p, q := x.RefreshTokenDuration, y.RefreshTokenDuration; (p == nil && q != nil) || (p != nil && (q == nil || p.Seconds != q.Seconds || p.Nanos != q.Nanos)) {
return false
}
- if p, q := x.AccessTokenDuration, y.AccessTokenDuration; (p == nil && q != nil) || (p != nil && (q == nil || p.Seconds != q.Seconds || p.Nanos != q.Nanos)) {
- return false
- }
if !x.Announcement.Equal(y.Announcement) {
return false
}
@@ -143,6 +140,12 @@ func (x *WorkspaceProfileSetting) Equal(y *WorkspaceProfileSetting) bool {
if !x.PasswordRestriction.Equal(y.PasswordRestriction) {
return false
}
+ if p, q := x.AccessTokenDuration, y.AccessTokenDuration; (p == nil && q != nil) || (p != nil && (q == nil || p.Seconds != q.Seconds || p.Nanos != q.Nanos)) {
+ return false
+ }
+ if x.EnableDebug != y.EnableDebug {
+ return false
+ }
return true
}
diff --git a/backend/generated-go/v1/actuator_service.pb.go b/backend/generated-go/v1/actuator_service.pb.go
index 51a2fdc19e..73dc9633fb 100644
--- a/backend/generated-go/v1/actuator_service.pb.go
+++ b/backend/generated-go/v1/actuator_service.pb.go
@@ -11,7 +11,6 @@ import (
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
emptypb "google.golang.org/protobuf/types/known/emptypb"
- fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
timestamppb "google.golang.org/protobuf/types/known/timestamppb"
reflect "reflect"
sync "sync"
@@ -182,71 +181,6 @@ func (*GetActuatorInfoRequest) Descriptor() ([]byte, []int) {
return file_v1_actuator_service_proto_rawDescGZIP(), []int{3}
}
-// Request message for updating actuator information.
-type UpdateActuatorInfoRequest struct {
- state protoimpl.MessageState `protogen:"open.v1"`
- // The actuator to update.
- Actuator *ActuatorInfo `protobuf:"bytes,1,opt,name=actuator,proto3" json:"actuator,omitempty"`
- // The list of fields to update.
- UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
- // If set to true, and the actuator is not found, a new actuator will be created.
- // In this situation, `update_mask` is ignored.
- AllowMissing bool `protobuf:"varint,3,opt,name=allow_missing,json=allowMissing,proto3" json:"allow_missing,omitempty"`
- unknownFields protoimpl.UnknownFields
- sizeCache protoimpl.SizeCache
-}
-
-func (x *UpdateActuatorInfoRequest) Reset() {
- *x = UpdateActuatorInfoRequest{}
- mi := &file_v1_actuator_service_proto_msgTypes[4]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
-}
-
-func (x *UpdateActuatorInfoRequest) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*UpdateActuatorInfoRequest) ProtoMessage() {}
-
-func (x *UpdateActuatorInfoRequest) ProtoReflect() protoreflect.Message {
- mi := &file_v1_actuator_service_proto_msgTypes[4]
- 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 UpdateActuatorInfoRequest.ProtoReflect.Descriptor instead.
-func (*UpdateActuatorInfoRequest) Descriptor() ([]byte, []int) {
- return file_v1_actuator_service_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *UpdateActuatorInfoRequest) GetActuator() *ActuatorInfo {
- if x != nil {
- return x.Actuator
- }
- return nil
-}
-
-func (x *UpdateActuatorInfoRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
- if x != nil {
- return x.UpdateMask
- }
- return nil
-}
-
-func (x *UpdateActuatorInfoRequest) GetAllowMissing() bool {
- if x != nil {
- return x.AllowMissing
- }
- return false
-}
-
// Request message for deleting cache.
type DeleteCacheRequest struct {
state protoimpl.MessageState `protogen:"open.v1"`
@@ -256,7 +190,7 @@ type DeleteCacheRequest struct {
func (x *DeleteCacheRequest) Reset() {
*x = DeleteCacheRequest{}
- 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)
}
@@ -268,7 +202,7 @@ func (x *DeleteCacheRequest) String() string {
func (*DeleteCacheRequest) ProtoMessage() {}
func (x *DeleteCacheRequest) 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 {
@@ -281,7 +215,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{5}
+ return file_v1_actuator_service_proto_rawDescGZIP(), []int{4}
}
// System information and configuration for the Bytebase instance.
@@ -310,8 +244,6 @@ type ActuatorInfo struct {
LastActiveTime *timestamppb.Timestamp `protobuf:"bytes,11,opt,name=last_active_time,json=lastActiveTime,proto3" json:"last_active_time,omitempty"`
// The unique identifier for the workspace.
WorkspaceId string `protobuf:"bytes,13,opt,name=workspace_id,json=workspaceId,proto3" json:"workspace_id,omitempty"`
- // Whether debug mode is enabled.
- Debug bool `protobuf:"varint,14,opt,name=debug,proto3" json:"debug,omitempty"`
// List of features that are not licensed.
UnlicensedFeatures []string `protobuf:"bytes,15,rep,name=unlicensed_features,json=unlicensedFeatures,proto3" json:"unlicensed_features,omitempty"`
// Whether the Bytebase instance is running in Docker.
@@ -332,7 +264,7 @@ type ActuatorInfo struct {
func (x *ActuatorInfo) Reset() {
*x = ActuatorInfo{}
- mi := &file_v1_actuator_service_proto_msgTypes[6]
+ mi := &file_v1_actuator_service_proto_msgTypes[5]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -344,7 +276,7 @@ func (x *ActuatorInfo) String() string {
func (*ActuatorInfo) ProtoMessage() {}
func (x *ActuatorInfo) ProtoReflect() protoreflect.Message {
- mi := &file_v1_actuator_service_proto_msgTypes[6]
+ mi := &file_v1_actuator_service_proto_msgTypes[5]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -357,7 +289,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{6}
+ return file_v1_actuator_service_proto_rawDescGZIP(), []int{5}
}
func (x *ActuatorInfo) GetVersion() string {
@@ -437,13 +369,6 @@ func (x *ActuatorInfo) GetWorkspaceId() string {
return ""
}
-func (x *ActuatorInfo) GetDebug() bool {
- if x != nil {
- return x.Debug
- }
- return false
-}
-
func (x *ActuatorInfo) GetUnlicensedFeatures() []string {
if x != nil {
return x.UnlicensedFeatures
@@ -508,7 +433,7 @@ type ActuatorInfo_StatUser struct {
func (x *ActuatorInfo_StatUser) Reset() {
*x = ActuatorInfo_StatUser{}
- mi := &file_v1_actuator_service_proto_msgTypes[7]
+ mi := &file_v1_actuator_service_proto_msgTypes[6]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -520,7 +445,7 @@ func (x *ActuatorInfo_StatUser) String() string {
func (*ActuatorInfo_StatUser) ProtoMessage() {}
func (x *ActuatorInfo_StatUser) ProtoReflect() protoreflect.Message {
- mi := &file_v1_actuator_service_proto_msgTypes[7]
+ mi := &file_v1_actuator_service_proto_msgTypes[6]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -533,7 +458,7 @@ func (x *ActuatorInfo_StatUser) ProtoReflect() protoreflect.Message {
// Deprecated: Use ActuatorInfo_StatUser.ProtoReflect.Descriptor instead.
func (*ActuatorInfo_StatUser) Descriptor() ([]byte, []int) {
- return file_v1_actuator_service_proto_rawDescGZIP(), []int{6, 0}
+ return file_v1_actuator_service_proto_rawDescGZIP(), []int{5, 0}
}
func (x *ActuatorInfo_StatUser) GetUserType() UserType {
@@ -561,18 +486,13 @@ 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\x1bgoogle/protobuf/empty.proto\x1a google/protobuf/field_mask.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x13v1/annotation.proto\x1a\x0fv1/common.proto\x1a\x15v1/user_service.proto\"\x1b\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\x1bgoogle/protobuf/empty.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x13v1/annotation.proto\x1a\x0fv1/common.proto\x1a\x15v1/user_service.proto\"\x1b\n" +
"\x19GetResourcePackageRequest\"%\n" +
"\x0fResourcePackage\x12\x12\n" +
"\x04logo\x18\x01 \x01(\fR\x04logo\"\x14\n" +
"\x12SetupSampleRequest\"\x18\n" +
- "\x16GetActuatorInfoRequest\"\xbe\x01\n" +
- "\x19UpdateActuatorInfoRequest\x12:\n" +
- "\bactuator\x18\x01 \x01(\v2\x19.bytebase.v1.ActuatorInfoB\x03\xe0A\x02R\bactuator\x12@\n" +
- "\vupdate_mask\x18\x02 \x01(\v2\x1a.google.protobuf.FieldMaskB\x03\xe0A\x02R\n" +
- "updateMask\x12#\n" +
- "\rallow_missing\x18\x03 \x01(\bR\fallowMissing\"\x14\n" +
- "\x12DeleteCacheRequest\"\xc3\a\n" +
+ "\x16GetActuatorInfoRequest\"\x14\n" +
+ "\x12DeleteCacheRequest\"\xb3\a\n" +
"\fActuatorInfo\x12\x1d\n" +
"\aversion\x18\x01 \x01(\tB\x03\xe0A\x03R\aversion\x12\"\n" +
"\n" +
@@ -585,8 +505,7 @@ const file_v1_actuator_service_proto_rawDesc = "" +
"\fexternal_url\x18\b \x01(\tB\x03\xe0A\x03R\vexternalUrl\x12-\n" +
"\x10need_admin_setup\x18\t \x01(\bB\x03\xe0A\x03R\x0eneedAdminSetup\x12I\n" +
"\x10last_active_time\x18\v \x01(\v2\x1a.google.protobuf.TimestampB\x03\xe0A\x03R\x0elastActiveTime\x12&\n" +
- "\fworkspace_id\x18\r \x01(\tB\x03\xe0A\x03R\vworkspaceId\x12\x14\n" +
- "\x05debug\x18\x0e \x01(\bR\x05debug\x124\n" +
+ "\fworkspace_id\x18\r \x01(\tB\x03\xe0A\x03R\vworkspaceId\x124\n" +
"\x13unlicensed_features\x18\x0f \x03(\tB\x03\xe0A\x03R\x12unlicensedFeatures\x12\x1b\n" +
"\x06docker\x18\x12 \x01(\bB\x03\xe0A\x03R\x06docker\x12F\n" +
"\n" +
@@ -599,10 +518,9 @@ const file_v1_actuator_service_proto_rawDesc = "" +
"\tuser_type\x18\x01 \x01(\x0e2\x15.bytebase.v1.UserTypeR\buserType\x12(\n" +
"\x05state\x18\x02 \x01(\x0e2\x12.bytebase.v1.StateR\x05state\x12\x14\n" +
"\x05count\x18\x03 \x01(\x05R\x05countJ\x04\b\n" +
- "\x10\vJ\x04\b\f\x10\rJ\x04\b\x10\x10\x11J\x04\b\x11\x10\x122\xa4\x05\n" +
+ "\x10\vJ\x04\b\f\x10\rJ\x04\b\x10\x10\x11J\x04\b\x11\x10\x12J\x04\b\x0e\x10\x0f2\xf7\x03\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\xaa\x01\n" +
- "\x12UpdateActuatorInfo\x12&.bytebase.v1.UpdateActuatorInfoRequest\x1a\x19.bytebase.v1.ActuatorInfo\"Q\xdaA\x14actuator,update_mask\x8a\xea0\x0fbb.settings.set\x90\xea0\x01\x82\xd3\xe4\x93\x02\x1d:\bactuator2\x11/v1/actuator/info\x12\x82\x01\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" +
"\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\x81\x01\n" +
"\x12GetResourcePackage\x12&.bytebase.v1.GetResourcePackageRequest\x1a\x1c.bytebase.v1.ResourcePackage\"%\xdaA\x00\x80\xea0\x01\x82\xd3\xe4\x93\x02\x18\x12\x16/v1/actuator/resourcesB\xaa\x01\n" +
@@ -620,44 +538,38 @@ 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, 8)
+var file_v1_actuator_service_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
var file_v1_actuator_service_proto_goTypes = []any{
(*GetResourcePackageRequest)(nil), // 0: bytebase.v1.GetResourcePackageRequest
(*ResourcePackage)(nil), // 1: bytebase.v1.ResourcePackage
(*SetupSampleRequest)(nil), // 2: bytebase.v1.SetupSampleRequest
(*GetActuatorInfoRequest)(nil), // 3: bytebase.v1.GetActuatorInfoRequest
- (*UpdateActuatorInfoRequest)(nil), // 4: bytebase.v1.UpdateActuatorInfoRequest
- (*DeleteCacheRequest)(nil), // 5: bytebase.v1.DeleteCacheRequest
- (*ActuatorInfo)(nil), // 6: bytebase.v1.ActuatorInfo
- (*ActuatorInfo_StatUser)(nil), // 7: bytebase.v1.ActuatorInfo.StatUser
- (*fieldmaskpb.FieldMask)(nil), // 8: google.protobuf.FieldMask
- (*timestamppb.Timestamp)(nil), // 9: google.protobuf.Timestamp
- (UserType)(0), // 10: bytebase.v1.UserType
- (State)(0), // 11: bytebase.v1.State
- (*emptypb.Empty)(nil), // 12: google.protobuf.Empty
+ (*DeleteCacheRequest)(nil), // 4: bytebase.v1.DeleteCacheRequest
+ (*ActuatorInfo)(nil), // 5: bytebase.v1.ActuatorInfo
+ (*ActuatorInfo_StatUser)(nil), // 6: bytebase.v1.ActuatorInfo.StatUser
+ (*timestamppb.Timestamp)(nil), // 7: google.protobuf.Timestamp
+ (UserType)(0), // 8: bytebase.v1.UserType
+ (State)(0), // 9: bytebase.v1.State
+ (*emptypb.Empty)(nil), // 10: google.protobuf.Empty
}
var file_v1_actuator_service_proto_depIdxs = []int32{
- 6, // 0: bytebase.v1.UpdateActuatorInfoRequest.actuator:type_name -> bytebase.v1.ActuatorInfo
- 8, // 1: bytebase.v1.UpdateActuatorInfoRequest.update_mask:type_name -> google.protobuf.FieldMask
- 9, // 2: bytebase.v1.ActuatorInfo.last_active_time:type_name -> google.protobuf.Timestamp
- 7, // 3: bytebase.v1.ActuatorInfo.user_stats:type_name -> bytebase.v1.ActuatorInfo.StatUser
- 10, // 4: bytebase.v1.ActuatorInfo.StatUser.user_type:type_name -> bytebase.v1.UserType
- 11, // 5: bytebase.v1.ActuatorInfo.StatUser.state:type_name -> bytebase.v1.State
- 3, // 6: bytebase.v1.ActuatorService.GetActuatorInfo:input_type -> bytebase.v1.GetActuatorInfoRequest
- 4, // 7: bytebase.v1.ActuatorService.UpdateActuatorInfo:input_type -> bytebase.v1.UpdateActuatorInfoRequest
- 2, // 8: bytebase.v1.ActuatorService.SetupSample:input_type -> bytebase.v1.SetupSampleRequest
- 5, // 9: bytebase.v1.ActuatorService.DeleteCache:input_type -> bytebase.v1.DeleteCacheRequest
- 0, // 10: bytebase.v1.ActuatorService.GetResourcePackage:input_type -> bytebase.v1.GetResourcePackageRequest
- 6, // 11: bytebase.v1.ActuatorService.GetActuatorInfo:output_type -> bytebase.v1.ActuatorInfo
- 6, // 12: bytebase.v1.ActuatorService.UpdateActuatorInfo:output_type -> bytebase.v1.ActuatorInfo
- 12, // 13: bytebase.v1.ActuatorService.SetupSample:output_type -> google.protobuf.Empty
- 12, // 14: bytebase.v1.ActuatorService.DeleteCache:output_type -> google.protobuf.Empty
- 1, // 15: bytebase.v1.ActuatorService.GetResourcePackage:output_type -> bytebase.v1.ResourcePackage
- 11, // [11:16] is the sub-list for method output_type
- 6, // [6:11] is the sub-list for method input_type
- 6, // [6:6] is the sub-list for extension type_name
- 6, // [6:6] is the sub-list for extension extendee
- 0, // [0:6] is the sub-list for field type_name
+ 7, // 0: bytebase.v1.ActuatorInfo.last_active_time:type_name -> google.protobuf.Timestamp
+ 6, // 1: bytebase.v1.ActuatorInfo.user_stats:type_name -> bytebase.v1.ActuatorInfo.StatUser
+ 8, // 2: bytebase.v1.ActuatorInfo.StatUser.user_type:type_name -> bytebase.v1.UserType
+ 9, // 3: bytebase.v1.ActuatorInfo.StatUser.state:type_name -> bytebase.v1.State
+ 3, // 4: bytebase.v1.ActuatorService.GetActuatorInfo:input_type -> bytebase.v1.GetActuatorInfoRequest
+ 2, // 5: bytebase.v1.ActuatorService.SetupSample:input_type -> bytebase.v1.SetupSampleRequest
+ 4, // 6: bytebase.v1.ActuatorService.DeleteCache:input_type -> bytebase.v1.DeleteCacheRequest
+ 0, // 7: bytebase.v1.ActuatorService.GetResourcePackage:input_type -> bytebase.v1.GetResourcePackageRequest
+ 5, // 8: bytebase.v1.ActuatorService.GetActuatorInfo:output_type -> bytebase.v1.ActuatorInfo
+ 10, // 9: bytebase.v1.ActuatorService.SetupSample:output_type -> google.protobuf.Empty
+ 10, // 10: bytebase.v1.ActuatorService.DeleteCache:output_type -> google.protobuf.Empty
+ 1, // 11: bytebase.v1.ActuatorService.GetResourcePackage:output_type -> bytebase.v1.ResourcePackage
+ 8, // [8:12] is the sub-list for method output_type
+ 4, // [4:8] is the sub-list for method input_type
+ 4, // [4:4] is the sub-list for extension type_name
+ 4, // [4:4] is the sub-list for extension extendee
+ 0, // [0:4] is the sub-list for field type_name
}
func init() { file_v1_actuator_service_proto_init() }
@@ -674,7 +586,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: 8,
+ NumMessages: 7,
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 6af97a7ef4..e6ed584b40 100644
--- a/backend/generated-go/v1/actuator_service.pb.gw.go
+++ b/backend/generated-go/v1/actuator_service.pb.gw.go
@@ -56,69 +56,6 @@ func local_request_ActuatorService_GetActuatorInfo_0(ctx context.Context, marsha
return msg, metadata, err
}
-var filter_ActuatorService_UpdateActuatorInfo_0 = &utilities.DoubleArray{Encoding: map[string]int{"actuator": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}
-
-func request_ActuatorService_UpdateActuatorInfo_0(ctx context.Context, marshaler runtime.Marshaler, client ActuatorServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
- var (
- protoReq UpdateActuatorInfoRequest
- metadata runtime.ServerMetadata
- )
- newReader, berr := utilities.IOReaderFactory(req.Body)
- if berr != nil {
- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr)
- }
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Actuator); err != nil && !errors.Is(err, io.EOF) {
- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
- }
- if req.Body != nil {
- _, _ = io.Copy(io.Discard, req.Body)
- }
- if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 {
- if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Actuator); err != nil {
- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
- } else {
- protoReq.UpdateMask = fieldMask
- }
- }
- if err := req.ParseForm(); err != nil {
- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
- }
- if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_ActuatorService_UpdateActuatorInfo_0); err != nil {
- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
- }
- msg, err := client.UpdateActuatorInfo(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
- return msg, metadata, err
-}
-
-func local_request_ActuatorService_UpdateActuatorInfo_0(ctx context.Context, marshaler runtime.Marshaler, server ActuatorServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
- var (
- protoReq UpdateActuatorInfoRequest
- metadata runtime.ServerMetadata
- )
- newReader, berr := utilities.IOReaderFactory(req.Body)
- if berr != nil {
- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr)
- }
- if err := marshaler.NewDecoder(newReader()).Decode(&protoReq.Actuator); err != nil && !errors.Is(err, io.EOF) {
- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
- }
- if protoReq.UpdateMask == nil || len(protoReq.UpdateMask.GetPaths()) == 0 {
- if fieldMask, err := runtime.FieldMaskFromRequestBody(newReader(), protoReq.Actuator); err != nil {
- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
- } else {
- protoReq.UpdateMask = fieldMask
- }
- }
- if err := req.ParseForm(); err != nil {
- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
- }
- if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_ActuatorService_UpdateActuatorInfo_0); err != nil {
- return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
- }
- msg, err := server.UpdateActuatorInfo(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) {
var (
protoReq SetupSampleRequest
@@ -208,26 +145,6 @@ func RegisterActuatorServiceHandlerServer(ctx context.Context, mux *runtime.Serv
}
forward_ActuatorService_GetActuatorInfo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
})
- mux.Handle(http.MethodPatch, pattern_ActuatorService_UpdateActuatorInfo_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/UpdateActuatorInfo", runtime.WithHTTPPathPattern("/v1/actuator/info"))
- if err != nil {
- runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
- return
- }
- resp, md, err := local_request_ActuatorService_UpdateActuatorInfo_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_UpdateActuatorInfo_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) {
ctx, cancel := context.WithCancel(req.Context())
defer cancel()
@@ -345,23 +262,6 @@ func RegisterActuatorServiceHandlerClient(ctx context.Context, mux *runtime.Serv
}
forward_ActuatorService_GetActuatorInfo_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
})
- mux.Handle(http.MethodPatch, pattern_ActuatorService_UpdateActuatorInfo_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/UpdateActuatorInfo", runtime.WithHTTPPathPattern("/v1/actuator/info"))
- if err != nil {
- runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
- return
- }
- resp, md, err := request_ActuatorService_UpdateActuatorInfo_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_UpdateActuatorInfo_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) {
ctx, cancel := context.WithCancel(req.Context())
defer cancel()
@@ -418,7 +318,6 @@ func RegisterActuatorServiceHandlerClient(ctx context.Context, mux *runtime.Serv
var (
pattern_ActuatorService_GetActuatorInfo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v1", "actuator", "info"}, ""))
- pattern_ActuatorService_UpdateActuatorInfo_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_GetResourcePackage_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v1", "actuator", "resources"}, ""))
@@ -426,7 +325,6 @@ var (
var (
forward_ActuatorService_GetActuatorInfo_0 = runtime.ForwardResponseMessage
- forward_ActuatorService_UpdateActuatorInfo_0 = runtime.ForwardResponseMessage
forward_ActuatorService_SetupSample_0 = runtime.ForwardResponseMessage
forward_ActuatorService_DeleteCache_0 = runtime.ForwardResponseMessage
forward_ActuatorService_GetResourcePackage_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 62480b412e..db8b03edf8 100644
--- a/backend/generated-go/v1/actuator_service_equal.pb.go
+++ b/backend/generated-go/v1/actuator_service_equal.pb.go
@@ -3,11 +3,6 @@
package v1
-import (
- proto "google.golang.org/protobuf/proto"
- fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
-)
-
func (x *GetResourcePackageRequest) Equal(y *GetResourcePackageRequest) bool {
if x == y {
return true
@@ -51,29 +46,6 @@ func (x *GetActuatorInfoRequest) Equal(y *GetActuatorInfoRequest) bool {
return true
}
-func (x *UpdateActuatorInfoRequest) Equal(y *UpdateActuatorInfoRequest) bool {
- if x == y {
- return true
- }
- if x == nil || y == nil {
- return x == nil && y == nil
- }
- if !x.Actuator.Equal(y.Actuator) {
- return false
- }
- if equal, ok := interface{}(x.UpdateMask).(interface {
- Equal(*fieldmaskpb.FieldMask) bool
- }); !ok || !equal.Equal(y.UpdateMask) {
- return false
- } else if !proto.Equal(x.UpdateMask, y.UpdateMask) {
- return false
- }
- if x.AllowMissing != y.AllowMissing {
- return false
- }
- return true
-}
-
func (x *DeleteCacheRequest) Equal(y *DeleteCacheRequest) bool {
if x == y {
return true
@@ -143,9 +115,6 @@ func (x *ActuatorInfo) Equal(y *ActuatorInfo) bool {
if x.WorkspaceId != y.WorkspaceId {
return false
}
- if x.Debug != y.Debug {
- return false
- }
if len(x.UnlicensedFeatures) != len(y.UnlicensedFeatures) {
return false
}
diff --git a/backend/generated-go/v1/actuator_service_grpc.pb.go b/backend/generated-go/v1/actuator_service_grpc.pb.go
index f6da06e14d..d6b7b3724b 100644
--- a/backend/generated-go/v1/actuator_service_grpc.pb.go
+++ b/backend/generated-go/v1/actuator_service_grpc.pb.go
@@ -21,7 +21,6 @@ const _ = grpc.SupportPackageIsVersion9
const (
ActuatorService_GetActuatorInfo_FullMethodName = "/bytebase.v1.ActuatorService/GetActuatorInfo"
- ActuatorService_UpdateActuatorInfo_FullMethodName = "/bytebase.v1.ActuatorService/UpdateActuatorInfo"
ActuatorService_SetupSample_FullMethodName = "/bytebase.v1.ActuatorService/SetupSample"
ActuatorService_DeleteCache_FullMethodName = "/bytebase.v1.ActuatorService/DeleteCache"
ActuatorService_GetResourcePackage_FullMethodName = "/bytebase.v1.ActuatorService/GetResourcePackage"
@@ -36,9 +35,6 @@ type ActuatorServiceClient interface {
// Gets system information and health status of the Bytebase instance.
// Permissions required: None
GetActuatorInfo(ctx context.Context, in *GetActuatorInfoRequest, opts ...grpc.CallOption) (*ActuatorInfo, error)
- // Updates system configuration settings for the Bytebase instance.
- // Permissions required: bb.settings.set
- UpdateActuatorInfo(ctx context.Context, in *UpdateActuatorInfoRequest, opts ...grpc.CallOption) (*ActuatorInfo, error)
// Sets up sample data for demonstration and testing purposes.
// Permissions required: bb.projects.create
SetupSample(ctx context.Context, in *SetupSampleRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
@@ -68,16 +64,6 @@ func (c *actuatorServiceClient) GetActuatorInfo(ctx context.Context, in *GetActu
return out, nil
}
-func (c *actuatorServiceClient) UpdateActuatorInfo(ctx context.Context, in *UpdateActuatorInfoRequest, opts ...grpc.CallOption) (*ActuatorInfo, error) {
- cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
- out := new(ActuatorInfo)
- err := c.cc.Invoke(ctx, ActuatorService_UpdateActuatorInfo_FullMethodName, in, out, cOpts...)
- if err != nil {
- return nil, err
- }
- return out, nil
-}
-
func (c *actuatorServiceClient) SetupSample(ctx context.Context, in *SetupSampleRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
out := new(emptypb.Empty)
@@ -117,9 +103,6 @@ type ActuatorServiceServer interface {
// Gets system information and health status of the Bytebase instance.
// Permissions required: None
GetActuatorInfo(context.Context, *GetActuatorInfoRequest) (*ActuatorInfo, error)
- // Updates system configuration settings for the Bytebase instance.
- // Permissions required: bb.settings.set
- UpdateActuatorInfo(context.Context, *UpdateActuatorInfoRequest) (*ActuatorInfo, error)
// Sets up sample data for demonstration and testing purposes.
// Permissions required: bb.projects.create
SetupSample(context.Context, *SetupSampleRequest) (*emptypb.Empty, error)
@@ -142,9 +125,6 @@ type UnimplementedActuatorServiceServer struct{}
func (UnimplementedActuatorServiceServer) GetActuatorInfo(context.Context, *GetActuatorInfoRequest) (*ActuatorInfo, error) {
return nil, status.Error(codes.Unimplemented, "method GetActuatorInfo not implemented")
}
-func (UnimplementedActuatorServiceServer) UpdateActuatorInfo(context.Context, *UpdateActuatorInfoRequest) (*ActuatorInfo, error) {
- return nil, status.Error(codes.Unimplemented, "method UpdateActuatorInfo not implemented")
-}
func (UnimplementedActuatorServiceServer) SetupSample(context.Context, *SetupSampleRequest) (*emptypb.Empty, error) {
return nil, status.Error(codes.Unimplemented, "method SetupSample not implemented")
}
@@ -193,24 +173,6 @@ func _ActuatorService_GetActuatorInfo_Handler(srv interface{}, ctx context.Conte
return interceptor(ctx, in, info, handler)
}
-func _ActuatorService_UpdateActuatorInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
- in := new(UpdateActuatorInfoRequest)
- if err := dec(in); err != nil {
- return nil, err
- }
- if interceptor == nil {
- return srv.(ActuatorServiceServer).UpdateActuatorInfo(ctx, in)
- }
- info := &grpc.UnaryServerInfo{
- Server: srv,
- FullMethod: ActuatorService_UpdateActuatorInfo_FullMethodName,
- }
- handler := func(ctx context.Context, req interface{}) (interface{}, error) {
- return srv.(ActuatorServiceServer).UpdateActuatorInfo(ctx, req.(*UpdateActuatorInfoRequest))
- }
- return interceptor(ctx, in, info, handler)
-}
-
func _ActuatorService_SetupSample_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(SetupSampleRequest)
if err := dec(in); err != nil {
@@ -276,10 +238,6 @@ var ActuatorService_ServiceDesc = grpc.ServiceDesc{
MethodName: "GetActuatorInfo",
Handler: _ActuatorService_GetActuatorInfo_Handler,
},
- {
- MethodName: "UpdateActuatorInfo",
- Handler: _ActuatorService_UpdateActuatorInfo_Handler,
- },
{
MethodName: "SetupSample",
Handler: _ActuatorService_SetupSample_Handler,
diff --git a/backend/generated-go/v1/setting_service.pb.go b/backend/generated-go/v1/setting_service.pb.go
index a3151b19d8..05960caedc 100644
--- a/backend/generated-go/v1/setting_service.pb.go
+++ b/backend/generated-go/v1/setting_service.pb.go
@@ -871,8 +871,6 @@ type WorkspaceProfileSetting struct {
Require_2Fa bool `protobuf:"varint,3,opt,name=require_2fa,json=require2fa,proto3" json:"require_2fa,omitempty"`
// The duration for refresh token. Default is 7 days.
RefreshTokenDuration *durationpb.Duration `protobuf:"bytes,4,opt,name=refresh_token_duration,json=refreshTokenDuration,proto3" json:"refresh_token_duration,omitempty"`
- // The duration for access token. Default is 1 hour.
- AccessTokenDuration *durationpb.Duration `protobuf:"bytes,18,opt,name=access_token_duration,json=accessTokenDuration,proto3" json:"access_token_duration,omitempty"`
// The setting of custom announcement
Announcement *Announcement `protobuf:"bytes,5,opt,name=announcement,proto3" json:"announcement,omitempty"`
// The max duration for role expired.
@@ -901,8 +899,12 @@ type WorkspaceProfileSetting struct {
BrandingLogo string `protobuf:"bytes,16,opt,name=branding_logo,json=brandingLogo,proto3" json:"branding_logo,omitempty"`
// Password restriction settings.
PasswordRestriction *WorkspaceProfileSetting_PasswordRestriction `protobuf:"bytes,17,opt,name=password_restriction,json=passwordRestriction,proto3" json:"password_restriction,omitempty"`
- unknownFields protoimpl.UnknownFields
- sizeCache protoimpl.SizeCache
+ // The duration for access token. Default is 1 hour.
+ AccessTokenDuration *durationpb.Duration `protobuf:"bytes,18,opt,name=access_token_duration,json=accessTokenDuration,proto3" json:"access_token_duration,omitempty"`
+ // Whether debug mode is enabled.
+ EnableDebug bool `protobuf:"varint,19,opt,name=enable_debug,json=enableDebug,proto3" json:"enable_debug,omitempty"`
+ unknownFields protoimpl.UnknownFields
+ sizeCache protoimpl.SizeCache
}
func (x *WorkspaceProfileSetting) Reset() {
@@ -963,13 +965,6 @@ func (x *WorkspaceProfileSetting) GetRefreshTokenDuration() *durationpb.Duration
return nil
}
-func (x *WorkspaceProfileSetting) GetAccessTokenDuration() *durationpb.Duration {
- if x != nil {
- return x.AccessTokenDuration
- }
- return nil
-}
-
func (x *WorkspaceProfileSetting) GetAnnouncement() *Announcement {
if x != nil {
return x.Announcement
@@ -1061,6 +1056,20 @@ func (x *WorkspaceProfileSetting) GetPasswordRestriction() *WorkspaceProfileSett
return nil
}
+func (x *WorkspaceProfileSetting) GetAccessTokenDuration() *durationpb.Duration {
+ if x != nil {
+ return x.AccessTokenDuration
+ }
+ return nil
+}
+
+func (x *WorkspaceProfileSetting) GetEnableDebug() bool {
+ if x != nil {
+ return x.EnableDebug
+ }
+ return false
+}
+
type Announcement struct {
state protoimpl.MessageState `protogen:"open.v1"`
// The alert level of announcement
@@ -2880,14 +2889,13 @@ const file_v1_setting_service_proto_rawDesc = "" +
"\x04lark\x18\x05 \x01(\v2\x1e.bytebase.v1.AppIMSetting.LarkH\x00R\x04lark\x12@\n" +
"\bdingtalk\x18\x06 \x01(\v2\".bytebase.v1.AppIMSetting.DingTalkH\x00R\bdingtalk\x127\n" +
"\x05teams\x18\a \x01(\v2\x1f.bytebase.v1.AppIMSetting.TeamsH\x00R\x05teamsB\t\n" +
- "\apayload\"\xd5\v\n" +
+ "\apayload\"\xf8\v\n" +
"\x17WorkspaceProfileSetting\x12!\n" +
"\fexternal_url\x18\x01 \x01(\tR\vexternalUrl\x12'\n" +
"\x0fdisallow_signup\x18\x02 \x01(\bR\x0edisallowSignup\x12\x1f\n" +
"\vrequire_2fa\x18\x03 \x01(\bR\n" +
"require2fa\x12O\n" +
- "\x16refresh_token_duration\x18\x04 \x01(\v2\x19.google.protobuf.DurationR\x14refreshTokenDuration\x12M\n" +
- "\x15access_token_duration\x18\x12 \x01(\v2\x19.google.protobuf.DurationR\x13accessTokenDuration\x12=\n" +
+ "\x16refresh_token_duration\x18\x04 \x01(\v2\x19.google.protobuf.DurationR\x14refreshTokenDuration\x12=\n" +
"\fannouncement\x18\x05 \x01(\v2\x19.bytebase.v1.AnnouncementR\fannouncement\x12Q\n" +
"\x17maximum_role_expiration\x18\x06 \x01(\v2\x19.google.protobuf.DurationR\x15maximumRoleExpiration\x12\x18\n" +
"\adomains\x18\a \x03(\tR\adomains\x126\n" +
@@ -2901,7 +2909,9 @@ const file_v1_setting_service_proto_rawDesc = "" +
"\twatermark\x18\x0e \x01(\bR\twatermark\x120\n" +
"\x14directory_sync_token\x18\x0f \x01(\tR\x12directorySyncToken\x12#\n" +
"\rbranding_logo\x18\x10 \x01(\tR\fbrandingLogo\x12k\n" +
- "\x14password_restriction\x18\x11 \x01(\v28.bytebase.v1.WorkspaceProfileSetting.PasswordRestrictionR\x13passwordRestriction\x1a\x93\x03\n" +
+ "\x14password_restriction\x18\x11 \x01(\v28.bytebase.v1.WorkspaceProfileSetting.PasswordRestrictionR\x13passwordRestriction\x12M\n" +
+ "\x15access_token_duration\x18\x12 \x01(\v2\x19.google.protobuf.DurationR\x13accessTokenDuration\x12!\n" +
+ "\fenable_debug\x18\x13 \x01(\bR\venableDebug\x1a\x93\x03\n" +
"\x13PasswordRestriction\x12\x1d\n" +
"\n" +
"min_length\x18\x01 \x01(\x05R\tminLength\x12%\n" +
@@ -3106,12 +3116,12 @@ var file_v1_setting_service_proto_depIdxs = []int32{
21, // 11: bytebase.v1.SettingValue.environment:type_name -> bytebase.v1.EnvironmentSetting
28, // 12: bytebase.v1.AppIMSetting.settings:type_name -> bytebase.v1.AppIMSetting.IMSetting
44, // 13: bytebase.v1.WorkspaceProfileSetting.refresh_token_duration:type_name -> google.protobuf.Duration
- 44, // 14: bytebase.v1.WorkspaceProfileSetting.access_token_duration:type_name -> google.protobuf.Duration
- 15, // 15: bytebase.v1.WorkspaceProfileSetting.announcement:type_name -> bytebase.v1.Announcement
- 44, // 16: bytebase.v1.WorkspaceProfileSetting.maximum_role_expiration:type_name -> google.protobuf.Duration
- 0, // 17: bytebase.v1.WorkspaceProfileSetting.database_change_mode:type_name -> bytebase.v1.DatabaseChangeMode
- 44, // 18: bytebase.v1.WorkspaceProfileSetting.inactive_session_timeout:type_name -> google.protobuf.Duration
- 29, // 19: bytebase.v1.WorkspaceProfileSetting.password_restriction:type_name -> bytebase.v1.WorkspaceProfileSetting.PasswordRestriction
+ 15, // 14: bytebase.v1.WorkspaceProfileSetting.announcement:type_name -> bytebase.v1.Announcement
+ 44, // 15: bytebase.v1.WorkspaceProfileSetting.maximum_role_expiration:type_name -> google.protobuf.Duration
+ 0, // 16: bytebase.v1.WorkspaceProfileSetting.database_change_mode:type_name -> bytebase.v1.DatabaseChangeMode
+ 44, // 17: bytebase.v1.WorkspaceProfileSetting.inactive_session_timeout:type_name -> google.protobuf.Duration
+ 29, // 18: bytebase.v1.WorkspaceProfileSetting.password_restriction:type_name -> bytebase.v1.WorkspaceProfileSetting.PasswordRestriction
+ 44, // 19: bytebase.v1.WorkspaceProfileSetting.access_token_duration:type_name -> google.protobuf.Duration
2, // 20: bytebase.v1.Announcement.level:type_name -> bytebase.v1.Announcement.AlertLevel
30, // 21: bytebase.v1.WorkspaceApprovalSetting.rules:type_name -> bytebase.v1.WorkspaceApprovalSetting.Rule
31, // 22: bytebase.v1.DataClassificationSetting.configs:type_name -> bytebase.v1.DataClassificationSetting.DataClassificationConfig
diff --git a/backend/generated-go/v1/setting_service_equal.pb.go b/backend/generated-go/v1/setting_service_equal.pb.go
index c4d5074e49..89897b34fc 100644
--- a/backend/generated-go/v1/setting_service_equal.pb.go
+++ b/backend/generated-go/v1/setting_service_equal.pb.go
@@ -337,9 +337,6 @@ func (x *WorkspaceProfileSetting) Equal(y *WorkspaceProfileSetting) bool {
if p, q := x.RefreshTokenDuration, y.RefreshTokenDuration; (p == nil && q != nil) || (p != nil && (q == nil || p.Seconds != q.Seconds || p.Nanos != q.Nanos)) {
return false
}
- if p, q := x.AccessTokenDuration, y.AccessTokenDuration; (p == nil && q != nil) || (p != nil && (q == nil || p.Seconds != q.Seconds || p.Nanos != q.Nanos)) {
- return false
- }
if !x.Announcement.Equal(y.Announcement) {
return false
}
@@ -384,6 +381,12 @@ func (x *WorkspaceProfileSetting) Equal(y *WorkspaceProfileSetting) bool {
if !x.PasswordRestriction.Equal(y.PasswordRestriction) {
return false
}
+ if p, q := x.AccessTokenDuration, y.AccessTokenDuration; (p == nil && q != nil) || (p != nil && (q == nil || p.Seconds != q.Seconds || p.Nanos != q.Nanos)) {
+ return false
+ }
+ if x.EnableDebug != y.EnableDebug {
+ 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 4d972c6ff3..acd3c20c8c 100644
--- a/backend/generated-go/v1/v1connect/actuator_service.connect.go
+++ b/backend/generated-go/v1/v1connect/actuator_service.connect.go
@@ -37,9 +37,6 @@ const (
// ActuatorServiceGetActuatorInfoProcedure is the fully-qualified name of the ActuatorService's
// GetActuatorInfo RPC.
ActuatorServiceGetActuatorInfoProcedure = "/bytebase.v1.ActuatorService/GetActuatorInfo"
- // ActuatorServiceUpdateActuatorInfoProcedure is the fully-qualified name of the ActuatorService's
- // UpdateActuatorInfo RPC.
- ActuatorServiceUpdateActuatorInfoProcedure = "/bytebase.v1.ActuatorService/UpdateActuatorInfo"
// ActuatorServiceSetupSampleProcedure is the fully-qualified name of the ActuatorService's
// SetupSample RPC.
ActuatorServiceSetupSampleProcedure = "/bytebase.v1.ActuatorService/SetupSample"
@@ -56,9 +53,6 @@ type ActuatorServiceClient interface {
// Gets system information and health status of the Bytebase instance.
// Permissions required: None
GetActuatorInfo(context.Context, *connect.Request[v1.GetActuatorInfoRequest]) (*connect.Response[v1.ActuatorInfo], error)
- // Updates system configuration settings for the Bytebase instance.
- // Permissions required: bb.settings.set
- UpdateActuatorInfo(context.Context, *connect.Request[v1.UpdateActuatorInfoRequest]) (*connect.Response[v1.ActuatorInfo], error)
// Sets up sample data for demonstration and testing purposes.
// Permissions required: bb.projects.create
SetupSample(context.Context, *connect.Request[v1.SetupSampleRequest]) (*connect.Response[emptypb.Empty], error)
@@ -87,12 +81,6 @@ func NewActuatorServiceClient(httpClient connect.HTTPClient, baseURL string, opt
connect.WithSchema(actuatorServiceMethods.ByName("GetActuatorInfo")),
connect.WithClientOptions(opts...),
),
- updateActuatorInfo: connect.NewClient[v1.UpdateActuatorInfoRequest, v1.ActuatorInfo](
- httpClient,
- baseURL+ActuatorServiceUpdateActuatorInfoProcedure,
- connect.WithSchema(actuatorServiceMethods.ByName("UpdateActuatorInfo")),
- connect.WithClientOptions(opts...),
- ),
setupSample: connect.NewClient[v1.SetupSampleRequest, emptypb.Empty](
httpClient,
baseURL+ActuatorServiceSetupSampleProcedure,
@@ -117,7 +105,6 @@ func NewActuatorServiceClient(httpClient connect.HTTPClient, baseURL string, opt
// actuatorServiceClient implements ActuatorServiceClient.
type actuatorServiceClient struct {
getActuatorInfo *connect.Client[v1.GetActuatorInfoRequest, v1.ActuatorInfo]
- updateActuatorInfo *connect.Client[v1.UpdateActuatorInfoRequest, v1.ActuatorInfo]
setupSample *connect.Client[v1.SetupSampleRequest, emptypb.Empty]
deleteCache *connect.Client[v1.DeleteCacheRequest, emptypb.Empty]
getResourcePackage *connect.Client[v1.GetResourcePackageRequest, v1.ResourcePackage]
@@ -128,11 +115,6 @@ func (c *actuatorServiceClient) GetActuatorInfo(ctx context.Context, req *connec
return c.getActuatorInfo.CallUnary(ctx, req)
}
-// UpdateActuatorInfo calls bytebase.v1.ActuatorService.UpdateActuatorInfo.
-func (c *actuatorServiceClient) UpdateActuatorInfo(ctx context.Context, req *connect.Request[v1.UpdateActuatorInfoRequest]) (*connect.Response[v1.ActuatorInfo], error) {
- return c.updateActuatorInfo.CallUnary(ctx, req)
-}
-
// SetupSample calls bytebase.v1.ActuatorService.SetupSample.
func (c *actuatorServiceClient) SetupSample(ctx context.Context, req *connect.Request[v1.SetupSampleRequest]) (*connect.Response[emptypb.Empty], error) {
return c.setupSample.CallUnary(ctx, req)
@@ -153,9 +135,6 @@ type ActuatorServiceHandler interface {
// Gets system information and health status of the Bytebase instance.
// Permissions required: None
GetActuatorInfo(context.Context, *connect.Request[v1.GetActuatorInfoRequest]) (*connect.Response[v1.ActuatorInfo], error)
- // Updates system configuration settings for the Bytebase instance.
- // Permissions required: bb.settings.set
- UpdateActuatorInfo(context.Context, *connect.Request[v1.UpdateActuatorInfoRequest]) (*connect.Response[v1.ActuatorInfo], error)
// Sets up sample data for demonstration and testing purposes.
// Permissions required: bb.projects.create
SetupSample(context.Context, *connect.Request[v1.SetupSampleRequest]) (*connect.Response[emptypb.Empty], error)
@@ -180,12 +159,6 @@ func NewActuatorServiceHandler(svc ActuatorServiceHandler, opts ...connect.Handl
connect.WithSchema(actuatorServiceMethods.ByName("GetActuatorInfo")),
connect.WithHandlerOptions(opts...),
)
- actuatorServiceUpdateActuatorInfoHandler := connect.NewUnaryHandler(
- ActuatorServiceUpdateActuatorInfoProcedure,
- svc.UpdateActuatorInfo,
- connect.WithSchema(actuatorServiceMethods.ByName("UpdateActuatorInfo")),
- connect.WithHandlerOptions(opts...),
- )
actuatorServiceSetupSampleHandler := connect.NewUnaryHandler(
ActuatorServiceSetupSampleProcedure,
svc.SetupSample,
@@ -208,8 +181,6 @@ func NewActuatorServiceHandler(svc ActuatorServiceHandler, opts ...connect.Handl
switch r.URL.Path {
case ActuatorServiceGetActuatorInfoProcedure:
actuatorServiceGetActuatorInfoHandler.ServeHTTP(w, r)
- case ActuatorServiceUpdateActuatorInfoProcedure:
- actuatorServiceUpdateActuatorInfoHandler.ServeHTTP(w, r)
case ActuatorServiceSetupSampleProcedure:
actuatorServiceSetupSampleHandler.ServeHTTP(w, r)
case ActuatorServiceDeleteCacheProcedure:
@@ -229,10 +200,6 @@ func (UnimplementedActuatorServiceHandler) GetActuatorInfo(context.Context, *con
return nil, connect.NewError(connect.CodeUnimplemented, errors.New("bytebase.v1.ActuatorService.GetActuatorInfo is not implemented"))
}
-func (UnimplementedActuatorServiceHandler) UpdateActuatorInfo(context.Context, *connect.Request[v1.UpdateActuatorInfoRequest]) (*connect.Response[v1.ActuatorInfo], error) {
- return nil, connect.NewError(connect.CodeUnimplemented, errors.New("bytebase.v1.ActuatorService.UpdateActuatorInfo is not implemented"))
-}
-
func (UnimplementedActuatorServiceHandler) SetupSample(context.Context, *connect.Request[v1.SetupSampleRequest]) (*connect.Response[emptypb.Empty], error) {
return nil, connect.NewError(connect.CodeUnimplemented, errors.New("bytebase.v1.ActuatorService.SetupSample is not implemented"))
}
diff --git a/backend/server/server.go b/backend/server/server.go
index 1ae06a81e7..8e3a7dd4c8 100644
--- a/backend/server/server.go
+++ b/backend/server/server.go
@@ -169,6 +169,15 @@ func NewServer(ctx context.Context, profile *config.Profile) (*Server, error) {
// Cache the license.
s.licenseService.LoadSubscription(ctx)
+ workspaceProfile, err := s.store.GetWorkspaceProfileSetting(ctx)
+ if err != nil {
+ return nil, errors.Wrap(err, "failed to get workspace profile setting")
+ }
+ profile.RuntimeDebug.Store(workspaceProfile.EnableDebug)
+ if workspaceProfile.EnableDebug {
+ log.LogLevel.Set(slog.LevelDebug)
+ }
+
// Settings are now initialized in the database schema (LATEST.sql)
systemSetting, err := s.store.GetSystemSetting(ctx)
if err != nil {
diff --git a/frontend/src/components/GeneralSetting/AuditLogStdoutSetting.vue b/frontend/src/components/GeneralSetting/AuditLogStdoutSetting.vue
index 6fcacd8032..af662fa775 100644
--- a/frontend/src/components/GeneralSetting/AuditLogStdoutSetting.vue
+++ b/frontend/src/components/GeneralSetting/AuditLogStdoutSetting.vue
@@ -3,25 +3,39 @@
<div class="text-left lg:w-1/4">
<div class="flex items-center gap-x-2">
<h1 class="text-2xl font-bold">
- {{ $t("settings.general.workspace.audit-log-stdout.self") }}
+ {{ $t("settings.general.workspace.log") }}
</h1>
<FeatureBadge :feature="PlanFeature.FEATURE_AUDIT_LOG" />
</div>
</div>
- <div class="flex-1 lg:px-4">
+
+ <div class="flex-1 lg:px-4 flex flex-col gap-y-6">
+ <div>
+ <div class="flex items-center gap-x-2">
+ <Switch
+ v-model:value="state.enableAuditLogStdout"
+ :text="true"
+ :disabled="!allowEdit || !hasAuditLogFeature"
+ />
+ <span class="text-sm">
+ {{ $t("settings.general.workspace.audit-log-stdout.enable") }}
+ </span>
+ </div>
+ <div class="mt-1 text-sm text-gray-400">
+ {{ $t("settings.general.workspace.audit-log-stdout.description") }}
+ </div>
+ </div>
+
<div class="flex items-center gap-x-2">
<Switch
- v-model:value="state.enableAuditLogStdout"
+ v-model:value="state.enableDebug"
:text="true"
- :disabled="!allowEdit || !hasAuditLogFeature"
+ :disabled="!allowEdit"
/>
<span class="text-sm">
- {{ $t("settings.general.workspace.audit-log-stdout.enable") }}
+ {{ $t("settings.general.workspace.enable-debug.enable") }}
</span>
</div>
- <div class="mt-1 text-sm text-gray-400">
- {{ $t("settings.general.workspace.audit-log-stdout.description") }}
- </div>
</div>
</div>
</template>
@@ -39,6 +53,7 @@ import { FeatureBadge } from "../FeatureGuard";
interface LocalState {
enableAuditLogStdout: boolean;
+ enableDebug: boolean;
}
defineProps<{
@@ -51,6 +66,7 @@ const hasAuditLogFeature = featureToRef(PlanFeature.FEATURE_AUDIT_LOG);
const getInitialState = (): LocalState => {
return {
enableAuditLogStdout: settingV1Store.workspaceProfile.enableAuditLogStdout,
+ enableDebug: settingV1Store.workspaceProfile.enableDebug,
};
};
@@ -68,12 +84,16 @@ const revert = () => {
const update = async () => {
const payload: Partial<WorkspaceProfileSetting> = {
enableAuditLogStdout: state.enableAuditLogStdout,
+ enableDebug: state.enableDebug,
};
await settingV1Store.updateWorkspaceProfile({
payload,
updateMask: create(FieldMaskSchema, {
- paths: ["value.workspace_profile.enable_audit_log_stdout"],
+ paths: [
+ "value.workspace_profile.enable_audit_log_stdout",
+ "value.workspace_profile.enable_debug",
+ ],
}),
});
diff --git a/frontend/src/components/ProfileDropdown.vue b/frontend/src/components/ProfileDropdown.vue
index 881cad2613..9e54a89e4b 100644
--- a/frontend/src/components/ProfileDropdown.vue
+++ b/frontend/src/components/ProfileDropdown.vue
@@ -34,7 +34,7 @@ import {
useUIStateStore,
} from "@/store";
import { PlanType } from "@/types/proto-es/v1/subscription_service_pb";
-import { hasWorkspacePermissionV2, isDev, isSQLEditorRoute } from "@/utils";
+import { isDev, isSQLEditorRoute } from "@/utils";
import Version from "./misc/Version.vue";
import ProfilePreview from "./ProfilePreview.vue";
import UserAvatar from "./User/UserAvatar.vue";
@@ -55,11 +55,6 @@ const currentUserV1 = useCurrentUserV1();
const showDropdown = ref(false);
const hideHelp = useAppFeature("bb.feature.hide-help");
-// For now, debug mode is a global setting and will affect all users.
-// So we only allow DBA and Owner to toggle it.
-const allowToggleDebug = computed(() => {
- return hasWorkspacePermissionV2("bb.settings.set");
-});
const { currentPlan } = storeToRefs(subscriptionStore);
const logout = () => {
@@ -92,14 +87,6 @@ const resetQuickstart = () => {
showDropdown.value = false;
};
-const { isDebug } = storeToRefs(actuatorStore);
-
-const switchDebug = () => {
- actuatorStore.patchDebug({
- debug: !isDebug.value,
- });
-};
-
const { enabledNewLayout, toggleLayout } = useIssueLayoutVersion();
const toggleLocale = (lang: string) => {
@@ -333,25 +320,6 @@ const options = computed((): DropdownOption[] => [
return <Version tooltipProps={{ placement: "left" }} />;
},
},
- {
- key: "debug",
- type: "render",
- show: allowToggleDebug.value,
- render() {
- return (
- <div class="menu-item">
- <div class="flex flex-row items-center gap-x-2 justify-between">
- <span>Debug</span>
- <NSwitch
- size="small"
- value={isDebug.value}
- onUpdate:value={switchDebug}
- />
- </div>
- </div>
- );
- },
- },
{
key: "enable-new-layout",
type: "render",
diff --git a/frontend/src/locales/en-US.json b/frontend/src/locales/en-US.json
index c258a08368..aaaf4c0bc9 100644
--- a/frontend/src/locales/en-US.json
+++ b/frontend/src/locales/en-US.json
@@ -659,6 +659,7 @@
"logo-upload-tip": "{extension} up to {size} MiB",
"security": "Security",
"account": "Account",
+ "log": "Log",
"watermark": {
"description": "Display watermarks on pages, including username, ID and email.",
"enable": "Enable watermark"
@@ -673,10 +674,12 @@
"description": "Help improve Bytebase by sharing anonymous usage data"
},
"audit-log-stdout": {
- "self": "Audit Log Export",
"enable": "Enable audit logging to stdout",
"description": "Output structured JSON audit logs to stdout for ingestion by log aggregators (Splunk, ELK, Datadog, Loki). Requires TEAM or ENTERPRISE license."
},
+ "enable-debug": {
+ "enable": "Enable debug level log for the backend service"
+ },
"disallow-signup": {
"enable": "Disallow self-service signup",
"description": "Users cannot self-service signup and can only be invited by the workspace admin."
diff --git a/frontend/src/locales/es-ES.json b/frontend/src/locales/es-ES.json
index daa539d9f9..cde4a3894c 100644
--- a/frontend/src/locales/es-ES.json
+++ b/frontend/src/locales/es-ES.json
@@ -659,6 +659,7 @@
"logo-upload-tip": "{extension} hasta {size} MiB",
"security": "Seguridad",
"account": "Cuenta",
+ "log": "Registro",
"watermark": {
"description": "Mostrar marcas de agua en las páginas, incluyendo el nombre de usuario, el ID y el correo electrónico.",
"enable": "Activar marca de agua"
@@ -673,10 +674,12 @@
"description": "Ayuda a mejorar Bytebase compartiendo datos de uso anónimos"
},
"audit-log-stdout": {
- "self": "Exportación de Registros de Auditoría",
"enable": "Habilitar el registro de auditoría en la salida estándar",
"description": "Generar registros de auditoría JSON estructurados en la salida estándar para su ingesta por agregadores de registros (Splunk, ELK, Datadog, Loki). Requiere licencia TEAM o ENTERPRISE."
},
+ "enable-debug": {
+ "enable": "Habilitar el nivel de registro de depuración para el servicio backend"
+ },
"disallow-signup": {
"enable": "Deshabilitar el registro de autoservicio",
"description": "Una vez deshabilitado, los usuarios no pueden registrarse por sí mismos y solo pueden ser invitados por el administrador del espacio de trabajo."
diff --git a/frontend/src/locales/ja-JP.json b/frontend/src/locales/ja-JP.json
index a49577ac0c..2d1a51eb54 100644
--- a/frontend/src/locales/ja-JP.json
+++ b/frontend/src/locales/ja-JP.json
@@ -659,6 +659,7 @@
"logo-upload-tip": "{extension} タイプのファイルをサポートします。{size} MiB より大きくすることはできません",
"security": "セキュリティ",
"account": "アカウント",
+ "log": "ログ",
"watermark": {
"description": "ユーザー名、ID、メールアドレスを含むページにウォーターマークを表示します。",
"enable": "ウォーターマークをオンにする"
@@ -673,10 +674,12 @@
"description": "匿名の使用データを共有してBytebaseの改善に協力する"
},
"audit-log-stdout": {
- "self": "監査ログエクスポート",
"enable": "監査ログの標準出力への出力を有効にする",
"description": "構造化されたJSON監査ログを標準出力に出力し、ログアグリゲーター(Splunk、ELK、Datadog、Loki)で取り込めるようにします。TEAMまたはENTERPRISEライセンスが必要です。"
},
+ "enable-debug": {
+ "enable": "バックエンドサービスのデバッグレベルのログを有効にする"
+ },
"disallow-signup": {
"enable": "セルフサービス登録を無効にする",
"description": "無効化されると、新しいユーザーは自己登録できなくなり、管理者の招待を通じてのみアカウントを作成できます。"
diff --git a/frontend/src/locales/vi-VN.json b/frontend/src/locales/vi-VN.json
index 2a52a2e94e..247764a803 100644
--- a/frontend/src/locales/vi-VN.json
+++ b/frontend/src/locales/vi-VN.json
@@ -659,6 +659,7 @@
"logo-upload-tip": "{extension} tối đa {size} MiB",
"security": "Bảo mật",
"account": "Tài khoản",
+ "log": "Nhật ký",
"watermark": {
"description": "Hiển thị hình mờ trên các trang, bao gồm tên người dùng, ID và email.",
"enable": "Bật hình mờ"
@@ -673,10 +674,12 @@
"description": "Giúp cải thiện Bytebase bằng cách chia sẻ dữ liệu sử dụng ẩn danh"
},
"audit-log-stdout": {
- "self": "Xuất Nhật ký Kiểm toán",
"enable": "Bật ghi nhật ký kiểm toán vào đầu ra chuẩn",
"description": "Xuất nhật ký kiểm toán JSON có cấu trúc vào đầu ra chuẩn để thu thập bởi các bộ tổng hợp nhật ký (Splunk, ELK, Datadog, Loki). Yêu cầu giấy phép TEAM hoặc ENTERPRISE."
},
+ "enable-debug": {
+ "enable": "Bật nhật ký cấp độ gỡ lỗi cho dịch vụ backend"
+ },
"disallow-signup": {
"enable": "Không cho phép đăng ký tự phục vụ",
"description": "Người dùng không thể tự đăng ký và chỉ có thể được mời bởi quản trị viên không gian làm việc."
diff --git a/frontend/src/locales/zh-CN.json b/frontend/src/locales/zh-CN.json
index f0bc0041c4..8c37c98659 100644
--- a/frontend/src/locales/zh-CN.json
+++ b/frontend/src/locales/zh-CN.json
@@ -659,6 +659,7 @@
"logo-upload-tip": "支持 {extension} 类型文件,不能大于 {size} MiB",
"security": "安全",
"account": "帐户",
+ "log": "日志",
"watermark": {
"description": "在页面上显示水印,包含用户名、ID 和 Email。",
"enable": "开启水印"
@@ -673,10 +674,12 @@
"description": "通过分享匿名使用数据帮助改进 Bytebase"
},
"audit-log-stdout": {
- "self": "审计日志导出",
"enable": "启用审计日志输出到标准输出",
"description": "将结构化的 JSON 审计日志输出到标准输出,以便日志聚合器(Splunk、ELK、Datadog、Loki)摄取。需要 TEAM 或 ENTERPRISE 许可证。"
},
+ "enable-debug": {
+ "enable": "启用后端服务的调试级别日志"
+ },
"disallow-signup": {
"enable": "禁用自助注册",
"description": "禁用之后,新用户将无法自助注册,只能通过管理员邀请来创建账户。"
diff --git a/frontend/src/store/modules/v1/actuator.ts b/frontend/src/store/modules/v1/actuator.ts
index 2f1d94f24e..2967cf9879 100644
--- a/frontend/src/store/modules/v1/actuator.ts
+++ b/frontend/src/store/modules/v1/actuator.ts
@@ -75,8 +75,6 @@ export const useActuatorV1Store = defineStore("actuator_v1", () => {
const isDemo = computed(() => serverInfo.value?.demo);
- const isDebug = computed(() => serverInfo.value?.debug || false);
-
const isDocker = computed(() => serverInfo.value?.docker || false);
const isSaaSMode = computed(() => serverInfo.value?.saas || false);
@@ -183,18 +181,6 @@ export const useActuatorV1Store = defineStore("actuator_v1", () => {
return info;
};
- const patchDebug = async ({ debug }: { debug: boolean }) => {
- const info = await actuatorServiceClientConnect.updateActuatorInfo({
- actuator: {
- debug,
- },
- updateMask: {
- paths: ["debug"],
- },
- });
- setServerInfo(info);
- };
-
const fetchLatestRelease = async (): Promise<Release | undefined> => {
try {
const releaseList = await useSilentRequest(async () => {
@@ -281,7 +267,6 @@ export const useActuatorV1Store = defineStore("actuator_v1", () => {
gitCommitBE,
gitCommitFE,
isDemo,
- isDebug,
isDocker,
isSaaSMode,
needAdminSetup,
@@ -296,7 +281,6 @@ export const useActuatorV1Store = defineStore("actuator_v1", () => {
setLogo,
setServerInfo,
fetchServerInfo,
- patchDebug,
fetchLatestRelease,
tryToRemindRelease,
tryToRemindRefresh,
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 9e65b85987..5b92c5cd40 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
@@ -4,7 +4,7 @@
import type { GenFile, GenMessage, GenService } from "@bufbuild/protobuf/codegenv2";
import type { Message } from "@bufbuild/protobuf";
-import type { EmptySchema, FieldMask, Timestamp } from "@bufbuild/protobuf/wkt";
+import type { EmptySchema, Timestamp } from "@bufbuild/protobuf/wkt";
import type { UserType } from "./user_service_pb";
import type { State } from "./common_pb";
@@ -75,41 +75,6 @@ export declare type GetActuatorInfoRequest = Message<"bytebase.v1.GetActuatorInf
*/
export declare const GetActuatorInfoRequestSchema: GenMessage<GetActuatorInfoRequest>;
-/**
- * Request message for updating actuator information.
- *
- * @generated from message bytebase.v1.UpdateActuatorInfoRequest
- */
-export declare type UpdateActuatorInfoRequest = Message<"bytebase.v1.UpdateActuatorInfoRequest"> & {
- /**
- * The actuator to update.
- *
- * @generated from field: bytebase.v1.ActuatorInfo actuator = 1;
- */
- actuator?: ActuatorInfo;
-
- /**
- * The list of fields to update.
- *
- * @generated from field: google.protobuf.FieldMask update_mask = 2;
- */
- updateMask?: FieldMask;
-
- /**
- * If set to true, and the actuator is not found, a new actuator will be created.
- * In this situation, `update_mask` is ignored.
- *
- * @generated from field: bool allow_missing = 3;
- */
- allowMissing: boolean;
-};
-
-/**
- * Describes the message bytebase.v1.UpdateActuatorInfoRequest.
- * Use `create(UpdateActuatorInfoRequestSchema)` to create a new message.
- */
-export declare const UpdateActuatorInfoRequestSchema: GenMessage<UpdateActuatorInfoRequest>;
-
/**
* Request message for deleting cache.
*
@@ -208,13 +173,6 @@ export declare type ActuatorInfo = Message<"bytebase.v1.ActuatorInfo"> & {
*/
workspaceId: string;
- /**
- * Whether debug mode is enabled.
- *
- * @generated from field: bool debug = 14;
- */
- debug: boolean;
-
/**
* List of features that are not licensed.
*
@@ -322,17 +280,6 @@ export declare const ActuatorService: GenService<{
input: typeof GetActuatorInfoRequestSchema;
output: typeof ActuatorInfoSchema;
},
- /**
- * Updates system configuration settings for the Bytebase instance.
- * Permissions required: bb.settings.set
- *
- * @generated from rpc bytebase.v1.ActuatorService.UpdateActuatorInfo
- */
- updateActuatorInfo: {
- methodKind: "unary";
- input: typeof UpdateActuatorInfoRequestSchema;
- output: typeof ActuatorInfoSchema;
- },
/**
* Sets up sample data for demonstration and testing purposes.
* Permissions required: bb.projects.create
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 af378aa362..d42c98984e 100644
--- a/frontend/src/types/proto-es/v1/actuator_service_pb.js
+++ b/frontend/src/types/proto-es/v1/actuator_service_pb.js
@@ -6,7 +6,7 @@ import { fileDesc, messageDesc, serviceDesc } from "@bufbuild/protobuf/codegenv2
import { file_google_api_annotations } from "../google/api/annotations_pb";
import { file_google_api_client } from "../google/api/client_pb";
import { file_google_api_field_behavior } from "../google/api/field_behavior_pb";
-import { file_google_protobuf_empty, file_google_protobuf_field_mask, file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";
+import { file_google_protobuf_empty, file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";
import { file_v1_annotation } from "./annotation_pb";
import { file_v1_common } from "./common_pb";
import { file_v1_user_service } from "./user_service_pb";
@@ -15,7 +15,7 @@ import { file_v1_user_service } from "./user_service_pb";
* Describes the file v1/actuator_service.proto.
*/
export const file_v1_actuator_service = /*@__PURE__*/
- fileDesc("Chl2MS9hY3R1YXRvcl9zZXJ2aWNlLnByb3RvEgtieXRlYmFzZS52MSIbChlHZXRSZXNvdXJjZVBhY2thZ2VSZXF1ZXN0Ih8KD1Jlc291cmNlUGFja2FnZRIMCgRsb2dvGAEgASgMIhQKElNldHVwU2FtcGxlUmVxdWVzdCIYChZHZXRBY3R1YXRvckluZm9SZXF1ZXN0IpoBChlVcGRhdGVBY3R1YXRvckluZm9SZXF1ZXN0EjAKCGFjdHVhdG9yGAEgASgLMhkuYnl0ZWJhc2UudjEuQWN0dWF0b3JJbmZvQgPgQQISNAoLdXBkYXRlX21hc2sYAiABKAsyGi5nb29nbGUucHJvdG9idWYuRmllbGRNYXNrQgPgQQISFQoNYWxsb3dfbWlzc2luZxgDIAEoCCIUChJEZWxldGVDYWNoZVJlcXVlc3QivgUKDEFjdHVhdG9ySW5mbxIUCgd2ZXJzaW9uGAEgASgJQgPgQQMSFwoKZ2l0X2NvbW1pdBgCIAEoCUID4EEDEhUKCHJlYWRvbmx5GAMgASgIQgPgQQMSEQoEc2FhcxgEIAEoCEID4EEDEhEKBGRlbW8YBSABKAhCA+BBAxIRCgRob3N0GAYgASgJQgPgQQMSEQoEcG9ydBgHIAEoCUID4EEDEhkKDGV4dGVybmFsX3VybBgIIAEoCUID4EEDEh0KEG5lZWRfYWRtaW5fc2V0dXAYCSABKAhCA+BBAxI5ChBsYXN0X2FjdGl2ZV90aW1lGAsgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEhkKDHdvcmtzcGFjZV9pZBgNIAEoCUID4EEDEg0KBWRlYnVnGA4gASgIEiAKE3VubGljZW5zZWRfZmVhdHVyZXMYDyADKAlCA+BBAxITCgZkb2NrZXIYEiABKAhCA+BBAxI7Cgp1c2VyX3N0YXRzGBMgAygLMiIuYnl0ZWJhc2UudjEuQWN0dWF0b3JJbmZvLlN0YXRVc2VyQgPgQQMSJQoYYWN0aXZhdGVkX2luc3RhbmNlX2NvdW50GBQgASgFQgPgQQMSIQoUdG90YWxfaW5zdGFuY2VfY291bnQYFSABKAVCA+BBAxIaCg1lbmFibGVfc2FtcGxlGBYgASgIQgPgQQMSIwoWZXh0ZXJuYWxfdXJsX2Zyb21fZmxhZxgXIAEoCEID4EEDGmYKCFN0YXRVc2VyEigKCXVzZXJfdHlwZRgBIAEoDjIVLmJ5dGViYXNlLnYxLlVzZXJUeXBlEiEKBXN0YXRlGAIgASgOMhIuYnl0ZWJhc2UudjEuU3RhdGUSDQoFY291bnQYAyABKAVKBAgKEAtKBAgMEA1KBAgQEBFKBAgREBIypAUKD0FjdHVhdG9yU2VydmljZRJzCg9HZXRBY3R1YXRvckluZm8SIy5ieXRlYmFzZS52MS5HZXRBY3R1YXRvckluZm9SZXF1ZXN0GhkuYnl0ZWJhc2UudjEuQWN0dWF0b3JJbmZvIiDaQQCA6jABgtPkkwITEhEvdjEvYWN0dWF0b3IvaW5mbxKqAQoSVXBkYXRlQWN0dWF0b3JJbmZvEiYuYnl0ZWJhc2UudjEuVXBkYXRlQWN0dWF0b3JJbmZvUmVxdWVzdBoZLmJ5dGViYXNlLnYxLkFjdHVhdG9ySW5mbyJR2kEUYWN0dWF0b3IsdXBkYXRlX21hc2uK6jAPYmIuc2V0dGluZ3Muc2V0kOowAYLT5JMCHToIYWN0dWF0b3IyES92MS9hY3R1YXRvci9pbmZvEoIBCgtTZXR1cFNhbXBsZRIfLmJ5dGViYXNlLnYxLlNldHVwU2FtcGxlUmVxdWVzdBoWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eSI6iuowEmJiLnByb2plY3RzLmNyZWF0ZZDqMAGC0+STAhoiGC92MS9hY3R1YXRvcjpzZXR1cFNhbXBsZRJmCgtEZWxldGVDYWNoZRIfLmJ5dGViYXNlLnYxLkRlbGV0ZUNhY2hlUmVxdWVzdBoWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eSIegOowAYLT5JMCFCoSL3YxL2FjdHVhdG9yL2NhY2hlEoEBChJHZXRSZXNvdXJjZVBhY2thZ2USJi5ieXRlYmFzZS52MS5HZXRSZXNvdXJjZVBhY2thZ2VSZXF1ZXN0GhwuYnl0ZWJhc2UudjEuUmVzb3VyY2VQYWNrYWdlIiXaQQCA6jABgtPkkwIYEhYvdjEvYWN0dWF0b3IvcmVzb3VyY2VzQqoBCg9jb20uYnl0ZWJhc2UudjFCFEFjdHVhdG9yU2VydmljZVByb3RvUAFaNGdpdGh1Yi5jb20vYnl0ZWJhc2UvYnl0ZWJhc2UvYmFja2VuZC9nZW5lcmF0ZWQtZ28vdjGiAgNCWFiqAgtCeXRlYmFzZS5WMcoCC0J5dGViYXNlXFYx4gIXQnl0ZWJhc2VcVjFcR1BCTWV0YWRhdGHqAgxCeXRlYmFzZTo6VjFiBnByb3RvMw", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_protobuf_empty, file_google_protobuf_field_mask, file_google_protobuf_timestamp, file_v1_annotation, file_v1_common, file_v1_user_service]);
+ fileDesc("Chl2MS9hY3R1YXRvcl9zZXJ2aWNlLnByb3RvEgtieXRlYmFzZS52MSIbChlHZXRSZXNvdXJjZVBhY2thZ2VSZXF1ZXN0Ih8KD1Jlc291cmNlUGFja2FnZRIMCgRsb2dvGAEgASgMIhQKElNldHVwU2FtcGxlUmVxdWVzdCIYChZHZXRBY3R1YXRvckluZm9SZXF1ZXN0IhQKEkRlbGV0ZUNhY2hlUmVxdWVzdCK1BQoMQWN0dWF0b3JJbmZvEhQKB3ZlcnNpb24YASABKAlCA+BBAxIXCgpnaXRfY29tbWl0GAIgASgJQgPgQQMSFQoIcmVhZG9ubHkYAyABKAhCA+BBAxIRCgRzYWFzGAQgASgIQgPgQQMSEQoEZGVtbxgFIAEoCEID4EEDEhEKBGhvc3QYBiABKAlCA+BBAxIRCgRwb3J0GAcgASgJQgPgQQMSGQoMZXh0ZXJuYWxfdXJsGAggASgJQgPgQQMSHQoQbmVlZF9hZG1pbl9zZXR1cBgJIAEoCEID4EEDEjkKEGxhc3RfYWN0aXZlX3RpbWUYCyABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSGQoMd29ya3NwYWNlX2lkGA0gASgJQgPgQQMSIAoTdW5saWNlbnNlZF9mZWF0dXJlcxgPIAMoCUID4EEDEhMKBmRvY2tlchgSIAEoCEID4EEDEjsKCnVzZXJfc3RhdHMYEyADKAsyIi5ieXRlYmFzZS52MS5BY3R1YXRvckluZm8uU3RhdFVzZXJCA+BBAxIlChhhY3RpdmF0ZWRfaW5zdGFuY2VfY291bnQYFCABKAVCA+BBAxIhChR0b3RhbF9pbnN0YW5jZV9jb3VudBgVIAEoBUID4EEDEhoKDWVuYWJsZV9zYW1wbGUYFiABKAhCA+BBAxIjChZleHRlcm5hbF91cmxfZnJvbV9mbGFnGBcgASgIQgPgQQMaZgoIU3RhdFVzZXISKAoJdXNlcl90eXBlGAEgASgOMhUuYnl0ZWJhc2UudjEuVXNlclR5cGUSIQoFc3RhdGUYAiABKA4yEi5ieXRlYmFzZS52MS5TdGF0ZRINCgVjb3VudBgDIAEoBUoECAoQC0oECAwQDUoECBAQEUoECBEQEkoECA4QDzL3AwoPQWN0dWF0b3JTZXJ2aWNlEnMKD0dldEFjdHVhdG9ySW5mbxIjLmJ5dGViYXNlLnYxLkdldEFjdHVhdG9ySW5mb1JlcXVlc3QaGS5ieXRlYmFzZS52MS5BY3R1YXRvckluZm8iINpBAIDqMAGC0+STAhMSES92MS9hY3R1YXRvci9pbmZvEoIBCgtTZXR1cFNhbXBsZRIfLmJ5dGViYXNlLnYxLlNldHVwU2FtcGxlUmVxdWVzdBoWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eSI6iuowEmJiLnByb2plY3RzLmNyZWF0ZZDqMAGC0+STAhoiGC92MS9hY3R1YXRvcjpzZXR1cFNhbXBsZRJmCgtEZWxldGVDYWNoZRIfLmJ5dGViYXNlLnYxLkRlbGV0ZUNhY2hlUmVxdWVzdBoWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eSIegOowAYLT5JMCFCoSL3YxL2FjdHVhdG9yL2NhY2hlEoEBChJHZXRSZXNvdXJjZVBhY2thZ2USJi5ieXRlYmFzZS52MS5HZXRSZXNvdXJjZVBhY2thZ2VSZXF1ZXN0GhwuYnl0ZWJhc2UudjEuUmVzb3VyY2VQYWNrYWdlIiXaQQCA6jABgtPkkwIYEhYvdjEvYWN0dWF0b3IvcmVzb3VyY2VzQqoBCg9jb20uYnl0ZWJhc2UudjFCFEFjdHVhdG9yU2VydmljZVByb3RvUAFaNGdpdGh1Yi5jb20vYnl0ZWJhc2UvYnl0ZWJhc2UvYmFja2VuZC9nZW5lcmF0ZWQtZ28vdjGiAgNCWFiqAgtCeXRlYmFzZS5WMcoCC0J5dGViYXNlXFYx4gIXQnl0ZWJhc2VcVjFcR1BCTWV0YWRhdGHqAgxCeXRlYmFzZTo6VjFiBnByb3RvMw", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_protobuf_empty, file_google_protobuf_timestamp, file_v1_annotation, file_v1_common, file_v1_user_service]);
/**
* Describes the message bytebase.v1.GetResourcePackageRequest.
@@ -45,33 +45,26 @@ export const SetupSampleRequestSchema = /*@__PURE__*/
export const GetActuatorInfoRequestSchema = /*@__PURE__*/
messageDesc(file_v1_actuator_service, 3);
-/**
- * Describes the message bytebase.v1.UpdateActuatorInfoRequest.
- * Use `create(UpdateActuatorInfoRequestSchema)` to create a new message.
- */
-export const UpdateActuatorInfoRequestSchema = /*@__PURE__*/
- messageDesc(file_v1_actuator_service, 4);
-
/**
* Describes the message bytebase.v1.DeleteCacheRequest.
* Use `create(DeleteCacheRequestSchema)` to create a new message.
*/
export const DeleteCacheRequestSchema = /*@__PURE__*/
- messageDesc(file_v1_actuator_service, 5);
+ messageDesc(file_v1_actuator_service, 4);
/**
* Describes the message bytebase.v1.ActuatorInfo.
* Use `create(ActuatorInfoSchema)` to create a new message.
*/
export const ActuatorInfoSchema = /*@__PURE__*/
- messageDesc(file_v1_actuator_service, 6);
+ messageDesc(file_v1_actuator_service, 5);
/**
* Describes the message bytebase.v1.ActuatorInfo.StatUser.
* Use `create(ActuatorInfo_StatUserSchema)` to create a new message.
*/
export const ActuatorInfo_StatUserSchema = /*@__PURE__*/
- messageDesc(file_v1_actuator_service, 6, 0);
+ messageDesc(file_v1_actuator_service, 5, 0);
/**
* ActuatorService manages system health and operational information.
diff --git a/frontend/src/types/proto-es/v1/setting_service_pb.d.ts b/frontend/src/types/proto-es/v1/setting_service_pb.d.ts
index 7d8714de82..15ef9a94ae 100644
--- a/frontend/src/types/proto-es/v1/setting_service_pb.d.ts
+++ b/frontend/src/types/proto-es/v1/setting_service_pb.d.ts
@@ -506,13 +506,6 @@ export declare type WorkspaceProfileSetting = Message<"bytebase.v1.WorkspaceProf
*/
refreshTokenDuration?: Duration;
- /**
- * The duration for access token. Default is 1 hour.
- *
- * @generated from field: google.protobuf.Duration access_token_duration = 18;
- */
- accessTokenDuration?: Duration;
-
/**
* The setting of custom announcement
*
@@ -605,6 +598,20 @@ export declare type WorkspaceProfileSetting = Message<"bytebase.v1.WorkspaceProf
* @generated from field: bytebase.v1.WorkspaceProfileSetting.PasswordRestriction password_restriction = 17;
*/
passwordRestriction?: WorkspaceProfileSetting_PasswordRestriction;
+
+ /**
+ * The duration for access token. Default is 1 hour.
+ *
+ * @generated from field: google.protobuf.Duration access_token_duration = 18;
+ */
+ accessTokenDuration?: Duration;
+
+ /**
+ * Whether debug mode is enabled.
+ *
+ * @generated from field: bool enable_debug = 19;
+ */
+ enableDebug: boolean;
};
/**
diff --git a/frontend/src/types/proto-es/v1/setting_service_pb.js b/frontend/src/types/proto-es/v1/setting_service_pb.js
index aeb035316f..4579c3b041 100644
--- a/frontend/src/types/proto-es/v1/setting_service_pb.js
+++ b/frontend/src/types/proto-es/v1/setting_service_pb.js
@@ -17,7 +17,7 @@ import { file_v1_issue_service } from "./issue_service_pb";
* Describes the file v1/setting_service.proto.
*/
export const file_v1_setting_service = /*@__PURE__*/
- fileDesc("Chh2MS9zZXR0aW5nX3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIhUKE0xpc3RTZXR0aW5nc1JlcXVlc3QiPgoUTGlzdFNldHRpbmdzUmVzcG9uc2USJgoIc2V0dGluZ3MYASADKAsyFC5ieXRlYmFzZS52MS5TZXR0aW5nIj8KEUdldFNldHRpbmdSZXF1ZXN0EioKBG5hbWUYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1NldHRpbmciOwoSR2V0U2V0dGluZ1Jlc3BvbnNlEiUKB3NldHRpbmcYASABKAsyFC5ieXRlYmFzZS52MS5TZXR0aW5nIqEBChRVcGRhdGVTZXR0aW5nUmVxdWVzdBIqCgdzZXR0aW5nGAEgASgLMhQuYnl0ZWJhc2UudjEuU2V0dGluZ0ID4EECEhUKDXZhbGlkYXRlX29ubHkYAiABKAgSFQoNYWxsb3dfbWlzc2luZxgDIAEoCBIvCgt1cGRhdGVfbWFzaxgEIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2siqQIKB1NldHRpbmcSEQoEbmFtZRgBIAEoCUID4EEIEi0KBXZhbHVlGAIgASgLMhkuYnl0ZWJhc2UudjEuU2V0dGluZ1ZhbHVlQgPgQQIirAEKC1NldHRpbmdOYW1lEhwKGFNFVFRJTkdfTkFNRV9VTlNQRUNJRklFRBAAEhUKEVdPUktTUEFDRV9QUk9GSUxFEAESFgoSV09SS1NQQUNFX0FQUFJPVkFMEAISCgoGQVBQX0lNEAMSBgoCQUkQBBIXChNEQVRBX0NMQVNTSUZJQ0FUSU9OEAUSEgoOU0VNQU5USUNfVFlQRVMQBhIPCgtFTlZJUk9OTUVOVBAHOi3qQSoKFGJ5dGViYXNlLmNvbS9TZXR0aW5nEhJzZXR0aW5ncy97c2V0dGluZ30irAMKDFNldHRpbmdWYWx1ZRIrCgZhcHBfaW0YASABKAsyGS5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmdIABJBChF3b3Jrc3BhY2VfcHJvZmlsZRgCIAEoCzIkLmJ5dGViYXNlLnYxLldvcmtzcGFjZVByb2ZpbGVTZXR0aW5nSAASQwoSd29ya3NwYWNlX2FwcHJvdmFsGAMgASgLMiUuYnl0ZWJhc2UudjEuV29ya3NwYWNlQXBwcm92YWxTZXR0aW5nSAASRQoTZGF0YV9jbGFzc2lmaWNhdGlvbhgEIAEoCzImLmJ5dGViYXNlLnYxLkRhdGFDbGFzc2lmaWNhdGlvblNldHRpbmdIABI5Cg1zZW1hbnRpY190eXBlGAUgASgLMiAuYnl0ZWJhc2UudjEuU2VtYW50aWNUeXBlU2V0dGluZ0gAEiQKAmFpGAYgASgLMhYuYnl0ZWJhc2UudjEuQUlTZXR0aW5nSAASNgoLZW52aXJvbm1lbnQYByABKAsyHy5ieXRlYmFzZS52MS5FbnZpcm9ubWVudFNldHRpbmdIAEIHCgV2YWx1ZSK8BgoMQXBwSU1TZXR0aW5nEjUKCHNldHRpbmdzGAEgAygLMiMuYnl0ZWJhc2UudjEuQXBwSU1TZXR0aW5nLklNU2V0dGluZxobCgVTbGFjaxISCgV0b2tlbhgBIAEoCUID4EEEGjYKBkZlaXNodRITCgZhcHBfaWQYASABKAlCA+BBBBIXCgphcHBfc2VjcmV0GAIgASgJQgPgQQQaSQoFV2Vjb20SFAoHY29ycF9pZBgBIAEoCUID4EEEEhUKCGFnZW50X2lkGAIgASgJQgPgQQQSEwoGc2VjcmV0GAMgASgJQgPgQQQaNAoETGFyaxITCgZhcHBfaWQYASABKAlCA+BBBBIXCgphcHBfc2VjcmV0GAIgASgJQgPgQQQaVwoIRGluZ1RhbGsSFgoJY2xpZW50X2lkGAEgASgJQgPgQQQSGgoNY2xpZW50X3NlY3JldBgCIAEoCUID4EEEEhcKCnJvYm90X2NvZGUYAyABKAlCA+BBBBpTCgVUZWFtcxIWCgl0ZW5hbnRfaWQYASABKAlCA+BBBBIWCgljbGllbnRfaWQYAiABKAlCA+BBBBIaCg1jbGllbnRfc2VjcmV0GAMgASgJQgPgQQQa8AIKCUlNU2V0dGluZxImCgR0eXBlGAEgASgOMhguYnl0ZWJhc2UudjEuV2ViaG9va1R5cGUSMAoFc2xhY2sYAiABKAsyHy5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmcuU2xhY2tIABIyCgZmZWlzaHUYAyABKAsyIC5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmcuRmVpc2h1SAASMAoFd2Vjb20YBCABKAsyHy5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmcuV2Vjb21IABIuCgRsYXJrGAUgASgLMh4uYnl0ZWJhc2UudjEuQXBwSU1TZXR0aW5nLkxhcmtIABI2CghkaW5ndGFsaxgGIAEoCzIiLmJ5dGViYXNlLnYxLkFwcElNU2V0dGluZy5EaW5nVGFsa0gAEjAKBXRlYW1zGAcgASgLMh8uYnl0ZWJhc2UudjEuQXBwSU1TZXR0aW5nLlRlYW1zSABCCQoHcGF5bG9hZCL5BwoXV29ya3NwYWNlUHJvZmlsZVNldHRpbmcSFAoMZXh0ZXJuYWxfdXJsGAEgASgJEhcKD2Rpc2FsbG93X3NpZ251cBgCIAEoCBITCgtyZXF1aXJlXzJmYRgDIAEoCBI5ChZyZWZyZXNoX3Rva2VuX2R1cmF0aW9uGAQgASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uEjgKFWFjY2Vzc190b2tlbl9kdXJhdGlvbhgSIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbhIvCgxhbm5vdW5jZW1lbnQYBSABKAsyGS5ieXRlYmFzZS52MS5Bbm5vdW5jZW1lbnQSOgoXbWF4aW11bV9yb2xlX2V4cGlyYXRpb24YBiABKAsyGS5nb29nbGUucHJvdG9idWYuRHVyYXRpb24SDwoHZG9tYWlucxgHIAMoCRIfChdlbmZvcmNlX2lkZW50aXR5X2RvbWFpbhgIIAEoCBI9ChRkYXRhYmFzZV9jaGFuZ2VfbW9kZRgJIAEoDjIfLmJ5dGViYXNlLnYxLkRhdGFiYXNlQ2hhbmdlTW9kZRIgChhkaXNhbGxvd19wYXNzd29yZF9zaWduaW4YCiABKAgSIAoYZW5hYmxlX21ldHJpY19jb2xsZWN0aW9uGAsgASgIEjsKGGluYWN0aXZlX3Nlc3Npb25fdGltZW91dBgMIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbhIfChdlbmFibGVfYXVkaXRfbG9nX3N0ZG91dBgNIAEoCBIRCgl3YXRlcm1hcmsYDiABKAgSHAoUZGlyZWN0b3J5X3N5bmNfdG9rZW4YDyABKAkSFQoNYnJhbmRpbmdfbG9nbxgQIAEoCRJWChRwYXNzd29yZF9yZXN0cmljdGlvbhgRIAEoCzI4LmJ5dGViYXNlLnYxLldvcmtzcGFjZVByb2ZpbGVTZXR0aW5nLlBhc3N3b3JkUmVzdHJpY3Rpb24ahAIKE1Bhc3N3b3JkUmVzdHJpY3Rpb24SEgoKbWluX2xlbmd0aBgBIAEoBRIWCg5yZXF1aXJlX251bWJlchgCIAEoCBIWCg5yZXF1aXJlX2xldHRlchgDIAEoCBIgChhyZXF1aXJlX3VwcGVyY2FzZV9sZXR0ZXIYBCABKAgSIQoZcmVxdWlyZV9zcGVjaWFsX2NoYXJhY3RlchgFIAEoCBIuCiZyZXF1aXJlX3Jlc2V0X3Bhc3N3b3JkX2Zvcl9maXJzdF9sb2dpbhgGIAEoCBI0ChFwYXNzd29yZF9yb3RhdGlvbhgHIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbiKvAQoMQW5ub3VuY2VtZW50EjMKBWxldmVsGAEgASgOMiQuYnl0ZWJhc2UudjEuQW5ub3VuY2VtZW50LkFsZXJ0TGV2ZWwSDAoEdGV4dBgCIAEoCRIMCgRsaW5rGAMgASgJIk4KCkFsZXJ0TGV2ZWwSGwoXQUxFUlRfTEVWRUxfVU5TUEVDSUZJRUQQABIICgRJTkZPEAESCwoHV0FSTklORxACEgwKCENSSVRJQ0FMEAMi5wIKGFdvcmtzcGFjZUFwcHJvdmFsU2V0dGluZxI5CgVydWxlcxgBIAMoCzIqLmJ5dGViYXNlLnYxLldvcmtzcGFjZUFwcHJvdmFsU2V0dGluZy5SdWxlGo8CCgRSdWxlEi8KCHRlbXBsYXRlGAEgASgLMh0uYnl0ZWJhc2UudjEuQXBwcm92YWxUZW1wbGF0ZRIkCgljb25kaXRpb24YAiABKAsyES5nb29nbGUudHlwZS5FeHByEkEKBnNvdXJjZRgDIAEoDjIxLmJ5dGViYXNlLnYxLldvcmtzcGFjZUFwcHJvdmFsU2V0dGluZy5SdWxlLlNvdXJjZSJtCgZTb3VyY2USFgoSU09VUkNFX1VOU1BFQ0lGSUVEEAASEwoPQ0hBTkdFX0RBVEFCQVNFEAESEwoPQ1JFQVRFX0RBVEFCQVNFEAISDwoLRVhQT1JUX0RBVEEQAxIQCgxSRVFVRVNUX1JPTEUQBCKYBQoZRGF0YUNsYXNzaWZpY2F0aW9uU2V0dGluZxJQCgdjb25maWdzGAEgAygLMj8uYnl0ZWJhc2UudjEuRGF0YUNsYXNzaWZpY2F0aW9uU2V0dGluZy5EYXRhQ2xhc3NpZmljYXRpb25Db25maWcaqAQKGERhdGFDbGFzc2lmaWNhdGlvbkNvbmZpZxIKCgJpZBgBIAEoCRINCgV0aXRsZRgCIAEoCRJVCgZsZXZlbHMYAyADKAsyRS5ieXRlYmFzZS52MS5EYXRhQ2xhc3NpZmljYXRpb25TZXR0aW5nLkRhdGFDbGFzc2lmaWNhdGlvbkNvbmZpZy5MZXZlbBJrCg5jbGFzc2lmaWNhdGlvbhgEIAMoCzJTLmJ5dGViYXNlLnYxLkRhdGFDbGFzc2lmaWNhdGlvblNldHRpbmcuRGF0YUNsYXNzaWZpY2F0aW9uQ29uZmlnLkNsYXNzaWZpY2F0aW9uRW50cnkaNwoFTGV2ZWwSCgoCaWQYASABKAkSDQoFdGl0bGUYAiABKAkSEwoLZGVzY3JpcHRpb24YAyABKAkaaAoSRGF0YUNsYXNzaWZpY2F0aW9uEgoKAmlkGAEgASgJEg0KBXRpdGxlGAIgASgJEhMKC2Rlc2NyaXB0aW9uGAMgASgJEhUKCGxldmVsX2lkGAQgASgJSACIAQFCCwoJX2xldmVsX2lkGokBChNDbGFzc2lmaWNhdGlvbkVudHJ5EgsKA2tleRgBIAEoCRJhCgV2YWx1ZRgCIAEoCzJSLmJ5dGViYXNlLnYxLkRhdGFDbGFzc2lmaWNhdGlvblNldHRpbmcuRGF0YUNsYXNzaWZpY2F0aW9uQ29uZmlnLkRhdGFDbGFzc2lmaWNhdGlvbjoCOAEizAEKE1NlbWFudGljVHlwZVNldHRpbmcSPAoFdHlwZXMYASADKAsyLS5ieXRlYmFzZS52MS5TZW1hbnRpY1R5cGVTZXR0aW5nLlNlbWFudGljVHlwZRp3CgxTZW1hbnRpY1R5cGUSCgoCaWQYASABKAkSDQoFdGl0bGUYAiABKAkSEwoLZGVzY3JpcHRpb24YAyABKAkSKQoJYWxnb3JpdGhtGAYgASgLMhYuYnl0ZWJhc2UudjEuQWxnb3JpdGhtEgwKBGljb24YByABKAki/wQKCUFsZ29yaXRobRI0CglmdWxsX21hc2sYASABKAsyHy5ieXRlYmFzZS52MS5BbGdvcml0aG0uRnVsbE1hc2tIABI2CgpyYW5nZV9tYXNrGAIgASgLMiAuYnl0ZWJhc2UudjEuQWxnb3JpdGhtLlJhbmdlTWFza0gAEjIKCG1kNV9tYXNrGAMgASgLMh4uYnl0ZWJhc2UudjEuQWxnb3JpdGhtLk1ENU1hc2tIABJBChBpbm5lcl9vdXRlcl9tYXNrGAQgASgLMiUuYnl0ZWJhc2UudjEuQWxnb3JpdGhtLklubmVyT3V0ZXJNYXNrSAAaIAoIRnVsbE1hc2sSFAoMc3Vic3RpdHV0aW9uGAEgASgJGn4KCVJhbmdlTWFzaxI2CgZzbGljZXMYASADKAsyJi5ieXRlYmFzZS52MS5BbGdvcml0aG0uUmFuZ2VNYXNrLlNsaWNlGjkKBVNsaWNlEg0KBXN0YXJ0GAEgASgFEgsKA2VuZBgCIAEoBRIUCgxzdWJzdGl0dXRpb24YAyABKAkaFwoHTUQ1TWFzaxIMCgRzYWx0GAEgASgJGskBCg5Jbm5lck91dGVyTWFzaxISCgpwcmVmaXhfbGVuGAEgASgFEhIKCnN1ZmZpeF9sZW4YAiABKAUSPAoEdHlwZRgDIAEoDjIuLmJ5dGViYXNlLnYxLkFsZ29yaXRobS5Jbm5lck91dGVyTWFzay5NYXNrVHlwZRIUCgxzdWJzdGl0dXRpb24YBCABKAkiOwoITWFza1R5cGUSGQoVTUFTS19UWVBFX1VOU1BFQ0lGSUVEEAASCQoFSU5ORVIQARIJCgVPVVRFUhACQgYKBG1hc2si7wEKCUFJU2V0dGluZxIPCgdlbmFibGVkGAEgASgIEjEKCHByb3ZpZGVyGAIgASgOMh8uYnl0ZWJhc2UudjEuQUlTZXR0aW5nLlByb3ZpZGVyEhAKCGVuZHBvaW50GAMgASgJEg8KB2FwaV9rZXkYBCABKAkSDQoFbW9kZWwYBSABKAkSDwoHdmVyc2lvbhgGIAEoCSJbCghQcm92aWRlchIYChRQUk9WSURFUl9VTlNQRUNJRklFRBAAEgsKB09QRU5fQUkQARIKCgZDTEFVREUQAhIKCgZHRU1JTkkQAxIQCgxBWlVSRV9PUEVOQUkQBCKWAgoSRW52aXJvbm1lbnRTZXR0aW5nEkEKDGVudmlyb25tZW50cxgBIAMoCzIrLmJ5dGViYXNlLnYxLkVudmlyb25tZW50U2V0dGluZy5FbnZpcm9ubWVudBq8AQoLRW52aXJvbm1lbnQSEQoEbmFtZRgBIAEoCUID4EEDEgoKAmlkGAIgASgJEg0KBXRpdGxlGAMgASgJEkMKBHRhZ3MYBCADKAsyNS5ieXRlYmFzZS52MS5FbnZpcm9ubWVudFNldHRpbmcuRW52aXJvbm1lbnQuVGFnc0VudHJ5Eg0KBWNvbG9yGAUgASgJGisKCVRhZ3NFbnRyeRILCgNrZXkYASABKAkSDQoFdmFsdWUYAiABKAk6AjgBKlQKEkRhdGFiYXNlQ2hhbmdlTW9kZRIkCiBEQVRBQkFTRV9DSEFOR0VfTU9ERV9VTlNQRUNJRklFRBAAEgwKCFBJUEVMSU5FEAESCgoGRURJVE9SEAIyrgMKDlNldHRpbmdTZXJ2aWNlEoQBCgxMaXN0U2V0dGluZ3MSIC5ieXRlYmFzZS52MS5MaXN0U2V0dGluZ3NSZXF1ZXN0GiEuYnl0ZWJhc2UudjEuTGlzdFNldHRpbmdzUmVzcG9uc2UiL9pBAIrqMBBiYi5zZXR0aW5ncy5saXN0kOowAYLT5JMCDhIML3YxL3NldHRpbmdzEn8KCkdldFNldHRpbmcSHi5ieXRlYmFzZS52MS5HZXRTZXR0aW5nUmVxdWVzdBoULmJ5dGViYXNlLnYxLlNldHRpbmciO9pBBG5hbWWK6jAPYmIuc2V0dGluZ3MuZ2V0kOowAoLT5JMCFxIVL3YxL3tuYW1lPXNldHRpbmdzLyp9EpMBCg1VcGRhdGVTZXR0aW5nEiEuYnl0ZWJhc2UudjEuVXBkYXRlU2V0dGluZ1JlcXVlc3QaFC5ieXRlYmFzZS52MS5TZXR0aW5nIkmK6jAPYmIuc2V0dGluZ3Muc2V0kOowApjqMAGC0+STAig6B3NldHRpbmcyHS92MS97c2V0dGluZy5uYW1lPXNldHRpbmdzLyp9QqkBCg9jb20uYnl0ZWJhc2UudjFCE1NldHRpbmdTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_duration, file_google_protobuf_field_mask, file_google_type_expr, file_v1_annotation, file_v1_common, file_v1_issue_service]);
+ fileDesc("Chh2MS9zZXR0aW5nX3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIhUKE0xpc3RTZXR0aW5nc1JlcXVlc3QiPgoUTGlzdFNldHRpbmdzUmVzcG9uc2USJgoIc2V0dGluZ3MYASADKAsyFC5ieXRlYmFzZS52MS5TZXR0aW5nIj8KEUdldFNldHRpbmdSZXF1ZXN0EioKBG5hbWUYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1NldHRpbmciOwoSR2V0U2V0dGluZ1Jlc3BvbnNlEiUKB3NldHRpbmcYASABKAsyFC5ieXRlYmFzZS52MS5TZXR0aW5nIqEBChRVcGRhdGVTZXR0aW5nUmVxdWVzdBIqCgdzZXR0aW5nGAEgASgLMhQuYnl0ZWJhc2UudjEuU2V0dGluZ0ID4EECEhUKDXZhbGlkYXRlX29ubHkYAiABKAgSFQoNYWxsb3dfbWlzc2luZxgDIAEoCBIvCgt1cGRhdGVfbWFzaxgEIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2siqQIKB1NldHRpbmcSEQoEbmFtZRgBIAEoCUID4EEIEi0KBXZhbHVlGAIgASgLMhkuYnl0ZWJhc2UudjEuU2V0dGluZ1ZhbHVlQgPgQQIirAEKC1NldHRpbmdOYW1lEhwKGFNFVFRJTkdfTkFNRV9VTlNQRUNJRklFRBAAEhUKEVdPUktTUEFDRV9QUk9GSUxFEAESFgoSV09SS1NQQUNFX0FQUFJPVkFMEAISCgoGQVBQX0lNEAMSBgoCQUkQBBIXChNEQVRBX0NMQVNTSUZJQ0FUSU9OEAUSEgoOU0VNQU5USUNfVFlQRVMQBhIPCgtFTlZJUk9OTUVOVBAHOi3qQSoKFGJ5dGViYXNlLmNvbS9TZXR0aW5nEhJzZXR0aW5ncy97c2V0dGluZ30irAMKDFNldHRpbmdWYWx1ZRIrCgZhcHBfaW0YASABKAsyGS5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmdIABJBChF3b3Jrc3BhY2VfcHJvZmlsZRgCIAEoCzIkLmJ5dGViYXNlLnYxLldvcmtzcGFjZVByb2ZpbGVTZXR0aW5nSAASQwoSd29ya3NwYWNlX2FwcHJvdmFsGAMgASgLMiUuYnl0ZWJhc2UudjEuV29ya3NwYWNlQXBwcm92YWxTZXR0aW5nSAASRQoTZGF0YV9jbGFzc2lmaWNhdGlvbhgEIAEoCzImLmJ5dGViYXNlLnYxLkRhdGFDbGFzc2lmaWNhdGlvblNldHRpbmdIABI5Cg1zZW1hbnRpY190eXBlGAUgASgLMiAuYnl0ZWJhc2UudjEuU2VtYW50aWNUeXBlU2V0dGluZ0gAEiQKAmFpGAYgASgLMhYuYnl0ZWJhc2UudjEuQUlTZXR0aW5nSAASNgoLZW52aXJvbm1lbnQYByABKAsyHy5ieXRlYmFzZS52MS5FbnZpcm9ubWVudFNldHRpbmdIAEIHCgV2YWx1ZSK8BgoMQXBwSU1TZXR0aW5nEjUKCHNldHRpbmdzGAEgAygLMiMuYnl0ZWJhc2UudjEuQXBwSU1TZXR0aW5nLklNU2V0dGluZxobCgVTbGFjaxISCgV0b2tlbhgBIAEoCUID4EEEGjYKBkZlaXNodRITCgZhcHBfaWQYASABKAlCA+BBBBIXCgphcHBfc2VjcmV0GAIgASgJQgPgQQQaSQoFV2Vjb20SFAoHY29ycF9pZBgBIAEoCUID4EEEEhUKCGFnZW50X2lkGAIgASgJQgPgQQQSEwoGc2VjcmV0GAMgASgJQgPgQQQaNAoETGFyaxITCgZhcHBfaWQYASABKAlCA+BBBBIXCgphcHBfc2VjcmV0GAIgASgJQgPgQQQaVwoIRGluZ1RhbGsSFgoJY2xpZW50X2lkGAEgASgJQgPgQQQSGgoNY2xpZW50X3NlY3JldBgCIAEoCUID4EEEEhcKCnJvYm90X2NvZGUYAyABKAlCA+BBBBpTCgVUZWFtcxIWCgl0ZW5hbnRfaWQYASABKAlCA+BBBBIWCgljbGllbnRfaWQYAiABKAlCA+BBBBIaCg1jbGllbnRfc2VjcmV0GAMgASgJQgPgQQQa8AIKCUlNU2V0dGluZxImCgR0eXBlGAEgASgOMhguYnl0ZWJhc2UudjEuV2ViaG9va1R5cGUSMAoFc2xhY2sYAiABKAsyHy5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmcuU2xhY2tIABIyCgZmZWlzaHUYAyABKAsyIC5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmcuRmVpc2h1SAASMAoFd2Vjb20YBCABKAsyHy5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmcuV2Vjb21IABIuCgRsYXJrGAUgASgLMh4uYnl0ZWJhc2UudjEuQXBwSU1TZXR0aW5nLkxhcmtIABI2CghkaW5ndGFsaxgGIAEoCzIiLmJ5dGViYXNlLnYxLkFwcElNU2V0dGluZy5EaW5nVGFsa0gAEjAKBXRlYW1zGAcgASgLMh8uYnl0ZWJhc2UudjEuQXBwSU1TZXR0aW5nLlRlYW1zSABCCQoHcGF5bG9hZCKPCAoXV29ya3NwYWNlUHJvZmlsZVNldHRpbmcSFAoMZXh0ZXJuYWxfdXJsGAEgASgJEhcKD2Rpc2FsbG93X3NpZ251cBgCIAEoCBITCgtyZXF1aXJlXzJmYRgDIAEoCBI5ChZyZWZyZXNoX3Rva2VuX2R1cmF0aW9uGAQgASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uEi8KDGFubm91bmNlbWVudBgFIAEoCzIZLmJ5dGViYXNlLnYxLkFubm91bmNlbWVudBI6ChdtYXhpbXVtX3JvbGVfZXhwaXJhdGlvbhgGIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbhIPCgdkb21haW5zGAcgAygJEh8KF2VuZm9yY2VfaWRlbnRpdHlfZG9tYWluGAggASgIEj0KFGRhdGFiYXNlX2NoYW5nZV9tb2RlGAkgASgOMh8uYnl0ZWJhc2UudjEuRGF0YWJhc2VDaGFuZ2VNb2RlEiAKGGRpc2FsbG93X3Bhc3N3b3JkX3NpZ25pbhgKIAEoCBIgChhlbmFibGVfbWV0cmljX2NvbGxlY3Rpb24YCyABKAgSOwoYaW5hY3RpdmVfc2Vzc2lvbl90aW1lb3V0GAwgASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uEh8KF2VuYWJsZV9hdWRpdF9sb2dfc3Rkb3V0GA0gASgIEhEKCXdhdGVybWFyaxgOIAEoCBIcChRkaXJlY3Rvcnlfc3luY190b2tlbhgPIAEoCRIVCg1icmFuZGluZ19sb2dvGBAgASgJElYKFHBhc3N3b3JkX3Jlc3RyaWN0aW9uGBEgASgLMjguYnl0ZWJhc2UudjEuV29ya3NwYWNlUHJvZmlsZVNldHRpbmcuUGFzc3dvcmRSZXN0cmljdGlvbhI4ChVhY2Nlc3NfdG9rZW5fZHVyYXRpb24YEiABKAsyGS5nb29nbGUucHJvdG9idWYuRHVyYXRpb24SFAoMZW5hYmxlX2RlYnVnGBMgASgIGoQCChNQYXNzd29yZFJlc3RyaWN0aW9uEhIKCm1pbl9sZW5ndGgYASABKAUSFgoOcmVxdWlyZV9udW1iZXIYAiABKAgSFgoOcmVxdWlyZV9sZXR0ZXIYAyABKAgSIAoYcmVxdWlyZV91cHBlcmNhc2VfbGV0dGVyGAQgASgIEiEKGXJlcXVpcmVfc3BlY2lhbF9jaGFyYWN0ZXIYBSABKAgSLgomcmVxdWlyZV9yZXNldF9wYXNzd29yZF9mb3JfZmlyc3RfbG9naW4YBiABKAgSNAoRcGFzc3dvcmRfcm90YXRpb24YByABKAsyGS5nb29nbGUucHJvdG9idWYuRHVyYXRpb24irwEKDEFubm91bmNlbWVudBIzCgVsZXZlbBgBIAEoDjIkLmJ5dGViYXNlLnYxLkFubm91bmNlbWVudC5BbGVydExldmVsEgwKBHRleHQYAiABKAkSDAoEbGluaxgDIAEoCSJOCgpBbGVydExldmVsEhsKF0FMRVJUX0xFVkVMX1VOU1BFQ0lGSUVEEAASCAoESU5GTxABEgsKB1dBUk5JTkcQAhIMCghDUklUSUNBTBADIucCChhXb3Jrc3BhY2VBcHByb3ZhbFNldHRpbmcSOQoFcnVsZXMYASADKAsyKi5ieXRlYmFzZS52MS5Xb3Jrc3BhY2VBcHByb3ZhbFNldHRpbmcuUnVsZRqPAgoEUnVsZRIvCgh0ZW1wbGF0ZRgBIAEoCzIdLmJ5dGViYXNlLnYxLkFwcHJvdmFsVGVtcGxhdGUSJAoJY29uZGl0aW9uGAIgASgLMhEuZ29vZ2xlLnR5cGUuRXhwchJBCgZzb3VyY2UYAyABKA4yMS5ieXRlYmFzZS52MS5Xb3Jrc3BhY2VBcHByb3ZhbFNldHRpbmcuUnVsZS5Tb3VyY2UibQoGU291cmNlEhYKElNPVVJDRV9VTlNQRUNJRklFRBAAEhMKD0NIQU5HRV9EQVRBQkFTRRABEhMKD0NSRUFURV9EQVRBQkFTRRACEg8KC0VYUE9SVF9EQVRBEAMSEAoMUkVRVUVTVF9ST0xFEAQimAUKGURhdGFDbGFzc2lmaWNhdGlvblNldHRpbmcSUAoHY29uZmlncxgBIAMoCzI/LmJ5dGViYXNlLnYxLkRhdGFDbGFzc2lmaWNhdGlvblNldHRpbmcuRGF0YUNsYXNzaWZpY2F0aW9uQ29uZmlnGqgEChhEYXRhQ2xhc3NpZmljYXRpb25Db25maWcSCgoCaWQYASABKAkSDQoFdGl0bGUYAiABKAkSVQoGbGV2ZWxzGAMgAygLMkUuYnl0ZWJhc2UudjEuRGF0YUNsYXNzaWZpY2F0aW9uU2V0dGluZy5EYXRhQ2xhc3NpZmljYXRpb25Db25maWcuTGV2ZWwSawoOY2xhc3NpZmljYXRpb24YBCADKAsyUy5ieXRlYmFzZS52MS5EYXRhQ2xhc3NpZmljYXRpb25TZXR0aW5nLkRhdGFDbGFzc2lmaWNhdGlvbkNvbmZpZy5DbGFzc2lmaWNhdGlvbkVudHJ5GjcKBUxldmVsEgoKAmlkGAEgASgJEg0KBXRpdGxlGAIgASgJEhMKC2Rlc2NyaXB0aW9uGAMgASgJGmgKEkRhdGFDbGFzc2lmaWNhdGlvbhIKCgJpZBgBIAEoCRINCgV0aXRsZRgCIAEoCRITCgtkZXNjcmlwdGlvbhgDIAEoCRIVCghsZXZlbF9pZBgEIAEoCUgAiAEBQgsKCV9sZXZlbF9pZBqJAQoTQ2xhc3NpZmljYXRpb25FbnRyeRILCgNrZXkYASABKAkSYQoFdmFsdWUYAiABKAsyUi5ieXRlYmFzZS52MS5EYXRhQ2xhc3NpZmljYXRpb25TZXR0aW5nLkRhdGFDbGFzc2lmaWNhdGlvbkNvbmZpZy5EYXRhQ2xhc3NpZmljYXRpb246AjgBIswBChNTZW1hbnRpY1R5cGVTZXR0aW5nEjwKBXR5cGVzGAEgAygLMi0uYnl0ZWJhc2UudjEuU2VtYW50aWNUeXBlU2V0dGluZy5TZW1hbnRpY1R5cGUadwoMU2VtYW50aWNUeXBlEgoKAmlkGAEgASgJEg0KBXRpdGxlGAIgASgJEhMKC2Rlc2NyaXB0aW9uGAMgASgJEikKCWFsZ29yaXRobRgGIAEoCzIWLmJ5dGViYXNlLnYxLkFsZ29yaXRobRIMCgRpY29uGAcgASgJIv8ECglBbGdvcml0aG0SNAoJZnVsbF9tYXNrGAEgASgLMh8uYnl0ZWJhc2UudjEuQWxnb3JpdGhtLkZ1bGxNYXNrSAASNgoKcmFuZ2VfbWFzaxgCIAEoCzIgLmJ5dGViYXNlLnYxLkFsZ29yaXRobS5SYW5nZU1hc2tIABIyCghtZDVfbWFzaxgDIAEoCzIeLmJ5dGViYXNlLnYxLkFsZ29yaXRobS5NRDVNYXNrSAASQQoQaW5uZXJfb3V0ZXJfbWFzaxgEIAEoCzIlLmJ5dGViYXNlLnYxLkFsZ29yaXRobS5Jbm5lck91dGVyTWFza0gAGiAKCEZ1bGxNYXNrEhQKDHN1YnN0aXR1dGlvbhgBIAEoCRp+CglSYW5nZU1hc2sSNgoGc2xpY2VzGAEgAygLMiYuYnl0ZWJhc2UudjEuQWxnb3JpdGhtLlJhbmdlTWFzay5TbGljZRo5CgVTbGljZRINCgVzdGFydBgBIAEoBRILCgNlbmQYAiABKAUSFAoMc3Vic3RpdHV0aW9uGAMgASgJGhcKB01ENU1hc2sSDAoEc2FsdBgBIAEoCRrJAQoOSW5uZXJPdXRlck1hc2sSEgoKcHJlZml4X2xlbhgBIAEoBRISCgpzdWZmaXhfbGVuGAIgASgFEjwKBHR5cGUYAyABKA4yLi5ieXRlYmFzZS52MS5BbGdvcml0aG0uSW5uZXJPdXRlck1hc2suTWFza1R5cGUSFAoMc3Vic3RpdHV0aW9uGAQgASgJIjsKCE1hc2tUeXBlEhkKFU1BU0tfVFlQRV9VTlNQRUNJRklFRBAAEgkKBUlOTkVSEAESCQoFT1VURVIQAkIGCgRtYXNrIu8BCglBSVNldHRpbmcSDwoHZW5hYmxlZBgBIAEoCBIxCghwcm92aWRlchgCIAEoDjIfLmJ5dGViYXNlLnYxLkFJU2V0dGluZy5Qcm92aWRlchIQCghlbmRwb2ludBgDIAEoCRIPCgdhcGlfa2V5GAQgASgJEg0KBW1vZGVsGAUgASgJEg8KB3ZlcnNpb24YBiABKAkiWwoIUHJvdmlkZXISGAoUUFJPVklERVJfVU5TUEVDSUZJRUQQABILCgdPUEVOX0FJEAESCgoGQ0xBVURFEAISCgoGR0VNSU5JEAMSEAoMQVpVUkVfT1BFTkFJEAQilgIKEkVudmlyb25tZW50U2V0dGluZxJBCgxlbnZpcm9ubWVudHMYASADKAsyKy5ieXRlYmFzZS52MS5FbnZpcm9ubWVudFNldHRpbmcuRW52aXJvbm1lbnQavAEKC0Vudmlyb25tZW50EhEKBG5hbWUYASABKAlCA+BBAxIKCgJpZBgCIAEoCRINCgV0aXRsZRgDIAEoCRJDCgR0YWdzGAQgAygLMjUuYnl0ZWJhc2UudjEuRW52aXJvbm1lbnRTZXR0aW5nLkVudmlyb25tZW50LlRhZ3NFbnRyeRINCgVjb2xvchgFIAEoCRorCglUYWdzRW50cnkSCwoDa2V5GAEgASgJEg0KBXZhbHVlGAIgASgJOgI4ASpUChJEYXRhYmFzZUNoYW5nZU1vZGUSJAogREFUQUJBU0VfQ0hBTkdFX01PREVfVU5TUEVDSUZJRUQQABIMCghQSVBFTElORRABEgoKBkVESVRPUhACMq4DCg5TZXR0aW5nU2VydmljZRKEAQoMTGlzdFNldHRpbmdzEiAuYnl0ZWJhc2UudjEuTGlzdFNldHRpbmdzUmVxdWVzdBohLmJ5dGViYXNlLnYxLkxpc3RTZXR0aW5nc1Jlc3BvbnNlIi/aQQCK6jAQYmIuc2V0dGluZ3MubGlzdJDqMAGC0+STAg4SDC92MS9zZXR0aW5ncxJ/CgpHZXRTZXR0aW5nEh4uYnl0ZWJhc2UudjEuR2V0U2V0dGluZ1JlcXVlc3QaFC5ieXRlYmFzZS52MS5TZXR0aW5nIjvaQQRuYW1liuowD2JiLnNldHRpbmdzLmdldJDqMAKC0+STAhcSFS92MS97bmFtZT1zZXR0aW5ncy8qfRKTAQoNVXBkYXRlU2V0dGluZxIhLmJ5dGViYXNlLnYxLlVwZGF0ZVNldHRpbmdSZXF1ZXN0GhQuYnl0ZWJhc2UudjEuU2V0dGluZyJJiuowD2JiLnNldHRpbmdzLnNldJDqMAKY6jABgtPkkwIoOgdzZXR0aW5nMh0vdjEve3NldHRpbmcubmFtZT1zZXR0aW5ncy8qfUKpAQoPY29tLmJ5dGViYXNlLnYxQhNTZXR0aW5nU2VydmljZVByb3RvUAFaNGdpdGh1Yi5jb20vYnl0ZWJhc2UvYnl0ZWJhc2UvYmFja2VuZC9nZW5lcmF0ZWQtZ28vdjGiAgNCWFiqAgtCeXRlYmFzZS5WMcoCC0J5dGViYXNlXFYx4gIXQnl0ZWJhc2VcVjFcR1BCTWV0YWRhdGHqAgxCeXRlYmFzZTo6VjFiBnByb3RvMw", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_duration, file_google_protobuf_field_mask, file_google_type_expr, file_v1_annotation, file_v1_common, file_v1_issue_service]);
/**
* Describes the message bytebase.v1.ListSettingsRequest.
diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yaml
index 223dec47a2..92244a04fb 100644
--- a/proto/gen/grpc-doc/openapi.yaml
+++ b/proto/gen/grpc-doc/openapi.yaml
@@ -45,46 +45,6 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/Status'
- patch:
- tags:
- - ActuatorService
- description: |-
- Updates system configuration settings for the Bytebase instance.
- Permissions required: bb.settings.set
- operationId: ActuatorService_UpdateActuatorInfo
- parameters:
- - name: updateMask
- in: query
- description: The list of fields to update.
- schema:
- type: string
- format: field-mask
- - name: allowMissing
- in: query
- description: |-
- If set to true, and the actuator is not found, a new actuator will be created.
- In this situation, `update_mask` is ignored.
- schema:
- type: boolean
- requestBody:
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/ActuatorInfo'
- required: true
- responses:
- "200":
- description: OK
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/ActuatorInfo'
- default:
- description: Default error response
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/Status'
/v1/actuator/resources:
get:
tags:
@@ -7771,9 +7731,6 @@ components:
readOnly: true
type: string
description: The unique identifier for the workspace.
- debug:
- type: boolean
- description: Whether debug mode is enabled.
unlicensedFeatures:
readOnly: true
type: array
@@ -14736,10 +14693,6 @@ components:
pattern: ^-?(?:0|[1-9][0-9]{0,11})(?:\.[0-9]{1,9})?s$
type: string
description: The duration for refresh token. Default is 7 days.
- accessTokenDuration:
- pattern: ^-?(?:0|[1-9][0-9]{0,11})(?:\.[0-9]{1,9})?s$
- type: string
- description: The duration for access token. Default is 1 hour.
announcement:
allOf:
- $ref: '#/components/schemas/Announcement'
@@ -14794,6 +14747,13 @@ components:
allOf:
- $ref: '#/components/schemas/WorkspaceProfileSetting_PasswordRestriction'
description: Password restriction settings.
+ accessTokenDuration:
+ pattern: ^-?(?:0|[1-9][0-9]{0,11})(?:\.[0-9]{1,9})?s$
+ type: string
+ description: The duration for access token. Default is 1 hour.
+ enableDebug:
+ type: boolean
+ description: Whether debug mode is enabled.
WorkspaceProfileSetting_PasswordRestriction:
type: object
properties:
diff --git a/proto/gen/grpc-doc/store/README.md b/proto/gen/grpc-doc/store/README.md
index 52f9195c58..5e7e2f6a00 100644
--- a/proto/gen/grpc-doc/store/README.md
+++ b/proto/gen/grpc-doc/store/README.md
@@ -4391,7 +4391,6 @@ The severity level for SQL review rules.
| disallow_signup | [bool](#bool) | | Disallow self-service signup, users can only be invited by the owner. |
| require_2fa | [bool](#bool) | | Require 2FA for all users. |
| refresh_token_duration | [google.protobuf.Duration](#google-protobuf-Duration) | | The duration for refresh token. Default is 7 days. |
-| access_token_duration | [google.protobuf.Duration](#google-protobuf-Duration) | | The duration for access token. Default is 1 hour. |
| announcement | [WorkspaceProfileSetting.Announcement](#bytebase-store-WorkspaceProfileSetting-Announcement) | | The setting of custom announcement |
| maximum_role_expiration | [google.protobuf.Duration](#google-protobuf-Duration) | | The max duration for role expired. |
| domains | [string](#string) | repeated | The workspace domain, e.g., bytebase.com. |
@@ -4405,6 +4404,8 @@ The severity level for SQL review rules.
| directory_sync_token | [string](#string) | | The token for directory sync authentication. |
| branding_logo | [string](#string) | | The branding logo as a data URI (e.g. data:image/png;base64,...). |
| password_restriction | [WorkspaceProfileSetting.PasswordRestriction](#bytebase-store-WorkspaceProfileSetting-PasswordRestriction) | | Password restriction settings. |
+| access_token_duration | [google.protobuf.Duration](#google-protobuf-Duration) | | The duration for access token. Default is 1 hour. |
+| enable_debug | [bool](#bool) | | Whether debug mode is enabled. |
diff --git a/proto/gen/grpc-doc/store/index.html b/proto/gen/grpc-doc/store/index.html
index 8976c05adb..408c334e6e 100644
--- a/proto/gen/grpc-doc/store/index.html
+++ b/proto/gen/grpc-doc/store/index.html
@@ -11945,13 +11945,6 @@ are /[a-z][0-9]-/. </p></td>
<td><p>The duration for refresh token. Default is 7 days. </p></td>
</tr>
- <tr>
- <td>access_token_duration</td>
- <td><a href="#google.protobuf.Duration">google.protobuf.Duration</a></td>
- <td></td>
- <td><p>The duration for access token. Default is 1 hour. </p></td>
- </tr>
-
<tr>
<td>announcement</td>
<td><a href="#bytebase.store.WorkspaceProfileSetting.Announcement">WorkspaceProfileSetting.Announcement</a></td>
@@ -12045,6 +12038,20 @@ Requires ENTERPRISE license. </p></td>
<td><p>Password restriction settings. </p></td>
</tr>
+ <tr>
+ <td>access_token_duration</td>
+ <td><a href="#google.protobuf.Duration">google.protobuf.Duration</a></td>
+ <td></td>
+ <td><p>The duration for access token. Default is 1 hour. </p></td>
+ </tr>
+
+ <tr>
+ <td>enable_debug</td>
+ <td><a href="#bool">bool</a></td>
+ <td></td>
+ <td><p>Whether debug mode is enabled. </p></td>
+ </tr>
+
</tbody>
</table>
diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.md
index c94da3f6cf..2893c5d052 100644
--- a/proto/gen/grpc-doc/v1/README.md
+++ b/proto/gen/grpc-doc/v1/README.md
@@ -51,7 +51,6 @@
- [GetResourcePackageRequest](#bytebase-v1-GetResourcePackageRequest)
- [ResourcePackage](#bytebase-v1-ResourcePackage)
- [SetupSampleRequest](#bytebase-v1-SetupSampleRequest)
- - [UpdateActuatorInfoRequest](#bytebase-v1-UpdateActuatorInfoRequest)
- [ActuatorService](#bytebase-v1-ActuatorService)
@@ -1222,7 +1221,6 @@ Actuator concept is similar to the Spring Boot Actuator.
| need_admin_setup | [bool](#bool) | | Whether the Bytebase instance requires initial admin setup. |
| last_active_time | [google.protobuf.Timestamp](#google-protobuf-Timestamp) | | The last time any API call was made, refreshed on each request. |
| workspace_id | [string](#string) | | The unique identifier for the workspace. |
-| debug | [bool](#bool) | | Whether debug mode is enabled. |
| unlicensed_features | [string](#string) | repeated | List of features that are not licensed. |
| docker | [bool](#bool) | | Whether the Bytebase instance is running in Docker. |
| user_stats | [ActuatorInfo.StatUser](#bytebase-v1-ActuatorInfo-StatUser) | repeated | Statistics about users in the system. |
@@ -1307,23 +1305,6 @@ Request message for setting up sample data.
-
-<a name="bytebase-v1-UpdateActuatorInfoRequest"></a>
-
-### UpdateActuatorInfoRequest
-Request message for updating actuator information.
-
-
-| Field | Type | Label | Description |
-| ----- | ---- | ----- | ----------- |
-| actuator | [ActuatorInfo](#bytebase-v1-ActuatorInfo) | | The actuator to update. |
-| update_mask | [google.protobuf.FieldMask](#google-protobuf-FieldMask) | | The list of fields to update. |
-| allow_missing | [bool](#bool) | | If set to true, and the actuator is not found, a new actuator will be created. In this situation, `update_mask` is ignored. |
-
-
-
-
-
@@ -1339,7 +1320,6 @@ 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 |
-| UpdateActuatorInfo | [UpdateActuatorInfoRequest](#bytebase-v1-UpdateActuatorInfoRequest) | [ActuatorInfo](#bytebase-v1-ActuatorInfo) | Updates system configuration settings for the Bytebase instance. Permissions required: bb.settings.set |
| 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 |
| GetResourcePackage | [GetResourcePackageRequest](#bytebase-v1-GetResourcePackageRequest) | [ResourcePackage](#bytebase-v1-ResourcePackage) | Gets custom branding resources such as logos. Permissions required: None |
@@ -9962,7 +9942,6 @@ For examples: resource.environment_id == &#34;prod&#34; &amp;&amp; statement.aff
| disallow_signup | [bool](#bool) | | Disallow self-service signup, users can only be invited by the owner. |
| require_2fa | [bool](#bool) | | Require 2FA for all users. |
| refresh_token_duration | [google.protobuf.Duration](#google-protobuf-Duration) | | The duration for refresh token. Default is 7 days. |
-| access_token_duration | [google.protobuf.Duration](#google-protobuf-Duration) | | The duration for access token. Default is 1 hour. |
| announcement | [Announcement](#bytebase-v1-Announcement) | | The setting of custom announcement |
| maximum_role_expiration | [google.protobuf.Duration](#google-protobuf-Duration) | | The max duration for role expired. |
| domains | [string](#string) | repeated | The workspace domain, e.g., bytebase.com. |
@@ -9976,6 +9955,8 @@ For examples: resource.environment_id == &#34;prod&#34; &amp;&amp; statement.aff
| directory_sync_token | [string](#string) | | The token for directory sync authentication. |
| branding_logo | [string](#string) | | The branding logo as a data URI (e.g. data:image/png;base64,...). |
| password_restriction | [WorkspaceProfileSetting.PasswordRestriction](#bytebase-v1-WorkspaceProfileSetting-PasswordRestriction) | | Password restriction settings. |
+| access_token_duration | [google.protobuf.Duration](#google-protobuf-Duration) | | The duration for access token. Default is 1 hour. |
+| enable_debug | [bool](#bool) | | Whether debug mode is enabled. |
diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.html
index 77e1358ff7..583020ec5a 100644
--- a/proto/gen/grpc-doc/v1/index.html
+++ b/proto/gen/grpc-doc/v1/index.html
@@ -359,10 +359,6 @@
<a href="#bytebase.v1.SetupSampleRequest"><span class="badge">M</span>SetupSampleRequest</a>
</li>
- <li>
- <a href="#bytebase.v1.UpdateActuatorInfoRequest"><span class="badge">M</span>UpdateActuatorInfoRequest</a>
- </li>
-
@@ -4226,13 +4222,6 @@ Permissions required: bb.users.updateEmail</p></td>
<td><p>The unique identifier for the workspace. </p></td>
</tr>
- <tr>
- <td>debug</td>
- <td><a href="#bool">bool</a></td>
- <td></td>
- <td><p>Whether debug mode is enabled. </p></td>
- </tr>
-
<tr>
<td>unlicensed_features</td>
<td><a href="#string">string</a></td>
@@ -4379,45 +4368,6 @@ Permissions required: bb.users.updateEmail</p></td>
- <h3 id="bytebase.v1.UpdateActuatorInfoRequest">UpdateActuatorInfoRequest</h3>
- <p>Request message for updating actuator information.</p>
-
-
- <table class="field-table">
- <thead>
- <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
- </thead>
- <tbody>
-
- <tr>
- <td>actuator</td>
- <td><a href="#bytebase.v1.ActuatorInfo">ActuatorInfo</a></td>
- <td></td>
- <td><p>The actuator to update. </p></td>
- </tr>
-
- <tr>
- <td>update_mask</td>
- <td><a href="#google.protobuf.FieldMask">google.protobuf.FieldMask</a></td>
- <td></td>
- <td><p>The list of fields to update. </p></td>
- </tr>
-
- <tr>
- <td>allow_missing</td>
- <td><a href="#bool">bool</a></td>
- <td></td>
- <td><p>If set to true, and the actuator is not found, a new actuator will be created.
-In this situation, `update_mask` is ignored. </p></td>
- </tr>
-
- </tbody>
- </table>
-
-
-
-
-
@@ -4440,14 +4390,6 @@ In this situation, `update_mask` is ignored. </p></td>
Permissions required: None</p></td>
</tr>
- <tr>
- <td>UpdateActuatorInfo</td>
- <td><a href="#bytebase.v1.UpdateActuatorInfoRequest">UpdateActuatorInfoRequest</a></td>
- <td><a href="#bytebase.v1.ActuatorInfo">ActuatorInfo</a></td>
- <td><p>Updates system configuration settings for the Bytebase instance.
-Permissions required: bb.settings.set</p></td>
- </tr>
-
<tr>
<td>SetupSample</td>
<td><a href="#bytebase.v1.SetupSampleRequest">SetupSampleRequest</a></td>
@@ -4502,16 +4444,6 @@ Permissions required: None</p></td>
- <tr>
- <td>UpdateActuatorInfo</td>
- <td>PATCH</td>
- <td>/v1/actuator/info</td>
- <td>actuator</td>
- </tr>
-
-
-
-
<tr>
<td>SetupSample</td>
<td>POST</td>
@@ -27847,13 +27779,6 @@ resource.table_name.matches(&#34;sensitive_.*&#34;) &amp;&amp; resource.db_engin
<td><p>The duration for refresh token. Default is 7 days. </p></td>
</tr>
- <tr>
- <td>access_token_duration</td>
- <td><a href="#google.protobuf.Duration">google.protobuf.Duration</a></td>
- <td></td>
- <td><p>The duration for access token. Default is 1 hour. </p></td>
- </tr>
-
<tr>
<td>announcement</td>
<td><a href="#bytebase.v1.Announcement">Announcement</a></td>
@@ -27947,6 +27872,20 @@ Requires ENTERPRISE license. </p></td>
<td><p>Password restriction settings. </p></td>
</tr>
+ <tr>
+ <td>access_token_duration</td>
+ <td><a href="#google.protobuf.Duration">google.protobuf.Duration</a></td>
+ <td></td>
+ <td><p>The duration for access token. Default is 1 hour. </p></td>
+ </tr>
+
+ <tr>
+ <td>enable_debug</td>
+ <td><a href="#bool">bool</a></td>
+ <td></td>
+ <td><p>Whether debug mode is enabled. </p></td>
+ </tr>
+
</tbody>
</table>
diff --git a/proto/store/store/setting.proto b/proto/store/store/setting.proto
index affcd4f5d8..bd97f79c96 100644
--- a/proto/store/store/setting.proto
+++ b/proto/store/store/setting.proto
@@ -72,9 +72,6 @@ message WorkspaceProfileSetting {
// The duration for refresh token. Default is 7 days.
google.protobuf.Duration refresh_token_duration = 4;
- // The duration for access token. Default is 1 hour.
- google.protobuf.Duration access_token_duration = 18;
-
// The setting of custom announcement
Announcement announcement = 5;
@@ -132,6 +129,12 @@ message WorkspaceProfileSetting {
// Password restriction settings.
PasswordRestriction password_restriction = 17;
+
+ // The duration for access token. Default is 1 hour.
+ google.protobuf.Duration access_token_duration = 18;
+
+ // Whether debug mode is enabled.
+ bool enable_debug = 19;
}
message WorkspaceApprovalSetting {
diff --git a/proto/v1/v1/actuator_service.proto b/proto/v1/v1/actuator_service.proto
index dc151e7cc0..266c35ce7f 100644
--- a/proto/v1/v1/actuator_service.proto
+++ b/proto/v1/v1/actuator_service.proto
@@ -6,7 +6,6 @@ import "google/api/annotations.proto";
import "google/api/client.proto";
import "google/api/field_behavior.proto";
import "google/protobuf/empty.proto";
-import "google/protobuf/field_mask.proto";
import "google/protobuf/timestamp.proto";
import "v1/annotation.proto";
import "v1/common.proto";
@@ -24,18 +23,6 @@ service ActuatorService {
option (bytebase.v1.allow_without_credential) = true;
}
- // Updates system configuration settings for the Bytebase instance.
- // Permissions required: bb.settings.set
- rpc UpdateActuatorInfo(UpdateActuatorInfoRequest) returns (ActuatorInfo) {
- option (google.api.http) = {
- patch: "/v1/actuator/info"
- body: "actuator"
- };
- option (google.api.method_signature) = "actuator,update_mask";
- option (bytebase.v1.permission) = "bb.settings.set";
- option (bytebase.v1.auth_method) = IAM;
- }
-
// Sets up sample data for demonstration and testing purposes.
// Permissions required: bb.projects.create
rpc SetupSample(SetupSampleRequest) returns (google.protobuf.Empty) {
@@ -78,26 +65,13 @@ message SetupSampleRequest {}
// Request message for getting actuator information.
message GetActuatorInfoRequest {}
-// Request message for updating actuator information.
-message UpdateActuatorInfoRequest {
- // The actuator to update.
- ActuatorInfo actuator = 1 [(google.api.field_behavior) = REQUIRED];
-
- // The list of fields to update.
- google.protobuf.FieldMask update_mask = 2 [(google.api.field_behavior) = REQUIRED];
-
- // If set to true, and the actuator is not found, a new actuator will be created.
- // In this situation, `update_mask` is ignored.
- bool allow_missing = 3;
-}
-
// Request message for deleting cache.
message DeleteCacheRequest {}
// System information and configuration for the Bytebase instance.
// Actuator concept is similar to the Spring Boot Actuator.
message ActuatorInfo {
- reserved 10, 12, 16, 17;
+ reserved 10, 12, 16, 17, 14;
// The Bytebase server version.
string version = 1 [(google.api.field_behavior) = OUTPUT_ONLY];
@@ -132,9 +106,6 @@ message ActuatorInfo {
// The unique identifier for the workspace.
string workspace_id = 13 [(google.api.field_behavior) = OUTPUT_ONLY];
- // Whether debug mode is enabled.
- bool debug = 14;
-
// List of features that are not licensed.
repeated string unlicensed_features = 15 [(google.api.field_behavior) = OUTPUT_ONLY];
diff --git a/proto/v1/v1/setting_service.proto b/proto/v1/v1/setting_service.proto
index e510143c75..1bef0e0d50 100644
--- a/proto/v1/v1/setting_service.proto
+++ b/proto/v1/v1/setting_service.proto
@@ -182,9 +182,6 @@ message WorkspaceProfileSetting {
// The duration for refresh token. Default is 7 days.
google.protobuf.Duration refresh_token_duration = 4;
- // The duration for access token. Default is 1 hour.
- google.protobuf.Duration access_token_duration = 18;
-
// The setting of custom announcement
Announcement announcement = 5;
@@ -242,6 +239,12 @@ message WorkspaceProfileSetting {
// Password restriction settings.
PasswordRestriction password_restriction = 17;
+
+ // The duration for access token. Default is 1 hour.
+ google.protobuf.Duration access_token_duration = 18;
+
+ // Whether debug mode is enabled.
+ bool enable_debug = 19;
}
message Announcement {