Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
refactor: clean up Setting proto API design (#18299)
Danny Xud91b19656216
diff --git a/backend/api/auth/header.go b/backend/api/auth/header.goindex a29e0ca290..f470de01fc 100644--- a/backend/api/auth/header.go+++ b/backend/api/auth/header.go@@ -78,7 +78,7 @@ func GetTokenDuration(ctx context.Context, store *store.Store, licenseService *eif err != nil {return tokenDuration}- passwordRestriction, err := store.GetPasswordRestrictionSetting(ctx)+ passwordRestriction, err := store.GetPasswordRestriction(ctx)if err != nil {return tokenDuration}diff --git a/backend/api/v1/actuator_service.go b/backend/api/v1/actuator_service.goindex be4ad12feb..a455c56d6f 100644--- a/backend/api/v1/actuator_service.go+++ b/backend/api/v1/actuator_service.go@@ -146,7 +146,7 @@ func (s *ActuatorService) getServerInfo(ctx context.Context) (*v1pb.ActuatorInforeturn nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to find workspace setting"))}- passwordRestrictionSetting, err := s.store.GetPasswordRestrictionSetting(ctx)+ passwordRestrictionSetting, err := s.store.GetPasswordRestriction(ctx)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to find password restriction setting"))}@@ -271,7 +271,7 @@ func (s *ActuatorService) getUsedFeatures(ctx context.Context) ([]v1pb.PlanFeatu}// environment tier- environments, err := s.store.GetEnvironmentSetting(ctx)+ environments, err := s.store.GetEnvironment(ctx)if err != nil {return nil, errors.Wrapf(err, "failed to get environment setting")}diff --git a/backend/api/v1/auth_service.go b/backend/api/v1/auth_service.goindex a67f8d061f..6da7bbb14b 100644--- a/backend/api/v1/auth_service.go+++ b/backend/api/v1/auth_service.go@@ -247,7 +247,7 @@ func (s *AuthService) needResetPassword(ctx context.Context, user *store.UserMesreturn false}- passwordRestriction, err := s.store.GetPasswordRestrictionSetting(ctx)+ passwordRestriction, err := s.store.GetPasswordRestriction(ctx)if err != nil {slog.Error("failed to get password restriction", log.BBError(err))return falsediff --git a/backend/api/v1/plan_service.go b/backend/api/v1/plan_service.goindex 8936f43645..b83746f5e3 100644--- a/backend/api/v1/plan_service.go+++ b/backend/api/v1/plan_service.go@@ -1221,7 +1221,7 @@ func getPlanSpecDatabaseGroups(specs []*storepb.PlanConfig_Spec) []string {// getAllEnvironmentIDs returns all environment IDs from the store.func getAllEnvironmentIDs(ctx context.Context, s *store.Store) ([]string, error) {- environments, err := s.GetEnvironmentSetting(ctx)+ environments, err := s.GetEnvironment(ctx)if err != nil {return nil, errors.Wrapf(err, "failed to list environments")}diff --git a/backend/api/v1/setting_service.go b/backend/api/v1/setting_service.goindex 6ffb023f69..4c9c1a43e9 100644--- a/backend/api/v1/setting_service.go+++ b/backend/api/v1/setting_service.go@@ -170,7 +170,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Reqif request.Msg.UpdateMask == nil {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("update mask is required"))}- payload := convertWorkspaceProfileSetting(request.Msg.Setting.Value.GetWorkspaceProfileSettingValue())+ payload := convertWorkspaceProfileSetting(request.Msg.Setting.Value.GetWorkspaceProfile())oldSetting, err := s.store.GetWorkspaceGeneralSetting(ctx)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to find setting %s with error: %v", apiSettingName, err))@@ -178,7 +178,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Reqfor _, path := range request.Msg.UpdateMask.Paths {switch path {- case "value.workspace_profile_setting_value.disallow_signup":+ 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))}@@ -188,7 +188,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Req}}oldSetting.DisallowSignup = payload.DisallowSignup- case "value.workspace_profile_setting_value.external_url":+ case "value.workspace_profile.external_url":if s.profile.SaaS {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("feature %s is unavailable in current mode", settingName))}@@ -204,12 +204,12 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Reqpayload.ExternalUrl = externalURL}oldSetting.ExternalUrl = payload.ExternalUrl- case "value.workspace_profile_setting_value.require_2fa":+ case "value.workspace_profile.require_2fa":if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_TWO_FA); err != nil {return nil, connect.NewError(connect.CodePermissionDenied, err)}oldSetting.Require_2Fa = payload.Require_2Fa- case "value.workspace_profile_setting_value.token_duration":+ case "value.workspace_profile.token_duration":if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_SIGN_IN_FREQUENCY_CONTROL); err != nil {return nil, connect.NewError(connect.CodePermissionDenied, err)}@@ -217,17 +217,17 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Reqreturn nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("refresh token duration should be at least one hour"))}oldSetting.TokenDuration = payload.TokenDuration- case "value.workspace_profile_setting_value.inactive_session_timeout":+ case "value.workspace_profile.inactive_session_timeout":if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_SIGN_IN_FREQUENCY_CONTROL); err != nil {return nil, connect.NewError(connect.CodePermissionDenied, err)}oldSetting.InactiveSessionTimeout = payload.InactiveSessionTimeout- case "value.workspace_profile_setting_value.announcement":+ case "value.workspace_profile.announcement":if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_DASHBOARD_ANNOUNCEMENT); err != nil {return nil, connect.NewError(connect.CodePermissionDenied, err)}oldSetting.Announcement = payload.Announcement- case "value.workspace_profile_setting_value.maximum_role_expiration":+ case "value.workspace_profile.maximum_role_expiration":if payload.MaximumRoleExpiration != nil {// If the value is less than or equal to 0, we will remove the setting. AKA no limit.if payload.MaximumRoleExpiration.Seconds <= 0 {@@ -235,21 +235,21 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Req}}oldSetting.MaximumRoleExpiration = payload.MaximumRoleExpiration- case "value.workspace_profile_setting_value.domains":+ case "value.workspace_profile.domains":if err := validateDomains(payload.Domains); err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid domains, error %v", err))}oldSetting.Domains = payload.Domains- case "value.workspace_profile_setting_value.enforce_identity_domain":+ case "value.workspace_profile.enforce_identity_domain":if payload.EnforceIdentityDomain {if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_USER_EMAIL_DOMAIN_RESTRICTION); err != nil {return nil, connect.NewError(connect.CodePermissionDenied, err)}}oldSetting.EnforceIdentityDomain = payload.EnforceIdentityDomain- case "value.workspace_profile_setting_value.database_change_mode":+ case "value.workspace_profile.database_change_mode":oldSetting.DatabaseChangeMode = payload.DatabaseChangeMode- case "value.workspace_profile_setting_value.disallow_password_signin":+ case "value.workspace_profile.disallow_password_signin":if payload.DisallowPasswordSignin {// We should still allow users to turn it off.if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_DISALLOW_PASSWORD_SIGNIN); err != nil {@@ -265,9 +265,9 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Req}}oldSetting.DisallowPasswordSignin = payload.DisallowPasswordSignin- case "value.workspace_profile_setting_value.enable_metric_collection":+ case "value.workspace_profile.enable_metric_collection":oldSetting.EnableMetricCollection = payload.EnableMetricCollection- case "value.workspace_profile_setting_value.enable_audit_log_stdout":+ case "value.workspace_profile.enable_audit_log_stdout":if payload.EnableAuditLogStdout {// Require TEAM or ENTERPRISE licenseif err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_AUDIT_LOG); err != nil {@@ -295,7 +295,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Req}payload := &storepb.WorkspaceApprovalSetting{}- for _, rule := range request.Msg.Setting.Value.GetWorkspaceApprovalSettingValue().Rules {+ for _, rule := range request.Msg.Setting.Value.GetWorkspaceApproval().Rules {// Validate the condition.if _, err := common.ConvertUnparsedApproval(rule.Condition); err != nil {return nil, err@@ -339,7 +339,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.ReqstoreSettingValue = request.Msg.Setting.Value.GetStringValue()case storepb.SettingName_APP_IM:- payload, err := convertAppIMSetting(request.Msg.Setting.Value.GetAppImSettingValue())+ payload, err := convertAppIMSetting(request.Msg.Setting.Value.GetAppIm())if err != nil {return nil, err}@@ -356,7 +356,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Reqfor _, path := range request.Msg.GetUpdateMask().GetPaths() {switch path {- case "value.app_im_setting_value.slack":+ case "value.app_im.slack":slackSetting := findIMSetting(storepb.ProjectWebhook_SLACK)if slackSetting == nil || slackSetting.GetSlack() == nil {return nil, connect.NewError(connect.CodeInvalidArgument, errors.New("cannot found slack setting"))@@ -365,7 +365,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Reqreturn nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("validation failed, error: %v", err))}- case "value.app_im_setting_value.feishu":+ case "value.app_im.feishu":feishuSetting := findIMSetting(storepb.ProjectWebhook_FEISHU)if feishuSetting == nil || feishuSetting.GetFeishu() == nil {return nil, connect.NewError(connect.CodeInvalidArgument, errors.New("cannot found feishu setting"))@@ -374,7 +374,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Reqreturn nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("validation failed, error: %v", err))}- case "value.app_im_setting_value.wecom":+ case "value.app_im.wecom":wecomSetting := findIMSetting(storepb.ProjectWebhook_WECOM)if wecomSetting == nil || wecomSetting.GetWecom() == nil {return nil, connect.NewError(connect.CodeInvalidArgument, errors.New("cannot found wecom setting"))@@ -383,7 +383,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Reqreturn nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("validation failed, error: %v", err))}- case "value.app_im_setting_value.lark":+ case "value.app_im.lark":larkSetting := findIMSetting(storepb.ProjectWebhook_LARK)if larkSetting == nil || larkSetting.GetLark() == nil {return nil, connect.NewError(connect.CodeInvalidArgument, errors.New("cannot found lark setting"))@@ -392,7 +392,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Reqreturn nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("validation failed, error: %v", err))}- case "value.app_im_setting_value.dingtalk":+ case "value.app_im.dingtalk":dingtalkSetting := findIMSetting(storepb.ProjectWebhook_DINGTALK)if dingtalkSetting == nil || dingtalkSetting.GetDingtalk() == nil {return nil, connect.NewError(connect.CodeInvalidArgument, errors.New("cannot found dingtalk setting"))@@ -416,7 +416,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Reqif err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_DATA_CLASSIFICATION); err != nil {return nil, connect.NewError(connect.CodePermissionDenied, err)}- payload := convertDataClassificationSetting(request.Msg.Setting.Value.GetDataClassificationSettingValue())+ payload := convertDataClassificationSetting(request.Msg.Setting.Value.GetDataClassification())// it's a temporary solution to limit only 1 classification config before we support manage it in the UX.if len(payload.Configs) > 1 {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("only support define 1 classification config for now"))@@ -431,7 +431,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.ReqresetClassification = truestoreSettingValue = string(bytes)case storepb.SettingName_SEMANTIC_TYPES:- storeSemanticTypeSetting := convertSemanticTypeSetting(request.Msg.Setting.Value.GetSemanticTypeSettingValue())+ storeSemanticTypeSetting := convertSemanticTypeSetting(request.Msg.Setting.Value.GetSemanticType())idMap := make(map[string]bool)for _, tp := range storeSemanticTypeSetting.Types {if tp.Title == "" {@@ -474,7 +474,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Reqif err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_PASSWORD_RESTRICTIONS); err != nil {return nil, connect.NewError(connect.CodePermissionDenied, err)}- passwordSetting := convertPasswordRestrictionSetting(request.Msg.Setting.Value.GetPasswordRestrictionSetting())+ passwordSetting := convertPasswordRestrictionSetting(request.Msg.Setting.Value.GetPasswordRestriction())if passwordSetting.MinLength < 8 {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid password minimum length, should no less than 8"))}@@ -484,7 +484,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Req}storeSettingValue = string(bytes)case storepb.SettingName_AI:- aiSetting := convertAISetting(request.Msg.Setting.Value.GetAiSetting())+ aiSetting := convertAISetting(request.Msg.Setting.Value.GetAi())if aiSetting.Enabled {if aiSetting.Endpoint == "" || aiSetting.Model == "" {return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("API endpoint and model are required"))@@ -495,7 +495,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Reqreturn nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to unmarshal existed ai setting with error: %v", err))}if aiSetting.ApiKey == "" {- aiSetting.ApiKey = existedAISetting.Value.GetAiSetting().GetApiKey()+ aiSetting.ApiKey = existedAISetting.Value.GetAi().GetApiKey()}}if aiSetting.ApiKey == "" {@@ -509,12 +509,12 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Req}storeSettingValue = string(bytes)case storepb.SettingName_ENVIRONMENT:- if serr := s.validateEnvironments(request.Msg.Setting.Value.GetEnvironmentSetting().GetEnvironments()); serr != nil {+ if serr := s.validateEnvironments(request.Msg.Setting.Value.GetEnvironment().GetEnvironments()); serr != nil {return nil, serr}- environmentSetting := convertEnvironmentSetting(request.Msg.Setting.Value.GetEnvironmentSetting())- oldEnvironmentSetting, err := s.store.GetEnvironmentSetting(ctx)+ environmentSetting := convertEnvironmentSetting(request.Msg.Setting.Value.GetEnvironment())+ oldEnvironmentSetting, err := s.store.GetEnvironment(ctx)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get old environment setting with error: %v", err))}diff --git a/backend/api/v1/setting_service_converter.go b/backend/api/v1/setting_service_converter.goindex dd1ebe9749..f141bb58b8 100644--- a/backend/api/v1/setting_service_converter.go+++ b/backend/api/v1/setting_service_converter.go@@ -24,9 +24,9 @@ func convertToSettingMessage(setting *store.SettingMessage, profile *config.Profv1Value := convertToAppIMSetting(storeValue)return &v1pb.Setting{Name: settingName,- Value: &v1pb.Value{- Value: &v1pb.Value_AppImSettingValue{- AppImSettingValue: v1Value,+ Value: &v1pb.SettingValue{+ Value: &v1pb.SettingValue_AppIm{+ AppIm: v1Value,},},}, nil@@ -39,9 +39,9 @@ func convertToSettingMessage(setting *store.SettingMessage, profile *config.Profv1Value.DisallowSignup = v1Value.DisallowSignup || profile.SaaSreturn &v1pb.Setting{Name: settingName,- Value: &v1pb.Value{- Value: &v1pb.Value_WorkspaceProfileSettingValue{- WorkspaceProfileSettingValue: v1Value,+ Value: &v1pb.SettingValue{+ Value: &v1pb.SettingValue_WorkspaceProfile{+ WorkspaceProfile: v1Value,},},}, nil@@ -61,9 +61,9 @@ func convertToSettingMessage(setting *store.SettingMessage, profile *config.Prof}return &v1pb.Setting{Name: settingName,- Value: &v1pb.Value{- Value: &v1pb.Value_WorkspaceApprovalSettingValue{- WorkspaceApprovalSettingValue: v1Value,+ Value: &v1pb.SettingValue{+ Value: &v1pb.SettingValue_WorkspaceApproval{+ WorkspaceApproval: v1Value,},},}, nil@@ -74,9 +74,9 @@ func convertToSettingMessage(setting *store.SettingMessage, profile *config.Prof}return &v1pb.Setting{Name: settingName,- Value: &v1pb.Value{- Value: &v1pb.Value_DataClassificationSettingValue{- DataClassificationSettingValue: convertToDataClassificationSetting(storeValue),+ Value: &v1pb.SettingValue{+ Value: &v1pb.SettingValue_DataClassification{+ DataClassification: convertToDataClassificationSetting(storeValue),},},}, nil@@ -87,9 +87,9 @@ func convertToSettingMessage(setting *store.SettingMessage, profile *config.Prof}return &v1pb.Setting{Name: settingName,- Value: &v1pb.Value{- Value: &v1pb.Value_SemanticTypeSettingValue{- SemanticTypeSettingValue: convertToSemanticTypeSetting(storeValue),+ Value: &v1pb.SettingValue{+ Value: &v1pb.SettingValue_SemanticType{+ SemanticType: convertToSemanticTypeSetting(storeValue),},},}, nil@@ -100,9 +100,9 @@ func convertToSettingMessage(setting *store.SettingMessage, profile *config.Prof}return &v1pb.Setting{Name: settingName,- Value: &v1pb.Value{- Value: &v1pb.Value_ScimSetting{- ScimSetting: convertToSCIMSetting(storeValue),+ Value: &v1pb.SettingValue{+ Value: &v1pb.SettingValue_Scim{+ Scim: convertToSCIMSetting(storeValue),},},}, nil@@ -113,9 +113,9 @@ func convertToSettingMessage(setting *store.SettingMessage, profile *config.Prof}return &v1pb.Setting{Name: settingName,- Value: &v1pb.Value{- Value: &v1pb.Value_PasswordRestrictionSetting{- PasswordRestrictionSetting: convertToPasswordRestrictionSetting(storeValue),+ Value: &v1pb.SettingValue{+ Value: &v1pb.SettingValue_PasswordRestriction{+ PasswordRestriction: convertToPasswordRestrictionSetting(storeValue),},},}, nil@@ -128,9 +128,9 @@ func convertToSettingMessage(setting *store.SettingMessage, profile *config.ProfstoreValue.ApiKey = ""return &v1pb.Setting{Name: settingName,- Value: &v1pb.Value{- Value: &v1pb.Value_AiSetting{- AiSetting: convertToAISetting(storeValue),+ Value: &v1pb.SettingValue{+ Value: &v1pb.SettingValue_Ai{+ Ai: convertToAISetting(storeValue),},},}, nil@@ -141,17 +141,17 @@ func convertToSettingMessage(setting *store.SettingMessage, profile *config.Prof}return &v1pb.Setting{Name: settingName,- Value: &v1pb.Value{- Value: &v1pb.Value_EnvironmentSetting{- EnvironmentSetting: storeValue,+ Value: &v1pb.SettingValue{+ Value: &v1pb.SettingValue_Environment{+ Environment: storeValue,},},}, nildefault:return &v1pb.Setting{Name: settingName,- Value: &v1pb.Value{- Value: &v1pb.Value_StringValue{+ Value: &v1pb.SettingValue{+ Value: &v1pb.SettingValue_StringValue{StringValue: setting.Value,},},diff --git a/backend/api/v1/user_service.go b/backend/api/v1/user_service.goindex 5637d5a4d0..8b93100c63 100644--- a/backend/api/v1/user_service.go+++ b/backend/api/v1/user_service.go@@ -303,7 +303,7 @@ func (s *UserService) CreateUser(ctx context.Context, request *connect.Request[v}func (s *UserService) validatePassword(ctx context.Context, password string) error {- passwordRestriction, err := s.store.GetPasswordRestrictionSetting(ctx)+ passwordRestriction, err := s.store.GetPasswordRestriction(ctx)if err != nil {return connect.NewError(connect.CodeInternal, errors.Errorf("failed to get password restriction with error: %v", err))}diff --git a/backend/generated-go/v1/setting_service.pb.go b/backend/generated-go/v1/setting_service.pb.goindex ce2336eb06..db4c923375 100644--- a/backend/generated-go/v1/setting_service.pb.go+++ b/backend/generated-go/v1/setting_service.pb.go@@ -621,13 +621,12 @@ func (x *UpdateSettingRequest) GetUpdateMask() *fieldmaskpb.FieldMask {// The schema of setting.type Setting struct {state protoimpl.MessageState `protogen:"open.v1"`- // The resource name of the setting. Must be one of the following forms:- //- // - `setting/{setting}`- // For example, "settings/bb.branding.logo"+ // The resource name of the setting.+ // Format: settings/{setting}+ // Example: "settings/SEMANTIC_TYPES"Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`// The configuration value of the setting.- Value *Value `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`+ Value *SettingValue `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`unknownFields protoimpl.UnknownFieldssizeCache protoimpl.SizeCache}@@ -669,7 +668,7 @@ func (x *Setting) GetName() string {return ""}-func (x *Setting) GetValue() *Value {+func (x *Setting) GetValue() *SettingValue {if x != nil {return x.Value}@@ -677,41 +676,39 @@ func (x *Setting) GetValue() *Value {}// The data in setting value.-type Value struct {+type SettingValue struct {state protoimpl.MessageState `protogen:"open.v1"`- // Value is a oneof field for setting value.- //// Types that are valid to be assigned to Value://- // *Value_StringValue- // *Value_AppImSettingValue- // *Value_WorkspaceProfileSettingValue- // *Value_WorkspaceApprovalSettingValue- // *Value_DataClassificationSettingValue- // *Value_SemanticTypeSettingValue- // *Value_ScimSetting- // *Value_PasswordRestrictionSetting- // *Value_AiSetting- // *Value_EnvironmentSetting- Value isValue_Value `protobuf_oneof:"value"`+ // *SettingValue_StringValue+ // *SettingValue_AppIm+ // *SettingValue_WorkspaceProfile+ // *SettingValue_WorkspaceApproval+ // *SettingValue_DataClassification+ // *SettingValue_SemanticType+ // *SettingValue_Scim+ // *SettingValue_PasswordRestriction+ // *SettingValue_Ai+ // *SettingValue_Environment+ Value isSettingValue_Value `protobuf_oneof:"value"`unknownFields protoimpl.UnknownFieldssizeCache protoimpl.SizeCache}-func (x *Value) Reset() {- *x = Value{}+func (x *SettingValue) Reset() {+ *x = SettingValue{}mi := &file_v1_setting_service_proto_msgTypes[6]ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))ms.StoreMessageInfo(mi)}-func (x *Value) String() string {+func (x *SettingValue) String() string {return protoimpl.X.MessageStringOf(x)}-func (*Value) ProtoMessage() {}+func (*SettingValue) ProtoMessage() {}-func (x *Value) ProtoReflect() protoreflect.Message {+func (x *SettingValue) ProtoReflect() protoreflect.Message {mi := &file_v1_setting_service_proto_msgTypes[6]if x != nil {ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))@@ -723,173 +720,172 @@ func (x *Value) ProtoReflect() protoreflect.Message {return mi.MessageOf(x)}-// Deprecated: Use Value.ProtoReflect.Descriptor instead.-func (*Value) Descriptor() ([]byte, []int) {+// Deprecated: Use SettingValue.ProtoReflect.Descriptor instead.+func (*SettingValue) Descriptor() ([]byte, []int) {return file_v1_setting_service_proto_rawDescGZIP(), []int{6}}-func (x *Value) GetValue() isValue_Value {+func (x *SettingValue) GetValue() isSettingValue_Value {if x != nil {return x.Value}return nil}-func (x *Value) GetStringValue() string {+func (x *SettingValue) GetStringValue() string {if x != nil {- if x, ok := x.Value.(*Value_StringValue); ok {+ if x, ok := x.Value.(*SettingValue_StringValue); ok {return x.StringValue}}return ""}-func (x *Value) GetAppImSettingValue() *AppIMSetting {+func (x *SettingValue) GetAppIm() *AppIMSetting {if x != nil {- if x, ok := x.Value.(*Value_AppImSettingValue); ok {- return x.AppImSettingValue+ if x, ok := x.Value.(*SettingValue_AppIm); ok {+ return x.AppIm}}return nil}-func (x *Value) GetWorkspaceProfileSettingValue() *WorkspaceProfileSetting {+func (x *SettingValue) GetWorkspaceProfile() *WorkspaceProfileSetting {if x != nil {- if x, ok := x.Value.(*Value_WorkspaceProfileSettingValue); ok {- return x.WorkspaceProfileSettingValue+ if x, ok := x.Value.(*SettingValue_WorkspaceProfile); ok {+ return x.WorkspaceProfile}}return nil}-func (x *Value) GetWorkspaceApprovalSettingValue() *WorkspaceApprovalSetting {+func (x *SettingValue) GetWorkspaceApproval() *WorkspaceApprovalSetting {if x != nil {- if x, ok := x.Value.(*Value_WorkspaceApprovalSettingValue); ok {- return x.WorkspaceApprovalSettingValue+ if x, ok := x.Value.(*SettingValue_WorkspaceApproval); ok {+ return x.WorkspaceApproval}}return nil}-func (x *Value) GetDataClassificationSettingValue() *DataClassificationSetting {+func (x *SettingValue) GetDataClassification() *DataClassificationSetting {if x != nil {- if x, ok := x.Value.(*Value_DataClassificationSettingValue); ok {- return x.DataClassificationSettingValue+ if x, ok := x.Value.(*SettingValue_DataClassification); ok {+ return x.DataClassification}}return nil}-func (x *Value) GetSemanticTypeSettingValue() *SemanticTypeSetting {+func (x *SettingValue) GetSemanticType() *SemanticTypeSetting {if x != nil {- if x, ok := x.Value.(*Value_SemanticTypeSettingValue); ok {- return x.SemanticTypeSettingValue+ if x, ok := x.Value.(*SettingValue_SemanticType); ok {+ return x.SemanticType}}return nil}-func (x *Value) GetScimSetting() *SCIMSetting {+func (x *SettingValue) GetScim() *SCIMSetting {if x != nil {- if x, ok := x.Value.(*Value_ScimSetting); ok {- return x.ScimSetting+ if x, ok := x.Value.(*SettingValue_Scim); ok {+ return x.Scim}}return nil}-func (x *Value) GetPasswordRestrictionSetting() *PasswordRestrictionSetting {+func (x *SettingValue) GetPasswordRestriction() *PasswordRestrictionSetting {if x != nil {- if x, ok := x.Value.(*Value_PasswordRestrictionSetting); ok {- return x.PasswordRestrictionSetting+ if x, ok := x.Value.(*SettingValue_PasswordRestriction); ok {+ return x.PasswordRestriction}}return nil}-func (x *Value) GetAiSetting() *AISetting {+func (x *SettingValue) GetAi() *AISetting {if x != nil {- if x, ok := x.Value.(*Value_AiSetting); ok {- return x.AiSetting+ if x, ok := x.Value.(*SettingValue_Ai); ok {+ return x.Ai}}return nil}-func (x *Value) GetEnvironmentSetting() *EnvironmentSetting {+func (x *SettingValue) GetEnvironment() *EnvironmentSetting {if x != nil {- if x, ok := x.Value.(*Value_EnvironmentSetting); ok {- return x.EnvironmentSetting+ if x, ok := x.Value.(*SettingValue_Environment); ok {+ return x.Environment}}return nil}-type isValue_Value interface {- isValue_Value()+type isSettingValue_Value interface {+ isSettingValue_Value()}-type Value_StringValue struct {+type SettingValue_StringValue struct {// Defines this value as being a string value.StringValue string `protobuf:"bytes,1,opt,name=string_value,json=stringValue,proto3,oneof"`}-type Value_AppImSettingValue struct {- AppImSettingValue *AppIMSetting `protobuf:"bytes,3,opt,name=app_im_setting_value,json=appImSettingValue,proto3,oneof"`+type SettingValue_AppIm struct {+ AppIm *AppIMSetting `protobuf:"bytes,3,opt,name=app_im,json=appIm,proto3,oneof"`}-type Value_WorkspaceProfileSettingValue struct {- // reserved 4; // was AgentPluginSetting agent_plugin_setting_value- WorkspaceProfileSettingValue *WorkspaceProfileSetting `protobuf:"bytes,5,opt,name=workspace_profile_setting_value,json=workspaceProfileSettingValue,proto3,oneof"`+type SettingValue_WorkspaceProfile struct {+ WorkspaceProfile *WorkspaceProfileSetting `protobuf:"bytes,5,opt,name=workspace_profile,json=workspaceProfile,proto3,oneof"`}-type Value_WorkspaceApprovalSettingValue struct {- WorkspaceApprovalSettingValue *WorkspaceApprovalSetting `protobuf:"bytes,6,opt,name=workspace_approval_setting_value,json=workspaceApprovalSettingValue,proto3,oneof"`+type SettingValue_WorkspaceApproval struct {+ WorkspaceApproval *WorkspaceApprovalSetting `protobuf:"bytes,6,opt,name=workspace_approval,json=workspaceApproval,proto3,oneof"`}-type Value_DataClassificationSettingValue struct {- DataClassificationSettingValue *DataClassificationSetting `protobuf:"bytes,10,opt,name=data_classification_setting_value,json=dataClassificationSettingValue,proto3,oneof"`+type SettingValue_DataClassification struct {+ DataClassification *DataClassificationSetting `protobuf:"bytes,10,opt,name=data_classification,json=dataClassification,proto3,oneof"`}-type Value_SemanticTypeSettingValue struct {- SemanticTypeSettingValue *SemanticTypeSetting `protobuf:"bytes,11,opt,name=semantic_type_setting_value,json=semanticTypeSettingValue,proto3,oneof"`+type SettingValue_SemanticType struct {+ SemanticType *SemanticTypeSetting `protobuf:"bytes,11,opt,name=semantic_type,json=semanticType,proto3,oneof"`}-type Value_ScimSetting struct {- ScimSetting *SCIMSetting `protobuf:"bytes,14,opt,name=scim_setting,json=scimSetting,proto3,oneof"`+type SettingValue_Scim struct {+ Scim *SCIMSetting `protobuf:"bytes,14,opt,name=scim,proto3,oneof"`}-type Value_PasswordRestrictionSetting struct {- PasswordRestrictionSetting *PasswordRestrictionSetting `protobuf:"bytes,15,opt,name=password_restriction_setting,json=passwordRestrictionSetting,proto3,oneof"`+type SettingValue_PasswordRestriction struct {+ PasswordRestriction *PasswordRestrictionSetting `protobuf:"bytes,15,opt,name=password_restriction,json=passwordRestriction,proto3,oneof"`}-type Value_AiSetting struct {- AiSetting *AISetting `protobuf:"bytes,16,opt,name=ai_setting,json=aiSetting,proto3,oneof"`+type SettingValue_Ai struct {+ Ai *AISetting `protobuf:"bytes,16,opt,name=ai,proto3,oneof"`}-type Value_EnvironmentSetting struct {- EnvironmentSetting *EnvironmentSetting `protobuf:"bytes,17,opt,name=environment_setting,json=environmentSetting,proto3,oneof"`+type SettingValue_Environment struct {+ Environment *EnvironmentSetting `protobuf:"bytes,17,opt,name=environment,proto3,oneof"`}-func (*Value_StringValue) isValue_Value() {}+func (*SettingValue_StringValue) isSettingValue_Value() {}-func (*Value_AppImSettingValue) isValue_Value() {}+func (*SettingValue_AppIm) isSettingValue_Value() {}-func (*Value_WorkspaceProfileSettingValue) isValue_Value() {}+func (*SettingValue_WorkspaceProfile) isSettingValue_Value() {}-func (*Value_WorkspaceApprovalSettingValue) isValue_Value() {}+func (*SettingValue_WorkspaceApproval) isSettingValue_Value() {}-func (*Value_DataClassificationSettingValue) isValue_Value() {}+func (*SettingValue_DataClassification) isSettingValue_Value() {}-func (*Value_SemanticTypeSettingValue) isValue_Value() {}+func (*SettingValue_SemanticType) isSettingValue_Value() {}-func (*Value_ScimSetting) isValue_Value() {}+func (*SettingValue_Scim) isSettingValue_Value() {}-func (*Value_PasswordRestrictionSetting) isValue_Value() {}+func (*SettingValue_PasswordRestriction) isSettingValue_Value() {}-func (*Value_AiSetting) isValue_Value() {}+func (*SettingValue_Ai) isSettingValue_Value() {}-func (*Value_EnvironmentSetting) isValue_Value() {}+func (*SettingValue_Environment) isSettingValue_Value() {}type AppIMSetting struct {state protoimpl.MessageState `protogen:"open.v1"`@@ -2813,10 +2809,10 @@ const file_v1_setting_service_proto_rawDesc = "" +"\rvalidate_only\x18\x02 \x01(\bR\fvalidateOnly\x12#\n" +"\rallow_missing\x18\x03 \x01(\bR\fallowMissing\x12;\n" +"\vupdate_mask\x18\x04 \x01(\v2\x1a.google.protobuf.FieldMaskR\n" +- "updateMask\"\xb8\x03\n" +- "\aSetting\x12\x12\n" +- "\x04name\x18\x01 \x01(\tR\x04name\x12(\n" +- "\x05value\x18\x02 \x01(\v2\x12.bytebase.v1.ValueR\x05value\"\xb9\x02\n" ++ "updateMask\"\xb7\x03\n" ++ "\aSetting\x12\x17\n" ++ "\x04name\x18\x01 \x01(\tB\x03\xe0A\bR\x04name\x124\n" ++ "\x05value\x18\x02 \x01(\v2\x19.bytebase.v1.SettingValueB\x03\xe0A\x02R\x05value\"\xad\x02\n" +"\vSettingName\x12\x1c\n" +"\x18SETTING_NAME_UNSPECIFIED\x10\x00\x12\x0f\n" +"\vAUTH_SECRET\x10\x01\x12\x11\n" +@@ -2834,23 +2830,21 @@ const file_v1_setting_service_proto_rawDesc = "" +"\x0eSEMANTIC_TYPES\x10\x0f\x12\b\n" +"\x04SCIM\x10\x11\x12\x18\n" +"\x14PASSWORD_RESTRICTION\x10\x12\x12\x0f\n" +- "\vENVIRONMENT\x10\x13\"\x04\b\x06\x10\x06\"\x04\b\r\x10\r:-\xeaA*\n" +- "\x14bytebase.com/Setting\x12\x12settings/{setting}J\x04\b\x10\x10\x11\"\x81\a\n" +- "\x05Value\x12#\n" +- "\fstring_value\x18\x01 \x01(\tH\x00R\vstringValue\x12L\n" +- "\x14app_im_setting_value\x18\x03 \x01(\v2\x19.bytebase.v1.AppIMSettingH\x00R\x11appImSettingValue\x12m\n" +- "\x1fworkspace_profile_setting_value\x18\x05 \x01(\v2$.bytebase.v1.WorkspaceProfileSettingH\x00R\x1cworkspaceProfileSettingValue\x12p\n" +- " workspace_approval_setting_value\x18\x06 \x01(\v2%.bytebase.v1.WorkspaceApprovalSettingH\x00R\x1dworkspaceApprovalSettingValue\x12s\n" +- "!data_classification_setting_value\x18\n" +- " \x01(\v2&.bytebase.v1.DataClassificationSettingH\x00R\x1edataClassificationSettingValue\x12a\n" +- "\x1bsemantic_type_setting_value\x18\v \x01(\v2 .bytebase.v1.SemanticTypeSettingH\x00R\x18semanticTypeSettingValue\x12=\n" +- "\fscim_setting\x18\x0e \x01(\v2\x18.bytebase.v1.SCIMSettingH\x00R\vscimSetting\x12k\n" +- "\x1cpassword_restriction_setting\x18\x0f \x01(\v2'.bytebase.v1.PasswordRestrictionSettingH\x00R\x1apasswordRestrictionSetting\x127\n" +- "\n" +- "ai_setting\x18\x10 \x01(\v2\x16.bytebase.v1.AISettingH\x00R\taiSetting\x12R\n" +- "\x13environment_setting\x18\x11 \x01(\v2\x1f.bytebase.v1.EnvironmentSettingH\x00R\x12environmentSettingB\a\n" +- "\x05valueJ\x04\b\x12\x10\x13J\x04\b\t\x10\n" +- "\"\xd3\x06\n" ++ "\vENVIRONMENT\x10\x13:-\xeaA*\n" ++ "\x14bytebase.com/Setting\x12\x12settings/{setting}\"\xbe\x05\n" ++ "\fSettingValue\x12#\n" ++ "\fstring_value\x18\x01 \x01(\tH\x00R\vstringValue\x122\n" ++ "\x06app_im\x18\x03 \x01(\v2\x19.bytebase.v1.AppIMSettingH\x00R\x05appIm\x12S\n" ++ "\x11workspace_profile\x18\x05 \x01(\v2$.bytebase.v1.WorkspaceProfileSettingH\x00R\x10workspaceProfile\x12V\n" ++ "\x12workspace_approval\x18\x06 \x01(\v2%.bytebase.v1.WorkspaceApprovalSettingH\x00R\x11workspaceApproval\x12Y\n" ++ "\x13data_classification\x18\n" ++ " \x01(\v2&.bytebase.v1.DataClassificationSettingH\x00R\x12dataClassification\x12G\n" ++ "\rsemantic_type\x18\v \x01(\v2 .bytebase.v1.SemanticTypeSettingH\x00R\fsemanticType\x12.\n" ++ "\x04scim\x18\x0e \x01(\v2\x18.bytebase.v1.SCIMSettingH\x00R\x04scim\x12\\\n" ++ "\x14password_restriction\x18\x0f \x01(\v2'.bytebase.v1.PasswordRestrictionSettingH\x00R\x13passwordRestriction\x12(\n" ++ "\x02ai\x18\x10 \x01(\v2\x16.bytebase.v1.AISettingH\x00R\x02ai\x12C\n" ++ "\venvironment\x18\x11 \x01(\v2\x1f.bytebase.v1.EnvironmentSettingH\x00R\venvironmentB\a\n" ++ "\x05value\"\xd3\x06\n" +"\fAppIMSetting\x12?\n" +"\bsettings\x18\x01 \x03(\v2#.bytebase.v1.AppIMSetting.IMSettingR\bsettings\x1a\"\n" +"\x05Slack\x12\x19\n" +@@ -3050,7 +3044,7 @@ var file_v1_setting_service_proto_goTypes = []any{(*GetSettingResponse)(nil), // 9: bytebase.v1.GetSettingResponse(*UpdateSettingRequest)(nil), // 10: bytebase.v1.UpdateSettingRequest(*Setting)(nil), // 11: bytebase.v1.Setting- (*Value)(nil), // 12: bytebase.v1.Value+ (*SettingValue)(nil), // 12: bytebase.v1.SettingValue(*AppIMSetting)(nil), // 13: bytebase.v1.AppIMSetting(*WorkspaceProfileSetting)(nil), // 14: bytebase.v1.WorkspaceProfileSetting(*Announcement)(nil), // 15: bytebase.v1.Announcement@@ -3092,16 +3086,16 @@ var file_v1_setting_service_proto_depIdxs = []int32{11, // 1: bytebase.v1.GetSettingResponse.setting:type_name -> bytebase.v1.Setting11, // 2: bytebase.v1.UpdateSettingRequest.setting:type_name -> bytebase.v1.Setting43, // 3: bytebase.v1.UpdateSettingRequest.update_mask:type_name -> google.protobuf.FieldMask- 12, // 4: bytebase.v1.Setting.value:type_name -> bytebase.v1.Value- 13, // 5: bytebase.v1.Value.app_im_setting_value:type_name -> bytebase.v1.AppIMSetting- 14, // 6: bytebase.v1.Value.workspace_profile_setting_value:type_name -> bytebase.v1.WorkspaceProfileSetting- 16, // 7: bytebase.v1.Value.workspace_approval_setting_value:type_name -> bytebase.v1.WorkspaceApprovalSetting- 17, // 8: bytebase.v1.Value.data_classification_setting_value:type_name -> bytebase.v1.DataClassificationSetting- 18, // 9: bytebase.v1.Value.semantic_type_setting_value:type_name -> bytebase.v1.SemanticTypeSetting- 20, // 10: bytebase.v1.Value.scim_setting:type_name -> bytebase.v1.SCIMSetting- 21, // 11: bytebase.v1.Value.password_restriction_setting:type_name -> bytebase.v1.PasswordRestrictionSetting- 22, // 12: bytebase.v1.Value.ai_setting:type_name -> bytebase.v1.AISetting- 23, // 13: bytebase.v1.Value.environment_setting:type_name -> bytebase.v1.EnvironmentSetting+ 12, // 4: bytebase.v1.Setting.value:type_name -> bytebase.v1.SettingValue+ 13, // 5: bytebase.v1.SettingValue.app_im:type_name -> bytebase.v1.AppIMSetting+ 14, // 6: bytebase.v1.SettingValue.workspace_profile:type_name -> bytebase.v1.WorkspaceProfileSetting+ 16, // 7: bytebase.v1.SettingValue.workspace_approval:type_name -> bytebase.v1.WorkspaceApprovalSetting+ 17, // 8: bytebase.v1.SettingValue.data_classification:type_name -> bytebase.v1.DataClassificationSetting+ 18, // 9: bytebase.v1.SettingValue.semantic_type:type_name -> bytebase.v1.SemanticTypeSetting+ 20, // 10: bytebase.v1.SettingValue.scim:type_name -> bytebase.v1.SCIMSetting+ 21, // 11: bytebase.v1.SettingValue.password_restriction:type_name -> bytebase.v1.PasswordRestrictionSetting+ 22, // 12: bytebase.v1.SettingValue.ai:type_name -> bytebase.v1.AISetting+ 23, // 13: bytebase.v1.SettingValue.environment:type_name -> bytebase.v1.EnvironmentSetting29, // 14: bytebase.v1.AppIMSetting.settings:type_name -> bytebase.v1.AppIMSetting.IMSetting44, // 15: bytebase.v1.WorkspaceProfileSetting.token_duration:type_name -> google.protobuf.Duration15, // 16: bytebase.v1.WorkspaceProfileSetting.announcement:type_name -> bytebase.v1.Announcement@@ -3157,16 +3151,16 @@ func file_v1_setting_service_proto_init() {file_v1_issue_service_proto_init()file_v1_project_service_proto_init()file_v1_setting_service_proto_msgTypes[6].OneofWrappers = []any{- (*Value_StringValue)(nil),- (*Value_AppImSettingValue)(nil),- (*Value_WorkspaceProfileSettingValue)(nil),- (*Value_WorkspaceApprovalSettingValue)(nil),- (*Value_DataClassificationSettingValue)(nil),- (*Value_SemanticTypeSettingValue)(nil),- (*Value_ScimSetting)(nil),- (*Value_PasswordRestrictionSetting)(nil),- (*Value_AiSetting)(nil),- (*Value_EnvironmentSetting)(nil),+ (*SettingValue_StringValue)(nil),+ (*SettingValue_AppIm)(nil),+ (*SettingValue_WorkspaceProfile)(nil),+ (*SettingValue_WorkspaceApproval)(nil),+ (*SettingValue_DataClassification)(nil),+ (*SettingValue_SemanticType)(nil),+ (*SettingValue_Scim)(nil),+ (*SettingValue_PasswordRestriction)(nil),+ (*SettingValue_Ai)(nil),+ (*SettingValue_Environment)(nil),}file_v1_setting_service_proto_msgTypes[13].OneofWrappers = []any{(*Algorithm_FullMask_)(nil),diff --git a/backend/generated-go/v1/setting_service_equal.pb.go b/backend/generated-go/v1/setting_service_equal.pb.goindex 4fca5818c9..3f7604a3ea 100644--- a/backend/generated-go/v1/setting_service_equal.pb.go+++ b/backend/generated-go/v1/setting_service_equal.pb.go@@ -105,7 +105,7 @@ func (x *Setting) Equal(y *Setting) bool {return true}-func (x *Value) Equal(y *Value) bool {+func (x *SettingValue) Equal(y *SettingValue) bool {if x == y {return true}@@ -115,31 +115,31 @@ func (x *Value) Equal(y *Value) bool {if x.GetStringValue() != y.GetStringValue() {return false}- if !x.GetAppImSettingValue().Equal(y.GetAppImSettingValue()) {+ if !x.GetAppIm().Equal(y.GetAppIm()) {return false}- if !x.GetWorkspaceProfileSettingValue().Equal(y.GetWorkspaceProfileSettingValue()) {+ if !x.GetWorkspaceProfile().Equal(y.GetWorkspaceProfile()) {return false}- if !x.GetWorkspaceApprovalSettingValue().Equal(y.GetWorkspaceApprovalSettingValue()) {+ if !x.GetWorkspaceApproval().Equal(y.GetWorkspaceApproval()) {return false}- if !x.GetDataClassificationSettingValue().Equal(y.GetDataClassificationSettingValue()) {+ if !x.GetDataClassification().Equal(y.GetDataClassification()) {return false}- if !x.GetSemanticTypeSettingValue().Equal(y.GetSemanticTypeSettingValue()) {+ if !x.GetSemanticType().Equal(y.GetSemanticType()) {return false}- if !x.GetScimSetting().Equal(y.GetScimSetting()) {+ if !x.GetScim().Equal(y.GetScim()) {return false}- if !x.GetPasswordRestrictionSetting().Equal(y.GetPasswordRestrictionSetting()) {+ if !x.GetPasswordRestriction().Equal(y.GetPasswordRestriction()) {return false}- if !x.GetAiSetting().Equal(y.GetAiSetting()) {+ if !x.GetAi().Equal(y.GetAi()) {return false}- if !x.GetEnvironmentSetting().Equal(y.GetEnvironmentSetting()) {+ if !x.GetEnvironment().Equal(y.GetEnvironment()) {return false}return truediff --git a/backend/runner/approval/runner.go b/backend/runner/approval/runner.goindex 2773b9ee37..25a844790f 100644--- a/backend/runner/approval/runner.go+++ b/backend/runner/approval/runner.go@@ -638,7 +638,7 @@ func (r *Runner) buildCELVariablesForGrantRequest(ctx context.Context, issue *st// If no specific databases, create one entry per environmentif len(factors.Databases) == 0 {- environments, err := r.store.GetEnvironmentSetting(ctx)+ environments, err := r.store.GetEnvironment(ctx)if err != nil {return nil, false, err}diff --git a/backend/runner/taskrun/schedulerv2.go b/backend/runner/taskrun/schedulerv2.goindex afd9131164..5ce9851698 100644--- a/backend/runner/taskrun/schedulerv2.go+++ b/backend/runner/taskrun/schedulerv2.go@@ -117,7 +117,7 @@ func (s *SchedulerV2) runOnce(ctx context.Context) {}func (s *SchedulerV2) scheduleAutoRolloutTasks(ctx context.Context) error {- environments, err := s.store.GetEnvironmentSetting(ctx)+ environments, err := s.store.GetEnvironment(ctx)if err != nil {return errors.Wrapf(err, "failed to list environments")}@@ -1037,7 +1037,7 @@ func isSequentialTask(task *store.TaskMessage) bool {// getAllEnvironmentIDs returns all environment IDs from the store.func getAllEnvironmentIDs(ctx context.Context, s *store.Store) ([]string, error) {- environments, err := s.GetEnvironmentSetting(ctx)+ environments, err := s.GetEnvironment(ctx)if err != nil {return nil, errors.Wrapf(err, "failed to list environments")}diff --git a/backend/store/environment.go b/backend/store/environment.goindex 39eca60f46..a11f88c662 100644--- a/backend/store/environment.go+++ b/backend/store/environment.go@@ -10,7 +10,7 @@ import ()func (s *Store) GetEnvironmentByID(ctx context.Context, id string) (*storepb.EnvironmentSetting_Environment, error) {- environments, err := s.GetEnvironmentSetting(ctx)+ environments, err := s.GetEnvironment(ctx)if err != nil {return nil, err}diff --git a/backend/store/setting.go b/backend/store/setting.goindex cbdf386b8e..11bdf09ca2 100644--- a/backend/store/setting.go+++ b/backend/store/setting.go@@ -28,7 +28,7 @@ type SettingMessage struct {Value string}-func (s *Store) GetPasswordRestrictionSetting(ctx context.Context) (*storepb.PasswordRestrictionSetting, error) {+func (s *Store) GetPasswordRestriction(ctx context.Context) (*storepb.PasswordRestrictionSetting, error) {passwordRestriction := &storepb.PasswordRestrictionSetting{MinLength: 8,}@@ -158,7 +158,7 @@ func (s *Store) GetAISetting(ctx context.Context) (*storepb.AISetting, error) {return aiSetting, nil}-func (s *Store) GetEnvironmentSetting(ctx context.Context) (*storepb.EnvironmentSetting, error) {+func (s *Store) GetEnvironment(ctx context.Context) (*storepb.EnvironmentSetting, error) {envSetting := &storepb.EnvironmentSetting{}setting, err := s.GetSettingV2(ctx, storepb.SettingName_ENVIRONMENT)if err != nil {diff --git a/backend/tests/approval_test.go b/backend/tests/approval_test.goindex 79d3eb9b48..51f455abf3 100644--- a/backend/tests/approval_test.go+++ b/backend/tests/approval_test.go@@ -56,9 +56,9 @@ func TestDirectApprovalRuleMatching(t *testing.T) {AllowMissing: true,Setting: &v1pb.Setting{Name: "settings/WORKSPACE_APPROVAL",- Value: &v1pb.Value{- Value: &v1pb.Value_WorkspaceApprovalSettingValue{- WorkspaceApprovalSettingValue: &v1pb.WorkspaceApprovalSetting{+ Value: &v1pb.SettingValue{+ Value: &v1pb.SettingValue_WorkspaceApproval{+ WorkspaceApproval: &v1pb.WorkspaceApprovalSetting{Rules: []*v1pb.WorkspaceApprovalSetting_Rule{{Source: v1pb.WorkspaceApprovalSetting_Rule_CHANGE_DATABASE,@@ -194,9 +194,9 @@ func TestApprovalRuleFirstMatchWins(t *testing.T) {AllowMissing: true,Setting: &v1pb.Setting{Name: "settings/WORKSPACE_APPROVAL",- Value: &v1pb.Value{- Value: &v1pb.Value_WorkspaceApprovalSettingValue{- WorkspaceApprovalSettingValue: &v1pb.WorkspaceApprovalSetting{+ Value: &v1pb.SettingValue{+ Value: &v1pb.SettingValue_WorkspaceApproval{+ WorkspaceApproval: &v1pb.WorkspaceApprovalSetting{Rules: []*v1pb.WorkspaceApprovalSetting_Rule{{// Rule 1: Specific - prod environment@@ -340,9 +340,9 @@ func TestApprovalRuleNoMatch(t *testing.T) {AllowMissing: true,Setting: &v1pb.Setting{Name: "settings/WORKSPACE_APPROVAL",- Value: &v1pb.Value{- Value: &v1pb.Value_WorkspaceApprovalSettingValue{- WorkspaceApprovalSettingValue: &v1pb.WorkspaceApprovalSetting{+ Value: &v1pb.SettingValue{+ Value: &v1pb.SettingValue_WorkspaceApproval{+ WorkspaceApproval: &v1pb.WorkspaceApprovalSetting{Rules: []*v1pb.WorkspaceApprovalSetting_Rule{{Source: v1pb.WorkspaceApprovalSetting_Rule_CHANGE_DATABASE,@@ -453,9 +453,9 @@ func TestFallbackRuleValidation(t *testing.T) {AllowMissing: true,Setting: &v1pb.Setting{Name: "settings/WORKSPACE_APPROVAL",- Value: &v1pb.Value{- Value: &v1pb.Value_WorkspaceApprovalSettingValue{- WorkspaceApprovalSettingValue: &v1pb.WorkspaceApprovalSetting{+ Value: &v1pb.SettingValue{+ Value: &v1pb.SettingValue_WorkspaceApproval{+ WorkspaceApproval: &v1pb.WorkspaceApprovalSetting{Rules: []*v1pb.WorkspaceApprovalSetting_Rule{{Source: v1pb.WorkspaceApprovalSetting_Rule_SOURCE_UNSPECIFIED,@@ -480,9 +480,9 @@ func TestFallbackRuleValidation(t *testing.T) {AllowMissing: true,Setting: &v1pb.Setting{Name: "settings/WORKSPACE_APPROVAL",- Value: &v1pb.Value{- Value: &v1pb.Value_WorkspaceApprovalSettingValue{- WorkspaceApprovalSettingValue: &v1pb.WorkspaceApprovalSetting{+ Value: &v1pb.SettingValue{+ Value: &v1pb.SettingValue_WorkspaceApproval{+ WorkspaceApproval: &v1pb.WorkspaceApprovalSetting{Rules: []*v1pb.WorkspaceApprovalSetting_Rule{{Source: v1pb.WorkspaceApprovalSetting_Rule_SOURCE_UNSPECIFIED,@@ -547,9 +547,9 @@ func TestFallbackRuleMatchesWhenSourceSpecificDoesNot(t *testing.T) {AllowMissing: true,Setting: &v1pb.Setting{Name: "settings/WORKSPACE_APPROVAL",- Value: &v1pb.Value{- Value: &v1pb.Value_WorkspaceApprovalSettingValue{- WorkspaceApprovalSettingValue: &v1pb.WorkspaceApprovalSetting{+ Value: &v1pb.SettingValue{+ Value: &v1pb.SettingValue_WorkspaceApproval{+ WorkspaceApproval: &v1pb.WorkspaceApprovalSetting{Rules: []*v1pb.WorkspaceApprovalSetting_Rule{{// Source-specific: only matches prod@@ -687,9 +687,9 @@ func TestSourceSpecificRuleTakesPriorityOverFallback(t *testing.T) {AllowMissing: true,Setting: &v1pb.Setting{Name: "settings/WORKSPACE_APPROVAL",- Value: &v1pb.Value{- Value: &v1pb.Value_WorkspaceApprovalSettingValue{- WorkspaceApprovalSettingValue: &v1pb.WorkspaceApprovalSetting{+ Value: &v1pb.SettingValue{+ Value: &v1pb.SettingValue_WorkspaceApproval{+ WorkspaceApproval: &v1pb.WorkspaceApprovalSetting{Rules: []*v1pb.WorkspaceApprovalSetting_Rule{{// Fallback rule FIRST in listdiff --git a/backend/tests/environment.go b/backend/tests/environment.goindex 07ae0d4b18..c1eae26e76 100644--- a/backend/tests/environment.go+++ b/backend/tests/environment.go@@ -19,7 +19,7 @@ func (ctl *controller) getEnvironment(ctx context.Context, id string) (*v1pb.Envif err != nil {return nil, err}- for _, environment := range resp.Msg.Value.GetEnvironmentSetting().GetEnvironments() {+ for _, environment := range resp.Msg.Value.GetEnvironment().GetEnvironments() {if environment.Id == id {return environment, nil}@@ -39,7 +39,7 @@ func (ctl *controller) createEnvironment(ctx context.Context, id, title string)if err != nil {return nil, err}- environments := resp.Msg.Value.GetEnvironmentSetting().GetEnvironments()+ environments := resp.Msg.Value.GetEnvironment().GetEnvironments()environments = append(environments, &v1pb.EnvironmentSetting_Environment{Id: id,Title: title,@@ -48,16 +48,16 @@ func (ctl *controller) createEnvironment(ctx context.Context, id, title string)connect.NewRequest(&v1pb.UpdateSettingRequest{Setting: &v1pb.Setting{Name: "settings/" + v1pb.Setting_ENVIRONMENT.String(),- Value: &v1pb.Value{- Value: &v1pb.Value_EnvironmentSetting{- EnvironmentSetting: &v1pb.EnvironmentSetting{+ Value: &v1pb.SettingValue{+ Value: &v1pb.SettingValue_Environment{+ Environment: &v1pb.EnvironmentSetting{Environments: environments,},},},},UpdateMask: &fieldmaskpb.FieldMask{- Paths: []string{"environment_setting"},+ Paths: []string{"environment"},},}))if err != nil {diff --git a/backend/tests/sensitive_data_test.go b/backend/tests/sensitive_data_test.goindex 3299ba520a..b7d402687a 100644--- a/backend/tests/sensitive_data_test.go+++ b/backend/tests/sensitive_data_test.go@@ -111,9 +111,9 @@ func TestSensitiveData(t *testing.T) {_, err = ctl.settingServiceClient.UpdateSetting(ctx, connect.NewRequest(&v1pb.UpdateSettingRequest{Setting: &v1pb.Setting{Name: "settings/" + v1pb.Setting_SEMANTIC_TYPES.String(),- Value: &v1pb.Value{- Value: &v1pb.Value_SemanticTypeSettingValue{- SemanticTypeSettingValue: &v1pb.SemanticTypeSetting{+ Value: &v1pb.SettingValue{+ Value: &v1pb.SettingValue_SemanticType{+ SemanticType: &v1pb.SemanticTypeSetting{Types: []*v1pb.SemanticTypeSetting_SemanticType{{Id: "default",diff --git a/backend/tests/tests.go b/backend/tests/tests.goindex f99093393f..c6a41d9102 100644--- a/backend/tests/tests.go+++ b/backend/tests/tests.go@@ -219,9 +219,9 @@ func (ctl *controller) initWorkspaceProfile(ctx context.Context) error {AllowMissing: true,Setting: &v1pb.Setting{Name: "settings/" + v1pb.Setting_WORKSPACE_PROFILE.String(),- Value: &v1pb.Value{- Value: &v1pb.Value_WorkspaceProfileSettingValue{- WorkspaceProfileSettingValue: &v1pb.WorkspaceProfileSetting{+ Value: &v1pb.SettingValue{+ Value: &v1pb.SettingValue_WorkspaceProfile{+ WorkspaceProfile: &v1pb.WorkspaceProfileSetting{DisallowSignup: false,},},@@ -229,7 +229,7 @@ func (ctl *controller) initWorkspaceProfile(ctx context.Context) error {},UpdateMask: &fieldmaskpb.FieldMask{Paths: []string{- "value.workspace_profile_setting_value.disallow_signup",+ "value.workspace_profile.disallow_signup",},},}))diff --git a/frontend/src/components/GeneralSetting/AIAugmentationSetting.vue b/frontend/src/components/GeneralSetting/AIAugmentationSetting.vueindex 2e0d9747ab..7872dbe2b2 100644--- a/frontend/src/components/GeneralSetting/AIAugmentationSetting.vue+++ b/frontend/src/components/GeneralSetting/AIAugmentationSetting.vue@@ -173,7 +173,7 @@ import {AISetting_Provider,AISettingSchema,Setting_SettingName,- ValueSchema as SettingValueSchema,+ SettingValueSchema as SettingSettingValueSchema,} from "@/types/proto-es/v1/setting_service_pb";interface LocalState {@@ -204,7 +204,7 @@ const state = reactive<LocalState>({const aiSetting = computed(() => {const setting = settingV1Store.getSettingByName(Setting_SettingName.AI);- if (setting?.value?.value?.case === "aiSetting") {+ if (setting?.value?.value?.case === "ai") {return setting.value.value.value;}return undefined;@@ -330,9 +330,9 @@ const toggleAIEnabled = (on: boolean) => {const updateAISetting = async () => {await settingV1Store.upsertSetting({name: Setting_SettingName.AI,- value: create(SettingValueSchema, {+ value: create(SettingSettingValueSchema, {value: {- case: "aiSetting",+ case: "ai",value: create(AISettingSchema, {enabled: state.enabled,apiKey: state.apiKey,diff --git a/frontend/src/components/GeneralSetting/AccountSetting.vue b/frontend/src/components/GeneralSetting/AccountSetting.vueindex 787bace9bb..8426194a63 100644--- a/frontend/src/components/GeneralSetting/AccountSetting.vue+++ b/frontend/src/components/GeneralSetting/AccountSetting.vue@@ -216,20 +216,16 @@ const onUpdate = async () => {state.disallowSignup !==settingV1Store.workspaceProfileSetting?.disallowSignup) {- updateMaskPaths.push(- "value.workspace_profile_setting_value.disallow_signup"- );+ updateMaskPaths.push("value.workspace_profile.disallow_signup");}if (state.require2fa !== settingV1Store.workspaceProfileSetting?.require2fa) {- updateMaskPaths.push("value.workspace_profile_setting_value.require_2fa");+ updateMaskPaths.push("value.workspace_profile.require_2fa");}if (state.disallowPasswordSignin !==settingV1Store.workspaceProfileSetting?.disallowPasswordSignin) {- updateMaskPaths.push(- "value.workspace_profile_setting_value.disallow_password_signin"- );+ updateMaskPaths.push("value.workspace_profile.disallow_password_signin");}if (updateMaskPaths.length > 0) {diff --git a/frontend/src/components/GeneralSetting/AnnouncementSetting.vue b/frontend/src/components/GeneralSetting/AnnouncementSetting.vueindex cf09692140..acb046a984 100644--- a/frontend/src/components/GeneralSetting/AnnouncementSetting.vue+++ b/frontend/src/components/GeneralSetting/AnnouncementSetting.vue@@ -146,7 +146,7 @@ const updateAnnouncementSetting = async () => {announcement: { ...state },},updateMask: create(FieldMaskSchema, {- paths: ["value.workspace_profile_setting_value.announcement"],+ paths: ["value.workspace_profile.announcement"],}),});};diff --git a/frontend/src/components/GeneralSetting/AuditLogStdoutSetting.vue b/frontend/src/components/GeneralSetting/AuditLogStdoutSetting.vueindex ee70f5c529..7bc965a108 100644--- a/frontend/src/components/GeneralSetting/AuditLogStdoutSetting.vue+++ b/frontend/src/components/GeneralSetting/AuditLogStdoutSetting.vue@@ -74,7 +74,7 @@ const update = async () => {await settingV1Store.updateWorkspaceProfile({payload,updateMask: create(FieldMaskSchema, {- paths: ["value.workspace_profile_setting_value.enable_audit_log_stdout"],+ paths: ["value.workspace_profile.enable_audit_log_stdout"],}),});diff --git a/frontend/src/components/GeneralSetting/BrandingSetting.vue b/frontend/src/components/GeneralSetting/BrandingSetting.vueindex a5573337c3..f2ef4d4cf1 100644--- a/frontend/src/components/GeneralSetting/BrandingSetting.vue+++ b/frontend/src/components/GeneralSetting/BrandingSetting.vue@@ -72,7 +72,7 @@ import { useActuatorV1Store } from "@/store/modules/v1/actuator";import { useSettingV1Store } from "@/store/modules/v1/setting";import {Setting_SettingName,- ValueSchema as SettingValueSchema,+ SettingValueSchema as SettingSettingValueSchema,} from "@/types/proto-es/v1/setting_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";import { FeatureBadge, FeatureModal } from "../FeatureGuard";@@ -123,7 +123,7 @@ const doUpdate = async (content: string) => {try {await settingV1Store.upsertSetting({name: Setting_SettingName.BRANDING_LOGO,- value: create(SettingValueSchema, {+ value: create(SettingSettingValueSchema, {value: {case: "stringValue",value: content,diff --git a/frontend/src/components/GeneralSetting/DomainRestrictionSetting.vue b/frontend/src/components/GeneralSetting/DomainRestrictionSetting.vueindex 9dabf81f1c..c44943aa8a 100644--- a/frontend/src/components/GeneralSetting/DomainRestrictionSetting.vue+++ b/frontend/src/components/GeneralSetting/DomainRestrictionSetting.vue@@ -122,13 +122,11 @@ defineExpose({}const updateMask: string[] = [];if (initialState.value.enableRestriction !== state.enableRestriction) {- updateMask.push(- "value.workspace_profile_setting_value.enforce_identity_domain"- );+ updateMask.push("value.workspace_profile.enforce_identity_domain");}if (!isEqual(validDomains.value, initialState.value.domains)) {- updateMask.push("value.workspace_profile_setting_value.domains");+ updateMask.push("value.workspace_profile.domains");}if (updateMask.length > 0) {await settingV1Store.updateWorkspaceProfile({diff --git a/frontend/src/components/GeneralSetting/GeneralSetting.vue b/frontend/src/components/GeneralSetting/GeneralSetting.vueindex d9e8e75f38..8008d89f8b 100644--- a/frontend/src/components/GeneralSetting/GeneralSetting.vue+++ b/frontend/src/components/GeneralSetting/GeneralSetting.vue@@ -143,7 +143,7 @@ const onUpdate = async () => {externalUrl: state.externalUrl,},updateMask: create(FieldMaskSchema, {- paths: ["value.workspace_profile_setting_value.external_url"],+ paths: ["value.workspace_profile.external_url"],}),});}@@ -153,7 +153,7 @@ const onUpdate = async () => {databaseChangeMode: state.databaseChangeMode,},updateMask: create(FieldMaskSchema, {- paths: ["value.workspace_profile_setting_value.database_change_mode"],+ paths: ["value.workspace_profile.database_change_mode"],}),});if (state.databaseChangeMode === DatabaseChangeMode.EDITOR) {diff --git a/frontend/src/components/GeneralSetting/MaximumRoleExpirationSetting.vue b/frontend/src/components/GeneralSetting/MaximumRoleExpirationSetting.vueindex d651e8fee1..f265accf5f 100644--- a/frontend/src/components/GeneralSetting/MaximumRoleExpirationSetting.vue+++ b/frontend/src/components/GeneralSetting/MaximumRoleExpirationSetting.vue@@ -83,7 +83,7 @@ const handleSettingChange = async () => {}),},updateMask: create(FieldMaskSchema, {- paths: ["value.workspace_profile_setting_value.maximum_role_expiration"],+ paths: ["value.workspace_profile.maximum_role_expiration"],}),});Object.assign(state, getInitialState());diff --git a/frontend/src/components/GeneralSetting/PasswordRestrictionSetting.vue b/frontend/src/components/GeneralSetting/PasswordRestrictionSetting.vueindex 9a729cef15..b48b264f2b 100644--- a/frontend/src/components/GeneralSetting/PasswordRestrictionSetting.vue+++ b/frontend/src/components/GeneralSetting/PasswordRestrictionSetting.vue@@ -174,7 +174,7 @@ import type { PasswordRestrictionSetting } from "@/types/proto-es/v1/setting_serimport {PasswordRestrictionSettingSchema,Setting_SettingName,- ValueSchema as SettingValueSchema,+ SettingValueSchema as SettingSettingValueSchema,} from "@/types/proto-es/v1/setting_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";import { FeatureBadge, FeatureModal } from "../FeatureGuard";@@ -195,7 +195,7 @@ const passwordRestrictionSetting = computed(() => {const setting = settingV1Store.getSettingByName(Setting_SettingName.PASSWORD_RESTRICTION);- if (setting?.value?.value?.case === "passwordRestrictionSetting") {+ if (setting?.value?.value?.case === "passwordRestriction") {return setting.value.value.value;}return create(PasswordRestrictionSettingSchema, {});@@ -218,9 +218,9 @@ defineExpose({update: async () => {await settingV1Store.upsertSetting({name: Setting_SettingName.PASSWORD_RESTRICTION,- value: create(SettingValueSchema, {+ value: create(SettingSettingValueSchema, {value: {- case: "passwordRestrictionSetting",+ case: "passwordRestriction",value: create(PasswordRestrictionSettingSchema, {...state,}),diff --git a/frontend/src/components/GeneralSetting/ProductImprovementSetting.vue b/frontend/src/components/GeneralSetting/ProductImprovementSetting.vueindex 238ba94fab..5f651fd1e2 100644--- a/frontend/src/components/GeneralSetting/ProductImprovementSetting.vue+++ b/frontend/src/components/GeneralSetting/ProductImprovementSetting.vue@@ -68,7 +68,7 @@ const update = async () => {await settingV1Store.updateWorkspaceProfile({payload,updateMask: create(FieldMaskSchema, {- paths: ["value.workspace_profile_setting_value.enable_metric_collection"],+ paths: ["value.workspace_profile.enable_metric_collection"],}),});diff --git a/frontend/src/components/GeneralSetting/SecuritySetting.vue b/frontend/src/components/GeneralSetting/SecuritySetting.vueindex 7f1728bdd2..44ee700dfe 100644--- a/frontend/src/components/GeneralSetting/SecuritySetting.vue+++ b/frontend/src/components/GeneralSetting/SecuritySetting.vue@@ -51,7 +51,7 @@ import { Switch } from "@/components/v2";import { featureToRef, useSettingV1Store } from "@/store";import {Setting_SettingName,- ValueSchema as SettingValueSchema,+ SettingValueSchema as SettingSettingValueSchema,} from "@/types/proto-es/v1/setting_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";import { FeatureBadge } from "../FeatureGuard";@@ -103,7 +103,7 @@ const handleWatermarkToggle = async () => {const value = enableWatermark.value ? "1" : "0";await settingV1Store.upsertSetting({name: Setting_SettingName.WATERMARK,- value: create(SettingValueSchema, {+ value: create(SettingSettingValueSchema, {value: {case: "stringValue",value: value,diff --git a/frontend/src/components/GeneralSetting/SignInFrequencySetting.vue b/frontend/src/components/GeneralSetting/SignInFrequencySetting.vueindex db22f7e307..7a08307675 100644--- a/frontend/src/components/GeneralSetting/SignInFrequencySetting.vue+++ b/frontend/src/components/GeneralSetting/SignInFrequencySetting.vue@@ -172,7 +172,7 @@ const handleFrequencySettingChange = async () => {}),},updateMask: create(FieldMaskSchema, {- paths: ["value.workspace_profile_setting_value.token_duration"],+ paths: ["value.workspace_profile.token_duration"],}),});};@@ -186,7 +186,7 @@ const handleInactivityTimeoutSettingChange = async () => {}),},updateMask: create(FieldMaskSchema, {- paths: ["value.workspace_profile_setting_value.inactive_session_timeout"],+ paths: ["value.workspace_profile.inactive_session_timeout"],}),});};diff --git a/frontend/src/components/ProjectWebhookForm.vue b/frontend/src/components/ProjectWebhookForm.vueindex 7df881da68..40bb8e1f09 100644--- a/frontend/src/components/ProjectWebhookForm.vue+++ b/frontend/src/components/ProjectWebhookForm.vue@@ -351,7 +351,7 @@ const imSetting = computed(() => {const setting = settingStore.getSettingByName(Setting_SettingName.APP_IM);if (!setting?.value?.value) return undefined;const value = setting.value.value;- if (value.case === "appImSettingValue") {+ if (value.case === "appIm") {return value.value;}return undefined;diff --git a/frontend/src/components/SensitiveData/ClassificationView.vue b/frontend/src/components/SensitiveData/ClassificationView.vueindex d24da617ec..19b0b91c76 100644--- a/frontend/src/components/SensitiveData/ClassificationView.vue+++ b/frontend/src/components/SensitiveData/ClassificationView.vue@@ -86,7 +86,7 @@ import {DataClassificationSetting_DataClassificationConfigSchema,DataClassificationSettingSchema,Setting_SettingName,- ValueSchema as SettingValueSchema,+ SettingValueSchema as SettingSettingValueSchema,} from "@/types/proto-es/v1/setting_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";import { hasWorkspacePermissionV2 } from "@/utils";@@ -181,9 +181,9 @@ const saveChanges = async () => {const upsertSetting = async () => {await settingStore.upsertSetting({name: Setting_SettingName.DATA_CLASSIFICATION,- value: create(SettingValueSchema, {+ value: create(SettingSettingValueSchema, {value: {- case: "dataClassificationSettingValue",+ case: "dataClassification",value: create(DataClassificationSettingSchema, {configs: [state.classification],}),diff --git a/frontend/src/components/SensitiveData/SemanticTypesView.vue b/frontend/src/components/SensitiveData/SemanticTypesView.vueindex 4dc07502e8..618864a296 100644--- a/frontend/src/components/SensitiveData/SemanticTypesView.vue+++ b/frontend/src/components/SensitiveData/SemanticTypesView.vue@@ -48,7 +48,7 @@ import type { SemanticTypeSetting_SemanticType } from "@/types/proto-es/v1/settiimport {SemanticTypeSetting_SemanticTypeSchema,Setting_SettingName,- ValueSchema as SettingValueSchema,+ SettingValueSchema as SettingSettingValueSchema,} from "@/types/proto-es/v1/setting_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";import { hasWorkspacePermissionV2 } from "@/utils";@@ -79,7 +79,7 @@ const semanticTypeSettingValue = computed(() => {const semanticTypeSetting = settingStore.getSettingByName(Setting_SettingName.SEMANTIC_TYPES);- return semanticTypeSetting?.value?.value?.case === "semanticTypeSettingValue"+ return semanticTypeSetting?.value?.value?.case === "semanticType"? (semanticTypeSetting.value.value.value.types ?? []): [];});@@ -118,9 +118,9 @@ const onRemove = async (index: number) => {await settingStore.upsertSetting({name: Setting_SettingName.SEMANTIC_TYPES,- value: create(SettingValueSchema, {+ value: create(SettingSettingValueSchema, {value: {- case: "semanticTypeSettingValue",+ case: "semanticType",value: {types: state.semanticItemList.filter((data) => data.mode === "NORMAL")@@ -159,9 +159,9 @@ const onUpsert = async () => {await settingStore.upsertSetting({name: Setting_SettingName.SEMANTIC_TYPES,- value: create(SettingValueSchema, {+ value: create(SettingSettingValueSchema, {value: {- case: "semanticTypeSettingValue",+ case: "semanticType",value: {types: semanticItemList,},@@ -186,7 +186,7 @@ const onCancel = (index: number) => {Setting_SettingName.SEMANTIC_TYPES);const types =- semanticTypeSetting?.value?.value?.case === "semanticTypeSettingValue"+ semanticTypeSetting?.value?.value?.case === "semanticType"? (semanticTypeSetting.value.value.value.types ?? []): [];const origin = types.find((s) => s.id === item.item.id);diff --git a/frontend/src/components/SensitiveData/components/MaskingRuleConfig.vue b/frontend/src/components/SensitiveData/components/MaskingRuleConfig.vueindex f369a074df..3dc562c8e3 100644--- a/frontend/src/components/SensitiveData/components/MaskingRuleConfig.vue+++ b/frontend/src/components/SensitiveData/components/MaskingRuleConfig.vue@@ -175,7 +175,7 @@ const semanticTypeSettingValue = computed(() => {const semanticTypeSetting = settingStore.getSettingByName(Setting_SettingName.SEMANTIC_TYPES);- if (semanticTypeSetting?.value?.value?.case === "semanticTypeSettingValue") {+ if (semanticTypeSetting?.value?.value?.case === "semanticType") {return semanticTypeSetting.value.value.value.types ?? [];}return [];diff --git a/frontend/src/components/SensitiveData/components/utils.ts b/frontend/src/components/SensitiveData/components/utils.tsindex d87d04f674..77b715270d 100644--- a/frontend/src/components/SensitiveData/components/utils.ts+++ b/frontend/src/components/SensitiveData/components/utils.ts@@ -26,7 +26,7 @@ export const getClassificationLevelOptions = () => {}const config =- setting.value.value.case === "dataClassificationSettingValue"+ setting.value.value.case === "dataClassification"? setting.value.value.value.configs: [];if (config.length === 0) {diff --git a/frontend/src/components/SensitiveData/useSemanticType.ts b/frontend/src/components/SensitiveData/useSemanticType.tsindex 63f9d091b8..bac77a4076 100644--- a/frontend/src/components/SensitiveData/useSemanticType.ts+++ b/frontend/src/components/SensitiveData/useSemanticType.ts@@ -9,7 +9,7 @@ export const useSemanticType = (semanticTypeId: MaybeRef<string>) => {const setting = settingV1Store.getSettingByName(Setting_SettingName.SEMANTIC_TYPES);- if (setting?.value?.value?.case === "semanticTypeSettingValue") {+ if (setting?.value?.value?.case === "semanticType") {return setting.value.value.value.types ?? [];}return [];diff --git a/frontend/src/components/User/Settings/AADSyncDrawer.vue b/frontend/src/components/User/Settings/AADSyncDrawer.vueindex 8f396d24fb..f979fc3f71 100644--- a/frontend/src/components/User/Settings/AADSyncDrawer.vue+++ b/frontend/src/components/User/Settings/AADSyncDrawer.vue@@ -135,7 +135,7 @@ import { pushNotification, useSettingV1Store } from "@/store";import {SCIMSettingSchema,Setting_SettingName,- ValueSchema as SettingValueSchema,+ SettingValueSchema as SettingSettingValueSchema,} from "@/types/proto-es/v1/setting_service_pb";import { hasWorkspacePermissionV2 } from "@/utils";@@ -180,7 +180,7 @@ const scimUrl = computed(() => {const scimToken = computed(() => {const setting = settingV1Store.getSettingByName(Setting_SettingName.SCIM);- return setting?.value?.value?.case === "scimSetting"+ return setting?.value?.value?.case === "scim"? (setting.value.value.value.token ?? ""): "";});@@ -210,9 +210,9 @@ const resetToken = () => {settingV1Store.upsertSetting({name: Setting_SettingName.SCIM,- value: create(SettingValueSchema, {+ value: create(SettingSettingValueSchema, {value: {- case: "scimSetting",+ case: "scim",value: create(SCIMSettingSchema, {token: "",}),diff --git a/frontend/src/customAppProfile.ts b/frontend/src/customAppProfile.tsindex add111d240..183cecccc6 100644--- a/frontend/src/customAppProfile.ts+++ b/frontend/src/customAppProfile.ts@@ -10,7 +10,7 @@ import {export const overrideAppProfile = () => {const setting = useSettingByName(Setting_SettingName.WORKSPACE_PROFILE);const databaseChangeMode = computed(() => {- if (setting.value?.value?.value?.case === "workspaceProfileSettingValue") {+ if (setting.value?.value?.value?.case === "workspaceProfile") {const mode = setting.value.value.value.value.databaseChangeMode;if (mode === DatabaseChangeMode.EDITOR) return DatabaseChangeMode.EDITOR;}diff --git a/frontend/src/plugins/ai/components/ProvideAIContext.vue b/frontend/src/plugins/ai/components/ProvideAIContext.vueindex be9989beef..da3021ab52 100644--- a/frontend/src/plugins/ai/components/ProvideAIContext.vue+++ b/frontend/src/plugins/ai/components/ProvideAIContext.vue@@ -34,7 +34,7 @@ const state = reactive<LocalState>({const settingV1Store = useSettingV1Store();const aiSetting = computed(() => {const setting = settingV1Store.getSettingByName(Setting_SettingName.AI);- if (setting?.value?.value?.case === "aiSetting") {+ if (setting?.value?.value?.case === "ai") {return setting.value.value.value;}return create(AISettingSchema, {});diff --git a/frontend/src/store/modules/v1/environment.ts b/frontend/src/store/modules/v1/environment.tsindex f36db4992a..cd667de782 100644--- a/frontend/src/store/modules/v1/environment.ts+++ b/frontend/src/store/modules/v1/environment.ts@@ -83,7 +83,7 @@ const getEnvironmentSetting = async (contextValues: createContextValues().set(silentContextKey, silent),});// Extract environments from proto-es format- if (response.value?.value?.case === "environmentSetting") {+ if (response.value?.value?.case === "environment") {const settingEnvironments = response.value.value.value.environments ?? [];return convertToEnvironments(settingEnvironments);}@@ -97,7 +97,7 @@ const updateEnvironmentSetting = async (name: `settings/${Setting_SettingName[Setting_SettingName.ENVIRONMENT]}`,value: {value: {- case: "environmentSetting",+ case: "environment",value: environment,},},@@ -110,7 +110,7 @@ const updateEnvironmentSetting = async (const response = await settingServiceClientConnect.updateSetting(request);// Extract environments from proto-es response- if (response.value?.value?.case === "environmentSetting") {+ if (response.value?.value?.case === "environment") {const settingEnvironments = response.value.value.value.environments ?? [];return convertToEnvironments(settingEnvironments);}diff --git a/frontend/src/store/modules/v1/setting.ts b/frontend/src/store/modules/v1/setting.tsindex 324e528c15..f47bb0f00c 100644--- a/frontend/src/store/modules/v1/setting.ts+++ b/frontend/src/store/modules/v1/setting.ts@@ -15,8 +15,8 @@ import {type Setting,Setting_SettingName,SettingSchema,- type Value as SettingValue,- ValueSchema as SettingValueSchema,+ type SettingValue,+ SettingValueSchema,UpdateSettingRequestSchema,type WorkspaceProfileSetting,WorkspaceProfileSettingSchema,@@ -38,7 +38,7 @@ export const useSettingV1Store = defineStore("setting_v1", {);if (!setting?.value?.value) return undefined;const value = setting.value.value;- if (value.case === "workspaceProfileSettingValue") {+ if (value.case === "workspaceProfile") {return value.value;}return undefined;@@ -60,7 +60,7 @@ export const useSettingV1Store = defineStore("setting_v1", {);if (!setting?.value?.value) return [];const value = setting.value.value;- if (value.case === "dataClassificationSettingValue") {+ if (value.case === "dataClassification") {return value.value.configs;}return [];@@ -76,7 +76,7 @@ export const useSettingV1Store = defineStore("setting_v1", {});}const value = setting.value.value;- if (value.case === "passwordRestrictionSetting") {+ if (value.case === "passwordRestriction") {return value.value;}return create(PasswordRestrictionSettingSchema, {@@ -94,7 +94,7 @@ export const useSettingV1Store = defineStore("setting_v1", {);if (!setting?.value?.value) return undefined;const value = setting.value.value;- if (value.case === "dataClassificationSettingValue") {+ if (value.case === "dataClassification") {return value.value.configs.find((config) => config.id === classificationId);@@ -187,7 +187,7 @@ export const useSettingV1Store = defineStore("setting_v1", {name: Setting_SettingName.WORKSPACE_PROFILE,value: create(SettingValueSchema, {value: {- case: "workspaceProfileSettingValue",+ case: "workspaceProfile",value: profileSetting,},}),diff --git a/frontend/src/store/modules/workspaceApprovalSetting.ts b/frontend/src/store/modules/workspaceApprovalSetting.tsindex aaa1ab7494..fa27d785b6 100644--- a/frontend/src/store/modules/workspaceApprovalSetting.ts+++ b/frontend/src/store/modules/workspaceApprovalSetting.ts@@ -10,7 +10,7 @@ import {GetSettingRequestSchema,Setting_SettingName,SettingSchema,- ValueSchema as SettingValueSchema,+ SettingValueSchema as SettingSettingValueSchema,UpdateSettingRequestSchema,WorkspaceApprovalSetting_Rule_Source,} from "@/types/proto-es/v1/setting_service_pb";@@ -30,7 +30,7 @@ export const useWorkspaceApprovalSettingStore = defineStore(});const setConfigSetting = async (setting: Setting) => {- if (setting.value?.value?.case === "workspaceApprovalSettingValue") {+ if (setting.value?.value?.case === "workspaceApproval") {const _config = setting.value.value.value;config.value = await resolveLocalApprovalConfig(_config);}@@ -53,9 +53,9 @@ export const useWorkspaceApprovalSettingStore = defineStore(const setting = create(SettingSchema, {name: SETTING_NAME,- value: create(SettingValueSchema, {+ value: create(SettingSettingValueSchema, {value: {- case: "workspaceApprovalSettingValue",+ case: "workspaceApproval",value: approvalSetting,},}),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.tsindex 499d9504e5..fd82292189 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@@ -127,10 +127,9 @@ export declare const UpdateSettingRequestSchema: GenMessage<UpdateSettingRequest*/export declare type Setting = Message<"bytebase.v1.Setting"> & {/**- * The resource name of the setting. Must be one of the following forms:- *- * - `setting/{setting}`- * For example, "settings/bb.branding.logo"+ * The resource name of the setting.+ * Format: settings/{setting}+ * Example: "settings/SEMANTIC_TYPES"** @generated from field: string name = 1;*/@@ -139,9 +138,9 @@ export declare type Setting = Message<"bytebase.v1.Setting"> & {/*** The configuration value of the setting.*- * @generated from field: bytebase.v1.Value value = 2;+ * @generated from field: bytebase.v1.SettingValue value = 2;*/- value?: Value;+ value?: SettingValue;};/**@@ -238,13 +237,11 @@ export declare const Setting_SettingNameSchema: GenEnum<Setting_SettingName>;/*** The data in setting value.*- * @generated from message bytebase.v1.Value+ * @generated from message bytebase.v1.SettingValue*/-export declare type Value = Message<"bytebase.v1.Value"> & {+export declare type SettingValue = Message<"bytebase.v1.SettingValue"> & {/**- * Value is a oneof field for setting value.- *- * @generated from oneof bytebase.v1.Value.value+ * @generated from oneof bytebase.v1.SettingValue.value*/value: {/**@@ -256,68 +253,66 @@ export declare type Value = Message<"bytebase.v1.Value"> & {case: "stringValue";} | {/**- * @generated from field: bytebase.v1.AppIMSetting app_im_setting_value = 3;+ * @generated from field: bytebase.v1.AppIMSetting app_im = 3;*/value: AppIMSetting;- case: "appImSettingValue";+ case: "appIm";} | {/**- * reserved 4; // was AgentPluginSetting agent_plugin_setting_value- *- * @generated from field: bytebase.v1.WorkspaceProfileSetting workspace_profile_setting_value = 5;+ * @generated from field: bytebase.v1.WorkspaceProfileSetting workspace_profile = 5;*/value: WorkspaceProfileSetting;- case: "workspaceProfileSettingValue";+ case: "workspaceProfile";} | {/**- * @generated from field: bytebase.v1.WorkspaceApprovalSetting workspace_approval_setting_value = 6;+ * @generated from field: bytebase.v1.WorkspaceApprovalSetting workspace_approval = 6;*/value: WorkspaceApprovalSetting;- case: "workspaceApprovalSettingValue";+ case: "workspaceApproval";} | {/**- * @generated from field: bytebase.v1.DataClassificationSetting data_classification_setting_value = 10;+ * @generated from field: bytebase.v1.DataClassificationSetting data_classification = 10;*/value: DataClassificationSetting;- case: "dataClassificationSettingValue";+ case: "dataClassification";} | {/**- * @generated from field: bytebase.v1.SemanticTypeSetting semantic_type_setting_value = 11;+ * @generated from field: bytebase.v1.SemanticTypeSetting semantic_type = 11;*/value: SemanticTypeSetting;- case: "semanticTypeSettingValue";+ case: "semanticType";} | {/**- * @generated from field: bytebase.v1.SCIMSetting scim_setting = 14;+ * @generated from field: bytebase.v1.SCIMSetting scim = 14;*/value: SCIMSetting;- case: "scimSetting";+ case: "scim";} | {/**- * @generated from field: bytebase.v1.PasswordRestrictionSetting password_restriction_setting = 15;+ * @generated from field: bytebase.v1.PasswordRestrictionSetting password_restriction = 15;*/value: PasswordRestrictionSetting;- case: "passwordRestrictionSetting";+ case: "passwordRestriction";} | {/**- * @generated from field: bytebase.v1.AISetting ai_setting = 16;+ * @generated from field: bytebase.v1.AISetting ai = 16;*/value: AISetting;- case: "aiSetting";+ case: "ai";} | {/**- * @generated from field: bytebase.v1.EnvironmentSetting environment_setting = 17;+ * @generated from field: bytebase.v1.EnvironmentSetting environment = 17;*/value: EnvironmentSetting;- case: "environmentSetting";+ case: "environment";} | { case: undefined; value?: undefined };};/**- * Describes the message bytebase.v1.Value.- * Use `create(ValueSchema)` to create a new message.+ * Describes the message bytebase.v1.SettingValue.+ * Use `create(SettingValueSchema)` to create a new message.*/-export declare const ValueSchema: GenMessage<Value>;+export declare const SettingValueSchema: GenMessage<SettingValue>;/*** @generated from message bytebase.v1.AppIMSettingdiff --git a/frontend/src/types/proto-es/v1/setting_service_pb.js b/frontend/src/types/proto-es/v1/setting_service_pb.jsindex 18b02188f3..bbe2e1ced8 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_project_service } from "./project_service_pb";* Describes the file v1/setting_service.proto.*/export const file_v1_setting_service = /*@__PURE__*/- fileDesc("Chh2MS9zZXR0aW5nX3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIhUKE0xpc3RTZXR0aW5nc1JlcXVlc3QiPgoUTGlzdFNldHRpbmdzUmVzcG9uc2USJgoIc2V0dGluZ3MYASADKAsyFC5ieXRlYmFzZS52MS5TZXR0aW5nIj8KEUdldFNldHRpbmdSZXF1ZXN0EioKBG5hbWUYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1NldHRpbmciOwoSR2V0U2V0dGluZ1Jlc3BvbnNlEiUKB3NldHRpbmcYASABKAsyFC5ieXRlYmFzZS52MS5TZXR0aW5nIqEBChRVcGRhdGVTZXR0aW5nUmVxdWVzdBIqCgdzZXR0aW5nGAEgASgLMhQuYnl0ZWJhc2UudjEuU2V0dGluZ0ID4EECEhUKDXZhbGlkYXRlX29ubHkYAiABKAgSFQoNYWxsb3dfbWlzc2luZxgDIAEoCBIvCgt1cGRhdGVfbWFzaxgEIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2siqwMKB1NldHRpbmcSDAoEbmFtZRgBIAEoCRIhCgV2YWx1ZRgCIAEoCzISLmJ5dGViYXNlLnYxLlZhbHVlIrkCCgtTZXR0aW5nTmFtZRIcChhTRVRUSU5HX05BTUVfVU5TUEVDSUZJRUQQABIPCgtBVVRIX1NFQ1JFVBABEhEKDUJSQU5ESU5HX0xPR08QAhIQCgxXT1JLU1BBQ0VfSUQQAxIVChFXT1JLU1BBQ0VfUFJPRklMRRAEEhYKEldPUktTUEFDRV9BUFBST1ZBTBAFEhYKEkVOVEVSUFJJU0VfTElDRU5TRRAHEgoKBkFQUF9JTRAIEg0KCVdBVEVSTUFSSxAJEgYKAkFJEAoSFwoTREFUQV9DTEFTU0lGSUNBVElPThAOEhIKDlNFTUFOVElDX1RZUEVTEA8SCAoEU0NJTRAREhgKFFBBU1NXT1JEX1JFU1RSSUNUSU9OEBISDwoLRU5WSVJPTk1FTlQQEyIECAYQBiIECA0QDTot6kEqChRieXRlYmFzZS5jb20vU2V0dGluZxISc2V0dGluZ3Mve3NldHRpbmd9SgQIEBARIqIFCgVWYWx1ZRIWCgxzdHJpbmdfdmFsdWUYASABKAlIABI5ChRhcHBfaW1fc2V0dGluZ192YWx1ZRgDIAEoCzIZLmJ5dGViYXNlLnYxLkFwcElNU2V0dGluZ0gAEk8KH3dvcmtzcGFjZV9wcm9maWxlX3NldHRpbmdfdmFsdWUYBSABKAsyJC5ieXRlYmFzZS52MS5Xb3Jrc3BhY2VQcm9maWxlU2V0dGluZ0gAElEKIHdvcmtzcGFjZV9hcHByb3ZhbF9zZXR0aW5nX3ZhbHVlGAYgASgLMiUuYnl0ZWJhc2UudjEuV29ya3NwYWNlQXBwcm92YWxTZXR0aW5nSAASUwohZGF0YV9jbGFzc2lmaWNhdGlvbl9zZXR0aW5nX3ZhbHVlGAogASgLMiYuYnl0ZWJhc2UudjEuRGF0YUNsYXNzaWZpY2F0aW9uU2V0dGluZ0gAEkcKG3NlbWFudGljX3R5cGVfc2V0dGluZ192YWx1ZRgLIAEoCzIgLmJ5dGViYXNlLnYxLlNlbWFudGljVHlwZVNldHRpbmdIABIwCgxzY2ltX3NldHRpbmcYDiABKAsyGC5ieXRlYmFzZS52MS5TQ0lNU2V0dGluZ0gAEk8KHHBhc3N3b3JkX3Jlc3RyaWN0aW9uX3NldHRpbmcYDyABKAsyJy5ieXRlYmFzZS52MS5QYXNzd29yZFJlc3RyaWN0aW9uU2V0dGluZ0gAEiwKCmFpX3NldHRpbmcYECABKAsyFi5ieXRlYmFzZS52MS5BSVNldHRpbmdIABI+ChNlbnZpcm9ubWVudF9zZXR0aW5nGBEgASgLMh8uYnl0ZWJhc2UudjEuRW52aXJvbm1lbnRTZXR0aW5nSABCBwoFdmFsdWVKBAgSEBNKBAgJEAoitgUKDEFwcElNU2V0dGluZxI1CghzZXR0aW5ncxgBIAMoCzIjLmJ5dGViYXNlLnYxLkFwcElNU2V0dGluZy5JTVNldHRpbmcaGwoFU2xhY2sSEgoFdG9rZW4YASABKAlCA+BBBBo2CgZGZWlzaHUSEwoGYXBwX2lkGAEgASgJQgPgQQQSFwoKYXBwX3NlY3JldBgCIAEoCUID4EEEGkkKBVdlY29tEhQKB2NvcnBfaWQYASABKAlCA+BBBBIVCghhZ2VudF9pZBgCIAEoCUID4EEEEhMKBnNlY3JldBgDIAEoCUID4EEEGjQKBExhcmsSEwoGYXBwX2lkGAEgASgJQgPgQQQSFwoKYXBwX3NlY3JldBgCIAEoCUID4EEEGlcKCERpbmdUYWxrEhYKCWNsaWVudF9pZBgBIAEoCUID4EEEEhoKDWNsaWVudF9zZWNyZXQYAiABKAlCA+BBBBIXCgpyb2JvdF9jb2RlGAMgASgJQgPgQQQavwIKCUlNU2V0dGluZxInCgR0eXBlGAEgASgOMhkuYnl0ZWJhc2UudjEuV2ViaG9vay5UeXBlEjAKBXNsYWNrGAIgASgLMh8uYnl0ZWJhc2UudjEuQXBwSU1TZXR0aW5nLlNsYWNrSAASMgoGZmVpc2h1GAMgASgLMiAuYnl0ZWJhc2UudjEuQXBwSU1TZXR0aW5nLkZlaXNodUgAEjAKBXdlY29tGAQgASgLMh8uYnl0ZWJhc2UudjEuQXBwSU1TZXR0aW5nLldlY29tSAASLgoEbGFyaxgFIAEoCzIeLmJ5dGViYXNlLnYxLkFwcElNU2V0dGluZy5MYXJrSAASNgoIZGluZ3RhbGsYBiABKAsyIi5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmcuRGluZ1RhbGtIAEIJCgdwYXlsb2FkIpAEChdXb3Jrc3BhY2VQcm9maWxlU2V0dGluZxIUCgxleHRlcm5hbF91cmwYASABKAkSFwoPZGlzYWxsb3dfc2lnbnVwGAIgASgIEhMKC3JlcXVpcmVfMmZhGAMgASgIEjEKDnRva2VuX2R1cmF0aW9uGAYgASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uEi8KDGFubm91bmNlbWVudBgHIAEoCzIZLmJ5dGViYXNlLnYxLkFubm91bmNlbWVudBI6ChdtYXhpbXVtX3JvbGVfZXhwaXJhdGlvbhgIIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbhIPCgdkb21haW5zGAkgAygJEh8KF2VuZm9yY2VfaWRlbnRpdHlfZG9tYWluGAogASgIEj0KFGRhdGFiYXNlX2NoYW5nZV9tb2RlGAsgASgOMh8uYnl0ZWJhc2UudjEuRGF0YWJhc2VDaGFuZ2VNb2RlEiAKGGRpc2FsbG93X3Bhc3N3b3JkX3NpZ25pbhgMIAEoCBIgChhlbmFibGVfbWV0cmljX2NvbGxlY3Rpb24YDSABKAgSOwoYaW5hY3RpdmVfc2Vzc2lvbl90aW1lb3V0GA4gASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uEh8KF2VuYWJsZV9hdWRpdF9sb2dfc3Rkb3V0GA8gASgIIq8BCgxBbm5vdW5jZW1lbnQSMwoFbGV2ZWwYASABKA4yJC5ieXRlYmFzZS52MS5Bbm5vdW5jZW1lbnQuQWxlcnRMZXZlbBIMCgR0ZXh0GAIgASgJEgwKBGxpbmsYAyABKAkiTgoKQWxlcnRMZXZlbBIbChdBTEVSVF9MRVZFTF9VTlNQRUNJRklFRBAAEggKBElORk8QARILCgdXQVJOSU5HEAISDAoIQ1JJVElDQUwQAyLnAgoYV29ya3NwYWNlQXBwcm92YWxTZXR0aW5nEjkKBXJ1bGVzGAEgAygLMiouYnl0ZWJhc2UudjEuV29ya3NwYWNlQXBwcm92YWxTZXR0aW5nLlJ1bGUajwIKBFJ1bGUSLwoIdGVtcGxhdGUYASABKAsyHS5ieXRlYmFzZS52MS5BcHByb3ZhbFRlbXBsYXRlEiQKCWNvbmRpdGlvbhgCIAEoCzIRLmdvb2dsZS50eXBlLkV4cHISQQoGc291cmNlGAMgASgOMjEuYnl0ZWJhc2UudjEuV29ya3NwYWNlQXBwcm92YWxTZXR0aW5nLlJ1bGUuU291cmNlIm0KBlNvdXJjZRIWChJTT1VSQ0VfVU5TUEVDSUZJRUQQABITCg9DSEFOR0VfREFUQUJBU0UQARITCg9DUkVBVEVfREFUQUJBU0UQAhIPCgtFWFBPUlRfREFUQRADEhAKDFJFUVVFU1RfUk9MRRAEIpgFChlEYXRhQ2xhc3NpZmljYXRpb25TZXR0aW5nElAKB2NvbmZpZ3MYASADKAsyPy5ieXRlYmFzZS52MS5EYXRhQ2xhc3NpZmljYXRpb25TZXR0aW5nLkRhdGFDbGFzc2lmaWNhdGlvbkNvbmZpZxqoBAoYRGF0YUNsYXNzaWZpY2F0aW9uQ29uZmlnEgoKAmlkGAEgASgJEg0KBXRpdGxlGAIgASgJElUKBmxldmVscxgDIAMoCzJFLmJ5dGViYXNlLnYxLkRhdGFDbGFzc2lmaWNhdGlvblNldHRpbmcuRGF0YUNsYXNzaWZpY2F0aW9uQ29uZmlnLkxldmVsEmsKDmNsYXNzaWZpY2F0aW9uGAQgAygLMlMuYnl0ZWJhc2UudjEuRGF0YUNsYXNzaWZpY2F0aW9uU2V0dGluZy5EYXRhQ2xhc3NpZmljYXRpb25Db25maWcuQ2xhc3NpZmljYXRpb25FbnRyeRo3CgVMZXZlbBIKCgJpZBgBIAEoCRINCgV0aXRsZRgCIAEoCRITCgtkZXNjcmlwdGlvbhgDIAEoCRpoChJEYXRhQ2xhc3NpZmljYXRpb24SCgoCaWQYASABKAkSDQoFdGl0bGUYAiABKAkSEwoLZGVzY3JpcHRpb24YAyABKAkSFQoIbGV2ZWxfaWQYBCABKAlIAIgBAUILCglfbGV2ZWxfaWQaiQEKE0NsYXNzaWZpY2F0aW9uRW50cnkSCwoDa2V5GAEgASgJEmEKBXZhbHVlGAIgASgLMlIuYnl0ZWJhc2UudjEuRGF0YUNsYXNzaWZpY2F0aW9uU2V0dGluZy5EYXRhQ2xhc3NpZmljYXRpb25Db25maWcuRGF0YUNsYXNzaWZpY2F0aW9uOgI4ASLMAQoTU2VtYW50aWNUeXBlU2V0dGluZxI8CgV0eXBlcxgBIAMoCzItLmJ5dGViYXNlLnYxLlNlbWFudGljVHlwZVNldHRpbmcuU2VtYW50aWNUeXBlGncKDFNlbWFudGljVHlwZRIKCgJpZBgBIAEoCRINCgV0aXRsZRgCIAEoCRITCgtkZXNjcmlwdGlvbhgDIAEoCRIpCglhbGdvcml0aG0YBiABKAsyFi5ieXRlYmFzZS52MS5BbGdvcml0aG0SDAoEaWNvbhgHIAEoCSL/BAoJQWxnb3JpdGhtEjQKCWZ1bGxfbWFzaxgFIAEoCzIfLmJ5dGViYXNlLnYxLkFsZ29yaXRobS5GdWxsTWFza0gAEjYKCnJhbmdlX21hc2sYBiABKAsyIC5ieXRlYmFzZS52MS5BbGdvcml0aG0uUmFuZ2VNYXNrSAASMgoIbWQ1X21hc2sYByABKAsyHi5ieXRlYmFzZS52MS5BbGdvcml0aG0uTUQ1TWFza0gAEkEKEGlubmVyX291dGVyX21hc2sYCCABKAsyJS5ieXRlYmFzZS52MS5BbGdvcml0aG0uSW5uZXJPdXRlck1hc2tIABogCghGdWxsTWFzaxIUCgxzdWJzdGl0dXRpb24YASABKAkafgoJUmFuZ2VNYXNrEjYKBnNsaWNlcxgBIAMoCzImLmJ5dGViYXNlLnYxLkFsZ29yaXRobS5SYW5nZU1hc2suU2xpY2UaOQoFU2xpY2USDQoFc3RhcnQYASABKAUSCwoDZW5kGAIgASgFEhQKDHN1YnN0aXR1dGlvbhgDIAEoCRoXCgdNRDVNYXNrEgwKBHNhbHQYASABKAkayQEKDklubmVyT3V0ZXJNYXNrEhIKCnByZWZpeF9sZW4YASABKAUSEgoKc3VmZml4X2xlbhgCIAEoBRI8CgR0eXBlGAMgASgOMi4uYnl0ZWJhc2UudjEuQWxnb3JpdGhtLklubmVyT3V0ZXJNYXNrLk1hc2tUeXBlEhQKDHN1YnN0aXR1dGlvbhgEIAEoCSI7CghNYXNrVHlwZRIZChVNQVNLX1RZUEVfVU5TUEVDSUZJRUQQABIJCgVJTk5FUhABEgkKBU9VVEVSEAJCBgoEbWFzayIcCgtTQ0lNU2V0dGluZxINCgV0b2tlbhgBIAEoCSKLAgoaUGFzc3dvcmRSZXN0cmljdGlvblNldHRpbmcSEgoKbWluX2xlbmd0aBgBIAEoBRIWCg5yZXF1aXJlX251bWJlchgCIAEoCBIWCg5yZXF1aXJlX2xldHRlchgDIAEoCBIgChhyZXF1aXJlX3VwcGVyY2FzZV9sZXR0ZXIYBCABKAgSIQoZcmVxdWlyZV9zcGVjaWFsX2NoYXJhY3RlchgFIAEoCBIuCiZyZXF1aXJlX3Jlc2V0X3Bhc3N3b3JkX2Zvcl9maXJzdF9sb2dpbhgGIAEoCBI0ChFwYXNzd29yZF9yb3RhdGlvbhgHIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbiLvAQoJQUlTZXR0aW5nEg8KB2VuYWJsZWQYASABKAgSMQoIcHJvdmlkZXIYAiABKA4yHy5ieXRlYmFzZS52MS5BSVNldHRpbmcuUHJvdmlkZXISEAoIZW5kcG9pbnQYAyABKAkSDwoHYXBpX2tleRgEIAEoCRINCgVtb2RlbBgFIAEoCRIPCgd2ZXJzaW9uGAYgASgJIlsKCFByb3ZpZGVyEhgKFFBST1ZJREVSX1VOU1BFQ0lGSUVEEAASCwoHT1BFTl9BSRABEgoKBkNMQVVERRACEgoKBkdFTUlOSRADEhAKDEFaVVJFX09QRU5BSRAEIpYCChJFbnZpcm9ubWVudFNldHRpbmcSQQoMZW52aXJvbm1lbnRzGAEgAygLMisuYnl0ZWJhc2UudjEuRW52aXJvbm1lbnRTZXR0aW5nLkVudmlyb25tZW50GrwBCgtFbnZpcm9ubWVudBIRCgRuYW1lGAEgASgJQgPgQQMSCgoCaWQYAiABKAkSDQoFdGl0bGUYAyABKAkSQwoEdGFncxgEIAMoCzI1LmJ5dGViYXNlLnYxLkVudmlyb25tZW50U2V0dGluZy5FbnZpcm9ubWVudC5UYWdzRW50cnkSDQoFY29sb3IYBSABKAkaKwoJVGFnc0VudHJ5EgsKA2tleRgBIAEoCRINCgV2YWx1ZRgCIAEoCToCOAEqVAoSRGF0YWJhc2VDaGFuZ2VNb2RlEiQKIERBVEFCQVNFX0NIQU5HRV9NT0RFX1VOU1BFQ0lGSUVEEAASDAoIUElQRUxJTkUQARIKCgZFRElUT1IQAjKuAwoOU2V0dGluZ1NlcnZpY2UShAEKDExpc3RTZXR0aW5ncxIgLmJ5dGViYXNlLnYxLkxpc3RTZXR0aW5nc1JlcXVlc3QaIS5ieXRlYmFzZS52MS5MaXN0U2V0dGluZ3NSZXNwb25zZSIv2kEAiuowEGJiLnNldHRpbmdzLmxpc3SQ6jABgtPkkwIOEgwvdjEvc2V0dGluZ3MSfwoKR2V0U2V0dGluZxIeLmJ5dGViYXNlLnYxLkdldFNldHRpbmdSZXF1ZXN0GhQuYnl0ZWJhc2UudjEuU2V0dGluZyI72kEEbmFtZYrqMA9iYi5zZXR0aW5ncy5nZXSQ6jABgtPkkwIXEhUvdjEve25hbWU9c2V0dGluZ3MvKn0SkwEKDVVwZGF0ZVNldHRpbmcSIS5ieXRlYmFzZS52MS5VcGRhdGVTZXR0aW5nUmVxdWVzdBoULmJ5dGViYXNlLnYxLlNldHRpbmciSYrqMA9iYi5zZXR0aW5ncy5zZXSQ6jABmOowAYLT5JMCKDoHc2V0dGluZzIdL3YxL3tzZXR0aW5nLm5hbWU9c2V0dGluZ3MvKn1CqQEKD2NvbS5ieXRlYmFzZS52MUITU2V0dGluZ1NlcnZpY2VQcm90b1ABWjRnaXRodWIuY29tL2J5dGViYXNlL2J5dGViYXNlL2JhY2tlbmQvZ2VuZXJhdGVkLWdvL3YxogIDQlhYqgILQnl0ZWJhc2UuVjHKAgtCeXRlYmFzZVxWMeICF0J5dGViYXNlXFYxXEdQQk1ldGFkYXRh6gIMQnl0ZWJhc2U6OlYxYgZwcm90bzM", [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_issue_service, file_v1_project_service]);+ fileDesc("Chh2MS9zZXR0aW5nX3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIhUKE0xpc3RTZXR0aW5nc1JlcXVlc3QiPgoUTGlzdFNldHRpbmdzUmVzcG9uc2USJgoIc2V0dGluZ3MYASADKAsyFC5ieXRlYmFzZS52MS5TZXR0aW5nIj8KEUdldFNldHRpbmdSZXF1ZXN0EioKBG5hbWUYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1NldHRpbmciOwoSR2V0U2V0dGluZ1Jlc3BvbnNlEiUKB3NldHRpbmcYASABKAsyFC5ieXRlYmFzZS52MS5TZXR0aW5nIqEBChRVcGRhdGVTZXR0aW5nUmVxdWVzdBIqCgdzZXR0aW5nGAEgASgLMhQuYnl0ZWJhc2UudjEuU2V0dGluZ0ID4EECEhUKDXZhbGlkYXRlX29ubHkYAiABKAgSFQoNYWxsb3dfbWlzc2luZxgDIAEoCBIvCgt1cGRhdGVfbWFzaxgEIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2siqgMKB1NldHRpbmcSEQoEbmFtZRgBIAEoCUID4EEIEi0KBXZhbHVlGAIgASgLMhkuYnl0ZWJhc2UudjEuU2V0dGluZ1ZhbHVlQgPgQQIirQIKC1NldHRpbmdOYW1lEhwKGFNFVFRJTkdfTkFNRV9VTlNQRUNJRklFRBAAEg8KC0FVVEhfU0VDUkVUEAESEQoNQlJBTkRJTkdfTE9HTxACEhAKDFdPUktTUEFDRV9JRBADEhUKEVdPUktTUEFDRV9QUk9GSUxFEAQSFgoSV09SS1NQQUNFX0FQUFJPVkFMEAUSFgoSRU5URVJQUklTRV9MSUNFTlNFEAcSCgoGQVBQX0lNEAgSDQoJV0FURVJNQVJLEAkSBgoCQUkQChIXChNEQVRBX0NMQVNTSUZJQ0FUSU9OEA4SEgoOU0VNQU5USUNfVFlQRVMQDxIICgRTQ0lNEBESGAoUUEFTU1dPUkRfUkVTVFJJQ1RJT04QEhIPCgtFTlZJUk9OTUVOVBATOi3qQSoKFGJ5dGViYXNlLmNvbS9TZXR0aW5nEhJzZXR0aW5ncy97c2V0dGluZ30itwQKDFNldHRpbmdWYWx1ZRIWCgxzdHJpbmdfdmFsdWUYASABKAlIABIrCgZhcHBfaW0YAyABKAsyGS5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmdIABJBChF3b3Jrc3BhY2VfcHJvZmlsZRgFIAEoCzIkLmJ5dGViYXNlLnYxLldvcmtzcGFjZVByb2ZpbGVTZXR0aW5nSAASQwoSd29ya3NwYWNlX2FwcHJvdmFsGAYgASgLMiUuYnl0ZWJhc2UudjEuV29ya3NwYWNlQXBwcm92YWxTZXR0aW5nSAASRQoTZGF0YV9jbGFzc2lmaWNhdGlvbhgKIAEoCzImLmJ5dGViYXNlLnYxLkRhdGFDbGFzc2lmaWNhdGlvblNldHRpbmdIABI5Cg1zZW1hbnRpY190eXBlGAsgASgLMiAuYnl0ZWJhc2UudjEuU2VtYW50aWNUeXBlU2V0dGluZ0gAEigKBHNjaW0YDiABKAsyGC5ieXRlYmFzZS52MS5TQ0lNU2V0dGluZ0gAEkcKFHBhc3N3b3JkX3Jlc3RyaWN0aW9uGA8gASgLMicuYnl0ZWJhc2UudjEuUGFzc3dvcmRSZXN0cmljdGlvblNldHRpbmdIABIkCgJhaRgQIAEoCzIWLmJ5dGViYXNlLnYxLkFJU2V0dGluZ0gAEjYKC2Vudmlyb25tZW50GBEgASgLMh8uYnl0ZWJhc2UudjEuRW52aXJvbm1lbnRTZXR0aW5nSABCBwoFdmFsdWUitgUKDEFwcElNU2V0dGluZxI1CghzZXR0aW5ncxgBIAMoCzIjLmJ5dGViYXNlLnYxLkFwcElNU2V0dGluZy5JTVNldHRpbmcaGwoFU2xhY2sSEgoFdG9rZW4YASABKAlCA+BBBBo2CgZGZWlzaHUSEwoGYXBwX2lkGAEgASgJQgPgQQQSFwoKYXBwX3NlY3JldBgCIAEoCUID4EEEGkkKBVdlY29tEhQKB2NvcnBfaWQYASABKAlCA+BBBBIVCghhZ2VudF9pZBgCIAEoCUID4EEEEhMKBnNlY3JldBgDIAEoCUID4EEEGjQKBExhcmsSEwoGYXBwX2lkGAEgASgJQgPgQQQSFwoKYXBwX3NlY3JldBgCIAEoCUID4EEEGlcKCERpbmdUYWxrEhYKCWNsaWVudF9pZBgBIAEoCUID4EEEEhoKDWNsaWVudF9zZWNyZXQYAiABKAlCA+BBBBIXCgpyb2JvdF9jb2RlGAMgASgJQgPgQQQavwIKCUlNU2V0dGluZxInCgR0eXBlGAEgASgOMhkuYnl0ZWJhc2UudjEuV2ViaG9vay5UeXBlEjAKBXNsYWNrGAIgASgLMh8uYnl0ZWJhc2UudjEuQXBwSU1TZXR0aW5nLlNsYWNrSAASMgoGZmVpc2h1GAMgASgLMiAuYnl0ZWJhc2UudjEuQXBwSU1TZXR0aW5nLkZlaXNodUgAEjAKBXdlY29tGAQgASgLMh8uYnl0ZWJhc2UudjEuQXBwSU1TZXR0aW5nLldlY29tSAASLgoEbGFyaxgFIAEoCzIeLmJ5dGViYXNlLnYxLkFwcElNU2V0dGluZy5MYXJrSAASNgoIZGluZ3RhbGsYBiABKAsyIi5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmcuRGluZ1RhbGtIAEIJCgdwYXlsb2FkIpAEChdXb3Jrc3BhY2VQcm9maWxlU2V0dGluZxIUCgxleHRlcm5hbF91cmwYASABKAkSFwoPZGlzYWxsb3dfc2lnbnVwGAIgASgIEhMKC3JlcXVpcmVfMmZhGAMgASgIEjEKDnRva2VuX2R1cmF0aW9uGAYgASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uEi8KDGFubm91bmNlbWVudBgHIAEoCzIZLmJ5dGViYXNlLnYxLkFubm91bmNlbWVudBI6ChdtYXhpbXVtX3JvbGVfZXhwaXJhdGlvbhgIIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbhIPCgdkb21haW5zGAkgAygJEh8KF2VuZm9yY2VfaWRlbnRpdHlfZG9tYWluGAogASgIEj0KFGRhdGFiYXNlX2NoYW5nZV9tb2RlGAsgASgOMh8uYnl0ZWJhc2UudjEuRGF0YWJhc2VDaGFuZ2VNb2RlEiAKGGRpc2FsbG93X3Bhc3N3b3JkX3NpZ25pbhgMIAEoCBIgChhlbmFibGVfbWV0cmljX2NvbGxlY3Rpb24YDSABKAgSOwoYaW5hY3RpdmVfc2Vzc2lvbl90aW1lb3V0GA4gASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uEh8KF2VuYWJsZV9hdWRpdF9sb2dfc3Rkb3V0GA8gASgIIq8BCgxBbm5vdW5jZW1lbnQSMwoFbGV2ZWwYASABKA4yJC5ieXRlYmFzZS52MS5Bbm5vdW5jZW1lbnQuQWxlcnRMZXZlbBIMCgR0ZXh0GAIgASgJEgwKBGxpbmsYAyABKAkiTgoKQWxlcnRMZXZlbBIbChdBTEVSVF9MRVZFTF9VTlNQRUNJRklFRBAAEggKBElORk8QARILCgdXQVJOSU5HEAISDAoIQ1JJVElDQUwQAyLnAgoYV29ya3NwYWNlQXBwcm92YWxTZXR0aW5nEjkKBXJ1bGVzGAEgAygLMiouYnl0ZWJhc2UudjEuV29ya3NwYWNlQXBwcm92YWxTZXR0aW5nLlJ1bGUajwIKBFJ1bGUSLwoIdGVtcGxhdGUYASABKAsyHS5ieXRlYmFzZS52MS5BcHByb3ZhbFRlbXBsYXRlEiQKCWNvbmRpdGlvbhgCIAEoCzIRLmdvb2dsZS50eXBlLkV4cHISQQoGc291cmNlGAMgASgOMjEuYnl0ZWJhc2UudjEuV29ya3NwYWNlQXBwcm92YWxTZXR0aW5nLlJ1bGUuU291cmNlIm0KBlNvdXJjZRIWChJTT1VSQ0VfVU5TUEVDSUZJRUQQABITCg9DSEFOR0VfREFUQUJBU0UQARITCg9DUkVBVEVfREFUQUJBU0UQAhIPCgtFWFBPUlRfREFUQRADEhAKDFJFUVVFU1RfUk9MRRAEIpgFChlEYXRhQ2xhc3NpZmljYXRpb25TZXR0aW5nElAKB2NvbmZpZ3MYASADKAsyPy5ieXRlYmFzZS52MS5EYXRhQ2xhc3NpZmljYXRpb25TZXR0aW5nLkRhdGFDbGFzc2lmaWNhdGlvbkNvbmZpZxqoBAoYRGF0YUNsYXNzaWZpY2F0aW9uQ29uZmlnEgoKAmlkGAEgASgJEg0KBXRpdGxlGAIgASgJElUKBmxldmVscxgDIAMoCzJFLmJ5dGViYXNlLnYxLkRhdGFDbGFzc2lmaWNhdGlvblNldHRpbmcuRGF0YUNsYXNzaWZpY2F0aW9uQ29uZmlnLkxldmVsEmsKDmNsYXNzaWZpY2F0aW9uGAQgAygLMlMuYnl0ZWJhc2UudjEuRGF0YUNsYXNzaWZpY2F0aW9uU2V0dGluZy5EYXRhQ2xhc3NpZmljYXRpb25Db25maWcuQ2xhc3NpZmljYXRpb25FbnRyeRo3CgVMZXZlbBIKCgJpZBgBIAEoCRINCgV0aXRsZRgCIAEoCRITCgtkZXNjcmlwdGlvbhgDIAEoCRpoChJEYXRhQ2xhc3NpZmljYXRpb24SCgoCaWQYASABKAkSDQoFdGl0bGUYAiABKAkSEwoLZGVzY3JpcHRpb24YAyABKAkSFQoIbGV2ZWxfaWQYBCABKAlIAIgBAUILCglfbGV2ZWxfaWQaiQEKE0NsYXNzaWZpY2F0aW9uRW50cnkSCwoDa2V5GAEgASgJEmEKBXZhbHVlGAIgASgLMlIuYnl0ZWJhc2UudjEuRGF0YUNsYXNzaWZpY2F0aW9uU2V0dGluZy5EYXRhQ2xhc3NpZmljYXRpb25Db25maWcuRGF0YUNsYXNzaWZpY2F0aW9uOgI4ASLMAQoTU2VtYW50aWNUeXBlU2V0dGluZxI8CgV0eXBlcxgBIAMoCzItLmJ5dGViYXNlLnYxLlNlbWFudGljVHlwZVNldHRpbmcuU2VtYW50aWNUeXBlGncKDFNlbWFudGljVHlwZRIKCgJpZBgBIAEoCRINCgV0aXRsZRgCIAEoCRITCgtkZXNjcmlwdGlvbhgDIAEoCRIpCglhbGdvcml0aG0YBiABKAsyFi5ieXRlYmFzZS52MS5BbGdvcml0aG0SDAoEaWNvbhgHIAEoCSL/BAoJQWxnb3JpdGhtEjQKCWZ1bGxfbWFzaxgFIAEoCzIfLmJ5dGViYXNlLnYxLkFsZ29yaXRobS5GdWxsTWFza0gAEjYKCnJhbmdlX21hc2sYBiABKAsyIC5ieXRlYmFzZS52MS5BbGdvcml0aG0uUmFuZ2VNYXNrSAASMgoIbWQ1X21hc2sYByABKAsyHi5ieXRlYmFzZS52MS5BbGdvcml0aG0uTUQ1TWFza0gAEkEKEGlubmVyX291dGVyX21hc2sYCCABKAsyJS5ieXRlYmFzZS52MS5BbGdvcml0aG0uSW5uZXJPdXRlck1hc2tIABogCghGdWxsTWFzaxIUCgxzdWJzdGl0dXRpb24YASABKAkafgoJUmFuZ2VNYXNrEjYKBnNsaWNlcxgBIAMoCzImLmJ5dGViYXNlLnYxLkFsZ29yaXRobS5SYW5nZU1hc2suU2xpY2UaOQoFU2xpY2USDQoFc3RhcnQYASABKAUSCwoDZW5kGAIgASgFEhQKDHN1YnN0aXR1dGlvbhgDIAEoCRoXCgdNRDVNYXNrEgwKBHNhbHQYASABKAkayQEKDklubmVyT3V0ZXJNYXNrEhIKCnByZWZpeF9sZW4YASABKAUSEgoKc3VmZml4X2xlbhgCIAEoBRI8CgR0eXBlGAMgASgOMi4uYnl0ZWJhc2UudjEuQWxnb3JpdGhtLklubmVyT3V0ZXJNYXNrLk1hc2tUeXBlEhQKDHN1YnN0aXR1dGlvbhgEIAEoCSI7CghNYXNrVHlwZRIZChVNQVNLX1RZUEVfVU5TUEVDSUZJRUQQABIJCgVJTk5FUhABEgkKBU9VVEVSEAJCBgoEbWFzayIcCgtTQ0lNU2V0dGluZxINCgV0b2tlbhgBIAEoCSKLAgoaUGFzc3dvcmRSZXN0cmljdGlvblNldHRpbmcSEgoKbWluX2xlbmd0aBgBIAEoBRIWCg5yZXF1aXJlX251bWJlchgCIAEoCBIWCg5yZXF1aXJlX2xldHRlchgDIAEoCBIgChhyZXF1aXJlX3VwcGVyY2FzZV9sZXR0ZXIYBCABKAgSIQoZcmVxdWlyZV9zcGVjaWFsX2NoYXJhY3RlchgFIAEoCBIuCiZyZXF1aXJlX3Jlc2V0X3Bhc3N3b3JkX2Zvcl9maXJzdF9sb2dpbhgGIAEoCBI0ChFwYXNzd29yZF9yb3RhdGlvbhgHIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbiLvAQoJQUlTZXR0aW5nEg8KB2VuYWJsZWQYASABKAgSMQoIcHJvdmlkZXIYAiABKA4yHy5ieXRlYmFzZS52MS5BSVNldHRpbmcuUHJvdmlkZXISEAoIZW5kcG9pbnQYAyABKAkSDwoHYXBpX2tleRgEIAEoCRINCgVtb2RlbBgFIAEoCRIPCgd2ZXJzaW9uGAYgASgJIlsKCFByb3ZpZGVyEhgKFFBST1ZJREVSX1VOU1BFQ0lGSUVEEAASCwoHT1BFTl9BSRABEgoKBkNMQVVERRACEgoKBkdFTUlOSRADEhAKDEFaVVJFX09QRU5BSRAEIpYCChJFbnZpcm9ubWVudFNldHRpbmcSQQoMZW52aXJvbm1lbnRzGAEgAygLMisuYnl0ZWJhc2UudjEuRW52aXJvbm1lbnRTZXR0aW5nLkVudmlyb25tZW50GrwBCgtFbnZpcm9ubWVudBIRCgRuYW1lGAEgASgJQgPgQQMSCgoCaWQYAiABKAkSDQoFdGl0bGUYAyABKAkSQwoEdGFncxgEIAMoCzI1LmJ5dGViYXNlLnYxLkVudmlyb25tZW50U2V0dGluZy5FbnZpcm9ubWVudC5UYWdzRW50cnkSDQoFY29sb3IYBSABKAkaKwoJVGFnc0VudHJ5EgsKA2tleRgBIAEoCRINCgV2YWx1ZRgCIAEoCToCOAEqVAoSRGF0YWJhc2VDaGFuZ2VNb2RlEiQKIERBVEFCQVNFX0NIQU5HRV9NT0RFX1VOU1BFQ0lGSUVEEAASDAoIUElQRUxJTkUQARIKCgZFRElUT1IQAjKuAwoOU2V0dGluZ1NlcnZpY2UShAEKDExpc3RTZXR0aW5ncxIgLmJ5dGViYXNlLnYxLkxpc3RTZXR0aW5nc1JlcXVlc3QaIS5ieXRlYmFzZS52MS5MaXN0U2V0dGluZ3NSZXNwb25zZSIv2kEAiuowEGJiLnNldHRpbmdzLmxpc3SQ6jABgtPkkwIOEgwvdjEvc2V0dGluZ3MSfwoKR2V0U2V0dGluZxIeLmJ5dGViYXNlLnYxLkdldFNldHRpbmdSZXF1ZXN0GhQuYnl0ZWJhc2UudjEuU2V0dGluZyI72kEEbmFtZYrqMA9iYi5zZXR0aW5ncy5nZXSQ6jABgtPkkwIXEhUvdjEve25hbWU9c2V0dGluZ3MvKn0SkwEKDVVwZGF0ZVNldHRpbmcSIS5ieXRlYmFzZS52MS5VcGRhdGVTZXR0aW5nUmVxdWVzdBoULmJ5dGViYXNlLnYxLlNldHRpbmciSYrqMA9iYi5zZXR0aW5ncy5zZXSQ6jABmOowAYLT5JMCKDoHc2V0dGluZzIdL3YxL3tzZXR0aW5nLm5hbWU9c2V0dGluZ3MvKn1CqQEKD2NvbS5ieXRlYmFzZS52MUITU2V0dGluZ1NlcnZpY2VQcm90b1ABWjRnaXRodWIuY29tL2J5dGViYXNlL2J5dGViYXNlL2JhY2tlbmQvZ2VuZXJhdGVkLWdvL3YxogIDQlhYqgILQnl0ZWJhc2UuVjHKAgtCeXRlYmFzZVxWMeICF0J5dGViYXNlXFYxXEdQQk1ldGFkYXRh6gIMQnl0ZWJhc2U6OlYxYgZwcm90bzM", [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_issue_service, file_v1_project_service]);/*** Describes the message bytebase.v1.ListSettingsRequest.@@ -74,10 +74,10 @@ export const Setting_SettingName = /*@__PURE__*/tsEnum(Setting_SettingNameSchema);/**- * Describes the message bytebase.v1.Value.- * Use `create(ValueSchema)` to create a new message.+ * Describes the message bytebase.v1.SettingValue.+ * Use `create(SettingValueSchema)` to create a new message.*/-export const ValueSchema = /*@__PURE__*/+export const SettingValueSchema = /*@__PURE__*/messageDesc(file_v1_setting_service, 6);/**diff --git a/frontend/src/views/SettingWorkspaceIM.vue b/frontend/src/views/SettingWorkspaceIM.vueindex 7ba240b813..301f39403b 100644--- a/frontend/src/views/SettingWorkspaceIM.vue+++ b/frontend/src/views/SettingWorkspaceIM.vue@@ -246,7 +246,7 @@ import {AppIMSetting_WecomSchema,AppIMSettingSchema,Setting_SettingName,- ValueSchema as SettingValueSchema,+ SettingValueSchema,} from "@/types/proto-es/v1/setting_service_pb";interface LocalState {@@ -337,7 +337,7 @@ const onDeleteIM = async (index: number, type: Webhook_Type) => {name: Setting_SettingName.APP_IM,value: create(SettingValueSchema, {value: {- case: "appImSettingValue",+ case: "appIm",value: create(AppIMSettingSchema, {settings: imSetting.value.settings.filter((setting) => setting.type !== type@@ -371,19 +371,19 @@ const onSaveIM = async (index: number, type: Webhook_Type) => {const updateMask: string[] = [];switch (type) {case Webhook_Type.SLACK:- updateMask.push("value.app_im_setting_value.slack");+ updateMask.push("value.app_im.slack");break;case Webhook_Type.FEISHU:- updateMask.push("value.app_im_setting_value.feishu");+ updateMask.push("value.app_im.feishu");break;case Webhook_Type.WECOM:- updateMask.push("value.app_im_setting_value.wecom");+ updateMask.push("value.app_im.wecom");break;case Webhook_Type.LARK:- updateMask.push("value.app_im_setting_value.lark");+ updateMask.push("value.app_im.lark");break;case Webhook_Type.DINGTALK:- updateMask.push("value.app_im_setting_value.dingtalk");+ updateMask.push("value.app_im.dingtalk");break;}@@ -402,7 +402,7 @@ const onSaveIM = async (index: number, type: Webhook_Type) => {name: Setting_SettingName.APP_IM,value: create(SettingValueSchema, {value: {- case: "appImSettingValue",+ case: "appIm",value: pendingUpdate,},}),@@ -438,7 +438,7 @@ const fillMask = (data: IMSettingPayloadValue): IMSettingPayloadValue => {const imSetting = computed(() => {const setting = settingStore.getSettingByName(Setting_SettingName.APP_IM);- if (setting?.value?.value?.case !== "appImSettingValue") {+ if (setting?.value?.value?.case !== "appIm") {return create(AppIMSettingSchema, {settings: [],});diff --git a/frontend/src/views/Setup/AdminSetup.vue b/frontend/src/views/Setup/AdminSetup.vueindex 8b90a24a86..957a16977f 100644--- a/frontend/src/views/Setup/AdminSetup.vue+++ b/frontend/src/views/Setup/AdminSetup.vue@@ -216,7 +216,7 @@ const tryFinishSetup = async () => {databaseChangeMode: state.mode,},updateMask: create(FieldMaskSchema, {- paths: ["value.workspace_profile_setting_value.database_change_mode"],+ paths: ["value.workspace_profile.database_change_mode"],}),});onCancel(getHomePageByMode(state.mode));@@ -232,7 +232,7 @@ onMounted(async () => {);return onCancel(getHomePageByMode(- profileSetting?.value?.value?.case === "workspaceProfileSettingValue"+ profileSetting?.value?.value?.case === "workspaceProfile"? profileSetting.value.value.value.databaseChangeMode: undefined)diff --git a/frontend/src/views/sql-editor/EditorCommon/OpenAIButton/OpenAIButton.vue b/frontend/src/views/sql-editor/EditorCommon/OpenAIButton/OpenAIButton.vueindex 1228746677..c9b8e952f9 100644--- a/frontend/src/views/sql-editor/EditorCommon/OpenAIButton/OpenAIButton.vue+++ b/frontend/src/views/sql-editor/EditorCommon/OpenAIButton/OpenAIButton.vue@@ -84,7 +84,7 @@ const settingV1Store = useSettingV1Store();const openAIEnabled = computed(() => {const setting = settingV1Store.getSettingByName(Setting_SettingName.AI);- return setting?.value?.value?.case === "aiSetting"+ return setting?.value?.value?.case === "ai"? setting.value.value.value.enabled: false;});diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yamlindex ffeb7f366c..9084fd9d1d 100644--- a/proto/gen/grpc-doc/openapi.yaml+++ b/proto/gen/grpc-doc/openapi.yaml@@ -12886,20 +12886,46 @@ components:description: The current etag of the policy.description: Request message for setting an IAM policy.Setting:+ required:+ - valuetype: objectproperties:name:type: stringdescription: |-- The resource name of the setting. Must be one of the following forms:-- - `setting/{setting}`- For example, "settings/bb.branding.logo"+ The resource name of the setting.+ Format: settings/{setting}+ Example: "settings/SEMANTIC_TYPES"value:allOf:- - $ref: '#/components/schemas/Value'+ - $ref: '#/components/schemas/SettingValue'description: The configuration value of the setting.description: The schema of setting.+ SettingValue:+ type: object+ properties:+ stringValue:+ type: string+ description: Defines this value as being a string value.+ appIm:+ $ref: '#/components/schemas/AppIMSetting'+ workspaceProfile:+ $ref: '#/components/schemas/WorkspaceProfileSetting'+ workspaceApproval:+ $ref: '#/components/schemas/WorkspaceApprovalSetting'+ dataClassification:+ $ref: '#/components/schemas/DataClassificationSetting'+ semanticType:+ $ref: '#/components/schemas/SemanticTypeSetting'+ scim:+ $ref: '#/components/schemas/SCIMSetting'+ passwordRestriction:+ $ref: '#/components/schemas/PasswordRestrictionSetting'+ ai:+ $ref: '#/components/schemas/AISetting'+ environment:+ $ref: '#/components/schemas/EnvironmentSetting'+ description: The data in setting value.Sheet:required:- name@@ -13688,33 +13714,6 @@ components:source:type: stringdescription: source means where the user comes from. For now we support Entra ID SCIM sync, so the source could be Entra ID.- Value:- type: object- properties:- stringValue:- type: string- description: Defines this value as being a string value.- appImSettingValue:- $ref: '#/components/schemas/AppIMSetting'- workspaceProfileSettingValue:- allOf:- - $ref: '#/components/schemas/WorkspaceProfileSetting'- description: reserved 4; // was AgentPluginSetting agent_plugin_setting_value- workspaceApprovalSettingValue:- $ref: '#/components/schemas/WorkspaceApprovalSetting'- dataClassificationSettingValue:- $ref: '#/components/schemas/DataClassificationSetting'- semanticTypeSettingValue:- $ref: '#/components/schemas/SemanticTypeSetting'- scimSetting:- $ref: '#/components/schemas/SCIMSetting'- passwordRestrictionSetting:- $ref: '#/components/schemas/PasswordRestrictionSetting'- aiSetting:- $ref: '#/components/schemas/AISetting'- environmentSetting:- $ref: '#/components/schemas/EnvironmentSetting'- description: The data in setting value.Webhook:required:- typediff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.mdindex aa891cd432..16ae3b7a78 100644--- a/proto/gen/grpc-doc/v1/README.md+++ b/proto/gen/grpc-doc/v1/README.md@@ -137,8 +137,8 @@- [SemanticTypeSetting](#bytebase-v1-SemanticTypeSetting)- [SemanticTypeSetting.SemanticType](#bytebase-v1-SemanticTypeSetting-SemanticType)- [Setting](#bytebase-v1-Setting)+ - [SettingValue](#bytebase-v1-SettingValue)- [UpdateSettingRequest](#bytebase-v1-UpdateSettingRequest)- - [Value](#bytebase-v1-Value)- [WorkspaceApprovalSetting](#bytebase-v1-WorkspaceApprovalSetting)- [WorkspaceApprovalSetting.Rule](#bytebase-v1-WorkspaceApprovalSetting-Rule)- [WorkspaceProfileSetting](#bytebase-v1-WorkspaceProfileSetting)@@ -2694,52 +2694,50 @@ The schema of setting.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| name | [string](#string) | | The resource name of the setting. Must be one of the following forms:+| name | [string](#string) | | The resource name of the setting. Format: settings/{setting} Example: "settings/SEMANTIC_TYPES" |+| value | [SettingValue](#bytebase-v1-SettingValue) | | The configuration value of the setting. |-- `setting/{setting}` For example, "settings/bb.branding.logo" |-| value | [Value](#bytebase-v1-Value) | | The configuration value of the setting. |+<a name="bytebase-v1-SettingValue"></a>-<a name="bytebase-v1-UpdateSettingRequest"></a>--### UpdateSettingRequest-The request message for updating or creating a setting.+### SettingValue+The data in setting value.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| setting | [Setting](#bytebase-v1-Setting) | | The setting to update. |-| validate_only | [bool](#bool) | | validate_only is a flag to indicate whether to validate the setting value, server would not persist the setting value if it is true. |-| allow_missing | [bool](#bool) | | |-| update_mask | [google.protobuf.FieldMask](#google-protobuf-FieldMask) | | |+| string_value | [string](#string) | | Defines this value as being a string value. |+| app_im | [AppIMSetting](#bytebase-v1-AppIMSetting) | | |+| workspace_profile | [WorkspaceProfileSetting](#bytebase-v1-WorkspaceProfileSetting) | | |+| workspace_approval | [WorkspaceApprovalSetting](#bytebase-v1-WorkspaceApprovalSetting) | | |+| data_classification | [DataClassificationSetting](#bytebase-v1-DataClassificationSetting) | | |+| semantic_type | [SemanticTypeSetting](#bytebase-v1-SemanticTypeSetting) | | |+| scim | [SCIMSetting](#bytebase-v1-SCIMSetting) | | |+| password_restriction | [PasswordRestrictionSetting](#bytebase-v1-PasswordRestrictionSetting) | | |+| ai | [AISetting](#bytebase-v1-AISetting) | | |+| environment | [EnvironmentSetting](#bytebase-v1-EnvironmentSetting) | | |-<a name="bytebase-v1-Value"></a>+<a name="bytebase-v1-UpdateSettingRequest"></a>-### Value-The data in setting value.+### UpdateSettingRequest+The request message for updating or creating a setting.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- |-| string_value | [string](#string) | | Defines this value as being a string value. |-| app_im_setting_value | [AppIMSetting](#bytebase-v1-AppIMSetting) | | |-| workspace_profile_setting_value | [WorkspaceProfileSetting](#bytebase-v1-WorkspaceProfileSetting) | | reserved 4; // was AgentPluginSetting agent_plugin_setting_value |-| workspace_approval_setting_value | [WorkspaceApprovalSetting](#bytebase-v1-WorkspaceApprovalSetting) | | |-| data_classification_setting_value | [DataClassificationSetting](#bytebase-v1-DataClassificationSetting) | | |-| semantic_type_setting_value | [SemanticTypeSetting](#bytebase-v1-SemanticTypeSetting) | | |-| scim_setting | [SCIMSetting](#bytebase-v1-SCIMSetting) | | |-| password_restriction_setting | [PasswordRestrictionSetting](#bytebase-v1-PasswordRestrictionSetting) | | |-| ai_setting | [AISetting](#bytebase-v1-AISetting) | | |-| environment_setting | [EnvironmentSetting](#bytebase-v1-EnvironmentSetting) | | |+| setting | [Setting](#bytebase-v1-Setting) | | The setting to update. |+| validate_only | [bool](#bool) | | validate_only is a flag to indicate whether to validate the setting value, server would not persist the setting value if it is true. |+| allow_missing | [bool](#bool) | | |+| update_mask | [google.protobuf.FieldMask](#google-protobuf-FieldMask) | | |diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.htmlindex 6fc7fa9cfd..0d6b91b642 100644--- a/proto/gen/grpc-doc/v1/index.html+++ b/proto/gen/grpc-doc/v1/index.html@@ -698,11 +698,11 @@</li><li>- <a href="#bytebase.v1.UpdateSettingRequest"><span class="badge">M</span>UpdateSettingRequest</a>+ <a href="#bytebase.v1.SettingValue"><span class="badge">M</span>SettingValue</a></li><li>- <a href="#bytebase.v1.Value"><span class="badge">M</span>Value</a>+ <a href="#bytebase.v1.UpdateSettingRequest"><span class="badge">M</span>UpdateSettingRequest</a></li><li>@@ -7917,15 +7917,14 @@ are /[a-z][0-9]-/. </p></td><td>name</td><td><a href="#string">string</a></td><td></td>- <td><p>The resource name of the setting. Must be one of the following forms:--- `setting/{setting}`-For example, "settings/bb.branding.logo" </p></td>+ <td><p>The resource name of the setting.+Format: settings/{setting}+Example: "settings/SEMANTIC_TYPES" </p></td></tr><tr><td>value</td>- <td><a href="#bytebase.v1.Value">Value</a></td>+ <td><a href="#bytebase.v1.SettingValue">SettingValue</a></td><td></td><td><p>The configuration value of the setting. </p></td></tr>@@ -7937,8 +7936,8 @@ For example, "settings/bb.branding.logo" </p></td>- <h3 id="bytebase.v1.UpdateSettingRequest">UpdateSettingRequest</h3>- <p>The request message for updating or creating a setting.</p>+ <h3 id="bytebase.v1.SettingValue">SettingValue</h3>+ <p>The data in setting value.</p><table class="field-table">@@ -7948,117 +7947,117 @@ For example, "settings/bb.branding.logo" </p></td><tbody><tr>- <td>setting</td>- <td><a href="#bytebase.v1.Setting">Setting</a></td>+ <td>string_value</td>+ <td><a href="#string">string</a></td><td></td>- <td><p>The setting to update. </p></td>+ <td><p>Defines this value as being a string value. </p></td></tr><tr>- <td>validate_only</td>- <td><a href="#bool">bool</a></td>+ <td>app_im</td>+ <td><a href="#bytebase.v1.AppIMSetting">AppIMSetting</a></td><td></td>- <td><p>validate_only is a flag to indicate whether to validate the setting value,-server would not persist the setting value if it is true. </p></td>+ <td><p> </p></td></tr><tr>- <td>allow_missing</td>- <td><a href="#bool">bool</a></td>+ <td>workspace_profile</td>+ <td><a href="#bytebase.v1.WorkspaceProfileSetting">WorkspaceProfileSetting</a></td><td></td><td><p> </p></td></tr><tr>- <td>update_mask</td>- <td><a href="#google.protobuf.FieldMask">google.protobuf.FieldMask</a></td>+ <td>workspace_approval</td>+ <td><a href="#bytebase.v1.WorkspaceApprovalSetting">WorkspaceApprovalSetting</a></td><td></td><td><p> </p></td></tr>- </tbody>- </table>------ <h3 id="bytebase.v1.Value">Value</h3>- <p>The data in setting value.</p>--- <table class="field-table">- <thead>- <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>- </thead>- <tbody>-<tr>- <td>string_value</td>- <td><a href="#string">string</a></td>+ <td>data_classification</td>+ <td><a href="#bytebase.v1.DataClassificationSetting">DataClassificationSetting</a></td><td></td>- <td><p>Defines this value as being a string value. </p></td>+ <td><p> </p></td></tr><tr>- <td>app_im_setting_value</td>- <td><a href="#bytebase.v1.AppIMSetting">AppIMSetting</a></td>+ <td>semantic_type</td>+ <td><a href="#bytebase.v1.SemanticTypeSetting">SemanticTypeSetting</a></td><td></td><td><p> </p></td></tr><tr>- <td>workspace_profile_setting_value</td>- <td><a href="#bytebase.v1.WorkspaceProfileSetting">WorkspaceProfileSetting</a></td>+ <td>scim</td>+ <td><a href="#bytebase.v1.SCIMSetting">SCIMSetting</a></td><td></td>- <td><p>reserved 4; // was AgentPluginSetting agent_plugin_setting_value </p></td>+ <td><p> </p></td></tr><tr>- <td>workspace_approval_setting_value</td>- <td><a href="#bytebase.v1.WorkspaceApprovalSetting">WorkspaceApprovalSetting</a></td>+ <td>password_restriction</td>+ <td><a href="#bytebase.v1.PasswordRestrictionSetting">PasswordRestrictionSetting</a></td><td></td><td><p> </p></td></tr><tr>- <td>data_classification_setting_value</td>- <td><a href="#bytebase.v1.DataClassificationSetting">DataClassificationSetting</a></td>+ <td>ai</td>+ <td><a href="#bytebase.v1.AISetting">AISetting</a></td><td></td><td><p> </p></td></tr><tr>- <td>semantic_type_setting_value</td>- <td><a href="#bytebase.v1.SemanticTypeSetting">SemanticTypeSetting</a></td>+ <td>environment</td>+ <td><a href="#bytebase.v1.EnvironmentSetting">EnvironmentSetting</a></td><td></td><td><p> </p></td></tr>+ </tbody>+ </table>++++++ <h3 id="bytebase.v1.UpdateSettingRequest">UpdateSettingRequest</h3>+ <p>The request message for updating or creating a setting.</p>+++ <table class="field-table">+ <thead>+ <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>+ </thead>+ <tbody>+<tr>- <td>scim_setting</td>- <td><a href="#bytebase.v1.SCIMSetting">SCIMSetting</a></td>+ <td>setting</td>+ <td><a href="#bytebase.v1.Setting">Setting</a></td><td></td>- <td><p> </p></td>+ <td><p>The setting to update. </p></td></tr><tr>- <td>password_restriction_setting</td>- <td><a href="#bytebase.v1.PasswordRestrictionSetting">PasswordRestrictionSetting</a></td>+ <td>validate_only</td>+ <td><a href="#bool">bool</a></td><td></td>- <td><p> </p></td>+ <td><p>validate_only is a flag to indicate whether to validate the setting value,+server would not persist the setting value if it is true. </p></td></tr><tr>- <td>ai_setting</td>- <td><a href="#bytebase.v1.AISetting">AISetting</a></td>+ <td>allow_missing</td>+ <td><a href="#bool">bool</a></td><td></td><td><p> </p></td></tr><tr>- <td>environment_setting</td>- <td><a href="#bytebase.v1.EnvironmentSetting">EnvironmentSetting</a></td>+ <td>update_mask</td>+ <td><a href="#google.protobuf.FieldMask">google.protobuf.FieldMask</a></td><td></td><td><p> </p></td></tr>diff --git a/proto/v1/v1/setting_service.proto b/proto/v1/v1/setting_service.protoindex 0951641d9c..4f48388207 100644--- a/proto/v1/v1/setting_service.proto+++ b/proto/v1/v1/setting_service.proto@@ -85,8 +85,6 @@ message UpdateSettingRequest {// The schema of setting.message Setting {- reserved 16;-option (google.api.resource) = {type: "bytebase.com/Setting"pattern: "settings/{setting}"@@ -99,12 +97,10 @@ message Setting {WORKSPACE_ID = 3;WORKSPACE_PROFILE = 4;WORKSPACE_APPROVAL = 5;- reserved 6; // was WORKSPACE_EXTERNAL_APPROVALENTERPRISE_LICENSE = 7;APP_IM = 8;WATERMARK = 9;AI = 10;- reserved 13; // was SCHEMA_TEMPLATEDATA_CLASSIFICATION = 14;SEMANTIC_TYPES = 15;SCIM = 17;@@ -112,35 +108,29 @@ message Setting {ENVIRONMENT = 19;}- // The resource name of the setting. Must be one of the following forms:- //- // - `setting/{setting}`- // For example, "settings/bb.branding.logo"- string name = 1;+ // The resource name of the setting.+ // Format: settings/{setting}+ // Example: "settings/SEMANTIC_TYPES"+ string name = 1 [(google.api.field_behavior) = IDENTIFIER];// The configuration value of the setting.- Value value = 2;+ SettingValue value = 2 [(google.api.field_behavior) = REQUIRED];}// The data in setting value.-message Value {- reserved 18;- reserved 9; // was SchemaTemplateSetting schema_template_setting_value-- // Value is a oneof field for setting value.+message SettingValue {oneof value {// Defines this value as being a string value.string string_value = 1;- AppIMSetting app_im_setting_value = 3;- // reserved 4; // was AgentPluginSetting agent_plugin_setting_value- WorkspaceProfileSetting workspace_profile_setting_value = 5;- WorkspaceApprovalSetting workspace_approval_setting_value = 6;- DataClassificationSetting data_classification_setting_value = 10;- SemanticTypeSetting semantic_type_setting_value = 11;- SCIMSetting scim_setting = 14;- PasswordRestrictionSetting password_restriction_setting = 15;- AISetting ai_setting = 16;- EnvironmentSetting environment_setting = 17;+ AppIMSetting app_im = 3;+ WorkspaceProfileSetting workspace_profile = 5;+ WorkspaceApprovalSetting workspace_approval = 6;+ DataClassificationSetting data_classification = 10;+ SemanticTypeSetting semantic_type = 11;+ SCIMSetting scim = 14;+ PasswordRestrictionSetting password_restriction = 15;+ AISetting ai = 16;+ EnvironmentSetting environment = 17;}}