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: move BRANDING_LOGO and WATERMARK settings to WORKSPACE_PROFILE (#18310)
Danny Xudbd487f412a7
diff --git a/backend/api/v1/actuator_service.go b/backend/api/v1/actuator_service.goindex a455c56d6f..b648bf8910 100644--- a/backend/api/v1/actuator_service.go+++ b/backend/api/v1/actuator_service.go@@ -103,16 +103,13 @@ func (s *ActuatorService) GetResourcePackage(ctx context.Context,_ *connect.Request[v1pb.GetResourcePackageRequest],) (*connect.Response[v1pb.ResourcePackage], error) {- brandingSetting, err := s.store.GetSettingV2(ctx, storepb.SettingName_BRANDING_LOGO)+ workspaceProfileSetting, err := s.store.GetWorkspaceGeneralSetting(ctx)if err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to find workspace branding"))- }- if brandingSetting == nil {- return nil, errors.Errorf("cannot find setting %v", storepb.SettingName_BRANDING_LOGO)+ return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to find workspace profile"))}pkg := &v1pb.ResourcePackage{- Logo: []byte(brandingSetting.Value),+ Logo: workspaceProfileSetting.BrandingLogo,}return connect.NewResponse(pkg), nil}@@ -237,26 +234,16 @@ func (s *ActuatorService) getUsedFeatures(ctx context.Context) ([]v1pb.PlanFeatu}// setting- brandingLogo, err := s.store.GetSettingV2(ctx, storepb.SettingName_BRANDING_LOGO)+ setting, err := s.store.GetWorkspaceGeneralSetting(ctx)if err != nil {- return nil, errors.Wrapf(err, "failed to get branding logo setting")+ return nil, errors.Wrapf(err, "failed to get workspace general setting")}- if brandingLogo != nil && brandingLogo.Value != "" {+ if len(setting.BrandingLogo) > 0 {features = append(features, v1pb.PlanFeature_FEATURE_CUSTOM_LOGO)}-- watermark, err := s.store.GetSettingV2(ctx, storepb.SettingName_WATERMARK)- if err != nil {- return nil, errors.Wrapf(err, "failed to get watermark setting")- }- if watermark != nil && watermark.Value == "1" {+ if setting.Watermark {features = append(features, v1pb.PlanFeature_FEATURE_WATERMARK)}-- setting, err := s.store.GetWorkspaceGeneralSetting(ctx)- if err != nil {- return nil, errors.Wrapf(err, "failed to get workspace general setting")- }if setting.DisallowSignup && !s.profile.SaaS {features = append(features, v1pb.PlanFeature_FEATURE_DISALLOW_SELF_SERVICE_SIGNUP)}diff --git a/backend/api/v1/setting_service.go b/backend/api/v1/setting_service.goindex bf18238cb3..ed3154c708 100644--- a/backend/api/v1/setting_service.go+++ b/backend/api/v1/setting_service.go@@ -268,6 +268,18 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Req}resetAuditLogStdout = trueoldSetting.EnableAuditLogStdout = payload.EnableAuditLogStdout+ case "value.workspace_profile.branding_logo":+ if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_CUSTOM_LOGO); err != nil {+ return nil, connect.NewError(connect.CodePermissionDenied, err)+ }+ oldSetting.BrandingLogo = payload.BrandingLogo+ case "value.workspace_profile.watermark":+ if payload.Watermark {+ if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_WATERMARK); err != nil {+ return nil, connect.NewError(connect.CodePermissionDenied, err)+ }+ }+ oldSetting.Watermark = payload.Watermarkdefault:return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid update mask path %v", path))}@@ -324,12 +336,6 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Reqreturn nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to marshal setting for %s with error: %v", apiSettingName, err))}storeSettingValue = string(bytes)- case storepb.SettingName_BRANDING_LOGO:- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_CUSTOM_LOGO); err != nil {- return nil, connect.NewError(connect.CodePermissionDenied, err)- }- storeSettingValue = request.Msg.Setting.Value.GetStringValue()-case storepb.SettingName_APP_IM:payload, err := convertAppIMSetting(request.Msg.Setting.Value.GetAppIm())if err != nil {@@ -454,11 +460,6 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Reqreturn nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to marshal setting for %s with error: %v", apiSettingName, err))}storeSettingValue = string(bytes)- case storepb.SettingName_WATERMARK:- if err := s.licenseService.IsFeatureEnabled(v1pb.PlanFeature_FEATURE_WATERMARK); err != nil {- return nil, connect.NewError(connect.CodePermissionDenied, err)- }- storeSettingValue = request.Msg.Setting.Value.GetStringValue()case storepb.SettingName_SCIM:scimToken, err := common.RandomString(32)if err != nil {diff --git a/backend/api/v1/setting_service_converter.go b/backend/api/v1/setting_service_converter.goindex cd297db32c..1fb478e39a 100644--- a/backend/api/v1/setting_service_converter.go+++ b/backend/api/v1/setting_service_converter.go@@ -179,16 +179,12 @@ func convertStoreSettingNameToV1(storeName storepb.SettingName) v1pb.Setting_Setswitch storeName {case storepb.SettingName_SETTING_NAME_UNSPECIFIED:return v1pb.Setting_SETTING_NAME_UNSPECIFIED- case storepb.SettingName_BRANDING_LOGO:- return v1pb.Setting_BRANDING_LOGOcase storepb.SettingName_WORKSPACE_PROFILE:return v1pb.Setting_WORKSPACE_PROFILEcase storepb.SettingName_WORKSPACE_APPROVAL:return v1pb.Setting_WORKSPACE_APPROVALcase storepb.SettingName_APP_IM:return v1pb.Setting_APP_IM- case storepb.SettingName_WATERMARK:- return v1pb.Setting_WATERMARKcase storepb.SettingName_AI:return v1pb.Setting_AIcase storepb.SettingName_DATA_CLASSIFICATION:@@ -214,16 +210,12 @@ func convertV1SettingNameToStore(v1Name v1pb.Setting_SettingName) storepb.Settinswitch v1Name {case v1pb.Setting_SETTING_NAME_UNSPECIFIED:return storepb.SettingName_SETTING_NAME_UNSPECIFIED- case v1pb.Setting_BRANDING_LOGO:- return storepb.SettingName_BRANDING_LOGOcase v1pb.Setting_WORKSPACE_PROFILE:return storepb.SettingName_WORKSPACE_PROFILEcase v1pb.Setting_WORKSPACE_APPROVAL:return storepb.SettingName_WORKSPACE_APPROVALcase v1pb.Setting_APP_IM:return storepb.SettingName_APP_IM- case v1pb.Setting_WATERMARK:- return storepb.SettingName_WATERMARKcase v1pb.Setting_AI:return storepb.SettingName_AIcase v1pb.Setting_DATA_CLASSIFICATION:diff --git a/backend/generated-go/store/setting.pb.go b/backend/generated-go/store/setting.pb.goindex 489fbbeeb7..62788a4da8 100644--- a/backend/generated-go/store/setting.pb.go+++ b/backend/generated-go/store/setting.pb.go@@ -28,13 +28,11 @@ type SettingName int32const (SettingName_SETTING_NAME_UNSPECIFIED SettingName = 0SettingName_AUTH_SECRET SettingName = 1- SettingName_BRANDING_LOGO SettingName = 2SettingName_WORKSPACE_ID SettingName = 3SettingName_WORKSPACE_PROFILE SettingName = 4SettingName_WORKSPACE_APPROVAL SettingName = 5SettingName_ENTERPRISE_LICENSE SettingName = 7SettingName_APP_IM SettingName = 8- SettingName_WATERMARK SettingName = 9SettingName_AI SettingName = 10SettingName_DATA_CLASSIFICATION SettingName = 14SettingName_SEMANTIC_TYPES SettingName = 15@@ -48,13 +46,11 @@ var (SettingName_name = map[int32]string{0: "SETTING_NAME_UNSPECIFIED",1: "AUTH_SECRET",- 2: "BRANDING_LOGO",3: "WORKSPACE_ID",4: "WORKSPACE_PROFILE",5: "WORKSPACE_APPROVAL",7: "ENTERPRISE_LICENSE",8: "APP_IM",- 9: "WATERMARK",10: "AI",14: "DATA_CLASSIFICATION",15: "SEMANTIC_TYPES",@@ -65,13 +61,11 @@ var (SettingName_value = map[string]int32{"SETTING_NAME_UNSPECIFIED": 0,"AUTH_SECRET": 1,- "BRANDING_LOGO": 2,"WORKSPACE_ID": 3,"WORKSPACE_PROFILE": 4,"WORKSPACE_APPROVAL": 5,"ENTERPRISE_LICENSE": 7,"APP_IM": 8,- "WATERMARK": 9,"AI": 10,"DATA_CLASSIFICATION": 14,"SEMANTIC_TYPES": 15,@@ -401,8 +395,14 @@ type WorkspaceProfileSetting struct {// Whether to enable audit logging to stdout in structured JSON format.// Requires TEAM or ENTERPRISE license.EnableAuditLogStdout bool `protobuf:"varint,15,opt,name=enable_audit_log_stdout,json=enableAuditLogStdout,proto3" json:"enable_audit_log_stdout,omitempty"`- unknownFields protoimpl.UnknownFields- sizeCache protoimpl.SizeCache+ // The branding logo as raw bytes.+ // Requires ENTERPRISE license with custom logo feature.+ BrandingLogo []byte `protobuf:"bytes,16,opt,name=branding_logo,json=brandingLogo,proto3" json:"branding_logo,omitempty"`+ // Whether to show watermark.+ // Requires ENTERPRISE license with watermark feature.+ Watermark bool `protobuf:"varint,17,opt,name=watermark,proto3" json:"watermark,omitempty"`+ unknownFields protoimpl.UnknownFields+ sizeCache protoimpl.SizeCache}func (x *WorkspaceProfileSetting) Reset() {@@ -526,6 +526,20 @@ func (x *WorkspaceProfileSetting) GetEnableAuditLogStdout() bool {return false}+func (x *WorkspaceProfileSetting) GetBrandingLogo() []byte {+ if x != nil {+ return x.BrandingLogo+ }+ return nil+}++func (x *WorkspaceProfileSetting) GetWatermark() bool {+ if x != nil {+ return x.Watermark+ }+ return false+}+type Announcement struct {state protoimpl.MessageState `protogen:"open.v1"`// The alert level of the announcement.@@ -2322,7 +2336,7 @@ var File_store_setting_proto protoreflect.FileDescriptorconst file_store_setting_proto_rawDesc = "" +"\n" +- "\x13store/setting.proto\x12\x0ebytebase.store\x1a\x1egoogle/protobuf/duration.proto\x1a\x16google/type/expr.proto\x1a\x14store/approval.proto\x1a\x1bstore/project_webhook.proto\"\x85\x06\n" ++ "\x13store/setting.proto\x12\x0ebytebase.store\x1a\x1egoogle/protobuf/duration.proto\x1a\x16google/type/expr.proto\x1a\x14store/approval.proto\x1a\x1bstore/project_webhook.proto\"\xc8\x06\n" +"\x17WorkspaceProfileSetting\x12!\n" +"\fexternal_url\x18\x01 \x01(\tR\vexternalUrl\x12'\n" +"\x0fdisallow_signup\x18\x02 \x01(\bR\x0edisallowSignup\x12\x1f\n" +@@ -2338,7 +2352,9 @@ const file_store_setting_proto_rawDesc = "" +"\x18disallow_password_signin\x18\f \x01(\bR\x16disallowPasswordSignin\x128\n" +"\x18enable_metric_collection\x18\r \x01(\bR\x16enableMetricCollection\x12S\n" +"\x18inactive_session_timeout\x18\x0e \x01(\v2\x19.google.protobuf.DurationR\x16inactiveSessionTimeout\x125\n" +- "\x17enable_audit_log_stdout\x18\x0f \x01(\bR\x14enableAuditLogStdout\"\xe9\x01\n" ++ "\x17enable_audit_log_stdout\x18\x0f \x01(\bR\x14enableAuditLogStdout\x12#\n" ++ "\rbranding_logo\x18\x10 \x01(\fR\fbrandingLogo\x12\x1c\n" ++ "\twatermark\x18\x11 \x01(\bR\twatermark\"\xe9\x01\n" +"\fAnnouncement\x12=\n" +"\x05level\x18\x01 \x01(\x0e2'.bytebase.store.Announcement.AlertLevelR\x05level\x12\x12\n" +"\x04text\x18\x02 \x01(\tR\x04text\x12\x12\n" +@@ -2486,25 +2502,23 @@ const file_store_setting_proto_rawDesc = "" +"\x05color\x18\x04 \x01(\tR\x05color\x1a7\n" +"\tTagsEntry\x12\x10\n" +"\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" +- "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01*\xbf\x02\n" ++ "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01*\x8b\x02\n" +"\vSettingName\x12\x1c\n" +"\x18SETTING_NAME_UNSPECIFIED\x10\x00\x12\x0f\n" +- "\vAUTH_SECRET\x10\x01\x12\x11\n" +- "\rBRANDING_LOGO\x10\x02\x12\x10\n" ++ "\vAUTH_SECRET\x10\x01\x12\x10\n" +"\fWORKSPACE_ID\x10\x03\x12\x15\n" +"\x11WORKSPACE_PROFILE\x10\x04\x12\x16\n" +"\x12WORKSPACE_APPROVAL\x10\x05\x12\x16\n" +"\x12ENTERPRISE_LICENSE\x10\a\x12\n" +"\n" +- "\x06APP_IM\x10\b\x12\r\n" +- "\tWATERMARK\x10\t\x12\x06\n" ++ "\x06APP_IM\x10\b\x12\x06\n" +"\x02AI\x10\n" +"\x12\x17\n" +"\x13DATA_CLASSIFICATION\x10\x0e\x12\x12\n" +"\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\x10\x10\x10\"\x04\b\x06\x10\x06\"\x04\b\r\x10\r*T\n" ++ "\vENVIRONMENT\x10\x13*T\n" +"\x12DatabaseChangeMode\x12$\n" +" DATABASE_CHANGE_MODE_UNSPECIFIED\x10\x00\x12\f\n" +"\bPIPELINE\x10\x01\x12\n" +diff --git a/backend/generated-go/store/setting_equal.pb.go b/backend/generated-go/store/setting_equal.pb.goindex e4a822f720..d5b8e41c89 100644--- a/backend/generated-go/store/setting_equal.pb.go+++ b/backend/generated-go/store/setting_equal.pb.go@@ -59,6 +59,12 @@ func (x *WorkspaceProfileSetting) Equal(y *WorkspaceProfileSetting) bool {if x.EnableAuditLogStdout != y.EnableAuditLogStdout {return false}+ if string(x.BrandingLogo) != string(y.BrandingLogo) {+ return false+ }+ if x.Watermark != y.Watermark {+ return false+ }return true}diff --git a/backend/generated-go/v1/setting_service.pb.go b/backend/generated-go/v1/setting_service.pb.goindex c515af5921..466166c8dc 100644--- a/backend/generated-go/v1/setting_service.pb.go+++ b/backend/generated-go/v1/setting_service.pb.go@@ -81,11 +81,9 @@ type Setting_SettingName int32const (Setting_SETTING_NAME_UNSPECIFIED Setting_SettingName = 0- Setting_BRANDING_LOGO Setting_SettingName = 2Setting_WORKSPACE_PROFILE Setting_SettingName = 4Setting_WORKSPACE_APPROVAL Setting_SettingName = 5Setting_APP_IM Setting_SettingName = 8- Setting_WATERMARK Setting_SettingName = 9Setting_AI Setting_SettingName = 10Setting_DATA_CLASSIFICATION Setting_SettingName = 14Setting_SEMANTIC_TYPES Setting_SettingName = 15@@ -98,11 +96,9 @@ const (var (Setting_SettingName_name = map[int32]string{0: "SETTING_NAME_UNSPECIFIED",- 2: "BRANDING_LOGO",4: "WORKSPACE_PROFILE",5: "WORKSPACE_APPROVAL",8: "APP_IM",- 9: "WATERMARK",10: "AI",14: "DATA_CLASSIFICATION",15: "SEMANTIC_TYPES",@@ -112,11 +108,9 @@ var (}Setting_SettingName_value = map[string]int32{"SETTING_NAME_UNSPECIFIED": 0,- "BRANDING_LOGO": 2,"WORKSPACE_PROFILE": 4,"WORKSPACE_APPROVAL": 5,"APP_IM": 8,- "WATERMARK": 9,"AI": 10,"DATA_CLASSIFICATION": 14,"SEMANTIC_TYPES": 15,@@ -951,8 +945,14 @@ type WorkspaceProfileSetting struct {// Whether to enable audit logging to stdout in structured JSON format.// Requires TEAM or ENTERPRISE license.EnableAuditLogStdout bool `protobuf:"varint,15,opt,name=enable_audit_log_stdout,json=enableAuditLogStdout,proto3" json:"enable_audit_log_stdout,omitempty"`- unknownFields protoimpl.UnknownFields- sizeCache protoimpl.SizeCache+ // The branding logo as raw bytes.+ // Requires ENTERPRISE license with custom logo feature.+ BrandingLogo []byte `protobuf:"bytes,16,opt,name=branding_logo,json=brandingLogo,proto3" json:"branding_logo,omitempty"`+ // Whether to show watermark.+ // Requires ENTERPRISE license with watermark feature.+ Watermark bool `protobuf:"varint,17,opt,name=watermark,proto3" json:"watermark,omitempty"`+ unknownFields protoimpl.UnknownFields+ sizeCache protoimpl.SizeCache}func (x *WorkspaceProfileSetting) Reset() {@@ -1076,6 +1076,20 @@ func (x *WorkspaceProfileSetting) GetEnableAuditLogStdout() bool {return false}+func (x *WorkspaceProfileSetting) GetBrandingLogo() []byte {+ if x != nil {+ return x.BrandingLogo+ }+ return nil+}++func (x *WorkspaceProfileSetting) GetWatermark() bool {+ if x != nil {+ return x.Watermark+ }+ return false+}+type Announcement struct {state protoimpl.MessageState `protogen:"open.v1"`// The alert level of announcement@@ -2879,18 +2893,16 @@ 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\"\xfc\x02\n" ++ "updateMask\"\xda\x02\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\"\xf2\x01\n" ++ "\x05value\x18\x02 \x01(\v2\x19.bytebase.v1.SettingValueB\x03\xe0A\x02R\x05value\"\xd0\x01\n" +"\vSettingName\x12\x1c\n" +- "\x18SETTING_NAME_UNSPECIFIED\x10\x00\x12\x11\n" +- "\rBRANDING_LOGO\x10\x02\x12\x15\n" ++ "\x18SETTING_NAME_UNSPECIFIED\x10\x00\x12\x15\n" +"\x11WORKSPACE_PROFILE\x10\x04\x12\x16\n" +"\x12WORKSPACE_APPROVAL\x10\x05\x12\n" +"\n" +- "\x06APP_IM\x10\b\x12\r\n" +- "\tWATERMARK\x10\t\x12\x06\n" ++ "\x06APP_IM\x10\b\x12\x06\n" +"\x02AI\x10\n" +"\x12\x17\n" +"\x13DATA_CLASSIFICATION\x10\x0e\x12\x12\n" +@@ -2945,7 +2957,7 @@ const file_v1_setting_service_proto_rawDesc = "" +"\x04lark\x18\x05 \x01(\v2\x1e.bytebase.v1.AppIMSetting.LarkH\x00R\x04lark\x12@\n" +"\bdingtalk\x18\x06 \x01(\v2\".bytebase.v1.AppIMSetting.DingTalkH\x00R\bdingtalk\x127\n" +"\x05teams\x18\a \x01(\v2\x1f.bytebase.v1.AppIMSetting.TeamsH\x00R\x05teamsB\t\n" +- "\apayload\"\xff\x05\n" ++ "\apayload\"\xc2\x06\n" +"\x17WorkspaceProfileSetting\x12!\n" +"\fexternal_url\x18\x01 \x01(\tR\vexternalUrl\x12'\n" +"\x0fdisallow_signup\x18\x02 \x01(\bR\x0edisallowSignup\x12\x1f\n" +@@ -2961,7 +2973,9 @@ const file_v1_setting_service_proto_rawDesc = "" +"\x18disallow_password_signin\x18\f \x01(\bR\x16disallowPasswordSignin\x128\n" +"\x18enable_metric_collection\x18\r \x01(\bR\x16enableMetricCollection\x12S\n" +"\x18inactive_session_timeout\x18\x0e \x01(\v2\x19.google.protobuf.DurationR\x16inactiveSessionTimeout\x125\n" +- "\x17enable_audit_log_stdout\x18\x0f \x01(\bR\x14enableAuditLogStdout\"\xc2\x01\n" ++ "\x17enable_audit_log_stdout\x18\x0f \x01(\bR\x14enableAuditLogStdout\x12#\n" ++ "\rbranding_logo\x18\x10 \x01(\fR\fbrandingLogo\x12\x1c\n" ++ "\twatermark\x18\x11 \x01(\bR\twatermark\"\xc2\x01\n" +"\fAnnouncement\x12:\n" +"\x05level\x18\x01 \x01(\x0e2$.bytebase.v1.Announcement.AlertLevelR\x05level\x12\x12\n" +"\x04text\x18\x02 \x01(\tR\x04text\x12\x12\n" +diff --git a/backend/generated-go/v1/setting_service_equal.pb.go b/backend/generated-go/v1/setting_service_equal.pb.goindex 79a6ff1213..d647df3c0c 100644--- a/backend/generated-go/v1/setting_service_equal.pb.go+++ b/backend/generated-go/v1/setting_service_equal.pb.go@@ -347,6 +347,12 @@ func (x *WorkspaceProfileSetting) Equal(y *WorkspaceProfileSetting) bool {if x.EnableAuditLogStdout != y.EnableAuditLogStdout {return false}+ if string(x.BrandingLogo) != string(y.BrandingLogo) {+ return false+ }+ if x.Watermark != y.Watermark {+ return false+ }return true}diff --git a/backend/migrator/migration/3.13/0009##move_branding_watermark_to_workspace_profile.sql b/backend/migrator/migration/3.13/0009##move_branding_watermark_to_workspace_profile.sqlnew file mode 100644index 0000000000..2b93a076a2--- /dev/null+++ b/backend/migrator/migration/3.13/0009##move_branding_watermark_to_workspace_profile.sql@@ -0,0 +1,18 @@+-- Move BRANDING_LOGO and WATERMARK settings into WORKSPACE_PROFILE setting+UPDATE setting+SET value = (+ COALESCE(value::jsonb, '{}'::jsonb)+ || CASE+ WHEN EXISTS (SELECT 1 FROM setting WHERE name = 'BRANDING_LOGO' AND value != '')+ THEN jsonb_build_object('brandingLogo', (SELECT value FROM setting WHERE name = 'BRANDING_LOGO'))+ ELSE '{}'::jsonb+ END+ || CASE+ WHEN EXISTS (SELECT 1 FROM setting WHERE name = 'WATERMARK' AND value != '')+ THEN jsonb_build_object('watermark', true)+ ELSE '{}'::jsonb+ END+)::text+WHERE name = 'WORKSPACE_PROFILE';++DELETE FROM setting WHERE name IN ('BRANDING_LOGO', 'WATERMARK');diff --git a/backend/migrator/migration/LATEST.sql b/backend/migrator/migration/LATEST.sqlindex 8a907479b5..1f808a7a1d 100644--- a/backend/migrator/migration/LATEST.sql+++ b/backend/migrator/migration/LATEST.sql@@ -33,8 +33,8 @@ CREATE TABLE principal (-- SettingCREATE TABLE setting (id serial PRIMARY KEY,- -- name: AUTH_SECRET, BRANDING_LOGO, WORKSPACE_ID, WORKSPACE_PROFILE, WORKSPACE_APPROVAL,- -- ENTERPRISE_LICENSE, APP_IM, WATERMARK, AI,+ -- name: AUTH_SECRET, WORKSPACE_ID, WORKSPACE_PROFILE, WORKSPACE_APPROVAL,+ -- ENTERPRISE_LICENSE, APP_IM, AI,-- DATA_CLASSIFICATION, SEMANTIC_TYPES, SCIM, PASSWORD_RESTRICTION, ENVIRONMENT-- Enum: SettingName (proto/store/store/setting.proto)name text NOT NULL,@@ -549,10 +549,8 @@ INSERT INTO project (id, name, resource_id) VALUES (1, 'Default', 'default');ALTER SEQUENCE project_id_seq RESTART WITH 101;-- Initialize settings with static values-INSERT INTO setting (name, value) VALUES ('BRANDING_LOGO', '');INSERT INTO setting (name, value) VALUES ('ENTERPRISE_LICENSE', '');INSERT INTO setting (name, value) VALUES ('APP_IM', '{}');-INSERT INTO setting (name, value) VALUES ('WATERMARK', '0');INSERT INTO setting (name, value) VALUES ('DATA_CLASSIFICATION', '{}');INSERT INTO setting (name, value) VALUES ('WORKSPACE_APPROVAL', '{"rules":[{"template":{"flow":{"roles":["roles/projectOwner"]},"title":"Fallback Rule","description":"Requires project owner approval when no other rules match."},"condition":{"expression":"true"}}]}');INSERT INTO setting (name, value) VALUES ('PASSWORD_RESTRICTION', '{"minLength":8}');diff --git a/backend/migrator/migrator_test.go b/backend/migrator/migrator_test.goindex 6ad0650572..47c5d59f6e 100644--- a/backend/migrator/migrator_test.go+++ b/backend/migrator/migrator_test.go@@ -12,7 +12,7 @@ import (func TestLatestVersion(t *testing.T) {files, err := getSortedVersionedFiles()require.NoError(t, err)- require.Equal(t, semver.MustParse("3.13.8"), *files[len(files)-1].version)+ require.Equal(t, semver.MustParse("3.13.9"), *files[len(files)-1].version)}func TestVersionUnique(t *testing.T) {diff --git a/frontend/src/components/GeneralSetting/BrandingSetting.vue b/frontend/src/components/GeneralSetting/BrandingSetting.vueindex f2ef4d4cf1..b787472c02 100644--- a/frontend/src/components/GeneralSetting/BrandingSetting.vue+++ b/frontend/src/components/GeneralSetting/BrandingSetting.vue@@ -65,15 +65,12 @@<script lang="ts" setup>import { create } from "@bufbuild/protobuf";+import { FieldMaskSchema } from "@bufbuild/protobuf/wkt";import { NButton, NTooltip } from "naive-ui";import { computed, reactive } from "vue";import { featureToRef } from "@/store";import { useActuatorV1Store } from "@/store/modules/v1/actuator";import { useSettingV1Store } from "@/store/modules/v1/setting";-import {- Setting_SettingName,- 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";import SingleFileSelector from "../SingleFileSelector.vue";@@ -121,13 +118,12 @@ const doUpdate = async (content: string) => {}state.loading = true;try {- await settingV1Store.upsertSetting({- name: Setting_SettingName.BRANDING_LOGO,- value: create(SettingSettingValueSchema, {- value: {- case: "stringValue",- value: content,- },+ await settingV1Store.updateWorkspaceProfile({+ payload: {+ brandingLogo: new TextEncoder().encode(content),+ },+ updateMask: create(FieldMaskSchema, {+ paths: ["value.workspace_profile.branding_logo"],}),});useActuatorV1Store().setLogo(content);diff --git a/frontend/src/components/GeneralSetting/SecuritySetting.vue b/frontend/src/components/GeneralSetting/SecuritySetting.vueindex 44ee700dfe..80eaa9e906 100644--- a/frontend/src/components/GeneralSetting/SecuritySetting.vue+++ b/frontend/src/components/GeneralSetting/SecuritySetting.vue@@ -46,13 +46,10 @@<script lang="ts" setup>import { create } from "@bufbuild/protobuf";+import { FieldMaskSchema } from "@bufbuild/protobuf/wkt";import { computed, ref } from "vue";import { Switch } from "@/components/v2";import { featureToRef, useSettingV1Store } from "@/store";-import {- Setting_SettingName,- 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";import DomainRestrictionSetting from "./DomainRestrictionSetting.vue";@@ -81,13 +78,7 @@ const settingRefList = computed(() => []);const initEnableWatermark = computed(() => {- const watermarkSetting = settingV1Store.getSettingByName(- Setting_SettingName.WATERMARK- );- if (watermarkSetting?.value?.value?.case === "stringValue") {- return watermarkSetting.value.value.value === "1";- }- return false;+ return settingV1Store.watermark;});const enableWatermark = ref(initEnableWatermark.value);@@ -100,14 +91,12 @@ const isDirty = computed(() => {});const handleWatermarkToggle = async () => {- const value = enableWatermark.value ? "1" : "0";- await settingV1Store.upsertSetting({- name: Setting_SettingName.WATERMARK,- value: create(SettingSettingValueSchema, {- value: {- case: "stringValue",- value: value,- },+ await settingV1Store.updateWorkspaceProfile({+ payload: {+ watermark: enableWatermark.value,+ },+ updateMask: create(FieldMaskSchema, {+ paths: ["value.workspace_profile.watermark"],}),});};diff --git a/frontend/src/components/misc/Watermark.vue b/frontend/src/components/misc/Watermark.vueindex 802374c729..f433c72e11 100644--- a/frontend/src/components/misc/Watermark.vue+++ b/frontend/src/components/misc/Watermark.vue@@ -43,7 +43,6 @@ import {} from "@/store";import { useSettingV1Store } from "@/store/modules/v1/setting";import { UNKNOWN_USER_NAME } from "@/types";-import { Setting_SettingName } from "@/types/proto-es/v1/setting_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";const GAP = 320;@@ -51,15 +50,13 @@ const SIZE = 16;const PADDING = 6;const currentUserV1 = useCurrentUserV1();+const settingV1Store = useSettingV1Store();const version = computed(() =>useActuatorV1Store().version +"-" +useActuatorV1Store().gitCommitBE.substring(0, 7));-const setting = computed(() =>- useSettingV1Store().getSettingByName(Setting_SettingName.WATERMARK)-);const hasWatermarkFeature = featureToRef(PlanFeature.FEATURE_WATERMARK);const lines = computed(() => {@@ -67,11 +64,7 @@ const lines = computed(() => {const uid = extractUserId(user.name);if (user.name === UNKNOWN_USER_NAME) return [];if (!hasWatermarkFeature.value) return [];- if (- setting.value?.value?.value?.case !== "stringValue" ||- setting.value.value.value.value !== "1"- )- return [];+ if (!settingV1Store.watermark) return [];const lines: string[] = [];lines.push(`${user.title} (${uid})`);diff --git a/frontend/src/store/modules/v1/setting.ts b/frontend/src/store/modules/v1/setting.tsindex f47bb0f00c..167c55d2b8 100644--- a/frontend/src/store/modules/v1/setting.ts+++ b/frontend/src/store/modules/v1/setting.ts@@ -43,16 +43,15 @@ export const useSettingV1Store = defineStore("setting_v1", {}return undefined;},- brandingLogo(state): string | undefined {- const setting = state.settingMapByName.get(- `${settingNamePrefix}${Setting_SettingName[Setting_SettingName.BRANDING_LOGO]}`- );- if (!setting?.value?.value) return undefined;- const value = setting.value.value;- if (value.case === "stringValue") {- return value.value;+ brandingLogo(): string {+ const bytes = this.workspaceProfileSetting?.brandingLogo;+ if (!bytes || bytes.length === 0) {+ return "";}- return undefined;+ return new TextDecoder().decode(bytes);+ },+ watermark(): boolean {+ return this.workspaceProfileSetting?.watermark ?? false;},classification(): DataClassificationSetting_DataClassificationConfig[] {const setting = this.settingMapByName.get(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 64d0e5b818..bbf6ce9716 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@@ -158,11 +158,6 @@ export enum Setting_SettingName {*/SETTING_NAME_UNSPECIFIED = 0,- /**- * @generated from enum value: BRANDING_LOGO = 2;- */- BRANDING_LOGO = 2,-/*** @generated from enum value: WORKSPACE_PROFILE = 4;*/@@ -178,11 +173,6 @@ export enum Setting_SettingName {*/APP_IM = 8,- /**- * @generated from enum value: WATERMARK = 9;- */- WATERMARK = 9,-/*** @generated from enum value: AI = 10;*/@@ -609,6 +599,22 @@ export declare type WorkspaceProfileSetting = Message<"bytebase.v1.WorkspaceProf* @generated from field: bool enable_audit_log_stdout = 15;*/enableAuditLogStdout: boolean;++ /**+ * The branding logo as raw bytes.+ * Requires ENTERPRISE license with custom logo feature.+ *+ * @generated from field: bytes branding_logo = 16;+ */+ brandingLogo: Uint8Array;++ /**+ * Whether to show watermark.+ * Requires ENTERPRISE license with watermark feature.+ *+ * @generated from field: bool watermark = 17;+ */+ watermark: boolean;};/**diff --git a/frontend/src/types/proto-es/v1/setting_service_pb.js b/frontend/src/types/proto-es/v1/setting_service_pb.jsindex e8b329ddb8..c60dd8baac 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("Chh2MS9zZXR0aW5nX3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIhUKE0xpc3RTZXR0aW5nc1JlcXVlc3QiPgoUTGlzdFNldHRpbmdzUmVzcG9uc2USJgoIc2V0dGluZ3MYASADKAsyFC5ieXRlYmFzZS52MS5TZXR0aW5nIj8KEUdldFNldHRpbmdSZXF1ZXN0EioKBG5hbWUYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1NldHRpbmciOwoSR2V0U2V0dGluZ1Jlc3BvbnNlEiUKB3NldHRpbmcYASABKAsyFC5ieXRlYmFzZS52MS5TZXR0aW5nIqEBChRVcGRhdGVTZXR0aW5nUmVxdWVzdBIqCgdzZXR0aW5nGAEgASgLMhQuYnl0ZWJhc2UudjEuU2V0dGluZ0ID4EECEhUKDXZhbGlkYXRlX29ubHkYAiABKAgSFQoNYWxsb3dfbWlzc2luZxgDIAEoCBIvCgt1cGRhdGVfbWFzaxgEIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2si7wIKB1NldHRpbmcSEQoEbmFtZRgBIAEoCUID4EEIEi0KBXZhbHVlGAIgASgLMhkuYnl0ZWJhc2UudjEuU2V0dGluZ1ZhbHVlQgPgQQIi8gEKC1NldHRpbmdOYW1lEhwKGFNFVFRJTkdfTkFNRV9VTlNQRUNJRklFRBAAEhEKDUJSQU5ESU5HX0xPR08QAhIVChFXT1JLU1BBQ0VfUFJPRklMRRAEEhYKEldPUktTUEFDRV9BUFBST1ZBTBAFEgoKBkFQUF9JTRAIEg0KCVdBVEVSTUFSSxAJEgYKAkFJEAoSFwoTREFUQV9DTEFTU0lGSUNBVElPThAOEhIKDlNFTUFOVElDX1RZUEVTEA8SCAoEU0NJTRAREhgKFFBBU1NXT1JEX1JFU1RSSUNUSU9OEBISDwoLRU5WSVJPTk1FTlQQEzot6kEqChRieXRlYmFzZS5jb20vU2V0dGluZxISc2V0dGluZ3Mve3NldHRpbmd9IrcECgxTZXR0aW5nVmFsdWUSFgoMc3RyaW5nX3ZhbHVlGAEgASgJSAASKwoGYXBwX2ltGAMgASgLMhkuYnl0ZWJhc2UudjEuQXBwSU1TZXR0aW5nSAASQQoRd29ya3NwYWNlX3Byb2ZpbGUYBSABKAsyJC5ieXRlYmFzZS52MS5Xb3Jrc3BhY2VQcm9maWxlU2V0dGluZ0gAEkMKEndvcmtzcGFjZV9hcHByb3ZhbBgGIAEoCzIlLmJ5dGViYXNlLnYxLldvcmtzcGFjZUFwcHJvdmFsU2V0dGluZ0gAEkUKE2RhdGFfY2xhc3NpZmljYXRpb24YCiABKAsyJi5ieXRlYmFzZS52MS5EYXRhQ2xhc3NpZmljYXRpb25TZXR0aW5nSAASOQoNc2VtYW50aWNfdHlwZRgLIAEoCzIgLmJ5dGViYXNlLnYxLlNlbWFudGljVHlwZVNldHRpbmdIABIoCgRzY2ltGA4gASgLMhguYnl0ZWJhc2UudjEuU0NJTVNldHRpbmdIABJHChRwYXNzd29yZF9yZXN0cmljdGlvbhgPIAEoCzInLmJ5dGViYXNlLnYxLlBhc3N3b3JkUmVzdHJpY3Rpb25TZXR0aW5nSAASJAoCYWkYECABKAsyFi5ieXRlYmFzZS52MS5BSVNldHRpbmdIABI2CgtlbnZpcm9ubWVudBgRIAEoCzIfLmJ5dGViYXNlLnYxLkVudmlyb25tZW50U2V0dGluZ0gAQgcKBXZhbHVlIr0GCgxBcHBJTVNldHRpbmcSNQoIc2V0dGluZ3MYASADKAsyIy5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmcuSU1TZXR0aW5nGhsKBVNsYWNrEhIKBXRva2VuGAEgASgJQgPgQQQaNgoGRmVpc2h1EhMKBmFwcF9pZBgBIAEoCUID4EEEEhcKCmFwcF9zZWNyZXQYAiABKAlCA+BBBBpJCgVXZWNvbRIUCgdjb3JwX2lkGAEgASgJQgPgQQQSFQoIYWdlbnRfaWQYAiABKAlCA+BBBBITCgZzZWNyZXQYAyABKAlCA+BBBBo0CgRMYXJrEhMKBmFwcF9pZBgBIAEoCUID4EEEEhcKCmFwcF9zZWNyZXQYAiABKAlCA+BBBBpXCghEaW5nVGFsaxIWCgljbGllbnRfaWQYASABKAlCA+BBBBIaCg1jbGllbnRfc2VjcmV0GAIgASgJQgPgQQQSFwoKcm9ib3RfY29kZRgDIAEoCUID4EEEGlMKBVRlYW1zEhYKCXRlbmFudF9pZBgBIAEoCUID4EEEEhYKCWNsaWVudF9pZBgCIAEoCUID4EEEEhoKDWNsaWVudF9zZWNyZXQYAyABKAlCA+BBBBrxAgoJSU1TZXR0aW5nEicKBHR5cGUYASABKA4yGS5ieXRlYmFzZS52MS5XZWJob29rLlR5cGUSMAoFc2xhY2sYAiABKAsyHy5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmcuU2xhY2tIABIyCgZmZWlzaHUYAyABKAsyIC5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmcuRmVpc2h1SAASMAoFd2Vjb20YBCABKAsyHy5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmcuV2Vjb21IABIuCgRsYXJrGAUgASgLMh4uYnl0ZWJhc2UudjEuQXBwSU1TZXR0aW5nLkxhcmtIABI2CghkaW5ndGFsaxgGIAEoCzIiLmJ5dGViYXNlLnYxLkFwcElNU2V0dGluZy5EaW5nVGFsa0gAEjAKBXRlYW1zGAcgASgLMh8uYnl0ZWJhc2UudjEuQXBwSU1TZXR0aW5nLlRlYW1zSABCCQoHcGF5bG9hZCKQBAoXV29ya3NwYWNlUHJvZmlsZVNldHRpbmcSFAoMZXh0ZXJuYWxfdXJsGAEgASgJEhcKD2Rpc2FsbG93X3NpZ251cBgCIAEoCBITCgtyZXF1aXJlXzJmYRgDIAEoCBIxCg50b2tlbl9kdXJhdGlvbhgGIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbhIvCgxhbm5vdW5jZW1lbnQYByABKAsyGS5ieXRlYmFzZS52MS5Bbm5vdW5jZW1lbnQSOgoXbWF4aW11bV9yb2xlX2V4cGlyYXRpb24YCCABKAsyGS5nb29nbGUucHJvdG9idWYuRHVyYXRpb24SDwoHZG9tYWlucxgJIAMoCRIfChdlbmZvcmNlX2lkZW50aXR5X2RvbWFpbhgKIAEoCBI9ChRkYXRhYmFzZV9jaGFuZ2VfbW9kZRgLIAEoDjIfLmJ5dGViYXNlLnYxLkRhdGFiYXNlQ2hhbmdlTW9kZRIgChhkaXNhbGxvd19wYXNzd29yZF9zaWduaW4YDCABKAgSIAoYZW5hYmxlX21ldHJpY19jb2xsZWN0aW9uGA0gASgIEjsKGGluYWN0aXZlX3Nlc3Npb25fdGltZW91dBgOIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbhIfChdlbmFibGVfYXVkaXRfbG9nX3N0ZG91dBgPIAEoCCKvAQoMQW5ub3VuY2VtZW50EjMKBWxldmVsGAEgASgOMiQuYnl0ZWJhc2UudjEuQW5ub3VuY2VtZW50LkFsZXJ0TGV2ZWwSDAoEdGV4dBgCIAEoCRIMCgRsaW5rGAMgASgJIk4KCkFsZXJ0TGV2ZWwSGwoXQUxFUlRfTEVWRUxfVU5TUEVDSUZJRUQQABIICgRJTkZPEAESCwoHV0FSTklORxACEgwKCENSSVRJQ0FMEAMi5wIKGFdvcmtzcGFjZUFwcHJvdmFsU2V0dGluZxI5CgVydWxlcxgBIAMoCzIqLmJ5dGViYXNlLnYxLldvcmtzcGFjZUFwcHJvdmFsU2V0dGluZy5SdWxlGo8CCgRSdWxlEi8KCHRlbXBsYXRlGAEgASgLMh0uYnl0ZWJhc2UudjEuQXBwcm92YWxUZW1wbGF0ZRIkCgljb25kaXRpb24YAiABKAsyES5nb29nbGUudHlwZS5FeHByEkEKBnNvdXJjZRgDIAEoDjIxLmJ5dGViYXNlLnYxLldvcmtzcGFjZUFwcHJvdmFsU2V0dGluZy5SdWxlLlNvdXJjZSJtCgZTb3VyY2USFgoSU09VUkNFX1VOU1BFQ0lGSUVEEAASEwoPQ0hBTkdFX0RBVEFCQVNFEAESEwoPQ1JFQVRFX0RBVEFCQVNFEAISDwoLRVhQT1JUX0RBVEEQAxIQCgxSRVFVRVNUX1JPTEUQBCKYBQoZRGF0YUNsYXNzaWZpY2F0aW9uU2V0dGluZxJQCgdjb25maWdzGAEgAygLMj8uYnl0ZWJhc2UudjEuRGF0YUNsYXNzaWZpY2F0aW9uU2V0dGluZy5EYXRhQ2xhc3NpZmljYXRpb25Db25maWcaqAQKGERhdGFDbGFzc2lmaWNhdGlvbkNvbmZpZxIKCgJpZBgBIAEoCRINCgV0aXRsZRgCIAEoCRJVCgZsZXZlbHMYAyADKAsyRS5ieXRlYmFzZS52MS5EYXRhQ2xhc3NpZmljYXRpb25TZXR0aW5nLkRhdGFDbGFzc2lmaWNhdGlvbkNvbmZpZy5MZXZlbBJrCg5jbGFzc2lmaWNhdGlvbhgEIAMoCzJTLmJ5dGViYXNlLnYxLkRhdGFDbGFzc2lmaWNhdGlvblNldHRpbmcuRGF0YUNsYXNzaWZpY2F0aW9uQ29uZmlnLkNsYXNzaWZpY2F0aW9uRW50cnkaNwoFTGV2ZWwSCgoCaWQYASABKAkSDQoFdGl0bGUYAiABKAkSEwoLZGVzY3JpcHRpb24YAyABKAkaaAoSRGF0YUNsYXNzaWZpY2F0aW9uEgoKAmlkGAEgASgJEg0KBXRpdGxlGAIgASgJEhMKC2Rlc2NyaXB0aW9uGAMgASgJEhUKCGxldmVsX2lkGAQgASgJSACIAQFCCwoJX2xldmVsX2lkGokBChNDbGFzc2lmaWNhdGlvbkVudHJ5EgsKA2tleRgBIAEoCRJhCgV2YWx1ZRgCIAEoCzJSLmJ5dGViYXNlLnYxLkRhdGFDbGFzc2lmaWNhdGlvblNldHRpbmcuRGF0YUNsYXNzaWZpY2F0aW9uQ29uZmlnLkRhdGFDbGFzc2lmaWNhdGlvbjoCOAEizAEKE1NlbWFudGljVHlwZVNldHRpbmcSPAoFdHlwZXMYASADKAsyLS5ieXRlYmFzZS52MS5TZW1hbnRpY1R5cGVTZXR0aW5nLlNlbWFudGljVHlwZRp3CgxTZW1hbnRpY1R5cGUSCgoCaWQYASABKAkSDQoFdGl0bGUYAiABKAkSEwoLZGVzY3JpcHRpb24YAyABKAkSKQoJYWxnb3JpdGhtGAYgASgLMhYuYnl0ZWJhc2UudjEuQWxnb3JpdGhtEgwKBGljb24YByABKAki/wQKCUFsZ29yaXRobRI0CglmdWxsX21hc2sYBSABKAsyHy5ieXRlYmFzZS52MS5BbGdvcml0aG0uRnVsbE1hc2tIABI2CgpyYW5nZV9tYXNrGAYgASgLMiAuYnl0ZWJhc2UudjEuQWxnb3JpdGhtLlJhbmdlTWFza0gAEjIKCG1kNV9tYXNrGAcgASgLMh4uYnl0ZWJhc2UudjEuQWxnb3JpdGhtLk1ENU1hc2tIABJBChBpbm5lcl9vdXRlcl9tYXNrGAggASgLMiUuYnl0ZWJhc2UudjEuQWxnb3JpdGhtLklubmVyT3V0ZXJNYXNrSAAaIAoIRnVsbE1hc2sSFAoMc3Vic3RpdHV0aW9uGAEgASgJGn4KCVJhbmdlTWFzaxI2CgZzbGljZXMYASADKAsyJi5ieXRlYmFzZS52MS5BbGdvcml0aG0uUmFuZ2VNYXNrLlNsaWNlGjkKBVNsaWNlEg0KBXN0YXJ0GAEgASgFEgsKA2VuZBgCIAEoBRIUCgxzdWJzdGl0dXRpb24YAyABKAkaFwoHTUQ1TWFzaxIMCgRzYWx0GAEgASgJGskBCg5Jbm5lck91dGVyTWFzaxISCgpwcmVmaXhfbGVuGAEgASgFEhIKCnN1ZmZpeF9sZW4YAiABKAUSPAoEdHlwZRgDIAEoDjIuLmJ5dGViYXNlLnYxLkFsZ29yaXRobS5Jbm5lck91dGVyTWFzay5NYXNrVHlwZRIUCgxzdWJzdGl0dXRpb24YBCABKAkiOwoITWFza1R5cGUSGQoVTUFTS19UWVBFX1VOU1BFQ0lGSUVEEAASCQoFSU5ORVIQARIJCgVPVVRFUhACQgYKBG1hc2siHAoLU0NJTVNldHRpbmcSDQoFdG9rZW4YASABKAkiiwIKGlBhc3N3b3JkUmVzdHJpY3Rpb25TZXR0aW5nEhIKCm1pbl9sZW5ndGgYASABKAUSFgoOcmVxdWlyZV9udW1iZXIYAiABKAgSFgoOcmVxdWlyZV9sZXR0ZXIYAyABKAgSIAoYcmVxdWlyZV91cHBlcmNhc2VfbGV0dGVyGAQgASgIEiEKGXJlcXVpcmVfc3BlY2lhbF9jaGFyYWN0ZXIYBSABKAgSLgomcmVxdWlyZV9yZXNldF9wYXNzd29yZF9mb3JfZmlyc3RfbG9naW4YBiABKAgSNAoRcGFzc3dvcmRfcm90YXRpb24YByABKAsyGS5nb29nbGUucHJvdG9idWYuRHVyYXRpb24i7wEKCUFJU2V0dGluZxIPCgdlbmFibGVkGAEgASgIEjEKCHByb3ZpZGVyGAIgASgOMh8uYnl0ZWJhc2UudjEuQUlTZXR0aW5nLlByb3ZpZGVyEhAKCGVuZHBvaW50GAMgASgJEg8KB2FwaV9rZXkYBCABKAkSDQoFbW9kZWwYBSABKAkSDwoHdmVyc2lvbhgGIAEoCSJbCghQcm92aWRlchIYChRQUk9WSURFUl9VTlNQRUNJRklFRBAAEgsKB09QRU5fQUkQARIKCgZDTEFVREUQAhIKCgZHRU1JTkkQAxIQCgxBWlVSRV9PUEVOQUkQBCKWAgoSRW52aXJvbm1lbnRTZXR0aW5nEkEKDGVudmlyb25tZW50cxgBIAMoCzIrLmJ5dGViYXNlLnYxLkVudmlyb25tZW50U2V0dGluZy5FbnZpcm9ubWVudBq8AQoLRW52aXJvbm1lbnQSEQoEbmFtZRgBIAEoCUID4EEDEgoKAmlkGAIgASgJEg0KBXRpdGxlGAMgASgJEkMKBHRhZ3MYBCADKAsyNS5ieXRlYmFzZS52MS5FbnZpcm9ubWVudFNldHRpbmcuRW52aXJvbm1lbnQuVGFnc0VudHJ5Eg0KBWNvbG9yGAUgASgJGisKCVRhZ3NFbnRyeRILCgNrZXkYASABKAkSDQoFdmFsdWUYAiABKAk6AjgBKlQKEkRhdGFiYXNlQ2hhbmdlTW9kZRIkCiBEQVRBQkFTRV9DSEFOR0VfTU9ERV9VTlNQRUNJRklFRBAAEgwKCFBJUEVMSU5FEAESCgoGRURJVE9SEAIyrgMKDlNldHRpbmdTZXJ2aWNlEoQBCgxMaXN0U2V0dGluZ3MSIC5ieXRlYmFzZS52MS5MaXN0U2V0dGluZ3NSZXF1ZXN0GiEuYnl0ZWJhc2UudjEuTGlzdFNldHRpbmdzUmVzcG9uc2UiL9pBAIrqMBBiYi5zZXR0aW5ncy5saXN0kOowAYLT5JMCDhIML3YxL3NldHRpbmdzEn8KCkdldFNldHRpbmcSHi5ieXRlYmFzZS52MS5HZXRTZXR0aW5nUmVxdWVzdBoULmJ5dGViYXNlLnYxLlNldHRpbmciO9pBBG5hbWWK6jAPYmIuc2V0dGluZ3MuZ2V0kOowAYLT5JMCFxIVL3YxL3tuYW1lPXNldHRpbmdzLyp9EpMBCg1VcGRhdGVTZXR0aW5nEiEuYnl0ZWJhc2UudjEuVXBkYXRlU2V0dGluZ1JlcXVlc3QaFC5ieXRlYmFzZS52MS5TZXR0aW5nIkmK6jAPYmIuc2V0dGluZ3Muc2V0kOowAZjqMAGC0+STAig6B3NldHRpbmcyHS92MS97c2V0dGluZy5uYW1lPXNldHRpbmdzLyp9QqkBCg9jb20uYnl0ZWJhc2UudjFCE1NldHRpbmdTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_duration, file_google_protobuf_field_mask, file_google_type_expr, file_v1_annotation, file_v1_issue_service, file_v1_project_service]);+ fileDesc("Chh2MS9zZXR0aW5nX3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIhUKE0xpc3RTZXR0aW5nc1JlcXVlc3QiPgoUTGlzdFNldHRpbmdzUmVzcG9uc2USJgoIc2V0dGluZ3MYASADKAsyFC5ieXRlYmFzZS52MS5TZXR0aW5nIj8KEUdldFNldHRpbmdSZXF1ZXN0EioKBG5hbWUYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1NldHRpbmciOwoSR2V0U2V0dGluZ1Jlc3BvbnNlEiUKB3NldHRpbmcYASABKAsyFC5ieXRlYmFzZS52MS5TZXR0aW5nIqEBChRVcGRhdGVTZXR0aW5nUmVxdWVzdBIqCgdzZXR0aW5nGAEgASgLMhQuYnl0ZWJhc2UudjEuU2V0dGluZ0ID4EECEhUKDXZhbGlkYXRlX29ubHkYAiABKAgSFQoNYWxsb3dfbWlzc2luZxgDIAEoCBIvCgt1cGRhdGVfbWFzaxgEIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2sizQIKB1NldHRpbmcSEQoEbmFtZRgBIAEoCUID4EEIEi0KBXZhbHVlGAIgASgLMhkuYnl0ZWJhc2UudjEuU2V0dGluZ1ZhbHVlQgPgQQIi0AEKC1NldHRpbmdOYW1lEhwKGFNFVFRJTkdfTkFNRV9VTlNQRUNJRklFRBAAEhUKEVdPUktTUEFDRV9QUk9GSUxFEAQSFgoSV09SS1NQQUNFX0FQUFJPVkFMEAUSCgoGQVBQX0lNEAgSBgoCQUkQChIXChNEQVRBX0NMQVNTSUZJQ0FUSU9OEA4SEgoOU0VNQU5USUNfVFlQRVMQDxIICgRTQ0lNEBESGAoUUEFTU1dPUkRfUkVTVFJJQ1RJT04QEhIPCgtFTlZJUk9OTUVOVBATOi3qQSoKFGJ5dGViYXNlLmNvbS9TZXR0aW5nEhJzZXR0aW5ncy97c2V0dGluZ30itwQKDFNldHRpbmdWYWx1ZRIWCgxzdHJpbmdfdmFsdWUYASABKAlIABIrCgZhcHBfaW0YAyABKAsyGS5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmdIABJBChF3b3Jrc3BhY2VfcHJvZmlsZRgFIAEoCzIkLmJ5dGViYXNlLnYxLldvcmtzcGFjZVByb2ZpbGVTZXR0aW5nSAASQwoSd29ya3NwYWNlX2FwcHJvdmFsGAYgASgLMiUuYnl0ZWJhc2UudjEuV29ya3NwYWNlQXBwcm92YWxTZXR0aW5nSAASRQoTZGF0YV9jbGFzc2lmaWNhdGlvbhgKIAEoCzImLmJ5dGViYXNlLnYxLkRhdGFDbGFzc2lmaWNhdGlvblNldHRpbmdIABI5Cg1zZW1hbnRpY190eXBlGAsgASgLMiAuYnl0ZWJhc2UudjEuU2VtYW50aWNUeXBlU2V0dGluZ0gAEigKBHNjaW0YDiABKAsyGC5ieXRlYmFzZS52MS5TQ0lNU2V0dGluZ0gAEkcKFHBhc3N3b3JkX3Jlc3RyaWN0aW9uGA8gASgLMicuYnl0ZWJhc2UudjEuUGFzc3dvcmRSZXN0cmljdGlvblNldHRpbmdIABIkCgJhaRgQIAEoCzIWLmJ5dGViYXNlLnYxLkFJU2V0dGluZ0gAEjYKC2Vudmlyb25tZW50GBEgASgLMh8uYnl0ZWJhc2UudjEuRW52aXJvbm1lbnRTZXR0aW5nSABCBwoFdmFsdWUivQYKDEFwcElNU2V0dGluZxI1CghzZXR0aW5ncxgBIAMoCzIjLmJ5dGViYXNlLnYxLkFwcElNU2V0dGluZy5JTVNldHRpbmcaGwoFU2xhY2sSEgoFdG9rZW4YASABKAlCA+BBBBo2CgZGZWlzaHUSEwoGYXBwX2lkGAEgASgJQgPgQQQSFwoKYXBwX3NlY3JldBgCIAEoCUID4EEEGkkKBVdlY29tEhQKB2NvcnBfaWQYASABKAlCA+BBBBIVCghhZ2VudF9pZBgCIAEoCUID4EEEEhMKBnNlY3JldBgDIAEoCUID4EEEGjQKBExhcmsSEwoGYXBwX2lkGAEgASgJQgPgQQQSFwoKYXBwX3NlY3JldBgCIAEoCUID4EEEGlcKCERpbmdUYWxrEhYKCWNsaWVudF9pZBgBIAEoCUID4EEEEhoKDWNsaWVudF9zZWNyZXQYAiABKAlCA+BBBBIXCgpyb2JvdF9jb2RlGAMgASgJQgPgQQQaUwoFVGVhbXMSFgoJdGVuYW50X2lkGAEgASgJQgPgQQQSFgoJY2xpZW50X2lkGAIgASgJQgPgQQQSGgoNY2xpZW50X3NlY3JldBgDIAEoCUID4EEEGvECCglJTVNldHRpbmcSJwoEdHlwZRgBIAEoDjIZLmJ5dGViYXNlLnYxLldlYmhvb2suVHlwZRIwCgVzbGFjaxgCIAEoCzIfLmJ5dGViYXNlLnYxLkFwcElNU2V0dGluZy5TbGFja0gAEjIKBmZlaXNodRgDIAEoCzIgLmJ5dGViYXNlLnYxLkFwcElNU2V0dGluZy5GZWlzaHVIABIwCgV3ZWNvbRgEIAEoCzIfLmJ5dGViYXNlLnYxLkFwcElNU2V0dGluZy5XZWNvbUgAEi4KBGxhcmsYBSABKAsyHi5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmcuTGFya0gAEjYKCGRpbmd0YWxrGAYgASgLMiIuYnl0ZWJhc2UudjEuQXBwSU1TZXR0aW5nLkRpbmdUYWxrSAASMAoFdGVhbXMYByABKAsyHy5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmcuVGVhbXNIAEIJCgdwYXlsb2FkIroEChdXb3Jrc3BhY2VQcm9maWxlU2V0dGluZxIUCgxleHRlcm5hbF91cmwYASABKAkSFwoPZGlzYWxsb3dfc2lnbnVwGAIgASgIEhMKC3JlcXVpcmVfMmZhGAMgASgIEjEKDnRva2VuX2R1cmF0aW9uGAYgASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uEi8KDGFubm91bmNlbWVudBgHIAEoCzIZLmJ5dGViYXNlLnYxLkFubm91bmNlbWVudBI6ChdtYXhpbXVtX3JvbGVfZXhwaXJhdGlvbhgIIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbhIPCgdkb21haW5zGAkgAygJEh8KF2VuZm9yY2VfaWRlbnRpdHlfZG9tYWluGAogASgIEj0KFGRhdGFiYXNlX2NoYW5nZV9tb2RlGAsgASgOMh8uYnl0ZWJhc2UudjEuRGF0YWJhc2VDaGFuZ2VNb2RlEiAKGGRpc2FsbG93X3Bhc3N3b3JkX3NpZ25pbhgMIAEoCBIgChhlbmFibGVfbWV0cmljX2NvbGxlY3Rpb24YDSABKAgSOwoYaW5hY3RpdmVfc2Vzc2lvbl90aW1lb3V0GA4gASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uEh8KF2VuYWJsZV9hdWRpdF9sb2dfc3Rkb3V0GA8gASgIEhUKDWJyYW5kaW5nX2xvZ28YECABKAwSEQoJd2F0ZXJtYXJrGBEgASgIIq8BCgxBbm5vdW5jZW1lbnQSMwoFbGV2ZWwYASABKA4yJC5ieXRlYmFzZS52MS5Bbm5vdW5jZW1lbnQuQWxlcnRMZXZlbBIMCgR0ZXh0GAIgASgJEgwKBGxpbmsYAyABKAkiTgoKQWxlcnRMZXZlbBIbChdBTEVSVF9MRVZFTF9VTlNQRUNJRklFRBAAEggKBElORk8QARILCgdXQVJOSU5HEAISDAoIQ1JJVElDQUwQAyLnAgoYV29ya3NwYWNlQXBwcm92YWxTZXR0aW5nEjkKBXJ1bGVzGAEgAygLMiouYnl0ZWJhc2UudjEuV29ya3NwYWNlQXBwcm92YWxTZXR0aW5nLlJ1bGUajwIKBFJ1bGUSLwoIdGVtcGxhdGUYASABKAsyHS5ieXRlYmFzZS52MS5BcHByb3ZhbFRlbXBsYXRlEiQKCWNvbmRpdGlvbhgCIAEoCzIRLmdvb2dsZS50eXBlLkV4cHISQQoGc291cmNlGAMgASgOMjEuYnl0ZWJhc2UudjEuV29ya3NwYWNlQXBwcm92YWxTZXR0aW5nLlJ1bGUuU291cmNlIm0KBlNvdXJjZRIWChJTT1VSQ0VfVU5TUEVDSUZJRUQQABITCg9DSEFOR0VfREFUQUJBU0UQARITCg9DUkVBVEVfREFUQUJBU0UQAhIPCgtFWFBPUlRfREFUQRADEhAKDFJFUVVFU1RfUk9MRRAEIpgFChlEYXRhQ2xhc3NpZmljYXRpb25TZXR0aW5nElAKB2NvbmZpZ3MYASADKAsyPy5ieXRlYmFzZS52MS5EYXRhQ2xhc3NpZmljYXRpb25TZXR0aW5nLkRhdGFDbGFzc2lmaWNhdGlvbkNvbmZpZxqoBAoYRGF0YUNsYXNzaWZpY2F0aW9uQ29uZmlnEgoKAmlkGAEgASgJEg0KBXRpdGxlGAIgASgJElUKBmxldmVscxgDIAMoCzJFLmJ5dGViYXNlLnYxLkRhdGFDbGFzc2lmaWNhdGlvblNldHRpbmcuRGF0YUNsYXNzaWZpY2F0aW9uQ29uZmlnLkxldmVsEmsKDmNsYXNzaWZpY2F0aW9uGAQgAygLMlMuYnl0ZWJhc2UudjEuRGF0YUNsYXNzaWZpY2F0aW9uU2V0dGluZy5EYXRhQ2xhc3NpZmljYXRpb25Db25maWcuQ2xhc3NpZmljYXRpb25FbnRyeRo3CgVMZXZlbBIKCgJpZBgBIAEoCRINCgV0aXRsZRgCIAEoCRITCgtkZXNjcmlwdGlvbhgDIAEoCRpoChJEYXRhQ2xhc3NpZmljYXRpb24SCgoCaWQYASABKAkSDQoFdGl0bGUYAiABKAkSEwoLZGVzY3JpcHRpb24YAyABKAkSFQoIbGV2ZWxfaWQYBCABKAlIAIgBAUILCglfbGV2ZWxfaWQaiQEKE0NsYXNzaWZpY2F0aW9uRW50cnkSCwoDa2V5GAEgASgJEmEKBXZhbHVlGAIgASgLMlIuYnl0ZWJhc2UudjEuRGF0YUNsYXNzaWZpY2F0aW9uU2V0dGluZy5EYXRhQ2xhc3NpZmljYXRpb25Db25maWcuRGF0YUNsYXNzaWZpY2F0aW9uOgI4ASLMAQoTU2VtYW50aWNUeXBlU2V0dGluZxI8CgV0eXBlcxgBIAMoCzItLmJ5dGViYXNlLnYxLlNlbWFudGljVHlwZVNldHRpbmcuU2VtYW50aWNUeXBlGncKDFNlbWFudGljVHlwZRIKCgJpZBgBIAEoCRINCgV0aXRsZRgCIAEoCRITCgtkZXNjcmlwdGlvbhgDIAEoCRIpCglhbGdvcml0aG0YBiABKAsyFi5ieXRlYmFzZS52MS5BbGdvcml0aG0SDAoEaWNvbhgHIAEoCSL/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.diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yamlindex fc3f90b335..260e3d3fd0 100644--- a/proto/gen/grpc-doc/openapi.yaml+++ b/proto/gen/grpc-doc/openapi.yaml@@ -13970,6 +13970,17 @@ components:description: |-Whether to enable audit logging to stdout in structured JSON format.Requires TEAM or ENTERPRISE license.+ brandingLogo:+ type: string+ description: |-+ The branding logo as raw bytes.+ Requires ENTERPRISE license with custom logo feature.+ format: bytes+ watermark:+ type: boolean+ description: |-+ Whether to show watermark.+ Requires ENTERPRISE license with watermark feature.tags:- name: ActuatorServicedescription: ActuatorService manages system health and operational information.diff --git a/proto/gen/grpc-doc/store/README.md b/proto/gen/grpc-doc/store/README.mdindex 97162297d5..1202aca501 100644--- a/proto/gen/grpc-doc/store/README.md+++ b/proto/gen/grpc-doc/store/README.md@@ -4637,6 +4637,8 @@ ISSUE_CREATE represents creating an issue. || enable_metric_collection | [bool](#bool) | | Whether to enable metric collection for the workspace. || inactive_session_timeout | [google.protobuf.Duration](#google-protobuf-Duration) | | The session expiration time if not activity detected for the user. Value <= 0 means no limit. || enable_audit_log_stdout | [bool](#bool) | | Whether to enable audit logging to stdout in structured JSON format. Requires TEAM or ENTERPRISE license. |+| branding_logo | [bytes](#bytes) | | The branding logo as raw bytes. Requires ENTERPRISE license with custom logo feature. |+| watermark | [bool](#bool) | | Whether to show watermark. Requires ENTERPRISE license with watermark feature. |@@ -4709,13 +4711,11 @@ We support three levels of AlertLevel: INFO, WARNING, and ERROR.| ---- | ------ | ----------- || SETTING_NAME_UNSPECIFIED | 0 | || AUTH_SECRET | 1 | |-| BRANDING_LOGO | 2 | || WORKSPACE_ID | 3 | || WORKSPACE_PROFILE | 4 | || WORKSPACE_APPROVAL | 5 | || ENTERPRISE_LICENSE | 7 | || APP_IM | 8 | |-| WATERMARK | 9 | || AI | 10 | || DATA_CLASSIFICATION | 14 | || SEMANTIC_TYPES | 15 | |diff --git a/proto/gen/grpc-doc/store/index.html b/proto/gen/grpc-doc/store/index.htmlindex 3aff110109..0737ad5bd4 100644--- a/proto/gen/grpc-doc/store/index.html+++ b/proto/gen/grpc-doc/store/index.html@@ -12219,6 +12219,22 @@ are /[a-z][0-9]-/. </p></td>Requires TEAM or ENTERPRISE license. </p></td></tr>+ <tr>+ <td>branding_logo</td>+ <td><a href="#bytes">bytes</a></td>+ <td></td>+ <td><p>The branding logo as raw bytes.+Requires ENTERPRISE license with custom logo feature. </p></td>+ </tr>++ <tr>+ <td>watermark</td>+ <td><a href="#bool">bool</a></td>+ <td></td>+ <td><p>Whether to show watermark.+Requires ENTERPRISE license with watermark feature. </p></td>+ </tr>+</tbody></table>@@ -12383,12 +12399,6 @@ Default to this mode.</p></td><td><p></p></td></tr>- <tr>- <td>BRANDING_LOGO</td>- <td>2</td>- <td><p></p></td>- </tr>-<tr><td>WORKSPACE_ID</td><td>3</td>@@ -12419,12 +12429,6 @@ Default to this mode.</p></td><td><p></p></td></tr>- <tr>- <td>WATERMARK</td>- <td>9</td>- <td><p></p></td>- </tr>-<tr><td>AI</td><td>10</td>diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.mdindex 87edc8648e..6452dc4c6a 100644--- a/proto/gen/grpc-doc/v1/README.md+++ b/proto/gen/grpc-doc/v1/README.md@@ -2822,6 +2822,8 @@ For examples: resource.environment_id == "prod" && statement.aff| enable_metric_collection | [bool](#bool) | | Whether to enable metric collection for the workspace. || inactive_session_timeout | [google.protobuf.Duration](#google-protobuf-Duration) | | The session expiration time if not activity detected for the user. Value <= 0 means no limit. || enable_audit_log_stdout | [bool](#bool) | | Whether to enable audit logging to stdout in structured JSON format. Requires TEAM or ENTERPRISE license. |+| branding_logo | [bytes](#bytes) | | The branding logo as raw bytes. Requires ENTERPRISE license with custom logo feature. |+| watermark | [bool](#bool) | | Whether to show watermark. Requires ENTERPRISE license with watermark feature. |@@ -2893,11 +2895,9 @@ We support three levels of AlertLevel: INFO, WARNING, and ERROR.| Name | Number | Description || ---- | ------ | ----------- || SETTING_NAME_UNSPECIFIED | 0 | |-| BRANDING_LOGO | 2 | || WORKSPACE_PROFILE | 4 | || WORKSPACE_APPROVAL | 5 | || APP_IM | 8 | |-| WATERMARK | 9 | || AI | 10 | || DATA_CLASSIFICATION | 14 | || SEMANTIC_TYPES | 15 | |diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.htmlindex b78e637ff2..0cbeb2bb2a 100644--- a/proto/gen/grpc-doc/v1/index.html+++ b/proto/gen/grpc-doc/v1/index.html@@ -8293,6 +8293,22 @@ resource.table_name.matches("sensitive_.*") && resource.db_enginRequires TEAM or ENTERPRISE license. </p></td></tr>+ <tr>+ <td>branding_logo</td>+ <td><a href="#bytes">bytes</a></td>+ <td></td>+ <td><p>The branding logo as raw bytes.+Requires ENTERPRISE license with custom logo feature. </p></td>+ </tr>++ <tr>+ <td>watermark</td>+ <td><a href="#bool">bool</a></td>+ <td></td>+ <td><p>Whether to show watermark.+Requires ENTERPRISE license with watermark feature. </p></td>+ </tr>+</tbody></table>@@ -8451,12 +8467,6 @@ Default to this mode.</p></td><td><p></p></td></tr>- <tr>- <td>BRANDING_LOGO</td>- <td>2</td>- <td><p></p></td>- </tr>-<tr><td>WORKSPACE_PROFILE</td><td>4</td>@@ -8475,12 +8485,6 @@ Default to this mode.</p></td><td><p></p></td></tr>- <tr>- <td>WATERMARK</td>- <td>9</td>- <td><p></p></td>- </tr>-<tr><td>AI</td><td>10</td>diff --git a/proto/store/store/setting.proto b/proto/store/store/setting.protoindex efe72eea9d..b3410e6204 100644--- a/proto/store/store/setting.proto+++ b/proto/store/store/setting.proto@@ -10,19 +10,13 @@ import "store/project_webhook.proto";option go_package = "generated-go/store";enum SettingName {- reserved 16;- reserved 6; // was WORKSPACE_EXTERNAL_APPROVAL- reserved 13; // was SCHEMA_TEMPLATE-SETTING_NAME_UNSPECIFIED = 0;AUTH_SECRET = 1;- BRANDING_LOGO = 2;WORKSPACE_ID = 3;WORKSPACE_PROFILE = 4;WORKSPACE_APPROVAL = 5;ENTERPRISE_LICENSE = 7;APP_IM = 8;- WATERMARK = 9;AI = 10;DATA_CLASSIFICATION = 14;SEMANTIC_TYPES = 15;@@ -71,6 +65,14 @@ message WorkspaceProfileSetting {// Whether to enable audit logging to stdout in structured JSON format.// Requires TEAM or ENTERPRISE license.bool enable_audit_log_stdout = 15;++ // The branding logo as raw bytes.+ // Requires ENTERPRISE license with custom logo feature.+ bytes branding_logo = 16;++ // Whether to show watermark.+ // Requires ENTERPRISE license with watermark feature.+ bool watermark = 17;}message Announcement {diff --git a/proto/v1/v1/setting_service.proto b/proto/v1/v1/setting_service.protoindex bc13651f2c..b4cee22e16 100644--- a/proto/v1/v1/setting_service.proto+++ b/proto/v1/v1/setting_service.proto@@ -92,11 +92,9 @@ message Setting {enum SettingName {SETTING_NAME_UNSPECIFIED = 0;- BRANDING_LOGO = 2;WORKSPACE_PROFILE = 4;WORKSPACE_APPROVAL = 5;APP_IM = 8;- WATERMARK = 9;AI = 10;DATA_CLASSIFICATION = 14;SEMANTIC_TYPES = 15;@@ -217,6 +215,14 @@ message WorkspaceProfileSetting {// Whether to enable audit logging to stdout in structured JSON format.// Requires TEAM or ENTERPRISE license.bool enable_audit_log_stdout = 15;++ // The branding logo as raw bytes.+ // Requires ENTERPRISE license with custom logo feature.+ bytes branding_logo = 16;++ // Whether to show watermark.+ // Requires ENTERPRISE license with watermark feature.+ bool watermark = 17;}message Announcement {