Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
chore: optimize expr editor (#17671)
ecmadao3cce601a338a
diff --git a/backend/api/v1/masking_evaluator.go b/backend/api/v1/masking_evaluator.goindex bdc617d20c..309cf63e20 100644--- a/backend/api/v1/masking_evaluator.go+++ b/backend/api/v1/masking_evaluator.go@@ -136,17 +136,17 @@ func (m *maskingLevelEvaluator) evaluateGlobalMaskingLevelOfColumn(classificationLevel := getClassificationLevelOfColumn(columnConfig.GetClassification(), dataClassificationConfig)for _, maskingRule := range m.maskingRules {maskingRuleAttributes := map[string]any{- "resource.environment_id": "",- "resource.project_id": databaseMessage.ProjectID,- "resource.instance_id": databaseMessage.InstanceID,- "resource.database_name": databaseMessage.DatabaseName,- "resource.schema_name": schemaName,- "resource.table_name": tableName,- "resource.column_name": columnName,- "resource.classification_level": classificationLevel,+ common.CELAttributeResourceEnvironmentID: "",+ common.CELAttributeResourceProjectID: databaseMessage.ProjectID,+ common.CELAttributeResourceInstanceID: databaseMessage.InstanceID,+ common.CELAttributeResourceDatabaseName: databaseMessage.DatabaseName,+ common.CELAttributeResourceSchemaName: schemaName,+ common.CELAttributeResourceTableName: tableName,+ common.CELAttributeResourceColumnName: columnName,+ common.CELAttributeResourceClassificationLevel: classificationLevel,}if databaseMessage.EffectiveEnvironmentID != nil {- maskingRuleAttributes["resource.environment_id"] = *databaseMessage.EffectiveEnvironmentID+ maskingRuleAttributes[common.CELAttributeResourceEnvironmentID] = *databaseMessage.EffectiveEnvironmentID}pass, err := evaluateMaskingRulePolicyCondition(maskingRule.Condition.Expression, maskingRuleAttributes)if err != nil {diff --git a/backend/runner/approval/runner.go b/backend/runner/approval/runner.goindex 80d106e7d3..941f78b95a 100644--- a/backend/runner/approval/runner.go+++ b/backend/runner/approval/runner.go@@ -298,8 +298,8 @@ func getApprovalTemplate(approvalSetting *storepb.WorkspaceApprovalSetting, risk}out, _, err := prg.Eval(map[string]any{- "level": riskLevel,- "source": apiv1.ConvertToV1Source(riskSource).String(),+ common.CELAttributeLevel: riskLevel,+ common.CELAttributeSource: apiv1.ConvertToV1Source(riskSource).String(),})if err != nil {return nil, err@@ -463,13 +463,13 @@ func (r *Runner) getDatabaseGeneralIssueRisk(ctx context.Context, issue *store.I}commonArgs := map[string]any{- "resource.environment_id": environmentID,- "resource.project_id": issue.Project.ResourceID,- "resource.instance_id": instance.ResourceID,- "resource.database_name": databaseName,+ common.CELAttributeResourceEnvironmentID: environmentID,+ common.CELAttributeResourceProjectID: issue.Project.ResourceID,+ common.CELAttributeResourceInstanceID: instance.ResourceID,+ common.CELAttributeResourceDatabaseName: databaseName,// convert to string type otherwise cel-go will complain that storepb.Engine is not string type.- "resource.db_engine": instance.Metadata.GetEngine().String(),- "statement.text": taskStatement,+ common.CELAttributeResourceDBEngine: instance.Metadata.GetEngine().String(),+ common.CELAttributeStatementText: taskStatement,}risk, err := func() (int32, error) {// The summary report is not always available.diff --git a/backend/utils/utils.go b/backend/utils/utils.goindex f0fa229d17..af013b185f 100644--- a/backend/utils/utils.go+++ b/backend/utils/utils.go@@ -201,10 +201,10 @@ func CheckDatabaseGroupMatch(ctx context.Context, expression string, database *seffectiveEnvironmentID = *database.EffectiveEnvironmentID}res, _, err := prog.ContextEval(ctx, map[string]any{- "resource.database_name": database.DatabaseName,- "resource.environment_id": common.FormatEnvironment(effectiveEnvironmentID),- "resource.instance_id": database.InstanceID,- "resource.database_labels": database.Metadata.Labels,+ common.CELAttributeResourceDatabaseName: database.DatabaseName,+ common.CELAttributeResourceEnvironmentID: common.FormatEnvironment(effectiveEnvironmentID),+ common.CELAttributeResourceInstanceID: database.InstanceID,+ common.CELAttributeResourceDatabaseLabels: database.Metadata.Labels,})if err != nil {return false, connect.NewError(connect.CodeInternal, err)diff --git a/frontend/src/components/CustomApproval/Settings/components/RiskCenter/RiskDialog/RiskForm.vue b/frontend/src/components/CustomApproval/Settings/components/RiskCenter/RiskDialog/RiskForm.vueindex 7aac1dd737..6110dd911c 100644--- a/frontend/src/components/CustomApproval/Settings/components/RiskCenter/RiskDialog/RiskForm.vue+++ b/frontend/src/components/CustomApproval/Settings/components/RiskCenter/RiskDialog/RiskForm.vue@@ -54,7 +54,6 @@:expr="state.expr":allow-admin="allowAdmin":factor-list="getFactorList(state.risk.source)"- :factor-support-dropdown="factorSupportDropdown":option-config-map="getOptionConfigMap(state.risk.source)"@update="$emit('update')"/>@@ -119,7 +118,6 @@ import {import {getFactorList,getOptionConfigMap,- factorSupportDropdown,RiskSourceFactorMap,} from "../../common/utils";import { useRiskCenterContext } from "../context";diff --git a/frontend/src/components/CustomApproval/Settings/components/RiskCenter/RiskDialog/ViewTemplate.vue b/frontend/src/components/CustomApproval/Settings/components/RiskCenter/RiskDialog/ViewTemplate.vueindex 995e9ece8e..7007a3dcb4 100644--- a/frontend/src/components/CustomApproval/Settings/components/RiskCenter/RiskDialog/ViewTemplate.vue+++ b/frontend/src/components/CustomApproval/Settings/components/RiskCenter/RiskDialog/ViewTemplate.vue@@ -3,7 +3,6 @@:expr="template.expr":allow-admin="false":factor-list="getFactorList(source)"- :factor-support-dropdown="factorSupportDropdown":option-config-map="getOptionConfigMap(source)"/></template>@@ -12,11 +11,7 @@import { computed } from "vue";import ExprEditor from "@/components/ExprEditor";import { Risk_Source } from "@/types/proto-es/v1/risk_service_pb";-import {- getFactorList,- getOptionConfigMap,- factorSupportDropdown,-} from "../../common/utils";+import { getFactorList, getOptionConfigMap } from "../../common/utils";import { type RuleTemplate } from "./template";const props = defineProps<{diff --git a/frontend/src/components/CustomApproval/Settings/components/common/utils.ts b/frontend/src/components/CustomApproval/Settings/components/common/utils.tsindex 6859dcb729..19e35dfac2 100644--- a/frontend/src/components/CustomApproval/Settings/components/common/utils.ts+++ b/frontend/src/components/CustomApproval/Settings/components/common/utils.ts@@ -4,11 +4,10 @@ import { h } from "vue";import type { VNode } from "vue";import { type OptionConfig } from "@/components/ExprEditor/context";import { getInstanceIdOptions } from "@/components/SensitiveData/components/utils";-import { EnvironmentV1Name } from "@/components/v2";+import { EnvironmentV1Name, RichDatabaseName } from "@/components/v2";import { SQLTypeList, type Factor } from "@/plugins/cel";import { t } from "@/plugins/i18n";import {- environmentNamePrefix,useEnvironmentV1Store,useProjectV1Store,useInstanceV1Store,@@ -19,6 +18,7 @@ import {PRESET_WORKSPACE_ROLES,PresetRiskLevelList,useSupportedSourceList,+ type ComposedDatabase,} from "@/types";import { Engine } from "@/types/proto-es/v1/common_pb";import type { Project } from "@/types/proto-es/v1/project_service_pb";@@ -31,6 +31,23 @@ import {getDefaultPagination,supportedEngineV1List,} from "@/utils";+import {+ CEL_ATTRIBUTE_REQUEST_EXPIRATION_DAYS,+ CEL_ATTRIBUTE_REQUEST_ROLE,+ CEL_ATTRIBUTE_STATEMENT_AFFECTED_ROWS,+ CEL_ATTRIBUTE_STATEMENT_TABLE_ROWS,+ CEL_ATTRIBUTE_STATEMENT_SQL_TYPE,+ CEL_ATTRIBUTE_STATEMENT_TEXT,+ CEL_ATTRIBUTE_RESOURCE_ENVIRONMENT_ID,+ CEL_ATTRIBUTE_RESOURCE_PROJECT_ID,+ CEL_ATTRIBUTE_RESOURCE_INSTANCE_ID,+ CEL_ATTRIBUTE_RESOURCE_DATABASE_NAME,+ CEL_ATTRIBUTE_RESOURCE_TABLE_NAME,+ CEL_ATTRIBUTE_RESOURCE_SCHEMA_NAME,+ CEL_ATTRIBUTE_RESOURCE_DB_ENGINE,+ CEL_ATTRIBUTE_LEVEL,+ CEL_ATTRIBUTE_SOURCE,+} from "@/utils/cel-attributes";export const sourceText = (source: Risk_Source) => {switch (source) {@@ -73,23 +90,23 @@ export const orderByLevelDesc = (a: Risk, b: Risk): number => {};const commonFactorList: Factor[] = [- "resource.environment_id",- "resource.project_id",- "resource.instance_id",- "resource.db_engine",+ CEL_ATTRIBUTE_RESOURCE_ENVIRONMENT_ID,+ CEL_ATTRIBUTE_RESOURCE_PROJECT_ID,+ CEL_ATTRIBUTE_RESOURCE_INSTANCE_ID,+ CEL_ATTRIBUTE_RESOURCE_DB_ENGINE,] as const;const schemaObjectNameFactorList: Factor[] = [- "resource.database_name",- "resource.schema_name",- "resource.table_name",+ CEL_ATTRIBUTE_RESOURCE_DATABASE_NAME,+ CEL_ATTRIBUTE_RESOURCE_SCHEMA_NAME,+ CEL_ATTRIBUTE_RESOURCE_TABLE_NAME,] as const;const migrationFactorList: Factor[] = [- "statement.affected_rows",- "statement.table_rows",- "statement.sql_type",- "statement.text",+ CEL_ATTRIBUTE_STATEMENT_AFFECTED_ROWS,+ CEL_ATTRIBUTE_STATEMENT_TABLE_ROWS,+ CEL_ATTRIBUTE_STATEMENT_SQL_TYPE,+ CEL_ATTRIBUTE_STATEMENT_TEXT,] as const;export const RiskSourceFactorMap: Map<Risk_Source, Factor[]> = new Map([@@ -111,7 +128,7 @@ export const RiskSourceFactorMap: Map<Risk_Source, Factor[]> = new Map([],[Risk_Source.CREATE_DATABASE,- [...commonFactorList, "resource.database_name"],+ [...commonFactorList, CEL_ATTRIBUTE_RESOURCE_DATABASE_NAME],],[Risk_Source.DATA_EXPORT,@@ -120,10 +137,10 @@ export const RiskSourceFactorMap: Map<Risk_Source, Factor[]> = new Map([[Risk_Source.REQUEST_ROLE,[- "resource.environment_id",- "resource.project_id",- "request.expiration_days",- "request.role",+ CEL_ATTRIBUTE_RESOURCE_ENVIRONMENT_ID,+ CEL_ATTRIBUTE_RESOURCE_PROJECT_ID,+ CEL_ATTRIBUTE_REQUEST_EXPIRATION_DAYS,+ CEL_ATTRIBUTE_REQUEST_ROLE,],],]);@@ -165,7 +182,7 @@ export const getEnvironmentIdOptions = () => {label: `${env.title} (${environmentId})`,value: environmentId,render: getRenderOptionFunc({- name: `${environmentNamePrefix}${env.id}`,+ name: env.name,title: () =>h(EnvironmentV1Name, {environment: env,@@ -190,6 +207,26 @@ export const getProjectIdOptions = (projects: Project[]) => {});};+export const getDatabaseIdOptions = (databases: ComposedDatabase[]) => {+ return databases.map<SelectOption>((database) => {+ return {+ label: database.databaseName,+ value: database.databaseName,+ render: getRenderOptionFunc({+ name: database.name,+ title: () =>+ h(RichDatabaseName, {+ database,+ showEngineIcon: true,+ showInstance: false,+ showProject: false,+ showArrow: false,+ }),+ }),+ };+ });+};+const getDBEndingOptions = () => {return supportedEngineV1List().map<SelectOption>((type) => ({label: engineNameV1(type),@@ -242,10 +279,10 @@ export const getOptionConfigMap = (source: Risk_Source) => {return factorList.reduce((map, factor) => {let options: SelectOption[] = [];switch (factor) {- case "resource.environment_id":+ case CEL_ATTRIBUTE_RESOURCE_ENVIRONMENT_ID:options = getEnvironmentIdOptions();break;- case "resource.project_id":+ case CEL_ATTRIBUTE_RESOURCE_PROJECT_ID:const projectStore = useProjectV1Store();map.set(factor, {remote: true,@@ -262,7 +299,7 @@ export const getOptionConfigMap = (source: Risk_Source) => {},});return map;- case "resource.instance_id":+ case CEL_ATTRIBUTE_RESOURCE_INSTANCE_ID:const store = useInstanceV1Store();map.set(factor, {remote: true,@@ -279,41 +316,23 @@ export const getOptionConfigMap = (source: Risk_Source) => {},});return map;- case "resource.db_engine":+ case CEL_ATTRIBUTE_RESOURCE_DB_ENGINE:options = getDBEndingOptions();break;- case "level":+ case CEL_ATTRIBUTE_LEVEL:options = getLevelOptions();break;- case "source":+ case CEL_ATTRIBUTE_SOURCE:options = getSourceOptions();break;- case "statement.sql_type":+ case CEL_ATTRIBUTE_STATEMENT_SQL_TYPE:options = getSQLTypeOptions(source);break;- case "request.role":+ case CEL_ATTRIBUTE_REQUEST_ROLE:options = getRoleOptions();break;- //- // factors that don't need special handling- //- case "resource.database":- case "resource.schema_name":- case "resource.table_name":- case "resource.database_name":- case "resource.column_name":- case "resource.classification_level":- case "statement.affected_rows":- case "statement.table_rows":- case "statement.text":- case "request.row_limit":- case "request.expiration_days":- case "request.time":- break;default:- // This should never happen if all factors are handled above- const _exhaustiveCheck: never = factor;- throw new Error(`Unhandled factor: ${_exhaustiveCheck}`);+ break;}map.set(factor, { options, remote: false });@@ -321,14 +340,3 @@ export const getOptionConfigMap = (source: Risk_Source) => {return map;}, new Map<Factor, OptionConfig>());};--export const factorSupportDropdown: Factor[] = [- "resource.environment_id",- "resource.project_id",- "resource.instance_id",- "resource.db_engine",- "statement.sql_type",- "level",- "source",- "request.role",-];diff --git a/frontend/src/components/DatabaseGroup/DatabaseGroupForm.vue b/frontend/src/components/DatabaseGroup/DatabaseGroupForm.vueindex 104e3dceca..9e4f7df866 100644--- a/frontend/src/components/DatabaseGroup/DatabaseGroupForm.vue+++ b/frontend/src/components/DatabaseGroup/DatabaseGroupForm.vue@@ -32,8 +32,7 @@:allow-admin="!readonly":enable-raw-expression="true":factor-list="FactorList"- :factor-support-dropdown="factorSupportDropdown"- :option-config-map="getDatabaseGroupOptionConfigMap()"+ :option-config-map="getDatabaseGroupOptionConfigMap(project.name)"/></div><div class="col-span-2">@@ -101,11 +100,7 @@ import {} from "@/utils";import { ResourceIdField } from "../v2";import MatchedDatabaseView from "./MatchedDatabaseView.vue";-import {- FactorList,- factorSupportDropdown,- getDatabaseGroupOptionConfigMap,-} from "./utils";+import { FactorList, getDatabaseGroupOptionConfigMap } from "./utils";const props = defineProps<{readonly: boolean;diff --git a/frontend/src/components/DatabaseGroup/utils.ts b/frontend/src/components/DatabaseGroup/utils.tsindex 42c16cf2fa..ee85cd8951 100644--- a/frontend/src/components/DatabaseGroup/utils.ts+++ b/frontend/src/components/DatabaseGroup/utils.ts@@ -1,34 +1,33 @@import type { SelectOption } from "naive-ui";-import { getRenderOptionFunc } from "@/components/CustomApproval/Settings/components/common";+import {+ getDatabaseIdOptions,+ getEnvironmentIdOptions,+} from "@/components/CustomApproval/Settings/components/common";import { type OptionConfig } from "@/components/ExprEditor/context";import { getInstanceIdOptions } from "@/components/SensitiveData/components/utils";import type { Factor } from "@/plugins/cel";-import {- environmentNamePrefix,- useEnvironmentV1Store,- useInstanceV1Store,-} from "@/store";+import { useInstanceV1Store, useDatabaseV1Store } from "@/store";import { getDefaultPagination } from "@/utils";+import {+ CEL_ATTRIBUTE_RESOURCE_ENVIRONMENT_ID,+ CEL_ATTRIBUTE_RESOURCE_INSTANCE_ID,+ CEL_ATTRIBUTE_RESOURCE_DATABASE_NAME,+} from "@/utils/cel-attributes";export const FactorList: Factor[] = [- "resource.environment_id",- "resource.database_name",- "resource.instance_id",-];--export const factorSupportDropdown: Factor[] = [- "resource.environment_id",- "resource.instance_id",+ CEL_ATTRIBUTE_RESOURCE_ENVIRONMENT_ID,+ CEL_ATTRIBUTE_RESOURCE_DATABASE_NAME,+ CEL_ATTRIBUTE_RESOURCE_INSTANCE_ID,];-export const getDatabaseGroupOptionConfigMap = () => {+export const getDatabaseGroupOptionConfigMap = (project: string) => {return FactorList.reduce((map, factor) => {let options: SelectOption[] = [];switch (factor) {- case "resource.environment_id":- options = getEnvironmentOptions();+ case CEL_ATTRIBUTE_RESOURCE_ENVIRONMENT_ID:+ options = getEnvironmentIdOptions();break;- case "resource.instance_id":+ case CEL_ATTRIBUTE_RESOURCE_INSTANCE_ID:const store = useInstanceV1Store();map.set(factor, {remote: true,@@ -45,6 +44,24 @@ export const getDatabaseGroupOptionConfigMap = () => {},});return map;+ case CEL_ATTRIBUTE_RESOURCE_DATABASE_NAME:+ const dbStore = useDatabaseV1Store();+ map.set(factor, {+ remote: true,+ options: [],+ search: async (keyword: string) => {+ return dbStore+ .fetchDatabases({+ pageSize: getDefaultPagination(),+ parent: project,+ filter: {+ query: keyword,+ },+ })+ .then((resp) => getDatabaseIdOptions(resp.databases));+ },+ });+ return map;}map.set(factor, {remote: false,@@ -53,19 +70,3 @@ export const getDatabaseGroupOptionConfigMap = () => {return map;}, new Map<Factor, OptionConfig>());};--const getEnvironmentOptions = () => {- const environmentList = useEnvironmentV1Store().getEnvironmentList();- return environmentList.map<SelectOption>((env) => {- const id = env.id;- const name = `${environmentNamePrefix}${id}`;- return {- label: id,- value: name,- render: getRenderOptionFunc({- name: name,- title: env.title,- }),- };- });-};diff --git a/frontend/src/components/ExprEditor/ConditionGroup.vue b/frontend/src/components/ExprEditor/ConditionGroup.vueindex 95d035a3aa..bb4cacd38e 100644--- a/frontend/src/components/ExprEditor/ConditionGroup.vue+++ b/frontend/src/components/ExprEditor/ConditionGroup.vue@@ -71,7 +71,6 @@/><Conditionv-if="isConditionExpr(operand)"- :key="`${i}.${operand.args[0]}.${operand.operator}`":expr="operand"@remove="removeCondition(operand)"@update="$emit('update')"diff --git a/frontend/src/components/ExprEditor/ExprEditor.vue b/frontend/src/components/ExprEditor/ExprEditor.vueindex 78ae16e418..647679d33e 100644--- a/frontend/src/components/ExprEditor/ExprEditor.vue+++ b/frontend/src/components/ExprEditor/ExprEditor.vue@@ -16,7 +16,6 @@ const props = withDefaults(allowAdmin?: boolean;enableRawExpression?: boolean;factorList: Factor[];- factorSupportDropdown?: Factor[];optionConfigMap?: Map<Factor, OptionConfig>;factorOperatorOverrideMap?: Map<Factor, Operator[]>;}>(),@@ -24,7 +23,6 @@ const props = withDefaults(allowAdmin: false,enableRawExpression: false,factorOperatorOverrideMap: undefined,- factorSupportDropdown: () => [],optionConfigMap: () => new Map(),});@@ -37,7 +35,6 @@ provideExprEditorContext({allowAdmin: toRef(props, "allowAdmin"),enableRawExpression: toRef(props, "enableRawExpression"),factorList: toRef(props, "factorList"),- factorSupportDropdown: toRef(props, "factorSupportDropdown"),optionConfigMap: toRef(props, "optionConfigMap"),factorOperatorOverrideMap: toRef(props, "factorOperatorOverrideMap"),});diff --git a/frontend/src/components/ExprEditor/components/ValueInput.vue b/frontend/src/components/ExprEditor/components/ValueInput.vueindex b9056446bb..50d6077530 100644--- a/frontend/src/components/ExprEditor/components/ValueInput.vue+++ b/frontend/src/components/ExprEditor/components/ValueInput.vue@@ -75,7 +75,7 @@ const factor = computed(() => {return props.expr.args[0];});-const { factorSupportDropdown } = useExprEditorContext();+const { optionConfigMap } = useExprEditorContext();const isNumberValue = computed(() => {if (isCompareOperator(operator.value)) return true;@@ -96,12 +96,12 @@ const isArrayValue = computed(() => {});const inputType = computed((): InputType => {if (isArrayValue.value) {- return factorSupportDropdown.value.includes(factor.value)+ return optionConfigMap.value.has(factor.value)? "MULTI-SELECT": "MULTI-INPUT";}if (isEqualityOperator(operator.value)) {- if (factorSupportDropdown.value.includes(factor.value)) {+ if (optionConfigMap.value.has(factor.value)) {return "SINGLE-SELECT";}}diff --git a/frontend/src/components/ExprEditor/context.ts b/frontend/src/components/ExprEditor/context.tsindex 01734f9a1e..bc8c36053b 100644--- a/frontend/src/components/ExprEditor/context.ts+++ b/frontend/src/components/ExprEditor/context.ts@@ -12,7 +12,6 @@ export type ExprEditorContext = {allowAdmin: Ref<boolean>;enableRawExpression: Ref<boolean>;factorList: Ref<Factor[]>;- factorSupportDropdown: Ref<Factor[]>;optionConfigMap: Ref<Map<Factor, OptionConfig>>;factorOperatorOverrideMap: Ref<Map<Factor, Operator[]> | undefined>;};diff --git a/frontend/src/components/SensitiveData/GlobalMaskingRulesView.vue b/frontend/src/components/SensitiveData/GlobalMaskingRulesView.vueindex 0f310ec42e..ccf4571d9f 100644--- a/frontend/src/components/SensitiveData/GlobalMaskingRulesView.vue+++ b/frontend/src/components/SensitiveData/GlobalMaskingRulesView.vue@@ -128,6 +128,7 @@ import {getEnvironmentIdOptions,getProjectIdOptions,} from "@/components/CustomApproval/Settings/components/common";+import { getDatabaseIdOptions } from "@/components/CustomApproval/Settings/components/common/utils";import { type OptionConfig } from "@/components/ExprEditor/context";import { useBodyLayoutContext } from "@/layouts/common";import type { Factor } from "@/plugins/cel";@@ -137,6 +138,7 @@ import {usePolicyV1Store,useProjectV1Store,useInstanceV1Store,+ useDatabaseV1Store,} from "@/store";import type { Policy } from "@/types/proto-es/v1/org_policy_service_pb";import type { MaskingRulePolicy_MaskingRule } from "@/types/proto-es/v1/org_policy_service_pb";@@ -154,6 +156,15 @@ import {hasWorkspacePermissionV2,getDefaultPagination,} from "@/utils";+import {+ CEL_ATTRIBUTE_RESOURCE_ENVIRONMENT_ID,+ CEL_ATTRIBUTE_RESOURCE_PROJECT_ID,+ CEL_ATTRIBUTE_RESOURCE_INSTANCE_ID,+ CEL_ATTRIBUTE_RESOURCE_DATABASE_NAME,+ CEL_ATTRIBUTE_RESOURCE_TABLE_NAME,+ CEL_ATTRIBUTE_RESOURCE_COLUMN_NAME,+ CEL_ATTRIBUTE_RESOURCE_CLASSIFICATION_LEVEL,+} from "@/utils/cel-attributes";import LearnMoreLink from "../LearnMoreLink.vue";import { MiniActionButton } from "../v2";import MaskingRuleConfig from "./components/MaskingRuleConfig.vue";@@ -341,13 +352,13 @@ const onPolicyUpsert = async () => {const factorList = computed((): Factor[] => {const list: Factor[] = [- "resource.environment_id",- "resource.project_id",- "resource.instance_id",- "resource.database_name",- "resource.table_name",- "resource.column_name",- "resource.classification_level",+ CEL_ATTRIBUTE_RESOURCE_ENVIRONMENT_ID,+ CEL_ATTRIBUTE_RESOURCE_PROJECT_ID,+ CEL_ATTRIBUTE_RESOURCE_INSTANCE_ID,+ CEL_ATTRIBUTE_RESOURCE_DATABASE_NAME,+ CEL_ATTRIBUTE_RESOURCE_TABLE_NAME,+ CEL_ATTRIBUTE_RESOURCE_COLUMN_NAME,+ CEL_ATTRIBUTE_RESOURCE_CLASSIFICATION_LEVEL,];return list;@@ -357,10 +368,10 @@ const factorOptionsMap = computed((): Map<Factor, OptionConfig> => {return factorList.value.reduce((map, factor) => {let options: SelectOption[] = [];switch (factor) {- case "resource.environment_id":+ case CEL_ATTRIBUTE_RESOURCE_ENVIRONMENT_ID:options = getEnvironmentIdOptions();break;- case "resource.instance_id":+ case CEL_ATTRIBUTE_RESOURCE_INSTANCE_ID:const store = useInstanceV1Store();map.set(factor, {remote: true,@@ -377,7 +388,7 @@ const factorOptionsMap = computed((): Map<Factor, OptionConfig> => {},});return map;- case "resource.project_id":+ case CEL_ATTRIBUTE_RESOURCE_PROJECT_ID:const projectStore = useProjectV1Store();map.set(factor, {remote: true,@@ -394,9 +405,28 @@ const factorOptionsMap = computed((): Map<Factor, OptionConfig> => {},});return map;- case "resource.classification_level":+ case CEL_ATTRIBUTE_RESOURCE_CLASSIFICATION_LEVEL:options = getClassificationLevelOptions();break;+ case CEL_ATTRIBUTE_RESOURCE_DATABASE_NAME: {+ const dbStore = useDatabaseV1Store();+ map.set(factor, {+ remote: true,+ options: [],+ search: async (keyword: string) => {+ return dbStore+ .fetchDatabases({+ pageSize: getDefaultPagination(),+ parent: "workspaces/-",+ filter: {+ query: keyword,+ },+ })+ .then((resp) => getDatabaseIdOptions(resp.databases));+ },+ });+ return map;+ }}map.set(factor, {remote: false,diff --git a/frontend/src/components/SensitiveData/components/MaskingRuleConfig.vue b/frontend/src/components/SensitiveData/components/MaskingRuleConfig.vueindex 9080ec913b..91920a2c2d 100644--- a/frontend/src/components/SensitiveData/components/MaskingRuleConfig.vue+++ b/frontend/src/components/SensitiveData/components/MaskingRuleConfig.vue@@ -23,7 +23,6 @@:expr="state.expr":allow-admin="!readonly":factor-list="factorList"- :factor-support-dropdown="factorSupportDropdown":option-config-map="optionConfigMap":factor-operator-override-map="factorOperatorOverrideMap"@update="state.dirty = true"@@ -109,7 +108,7 @@ import {batchConvertCELStringToParsedExpr,batchConvertParsedExprToCELString,} from "@/utils";-import { factorSupportDropdown, factorOperatorOverrideMap } from "./utils";+import { factorOperatorOverrideMap } from "./utils";export interface SemanticTypeSelectOption extends SelectOption {value: string;diff --git a/frontend/src/components/SensitiveData/components/utils.ts b/frontend/src/components/SensitiveData/components/utils.tsindex 09723df889..c66959efe8 100644--- a/frontend/src/components/SensitiveData/components/utils.ts+++ b/frontend/src/components/SensitiveData/components/utils.ts@@ -1,7 +1,9 @@import { create } from "@bufbuild/protobuf";import { uniq } from "lodash-es";import type { SelectOption } from "naive-ui";+import { h } from "vue";import { getRenderOptionFunc } from "@/components/CustomApproval/Settings/components/common";+import { InstanceV1Name } from "@/components/v2";import type { Factor, Operator } from "@/plugins/cel";import { EqualityOperatorList, CollectionOperatorList } from "@/plugins/cel";import { useSettingV1Store } from "@/store";@@ -12,6 +14,7 @@ import {AlgorithmSchema,} from "@/types/proto-es/v1/setting_service_pb";import { extractInstanceResourceName } from "@/utils";+import { CEL_ATTRIBUTE_RESOURCE_PROJECT_ID } from "@/utils/cel-attributes";export const getClassificationLevelOptions = () => {const settingStore = useSettingV1Store();@@ -42,21 +45,21 @@ export const getInstanceIdOptions = (instanceList: Instance[]) => {return {label: `${ins.title} (${instanceId})`,value: instanceId,- render: getRenderOptionFunc(ins),+ render: getRenderOptionFunc({+ name: ins.name,+ title: () =>+ h(InstanceV1Name, {+ instance: ins,+ link: false,+ }),+ }),};});};-export const factorSupportDropdown: Factor[] = [- "resource.environment_id",- "resource.instance_id",- "resource.project_id",- "resource.classification_level",-];-export const factorOperatorOverrideMap = new Map<Factor, Operator[]>([[- "resource.project_id",+ CEL_ATTRIBUTE_RESOURCE_PROJECT_ID,uniq([...EqualityOperatorList, ...CollectionOperatorList]),],]);diff --git a/frontend/src/components/SensitiveData/utils.ts b/frontend/src/components/SensitiveData/utils.tsindex 52b8c4ced0..21acd34317 100644--- a/frontend/src/components/SensitiveData/utils.ts+++ b/frontend/src/components/SensitiveData/utils.ts@@ -2,6 +2,14 @@ import type { MaskData } from "@/components/SensitiveData/types";import type { DatabaseResource } from "@/types";import type { MaskingExceptionPolicy_MaskingException } from "@/types/proto-es/v1/org_policy_service_pb";import { extractDatabaseResourceName } from "@/utils";+import {+ CEL_ATTRIBUTE_REQUEST_TIME,+ CEL_ATTRIBUTE_RESOURCE_SCHEMA_NAME,+ CEL_ATTRIBUTE_RESOURCE_INSTANCE_ID,+ CEL_ATTRIBUTE_RESOURCE_DATABASE_NAME,+ CEL_ATTRIBUTE_RESOURCE_TABLE_NAME,+ CEL_ATTRIBUTE_RESOURCE_COLUMN_NAME,+} from "@/utils/cel-attributes";import type { SensitiveColumn } from "./types";export const getMaskDataIdentifier = (maskData: MaskData): string => {@@ -28,7 +36,7 @@ export const isCurrentColumnException = (}const databaseExpression = expression.split(" && ")- .filter((expr) => !expr.startsWith("request.time"))+ .filter((expr) => !expr.startsWith(CEL_ATTRIBUTE_REQUEST_TIME)).join(" && ");const matches = getExpressionsForDatabaseResource(convertSensitiveColumnToDatabaseResource(sensitiveColumn)@@ -43,23 +51,27 @@ export const getExpressionsForDatabaseResource = (databaseResource.databaseFullName);const expressions = [- `resource.instance_id == "${instanceName}"`,- `resource.database_name == "${databaseName}"`,+ `${CEL_ATTRIBUTE_RESOURCE_INSTANCE_ID} == "${instanceName}"`,+ `${CEL_ATTRIBUTE_RESOURCE_DATABASE_NAME} == "${databaseName}"`,];if (databaseResource.schema) {- expressions.push(`resource.schema_name == "${databaseResource.schema}"`);+ expressions.push(+ `${CEL_ATTRIBUTE_RESOURCE_SCHEMA_NAME} == "${databaseResource.schema}"`+ );}if (databaseResource.table) {- expressions.push(`resource.table_name == "${databaseResource.table}"`);+ expressions.push(+ `${CEL_ATTRIBUTE_RESOURCE_TABLE_NAME} == "${databaseResource.table}"`+ );}if (databaseResource.columns && databaseResource.columns.length > 0) {if (databaseResource.columns.length === 1) {expressions.push(- `resource.column_name == "${databaseResource.columns[0]}"`+ `${CEL_ATTRIBUTE_RESOURCE_COLUMN_NAME} == "${databaseResource.columns[0]}"`);} else {expressions.push(- `resource.column_name in [${databaseResource.columns.map((c) => `"${c}"`)}]`+ `${CEL_ATTRIBUTE_RESOURCE_COLUMN_NAME} in [${databaseResource.columns.map((c) => `"${c}"`)}]`);}}diff --git a/frontend/src/components/v2/Model/RichDatabaseName.vue b/frontend/src/components/v2/Model/RichDatabaseName.vueindex 35a2eca61a..57f53043eb 100644--- a/frontend/src/components/v2/Model/RichDatabaseName.vue+++ b/frontend/src/components/v2/Model/RichDatabaseName.vue@@ -1,10 +1,12 @@<template><NPopover :disabled="!tooltip"><template #trigger>- <div class="flex flex-row justify-start items-center">- <div v-if="showProject">- <ProjectV1Name :project="database.projectEntity" :link="false" />- </div>+ <div class="flex flex-row justify-start items-center gap-x-1">+ <ProjectV1Name+ v-if="showProject"+ :project="database.projectEntity"+ :link="false"+ /><heroicons:chevron-rightv-if="showProject && showArrow"diff --git a/frontend/src/plugins/cel/types/operator.ts b/frontend/src/plugins/cel/types/operator.tsindex 847ecf6e84..7499351876 100644--- a/frontend/src/plugins/cel/types/operator.ts+++ b/frontend/src/plugins/cel/types/operator.ts@@ -1,4 +1,26 @@import { uniq } from "lodash-es";+import {+ CEL_ATTRIBUTE_STATEMENT_AFFECTED_ROWS,+ CEL_ATTRIBUTE_STATEMENT_TABLE_ROWS,+ CEL_ATTRIBUTE_STATEMENT_SQL_TYPE,+ CEL_ATTRIBUTE_STATEMENT_TEXT,+ CEL_ATTRIBUTE_RESOURCE_ENVIRONMENT_ID,+ CEL_ATTRIBUTE_RESOURCE_PROJECT_ID,+ CEL_ATTRIBUTE_RESOURCE_INSTANCE_ID,+ CEL_ATTRIBUTE_RESOURCE_DATABASE_NAME,+ CEL_ATTRIBUTE_RESOURCE_TABLE_NAME,+ CEL_ATTRIBUTE_RESOURCE_SCHEMA_NAME,+ CEL_ATTRIBUTE_RESOURCE_COLUMN_NAME,+ CEL_ATTRIBUTE_RESOURCE_DB_ENGINE,+ CEL_ATTRIBUTE_RESOURCE_DATABASE,+ CEL_ATTRIBUTE_RESOURCE_CLASSIFICATION_LEVEL,+ CEL_ATTRIBUTE_LEVEL,+ CEL_ATTRIBUTE_SOURCE,+ CEL_ATTRIBUTE_REQUEST_ROW_LIMIT,+ CEL_ATTRIBUTE_REQUEST_TIME,+ CEL_ATTRIBUTE_REQUEST_EXPIRATION_DAYS,+ CEL_ATTRIBUTE_REQUEST_ROLE,+} from "@/utils/cel-attributes";import type { Factor } from "./factor";export const NegativeOperatorList = ["!_"] as const;@@ -54,80 +76,88 @@ export const isStringOperator = (op: Operator): op is StringOperator => {/// Define supported operators for each factorconst OperatorList: Record<Factor, Operator[]> = {- "statement.affected_rows": uniq([+ [CEL_ATTRIBUTE_STATEMENT_AFFECTED_ROWS]: uniq([...EqualityOperatorList,...CompareOperatorList,]),- "statement.table_rows": uniq([+ [CEL_ATTRIBUTE_STATEMENT_TABLE_ROWS]: uniq([...EqualityOperatorList,...CompareOperatorList,]),- level: uniq([...EqualityOperatorList, ...CollectionOperatorList]),- source: uniq([...EqualityOperatorList, ...CollectionOperatorList]),+ [CEL_ATTRIBUTE_LEVEL]: uniq([+ ...EqualityOperatorList,+ ...CollectionOperatorList,+ ]),+ [CEL_ATTRIBUTE_SOURCE]: uniq([+ ...EqualityOperatorList,+ ...CollectionOperatorList,+ ]),- "resource.environment_id": uniq([+ [CEL_ATTRIBUTE_RESOURCE_ENVIRONMENT_ID]: uniq([...EqualityOperatorList,...CollectionOperatorList,]),- "resource.instance_id": uniq([+ [CEL_ATTRIBUTE_RESOURCE_INSTANCE_ID]: uniq([...EqualityOperatorList,...CollectionOperatorList,...StringOperatorList,]),- "resource.project_id": uniq([+ [CEL_ATTRIBUTE_RESOURCE_PROJECT_ID]: uniq([...EqualityOperatorList,...CollectionOperatorList,...StringOperatorList,]),- "resource.database_name": uniq([+ [CEL_ATTRIBUTE_RESOURCE_DATABASE_NAME]: uniq([...EqualityOperatorList,...CollectionOperatorList,...StringOperatorList,]),- "resource.schema_name": uniq([+ [CEL_ATTRIBUTE_RESOURCE_SCHEMA_NAME]: uniq([...EqualityOperatorList,...CollectionOperatorList,...StringOperatorList,]),- "resource.table_name": uniq([+ [CEL_ATTRIBUTE_RESOURCE_TABLE_NAME]: uniq([...EqualityOperatorList,...CollectionOperatorList,...StringOperatorList,]),- "resource.column_name": uniq([+ [CEL_ATTRIBUTE_RESOURCE_COLUMN_NAME]: uniq([...EqualityOperatorList,...CollectionOperatorList,...StringOperatorList,]),- "resource.db_engine": uniq([+ [CEL_ATTRIBUTE_RESOURCE_DB_ENGINE]: uniq([...EqualityOperatorList,...CollectionOperatorList,...StringOperatorList,]),- "statement.sql_type": uniq([+ [CEL_ATTRIBUTE_STATEMENT_SQL_TYPE]: uniq([...EqualityOperatorList,...CollectionOperatorList,...StringOperatorList,]),- "statement.text": uniq([...StringOperatorList]),- "resource.classification_level": uniq([...CollectionOperatorList]),+ [CEL_ATTRIBUTE_STATEMENT_TEXT]: uniq([...StringOperatorList]),+ [CEL_ATTRIBUTE_RESOURCE_CLASSIFICATION_LEVEL]: uniq([+ ...CollectionOperatorList,+ ]),// Request query/export factors- "request.expiration_days": uniq([+ [CEL_ATTRIBUTE_REQUEST_EXPIRATION_DAYS]: uniq([...EqualityOperatorList,...CompareOperatorList,]),- "request.role": uniq([+ [CEL_ATTRIBUTE_REQUEST_ROLE]: uniq([...EqualityOperatorList,...CollectionOperatorList,...StringOperatorList,]),// These factors don't have operator candidates for user selection.- "request.row_limit": [],- "resource.database": [],- "request.time": [],+ [CEL_ATTRIBUTE_REQUEST_ROW_LIMIT]: [],+ [CEL_ATTRIBUTE_RESOURCE_DATABASE]: [],+ [CEL_ATTRIBUTE_REQUEST_TIME]: [],};export const getOperatorListByFactor = (factor: Factor) => {