Skip to content

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

docs: add approval source consolidation design plan (#18275)

p0nyc034aff3ab56
diff --git a/backend/generated-go/store/setting.pb.go b/backend/generated-go/store/setting.pb.go
index c6289ba387..c743aa68cb 100644
--- a/backend/generated-go/store/setting.pb.go
+++ b/backend/generated-go/store/setting.pb.go
@@ -223,30 +223,27 @@ type WorkspaceApprovalSetting_Rule_Source int32
const (
WorkspaceApprovalSetting_Rule_SOURCE_UNSPECIFIED WorkspaceApprovalSetting_Rule_Source = 0
- WorkspaceApprovalSetting_Rule_DDL WorkspaceApprovalSetting_Rule_Source = 1
- WorkspaceApprovalSetting_Rule_DML WorkspaceApprovalSetting_Rule_Source = 2
- WorkspaceApprovalSetting_Rule_CREATE_DATABASE WorkspaceApprovalSetting_Rule_Source = 3
- WorkspaceApprovalSetting_Rule_EXPORT_DATA WorkspaceApprovalSetting_Rule_Source = 4
- WorkspaceApprovalSetting_Rule_REQUEST_ROLE WorkspaceApprovalSetting_Rule_Source = 5
+ WorkspaceApprovalSetting_Rule_CHANGE_DATABASE WorkspaceApprovalSetting_Rule_Source = 1
+ WorkspaceApprovalSetting_Rule_CREATE_DATABASE WorkspaceApprovalSetting_Rule_Source = 2
+ WorkspaceApprovalSetting_Rule_EXPORT_DATA WorkspaceApprovalSetting_Rule_Source = 3
+ WorkspaceApprovalSetting_Rule_REQUEST_ROLE WorkspaceApprovalSetting_Rule_Source = 4
)
// Enum value maps for WorkspaceApprovalSetting_Rule_Source.
var (
WorkspaceApprovalSetting_Rule_Source_name = map[int32]string{
0: "SOURCE_UNSPECIFIED",
- 1: "DDL",
- 2: "DML",
- 3: "CREATE_DATABASE",
- 4: "EXPORT_DATA",
- 5: "REQUEST_ROLE",
+ 1: "CHANGE_DATABASE",
+ 2: "CREATE_DATABASE",
+ 3: "EXPORT_DATA",
+ 4: "REQUEST_ROLE",
}
WorkspaceApprovalSetting_Rule_Source_value = map[string]int32{
"SOURCE_UNSPECIFIED": 0,
- "DDL": 1,
- "DML": 2,
- "CREATE_DATABASE": 3,
- "EXPORT_DATA": 4,
- "REQUEST_ROLE": 5,
+ "CHANGE_DATABASE": 1,
+ "CREATE_DATABASE": 2,
+ "EXPORT_DATA": 3,
+ "REQUEST_ROLE": 4,
}
)
@@ -2550,20 +2547,19 @@ const file_store_setting_proto_rawDesc = "" +
"\x17ALERT_LEVEL_UNSPECIFIED\x10\x00\x12\x14\n" +
"\x10ALERT_LEVEL_INFO\x10\x01\x12\x17\n" +
"\x13ALERT_LEVEL_WARNING\x10\x02\x12\x18\n" +
- "\x14ALERT_LEVEL_CRITICAL\x10\x03\"\x91\x03\n" +
+ "\x14ALERT_LEVEL_CRITICAL\x10\x03\"\x94\x03\n" +
"\x18WorkspaceApprovalSetting\x12C\n" +
- "\x05rules\x18\x01 \x03(\v2-.bytebase.store.WorkspaceApprovalSetting.RuleR\x05rules\x1a\xaf\x02\n" +
+ "\x05rules\x18\x01 \x03(\v2-.bytebase.store.WorkspaceApprovalSetting.RuleR\x05rules\x1a\xb2\x02\n" +
"\x04Rule\x12<\n" +
"\btemplate\x18\x01 \x01(\v2 .bytebase.store.ApprovalTemplateR\btemplate\x12/\n" +
"\tcondition\x18\x02 \x01(\v2\x11.google.type.ExprR\tcondition\x12L\n" +
- "\x06source\x18\x03 \x01(\x0e24.bytebase.store.WorkspaceApprovalSetting.Rule.SourceR\x06source\"j\n" +
+ "\x06source\x18\x03 \x01(\x0e24.bytebase.store.WorkspaceApprovalSetting.Rule.SourceR\x06source\"m\n" +
"\x06Source\x12\x16\n" +
- "\x12SOURCE_UNSPECIFIED\x10\x00\x12\a\n" +
- "\x03DDL\x10\x01\x12\a\n" +
- "\x03DML\x10\x02\x12\x13\n" +
- "\x0fCREATE_DATABASE\x10\x03\x12\x0f\n" +
- "\vEXPORT_DATA\x10\x04\x12\x10\n" +
- "\fREQUEST_ROLE\x10\x05\"\xd0\x06\n" +
+ "\x12SOURCE_UNSPECIFIED\x10\x00\x12\x13\n" +
+ "\x0fCHANGE_DATABASE\x10\x01\x12\x13\n" +
+ "\x0fCREATE_DATABASE\x10\x02\x12\x0f\n" +
+ "\vEXPORT_DATA\x10\x03\x12\x10\n" +
+ "\fREQUEST_ROLE\x10\x04\"\xd0\x06\n" +
"\x15SchemaTemplateSetting\x12\\\n" +
"\x0ffield_templates\x18\x01 \x03(\v23.bytebase.store.SchemaTemplateSetting.FieldTemplateR\x0efieldTemplates\x12S\n" +
"\fcolumn_types\x18\x02 \x03(\v20.bytebase.store.SchemaTemplateSetting.ColumnTypeR\vcolumnTypes\x12\\\n" +
diff --git a/backend/generated-go/v1/setting_service.pb.go b/backend/generated-go/v1/setting_service.pb.go
index 4f495b5105..8398240bc2 100644
--- a/backend/generated-go/v1/setting_service.pb.go
+++ b/backend/generated-go/v1/setting_service.pb.go
@@ -225,30 +225,27 @@ type WorkspaceApprovalSetting_Rule_Source int32
const (
WorkspaceApprovalSetting_Rule_SOURCE_UNSPECIFIED WorkspaceApprovalSetting_Rule_Source = 0
- WorkspaceApprovalSetting_Rule_DDL WorkspaceApprovalSetting_Rule_Source = 1
- WorkspaceApprovalSetting_Rule_DML WorkspaceApprovalSetting_Rule_Source = 2
- WorkspaceApprovalSetting_Rule_CREATE_DATABASE WorkspaceApprovalSetting_Rule_Source = 3
- WorkspaceApprovalSetting_Rule_EXPORT_DATA WorkspaceApprovalSetting_Rule_Source = 4
- WorkspaceApprovalSetting_Rule_REQUEST_ROLE WorkspaceApprovalSetting_Rule_Source = 5
+ WorkspaceApprovalSetting_Rule_CHANGE_DATABASE WorkspaceApprovalSetting_Rule_Source = 1
+ WorkspaceApprovalSetting_Rule_CREATE_DATABASE WorkspaceApprovalSetting_Rule_Source = 2
+ WorkspaceApprovalSetting_Rule_EXPORT_DATA WorkspaceApprovalSetting_Rule_Source = 3
+ WorkspaceApprovalSetting_Rule_REQUEST_ROLE WorkspaceApprovalSetting_Rule_Source = 4
)
// Enum value maps for WorkspaceApprovalSetting_Rule_Source.
var (
WorkspaceApprovalSetting_Rule_Source_name = map[int32]string{
0: "SOURCE_UNSPECIFIED",
- 1: "DDL",
- 2: "DML",
- 3: "CREATE_DATABASE",
- 4: "EXPORT_DATA",
- 5: "REQUEST_ROLE",
+ 1: "CHANGE_DATABASE",
+ 2: "CREATE_DATABASE",
+ 3: "EXPORT_DATA",
+ 4: "REQUEST_ROLE",
}
WorkspaceApprovalSetting_Rule_Source_value = map[string]int32{
"SOURCE_UNSPECIFIED": 0,
- "DDL": 1,
- "DML": 2,
- "CREATE_DATABASE": 3,
- "EXPORT_DATA": 4,
- "REQUEST_ROLE": 5,
+ "CHANGE_DATABASE": 1,
+ "CREATE_DATABASE": 2,
+ "EXPORT_DATA": 3,
+ "REQUEST_ROLE": 4,
}
)
@@ -2182,7 +2179,7 @@ type WorkspaceApprovalSetting_Rule struct {
// request.expiration_days: the role expiration days for the request, support "==", "!=", "<", "<=", ">", ">=" operations.
// request.role: the request role full name, support "==", "!=", "in [xx]", "!(in [xx])", "contains()", "matches()", "startsWith()", "endsWith()" operations.
//
- // When source is DDL/DML, support: statement.*, resource.* (excluding request.*)
+ // When source is CHANGE_DATABASE, support: statement.*, resource.* (excluding request.*)
// When source is CREATE_DATABASE, support: resource.environment_id, resource.project_id, resource.db_engine, resource.database_name
// When source is EXPORT_DATA, support: resource.environment_id, resource.project_id, resource.db_engine, resource.database_name, resource.schema_name, resource.table_name
// When source is REQUEST_ROLE, support: resource.project_id, request.expiration_days, request.role
@@ -2190,8 +2187,6 @@ type WorkspaceApprovalSetting_Rule struct {
// For examples:
// resource.environment_id == "prod" && statement.affected_rows >= 100
// resource.table_name.matches("sensitive_.*") && resource.db_engine == "MYSQL"
- //
- // Legacy format (deprecated): source == "DDL" && level == "HIGH"
Condition *expr.Expr `protobuf:"bytes,2,opt,name=condition,proto3" json:"condition,omitempty"`
Source WorkspaceApprovalSetting_Rule_Source `protobuf:"varint,3,opt,name=source,proto3,enum=bytebase.v1.WorkspaceApprovalSetting_Rule_Source" json:"source,omitempty"`
unknownFields protoimpl.UnknownFields
@@ -3206,20 +3201,19 @@ const file_v1_setting_service_proto_rawDesc = "" +
"\x17ALERT_LEVEL_UNSPECIFIED\x10\x00\x12\b\n" +
"\x04INFO\x10\x01\x12\v\n" +
"\aWARNING\x10\x02\x12\f\n" +
- "\bCRITICAL\x10\x03\"\x88\x03\n" +
+ "\bCRITICAL\x10\x03\"\x8b\x03\n" +
"\x18WorkspaceApprovalSetting\x12@\n" +
- "\x05rules\x18\x01 \x03(\v2*.bytebase.v1.WorkspaceApprovalSetting.RuleR\x05rules\x1a\xa9\x02\n" +
+ "\x05rules\x18\x01 \x03(\v2*.bytebase.v1.WorkspaceApprovalSetting.RuleR\x05rules\x1a\xac\x02\n" +
"\x04Rule\x129\n" +
"\btemplate\x18\x01 \x01(\v2\x1d.bytebase.v1.ApprovalTemplateR\btemplate\x12/\n" +
"\tcondition\x18\x02 \x01(\v2\x11.google.type.ExprR\tcondition\x12I\n" +
- "\x06source\x18\x03 \x01(\x0e21.bytebase.v1.WorkspaceApprovalSetting.Rule.SourceR\x06source\"j\n" +
+ "\x06source\x18\x03 \x01(\x0e21.bytebase.v1.WorkspaceApprovalSetting.Rule.SourceR\x06source\"m\n" +
"\x06Source\x12\x16\n" +
- "\x12SOURCE_UNSPECIFIED\x10\x00\x12\a\n" +
- "\x03DDL\x10\x01\x12\a\n" +
- "\x03DML\x10\x02\x12\x13\n" +
- "\x0fCREATE_DATABASE\x10\x03\x12\x0f\n" +
- "\vEXPORT_DATA\x10\x04\x12\x10\n" +
- "\fREQUEST_ROLE\x10\x05\"\xb2\x06\n" +
+ "\x12SOURCE_UNSPECIFIED\x10\x00\x12\x13\n" +
+ "\x0fCHANGE_DATABASE\x10\x01\x12\x13\n" +
+ "\x0fCREATE_DATABASE\x10\x02\x12\x0f\n" +
+ "\vEXPORT_DATA\x10\x03\x12\x10\n" +
+ "\fREQUEST_ROLE\x10\x04\"\xb2\x06\n" +
"\x15SchemaTemplateSetting\x12Y\n" +
"\x0ffield_templates\x18\x01 \x03(\v20.bytebase.v1.SchemaTemplateSetting.FieldTemplateR\x0efieldTemplates\x12P\n" +
"\fcolumn_types\x18\x02 \x03(\v2-.bytebase.v1.SchemaTemplateSetting.ColumnTypeR\vcolumnTypes\x12Y\n" +
diff --git a/backend/migrator/migration/3.13/0006##approval_source_consolidation.sql b/backend/migrator/migration/3.13/0006##approval_source_consolidation.sql
new file mode 100644
index 0000000000..f7602b564d
--- /dev/null
+++ b/backend/migrator/migration/3.13/0006##approval_source_consolidation.sql
@@ -0,0 +1,51 @@
+-- Consolidate DDL and DML approval sources into CHANGE_DATABASE.
+-- Preserve backward compatibility by encoding DDL/DML distinction into CEL conditions.
+
+UPDATE setting
+SET value = (
+ SELECT jsonb_set(
+ value::jsonb,
+ '{rules}',
+ (
+ -- DDL rules: rename to CHANGE_DATABASE and add DDL condition filter
+ SELECT COALESCE(jsonb_agg(
+ jsonb_set(
+ jsonb_set(rule, '{source}', '"CHANGE_DATABASE"'),
+ '{condition,expression}',
+ to_jsonb(
+ CASE
+ WHEN COALESCE(rule->'condition'->>'expression', '') IN ('', 'true')
+ THEN '!(statement.sql_type in ["DELETE", "INSERT", "UPDATE"])'
+ ELSE '(' || (rule->'condition'->>'expression') || ') && !(statement.sql_type in ["DELETE", "INSERT", "UPDATE"])'
+ END
+ )
+ )
+ ), '[]'::jsonb)
+ FROM jsonb_array_elements(value::jsonb->'rules') AS rule
+ WHERE rule->>'source' = 'DDL'
+ ) || (
+ -- DML rules: rename to CHANGE_DATABASE and add DML condition filter (appended after DDL)
+ SELECT COALESCE(jsonb_agg(
+ jsonb_set(
+ jsonb_set(rule, '{source}', '"CHANGE_DATABASE"'),
+ '{condition,expression}',
+ to_jsonb(
+ CASE
+ WHEN COALESCE(rule->'condition'->>'expression', '') IN ('', 'true')
+ THEN 'statement.sql_type in ["DELETE", "INSERT", "UPDATE"]'
+ ELSE '(' || (rule->'condition'->>'expression') || ') && statement.sql_type in ["DELETE", "INSERT", "UPDATE"]'
+ END
+ )
+ )
+ ), '[]'::jsonb)
+ FROM jsonb_array_elements(value::jsonb->'rules') AS rule
+ WHERE rule->>'source' = 'DML'
+ ) || (
+ -- Other rules: keep unchanged
+ SELECT COALESCE(jsonb_agg(rule), '[]'::jsonb)
+ FROM jsonb_array_elements(value::jsonb->'rules') AS rule
+ WHERE rule->>'source' NOT IN ('DDL', 'DML')
+ )
+ )::text
+)
+WHERE name = 'WORKSPACE_APPROVAL';
diff --git a/backend/migrator/migrator_test.go b/backend/migrator/migrator_test.go
index 5631a04cce..44c0e525fa 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.5"), *files[len(files)-1].version)
+ require.Equal(t, semver.MustParse("3.13.6"), *files[len(files)-1].version)
}
func TestVersionUnique(t *testing.T) {
diff --git a/backend/runner/approval/runner.go b/backend/runner/approval/runner.go
index 02da96f70e..380c5b9c9a 100644
--- a/backend/runner/approval/runner.go
+++ b/backend/runner/approval/runner.go
@@ -679,8 +679,7 @@ func getApprovalSourceFromPlan(config *storepb.PlanConfig) storepb.WorkspaceAppr
case *storepb.PlanConfig_Spec_CreateDatabaseConfig:
return storepb.WorkspaceApprovalSetting_Rule_CREATE_DATABASE
case *storepb.PlanConfig_Spec_ChangeDatabaseConfig:
- // All DATABASE_MIGRATE and SDL operations use DDL approval rules
- return storepb.WorkspaceApprovalSetting_Rule_DDL
+ return storepb.WorkspaceApprovalSetting_Rule_CHANGE_DATABASE
case *storepb.PlanConfig_Spec_ExportDataConfig:
return storepb.WorkspaceApprovalSetting_Rule_EXPORT_DATA
}
diff --git a/backend/tests/approval_test.go b/backend/tests/approval_test.go
index 293f7320db..cfcebf91fc 100644
--- a/backend/tests/approval_test.go
+++ b/backend/tests/approval_test.go
@@ -60,13 +60,13 @@ func TestDirectApprovalRuleMatching(t *testing.T) {
WorkspaceApprovalSettingValue: &v1pb.WorkspaceApprovalSetting{
Rules: []*v1pb.WorkspaceApprovalSetting_Rule{
{
- Source: v1pb.WorkspaceApprovalSetting_Rule_DDL,
+ Source: v1pb.WorkspaceApprovalSetting_Rule_CHANGE_DATABASE,
Condition: &expr.Expr{
Expression: `resource.db_engine == "SQLITE"`, // Use db_engine to test CEL with variables
},
Template: &v1pb.ApprovalTemplate{
- Title: "Prod DDL Approval",
- Description: "Requires workspace owner approval for DDL in prod",
+ Title: "Prod Change Database Approval",
+ Description: "Requires workspace owner approval for database changes in prod",
Flow: &v1pb.ApprovalFlow{
Roles: []string{"roles/workspaceOwner"},
},
@@ -148,7 +148,7 @@ func TestDirectApprovalRuleMatching(t *testing.T) {
// Note: The status may be SKIPPED/APPROVED if the user is a workspace owner
// who can self-approve, but the template should still be assigned
a.NotNil(issue.ApprovalTemplate, "Approval template should be assigned")
- a.Equal("Prod DDL Approval", issue.GetApprovalTemplate().GetTitle(), "Correct approval template should be applied")
+ a.Equal("Prod Change Database Approval", issue.GetApprovalTemplate().GetTitle(), "Correct approval template should be applied")
}
// TestApprovalRuleFirstMatchWins tests that the first matching approval rule is applied
@@ -198,13 +198,13 @@ func TestApprovalRuleFirstMatchWins(t *testing.T) {
WorkspaceApprovalSettingValue: &v1pb.WorkspaceApprovalSetting{
Rules: []*v1pb.WorkspaceApprovalSetting_Rule{
{
- // Rule 1: Specific - prod environment DDL
- Source: v1pb.WorkspaceApprovalSetting_Rule_DDL,
+ // Rule 1: Specific - prod environment
+ Source: v1pb.WorkspaceApprovalSetting_Rule_CHANGE_DATABASE,
Condition: &expr.Expr{
Expression: `resource.environment_id == "prod"`,
},
Template: &v1pb.ApprovalTemplate{
- Title: "Prod DDL - First Rule",
+ Title: "Prod Change Database - First Rule",
Flow: &v1pb.ApprovalFlow{
Roles: []string{"roles/workspaceOwner"},
},
@@ -212,12 +212,12 @@ func TestApprovalRuleFirstMatchWins(t *testing.T) {
},
{
// Rule 2: Catch-all - matches everything
- Source: v1pb.WorkspaceApprovalSetting_Rule_DDL,
+ Source: v1pb.WorkspaceApprovalSetting_Rule_CHANGE_DATABASE,
Condition: &expr.Expr{
Expression: `true`,
},
Template: &v1pb.ApprovalTemplate{
- Title: "Catch-all DDL - Second Rule",
+ Title: "Catch-all Change Database - Second Rule",
Flow: &v1pb.ApprovalFlow{
Roles: []string{"roles/projectOwner", "roles/workspaceOwner"},
},
@@ -296,7 +296,7 @@ func TestApprovalRuleFirstMatchWins(t *testing.T) {
a.NotEqual(v1pb.Issue_ERROR, issue.ApprovalStatus)
// Verify the first rule was applied (not the catch-all)
- a.Equal("Prod DDL - First Rule", issue.GetApprovalTemplate().GetTitle(), "First matching rule should be applied")
+ a.Equal("Prod Change Database - First Rule", issue.GetApprovalTemplate().GetTitle(), "First matching rule should be applied")
}
// TestApprovalRuleNoMatch tests that issues without matching approval rules
@@ -344,7 +344,7 @@ func TestApprovalRuleNoMatch(t *testing.T) {
WorkspaceApprovalSettingValue: &v1pb.WorkspaceApprovalSetting{
Rules: []*v1pb.WorkspaceApprovalSetting_Rule{
{
- Source: v1pb.WorkspaceApprovalSetting_Rule_DDL,
+ Source: v1pb.WorkspaceApprovalSetting_Rule_CHANGE_DATABASE,
Condition: &expr.Expr{
Expression: `resource.environment_id == "prod"`,
},
diff --git a/frontend/src/components/CustomApproval/Settings/components/CustomApproval/RulesPanel/RulesPanel.vue b/frontend/src/components/CustomApproval/Settings/components/CustomApproval/RulesPanel/RulesPanel.vue
index fcbf5a8959..1768d0f858 100644
--- a/frontend/src/components/CustomApproval/Settings/components/CustomApproval/RulesPanel/RulesPanel.vue
+++ b/frontend/src/components/CustomApproval/Settings/components/CustomApproval/RulesPanel/RulesPanel.vue
@@ -14,8 +14,7 @@ import { WorkspaceApprovalSetting_Rule_Source } from "@/types/proto-es/v1/settin
import RulesSection from "./RulesSection.vue";
const supportedSourceList = computed(() => [
- WorkspaceApprovalSetting_Rule_Source.DDL,
- WorkspaceApprovalSetting_Rule_Source.DML,
+ WorkspaceApprovalSetting_Rule_Source.CHANGE_DATABASE,
WorkspaceApprovalSetting_Rule_Source.CREATE_DATABASE,
WorkspaceApprovalSetting_Rule_Source.EXPORT_DATA,
WorkspaceApprovalSetting_Rule_Source.REQUEST_ROLE,
diff --git a/frontend/src/components/CustomApproval/Settings/components/CustomApproval/RulesPanel/template.ts b/frontend/src/components/CustomApproval/Settings/components/CustomApproval/RulesPanel/template.ts
index 1c9c2e269f..7f8c7baef8 100644
--- a/frontend/src/components/CustomApproval/Settings/components/CustomApproval/RulesPanel/template.ts
+++ b/frontend/src/components/CustomApproval/Settings/components/CustomApproval/RulesPanel/template.ts
@@ -38,10 +38,7 @@ export const useApprovalRuleTemplates = () => {
args: [CEL_ATTRIBUTE_STATEMENT_SQL_TYPE, ["DROP_TABLE", "TRUNCATE"]],
}),
roles: [PresetRoleType.PROJECT_OWNER, PresetRoleType.WORKSPACE_DBA],
- sources: [
- WorkspaceApprovalSetting_Rule_Source.DDL,
- WorkspaceApprovalSetting_Rule_Source.DML,
- ],
+ sources: [WorkspaceApprovalSetting_Rule_Source.CHANGE_DATABASE],
},
{
title: () =>
@@ -59,10 +56,7 @@ export const useApprovalRuleTemplates = () => {
args: [CEL_ATTRIBUTE_STATEMENT_AFFECTED_ROWS, 100],
}),
roles: [PresetRoleType.PROJECT_OWNER, PresetRoleType.WORKSPACE_DBA],
- sources: [
- WorkspaceApprovalSetting_Rule_Source.DDL,
- WorkspaceApprovalSetting_Rule_Source.DML,
- ],
+ sources: [WorkspaceApprovalSetting_Rule_Source.CHANGE_DATABASE],
},
{
title: () =>
diff --git a/frontend/src/components/CustomApproval/Settings/components/common/utils.ts b/frontend/src/components/CustomApproval/Settings/components/common/utils.ts
index 8438d4077a..a356c0c304 100644
--- a/frontend/src/components/CustomApproval/Settings/components/common/utils.ts
+++ b/frontend/src/components/CustomApproval/Settings/components/common/utils.ts
@@ -181,10 +181,8 @@ const getSQLTypeOptions = (source: WorkspaceApprovalSetting_Rule_Source) => {
}));
};
switch (source) {
- case WorkspaceApprovalSetting_Rule_Source.DDL:
- return mapOptions(SQLTypeList.DDL);
- case WorkspaceApprovalSetting_Rule_Source.DML:
- return mapOptions(SQLTypeList.DML);
+ case WorkspaceApprovalSetting_Rule_Source.CHANGE_DATABASE:
+ return mapOptions([...SQLTypeList.DDL, ...SQLTypeList.DML]);
}
// unsupported source
return [];
@@ -206,10 +204,8 @@ export const approvalSourceText = (
switch (source) {
case WorkspaceApprovalSetting_Rule_Source.SOURCE_UNSPECIFIED:
return t("common.all");
- case WorkspaceApprovalSetting_Rule_Source.DDL:
- return t("custom-approval.risk-rule.risk.namespace.ddl");
- case WorkspaceApprovalSetting_Rule_Source.DML:
- return t("custom-approval.risk-rule.risk.namespace.dml");
+ case WorkspaceApprovalSetting_Rule_Source.CHANGE_DATABASE:
+ return t("custom-approval.risk-rule.risk.namespace.change_database");
case WorkspaceApprovalSetting_Rule_Source.CREATE_DATABASE:
return t("custom-approval.risk-rule.risk.namespace.create_database");
case WorkspaceApprovalSetting_Rule_Source.EXPORT_DATA:
@@ -227,15 +223,7 @@ export const ApprovalSourceFactorMap: Map<
Factor[]
> = new Map([
[
- WorkspaceApprovalSetting_Rule_Source.DDL,
- [
- ...commonFactorList,
- ...schemaObjectNameFactorList,
- ...migrationFactorList,
- ],
- ],
- [
- WorkspaceApprovalSetting_Rule_Source.DML,
+ WorkspaceApprovalSetting_Rule_Source.CHANGE_DATABASE,
[
...commonFactorList,
...schemaObjectNameFactorList,
diff --git a/frontend/src/locales/en-US.json b/frontend/src/locales/en-US.json
index 0358ed6af7..95e4ea7011 100644
--- a/frontend/src/locales/en-US.json
+++ b/frontend/src/locales/en-US.json
@@ -2629,8 +2629,7 @@
"high": "High"
},
"namespace": {
- "dml": "DML",
- "ddl": "DDL",
+ "change_database": "Change Database",
"create_database": "Create Database",
"data_export": "Export Data",
"request-role": "Request Role"
diff --git a/frontend/src/locales/es-ES.json b/frontend/src/locales/es-ES.json
index 547554e223..e29230195a 100644
--- a/frontend/src/locales/es-ES.json
+++ b/frontend/src/locales/es-ES.json
@@ -2629,8 +2629,7 @@
"high": "Alto"
},
"namespace": {
- "dml": "DML",
- "ddl": "DDL",
+ "change_database": "Cambiar base de datos",
"create_database": "Crear base de datos",
"data_export": "Exportar datos",
"request-role": "Rol de solicitud"
diff --git a/frontend/src/locales/ja-JP.json b/frontend/src/locales/ja-JP.json
index 5d1bf9e02c..78b17867c9 100644
--- a/frontend/src/locales/ja-JP.json
+++ b/frontend/src/locales/ja-JP.json
@@ -2629,8 +2629,7 @@
"high": "高"
},
"namespace": {
- "dml": "DML",
- "ddl": "DDL",
+ "change_database": "データベースの変更",
"create_database": "データベースの作成",
"data_export": "データのエクスポート",
"request-role": "ロールのリクエスト"
diff --git a/frontend/src/locales/vi-VN.json b/frontend/src/locales/vi-VN.json
index d72825146b..e11e72dc33 100644
--- a/frontend/src/locales/vi-VN.json
+++ b/frontend/src/locales/vi-VN.json
@@ -2629,8 +2629,7 @@
"high": "Cao"
},
"namespace": {
- "dml": "DML",
- "ddl": "DDL",
+ "change_database": "Thay đổi cơ sở dữ liệu",
"create_database": "Tạo cơ sở dữ liệu",
"data_export": "Xuất dữ liệu",
"request-role": "Yêu cầu vai trò"
diff --git a/frontend/src/locales/zh-CN.json b/frontend/src/locales/zh-CN.json
index 3657750163..fbb9e02b15 100644
--- a/frontend/src/locales/zh-CN.json
+++ b/frontend/src/locales/zh-CN.json
@@ -2629,8 +2629,7 @@
"high": "高"
},
"namespace": {
- "dml": "DML",
- "ddl": "DDL",
+ "change_database": "变更数据库",
"create_database": "创建数据库",
"data_export": "导出数据",
"request-role": "请求角色"
diff --git a/frontend/src/types/proto-es/v1/setting_service_pb.d.ts b/frontend/src/types/proto-es/v1/setting_service_pb.d.ts
index 8fec657238..2a05625552 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
@@ -727,7 +727,7 @@ export declare type WorkspaceApprovalSetting_Rule = Message<"bytebase.v1.Workspa
* request.expiration_days: the role expiration days for the request, support "==", "!=", "<", "<=", ">", ">=" operations.
* request.role: the request role full name, support "==", "!=", "in [xx]", "!(in [xx])", "contains()", "matches()", "startsWith()", "endsWith()" operations.
*
- * When source is DDL/DML, support: statement.*, resource.* (excluding request.*)
+ * When source is CHANGE_DATABASE, support: statement.*, resource.* (excluding request.*)
* When source is CREATE_DATABASE, support: resource.environment_id, resource.project_id, resource.db_engine, resource.database_name
* When source is EXPORT_DATA, support: resource.environment_id, resource.project_id, resource.db_engine, resource.database_name, resource.schema_name, resource.table_name
* When source is REQUEST_ROLE, support: resource.project_id, request.expiration_days, request.role
@@ -736,8 +736,6 @@ export declare type WorkspaceApprovalSetting_Rule = Message<"bytebase.v1.Workspa
* resource.environment_id == "prod" && statement.affected_rows >= 100
* resource.table_name.matches("sensitive_.*") && resource.db_engine == "MYSQL"
*
- * Legacy format (deprecated): source == "DDL" && level == "HIGH"
- *
* @generated from field: google.type.Expr condition = 2;
*/
condition?: Expr;
@@ -764,29 +762,24 @@ export enum WorkspaceApprovalSetting_Rule_Source {
SOURCE_UNSPECIFIED = 0,
/**
- * @generated from enum value: DDL = 1;
- */
- DDL = 1,
-
- /**
- * @generated from enum value: DML = 2;
+ * @generated from enum value: CHANGE_DATABASE = 1;
*/
- DML = 2,
+ CHANGE_DATABASE = 1,
/**
- * @generated from enum value: CREATE_DATABASE = 3;
+ * @generated from enum value: CREATE_DATABASE = 2;
*/
- CREATE_DATABASE = 3,
+ CREATE_DATABASE = 2,
/**
- * @generated from enum value: EXPORT_DATA = 4;
+ * @generated from enum value: EXPORT_DATA = 3;
*/
- EXPORT_DATA = 4,
+ EXPORT_DATA = 3,
/**
- * @generated from enum value: REQUEST_ROLE = 5;
+ * @generated from enum value: REQUEST_ROLE = 4;
*/
- REQUEST_ROLE = 5,
+ REQUEST_ROLE = 4,
}
/**
diff --git a/frontend/src/types/proto-es/v1/setting_service_pb.js b/frontend/src/types/proto-es/v1/setting_service_pb.js
index ace388e762..331d63cf37 100644
--- a/frontend/src/types/proto-es/v1/setting_service_pb.js
+++ b/frontend/src/types/proto-es/v1/setting_service_pb.js
@@ -20,7 +20,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("Chh2MS9zZXR0aW5nX3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIhUKE0xpc3RTZXR0aW5nc1JlcXVlc3QiPgoUTGlzdFNldHRpbmdzUmVzcG9uc2USJgoIc2V0dGluZ3MYASADKAsyFC5ieXRlYmFzZS52MS5TZXR0aW5nIj8KEUdldFNldHRpbmdSZXF1ZXN0EioKBG5hbWUYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1NldHRpbmciOwoSR2V0U2V0dGluZ1Jlc3BvbnNlEiUKB3NldHRpbmcYASABKAsyFC5ieXRlYmFzZS52MS5TZXR0aW5nIqEBChRVcGRhdGVTZXR0aW5nUmVxdWVzdBIqCgdzZXR0aW5nGAEgASgLMhQuYnl0ZWJhc2UudjEuU2V0dGluZ0ID4EECEhUKDXZhbGlkYXRlX29ubHkYAiABKAgSFQoNYWxsb3dfbWlzc2luZxgDIAEoCBIvCgt1cGRhdGVfbWFzaxgEIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2si1QMKB1NldHRpbmcSDAoEbmFtZRgBIAEoCRIhCgV2YWx1ZRgCIAEoCzISLmJ5dGViYXNlLnYxLlZhbHVlIuMCCgtTZXR0aW5nTmFtZRIcChhTRVRUSU5HX05BTUVfVU5TUEVDSUZJRUQQABIPCgtBVVRIX1NFQ1JFVBABEhEKDUJSQU5ESU5HX0xPR08QAhIQCgxXT1JLU1BBQ0VfSUQQAxIVChFXT1JLU1BBQ0VfUFJPRklMRRAEEhYKEldPUktTUEFDRV9BUFBST1ZBTBAFEh8KG1dPUktTUEFDRV9FWFRFUk5BTF9BUFBST1ZBTBAGEhYKEkVOVEVSUFJJU0VfTElDRU5TRRAHEgoKBkFQUF9JTRAIEg0KCVdBVEVSTUFSSxAJEgYKAkFJEAoSEwoPU0NIRU1BX1RFTVBMQVRFEA0SFwoTREFUQV9DTEFTU0lGSUNBVElPThAOEhIKDlNFTUFOVElDX1RZUEVTEA8SCAoEU0NJTRAREhgKFFBBU1NXT1JEX1JFU1RSSUNUSU9OEBISDwoLRU5WSVJPTk1FTlQQEzot6kEqChRieXRlYmFzZS5jb20vU2V0dGluZxISc2V0dGluZ3Mve3NldHRpbmd9SgQIEBARIukFCgVWYWx1ZRIWCgxzdHJpbmdfdmFsdWUYASABKAlIABI5ChRhcHBfaW1fc2V0dGluZ192YWx1ZRgDIAEoCzIZLmJ5dGViYXNlLnYxLkFwcElNU2V0dGluZ0gAEk8KH3dvcmtzcGFjZV9wcm9maWxlX3NldHRpbmdfdmFsdWUYBSABKAsyJC5ieXRlYmFzZS52MS5Xb3Jrc3BhY2VQcm9maWxlU2V0dGluZ0gAElEKIHdvcmtzcGFjZV9hcHByb3ZhbF9zZXR0aW5nX3ZhbHVlGAYgASgLMiUuYnl0ZWJhc2UudjEuV29ya3NwYWNlQXBwcm92YWxTZXR0aW5nSAASSwodc2NoZW1hX3RlbXBsYXRlX3NldHRpbmdfdmFsdWUYCSABKAsyIi5ieXRlYmFzZS52MS5TY2hlbWFUZW1wbGF0ZVNldHRpbmdIABJTCiFkYXRhX2NsYXNzaWZpY2F0aW9uX3NldHRpbmdfdmFsdWUYCiABKAsyJi5ieXRlYmFzZS52MS5EYXRhQ2xhc3NpZmljYXRpb25TZXR0aW5nSAASRwobc2VtYW50aWNfdHlwZV9zZXR0aW5nX3ZhbHVlGAsgASgLMiAuYnl0ZWJhc2UudjEuU2VtYW50aWNUeXBlU2V0dGluZ0gAEjAKDHNjaW1fc2V0dGluZxgOIAEoCzIYLmJ5dGViYXNlLnYxLlNDSU1TZXR0aW5nSAASTwoccGFzc3dvcmRfcmVzdHJpY3Rpb25fc2V0dGluZxgPIAEoCzInLmJ5dGViYXNlLnYxLlBhc3N3b3JkUmVzdHJpY3Rpb25TZXR0aW5nSAASLAoKYWlfc2V0dGluZxgQIAEoCzIWLmJ5dGViYXNlLnYxLkFJU2V0dGluZ0gAEj4KE2Vudmlyb25tZW50X3NldHRpbmcYESABKAsyHy5ieXRlYmFzZS52MS5FbnZpcm9ubWVudFNldHRpbmdIAEIHCgV2YWx1ZUoECBIQEyK2BQoMQXBwSU1TZXR0aW5nEjUKCHNldHRpbmdzGAEgAygLMiMuYnl0ZWJhc2UudjEuQXBwSU1TZXR0aW5nLklNU2V0dGluZxobCgVTbGFjaxISCgV0b2tlbhgBIAEoCUID4EEEGjYKBkZlaXNodRITCgZhcHBfaWQYASABKAlCA+BBBBIXCgphcHBfc2VjcmV0GAIgASgJQgPgQQQaSQoFV2Vjb20SFAoHY29ycF9pZBgBIAEoCUID4EEEEhUKCGFnZW50X2lkGAIgASgJQgPgQQQSEwoGc2VjcmV0GAMgASgJQgPgQQQaNAoETGFyaxITCgZhcHBfaWQYASABKAlCA+BBBBIXCgphcHBfc2VjcmV0GAIgASgJQgPgQQQaVwoIRGluZ1RhbGsSFgoJY2xpZW50X2lkGAEgASgJQgPgQQQSGgoNY2xpZW50X3NlY3JldBgCIAEoCUID4EEEEhcKCnJvYm90X2NvZGUYAyABKAlCA+BBBBq/AgoJSU1TZXR0aW5nEicKBHR5cGUYASABKA4yGS5ieXRlYmFzZS52MS5XZWJob29rLlR5cGUSMAoFc2xhY2sYAiABKAsyHy5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmcuU2xhY2tIABIyCgZmZWlzaHUYAyABKAsyIC5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmcuRmVpc2h1SAASMAoFd2Vjb20YBCABKAsyHy5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmcuV2Vjb21IABIuCgRsYXJrGAUgASgLMh4uYnl0ZWJhc2UudjEuQXBwSU1TZXR0aW5nLkxhcmtIABI2CghkaW5ndGFsaxgGIAEoCzIiLmJ5dGViYXNlLnYxLkFwcElNU2V0dGluZy5EaW5nVGFsa0gAQgkKB3BheWxvYWQikAQKF1dvcmtzcGFjZVByb2ZpbGVTZXR0aW5nEhQKDGV4dGVybmFsX3VybBgBIAEoCRIXCg9kaXNhbGxvd19zaWdudXAYAiABKAgSEwoLcmVxdWlyZV8yZmEYAyABKAgSMQoOdG9rZW5fZHVyYXRpb24YBiABKAsyGS5nb29nbGUucHJvdG9idWYuRHVyYXRpb24SLwoMYW5ub3VuY2VtZW50GAcgASgLMhkuYnl0ZWJhc2UudjEuQW5ub3VuY2VtZW50EjoKF21heGltdW1fcm9sZV9leHBpcmF0aW9uGAggASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uEg8KB2RvbWFpbnMYCSADKAkSHwoXZW5mb3JjZV9pZGVudGl0eV9kb21haW4YCiABKAgSPQoUZGF0YWJhc2VfY2hhbmdlX21vZGUYCyABKA4yHy5ieXRlYmFzZS52MS5EYXRhYmFzZUNoYW5nZU1vZGUSIAoYZGlzYWxsb3dfcGFzc3dvcmRfc2lnbmluGAwgASgIEiAKGGVuYWJsZV9tZXRyaWNfY29sbGVjdGlvbhgNIAEoCBI7ChhpbmFjdGl2ZV9zZXNzaW9uX3RpbWVvdXQYDiABKAsyGS5nb29nbGUucHJvdG9idWYuRHVyYXRpb24SHwoXZW5hYmxlX2F1ZGl0X2xvZ19zdGRvdXQYDyABKAgirwEKDEFubm91bmNlbWVudBIzCgVsZXZlbBgBIAEoDjIkLmJ5dGViYXNlLnYxLkFubm91bmNlbWVudC5BbGVydExldmVsEgwKBHRleHQYAiABKAkSDAoEbGluaxgDIAEoCSJOCgpBbGVydExldmVsEhsKF0FMRVJUX0xFVkVMX1VOU1BFQ0lGSUVEEAASCAoESU5GTxABEgsKB1dBUk5JTkcQAhIMCghDUklUSUNBTBADIuQCChhXb3Jrc3BhY2VBcHByb3ZhbFNldHRpbmcSOQoFcnVsZXMYASADKAsyKi5ieXRlYmFzZS52MS5Xb3Jrc3BhY2VBcHByb3ZhbFNldHRpbmcuUnVsZRqMAgoEUnVsZRIvCgh0ZW1wbGF0ZRgBIAEoCzIdLmJ5dGViYXNlLnYxLkFwcHJvdmFsVGVtcGxhdGUSJAoJY29uZGl0aW9uGAIgASgLMhEuZ29vZ2xlLnR5cGUuRXhwchJBCgZzb3VyY2UYAyABKA4yMS5ieXRlYmFzZS52MS5Xb3Jrc3BhY2VBcHByb3ZhbFNldHRpbmcuUnVsZS5Tb3VyY2UiagoGU291cmNlEhYKElNPVVJDRV9VTlNQRUNJRklFRBAAEgcKA0RETBABEgcKA0RNTBACEhMKD0NSRUFURV9EQVRBQkFTRRADEg8KC0VYUE9SVF9EQVRBEAQSEAoMUkVRVUVTVF9ST0xFEAUioAUKFVNjaGVtYVRlbXBsYXRlU2V0dGluZxJJCg9maWVsZF90ZW1wbGF0ZXMYASADKAsyMC5ieXRlYmFzZS52MS5TY2hlbWFUZW1wbGF0ZVNldHRpbmcuRmllbGRUZW1wbGF0ZRJDCgxjb2x1bW5fdHlwZXMYAiADKAsyLS5ieXRlYmFzZS52MS5TY2hlbWFUZW1wbGF0ZVNldHRpbmcuQ29sdW1uVHlwZRJJCg90YWJsZV90ZW1wbGF0ZXMYAyADKAsyMC5ieXRlYmFzZS52MS5TY2hlbWFUZW1wbGF0ZVNldHRpbmcuVGFibGVUZW1wbGF0ZRqsAQoNRmllbGRUZW1wbGF0ZRIKCgJpZBgBIAEoCRIjCgZlbmdpbmUYAiABKA4yEy5ieXRlYmFzZS52MS5FbmdpbmUSEAoIY2F0ZWdvcnkYAyABKAkSKwoGY29sdW1uGAQgASgLMhsuYnl0ZWJhc2UudjEuQ29sdW1uTWV0YWRhdGESKwoHY2F0YWxvZxgFIAEoCzIaLmJ5dGViYXNlLnYxLkNvbHVtbkNhdGFsb2caUQoKQ29sdW1uVHlwZRIjCgZlbmdpbmUYASABKA4yEy5ieXRlYmFzZS52MS5FbmdpbmUSDwoHZW5hYmxlZBgCIAEoCBINCgV0eXBlcxgDIAMoCRqpAQoNVGFibGVUZW1wbGF0ZRIKCgJpZBgBIAEoCRIjCgZlbmdpbmUYAiABKA4yEy5ieXRlYmFzZS52MS5FbmdpbmUSEAoIY2F0ZWdvcnkYAyABKAkSKQoFdGFibGUYBCABKAsyGi5ieXRlYmFzZS52MS5UYWJsZU1ldGFkYXRhEioKB2NhdGFsb2cYBSABKAsyGS5ieXRlYmFzZS52MS5UYWJsZUNhdGFsb2cimAUKGURhdGFDbGFzc2lmaWNhdGlvblNldHRpbmcSUAoHY29uZmlncxgBIAMoCzI/LmJ5dGViYXNlLnYxLkRhdGFDbGFzc2lmaWNhdGlvblNldHRpbmcuRGF0YUNsYXNzaWZpY2F0aW9uQ29uZmlnGqgEChhEYXRhQ2xhc3NpZmljYXRpb25Db25maWcSCgoCaWQYASABKAkSDQoFdGl0bGUYAiABKAkSVQoGbGV2ZWxzGAMgAygLMkUuYnl0ZWJhc2UudjEuRGF0YUNsYXNzaWZpY2F0aW9uU2V0dGluZy5EYXRhQ2xhc3NpZmljYXRpb25Db25maWcuTGV2ZWwSawoOY2xhc3NpZmljYXRpb24YBCADKAsyUy5ieXRlYmFzZS52MS5EYXRhQ2xhc3NpZmljYXRpb25TZXR0aW5nLkRhdGFDbGFzc2lmaWNhdGlvbkNvbmZpZy5DbGFzc2lmaWNhdGlvbkVudHJ5GjcKBUxldmVsEgoKAmlkGAEgASgJEg0KBXRpdGxlGAIgASgJEhMKC2Rlc2NyaXB0aW9uGAMgASgJGmgKEkRhdGFDbGFzc2lmaWNhdGlvbhIKCgJpZBgBIAEoCRINCgV0aXRsZRgCIAEoCRITCgtkZXNjcmlwdGlvbhgDIAEoCRIVCghsZXZlbF9pZBgEIAEoCUgAiAEBQgsKCV9sZXZlbF9pZBqJAQoTQ2xhc3NpZmljYXRpb25FbnRyeRILCgNrZXkYASABKAkSYQoFdmFsdWUYAiABKAsyUi5ieXRlYmFzZS52MS5EYXRhQ2xhc3NpZmljYXRpb25TZXR0aW5nLkRhdGFDbGFzc2lmaWNhdGlvbkNvbmZpZy5EYXRhQ2xhc3NpZmljYXRpb246AjgBIswBChNTZW1hbnRpY1R5cGVTZXR0aW5nEjwKBXR5cGVzGAEgAygLMi0uYnl0ZWJhc2UudjEuU2VtYW50aWNUeXBlU2V0dGluZy5TZW1hbnRpY1R5cGUadwoMU2VtYW50aWNUeXBlEgoKAmlkGAEgASgJEg0KBXRpdGxlGAIgASgJEhMKC2Rlc2NyaXB0aW9uGAMgASgJEikKCWFsZ29yaXRobRgGIAEoCzIWLmJ5dGViYXNlLnYxLkFsZ29yaXRobRIMCgRpY29uGAcgASgJIv8ECglBbGdvcml0aG0SNAoJZnVsbF9tYXNrGAUgASgLMh8uYnl0ZWJhc2UudjEuQWxnb3JpdGhtLkZ1bGxNYXNrSAASNgoKcmFuZ2VfbWFzaxgGIAEoCzIgLmJ5dGViYXNlLnYxLkFsZ29yaXRobS5SYW5nZU1hc2tIABIyCghtZDVfbWFzaxgHIAEoCzIeLmJ5dGViYXNlLnYxLkFsZ29yaXRobS5NRDVNYXNrSAASQQoQaW5uZXJfb3V0ZXJfbWFzaxgIIAEoCzIlLmJ5dGViYXNlLnYxLkFsZ29yaXRobS5Jbm5lck91dGVyTWFza0gAGiAKCEZ1bGxNYXNrEhQKDHN1YnN0aXR1dGlvbhgBIAEoCRp+CglSYW5nZU1hc2sSNgoGc2xpY2VzGAEgAygLMiYuYnl0ZWJhc2UudjEuQWxnb3JpdGhtLlJhbmdlTWFzay5TbGljZRo5CgVTbGljZRINCgVzdGFydBgBIAEoBRILCgNlbmQYAiABKAUSFAoMc3Vic3RpdHV0aW9uGAMgASgJGhcKB01ENU1hc2sSDAoEc2FsdBgBIAEoCRrJAQoOSW5uZXJPdXRlck1hc2sSEgoKcHJlZml4X2xlbhgBIAEoBRISCgpzdWZmaXhfbGVuGAIgASgFEjwKBHR5cGUYAyABKA4yLi5ieXRlYmFzZS52MS5BbGdvcml0aG0uSW5uZXJPdXRlck1hc2suTWFza1R5cGUSFAoMc3Vic3RpdHV0aW9uGAQgASgJIjsKCE1hc2tUeXBlEhkKFU1BU0tfVFlQRV9VTlNQRUNJRklFRBAAEgkKBUlOTkVSEAESCQoFT1VURVIQAkIGCgRtYXNrIhwKC1NDSU1TZXR0aW5nEg0KBXRva2VuGAEgASgJIosCChpQYXNzd29yZFJlc3RyaWN0aW9uU2V0dGluZxISCgptaW5fbGVuZ3RoGAEgASgFEhYKDnJlcXVpcmVfbnVtYmVyGAIgASgIEhYKDnJlcXVpcmVfbGV0dGVyGAMgASgIEiAKGHJlcXVpcmVfdXBwZXJjYXNlX2xldHRlchgEIAEoCBIhChlyZXF1aXJlX3NwZWNpYWxfY2hhcmFjdGVyGAUgASgIEi4KJnJlcXVpcmVfcmVzZXRfcGFzc3dvcmRfZm9yX2ZpcnN0X2xvZ2luGAYgASgIEjQKEXBhc3N3b3JkX3JvdGF0aW9uGAcgASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uIu8BCglBSVNldHRpbmcSDwoHZW5hYmxlZBgBIAEoCBIxCghwcm92aWRlchgCIAEoDjIfLmJ5dGViYXNlLnYxLkFJU2V0dGluZy5Qcm92aWRlchIQCghlbmRwb2ludBgDIAEoCRIPCgdhcGlfa2V5GAQgASgJEg0KBW1vZGVsGAUgASgJEg8KB3ZlcnNpb24YBiABKAkiWwoIUHJvdmlkZXISGAoUUFJPVklERVJfVU5TUEVDSUZJRUQQABILCgdPUEVOX0FJEAESCgoGQ0xBVURFEAISCgoGR0VNSU5JEAMSEAoMQVpVUkVfT1BFTkFJEAQilgIKEkVudmlyb25tZW50U2V0dGluZxJBCgxlbnZpcm9ubWVudHMYASADKAsyKy5ieXRlYmFzZS52MS5FbnZpcm9ubWVudFNldHRpbmcuRW52aXJvbm1lbnQavAEKC0Vudmlyb25tZW50EhEKBG5hbWUYASABKAlCA+BBAxIKCgJpZBgCIAEoCRINCgV0aXRsZRgDIAEoCRJDCgR0YWdzGAQgAygLMjUuYnl0ZWJhc2UudjEuRW52aXJvbm1lbnRTZXR0aW5nLkVudmlyb25tZW50LlRhZ3NFbnRyeRINCgVjb2xvchgFIAEoCRorCglUYWdzRW50cnkSCwoDa2V5GAEgASgJEg0KBXZhbHVlGAIgASgJOgI4ASpUChJEYXRhYmFzZUNoYW5nZU1vZGUSJAogREFUQUJBU0VfQ0hBTkdFX01PREVfVU5TUEVDSUZJRUQQABIMCghQSVBFTElORRABEgoKBkVESVRPUhACMq4DCg5TZXR0aW5nU2VydmljZRKEAQoMTGlzdFNldHRpbmdzEiAuYnl0ZWJhc2UudjEuTGlzdFNldHRpbmdzUmVxdWVzdBohLmJ5dGViYXNlLnYxLkxpc3RTZXR0aW5nc1Jlc3BvbnNlIi/aQQCK6jAQYmIuc2V0dGluZ3MubGlzdJDqMAGC0+STAg4SDC92MS9zZXR0aW5ncxJ/CgpHZXRTZXR0aW5nEh4uYnl0ZWJhc2UudjEuR2V0U2V0dGluZ1JlcXVlc3QaFC5ieXRlYmFzZS52MS5TZXR0aW5nIjvaQQRuYW1liuowD2JiLnNldHRpbmdzLmdldJDqMAGC0+STAhcSFS92MS97bmFtZT1zZXR0aW5ncy8qfRKTAQoNVXBkYXRlU2V0dGluZxIhLmJ5dGViYXNlLnYxLlVwZGF0ZVNldHRpbmdSZXF1ZXN0GhQuYnl0ZWJhc2UudjEuU2V0dGluZyJJiuowD2JiLnNldHRpbmdzLnNldJDqMAGY6jABgtPkkwIoOgdzZXR0aW5nMh0vdjEve3NldHRpbmcubmFtZT1zZXR0aW5ncy8qfUKpAQoPY29tLmJ5dGViYXNlLnYxQhNTZXR0aW5nU2VydmljZVByb3RvUAFaNGdpdGh1Yi5jb20vYnl0ZWJhc2UvYnl0ZWJhc2UvYmFja2VuZC9nZW5lcmF0ZWQtZ28vdjGiAgNCWFiqAgtCeXRlYmFzZS5WMcoCC0J5dGViYXNlXFYx4gIXQnl0ZWJhc2VcVjFcR1BCTWV0YWRhdGHqAgxCeXRlYmFzZTo6VjFiBnByb3RvMw", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_duration, file_google_protobuf_field_mask, file_google_type_expr, file_v1_annotation, file_v1_common, file_v1_database_catalog_service, file_v1_database_service, file_v1_issue_service, file_v1_project_service]);
+ fileDesc("Chh2MS9zZXR0aW5nX3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIhUKE0xpc3RTZXR0aW5nc1JlcXVlc3QiPgoUTGlzdFNldHRpbmdzUmVzcG9uc2USJgoIc2V0dGluZ3MYASADKAsyFC5ieXRlYmFzZS52MS5TZXR0aW5nIj8KEUdldFNldHRpbmdSZXF1ZXN0EioKBG5hbWUYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1NldHRpbmciOwoSR2V0U2V0dGluZ1Jlc3BvbnNlEiUKB3NldHRpbmcYASABKAsyFC5ieXRlYmFzZS52MS5TZXR0aW5nIqEBChRVcGRhdGVTZXR0aW5nUmVxdWVzdBIqCgdzZXR0aW5nGAEgASgLMhQuYnl0ZWJhc2UudjEuU2V0dGluZ0ID4EECEhUKDXZhbGlkYXRlX29ubHkYAiABKAgSFQoNYWxsb3dfbWlzc2luZxgDIAEoCBIvCgt1cGRhdGVfbWFzaxgEIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2si1QMKB1NldHRpbmcSDAoEbmFtZRgBIAEoCRIhCgV2YWx1ZRgCIAEoCzISLmJ5dGViYXNlLnYxLlZhbHVlIuMCCgtTZXR0aW5nTmFtZRIcChhTRVRUSU5HX05BTUVfVU5TUEVDSUZJRUQQABIPCgtBVVRIX1NFQ1JFVBABEhEKDUJSQU5ESU5HX0xPR08QAhIQCgxXT1JLU1BBQ0VfSUQQAxIVChFXT1JLU1BBQ0VfUFJPRklMRRAEEhYKEldPUktTUEFDRV9BUFBST1ZBTBAFEh8KG1dPUktTUEFDRV9FWFRFUk5BTF9BUFBST1ZBTBAGEhYKEkVOVEVSUFJJU0VfTElDRU5TRRAHEgoKBkFQUF9JTRAIEg0KCVdBVEVSTUFSSxAJEgYKAkFJEAoSEwoPU0NIRU1BX1RFTVBMQVRFEA0SFwoTREFUQV9DTEFTU0lGSUNBVElPThAOEhIKDlNFTUFOVElDX1RZUEVTEA8SCAoEU0NJTRAREhgKFFBBU1NXT1JEX1JFU1RSSUNUSU9OEBISDwoLRU5WSVJPTk1FTlQQEzot6kEqChRieXRlYmFzZS5jb20vU2V0dGluZxISc2V0dGluZ3Mve3NldHRpbmd9SgQIEBARIukFCgVWYWx1ZRIWCgxzdHJpbmdfdmFsdWUYASABKAlIABI5ChRhcHBfaW1fc2V0dGluZ192YWx1ZRgDIAEoCzIZLmJ5dGViYXNlLnYxLkFwcElNU2V0dGluZ0gAEk8KH3dvcmtzcGFjZV9wcm9maWxlX3NldHRpbmdfdmFsdWUYBSABKAsyJC5ieXRlYmFzZS52MS5Xb3Jrc3BhY2VQcm9maWxlU2V0dGluZ0gAElEKIHdvcmtzcGFjZV9hcHByb3ZhbF9zZXR0aW5nX3ZhbHVlGAYgASgLMiUuYnl0ZWJhc2UudjEuV29ya3NwYWNlQXBwcm92YWxTZXR0aW5nSAASSwodc2NoZW1hX3RlbXBsYXRlX3NldHRpbmdfdmFsdWUYCSABKAsyIi5ieXRlYmFzZS52MS5TY2hlbWFUZW1wbGF0ZVNldHRpbmdIABJTCiFkYXRhX2NsYXNzaWZpY2F0aW9uX3NldHRpbmdfdmFsdWUYCiABKAsyJi5ieXRlYmFzZS52MS5EYXRhQ2xhc3NpZmljYXRpb25TZXR0aW5nSAASRwobc2VtYW50aWNfdHlwZV9zZXR0aW5nX3ZhbHVlGAsgASgLMiAuYnl0ZWJhc2UudjEuU2VtYW50aWNUeXBlU2V0dGluZ0gAEjAKDHNjaW1fc2V0dGluZxgOIAEoCzIYLmJ5dGViYXNlLnYxLlNDSU1TZXR0aW5nSAASTwoccGFzc3dvcmRfcmVzdHJpY3Rpb25fc2V0dGluZxgPIAEoCzInLmJ5dGViYXNlLnYxLlBhc3N3b3JkUmVzdHJpY3Rpb25TZXR0aW5nSAASLAoKYWlfc2V0dGluZxgQIAEoCzIWLmJ5dGViYXNlLnYxLkFJU2V0dGluZ0gAEj4KE2Vudmlyb25tZW50X3NldHRpbmcYESABKAsyHy5ieXRlYmFzZS52MS5FbnZpcm9ubWVudFNldHRpbmdIAEIHCgV2YWx1ZUoECBIQEyK2BQoMQXBwSU1TZXR0aW5nEjUKCHNldHRpbmdzGAEgAygLMiMuYnl0ZWJhc2UudjEuQXBwSU1TZXR0aW5nLklNU2V0dGluZxobCgVTbGFjaxISCgV0b2tlbhgBIAEoCUID4EEEGjYKBkZlaXNodRITCgZhcHBfaWQYASABKAlCA+BBBBIXCgphcHBfc2VjcmV0GAIgASgJQgPgQQQaSQoFV2Vjb20SFAoHY29ycF9pZBgBIAEoCUID4EEEEhUKCGFnZW50X2lkGAIgASgJQgPgQQQSEwoGc2VjcmV0GAMgASgJQgPgQQQaNAoETGFyaxITCgZhcHBfaWQYASABKAlCA+BBBBIXCgphcHBfc2VjcmV0GAIgASgJQgPgQQQaVwoIRGluZ1RhbGsSFgoJY2xpZW50X2lkGAEgASgJQgPgQQQSGgoNY2xpZW50X3NlY3JldBgCIAEoCUID4EEEEhcKCnJvYm90X2NvZGUYAyABKAlCA+BBBBq/AgoJSU1TZXR0aW5nEicKBHR5cGUYASABKA4yGS5ieXRlYmFzZS52MS5XZWJob29rLlR5cGUSMAoFc2xhY2sYAiABKAsyHy5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmcuU2xhY2tIABIyCgZmZWlzaHUYAyABKAsyIC5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmcuRmVpc2h1SAASMAoFd2Vjb20YBCABKAsyHy5ieXRlYmFzZS52MS5BcHBJTVNldHRpbmcuV2Vjb21IABIuCgRsYXJrGAUgASgLMh4uYnl0ZWJhc2UudjEuQXBwSU1TZXR0aW5nLkxhcmtIABI2CghkaW5ndGFsaxgGIAEoCzIiLmJ5dGViYXNlLnYxLkFwcElNU2V0dGluZy5EaW5nVGFsa0gAQgkKB3BheWxvYWQikAQKF1dvcmtzcGFjZVByb2ZpbGVTZXR0aW5nEhQKDGV4dGVybmFsX3VybBgBIAEoCRIXCg9kaXNhbGxvd19zaWdudXAYAiABKAgSEwoLcmVxdWlyZV8yZmEYAyABKAgSMQoOdG9rZW5fZHVyYXRpb24YBiABKAsyGS5nb29nbGUucHJvdG9idWYuRHVyYXRpb24SLwoMYW5ub3VuY2VtZW50GAcgASgLMhkuYnl0ZWJhc2UudjEuQW5ub3VuY2VtZW50EjoKF21heGltdW1fcm9sZV9leHBpcmF0aW9uGAggASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uEg8KB2RvbWFpbnMYCSADKAkSHwoXZW5mb3JjZV9pZGVudGl0eV9kb21haW4YCiABKAgSPQoUZGF0YWJhc2VfY2hhbmdlX21vZGUYCyABKA4yHy5ieXRlYmFzZS52MS5EYXRhYmFzZUNoYW5nZU1vZGUSIAoYZGlzYWxsb3dfcGFzc3dvcmRfc2lnbmluGAwgASgIEiAKGGVuYWJsZV9tZXRyaWNfY29sbGVjdGlvbhgNIAEoCBI7ChhpbmFjdGl2ZV9zZXNzaW9uX3RpbWVvdXQYDiABKAsyGS5nb29nbGUucHJvdG9idWYuRHVyYXRpb24SHwoXZW5hYmxlX2F1ZGl0X2xvZ19zdGRvdXQYDyABKAgirwEKDEFubm91bmNlbWVudBIzCgVsZXZlbBgBIAEoDjIkLmJ5dGViYXNlLnYxLkFubm91bmNlbWVudC5BbGVydExldmVsEgwKBHRleHQYAiABKAkSDAoEbGluaxgDIAEoCSJOCgpBbGVydExldmVsEhsKF0FMRVJUX0xFVkVMX1VOU1BFQ0lGSUVEEAASCAoESU5GTxABEgsKB1dBUk5JTkcQAhIMCghDUklUSUNBTBADIucCChhXb3Jrc3BhY2VBcHByb3ZhbFNldHRpbmcSOQoFcnVsZXMYASADKAsyKi5ieXRlYmFzZS52MS5Xb3Jrc3BhY2VBcHByb3ZhbFNldHRpbmcuUnVsZRqPAgoEUnVsZRIvCgh0ZW1wbGF0ZRgBIAEoCzIdLmJ5dGViYXNlLnYxLkFwcHJvdmFsVGVtcGxhdGUSJAoJY29uZGl0aW9uGAIgASgLMhEuZ29vZ2xlLnR5cGUuRXhwchJBCgZzb3VyY2UYAyABKA4yMS5ieXRlYmFzZS52MS5Xb3Jrc3BhY2VBcHByb3ZhbFNldHRpbmcuUnVsZS5Tb3VyY2UibQoGU291cmNlEhYKElNPVVJDRV9VTlNQRUNJRklFRBAAEhMKD0NIQU5HRV9EQVRBQkFTRRABEhMKD0NSRUFURV9EQVRBQkFTRRACEg8KC0VYUE9SVF9EQVRBEAMSEAoMUkVRVUVTVF9ST0xFEAQioAUKFVNjaGVtYVRlbXBsYXRlU2V0dGluZxJJCg9maWVsZF90ZW1wbGF0ZXMYASADKAsyMC5ieXRlYmFzZS52MS5TY2hlbWFUZW1wbGF0ZVNldHRpbmcuRmllbGRUZW1wbGF0ZRJDCgxjb2x1bW5fdHlwZXMYAiADKAsyLS5ieXRlYmFzZS52MS5TY2hlbWFUZW1wbGF0ZVNldHRpbmcuQ29sdW1uVHlwZRJJCg90YWJsZV90ZW1wbGF0ZXMYAyADKAsyMC5ieXRlYmFzZS52MS5TY2hlbWFUZW1wbGF0ZVNldHRpbmcuVGFibGVUZW1wbGF0ZRqsAQoNRmllbGRUZW1wbGF0ZRIKCgJpZBgBIAEoCRIjCgZlbmdpbmUYAiABKA4yEy5ieXRlYmFzZS52MS5FbmdpbmUSEAoIY2F0ZWdvcnkYAyABKAkSKwoGY29sdW1uGAQgASgLMhsuYnl0ZWJhc2UudjEuQ29sdW1uTWV0YWRhdGESKwoHY2F0YWxvZxgFIAEoCzIaLmJ5dGViYXNlLnYxLkNvbHVtbkNhdGFsb2caUQoKQ29sdW1uVHlwZRIjCgZlbmdpbmUYASABKA4yEy5ieXRlYmFzZS52MS5FbmdpbmUSDwoHZW5hYmxlZBgCIAEoCBINCgV0eXBlcxgDIAMoCRqpAQoNVGFibGVUZW1wbGF0ZRIKCgJpZBgBIAEoCRIjCgZlbmdpbmUYAiABKA4yEy5ieXRlYmFzZS52MS5FbmdpbmUSEAoIY2F0ZWdvcnkYAyABKAkSKQoFdGFibGUYBCABKAsyGi5ieXRlYmFzZS52MS5UYWJsZU1ldGFkYXRhEioKB2NhdGFsb2cYBSABKAsyGS5ieXRlYmFzZS52MS5UYWJsZUNhdGFsb2cimAUKGURhdGFDbGFzc2lmaWNhdGlvblNldHRpbmcSUAoHY29uZmlncxgBIAMoCzI/LmJ5dGViYXNlLnYxLkRhdGFDbGFzc2lmaWNhdGlvblNldHRpbmcuRGF0YUNsYXNzaWZpY2F0aW9uQ29uZmlnGqgEChhEYXRhQ2xhc3NpZmljYXRpb25Db25maWcSCgoCaWQYASABKAkSDQoFdGl0bGUYAiABKAkSVQoGbGV2ZWxzGAMgAygLMkUuYnl0ZWJhc2UudjEuRGF0YUNsYXNzaWZpY2F0aW9uU2V0dGluZy5EYXRhQ2xhc3NpZmljYXRpb25Db25maWcuTGV2ZWwSawoOY2xhc3NpZmljYXRpb24YBCADKAsyUy5ieXRlYmFzZS52MS5EYXRhQ2xhc3NpZmljYXRpb25TZXR0aW5nLkRhdGFDbGFzc2lmaWNhdGlvbkNvbmZpZy5DbGFzc2lmaWNhdGlvbkVudHJ5GjcKBUxldmVsEgoKAmlkGAEgASgJEg0KBXRpdGxlGAIgASgJEhMKC2Rlc2NyaXB0aW9uGAMgASgJGmgKEkRhdGFDbGFzc2lmaWNhdGlvbhIKCgJpZBgBIAEoCRINCgV0aXRsZRgCIAEoCRITCgtkZXNjcmlwdGlvbhgDIAEoCRIVCghsZXZlbF9pZBgEIAEoCUgAiAEBQgsKCV9sZXZlbF9pZBqJAQoTQ2xhc3NpZmljYXRpb25FbnRyeRILCgNrZXkYASABKAkSYQoFdmFsdWUYAiABKAsyUi5ieXRlYmFzZS52MS5EYXRhQ2xhc3NpZmljYXRpb25TZXR0aW5nLkRhdGFDbGFzc2lmaWNhdGlvbkNvbmZpZy5EYXRhQ2xhc3NpZmljYXRpb246AjgBIswBChNTZW1hbnRpY1R5cGVTZXR0aW5nEjwKBXR5cGVzGAEgAygLMi0uYnl0ZWJhc2UudjEuU2VtYW50aWNUeXBlU2V0dGluZy5TZW1hbnRpY1R5cGUadwoMU2VtYW50aWNUeXBlEgoKAmlkGAEgASgJEg0KBXRpdGxlGAIgASgJEhMKC2Rlc2NyaXB0aW9uGAMgASgJEikKCWFsZ29yaXRobRgGIAEoCzIWLmJ5dGViYXNlLnYxLkFsZ29yaXRobRIMCgRpY29uGAcgASgJIv8ECglBbGdvcml0aG0SNAoJZnVsbF9tYXNrGAUgASgLMh8uYnl0ZWJhc2UudjEuQWxnb3JpdGhtLkZ1bGxNYXNrSAASNgoKcmFuZ2VfbWFzaxgGIAEoCzIgLmJ5dGViYXNlLnYxLkFsZ29yaXRobS5SYW5nZU1hc2tIABIyCghtZDVfbWFzaxgHIAEoCzIeLmJ5dGViYXNlLnYxLkFsZ29yaXRobS5NRDVNYXNrSAASQQoQaW5uZXJfb3V0ZXJfbWFzaxgIIAEoCzIlLmJ5dGViYXNlLnYxLkFsZ29yaXRobS5Jbm5lck91dGVyTWFza0gAGiAKCEZ1bGxNYXNrEhQKDHN1YnN0aXR1dGlvbhgBIAEoCRp+CglSYW5nZU1hc2sSNgoGc2xpY2VzGAEgAygLMiYuYnl0ZWJhc2UudjEuQWxnb3JpdGhtLlJhbmdlTWFzay5TbGljZRo5CgVTbGljZRINCgVzdGFydBgBIAEoBRILCgNlbmQYAiABKAUSFAoMc3Vic3RpdHV0aW9uGAMgASgJGhcKB01ENU1hc2sSDAoEc2FsdBgBIAEoCRrJAQoOSW5uZXJPdXRlck1hc2sSEgoKcHJlZml4X2xlbhgBIAEoBRISCgpzdWZmaXhfbGVuGAIgASgFEjwKBHR5cGUYAyABKA4yLi5ieXRlYmFzZS52MS5BbGdvcml0aG0uSW5uZXJPdXRlck1hc2suTWFza1R5cGUSFAoMc3Vic3RpdHV0aW9uGAQgASgJIjsKCE1hc2tUeXBlEhkKFU1BU0tfVFlQRV9VTlNQRUNJRklFRBAAEgkKBUlOTkVSEAESCQoFT1VURVIQAkIGCgRtYXNrIhwKC1NDSU1TZXR0aW5nEg0KBXRva2VuGAEgASgJIosCChpQYXNzd29yZFJlc3RyaWN0aW9uU2V0dGluZxISCgptaW5fbGVuZ3RoGAEgASgFEhYKDnJlcXVpcmVfbnVtYmVyGAIgASgIEhYKDnJlcXVpcmVfbGV0dGVyGAMgASgIEiAKGHJlcXVpcmVfdXBwZXJjYXNlX2xldHRlchgEIAEoCBIhChlyZXF1aXJlX3NwZWNpYWxfY2hhcmFjdGVyGAUgASgIEi4KJnJlcXVpcmVfcmVzZXRfcGFzc3dvcmRfZm9yX2ZpcnN0X2xvZ2luGAYgASgIEjQKEXBhc3N3b3JkX3JvdGF0aW9uGAcgASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uIu8BCglBSVNldHRpbmcSDwoHZW5hYmxlZBgBIAEoCBIxCghwcm92aWRlchgCIAEoDjIfLmJ5dGViYXNlLnYxLkFJU2V0dGluZy5Qcm92aWRlchIQCghlbmRwb2ludBgDIAEoCRIPCgdhcGlfa2V5GAQgASgJEg0KBW1vZGVsGAUgASgJEg8KB3ZlcnNpb24YBiABKAkiWwoIUHJvdmlkZXISGAoUUFJPVklERVJfVU5TUEVDSUZJRUQQABILCgdPUEVOX0FJEAESCgoGQ0xBVURFEAISCgoGR0VNSU5JEAMSEAoMQVpVUkVfT1BFTkFJEAQilgIKEkVudmlyb25tZW50U2V0dGluZxJBCgxlbnZpcm9ubWVudHMYASADKAsyKy5ieXRlYmFzZS52MS5FbnZpcm9ubWVudFNldHRpbmcuRW52aXJvbm1lbnQavAEKC0Vudmlyb25tZW50EhEKBG5hbWUYASABKAlCA+BBAxIKCgJpZBgCIAEoCRINCgV0aXRsZRgDIAEoCRJDCgR0YWdzGAQgAygLMjUuYnl0ZWJhc2UudjEuRW52aXJvbm1lbnRTZXR0aW5nLkVudmlyb25tZW50LlRhZ3NFbnRyeRINCgVjb2xvchgFIAEoCRorCglUYWdzRW50cnkSCwoDa2V5GAEgASgJEg0KBXZhbHVlGAIgASgJOgI4ASpUChJEYXRhYmFzZUNoYW5nZU1vZGUSJAogREFUQUJBU0VfQ0hBTkdFX01PREVfVU5TUEVDSUZJRUQQABIMCghQSVBFTElORRABEgoKBkVESVRPUhACMq4DCg5TZXR0aW5nU2VydmljZRKEAQoMTGlzdFNldHRpbmdzEiAuYnl0ZWJhc2UudjEuTGlzdFNldHRpbmdzUmVxdWVzdBohLmJ5dGViYXNlLnYxLkxpc3RTZXR0aW5nc1Jlc3BvbnNlIi/aQQCK6jAQYmIuc2V0dGluZ3MubGlzdJDqMAGC0+STAg4SDC92MS9zZXR0aW5ncxJ/CgpHZXRTZXR0aW5nEh4uYnl0ZWJhc2UudjEuR2V0U2V0dGluZ1JlcXVlc3QaFC5ieXRlYmFzZS52MS5TZXR0aW5nIjvaQQRuYW1liuowD2JiLnNldHRpbmdzLmdldJDqMAGC0+STAhcSFS92MS97bmFtZT1zZXR0aW5ncy8qfRKTAQoNVXBkYXRlU2V0dGluZxIhLmJ5dGViYXNlLnYxLlVwZGF0ZVNldHRpbmdSZXF1ZXN0GhQuYnl0ZWJhc2UudjEuU2V0dGluZyJJiuowD2JiLnNldHRpbmdzLnNldJDqMAGY6jABgtPkkwIoOgdzZXR0aW5nMh0vdjEve3NldHRpbmcubmFtZT1zZXR0aW5ncy8qfUKpAQoPY29tLmJ5dGViYXNlLnYxQhNTZXR0aW5nU2VydmljZVByb3RvUAFaNGdpdGh1Yi5jb20vYnl0ZWJhc2UvYnl0ZWJhc2UvYmFja2VuZC9nZW5lcmF0ZWQtZ28vdjGiAgNCWFiqAgtCeXRlYmFzZS5WMcoCC0J5dGViYXNlXFYx4gIXQnl0ZWJhc2VcVjFcR1BCTWV0YWRhdGHqAgxCeXRlYmFzZTo6VjFiBnByb3RvMw", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_duration, file_google_protobuf_field_mask, file_google_type_expr, file_v1_annotation, file_v1_common, file_v1_database_catalog_service, file_v1_database_service, 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.yaml
index b5536d8377..d4b4cfe0d5 100644
--- a/proto/gen/grpc-doc/openapi.yaml
+++ b/proto/gen/grpc-doc/openapi.yaml
@@ -14553,8 +14553,7 @@ components:
source:
enum:
- SOURCE_UNSPECIFIED
- - DDL
- - DML
+ - CHANGE_DATABASE
- CREATE_DATABASE
- EXPORT_DATA
- REQUEST_ROLE
diff --git a/proto/gen/grpc-doc/store/README.md b/proto/gen/grpc-doc/store/README.md
index 2ea207f4b3..ccf3c31af0 100644
--- a/proto/gen/grpc-doc/store/README.md
+++ b/proto/gen/grpc-doc/store/README.md
@@ -4808,11 +4808,10 @@ We support three levels of AlertLevel: INFO, WARNING, and ERROR.
| Name | Number | Description |
| ---- | ------ | ----------- |
| SOURCE_UNSPECIFIED | 0 | |
-| DDL | 1 | |
-| DML | 2 | |
-| CREATE_DATABASE | 3 | |
-| EXPORT_DATA | 4 | |
-| REQUEST_ROLE | 5 | |
+| CHANGE_DATABASE | 1 | |
+| CREATE_DATABASE | 2 | |
+| EXPORT_DATA | 3 | |
+| REQUEST_ROLE | 4 | |
diff --git a/proto/gen/grpc-doc/store/index.html b/proto/gen/grpc-doc/store/index.html
index e6b5bf6613..983f67037a 100644
--- a/proto/gen/grpc-doc/store/index.html
+++ b/proto/gen/grpc-doc/store/index.html
@@ -12669,32 +12669,26 @@ Default to this mode.</p></td>
</tr>
<tr>
- <td>DDL</td>
+ <td>CHANGE_DATABASE</td>
<td>1</td>
<td><p></p></td>
</tr>
- <tr>
- <td>DML</td>
- <td>2</td>
- <td><p></p></td>
- </tr>
-
<tr>
<td>CREATE_DATABASE</td>
- <td>3</td>
+ <td>2</td>
<td><p></p></td>
</tr>
<tr>
<td>EXPORT_DATA</td>
- <td>4</td>
+ <td>3</td>
<td><p></p></td>
</tr>
<tr>
<td>REQUEST_ROLE</td>
- <td>5</td>
+ <td>4</td>
<td><p></p></td>
</tr>
diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.md
index 180acd9e74..1c6380fcec 100644
--- a/proto/gen/grpc-doc/v1/README.md
+++ b/proto/gen/grpc-doc/v1/README.md
@@ -5350,11 +5350,9 @@ The `source` field filters which rules apply. The `condition` field then evaluat
All supported variables: statement.affected_rows: affected row count in the DDL/DML, support &#34;==&#34;, &#34;!=&#34;, &#34;&lt;&#34;, &#34;&lt;=&#34;, &#34;&gt;&#34;, &#34;&gt;=&#34; operations. statement.table_rows: table row count number, support &#34;==&#34;, &#34;!=&#34;, &#34;&lt;&#34;, &#34;&lt;=&#34;, &#34;&gt;&#34;, &#34;&gt;=&#34; operations. resource.environment_id: the environment resource id, support &#34;==&#34;, &#34;!=&#34;, &#34;in [xx]&#34;, &#34;!(in [xx])&#34; operations. resource.project_id: the project resource id, support &#34;==&#34;, &#34;!=&#34;, &#34;in [xx]&#34;, &#34;!(in [xx])&#34;, &#34;contains()&#34;, &#34;matches()&#34;, &#34;startsWith()&#34;, &#34;endsWith()&#34; operations. resource.db_engine: the database engine type, support &#34;==&#34;, &#34;!=&#34;, &#34;in [xx]&#34;, &#34;!(in [xx])&#34; operations. Check the Engine enum for values. statement.sql_type: the SQL type, support &#34;==&#34;, &#34;!=&#34;, &#34;in [xx]&#34;, &#34;!(in [xx])&#34; operations. resource.database_name: the database name, support &#34;==&#34;, &#34;!=&#34;, &#34;in [xx]&#34;, &#34;!(in [xx])&#34;, &#34;contains()&#34;, &#34;matches()&#34;, &#34;startsWith()&#34;, &#34;endsWith()&#34; operations. resource.schema_name: the schema name, support &#34;==&#34;, &#34;!=&#34;, &#34;in [xx]&#34;, &#34;!(in [xx])&#34;, &#34;contains()&#34;, &#34;matches()&#34;, &#34;startsWith()&#34;, &#34;endsWith()&#34; operations. resource.table_name: the table name, support &#34;==&#34;, &#34;!=&#34;, &#34;in [xx]&#34;, &#34;!(in [xx])&#34;, &#34;contains()&#34;, &#34;matches()&#34;, &#34;startsWith()&#34;, &#34;endsWith()&#34; operations. statement.text: the SQL statement, support &#34;contains()&#34;, &#34;matches()&#34;, &#34;startsWith()&#34;, &#34;endsWith()&#34; operations. request.expiration_days: the role expiration days for the request, support &#34;==&#34;, &#34;!=&#34;, &#34;&lt;&#34;, &#34;&lt;=&#34;, &#34;&gt;&#34;, &#34;&gt;=&#34; operations. request.role: the request role full name, support &#34;==&#34;, &#34;!=&#34;, &#34;in [xx]&#34;, &#34;!(in [xx])&#34;, &#34;contains()&#34;, &#34;matches()&#34;, &#34;startsWith()&#34;, &#34;endsWith()&#34; operations.
-When source is DDL/DML, support: statement.*, resource.* (excluding request.*) When source is CREATE_DATABASE, support: resource.environment_id, resource.project_id, resource.db_engine, resource.database_name When source is EXPORT_DATA, support: resource.environment_id, resource.project_id, resource.db_engine, resource.database_name, resource.schema_name, resource.table_name When source is REQUEST_ROLE, support: resource.project_id, request.expiration_days, request.role
+When source is CHANGE_DATABASE, support: statement.*, resource.* (excluding request.*) When source is CREATE_DATABASE, support: resource.environment_id, resource.project_id, resource.db_engine, resource.database_name When source is EXPORT_DATA, support: resource.environment_id, resource.project_id, resource.db_engine, resource.database_name, resource.schema_name, resource.table_name When source is REQUEST_ROLE, support: resource.project_id, request.expiration_days, request.role
-For examples: resource.environment_id == &#34;prod&#34; &amp;&amp; statement.affected_rows &gt;= 100 resource.table_name.matches(&#34;sensitive_.*&#34;) &amp;&amp; resource.db_engine == &#34;MYSQL&#34;
-
-Legacy format (deprecated): source == &#34;DDL&#34; &amp;&amp; level == &#34;HIGH&#34; |
+For examples: resource.environment_id == &#34;prod&#34; &amp;&amp; statement.affected_rows &gt;= 100 resource.table_name.matches(&#34;sensitive_.*&#34;) &amp;&amp; resource.db_engine == &#34;MYSQL&#34; |
| source | [WorkspaceApprovalSetting.Rule.Source](#bytebase-v1-WorkspaceApprovalSetting-Rule-Source) | | |
@@ -5481,11 +5479,10 @@ We support three levels of AlertLevel: INFO, WARNING, and ERROR.
| Name | Number | Description |
| ---- | ------ | ----------- |
| SOURCE_UNSPECIFIED | 0 | |
-| DDL | 1 | |
-| DML | 2 | |
-| CREATE_DATABASE | 3 | |
-| EXPORT_DATA | 4 | |
-| REQUEST_ROLE | 5 | |
+| CHANGE_DATABASE | 1 | |
+| CREATE_DATABASE | 2 | |
+| EXPORT_DATA | 3 | |
+| REQUEST_ROLE | 4 | |
diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.html
index 6c50d0413a..56adb84236 100644
--- a/proto/gen/grpc-doc/v1/index.html
+++ b/proto/gen/grpc-doc/v1/index.html
@@ -15447,16 +15447,14 @@ statement.text: the SQL statement, support &#34;contains()&#34;, &#34;matches()&
request.expiration_days: the role expiration days for the request, support &#34;==&#34;, &#34;!=&#34;, &#34;&lt;&#34;, &#34;&lt;=&#34;, &#34;&gt;&#34;, &#34;&gt;=&#34; operations.
request.role: the request role full name, support &#34;==&#34;, &#34;!=&#34;, &#34;in [xx]&#34;, &#34;!(in [xx])&#34;, &#34;contains()&#34;, &#34;matches()&#34;, &#34;startsWith()&#34;, &#34;endsWith()&#34; operations.
-When source is DDL/DML, support: statement.*, resource.* (excluding request.*)
+When source is CHANGE_DATABASE, support: statement.*, resource.* (excluding request.*)
When source is CREATE_DATABASE, support: resource.environment_id, resource.project_id, resource.db_engine, resource.database_name
When source is EXPORT_DATA, support: resource.environment_id, resource.project_id, resource.db_engine, resource.database_name, resource.schema_name, resource.table_name
When source is REQUEST_ROLE, support: resource.project_id, request.expiration_days, request.role
For examples:
resource.environment_id == &#34;prod&#34; &amp;&amp; statement.affected_rows &gt;= 100
-resource.table_name.matches(&#34;sensitive_.*&#34;) &amp;&amp; resource.db_engine == &#34;MYSQL&#34;
-
-Legacy format (deprecated): source == &#34;DDL&#34; &amp;&amp; level == &#34;HIGH&#34; </p></td>
+resource.table_name.matches(&#34;sensitive_.*&#34;) &amp;&amp; resource.db_engine == &#34;MYSQL&#34; </p></td>
</tr>
<tr>
@@ -15847,32 +15845,26 @@ Default to this mode.</p></td>
</tr>
<tr>
- <td>DDL</td>
+ <td>CHANGE_DATABASE</td>
<td>1</td>
<td><p></p></td>
</tr>
- <tr>
- <td>DML</td>
- <td>2</td>
- <td><p></p></td>
- </tr>
-
<tr>
<td>CREATE_DATABASE</td>
- <td>3</td>
+ <td>2</td>
<td><p></p></td>
</tr>
<tr>
<td>EXPORT_DATA</td>
- <td>4</td>
+ <td>3</td>
<td><p></p></td>
</tr>
<tr>
<td>REQUEST_ROLE</td>
- <td>5</td>
+ <td>4</td>
<td><p></p></td>
</tr>
diff --git a/proto/store/store/setting.proto b/proto/store/store/setting.proto
index d4b46ef6dc..33b4504aac 100644
--- a/proto/store/store/setting.proto
+++ b/proto/store/store/setting.proto
@@ -101,11 +101,10 @@ message WorkspaceApprovalSetting {
Source source = 3;
enum Source {
SOURCE_UNSPECIFIED = 0;
- DDL = 1;
- DML = 2;
- CREATE_DATABASE = 3;
- EXPORT_DATA = 4;
- REQUEST_ROLE = 5;
+ CHANGE_DATABASE = 1;
+ CREATE_DATABASE = 2;
+ EXPORT_DATA = 3;
+ REQUEST_ROLE = 4;
}
}
repeated Rule rules = 1;
diff --git a/proto/v1/v1/setting_service.proto b/proto/v1/v1/setting_service.proto
index 388501ec81..259edca12e 100644
--- a/proto/v1/v1/setting_service.proto
+++ b/proto/v1/v1/setting_service.proto
@@ -267,7 +267,7 @@ message WorkspaceApprovalSetting {
// request.expiration_days: the role expiration days for the request, support "==", "!=", "<", "<=", ">", ">=" operations.
// request.role: the request role full name, support "==", "!=", "in [xx]", "!(in [xx])", "contains()", "matches()", "startsWith()", "endsWith()" operations.
//
- // When source is DDL/DML, support: statement.*, resource.* (excluding request.*)
+ // When source is CHANGE_DATABASE, support: statement.*, resource.* (excluding request.*)
// When source is CREATE_DATABASE, support: resource.environment_id, resource.project_id, resource.db_engine, resource.database_name
// When source is EXPORT_DATA, support: resource.environment_id, resource.project_id, resource.db_engine, resource.database_name, resource.schema_name, resource.table_name
// When source is REQUEST_ROLE, support: resource.project_id, request.expiration_days, request.role
@@ -275,17 +275,14 @@ message WorkspaceApprovalSetting {
// For examples:
// resource.environment_id == "prod" && statement.affected_rows >= 100
// resource.table_name.matches("sensitive_.*") && resource.db_engine == "MYSQL"
- //
- // Legacy format (deprecated): source == "DDL" && level == "HIGH"
google.type.Expr condition = 2;
Source source = 3;
enum Source {
SOURCE_UNSPECIFIED = 0;
- DDL = 1;
- DML = 2;
- CREATE_DATABASE = 3;
- EXPORT_DATA = 4;
- REQUEST_ROLE = 5;
+ CHANGE_DATABASE = 1;
+ CREATE_DATABASE = 2;
+ EXPORT_DATA = 3;
+ REQUEST_ROLE = 4;
}
}
repeated Rule rules = 1;