Skip to content

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

refactor: remove DISABLED level and add rule deletion (#17757)

Danny Xuba63465a193e
diff --git a/backend/api/v1/org_policy_service.go b/backend/api/v1/org_policy_service.go
index 2c033cc9e5..90a0a2be34 100644
--- a/backend/api/v1/org_policy_service.go
+++ b/backend/api/v1/org_policy_service.go
@@ -572,8 +572,6 @@ func convertToV1PBSQLReviewRules(ruleList []*storepb.SQLReviewRule) []*v1pb.SQLR
level = v1pb.SQLReviewRuleLevel_ERROR
case storepb.SQLReviewRuleLevel_WARNING:
level = v1pb.SQLReviewRuleLevel_WARNING
- case storepb.SQLReviewRuleLevel_DISABLED:
- level = v1pb.SQLReviewRuleLevel_DISABLED
default:
}
rules = append(rules, &v1pb.SQLReviewRule{
@@ -597,8 +595,6 @@ func convertToSQLReviewRules(rules []*v1pb.SQLReviewRule) ([]*storepb.SQLReviewR
level = storepb.SQLReviewRuleLevel_ERROR
case v1pb.SQLReviewRuleLevel_WARNING:
level = storepb.SQLReviewRuleLevel_WARNING
- case v1pb.SQLReviewRuleLevel_DISABLED:
- level = storepb.SQLReviewRuleLevel_DISABLED
default:
return nil, errors.Errorf("invalid rule level %v", rule.Level)
}
diff --git a/backend/api/v1/review_config_service.go b/backend/api/v1/review_config_service.go
index fb52b97a9b..dd97879c1c 100644
--- a/backend/api/v1/review_config_service.go
+++ b/backend/api/v1/review_config_service.go
@@ -121,6 +121,9 @@ func (s *ReviewConfigService) UpdateReviewConfig(ctx context.Context, req *conne
case "title":
patch.Name = &req.Msg.ReviewConfig.Title
case "rules":
+ if err := validateSQLReviewRules(req.Msg.ReviewConfig.Rules); err != nil {
+ return nil, connect.NewError(connect.CodeInvalidArgument, err)
+ }
ruleList, err := convertToSQLReviewRules(req.Msg.ReviewConfig.Rules)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrap(err, "failed to convert rules"))
@@ -289,6 +292,9 @@ func validateSQLReviewRules(rules []*v1pb.SQLReviewRule) error {
return errors.Errorf("invalid payload, rule list cannot be empty")
}
for _, rule := range rules {
+ if rule.Level == v1pb.SQLReviewRuleLevel_LEVEL_UNSPECIFIED {
+ return errors.Errorf("invalid rule level: LEVEL_UNSPECIFIED is not allowed for rule %q", rule.Type)
+ }
ruleType := advisor.SQLReviewRuleType(rule.Type)
// TODO(rebelice): add other SQL review rule validation.
switch ruleType {
diff --git a/backend/api/v1/review_config_service_test.go b/backend/api/v1/review_config_service_test.go
new file mode 100644
index 0000000000..fd21ec004a
--- /dev/null
+++ b/backend/api/v1/review_config_service_test.go
@@ -0,0 +1,93 @@
+package v1
+
+import (
+ "testing"
+
+ "github.com/stretchr/testify/require"
+
+ v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
+)
+
+func TestValidateSQLReviewRules(t *testing.T) {
+ tests := []struct {
+ name string
+ rules []*v1pb.SQLReviewRule
+ wantErr bool
+ errMsg string
+ }{
+ {
+ name: "empty rule list",
+ rules: []*v1pb.SQLReviewRule{},
+ wantErr: true,
+ errMsg: "invalid payload, rule list cannot be empty",
+ },
+ {
+ name: "valid ERROR level",
+ rules: []*v1pb.SQLReviewRule{
+ {
+ Type: "table.require-pk",
+ Level: v1pb.SQLReviewRuleLevel_ERROR,
+ Engine: v1pb.Engine_POSTGRES,
+ Payload: "",
+ },
+ },
+ wantErr: false,
+ },
+ {
+ name: "valid WARNING level",
+ rules: []*v1pb.SQLReviewRule{
+ {
+ Type: "table.require-pk",
+ Level: v1pb.SQLReviewRuleLevel_WARNING,
+ Engine: v1pb.Engine_POSTGRES,
+ Payload: "",
+ },
+ },
+ wantErr: false,
+ },
+ {
+ name: "invalid LEVEL_UNSPECIFIED",
+ rules: []*v1pb.SQLReviewRule{
+ {
+ Type: "table.require-pk",
+ Level: v1pb.SQLReviewRuleLevel_LEVEL_UNSPECIFIED,
+ Engine: v1pb.Engine_POSTGRES,
+ Payload: "",
+ },
+ },
+ wantErr: true,
+ errMsg: "invalid rule level: LEVEL_UNSPECIFIED is not allowed for rule \"table.require-pk\"",
+ },
+ {
+ name: "multiple rules with one invalid",
+ rules: []*v1pb.SQLReviewRule{
+ {
+ Type: "table.require-pk",
+ Level: v1pb.SQLReviewRuleLevel_ERROR,
+ Engine: v1pb.Engine_POSTGRES,
+ Payload: "",
+ },
+ {
+ Type: "table.no-foreign-key",
+ Level: v1pb.SQLReviewRuleLevel_LEVEL_UNSPECIFIED,
+ Engine: v1pb.Engine_POSTGRES,
+ Payload: "",
+ },
+ },
+ wantErr: true,
+ errMsg: "invalid rule level: LEVEL_UNSPECIFIED is not allowed for rule \"table.no-foreign-key\"",
+ },
+ }
+
+ for _, tt := range tests {
+ t.Run(tt.name, func(t *testing.T) {
+ err := validateSQLReviewRules(tt.rules)
+ if tt.wantErr {
+ require.Error(t, err)
+ require.Contains(t, err.Error(), tt.errMsg)
+ } else {
+ require.NoError(t, err)
+ }
+ })
+ }
+}
diff --git a/backend/generated-go/store/policy.pb.go b/backend/generated-go/store/policy.pb.go
index 02ded430dc..8f659d6124 100644
--- a/backend/generated-go/store/policy.pb.go
+++ b/backend/generated-go/store/policy.pb.go
@@ -29,7 +29,6 @@ const (
SQLReviewRuleLevel_LEVEL_UNSPECIFIED SQLReviewRuleLevel = 0
SQLReviewRuleLevel_ERROR SQLReviewRuleLevel = 1
SQLReviewRuleLevel_WARNING SQLReviewRuleLevel = 2
- SQLReviewRuleLevel_DISABLED SQLReviewRuleLevel = 3
)
// Enum value maps for SQLReviewRuleLevel.
@@ -38,13 +37,11 @@ var (
0: "LEVEL_UNSPECIFIED",
1: "ERROR",
2: "WARNING",
- 3: "DISABLED",
}
SQLReviewRuleLevel_value = map[string]int32{
"LEVEL_UNSPECIFIED": 0,
"ERROR": 1,
"WARNING": 2,
- "DISABLED": 3,
}
)
@@ -1331,12 +1328,11 @@ const file_store_policy_proto_rawDesc = "" +
"\vRestriction\x12\x1b\n" +
"\x17RESTRICTION_UNSPECIFIED\x10\x00\x12\f\n" +
"\bFALLBACK\x10\x01\x12\f\n" +
- "\bDISALLOW\x10\x02*Q\n" +
+ "\bDISALLOW\x10\x02*C\n" +
"\x12SQLReviewRuleLevel\x12\x15\n" +
"\x11LEVEL_UNSPECIFIED\x10\x00\x12\t\n" +
"\x05ERROR\x10\x01\x12\v\n" +
- "\aWARNING\x10\x02\x12\f\n" +
- "\bDISABLED\x10\x03B\x14Z\x12generated-go/storeb\x06proto3"
+ "\aWARNING\x10\x02B\x14Z\x12generated-go/storeb\x06proto3"
var (
file_store_policy_proto_rawDescOnce sync.Once
diff --git a/backend/generated-go/v1/org_policy_service.pb.go b/backend/generated-go/v1/org_policy_service.pb.go
index 349c793609..656adc3ca0 100644
--- a/backend/generated-go/v1/org_policy_service.pb.go
+++ b/backend/generated-go/v1/org_policy_service.pb.go
@@ -162,8 +162,6 @@ const (
SQLReviewRuleLevel_ERROR SQLReviewRuleLevel = 1
// Rule violation is a warning.
SQLReviewRuleLevel_WARNING SQLReviewRuleLevel = 2
- // Rule is disabled.
- SQLReviewRuleLevel_DISABLED SQLReviewRuleLevel = 3
)
// Enum value maps for SQLReviewRuleLevel.
@@ -172,13 +170,11 @@ var (
0: "LEVEL_UNSPECIFIED",
1: "ERROR",
2: "WARNING",
- 3: "DISABLED",
}
SQLReviewRuleLevel_value = map[string]int32{
"LEVEL_UNSPECIFIED": 0,
"ERROR": 1,
"WARNING": 2,
- "DISABLED": 3,
}
)
@@ -1765,12 +1761,11 @@ const file_v1_org_policy_service_proto_rawDesc = "" +
"\x19RESOURCE_TYPE_UNSPECIFIED\x10\x00\x12\r\n" +
"\tWORKSPACE\x10\x01\x12\x0f\n" +
"\vENVIRONMENT\x10\x02\x12\v\n" +
- "\aPROJECT\x10\x03*Q\n" +
+ "\aPROJECT\x10\x03*C\n" +
"\x12SQLReviewRuleLevel\x12\x15\n" +
"\x11LEVEL_UNSPECIFIED\x10\x00\x12\t\n" +
"\x05ERROR\x10\x01\x12\v\n" +
- "\aWARNING\x10\x02\x12\f\n" +
- "\bDISABLED\x10\x032\xf4\f\n" +
+ "\aWARNING\x10\x022\xf4\f\n" +
"\x10OrgPolicyService\x12\xa0\x02\n" +
"\tGetPolicy\x12\x1d.bytebase.v1.GetPolicyRequest\x1a\x13.bytebase.v1.Policy\"\xde\x01\xdaA\x04name\x8a\xea0\x0fbb.policies.get\x90\xea0\x01\x82\xd3\xe4\x93\x02\xb9\x01Z\"\x12 /v1/{name=projects/*/policies/*}Z&\x12$/v1/{name=environments/*/policies/*}Z#\x12!/v1/{name=instances/*/policies/*}Z/\x12-/v1/{name=instances/*/databases/*/policies/*}\x12\x15/v1/{name=policies/*}\x12\xa8\x02\n" +
"\fListPolicies\x12 .bytebase.v1.ListPoliciesRequest\x1a!.bytebase.v1.ListPoliciesResponse\"\xd2\x01\xdaA\x00\x8a\xea0\x10bb.policies.list\x90\xea0\x01\x82\xd3\xe4\x93\x02\xb0\x01Z\"\x12 /v1/{parent=projects/*}/policiesZ&\x12$/v1/{parent=environments/*}/policiesZ#\x12!/v1/{parent=instances/*}/policiesZ/\x12-/v1/{parent=instances/*/databases/*}/policies\x12\f/v1/policies\x12\xd5\x02\n" +
diff --git a/backend/migrator/migration/3.11/0015##remove_disabled_sql_review_rules.sql b/backend/migrator/migration/3.11/0015##remove_disabled_sql_review_rules.sql
new file mode 100644
index 0000000000..f2e8fae9c4
--- /dev/null
+++ b/backend/migrator/migration/3.11/0015##remove_disabled_sql_review_rules.sql
@@ -0,0 +1,36 @@
+-- Remove DISABLED rules from SQL review configurations.
+--
+-- Context: SQLReviewRuleLevel enum previously had DISABLED as an option.
+-- This has been removed - rules should either be in the policy (ERROR/WARNING) or absent.
+--
+-- This migration filters out any rules with level = "DISABLED" from the sqlReviewRules array
+-- in the review_config.payload JSONB column.
+--
+-- Note: The JSONB column stores JSON marshaled by protojson.Marshal, which uses string enum
+-- names (not integers). So level values are: "ERROR", "WARNING", "DISABLED", etc.
+--
+-- Structure: payload.sqlReviewRules[].level where level can be:
+-- "LEVEL_UNSPECIFIED"
+-- "ERROR"
+-- "WARNING"
+-- "DISABLED" (to be removed)
+
+UPDATE review_config
+SET payload = jsonb_set(
+ payload,
+ '{sqlReviewRules}',
+ COALESCE(
+ (
+ SELECT jsonb_agg(rule)
+ FROM jsonb_array_elements(payload->'sqlReviewRules') AS rule
+ WHERE (rule->>'level') != 'DISABLED'
+ ),
+ '[]'::jsonb
+ )
+)
+WHERE payload ? 'sqlReviewRules'
+ AND EXISTS (
+ SELECT 1
+ FROM jsonb_array_elements(payload->'sqlReviewRules') AS rule
+ WHERE (rule->>'level') = 'DISABLED'
+ );
diff --git a/backend/migrator/migrator_test.go b/backend/migrator/migrator_test.go
index 9984e2e22f..b194b155aa 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.11.14"), *files[len(files)-1].version)
+ require.Equal(t, semver.MustParse("3.11.15"), *files[len(files)-1].version)
}
func TestVersionUnique(t *testing.T) {
diff --git a/backend/plugin/advisor/sql_review.go b/backend/plugin/advisor/sql_review.go
index d63fab2d10..f0e95fea0c 100644
--- a/backend/plugin/advisor/sql_review.go
+++ b/backend/plugin/advisor/sql_review.go
@@ -552,9 +552,6 @@ func SQLReviewCheck(
if rule.Engine != storepb.Engine_ENGINE_UNSPECIFIED && rule.Engine != checkContext.DBType {
continue
}
- if rule.Level == storepb.SQLReviewRuleLevel_DISABLED {
- continue
- }
ruleType := SQLReviewRuleType(rule.Type)
if !isRuleAllowed(ruleType, checkContext.ChangeType) {
diff --git a/frontend/src/components/SQLReview/SQLReviewConfig.vue b/frontend/src/components/SQLReview/SQLReviewConfig.vue
index 0d7c2f5841..55bf52d476 100644
--- a/frontend/src/components/SQLReview/SQLReviewConfig.vue
+++ b/frontend/src/components/SQLReview/SQLReviewConfig.vue
@@ -20,6 +20,7 @@
:rule-list="ruleListFilteredByEngine"
:editable="true"
@rule-upsert="onRuleChange"
+ @rule-remove="$emit('rule-remove', $event)"
/>
</template>
</SQLReviewTabsByEngine>
diff --git a/frontend/src/components/SQLReview/SQLReviewCreation.vue b/frontend/src/components/SQLReview/SQLReviewCreation.vue
index 8581f8443e..cd5c03e48f 100644
--- a/frontend/src/components/SQLReview/SQLReviewCreation.vue
+++ b/frontend/src/components/SQLReview/SQLReviewCreation.vue
@@ -52,11 +52,7 @@ import {
WORKSPACE_ROUTE_SQL_REVIEW,
WORKSPACE_ROUTE_SQL_REVIEW_DETAIL,
} from "@/router/dashboard/workspaceRoutes";
-import {
- pushNotification,
- useSQLReviewStore,
- useSubscriptionV1Store,
-} from "@/store";
+import { pushNotification, useSQLReviewStore } from "@/store";
import {
reviewConfigNamePrefix,
getReviewConfigId,
@@ -69,11 +65,9 @@ import type {
import {
getRuleMapByEngine,
convertRuleMapToPolicyRuleList,
- ruleIsAvailableInSubscription,
TEMPLATE_LIST_V2 as builtInTemplateList,
} from "@/types";
import { Engine } from "@/types/proto-es/v1/common_pb";
-import { SQLReviewRuleLevel } from "@/types/proto-es/v1/org_policy_service_pb";
import { hasWorkspacePermissionV2, sqlReviewPolicySlug } from "@/utils";
import SQLReviewConfig from "./SQLReviewConfig.vue";
import SQLReviewInfo from "./SQLReviewInfo.vue";
@@ -111,7 +105,6 @@ const dialog = useDialog();
const { t } = useI18n();
const router = useRouter();
const store = useSQLReviewStore();
-const subscriptionStore = useSubscriptionV1Store();
const BASIC_INFO_STEP = 0;
const CONFIGURE_RULE_STEP = 1;
@@ -144,17 +137,7 @@ const onTemplateApply = (template: SQLReviewPolicyTemplateV2 | undefined) => {
state.selectedTemplateId = template.id;
state.pendingApplyTemplate = undefined;
- state.selectedRuleMapByEngine = getRuleMapByEngine(
- template.ruleList.map((rule) => ({
- ...rule,
- level: ruleIsAvailableInSubscription(
- rule.type,
- subscriptionStore.currentPlan
- )
- ? rule.level
- : SQLReviewRuleLevel.DISABLED,
- }))
- );
+ state.selectedRuleMapByEngine = getRuleMapByEngine(template.ruleList);
};
const onCancel = (newPolicy: SQLReviewPolicy | undefined = undefined) => {
@@ -276,12 +259,6 @@ const upsertRule = (
rule: RuleTemplateV2,
overrides: Partial<RuleTemplateV2>
) => {
- if (
- !ruleIsAvailableInSubscription(rule.type, subscriptionStore.currentPlan)
- ) {
- return;
- }
-
if (!state.selectedRuleMapByEngine.has(rule.engine)) {
state.selectedRuleMapByEngine.set(
rule.engine,
@@ -293,12 +270,15 @@ const upsertRule = (
.get(rule.engine)
?.get(rule.type);
if (!selectedRule) {
+ // Adding a new rule - use the rule's level from the template
state.selectedRuleMapByEngine.get(rule.engine)?.set(rule.type, {
...rule,
- level: SQLReviewRuleLevel.WARNING,
+ ...overrides,
});
+ state.ruleUpdated = true;
return;
}
+ // Updating existing rule with overrides
state.selectedRuleMapByEngine
.get(rule.engine)
?.set(rule.type, Object.assign(selectedRule, overrides));
diff --git a/frontend/src/components/SQLReview/components/RuleLevelSwitch.vue b/frontend/src/components/SQLReview/components/RuleLevelSwitch.vue
index 06359af529..70456c7239 100644
--- a/frontend/src/components/SQLReview/components/RuleLevelSwitch.vue
+++ b/frontend/src/components/SQLReview/components/RuleLevelSwitch.vue
@@ -47,17 +47,7 @@ const availableLevel = computed(() => {
title: t("sql-review.level.warning"),
class: "warning",
},
- {
- level: SQLReviewRuleLevel.DISABLED,
- title: t("sql-review.level.disabled"),
- class: "",
- },
- ].filter((item) => {
- if (props.editable) {
- return item.level !== SQLReviewRuleLevel.DISABLED;
- }
- return props.level === item.level;
- });
+ ].filter((item) => props.editable || props.level === item.level);
});
</script>
diff --git a/frontend/src/components/SQLReview/components/SQLReviewLevelFilter.vue b/frontend/src/components/SQLReview/components/SQLReviewLevelFilter.vue
index cacd1b6b9f..7079046673 100644
--- a/frontend/src/components/SQLReview/components/SQLReviewLevelFilter.vue
+++ b/frontend/src/components/SQLReview/components/SQLReviewLevelFilter.vue
@@ -29,11 +29,7 @@ import { SQLReviewRuleLevel } from "@/types/proto-es/v1/org_policy_service_pb";
import type { RuleListWithCategory } from "./SQLReviewCategoryTabFilter.vue";
import SQLRuleLevelBadge from "./SQLRuleLevelBadge.vue";
-const LEVEL_LIST = [
- SQLReviewRuleLevel.ERROR,
- SQLReviewRuleLevel.WARNING,
- SQLReviewRuleLevel.DISABLED,
-];
+const LEVEL_LIST = [SQLReviewRuleLevel.ERROR, SQLReviewRuleLevel.WARNING];
const props = withDefaults(
defineProps<{
@@ -73,8 +69,6 @@ const sqlReviewRuleLevelToString = (level: SQLReviewRuleLevel): string => {
return "ERROR";
case SQLReviewRuleLevel.WARNING:
return "WARNING";
- case SQLReviewRuleLevel.DISABLED:
- return "DISABLED";
default:
return "UNKNOWN";
}
diff --git a/frontend/src/components/SQLReview/components/SQLReviewPolicyDataTable.vue b/frontend/src/components/SQLReview/components/SQLReviewPolicyDataTable.vue
index 084f924412..73abe2e980 100644
--- a/frontend/src/components/SQLReview/components/SQLReviewPolicyDataTable.vue
+++ b/frontend/src/components/SQLReview/components/SQLReviewPolicyDataTable.vue
@@ -20,7 +20,6 @@ import { BBButtonConfirm } from "@/bbkit";
import Resource from "@/components/v2/ResourceOccupiedModal/Resource.vue";
import { pushNotification, useSQLReviewStore } from "@/store";
import type { SQLReviewPolicy } from "@/types";
-import { SQLReviewRuleLevel } from "@/types/proto-es/v1/org_policy_service_pb";
import { hasWorkspacePermissionV2 } from "@/utils";
import { getHighlightHTMLByRegExp } from "@/utils";
@@ -85,15 +84,7 @@ const columns = computed(
title: t("sql-review.enabled-rules"),
key: "rules",
render: (review: SQLReviewPolicy) => {
- return (
- <span>
- {
- review.ruleList.filter(
- (r) => r.level !== SQLReviewRuleLevel.DISABLED
- ).length
- }
- </span>
- );
+ return <span>{review.ruleList.length}</span>;
},
},
{
diff --git a/frontend/src/components/SQLReview/components/SQLReviewTemplateSelector.vue b/frontend/src/components/SQLReview/components/SQLReviewTemplateSelector.vue
index 0a272c1690..45d6df5ca9 100644
--- a/frontend/src/components/SQLReview/components/SQLReviewTemplateSelector.vue
+++ b/frontend/src/components/SQLReview/components/SQLReviewTemplateSelector.vue
@@ -98,7 +98,6 @@ import Resource from "@/components/v2/ResourceOccupiedModal/Resource.vue";
import { useSQLReviewPolicyList } from "@/store";
import type { SQLReviewPolicyTemplateV2 } from "@/types";
import { TEMPLATE_LIST_V2 as builtInTemplateList } from "@/types";
-import { SQLReviewRuleLevel } from "@/types/proto-es/v1/org_policy_service_pb";
import { rulesToTemplate } from "./utils";
const props = withDefaults(
@@ -121,7 +120,7 @@ defineEmits<{
const reviewPolicyList = useSQLReviewPolicyList();
const reviewPolicyTemplateList = computed(() => {
- return reviewPolicyList.value.map((r) => rulesToTemplate(r, false));
+ return reviewPolicyList.value.map((r) => rulesToTemplate(r));
});
const isSelectedTemplate = (template: SQLReviewPolicyTemplateV2) => {
@@ -129,8 +128,6 @@ const isSelectedTemplate = (template: SQLReviewPolicyTemplateV2) => {
};
const enabledRuleCount = (template: SQLReviewPolicyTemplateV2) => {
- return template.ruleList.filter(
- (rule) => rule.level !== SQLReviewRuleLevel.DISABLED
- ).length;
+ return template.ruleList.length;
};
</script>
diff --git a/frontend/src/components/SQLReview/components/SQLRuleEditDialog.vue b/frontend/src/components/SQLReview/components/SQLRuleEditDialog.vue
index 409a419d19..40e35c7e28 100644
--- a/frontend/src/components/SQLReview/components/SQLRuleEditDialog.vue
+++ b/frontend/src/components/SQLReview/components/SQLRuleEditDialog.vue
@@ -28,18 +28,6 @@
</a>
</div>
</div>
- <div class="space-y-1">
- <h3 class="text-lg text-control font-medium">
- {{ $t("sql-review.rule.active") }}
- </h3>
- <div class="flex items-center gap-x-2 text-sm">
- <NSwitch
- :disabled="disabled"
- :value="state.level !== SQLReviewRuleLevel.DISABLED"
- @update-value="toggleActivity"
- />
- </div>
- </div>
<div class="space-y-1">
<h3 class="text-lg text-control font-medium">
{{ $t("sql-review.level.name") }}
@@ -88,7 +76,7 @@
</template>
<script lang="ts" setup>
-import { NButton, NSwitch } from "naive-ui";
+import { NButton } from "naive-ui";
import { nextTick, reactive, watch, ref } from "vue";
import { BBModal, BBTextField } from "@/bbkit";
import { payloadValueListToComponentList } from "@/components/SQLReview/components";
@@ -123,10 +111,6 @@ const state = reactive<LocalState>({
getRuleLocalization(props.rule.type, props.rule.engine).description,
});
-const toggleActivity = (on: boolean) => {
- state.level = on ? SQLReviewRuleLevel.WARNING : SQLReviewRuleLevel.DISABLED;
-};
-
watch(
() => props.rule.level,
() => {
diff --git a/frontend/src/components/SQLReview/components/SQLRuleLevelBadge.vue b/frontend/src/components/SQLReview/components/SQLRuleLevelBadge.vue
index 5cf5065c20..4cbc3a678c 100644
--- a/frontend/src/components/SQLReview/components/SQLRuleLevelBadge.vue
+++ b/frontend/src/components/SQLReview/components/SQLRuleLevelBadge.vue
@@ -46,8 +46,6 @@ const sqlReviewRuleLevelToString = (level: SQLReviewRuleLevel): string => {
return "ERROR";
case SQLReviewRuleLevel.WARNING:
return "WARNING";
- case SQLReviewRuleLevel.DISABLED:
- return "DISABLED";
default:
return "UNKNOWN";
}
diff --git a/frontend/src/components/SQLReview/components/SQLRuleTable.vue b/frontend/src/components/SQLReview/components/SQLRuleTable.vue
index ea5ade6cdc..f7488b0950 100644
--- a/frontend/src/components/SQLReview/components/SQLRuleTable.vue
+++ b/frontend/src/components/SQLReview/components/SQLRuleTable.vue
@@ -38,30 +38,6 @@
>
<div class="flex justify-between items-center gap-x-2">
<div class="flex items-center gap-x-1">
- <NTooltip
- v-if="!isRuleAvailable(rule)"
- trigger="hover"
- :show-arrow="false"
- >
- <template #trigger>
- <div class="flex justify-center">
- <heroicons-outline:exclamation
- class="h-5 w-5 text-yellow-600"
- />
- </div>
- </template>
- <span class="whitespace-nowrap">
- {{
- $t("sql-review.not-available-for-free", {
- plan: $t(
- `subscription.plan.${PlanType[
- currentPlan
- ].toLowerCase()}.title`
- ),
- })
- }}
- </span>
- </NTooltip>
<span>
{{ getRuleLocalization(rule.type, rule.engine).title }}
<a
@@ -78,25 +54,28 @@
:checked="selectedRuleKeys.includes(getRuleKey(rule))"
@update:checked="(_) => toggleRule(rule)"
/>
- <div v-else class="flex items-center space-x-2">
+ <div v-else class="flex items-center gap-x-2">
<PencilIcon
v-if="editable"
- class="w-4 h-4"
+ class="w-4 h-4 cursor-pointer hover:text-accent"
@click="setActiveRule(rule)"
/>
- <NSwitch
+ <NButton
+ v-if="editable"
+ secondary
+ type="error"
size="small"
- :disabled="!editable || !isRuleAvailable(rule)"
- :value="rule.level !== SQLReviewRuleLevel.DISABLED"
- @update-value="(val) => toggleActivity(rule, val)"
- />
+ @click="$emit('rule-remove', rule)"
+ >
+ {{ $t("common.delete") }}
+ </NButton>
</div>
</div>
<RuleLevelSwitch
v-if="!hideLevel"
class="text-xs"
:level="rule.level"
- :disabled="!editable || !isRuleAvailable(rule)"
+ :disabled="!editable"
@level-change="updateLevel(rule, $event)"
/>
<p class="textinfolabel">
@@ -109,7 +88,7 @@
<SQLRuleEditDialog
v-if="state.activeRule"
:rule="state.activeRule"
- :disabled="!editable || !isRuleAvailable(state.activeRule)"
+ :disabled="!editable"
@cancel="state.activeRule = undefined"
@update:rule="onRuleChanged"
/>
@@ -118,22 +97,13 @@
<script lang="tsx" setup>
import { ExternalLinkIcon, PencilIcon } from "lucide-vue-next";
-import {
- NSwitch,
- NCheckbox,
- NDataTable,
- NButton,
- NDivider,
- NTooltip,
-} from "naive-ui";
+import { NCheckbox, NDataTable, NButton, NDivider } from "naive-ui";
import type { DataTableColumn } from "naive-ui";
import { computed, reactive } from "vue";
import { useI18n } from "vue-i18n";
-import { useCurrentPlan } from "@/store";
import type { RuleTemplateV2 } from "@/types";
-import { getRuleLocalization, ruleIsAvailableInSubscription } from "@/types";
+import { getRuleLocalization } from "@/types";
import { SQLReviewRuleLevel } from "@/types/proto-es/v1/org_policy_service_pb";
-import { PlanType } from "@/types/proto-es/v1/subscription_service_pb";
import RuleConfig from "./RuleConfigComponents/RuleConfig.vue";
import RuleLevelSwitch from "./RuleLevelSwitch.vue";
import type { RuleListWithCategory } from "./SQLReviewCategoryTabFilter.vue";
@@ -169,11 +139,11 @@ const emit = defineEmits<{
rule: RuleTemplateV2,
update: Partial<RuleTemplateV2>
): void;
+ (event: "rule-remove", rule: RuleTemplateV2): void;
(event: "update:selectedRuleKeys", keys: string[]): void;
}>();
const { t } = useI18n();
-const currentPlan = useCurrentPlan();
const state = reactive<LocalState>({
activeRule: undefined,
});
@@ -229,22 +199,6 @@ const columns = computed(() => {
};
},
},
- {
- title: t("sql-review.rule.active"),
- key: "active",
- width: "5rem",
- hide: props.hideLevel,
- render: (rule: RuleTemplateV2) => {
- return (
- <NSwitch
- size={"small"}
- disabled={!props.editable || !isRuleAvailable(rule)}
- value={rule.level !== SQLReviewRuleLevel.DISABLED}
- onUpdate:value={(val) => toggleActivity(rule, val)}
- />
- );
- },
- },
{
title: t("common.name"),
resizable: true,
@@ -272,7 +226,7 @@ const columns = computed(() => {
return (
<RuleLevelSwitch
level={rule.level}
- disabled={!props.editable || !isRuleAvailable(rule)}
+ disabled={!props.editable}
onLevel-change={(on) => updateLevel(rule, on)}
/>
);
@@ -282,15 +236,23 @@ const columns = computed(() => {
title: t("common.operations"),
hide: props.supportSelect,
key: "operations",
- width: "10rem",
+ width: "12rem",
render: (rule: RuleTemplateV2) => {
return (
- <NButton
- disabled={!isRuleAvailable(rule)}
- onClick={() => setActiveRule(rule)}
- >
- {props.editable ? t("common.edit") : t("common.view")}
- </NButton>
+ <div class="flex items-center gap-x-2">
+ <NButton onClick={() => setActiveRule(rule)}>
+ {props.editable ? t("common.edit") : t("common.view")}
+ </NButton>
+ {props.editable && (
+ <NButton
+ secondary
+ type="error"
+ onClick={() => emit("rule-remove", rule)}
+ >
+ {t("common.delete")}
+ </NButton>
+ )}
+ </div>
);
},
},
@@ -324,21 +286,10 @@ const toggleRule = (rule: RuleTemplateV2) => {
}
};
-const isRuleAvailable = (rule: RuleTemplateV2) => {
- return ruleIsAvailableInSubscription(rule.type, currentPlan.value);
-};
-
const setActiveRule = (rule: RuleTemplateV2) => {
state.activeRule = rule;
};
-const toggleActivity = (rule: RuleTemplateV2, on: boolean) => {
- updateLevel(
- rule,
- on ? SQLReviewRuleLevel.WARNING : SQLReviewRuleLevel.DISABLED
- );
-};
-
const onRuleChanged = (update: Partial<RuleTemplateV2>) => {
if (!state.activeRule) {
return;
diff --git a/frontend/src/components/SQLReview/components/SQLRuleTableWithFilter.vue b/frontend/src/components/SQLReview/components/SQLRuleTableWithFilter.vue
index 8050391ff3..37b8138adb 100644
--- a/frontend/src/components/SQLReview/components/SQLRuleTableWithFilter.vue
+++ b/frontend/src/components/SQLReview/components/SQLRuleTableWithFilter.vue
@@ -24,6 +24,7 @@
:selected-rule-keys="selectedRuleKeys"
:size="size"
@rule-upsert="onRuleChange"
+ @rule-remove="$emit('rule-remove', $event)"
@update:selected-rule-keys="$emit('update:selectedRuleKeys', $event)"
/>
<NEmpty v-else class="py-12 border rounded" />
@@ -68,6 +69,7 @@ const emit = defineEmits<{
rule: RuleTemplateV2,
update: Partial<RuleTemplateV2>
): void;
+ (event: "rule-remove", rule: RuleTemplateV2): void;
(event: "update:selectedRuleKeys", keys: string[]): void;
}>();
diff --git a/frontend/src/components/SQLReview/components/utils.ts b/frontend/src/components/SQLReview/components/utils.ts
index 6a8f884891..7c9c977503 100644
--- a/frontend/src/components/SQLReview/components/utils.ts
+++ b/frontend/src/components/SQLReview/components/utils.ts
@@ -4,7 +4,6 @@ import type {
SQLReviewPolicy,
} from "@/types";
import { convertPolicyRuleToRuleTemplate, ruleTemplateMapV2 } from "@/types";
-import { SQLReviewRuleLevel } from "@/types/proto-es/v1/org_policy_service_pb";
import type { PayloadValueType } from "./RuleConfigComponents";
export const getRuleKey = (rule: RuleTemplateV2) =>
@@ -13,12 +12,8 @@ export const getRuleKey = (rule: RuleTemplateV2) =>
export const getTemplateId = (review: SQLReviewPolicy) =>
`bb.sql-review.${review.id}`;
-export const rulesToTemplate = (
- review: SQLReviewPolicy,
- withDisabled: boolean
-) => {
+export const rulesToTemplate = (review: SQLReviewPolicy) => {
const ruleTemplateList: RuleTemplateV2[] = [];
- const usedRule = new Set<string>();
for (const rule of review.ruleList) {
const ruleTemplate = ruleTemplateMapV2.get(rule.engine)?.get(rule.type);
@@ -26,27 +21,12 @@ export const rulesToTemplate = (
continue;
}
- usedRule.add(`${rule.engine}-${rule.type}`);
const data = convertPolicyRuleToRuleTemplate(rule, ruleTemplate);
if (data) {
ruleTemplateList.push(data);
}
}
- if (withDisabled) {
- for (const map of ruleTemplateMapV2.values()) {
- for (const rule of map.values()) {
- if (usedRule.has(`${rule.engine}-${rule.type}`)) {
- continue;
- }
- ruleTemplateList.push({
- ...rule,
- level: SQLReviewRuleLevel.DISABLED,
- });
- }
- }
- }
-
return {
id: getTemplateId(review),
review,
diff --git a/frontend/src/locales/en-US.json b/frontend/src/locales/en-US.json
index ac8d84a264..54e8b83a15 100644
--- a/frontend/src/locales/en-US.json
+++ b/frontend/src/locales/en-US.json
@@ -2359,7 +2359,6 @@
"no-permission": "Only DBA or Admin has permission to create or update review policy.",
"delete": "Delete SQL review policy",
"input-then-press-enter": "Input the value then press enter to add",
- "not-available-for-free": "Rule is not available for {plan}",
"attach-resource": {
"no-linked-resources": "No attached resources",
"change-resources": "Change attached resources",
@@ -2387,7 +2386,6 @@
}
},
"rule": {
- "active": "Active"
},
"enabled-rules": "Enabled rules",
"rule-detail": "Rule detail",
@@ -2399,8 +2397,7 @@
"level": {
"name": "Level",
"error": "Error",
- "warning": "Warning",
- "disabled": "Disabled"
+ "warning": "Warning"
}
},
"audit-log": {
diff --git a/frontend/src/locales/es-ES.json b/frontend/src/locales/es-ES.json
index c48d0f49c6..16003ef0ba 100644
--- a/frontend/src/locales/es-ES.json
+++ b/frontend/src/locales/es-ES.json
@@ -2359,7 +2359,6 @@
"no-permission": "Solo el DBA o el administrador tiene permiso para crear o actualizar la política de revisión.",
"delete": "Eliminar política de revisión SQL",
"input-then-press-enter": "Ingrese el valor y luego presione enter para agregar",
- "not-available-for-free": "La regla no está disponible para {plan}",
"attach-resource": {
"no-linked-resources": "Sin recursos adjuntos",
"change-resources": "Cambiar recursos adjuntos",
@@ -2387,7 +2386,6 @@
}
},
"rule": {
- "active": "Activa"
},
"enabled-rules": "Reglas habilitadas",
"rule-detail": "Detalle de la regla",
@@ -2399,8 +2397,7 @@
"level": {
"name": "Nivel",
"error": "Error",
- "warning": "Advertencia",
- "disabled": "Deshabilitado"
+ "warning": "Advertencia"
}
},
"audit-log": {
diff --git a/frontend/src/locales/ja-JP.json b/frontend/src/locales/ja-JP.json
index 829507eecc..4b94e4ffc0 100644
--- a/frontend/src/locales/ja-JP.json
+++ b/frontend/src/locales/ja-JP.json
@@ -2359,7 +2359,6 @@
"no-permission": "管理者または DBA のみが監査ポリシーを作成または更新する権限を持っています。",
"delete": "監査ポリシーの削除",
"input-then-press-enter": "入力後、Enterを押して追加します",
- "not-available-for-free": "{plan}定期購入ではこのルールを使用できません",
"attach-resource": {
"no-linked-resources": "リソースのバインドはありません",
"change-resources": "バインドされたリソースを変更する",
@@ -2387,7 +2386,6 @@
}
},
"rule": {
- "active": "オンにする"
},
"enabled-rules": "開かれたルールの数",
"rule-detail": "ルールの詳細",
@@ -2399,8 +2397,7 @@
"level": {
"name": "レベル",
"error": "エラー",
- "warning": "警告",
- "disabled": "無効"
+ "warning": "警告"
}
},
"audit-log": {
diff --git a/frontend/src/locales/vi-VN.json b/frontend/src/locales/vi-VN.json
index 7f32f0f4ae..17ea35f25c 100644
--- a/frontend/src/locales/vi-VN.json
+++ b/frontend/src/locales/vi-VN.json
@@ -2359,7 +2359,6 @@
"no-permission": "Chỉ DBA hoặc Quản trị viên mới có quyền tạo hoặc cập nhật chính sách đánh giá.",
"delete": "Xóa chính sách đánh giá SQL",
"input-then-press-enter": "Nhập giá trị sau đó nhấn enter để thêm",
- "not-available-for-free": "Quy tắc không khả dụng cho {plan}",
"attach-resource": {
"no-linked-resources": "Không có tài nguyên nào được đính kèm",
"change-resources": "Thay đổi tài nguyên đính kèm",
@@ -2387,7 +2386,6 @@
}
},
"rule": {
- "active": "Đang hoạt động"
},
"enabled-rules": "Quy tắc được bật",
"rule-detail": "Chi tiết quy tắc",
@@ -2399,8 +2397,7 @@
"level": {
"name": "Cấp độ",
"error": "Lỗi",
- "warning": "Cảnh báo",
- "disabled": "Đã tắt"
+ "warning": "Cảnh báo"
}
},
"audit-log": {
diff --git a/frontend/src/locales/zh-CN.json b/frontend/src/locales/zh-CN.json
index b26ea388f4..e9ab60af7a 100644
--- a/frontend/src/locales/zh-CN.json
+++ b/frontend/src/locales/zh-CN.json
@@ -2359,7 +2359,6 @@
"no-permission": "仅管理员或 DBA 有权限创建或更新审核策略。",
"delete": "删除审核策略",
"input-then-press-enter": "输入后按下回车来添加",
- "not-available-for-free": "{plan}订阅不能使用该规则",
"attach-resource": {
"no-linked-resources": "没有绑定的资源",
"change-resources": "更改绑定的资源",
@@ -2387,7 +2386,6 @@
}
},
"rule": {
- "active": "开启"
},
"enabled-rules": "开启的规则数",
"rule-detail": "规则详情",
@@ -2399,8 +2397,7 @@
"level": {
"name": "级别",
"error": "错误",
- "warning": "警告",
- "disabled": "已禁用"
+ "warning": "警告"
}
},
"audit-log": {
diff --git a/frontend/src/plugins/i18n.test.ts b/frontend/src/plugins/i18n.test.ts
index 8189db561d..6e1329df71 100644
--- a/frontend/src/plugins/i18n.test.ts
+++ b/frontend/src/plugins/i18n.test.ts
@@ -97,8 +97,6 @@ const sqlReviewRuleLevelToString = (level: SQLReviewRuleLevel): string => {
return "ERROR";
case SQLReviewRuleLevel.WARNING:
return "WARNING";
- case SQLReviewRuleLevel.DISABLED:
- return "DISABLED";
default:
return "UNKNOWN";
}
diff --git a/frontend/src/types/proto-es/v1/org_policy_service_pb.d.ts b/frontend/src/types/proto-es/v1/org_policy_service_pb.d.ts
index 862096ae2e..76211516cf 100644
--- a/frontend/src/types/proto-es/v1/org_policy_service_pb.d.ts
+++ b/frontend/src/types/proto-es/v1/org_policy_service_pb.d.ts
@@ -910,13 +910,6 @@ export enum SQLReviewRuleLevel {
* @generated from enum value: WARNING = 2;
*/
WARNING = 2,
-
- /**
- * Rule is disabled.
- *
- * @generated from enum value: DISABLED = 3;
- */
- DISABLED = 3,
}
/**
diff --git a/frontend/src/types/proto-es/v1/org_policy_service_pb.js b/frontend/src/types/proto-es/v1/org_policy_service_pb.js
index 11b12cdecc..025a2e3c3e 100644
--- a/frontend/src/types/proto-es/v1/org_policy_service_pb.js
+++ b/frontend/src/types/proto-es/v1/org_policy_service_pb.js
@@ -16,7 +16,7 @@ import { file_v1_common } from "./common_pb";
* Describes the file v1/org_policy_service.proto.
*/
export const file_v1_org_policy_service = /*@__PURE__*/
- fileDesc("Cht2MS9vcmdfcG9saWN5X3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIpMBChNDcmVhdGVQb2xpY3lSZXF1ZXN0EisKBnBhcmVudBgBIAEoCUIb4EEC+kEVEhNieXRlYmFzZS5jb20vUG9saWN5EigKBnBvbGljeRgCIAEoCzITLmJ5dGViYXNlLnYxLlBvbGljeUID4EECEiUKBHR5cGUYAyABKA4yFy5ieXRlYmFzZS52MS5Qb2xpY3lUeXBlIocBChNVcGRhdGVQb2xpY3lSZXF1ZXN0EigKBnBvbGljeRgBIAEoCzITLmJ5dGViYXNlLnYxLlBvbGljeUID4EECEi8KC3VwZGF0ZV9tYXNrGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFzaxIVCg1hbGxvd19taXNzaW5nGAMgASgIIkAKE0RlbGV0ZVBvbGljeVJlcXVlc3QSKQoEbmFtZRgBIAEoCUIb4EEC+kEVChNieXRlYmFzZS5jb20vUG9saWN5Ij0KEEdldFBvbGljeVJlcXVlc3QSKQoEbmFtZRgBIAEoCUIb4EEC+kEVChNieXRlYmFzZS5jb20vUG9saWN5IsIBChNMaXN0UG9saWNpZXNSZXF1ZXN0EisKBnBhcmVudBgBIAEoCUIb4EEC+kEVEhNieXRlYmFzZS5jb20vUG9saWN5EjEKC3BvbGljeV90eXBlGAIgASgOMhcuYnl0ZWJhc2UudjEuUG9saWN5VHlwZUgAiAEBEhEKCXBhZ2Vfc2l6ZRgDIAEoBRISCgpwYWdlX3Rva2VuGAQgASgJEhQKDHNob3dfZGVsZXRlZBgFIAEoCEIOCgxfcG9saWN5X3R5cGUiVgoUTGlzdFBvbGljaWVzUmVzcG9uc2USJQoIcG9saWNpZXMYASADKAsyEy5ieXRlYmFzZS52MS5Qb2xpY3kSFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJIpUGCgZQb2xpY3kSDAoEbmFtZRgBIAEoCRIbChNpbmhlcml0X2Zyb21fcGFyZW50GAQgASgIEiUKBHR5cGUYBSABKA4yFy5ieXRlYmFzZS52MS5Qb2xpY3lUeXBlEjQKDnJvbGxvdXRfcG9saWN5GBMgASgLMhouYnl0ZWJhc2UudjEuUm9sbG91dFBvbGljeUgAEj0KE21hc2tpbmdfcnVsZV9wb2xpY3kYESABKAsyHi5ieXRlYmFzZS52MS5NYXNraW5nUnVsZVBvbGljeUgAEkcKGG1hc2tpbmdfZXhjZXB0aW9uX3BvbGljeRgSIAEoCzIjLmJ5dGViYXNlLnYxLk1hc2tpbmdFeGNlcHRpb25Qb2xpY3lIABIsCgp0YWdfcG9saWN5GBUgASgLMhYuYnl0ZWJhc2UudjEuVGFnUG9saWN5SAASRgoYZGF0YV9zb3VyY2VfcXVlcnlfcG9saWN5GBYgASgLMiIuYnl0ZWJhc2UudjEuRGF0YVNvdXJjZVF1ZXJ5UG9saWN5SAASOQoRcXVlcnlfZGF0YV9wb2xpY3kYGCABKAsyHC5ieXRlYmFzZS52MS5RdWVyeURhdGFQb2xpY3lIABIPCgdlbmZvcmNlGA0gASgIEjsKDXJlc291cmNlX3R5cGUYDiABKA4yHy5ieXRlYmFzZS52MS5Qb2xpY3lSZXNvdXJjZVR5cGVCA+BBAzrlAepB4QEKE2J5dGViYXNlLmNvbS9Qb2xpY3kSEXBvbGljaWVzL3twb2xpY3l9EiRwcm9qZWN0cy97cHJvamVjdH0vcG9saWNpZXMve3BvbGljeX0SLGVudmlyb25tZW50cy97ZW52aXJvbm1lbnR9L3BvbGljaWVzL3twb2xpY3l9EiZpbnN0YW5jZXMve2luc3RhbmNlfS9wb2xpY2llcy97cG9saWN5fRI7aW5zdGFuY2VzL3tpbnN0YW5jZX0vZGF0YWJhc2VzL3tkYXRhYmFzZX0vcG9saWNpZXMve3BvbGljeX1CCAoGcG9saWN5SgQIAhADSgQIFxAYIr4DCg1Sb2xsb3V0UG9saWN5EhEKCWF1dG9tYXRpYxgBIAEoCBINCgVyb2xlcxgCIAMoCRI1CghjaGVja2VycxgEIAEoCzIjLmJ5dGViYXNlLnYxLlJvbGxvdXRQb2xpY3kuQ2hlY2tlcnMa0wIKCENoZWNrZXJzEh8KF3JlcXVpcmVkX2lzc3VlX2FwcHJvdmFsGAEgASgIElgKFnJlcXVpcmVkX3N0YXR1c19jaGVja3MYAiABKAsyOC5ieXRlYmFzZS52MS5Sb2xsb3V0UG9saWN5LkNoZWNrZXJzLlJlcXVpcmVkU3RhdHVzQ2hlY2tzGnAKFFJlcXVpcmVkU3RhdHVzQ2hlY2tzElgKFnBsYW5fY2hlY2tfZW5mb3JjZW1lbnQYASABKA4yOC5ieXRlYmFzZS52MS5Sb2xsb3V0UG9saWN5LkNoZWNrZXJzLlBsYW5DaGVja0VuZm9yY2VtZW50IloKFFBsYW5DaGVja0VuZm9yY2VtZW50EiYKIlBMQU5fQ0hFQ0tfRU5GT1JDRU1FTlRfVU5TUEVDSUZJRUQQABIOCgpFUlJPUl9PTkxZEAESCgoGU1RSSUNUEAIiqgEKD1F1ZXJ5RGF0YVBvbGljeRIqCgd0aW1lb3V0GAEgASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uEhYKDmRpc2FibGVfZXhwb3J0GAIgASgIEhsKE21heGltdW1fcmVzdWx0X3NpemUYAyABKAMSGwoTbWF4aW11bV9yZXN1bHRfcm93cxgEIAEoBRIZChFkaXNhYmxlX2NvcHlfZGF0YRgFIAEoCCKUAQoNU1FMUmV2aWV3UnVsZRIMCgR0eXBlGAEgASgJEi4KBWxldmVsGAIgASgOMh8uYnl0ZWJhc2UudjEuU1FMUmV2aWV3UnVsZUxldmVsEg8KB3BheWxvYWQYAyABKAkSIwoGZW5naW5lGAQgASgOMhMuYnl0ZWJhc2UudjEuRW5naW5lEg8KB2NvbW1lbnQYBSABKAkiuwIKFk1hc2tpbmdFeGNlcHRpb25Qb2xpY3kSUAoSbWFza2luZ19leGNlcHRpb25zGAEgAygLMjQuYnl0ZWJhc2UudjEuTWFza2luZ0V4Y2VwdGlvblBvbGljeS5NYXNraW5nRXhjZXB0aW9uGs4BChBNYXNraW5nRXhjZXB0aW9uEksKBmFjdGlvbhgBIAEoDjI7LmJ5dGViYXNlLnYxLk1hc2tpbmdFeGNlcHRpb25Qb2xpY3kuTWFza2luZ0V4Y2VwdGlvbi5BY3Rpb24SDgoGbWVtYmVyGAMgASgJEiQKCWNvbmRpdGlvbhgEIAEoCzIRLmdvb2dsZS50eXBlLkV4cHIiNwoGQWN0aW9uEhYKEkFDVElPTl9VTlNQRUNJRklFRBAAEgkKBVFVRVJZEAESCgoGRVhQT1JUEAIipgEKEU1hc2tpbmdSdWxlUG9saWN5EjkKBXJ1bGVzGAEgAygLMiouYnl0ZWJhc2UudjEuTWFza2luZ1J1bGVQb2xpY3kuTWFza2luZ1J1bGUaVgoLTWFza2luZ1J1bGUSCgoCaWQYASABKAkSJAoJY29uZGl0aW9uGAIgASgLMhEuZ29vZ2xlLnR5cGUuRXhwchIVCg1zZW1hbnRpY190eXBlGAMgASgJImgKCVRhZ1BvbGljeRIuCgR0YWdzGAEgAygLMiAuYnl0ZWJhc2UudjEuVGFnUG9saWN5LlRhZ3NFbnRyeRorCglUYWdzRW50cnkSCwoDa2V5GAEgASgJEg0KBXZhbHVlGAIgASgJOgI4ASLiAQoVRGF0YVNvdXJjZVF1ZXJ5UG9saWN5ElUKHWFkbWluX2RhdGFfc291cmNlX3Jlc3RyaWN0aW9uGAEgASgOMi4uYnl0ZWJhc2UudjEuRGF0YVNvdXJjZVF1ZXJ5UG9saWN5LlJlc3RyaWN0aW9uEhQKDGRpc2FsbG93X2RkbBgCIAEoCBIUCgxkaXNhbGxvd19kbWwYAyABKAgiRgoLUmVzdHJpY3Rpb24SGwoXUkVTVFJJQ1RJT05fVU5TUEVDSUZJRUQQABIMCghGQUxMQkFDSxABEgwKCERJU0FMTE9XEAIqwAEKClBvbGljeVR5cGUSGwoXUE9MSUNZX1RZUEVfVU5TUEVDSUZJRUQQABISCg5ST0xMT1VUX1BPTElDWRALEhAKDE1BU0tJTkdfUlVMRRAJEhUKEU1BU0tJTkdfRVhDRVBUSU9OEAoSBwoDVEFHEA0SFQoRREFUQV9TT1VSQ0VfUVVFUlkQDhIOCgpEQVRBX1FVRVJZEBAiBAgCEAIiBAgEEAQiBAgGEAYiBAgFEAUiBAgHEAciBAgMEAwiBAgPEA8qYAoSUG9saWN5UmVzb3VyY2VUeXBlEh0KGVJFU09VUkNFX1RZUEVfVU5TUEVDSUZJRUQQABINCglXT1JLU1BBQ0UQARIPCgtFTlZJUk9OTUVOVBACEgsKB1BST0pFQ1QQAypRChJTUUxSZXZpZXdSdWxlTGV2ZWwSFQoRTEVWRUxfVU5TUEVDSUZJRUQQABIJCgVFUlJPUhABEgsKB1dBUk5JTkcQAhIMCghESVNBQkxFRBADMvQMChBPcmdQb2xpY3lTZXJ2aWNlEqACCglHZXRQb2xpY3kSHS5ieXRlYmFzZS52MS5HZXRQb2xpY3lSZXF1ZXN0GhMuYnl0ZWJhc2UudjEuUG9saWN5It4B2kEEbmFtZYrqMA9iYi5wb2xpY2llcy5nZXSQ6jABgtPkkwK5AVoiEiAvdjEve25hbWU9cHJvamVjdHMvKi9wb2xpY2llcy8qfVomEiQvdjEve25hbWU9ZW52aXJvbm1lbnRzLyovcG9saWNpZXMvKn1aIxIhL3YxL3tuYW1lPWluc3RhbmNlcy8qL3BvbGljaWVzLyp9Wi8SLS92MS97bmFtZT1pbnN0YW5jZXMvKi9kYXRhYmFzZXMvKi9wb2xpY2llcy8qfRIVL3YxL3tuYW1lPXBvbGljaWVzLyp9EqgCCgxMaXN0UG9saWNpZXMSIC5ieXRlYmFzZS52MS5MaXN0UG9saWNpZXNSZXF1ZXN0GiEuYnl0ZWJhc2UudjEuTGlzdFBvbGljaWVzUmVzcG9uc2Ui0gHaQQCK6jAQYmIucG9saWNpZXMubGlzdJDqMAGC0+STArABWiISIC92MS97cGFyZW50PXByb2plY3RzLyp9L3BvbGljaWVzWiYSJC92MS97cGFyZW50PWVudmlyb25tZW50cy8qfS9wb2xpY2llc1ojEiEvdjEve3BhcmVudD1pbnN0YW5jZXMvKn0vcG9saWNpZXNaLxItL3YxL3twYXJlbnQ9aW5zdGFuY2VzLyovZGF0YWJhc2VzLyp9L3BvbGljaWVzEgwvdjEvcG9saWNpZXMS1QIKDENyZWF0ZVBvbGljeRIgLmJ5dGViYXNlLnYxLkNyZWF0ZVBvbGljeVJlcXVlc3QaEy5ieXRlYmFzZS52MS5Qb2xpY3kijQLaQQ1wYXJlbnQscG9saWN5iuowEmJiLnBvbGljaWVzLmNyZWF0ZZDqMAGY6jABgtPkkwLYAToGcG9saWN5Wio6BnBvbGljeSIgL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vcG9saWNpZXNaLjoGcG9saWN5IiQvdjEve3BhcmVudD1lbnZpcm9ubWVudHMvKn0vcG9saWNpZXNaKzoGcG9saWN5IiEvdjEve3BhcmVudD1pbnN0YW5jZXMvKn0vcG9saWNpZXNaNzoGcG9saWN5Ii0vdjEve3BhcmVudD1pbnN0YW5jZXMvKi9kYXRhYmFzZXMvKn0vcG9saWNpZXMiDC92MS9wb2xpY2llcxKGAwoMVXBkYXRlUG9saWN5EiAuYnl0ZWJhc2UudjEuVXBkYXRlUG9saWN5UmVxdWVzdBoTLmJ5dGViYXNlLnYxLlBvbGljeSK+AtpBEnBvbGljeSx1cGRhdGVfbWFza4rqMBJiYi5wb2xpY2llcy51cGRhdGWQ6jABmOowAYLT5JMChAI6BnBvbGljeVoxOgZwb2xpY3kyJy92MS97cG9saWN5Lm5hbWU9cHJvamVjdHMvKi9wb2xpY2llcy8qfVo1OgZwb2xpY3kyKy92MS97cG9saWN5Lm5hbWU9ZW52aXJvbm1lbnRzLyovcG9saWNpZXMvKn1aMjoGcG9saWN5MigvdjEve3BvbGljeS5uYW1lPWluc3RhbmNlcy8qL3BvbGljaWVzLyp9Wj46BnBvbGljeTI0L3YxL3twb2xpY3kubmFtZT1pbnN0YW5jZXMvKi9kYXRhYmFzZXMvKi9wb2xpY2llcy8qfTIcL3YxL3twb2xpY3kubmFtZT1wb2xpY2llcy8qfRKwAgoMRGVsZXRlUG9saWN5EiAuYnl0ZWJhc2UudjEuRGVsZXRlUG9saWN5UmVxdWVzdBoWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eSLlAdpBBG5hbWWK6jASYmIucG9saWNpZXMuZGVsZXRlkOowAZjqMAGC0+STArkBWiIqIC92MS97bmFtZT1wcm9qZWN0cy8qL3BvbGljaWVzLyp9WiYqJC92MS97bmFtZT1lbnZpcm9ubWVudHMvKi9wb2xpY2llcy8qfVojKiEvdjEve25hbWU9aW5zdGFuY2VzLyovcG9saWNpZXMvKn1aLyotL3YxL3tuYW1lPWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qL3BvbGljaWVzLyp9KhUvdjEve25hbWU9cG9saWNpZXMvKn1CNlo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MWIGcHJvdG8z", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_duration, file_google_protobuf_empty, file_google_protobuf_field_mask, file_google_type_expr, file_v1_annotation, file_v1_common]);
+ fileDesc("Cht2MS9vcmdfcG9saWN5X3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIpMBChNDcmVhdGVQb2xpY3lSZXF1ZXN0EisKBnBhcmVudBgBIAEoCUIb4EEC+kEVEhNieXRlYmFzZS5jb20vUG9saWN5EigKBnBvbGljeRgCIAEoCzITLmJ5dGViYXNlLnYxLlBvbGljeUID4EECEiUKBHR5cGUYAyABKA4yFy5ieXRlYmFzZS52MS5Qb2xpY3lUeXBlIocBChNVcGRhdGVQb2xpY3lSZXF1ZXN0EigKBnBvbGljeRgBIAEoCzITLmJ5dGViYXNlLnYxLlBvbGljeUID4EECEi8KC3VwZGF0ZV9tYXNrGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFzaxIVCg1hbGxvd19taXNzaW5nGAMgASgIIkAKE0RlbGV0ZVBvbGljeVJlcXVlc3QSKQoEbmFtZRgBIAEoCUIb4EEC+kEVChNieXRlYmFzZS5jb20vUG9saWN5Ij0KEEdldFBvbGljeVJlcXVlc3QSKQoEbmFtZRgBIAEoCUIb4EEC+kEVChNieXRlYmFzZS5jb20vUG9saWN5IsIBChNMaXN0UG9saWNpZXNSZXF1ZXN0EisKBnBhcmVudBgBIAEoCUIb4EEC+kEVEhNieXRlYmFzZS5jb20vUG9saWN5EjEKC3BvbGljeV90eXBlGAIgASgOMhcuYnl0ZWJhc2UudjEuUG9saWN5VHlwZUgAiAEBEhEKCXBhZ2Vfc2l6ZRgDIAEoBRISCgpwYWdlX3Rva2VuGAQgASgJEhQKDHNob3dfZGVsZXRlZBgFIAEoCEIOCgxfcG9saWN5X3R5cGUiVgoUTGlzdFBvbGljaWVzUmVzcG9uc2USJQoIcG9saWNpZXMYASADKAsyEy5ieXRlYmFzZS52MS5Qb2xpY3kSFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJIpUGCgZQb2xpY3kSDAoEbmFtZRgBIAEoCRIbChNpbmhlcml0X2Zyb21fcGFyZW50GAQgASgIEiUKBHR5cGUYBSABKA4yFy5ieXRlYmFzZS52MS5Qb2xpY3lUeXBlEjQKDnJvbGxvdXRfcG9saWN5GBMgASgLMhouYnl0ZWJhc2UudjEuUm9sbG91dFBvbGljeUgAEj0KE21hc2tpbmdfcnVsZV9wb2xpY3kYESABKAsyHi5ieXRlYmFzZS52MS5NYXNraW5nUnVsZVBvbGljeUgAEkcKGG1hc2tpbmdfZXhjZXB0aW9uX3BvbGljeRgSIAEoCzIjLmJ5dGViYXNlLnYxLk1hc2tpbmdFeGNlcHRpb25Qb2xpY3lIABIsCgp0YWdfcG9saWN5GBUgASgLMhYuYnl0ZWJhc2UudjEuVGFnUG9saWN5SAASRgoYZGF0YV9zb3VyY2VfcXVlcnlfcG9saWN5GBYgASgLMiIuYnl0ZWJhc2UudjEuRGF0YVNvdXJjZVF1ZXJ5UG9saWN5SAASOQoRcXVlcnlfZGF0YV9wb2xpY3kYGCABKAsyHC5ieXRlYmFzZS52MS5RdWVyeURhdGFQb2xpY3lIABIPCgdlbmZvcmNlGA0gASgIEjsKDXJlc291cmNlX3R5cGUYDiABKA4yHy5ieXRlYmFzZS52MS5Qb2xpY3lSZXNvdXJjZVR5cGVCA+BBAzrlAepB4QEKE2J5dGViYXNlLmNvbS9Qb2xpY3kSEXBvbGljaWVzL3twb2xpY3l9EiRwcm9qZWN0cy97cHJvamVjdH0vcG9saWNpZXMve3BvbGljeX0SLGVudmlyb25tZW50cy97ZW52aXJvbm1lbnR9L3BvbGljaWVzL3twb2xpY3l9EiZpbnN0YW5jZXMve2luc3RhbmNlfS9wb2xpY2llcy97cG9saWN5fRI7aW5zdGFuY2VzL3tpbnN0YW5jZX0vZGF0YWJhc2VzL3tkYXRhYmFzZX0vcG9saWNpZXMve3BvbGljeX1CCAoGcG9saWN5SgQIAhADSgQIFxAYIr4DCg1Sb2xsb3V0UG9saWN5EhEKCWF1dG9tYXRpYxgBIAEoCBINCgVyb2xlcxgCIAMoCRI1CghjaGVja2VycxgEIAEoCzIjLmJ5dGViYXNlLnYxLlJvbGxvdXRQb2xpY3kuQ2hlY2tlcnMa0wIKCENoZWNrZXJzEh8KF3JlcXVpcmVkX2lzc3VlX2FwcHJvdmFsGAEgASgIElgKFnJlcXVpcmVkX3N0YXR1c19jaGVja3MYAiABKAsyOC5ieXRlYmFzZS52MS5Sb2xsb3V0UG9saWN5LkNoZWNrZXJzLlJlcXVpcmVkU3RhdHVzQ2hlY2tzGnAKFFJlcXVpcmVkU3RhdHVzQ2hlY2tzElgKFnBsYW5fY2hlY2tfZW5mb3JjZW1lbnQYASABKA4yOC5ieXRlYmFzZS52MS5Sb2xsb3V0UG9saWN5LkNoZWNrZXJzLlBsYW5DaGVja0VuZm9yY2VtZW50IloKFFBsYW5DaGVja0VuZm9yY2VtZW50EiYKIlBMQU5fQ0hFQ0tfRU5GT1JDRU1FTlRfVU5TUEVDSUZJRUQQABIOCgpFUlJPUl9PTkxZEAESCgoGU1RSSUNUEAIiqgEKD1F1ZXJ5RGF0YVBvbGljeRIqCgd0aW1lb3V0GAEgASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uEhYKDmRpc2FibGVfZXhwb3J0GAIgASgIEhsKE21heGltdW1fcmVzdWx0X3NpemUYAyABKAMSGwoTbWF4aW11bV9yZXN1bHRfcm93cxgEIAEoBRIZChFkaXNhYmxlX2NvcHlfZGF0YRgFIAEoCCKUAQoNU1FMUmV2aWV3UnVsZRIMCgR0eXBlGAEgASgJEi4KBWxldmVsGAIgASgOMh8uYnl0ZWJhc2UudjEuU1FMUmV2aWV3UnVsZUxldmVsEg8KB3BheWxvYWQYAyABKAkSIwoGZW5naW5lGAQgASgOMhMuYnl0ZWJhc2UudjEuRW5naW5lEg8KB2NvbW1lbnQYBSABKAkiuwIKFk1hc2tpbmdFeGNlcHRpb25Qb2xpY3kSUAoSbWFza2luZ19leGNlcHRpb25zGAEgAygLMjQuYnl0ZWJhc2UudjEuTWFza2luZ0V4Y2VwdGlvblBvbGljeS5NYXNraW5nRXhjZXB0aW9uGs4BChBNYXNraW5nRXhjZXB0aW9uEksKBmFjdGlvbhgBIAEoDjI7LmJ5dGViYXNlLnYxLk1hc2tpbmdFeGNlcHRpb25Qb2xpY3kuTWFza2luZ0V4Y2VwdGlvbi5BY3Rpb24SDgoGbWVtYmVyGAMgASgJEiQKCWNvbmRpdGlvbhgEIAEoCzIRLmdvb2dsZS50eXBlLkV4cHIiNwoGQWN0aW9uEhYKEkFDVElPTl9VTlNQRUNJRklFRBAAEgkKBVFVRVJZEAESCgoGRVhQT1JUEAIipgEKEU1hc2tpbmdSdWxlUG9saWN5EjkKBXJ1bGVzGAEgAygLMiouYnl0ZWJhc2UudjEuTWFza2luZ1J1bGVQb2xpY3kuTWFza2luZ1J1bGUaVgoLTWFza2luZ1J1bGUSCgoCaWQYASABKAkSJAoJY29uZGl0aW9uGAIgASgLMhEuZ29vZ2xlLnR5cGUuRXhwchIVCg1zZW1hbnRpY190eXBlGAMgASgJImgKCVRhZ1BvbGljeRIuCgR0YWdzGAEgAygLMiAuYnl0ZWJhc2UudjEuVGFnUG9saWN5LlRhZ3NFbnRyeRorCglUYWdzRW50cnkSCwoDa2V5GAEgASgJEg0KBXZhbHVlGAIgASgJOgI4ASLiAQoVRGF0YVNvdXJjZVF1ZXJ5UG9saWN5ElUKHWFkbWluX2RhdGFfc291cmNlX3Jlc3RyaWN0aW9uGAEgASgOMi4uYnl0ZWJhc2UudjEuRGF0YVNvdXJjZVF1ZXJ5UG9saWN5LlJlc3RyaWN0aW9uEhQKDGRpc2FsbG93X2RkbBgCIAEoCBIUCgxkaXNhbGxvd19kbWwYAyABKAgiRgoLUmVzdHJpY3Rpb24SGwoXUkVTVFJJQ1RJT05fVU5TUEVDSUZJRUQQABIMCghGQUxMQkFDSxABEgwKCERJU0FMTE9XEAIqwAEKClBvbGljeVR5cGUSGwoXUE9MSUNZX1RZUEVfVU5TUEVDSUZJRUQQABISCg5ST0xMT1VUX1BPTElDWRALEhAKDE1BU0tJTkdfUlVMRRAJEhUKEU1BU0tJTkdfRVhDRVBUSU9OEAoSBwoDVEFHEA0SFQoRREFUQV9TT1VSQ0VfUVVFUlkQDhIOCgpEQVRBX1FVRVJZEBAiBAgCEAIiBAgEEAQiBAgGEAYiBAgFEAUiBAgHEAciBAgMEAwiBAgPEA8qYAoSUG9saWN5UmVzb3VyY2VUeXBlEh0KGVJFU09VUkNFX1RZUEVfVU5TUEVDSUZJRUQQABINCglXT1JLU1BBQ0UQARIPCgtFTlZJUk9OTUVOVBACEgsKB1BST0pFQ1QQAypDChJTUUxSZXZpZXdSdWxlTGV2ZWwSFQoRTEVWRUxfVU5TUEVDSUZJRUQQABIJCgVFUlJPUhABEgsKB1dBUk5JTkcQAjL0DAoQT3JnUG9saWN5U2VydmljZRKgAgoJR2V0UG9saWN5Eh0uYnl0ZWJhc2UudjEuR2V0UG9saWN5UmVxdWVzdBoTLmJ5dGViYXNlLnYxLlBvbGljeSLeAdpBBG5hbWWK6jAPYmIucG9saWNpZXMuZ2V0kOowAYLT5JMCuQFaIhIgL3YxL3tuYW1lPXByb2plY3RzLyovcG9saWNpZXMvKn1aJhIkL3YxL3tuYW1lPWVudmlyb25tZW50cy8qL3BvbGljaWVzLyp9WiMSIS92MS97bmFtZT1pbnN0YW5jZXMvKi9wb2xpY2llcy8qfVovEi0vdjEve25hbWU9aW5zdGFuY2VzLyovZGF0YWJhc2VzLyovcG9saWNpZXMvKn0SFS92MS97bmFtZT1wb2xpY2llcy8qfRKoAgoMTGlzdFBvbGljaWVzEiAuYnl0ZWJhc2UudjEuTGlzdFBvbGljaWVzUmVxdWVzdBohLmJ5dGViYXNlLnYxLkxpc3RQb2xpY2llc1Jlc3BvbnNlItIB2kEAiuowEGJiLnBvbGljaWVzLmxpc3SQ6jABgtPkkwKwAVoiEiAvdjEve3BhcmVudD1wcm9qZWN0cy8qfS9wb2xpY2llc1omEiQvdjEve3BhcmVudD1lbnZpcm9ubWVudHMvKn0vcG9saWNpZXNaIxIhL3YxL3twYXJlbnQ9aW5zdGFuY2VzLyp9L3BvbGljaWVzWi8SLS92MS97cGFyZW50PWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qfS9wb2xpY2llcxIML3YxL3BvbGljaWVzEtUCCgxDcmVhdGVQb2xpY3kSIC5ieXRlYmFzZS52MS5DcmVhdGVQb2xpY3lSZXF1ZXN0GhMuYnl0ZWJhc2UudjEuUG9saWN5Io0C2kENcGFyZW50LHBvbGljeYrqMBJiYi5wb2xpY2llcy5jcmVhdGWQ6jABmOowAYLT5JMC2AE6BnBvbGljeVoqOgZwb2xpY3kiIC92MS97cGFyZW50PXByb2plY3RzLyp9L3BvbGljaWVzWi46BnBvbGljeSIkL3YxL3twYXJlbnQ9ZW52aXJvbm1lbnRzLyp9L3BvbGljaWVzWis6BnBvbGljeSIhL3YxL3twYXJlbnQ9aW5zdGFuY2VzLyp9L3BvbGljaWVzWjc6BnBvbGljeSItL3YxL3twYXJlbnQ9aW5zdGFuY2VzLyovZGF0YWJhc2VzLyp9L3BvbGljaWVzIgwvdjEvcG9saWNpZXMShgMKDFVwZGF0ZVBvbGljeRIgLmJ5dGViYXNlLnYxLlVwZGF0ZVBvbGljeVJlcXVlc3QaEy5ieXRlYmFzZS52MS5Qb2xpY3kivgLaQRJwb2xpY3ksdXBkYXRlX21hc2uK6jASYmIucG9saWNpZXMudXBkYXRlkOowAZjqMAGC0+STAoQCOgZwb2xpY3laMToGcG9saWN5MicvdjEve3BvbGljeS5uYW1lPXByb2plY3RzLyovcG9saWNpZXMvKn1aNToGcG9saWN5MisvdjEve3BvbGljeS5uYW1lPWVudmlyb25tZW50cy8qL3BvbGljaWVzLyp9WjI6BnBvbGljeTIoL3YxL3twb2xpY3kubmFtZT1pbnN0YW5jZXMvKi9wb2xpY2llcy8qfVo+OgZwb2xpY3kyNC92MS97cG9saWN5Lm5hbWU9aW5zdGFuY2VzLyovZGF0YWJhc2VzLyovcG9saWNpZXMvKn0yHC92MS97cG9saWN5Lm5hbWU9cG9saWNpZXMvKn0SsAIKDERlbGV0ZVBvbGljeRIgLmJ5dGViYXNlLnYxLkRlbGV0ZVBvbGljeVJlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHki5QHaQQRuYW1liuowEmJiLnBvbGljaWVzLmRlbGV0ZZDqMAGY6jABgtPkkwK5AVoiKiAvdjEve25hbWU9cHJvamVjdHMvKi9wb2xpY2llcy8qfVomKiQvdjEve25hbWU9ZW52aXJvbm1lbnRzLyovcG9saWNpZXMvKn1aIyohL3YxL3tuYW1lPWluc3RhbmNlcy8qL3BvbGljaWVzLyp9Wi8qLS92MS97bmFtZT1pbnN0YW5jZXMvKi9kYXRhYmFzZXMvKi9wb2xpY2llcy8qfSoVL3YxL3tuYW1lPXBvbGljaWVzLyp9QjZaNGdpdGh1Yi5jb20vYnl0ZWJhc2UvYnl0ZWJhc2UvYmFja2VuZC9nZW5lcmF0ZWQtZ28vdjFiBnByb3RvMw", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_duration, file_google_protobuf_empty, file_google_protobuf_field_mask, file_google_type_expr, file_v1_annotation, file_v1_common]);
/**
* Describes the message bytebase.v1.CreatePolicyRequest.
diff --git a/frontend/src/types/sqlReview.test.ts b/frontend/src/types/sqlReview.test.ts
new file mode 100644
index 0000000000..bd1f59ad1a
--- /dev/null
+++ b/frontend/src/types/sqlReview.test.ts
@@ -0,0 +1,164 @@
+import { describe, expect, test } from "vitest";
+import { SQLReviewRuleLevel } from "@/types/proto-es/v1/org_policy_service_pb";
+import sqlReviewSchema from "./sql-review-schema.yaml";
+import sqlReviewDevTemplate from "./sql-review.dev.yaml";
+import sqlReviewProdTemplate from "./sql-review.prod.yaml";
+import sqlReviewSampleTemplate from "./sql-review.sample.yaml";
+
+describe("SQL Review YAML Templates Validation", () => {
+ const templates = [
+ { name: "sample", data: sqlReviewSampleTemplate },
+ { name: "dev", data: sqlReviewDevTemplate },
+ { name: "prod", data: sqlReviewProdTemplate },
+ ];
+
+ templates.forEach(({ name, data }) => {
+ describe(`Template: ${name}`, () => {
+ test("should have id field", () => {
+ expect(data.id).toBeDefined();
+ expect(typeof data.id).toBe("string");
+ expect(data.id.length).toBeGreaterThan(0);
+ });
+
+ test("should have ruleList array", () => {
+ expect(data.ruleList).toBeDefined();
+ expect(Array.isArray(data.ruleList)).toBe(true);
+ expect(data.ruleList.length).toBeGreaterThan(0);
+ });
+
+ test("all rules must have required fields", () => {
+ data.ruleList.forEach((rule: any, index: number) => {
+ const ruleDesc = `rule[${index}] (${rule.type || "unknown"})`;
+
+ // Type is required
+ expect(rule.type, `${ruleDesc} must have type`).toBeDefined();
+ expect(typeof rule.type, `${ruleDesc} type must be string`).toBe(
+ "string"
+ );
+
+ // Engine is required
+ expect(rule.engine, `${ruleDesc} must have engine`).toBeDefined();
+ expect(typeof rule.engine, `${ruleDesc} engine must be string`).toBe(
+ "string"
+ );
+
+ // Level is required and must be valid
+ expect(rule.level, `${ruleDesc} must have level`).toBeDefined();
+ expect(typeof rule.level, `${ruleDesc} level must be string`).toBe(
+ "string"
+ );
+ });
+ });
+
+ test("all rules must have valid level (ERROR or WARNING, not LEVEL_UNSPECIFIED)", () => {
+ const validLevels = ["ERROR", "WARNING"];
+ data.ruleList.forEach((rule: any, index: number) => {
+ const ruleDesc = `rule[${index}] (${rule.type})`;
+ expect(
+ validLevels.includes(rule.level),
+ `${ruleDesc} has invalid level '${rule.level}', must be ERROR or WARNING`
+ ).toBe(true);
+
+ // Also ensure it's not LEVEL_UNSPECIFIED or DISABLED
+ expect(
+ rule.level,
+ `${ruleDesc} must not have LEVEL_UNSPECIFIED`
+ ).not.toBe("LEVEL_UNSPECIFIED");
+ expect(rule.level, `${ruleDesc} must not have DISABLED`).not.toBe(
+ "DISABLED"
+ );
+ });
+ });
+
+ test("all rules must be convertible to SQLReviewRuleLevel enum", () => {
+ data.ruleList.forEach((rule: any, index: number) => {
+ const ruleDesc = `rule[${index}] (${rule.type})`;
+ const levelKey = rule.level as keyof typeof SQLReviewRuleLevel;
+ const levelValue = SQLReviewRuleLevel[levelKey];
+
+ expect(
+ levelValue,
+ `${ruleDesc} level '${rule.level}' must map to valid enum`
+ ).toBeDefined();
+ expect(
+ levelValue,
+ `${ruleDesc} level must not be LEVEL_UNSPECIFIED (0)`
+ ).not.toBe(SQLReviewRuleLevel.LEVEL_UNSPECIFIED);
+ });
+ });
+ });
+ });
+
+ describe("Schema validation", () => {
+ test("should be an array", () => {
+ expect(Array.isArray(sqlReviewSchema)).toBe(true);
+ expect(sqlReviewSchema.length).toBeGreaterThan(0);
+ });
+
+ test("schema rules should NOT have level field", () => {
+ sqlReviewSchema.forEach((rule: any, index: number) => {
+ const ruleDesc = `schema rule[${index}] (${rule.type || "unknown"})`;
+
+ // Schema rules are just definitions, they should not have a level
+ expect(
+ rule.level,
+ `${ruleDesc} should not have level field (schema rules are templates, not configured rules)`
+ ).toBeUndefined();
+ });
+ });
+
+ test("schema rules must have required fields", () => {
+ sqlReviewSchema.forEach((rule: any, index: number) => {
+ const ruleDesc = `schema rule[${index}] (${rule.type || "unknown"})`;
+
+ // Type is required
+ expect(rule.type, `${ruleDesc} must have type`).toBeDefined();
+ expect(typeof rule.type, `${ruleDesc} type must be string`).toBe(
+ "string"
+ );
+
+ // Engine is required
+ expect(rule.engine, `${ruleDesc} must have engine`).toBeDefined();
+ expect(typeof rule.engine, `${ruleDesc} engine must be string`).toBe(
+ "string"
+ );
+
+ // Category is required
+ expect(rule.category, `${ruleDesc} must have category`).toBeDefined();
+ expect(
+ typeof rule.category,
+ `${ruleDesc} category must be string`
+ ).toBe("string");
+ });
+ });
+ });
+
+ describe("Cross-template consistency", () => {
+ test("report template rules that don't exist in schema", () => {
+ const schemaRuleTypes = new Set(
+ sqlReviewSchema.map((rule: any) => `${rule.engine}:${rule.type}`)
+ );
+
+ const missingRules: string[] = [];
+ templates.forEach(({ name, data }) => {
+ data.ruleList.forEach((rule: any) => {
+ const ruleKey = `${rule.engine}:${rule.type}`;
+ if (!schemaRuleTypes.has(ruleKey)) {
+ missingRules.push(`${name}: ${ruleKey}`);
+ }
+ });
+ });
+
+ // Log missing rules but don't fail - they might be intentional
+ if (missingRules.length > 0) {
+ console.warn(
+ "Warning: Template rules not found in schema:",
+ missingRules
+ );
+ }
+
+ // This test just verifies we can check consistency, not that it's perfect
+ expect(schemaRuleTypes.size).toBeGreaterThan(0);
+ });
+ });
+});
diff --git a/frontend/src/types/sqlReview.ts b/frontend/src/types/sqlReview.ts
index f14ede52ef..177e122de4 100644
--- a/frontend/src/types/sqlReview.ts
+++ b/frontend/src/types/sqlReview.ts
@@ -1,7 +1,6 @@
import { t, te } from "@/plugins/i18n";
import { Engine } from "@/types/proto-es/v1/common_pb";
import { SQLReviewRuleLevel } from "@/types/proto-es/v1/org_policy_service_pb";
-import type { PlanType } from "@/types/proto-es/v1/subscription_service_pb";
import { engineToString } from "@/utils/v1/common-conversions";
import sqlReviewSchema from "./sql-review-schema.yaml";
import sqlReviewDevTemplate from "./sql-review.dev.yaml";
@@ -167,7 +166,7 @@ export const getRuleMapByEngine = (
}
map.get(engine)?.set(rule.type, {
...rule,
- level: rule.level || SQLReviewRuleLevel.DISABLED,
+ level: rule.level,
engine,
componentList: rule.componentList || [],
});
@@ -183,9 +182,9 @@ const convertRuleTemplateV2Raw = (
const engineKey = rawRule.engine as keyof typeof Engine;
const engine = Engine[engineKey] ?? Engine.ENGINE_UNSPECIFIED;
- // Convert level string key to enum value
- const levelKey = rawRule.level as keyof typeof SQLReviewRuleLevel;
- const level = SQLReviewRuleLevel[levelKey] ?? SQLReviewRuleLevel.DISABLED;
+ // Schema rules from YAML don't have levels (enforced by tests).
+ // WARNING is the default severity when users add these rules to their policies.
+ const level = SQLReviewRuleLevel.WARNING;
return {
...rawRule,
@@ -231,9 +230,19 @@ export const TEMPLATE_LIST_V2: SQLReviewPolicyTemplateV2[] = (function () {
continue;
}
- // Convert level string to enum
+ // Convert level string to enum - all template rules must have a level
+ if (!rule.level) {
+ throw new Error(
+ `Template rule ${rule.type} is missing required 'level' field in template ${template.id}`
+ );
+ }
const levelKey = rule.level as keyof typeof SQLReviewRuleLevel;
- const level = SQLReviewRuleLevel[levelKey] ?? SQLReviewRuleLevel.DISABLED;
+ const level = SQLReviewRuleLevel[levelKey];
+ if (level === undefined) {
+ throw new Error(
+ `Template rule ${rule.type} has invalid level '${rule.level}' in template ${template.id}`
+ );
+ }
ruleList.push({
...ruleTemplate,
@@ -799,10 +808,3 @@ export const getRuleLocalization = (
description,
};
};
-
-export const ruleIsAvailableInSubscription = (
- _ruleType: string,
- _subscriptionPlan: PlanType
-): boolean => {
- return true;
-};
diff --git a/frontend/src/views/SettingWorkspaceSQLReviewDetail.vue b/frontend/src/views/SettingWorkspaceSQLReviewDetail.vue
index 7175d92d61..ea4378549c 100644
--- a/frontend/src/views/SettingWorkspaceSQLReviewDetail.vue
+++ b/frontend/src/views/SettingWorkspaceSQLReviewDetail.vue
@@ -80,6 +80,7 @@
:rule-list="ruleListFilteredByEngine"
:editable="hasUpdateReviwConfigPermission"
@rule-upsert="markChange"
+ @rule-remove="removeRule"
/>
</template>
</SQLReviewTabsByEngine>
@@ -169,16 +170,11 @@ import SQLRuleTableWithFilter from "@/components/SQLReview/components/SQLRuleTab
import { rulesToTemplate } from "@/components/SQLReview/components/utils";
import Resource from "@/components/v2/ResourceOccupiedModal/Resource.vue";
import { WORKSPACE_ROUTE_SQL_REVIEW } from "@/router/dashboard/workspaceRoutes";
-import {
- pushNotification,
- useSQLReviewStore,
- useSubscriptionV1Store,
-} from "@/store";
+import { pushNotification, useSQLReviewStore } from "@/store";
import type { RuleTemplateV2 } from "@/types";
import {
convertRuleMapToPolicyRuleList,
getRuleMapByEngine,
- ruleIsAvailableInSubscription,
unknown,
UNKNOWN_ID,
} from "@/types";
@@ -205,7 +201,6 @@ const { t } = useI18n();
const store = useSQLReviewStore();
const router = useRouter();
const route = useRoute();
-const subscriptionStore = useSubscriptionV1Store();
const state = reactive<LocalState>({
showDisableModal: false,
@@ -256,7 +251,7 @@ const ruleListOfPolicy = computed((): RuleTemplateV2[] => {
if (reviewPolicy.value.id === `${UNKNOWN_ID}`) {
return [];
}
- return rulesToTemplate(reviewPolicy.value, false).ruleList;
+ return rulesToTemplate(reviewPolicy.value).ruleList;
});
watch(
@@ -293,12 +288,6 @@ const markChange = (
rule: RuleTemplateV2,
overrides: Partial<RuleTemplateV2>
) => {
- if (
- !ruleIsAvailableInSubscription(rule.type, subscriptionStore.currentPlan)
- ) {
- return;
- }
-
const selectedRule = state.ruleMapByEngine.get(rule.engine)?.get(rule.type);
if (!selectedRule) {
return;
@@ -310,6 +299,14 @@ const markChange = (
state.rulesUpdated = true;
};
+const removeRule = (rule: RuleTemplateV2) => {
+ state.ruleMapByEngine.get(rule.engine)?.delete(rule.type);
+ if (state.ruleMapByEngine.get(rule.engine)?.size === 0) {
+ state.ruleMapByEngine.delete(rule.engine);
+ }
+ state.rulesUpdated = true;
+};
+
const onCancelChanges = () => {
state.ruleMapByEngine = getRuleMapByEngine(ruleListOfPolicy.value);
state.rulesUpdated = false;
diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yaml
index 11b3152b89..176a1eb0b1 100644
--- a/proto/gen/grpc-doc/openapi.yaml
+++ b/proto/gen/grpc-doc/openapi.yaml
@@ -13533,7 +13533,6 @@ components:
- LEVEL_UNSPECIFIED
- ERROR
- WARNING
- - DISABLED
type: string
format: enum
payload:
diff --git a/proto/gen/grpc-doc/store/README.md b/proto/gen/grpc-doc/store/README.md
index fba3b646ce..8c529fd589 100644
--- a/proto/gen/grpc-doc/store/README.md
+++ b/proto/gen/grpc-doc/store/README.md
@@ -3739,7 +3739,6 @@ QueryDataPolicy is the policy configuration for querying data.
| LEVEL_UNSPECIFIED | 0 | |
| ERROR | 1 | |
| WARNING | 2 | |
-| DISABLED | 3 | |
diff --git a/proto/gen/grpc-doc/store/index.html b/proto/gen/grpc-doc/store/index.html
index c794fda6e0..d8f72004cc 100644
--- a/proto/gen/grpc-doc/store/index.html
+++ b/proto/gen/grpc-doc/store/index.html
@@ -10261,12 +10261,6 @@ For example, the environment resource can have the SQL review config tag, such a
<td><p></p></td>
</tr>
- <tr>
- <td>DISABLED</td>
- <td>3</td>
- <td><p></p></td>
- </tr>
-
</tbody>
</table>
diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.md
index 7f3975b5e2..949127d0b7 100644
--- a/proto/gen/grpc-doc/v1/README.md
+++ b/proto/gen/grpc-doc/v1/README.md
@@ -7133,7 +7133,6 @@ The severity level for SQL review rules.
| LEVEL_UNSPECIFIED | 0 | Unspecified level. |
| ERROR | 1 | Rule violation is an error. |
| WARNING | 2 | Rule violation is a warning. |
-| DISABLED | 3 | Rule is disabled. |
diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.html
index b07a4021a2..0eb9eaceed 100644
--- a/proto/gen/grpc-doc/v1/index.html
+++ b/proto/gen/grpc-doc/v1/index.html
@@ -20096,12 +20096,6 @@ In this situation, `update_mask` is ignored. </p></td>
<td><p>Rule violation is a warning.</p></td>
</tr>
- <tr>
- <td>DISABLED</td>
- <td>3</td>
- <td><p>Rule is disabled.</p></td>
- </tr>
-
</tbody>
</table>
diff --git a/proto/store/store/policy.proto b/proto/store/store/policy.proto
index cf03c05df3..3cea505a7e 100644
--- a/proto/store/store/policy.proto
+++ b/proto/store/store/policy.proto
@@ -107,7 +107,6 @@ enum SQLReviewRuleLevel {
LEVEL_UNSPECIFIED = 0;
ERROR = 1;
WARNING = 2;
- DISABLED = 3;
}
message TagPolicy {
diff --git a/proto/v1/v1/org_policy_service.proto b/proto/v1/v1/org_policy_service.proto
index c91aedc6ee..f141ca9905 100644
--- a/proto/v1/v1/org_policy_service.proto
+++ b/proto/v1/v1/org_policy_service.proto
@@ -378,8 +378,6 @@ enum SQLReviewRuleLevel {
ERROR = 1;
// Rule violation is a warning.
WARNING = 2;
- // Rule is disabled.
- DISABLED = 3;
}
// MaskingExceptionPolicy is the allowlist of users who can access sensitive data.