Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
feat: unified account selector (#19144)
ecmadao3819d8290ffd
diff --git a/backend/api/mcp/gen/openapi.yaml b/backend/api/mcp/gen/openapi.yamlindex a26bac76d0..11de12ff6a 100644--- a/backend/api/mcp/gen/openapi.yaml+++ b/backend/api/mcp/gen/openapi.yaml@@ -12480,10 +12480,12 @@ components:Supported filter:- name: the service account name, support "==" and ".matches()" operator.- email: the service account email, support "==" and ".matches()" operator.+ - state: check State enum for values, support "==" operator.For example:name == "ed"name.matches("ed")+ state == "DELETED"email == "[email protected]"email.matches("ed")title: ListServiceAccountsRequest@@ -12656,10 +12658,12 @@ components:Supported filter:- name: the workload identity name, support "==" and ".matches()" operator.- email: the workload identity email, support "==" and ".matches()" operator.+ - state: check State enum for values, support "==" operator.For example:name == "ed"name.matches("ed")+ state == "DELETED"email == "[email protected]"email.matches("ed")title: ListWorkloadIdentitiesRequestdiff --git a/backend/generated-go/v1/service_account_service.pb.go b/backend/generated-go/v1/service_account_service.pb.goindex 2f1b5a3be1..e0a2736485 100644--- a/backend/generated-go/v1/service_account_service.pb.go+++ b/backend/generated-go/v1/service_account_service.pb.go@@ -259,10 +259,12 @@ type ListServiceAccountsRequest struct {// Supported filter:// - name: the service account name, support "==" and ".matches()" operator.// - email: the service account email, support "==" and ".matches()" operator.+ // - state: check State enum for values, support "==" operator.//// For example:// name == "ed"// name.matches("ed")+ // state == "DELETED"// email == "[email protected]"// email.matches("ed")Filter string `protobuf:"bytes,5,opt,name=filter,proto3" json:"filter,omitempty"`diff --git a/backend/generated-go/v1/workload_identity_service.pb.go b/backend/generated-go/v1/workload_identity_service.pb.goindex ce51e6b69f..4ca2584ae7 100644--- a/backend/generated-go/v1/workload_identity_service.pb.go+++ b/backend/generated-go/v1/workload_identity_service.pb.go@@ -259,10 +259,12 @@ type ListWorkloadIdentitiesRequest struct {// Supported filter:// - name: the workload identity name, support "==" and ".matches()" operator.// - email: the workload identity email, support "==" and ".matches()" operator.+ // - state: check State enum for values, support "==" operator.//// For example:// name == "ed"// name.matches("ed")+ // state == "DELETED"// email == "[email protected]"// email.matches("ed")Filter string `protobuf:"bytes,5,opt,name=filter,proto3" json:"filter,omitempty"`diff --git a/backend/store/principal_filter.go b/backend/store/principal_filter.goindex 3dbbf41ed6..184e6a360a 100644--- a/backend/store/principal_filter.go+++ b/backend/store/principal_filter.go@@ -234,6 +234,24 @@ func GetAccountListFilter(filter string) (*GetAccountListFilterResult, error) {return qb.Q().Space("principal.email = ?", value.(string)), nilcase "name":return qb.Q().Space("principal.name = ?", value.(string)), nil+ case "state":+ stateStr, ok := value.(string)+ if !ok {+ return nil, errors.Errorf("state value must be string, got %T", value)+ }+ // Try with STATE_ prefix first (e.g., "STATE_ACTIVE", "STATE_DELETED")+ v1State, ok := v1pb.State_value[stateStr]+ if !ok {+ // If not found, try without STATE_ prefix (e.g., "ACTIVE", "DELETED")+ if v, exists := v1pb.State_value[strings.TrimPrefix(stateStr, "STATE_")]; exists {+ v1State = v+ ok = true+ }+ }+ if !ok {+ return nil, errors.Errorf("invalid state filter %q", value)+ }+ return qb.Q().Space("principal.deleted = ?", v1pb.State(v1State) == v1pb.State_DELETED), nildefault:return nil, errors.Errorf("unsupported variable %q", variable)}diff --git a/frontend/src/components/Member/EditMemberRoleDrawer.vue b/frontend/src/components/Member/EditMemberRoleDrawer.vueindex 20125c06cd..31b462a146 100644--- a/frontend/src/components/Member/EditMemberRoleDrawer.vue+++ b/frontend/src/components/Member/EditMemberRoleDrawer.vue@@ -12,8 +12,6 @@v-model:value="state.memberList":required="true":include-all-users="true"- :include-service-account="true"- :include-workload-identity="true"/><div v-else class="w-full flex flex-col gap-y-2"><div class="flex items-center gap-x-1">diff --git a/frontend/src/components/Member/MembersBindingSelect.vue b/frontend/src/components/Member/MembersBindingSelect.vueindex 812bf7b695..8105b971a8 100644--- a/frontend/src/components/Member/MembersBindingSelect.vue+++ b/frontend/src/components/Member/MembersBindingSelect.vue@@ -1,28 +1,5 @@<template><div class="w-full flex flex-col gap-y-2">- <div- v-if="allowChangeType"- class="w-full flex items-center justify-between"- >- <NRadioGroup- :value="memberType"- class="flex gap-x-2"- :disabled="disabled"- @update:value="onTypeChange"- >- <NRadio value="USERS">{{ $t("common.users") }}</NRadio>- <NRadio v-if="includeServiceAccount" value="SERVICE_ACCOUNTS">- {{ $t("settings.members.service-accounts") }}- </NRadio>- <NRadio v-if="includeWorkloadIdentity" value="WORKLOAD_IDENTITIES">- {{ $t("settings.members.workload-identities") }}- </NRadio>- <NRadio value="GROUPS">- {{ $t("common.groups") }}- </NRadio>- </NRadioGroup>- <slot name="suffix" />- </div><i18n-tv-if="projectName"keypath="settings.members.select-in-project"@@ -34,17 +11,22 @@</template></i18n-t><div- v-if="memberType === 'USERS'"- :class="[- 'w-full flex flex-col gap-y-2',- ]"+ class="w-full flex flex-col gap-y-2"><div class="flex text-main items-center gap-x-1">- {{ $t("settings.members.select-user", 2 /* multiply*/) }}+ {{ $t("settings.members.select-account", 2 /* multiply*/) }}<RequiredStar v-if="required" />+ <NTooltip>+ <template #trigger>+ <CircleHelpIcon class="w-4 textinfolabel" />+ </template>+ <span>+ {{ $t("settings.members.select-account-hint") }}+ </span>+ </NTooltip></div>- <UserSelect- key="user-select"+ <AccountSelect+ key="account-select":value="memberList":multiple="true":disabled="disabled"@@ -53,76 +35,16 @@@update:value="onMemberListUpdate($event as string[])"/></div>- <div- v-else-if="memberType === 'SERVICE_ACCOUNTS'"- :class="[- 'w-full flex flex-col gap-y-2',- ]"- >- <div class="flex text-main items-center gap-x-1">- {{ $t("settings.members.select-service-account", 2 /* multiply*/) }}- <RequiredStar v-if="required" />- </div>- <ServiceAccountSelect- key="service-account-select"- :value="memberList"- :multiple="true"- :disabled="disabled"- @update:value="onMemberListUpdate($event as string[])"- />- </div>- <div- v-else-if="memberType === 'WORKLOAD_IDENTITIES'"- :class="[- 'w-full flex flex-col gap-y-2',- ]"- >- <div class="flex text-main items-center gap-x-1">- {{ $t("settings.members.select-workload-identity", 2 /* multiply*/) }}- <RequiredStar v-if="required" />- </div>- <WorkloadIdentitySelect- key="workload-identity-select"- :value="memberList"- :multiple="true"- :disabled="disabled"- @update:value="onMemberListUpdate($event as string[])"- />- </div>- <div- v-else-if="memberType === 'GROUPS'"- :class="[- 'w-full flex flex-col gap-y-2',- ]"- >- <div class="flex text-main items-center gap-x-1">- {{ $t("settings.members.select-group", 2 /* multiply*/) }}- <RequiredStar v-if="required" />- </div>-- <GroupSelect- key="group-select"- :value="memberList"- :disabled="disabled"- :multiple="true"- :project-name="projectName"- @update:value="onMemberListUpdate($event as string[])"- />- </div></div></template><script setup lang="ts">import { uniq } from "lodash-es";-import { NRadio, NRadioGroup } from "naive-ui";-import { computed, ref } from "vue";+import { CircleHelpIcon } from "lucide-vue-next";+import { NTooltip } from "naive-ui";+import { computed } from "vue";import RequiredStar from "@/components/RequiredStar.vue";-import {- GroupSelect,- ServiceAccountSelect,- UserSelect,- WorkloadIdentitySelect,-} from "@/components/v2";+import { AccountSelect } from "@/components/v2";import {extractGroupEmail,extractServiceAccountId,@@ -137,18 +59,9 @@ import {getServiceAccountNameInBinding,getUserEmailInBinding,getWorkloadIdentityNameInBinding,- groupBindingPrefix,- serviceAccountBindingPrefix,- workloadIdentityBindingPrefix,} from "@/types";import { convertMemberToFullname } from "@/utils";-type MemberType =- | "USERS"- | "SERVICE_ACCOUNTS"- | "WORKLOAD_IDENTITIES"- | "GROUPS";-const props = withDefaults(defineProps<{// member binding list, could be@@ -163,16 +76,12 @@ const props = withDefaults(disabled?: boolean;allowChangeType?: boolean;includeAllUsers?: boolean;- includeServiceAccount?: boolean;- includeWorkloadIdentity?: boolean;}>(),{disabled: false,projectName: undefined,allowChangeType: true,includeAllUsers: false,- includeServiceAccount: false,- includeWorkloadIdentity: false,});@@ -180,29 +89,6 @@ const emit = defineEmits<{(event: "update:value", memberList: string[]): void;}>();-const initMemberType = computed((): MemberType => {- for (const binding of props.value) {- if (binding.startsWith(groupBindingPrefix)) {- return "GROUPS";- }- if (binding.startsWith(serviceAccountBindingPrefix)) {- return "SERVICE_ACCOUNTS";- }- if (binding.startsWith(workloadIdentityBindingPrefix)) {- return "WORKLOAD_IDENTITIES";- }- return "USERS";- }- return "USERS";-});--const memberType = ref<MemberType>(initMemberType.value);--const onTypeChange = (type: MemberType) => {- emit("update:value", []);- memberType.value = type;-};-const memberList = computed(() => {return props.value.map(convertMemberToFullname);});diff --git a/frontend/src/components/ProjectMember/AddProjectMember/AddProjectMemberForm.vue b/frontend/src/components/ProjectMember/AddProjectMember/AddProjectMemberForm.vueindex 8ea9fc02a2..72f0e60b79 100644--- a/frontend/src/components/ProjectMember/AddProjectMember/AddProjectMemberForm.vue+++ b/frontend/src/components/ProjectMember/AddProjectMember/AddProjectMemberForm.vue@@ -4,8 +4,6 @@v-model:value="state.memberList":required="true":include-all-users="true"- :include-service-account="true"- :include-workload-identity="true":disabled="disableMemberChange"><template #suffix>diff --git a/frontend/src/components/ProjectMember/ProjectMemberRolePanel/EditProjectRolePanel.vue b/frontend/src/components/ProjectMember/ProjectMemberRolePanel/EditProjectRolePanel.vueindex 6bdc1c09f4..f4f2b877ad 100644--- a/frontend/src/components/ProjectMember/ProjectMemberRolePanel/EditProjectRolePanel.vue+++ b/frontend/src/components/ProjectMember/ProjectMemberRolePanel/EditProjectRolePanel.vue@@ -69,7 +69,6 @@:required="true":allow-change-type="false":include-all-users="true"- :include-service-account="true"/></div><template #footer>diff --git a/frontend/src/components/SensitiveData/GrantAccessForm.vue b/frontend/src/components/SensitiveData/GrantAccessForm.vueindex 360b2195e0..0a0a770f40 100644--- a/frontend/src/components/SensitiveData/GrantAccessForm.vue+++ b/frontend/src/components/SensitiveData/GrantAccessForm.vue@@ -50,8 +50,6 @@v-model:value="state.memberList":required="true":include-all-users="false"- :include-service-account="false"- :include-workload-identity="false"/></div></template>diff --git a/frontend/src/components/User/Settings/CreateUserDrawer.vue b/frontend/src/components/User/Settings/CreateUserDrawer.vueindex 01492dd6b5..4dd8f49346 100644--- a/frontend/src/components/User/Settings/CreateUserDrawer.vue+++ b/frontend/src/components/User/Settings/CreateUserDrawer.vue@@ -428,7 +428,7 @@<script lang="ts" setup>import { create } from "@bufbuild/protobuf";import { FieldMaskSchema } from "@bufbuild/protobuf/wkt";-import { isEqual } from "lodash-es";+import { cloneDeep, isEqual } from "lodash-es";import {NButton,NCollapseTransition,@@ -445,6 +445,8 @@ import RequiredStar from "@/components/RequiredStar.vue";import { Drawer, DrawerContent } from "@/components/v2";import { RoleSelect } from "@/components/v2/Select";import {+ ensureServiceAccountFullName,+ ensureWorkloadIdentityFullName,getUserFullNameByType,pushNotification,serviceAccountToUser,@@ -460,6 +462,7 @@ import {getUserEmailInBinding,getWorkloadIdentityNameInBinding,serviceAccountSuffix,+ UNKNOWN_USER_NAME,unknownUser,workloadIdentitySuffix,} from "@/types";@@ -498,7 +501,6 @@ interface LocalState {const props = defineProps<{user?: User;- initialUserType?: UserType;}>();const emit = defineEmits<{@@ -568,7 +570,7 @@ const allowUpdate = computed(() => {});const initialRoles = computed(() => {- if (!props.user) {+ if (!props.user || props.user.name === UNKNOWN_USER_NAME) {return [PresetRoleType.WORKSPACE_MEMBER];}@@ -649,13 +651,9 @@ watch(() => props.user,(user) => {if (!user) {- // Apply initialUserType when creating a new user- if (props.initialUserType) {- state.user.userType = props.initialUserType;- }return;}- state.user = create(UserSchema, user);+ state.user = cloneDeep(create(UserSchema, user));state.roles = [...initialRoles.value];if (user.userType === UserType.WORKLOAD_IDENTITY) {@@ -950,7 +948,7 @@ const updateUser = async () => {case UserType.WORKLOAD_IDENTITY: {const wi = await workloadIdentityStore.updateWorkloadIdentity({- name: payload.name,+ name: ensureWorkloadIdentityFullName(payload.email),title: payload.title,workloadIdentityConfig: create(WorkloadIdentityConfigSchema, {providerType: state.wif.providerType,@@ -968,16 +966,16 @@ const updateUser = async () => {}case UserType.SERVICE_ACCOUNT: {if (updateMask.length > 0) {- const se = await serviceAccountStore.updateServiceAccount(+ const sa = await serviceAccountStore.updateServiceAccount({- name: payload.name,+ name: ensureServiceAccountFullName(payload.email),title: payload.title,},create(FieldMaskSchema, {paths: [...updateMask],}));- updatedUser = serviceAccountToUser(se);+ updatedUser = serviceAccountToUser(sa);}break;}diff --git a/frontend/src/components/User/Settings/UserDataTable/index.vue b/frontend/src/components/User/Settings/UserDataTable/index.vueindex bc7014b2d7..c9792164f0 100644--- a/frontend/src/components/User/Settings/UserDataTable/index.vue+++ b/frontend/src/components/User/Settings/UserDataTable/index.vue@@ -31,6 +31,7 @@ import { useI18n } from "vue-i18n";import { BBAlert } from "@/bbkit";import { UserNameCell } from "@/components/v2/Model/cells";import {+ ensureServiceAccountFullName,getUserFullNameByType,pushNotification,serviceAccountToUser,@@ -160,7 +161,7 @@ const resetServiceKey = () => {serviceAccountStore.updateServiceAccount({- name: user.name,+ name: ensureServiceAccountFullName(user.email),},create(FieldMaskSchema, {paths: ["service_key"],diff --git a/frontend/src/components/misc/AccountTag.vue b/frontend/src/components/misc/AccountTag.vuenew file mode 100644index 0000000000..c858c672c7--- /dev/null+++ b/frontend/src/components/misc/AccountTag.vue@@ -0,0 +1,17 @@+<template>+ <NTag v-if="user.userType === UserType.SERVICE_ACCOUNT || user.userType === UserType.WORKLOAD_IDENTITY" v-bind="$attrs" round type="info">+ {{ user.userType === UserType.SERVICE_ACCOUNT+ ? $t("settings.members.service-account")+ : $t("settings.members.workload-identity")+ }}+ </NTag>+</template>++<script lang="ts" setup>+import { NTag } from "naive-ui";+import { type User, UserType } from "@/types/proto-es/v1/user_service_pb";++defineProps<{+ user: User;+}>();+</script>diff --git a/frontend/src/components/misc/ServiceAccountTag.vue b/frontend/src/components/misc/ServiceAccountTag.vuedeleted file mode 100644index 4fd870375b..0000000000--- a/frontend/src/components/misc/ServiceAccountTag.vue+++ /dev/null@@ -1,18 +0,0 @@-<template>- <NTag :size="size" round type="info">- {{ $t("settings.members.service-account") }}- </NTag>-</template>--<script lang="ts" setup>-import { NTag } from "naive-ui";--withDefaults(- defineProps<{- size?: "tiny" | "small" | "medium" | "large";- }>(),- {- size: "small",- }-);-</script>diff --git a/frontend/src/components/misc/WorkloadIdentityTag.vue b/frontend/src/components/misc/WorkloadIdentityTag.vuedeleted file mode 100644index f69d6ceb8b..0000000000--- a/frontend/src/components/misc/WorkloadIdentityTag.vue+++ /dev/null@@ -1,18 +0,0 @@-<template>- <NTag :size="size" round type="warning">- {{ $t("settings.members.workload-identity") }}- </NTag>-</template>--<script lang="ts" setup>-import { NTag } from "naive-ui";--withDefaults(- defineProps<{- size?: "tiny" | "small" | "medium" | "large";- }>(),- {- size: "small",- }-);-</script>diff --git a/frontend/src/components/v2/Model/PagedTable.vue b/frontend/src/components/v2/Model/PagedTable.vueindex f487aabe3a..82ad8f90df 100644--- a/frontend/src/components/v2/Model/PagedTable.vue+++ b/frontend/src/components/v2/Model/PagedTable.vue@@ -264,10 +264,12 @@ const updateCache = (items: T[]) => {let hasChanges = false;for (const item of items) {+ hasChanges = true;const index = updated.findIndex((d) => d.name === item.name);if (index >= 0) {updated[index] = item;- hasChanges = true;+ } else {+ updated.push(item);}}diff --git a/frontend/src/components/v2/Model/cells/UserNameCell.vue b/frontend/src/components/v2/Model/cells/UserNameCell.vueindex 2c9335a3cf..c588582a25 100644--- a/frontend/src/components/v2/Model/cells/UserNameCell.vue+++ b/frontend/src/components/v2/Model/cells/UserNameCell.vue@@ -26,22 +26,17 @@<NTag v-if="isDeleted" :size="tagSize" type="error" round>{{$t("common.deleted")}}</NTag>- <NTag v-if="user.profile?.source && showSource" :size="tagSize" round type="primary">- {{ user.profile.source }}- </NTag>- <YouTag v-if="currentUserV1.name === user.name" :size="tagSize"/>- <SystemBotTag v-if="user.name === SYSTEM_BOT_USER_NAME" :size="tagSize"/>- <ServiceAccountTag- v-if="user.userType === UserType.SERVICE_ACCOUNT"- :size="tagSize"- />- <WorkloadIdentityTag- v-if="user.userType === UserType.WORKLOAD_IDENTITY"- :size="tagSize"- />- <NTag v-if="user.mfaEnabled && showMfaEnabled" :size="tagSize" type="success" round>- {{ $t("two-factor.enabled") }}- </NTag>+ <template v-else>+ <NTag v-if="user.profile?.source && showSource" :size="tagSize" round type="info">+ {{ user.profile.source }}+ </NTag>+ <YouTag v-if="currentUserV1.name === user.name" :size="tagSize"/>+ <SystemBotTag v-if="user.name === SYSTEM_BOT_USER_NAME" :size="tagSize"/>+ <AccountTag :user="user" :size="tagSize" />+ <NTag v-if="user.mfaEnabled && showMfaEnabled" :size="tagSize" type="success" round>+ {{ $t("two-factor.enabled") }}+ </NTag>+ </template></div><slot name="footer"><NEllipsis@@ -51,7 +46,7 @@:tooltip="true"><HighlightLabelText- class="truncate max-w-40 cursor-pointer"+ class="truncate max-w-40":keyword="keyword":text="user.email"/>@@ -92,9 +87,8 @@import { ReplyIcon } from "lucide-vue-next";import { NButton, NEllipsis, NTag } from "naive-ui";import { computed } from "vue";-import ServiceAccountTag from "@/components/misc/ServiceAccountTag.vue";+import AccountTag from "@/components/misc/AccountTag.vue";import SystemBotTag from "@/components/misc/SystemBotTag.vue";-import WorkloadIdentityTag from "@/components/misc/WorkloadIdentityTag.vue";import YouTag from "@/components/misc/YouTag.vue";import UserAvatar from "@/components/User/UserAvatar.vue";import { CopyButton, HighlightLabelText } from "@/components/v2";diff --git a/frontend/src/components/v2/Select/AccountSelect.vue b/frontend/src/components/v2/Select/AccountSelect.vuenew file mode 100644index 0000000000..846fbec606--- /dev/null+++ b/frontend/src/components/v2/Select/AccountSelect.vue@@ -0,0 +1,434 @@+<template>+ <RemoteResourceSelector+ v-bind="$attrs"+ :multiple="multiple"+ :disabled="disabled"+ :size="size"+ :value="value"+ :tag="true"+ :remote="true"+ :additional-options="additionalOptions"+ :render-label="renderLabel"+ :render-tag="renderTag"+ :search="handleSearch"+ @update:value="(val) => $emit('update:value', val)"+ />+</template>++<script lang="tsx" setup>+import { create } from "@bufbuild/protobuf";+import { computedAsync } from "@vueuse/core";+import { computed, ref } from "vue";+import EllipsisText from "@/components/EllipsisText.vue";+import GroupNameCell from "@/components/User/Settings/UserDataTableByGroup/cells/GroupNameCell.vue";+import { HighlightLabelText } from "@/components/v2";+import { UserNameCell } from "@/components/v2/Model/cells";+import {+ ensureGroupIdentifier,+ ensureServiceAccountFullName,+ ensureWorkloadIdentityFullName,+ extractServiceAccountId,+ extractWorkloadIdentityId,+ getUserFullNameByType,+ groupNamePrefix,+ serviceAccountToUser,+ useGroupStore,+ userNamePrefix,+ useServiceAccountStore,+ useUserStore,+ useWorkloadIdentityStore,+ workloadIdentityToUser,+} from "@/store";+import {+ allUsersUser,+ getUserTypeByEmail,+ unknownGroup,+ unknownUser,+} from "@/types";+import type { Group } from "@/types/proto-es/v1/group_service_pb";+import { ServiceAccountSchema } from "@/types/proto-es/v1/service_account_service_pb";+import { type User, UserType } from "@/types/proto-es/v1/user_service_pb";+import { WorkloadIdentitySchema } from "@/types/proto-es/v1/workload_identity_service_pb";+import { ensureUserFullName, hasWorkspacePermissionV2 } from "@/utils";+import RemoteResourceSelector from "./RemoteResourceSelector/index.vue";+import type {+ ResourceSelectOption,+ SelectSize,+} from "./RemoteResourceSelector/types";+import {+ getRenderLabelFunc,+ getRenderTagFunc,+} from "./RemoteResourceSelector/utils";++interface AccountResource {+ type: "user" | "group";+ name: string;+ resource: Group | User;+}++const props = defineProps<{+ multiple?: boolean;+ disabled?: boolean;+ size?: SelectSize;+ value?: string | string[] | undefined; // fullname+ projectName?: string;+ // allUsers is a special user that represents all users in the project.+ includeAllUsers?: boolean;+}>();++defineEmits<{+ // the value is the fullname, for example:+ // users/{email}, groups/{email}, workloadIdentities/{email}, serviceAccounts/{email}+ (event: "update:value", value: string[] | string | undefined): void;+}>();++const combinedPageToken = ref<{+ user: string;+ group: string;+}>({+ user: "",+ group: "",+});+const userStore = useUserStore();+const groupStore = useGroupStore();+const serviceAccountStore = useServiceAccountStore();+const workloadIdentityStore = useWorkloadIdentityStore();++const hasListUserPermission = computed(() =>+ hasWorkspacePermissionV2("bb.users.list")+);+const hasListGroupPermission = computed(() =>+ hasWorkspacePermissionV2("bb.groups.list")+);+const hasGetWorkloadIdentityPermission = computed(() =>+ hasWorkspacePermissionV2("bb.workloadIdentities.get")+);+const hasGetServiceAccountPermission = computed(() =>+ hasWorkspacePermissionV2("bb.serviceAccounts.get")+);++const getUserOption = (user: User): ResourceSelectOption<AccountResource> => ({+ resource: {+ type: "user",+ name: getUserFullNameByType(user),+ resource: user,+ },+ value: getUserFullNameByType(user),+ label: user.title,+});++const getGroupOption = (+ group: Group+): ResourceSelectOption<AccountResource> => ({+ resource: {+ type: "group",+ name: group.name,+ resource: group,+ },+ value: group.name,+ label: group.title,+});++const additionalOptions = computedAsync(async () => {+ const options: ResourceSelectOption<AccountResource>[] = [];+ if (props.includeAllUsers) {+ options.push(getUserOption(allUsersUser()));+ }++ let values: string[] = [];+ if (Array.isArray(props.value)) {+ values = props.value;+ } else if (props.value) {+ values = [props.value];+ }++ const groupNames: string[] = [];+ const userNames: string[] = [];+ for (const fullname of values) {+ if (fullname.startsWith(groupNamePrefix)) {+ groupNames.push(fullname);+ continue;+ }+ const userType = getUserTypeByEmail(fullname);+ switch (userType) {+ case UserType.SERVICE_ACCOUNT:+ if (!hasGetServiceAccountPermission.value) {+ continue;+ }+ const sa = await serviceAccountStore.getOrFetchServiceAccount(+ fullname,+ true+ );+ options.push(getUserOption(serviceAccountToUser(sa)));+ break;+ case UserType.WORKLOAD_IDENTITY:+ if (!hasGetWorkloadIdentityPermission.value) {+ continue;+ }+ const wi = await workloadIdentityStore.getOrFetchWorkloadIdentity(+ fullname,+ true+ );+ options.push(getUserOption(workloadIdentityToUser(wi)));+ break;+ default:+ userNames.push(fullname);+ break;+ }+ }++ const groups = await groupStore.batchGetOrFetchGroups(groupNames);+ for (const group of groups) {+ if (group) {+ options.push(getGroupOption(group));+ }+ }++ // Ensure users are fetched into store+ await userStore.batchGetOrFetchUsers(userNames);+ // Get all users from store+ for (const email of userNames) {+ const user = userStore.getUserByIdentifier(email);+ if (user) {+ options.push(getUserOption(user));+ }+ }++ return options;+}, []);++const handleSearch = async (params: {+ search: string;+ pageToken: string;+ pageSize: number;+}) => {+ const loadNextPage = !!params.pageToken;+ if (!loadNextPage) {+ combinedPageToken.value = {+ user: "",+ group: "",+ };+ }++ const userType = getUserTypeByEmail(params.search);+ switch (userType) {+ case UserType.SERVICE_ACCOUNT:+ if (!hasGetServiceAccountPermission.value) {+ const email = extractServiceAccountId(params.search);+ return {+ nextPageToken: "",+ options: [+ getUserOption(+ serviceAccountToUser(+ create(ServiceAccountSchema, {+ name: ensureServiceAccountFullName(params.search),+ email: email,+ title: email.split("@")[0],+ })+ )+ ),+ ],+ };+ }+ const sa = await serviceAccountStore.getOrFetchServiceAccount(+ params.search,+ true+ );+ return {+ nextPageToken: "",+ options: [getUserOption(serviceAccountToUser(sa))],+ };+ case UserType.WORKLOAD_IDENTITY:+ if (!hasGetWorkloadIdentityPermission.value) {+ const email = extractWorkloadIdentityId(params.search);+ return {+ nextPageToken: "",+ options: [+ getUserOption(+ workloadIdentityToUser(+ create(WorkloadIdentitySchema, {+ name: ensureWorkloadIdentityFullName(params.search),+ email: email,+ title: email.split("@")[0],+ })+ )+ ),+ ],+ };+ }+ const wi = await workloadIdentityStore.getOrFetchWorkloadIdentity(+ params.search,+ true+ );+ return {+ nextPageToken: "",+ options: [getUserOption(workloadIdentityToUser(wi))],+ };+ default:+ }++ const requests: Promise<ResourceSelectOption<AccountResource>[]>[] = [];++ if (!loadNextPage) {+ requests.push(+ handleSearchUser({+ search: params.search,+ pageToken: "",+ pageSize: params.pageSize,+ }),+ handleSearchGroup({+ search: params.search,+ pageToken: "",+ pageSize: params.pageSize,+ })+ );+ } else {+ if (combinedPageToken.value.user) {+ requests.push(+ handleSearchUser({+ search: params.search,+ pageToken: combinedPageToken.value.user,+ pageSize: params.pageSize,+ })+ );+ }+ if (combinedPageToken.value.group) {+ requests.push(+ handleSearchGroup({+ search: params.search,+ pageToken: combinedPageToken.value.group,+ pageSize: params.pageSize,+ })+ );+ }+ }++ const responses = await Promise.all(requests);+ return {+ nextPageToken:+ combinedPageToken.value.user || combinedPageToken.value.group,+ options: responses.reduce((resp, list) => {+ resp.push(...list);+ return resp;+ }, []),+ };+};++const handleSearchUser = async (params: {+ search: string;+ pageToken: string;+ pageSize: number;+}) => {+ if (+ !hasListUserPermission.value &&+ params.search.startsWith(userNamePrefix)+ ) {+ return [getUserOption(unknownUser(ensureUserFullName(params.search)))];+ }++ const { nextPageToken, users } = await userStore.fetchUserList({+ filter: {+ query: params.search,+ project: props.projectName,+ types: [UserType.USER],+ },+ pageToken: params.pageToken,+ pageSize: params.pageSize,+ });+ combinedPageToken.value.user = nextPageToken;+ return users.map(getUserOption);+};++const handleSearchGroup = async (params: {+ search: string;+ pageToken: string;+ pageSize: number;+}) => {+ if (+ !hasListGroupPermission.value &&+ params.search.startsWith(groupNamePrefix)+ ) {+ return [getGroupOption(unknownGroup(ensureGroupIdentifier(params.search)))];+ }++ const { nextPageToken, groups } = await groupStore.fetchGroupList({+ filter: {+ query: params.search,+ project: props.projectName,+ },+ pageToken: params.pageToken,+ pageSize: params.pageSize,+ });+ combinedPageToken.value.group = nextPageToken;+ return groups.map(getGroupOption);+};++const customLabel = (+ resource: AccountResource,+ keyword: string,+ showName: boolean+) => {+ if (resource.type === "group") {+ return (+ <div>+ <GroupNameCell+ showEmail={false}+ group={resource.resource as Group}+ showIcon={false}+ link={false}+ keyword={keyword}+ />+ {showName && (+ <div>+ <EllipsisText class="opacity-60 textinfolabel">+ <HighlightLabelText keyword={keyword} text={resource.name} />+ </EllipsisText>+ </div>+ )}+ </div>+ );+ }++ const user = resource.resource as User;+ return (+ <UserNameCell+ user={user}+ allowEdit={false}+ showMfaEnabled={false}+ showSource={false}+ showEmail={false}+ link={false}+ size="small"+ keyword={keyword}+ onClickUser={() => {}}+ >+ {{+ suffix: () => (+ <span class="textinfolabel truncate">+ (<HighlightLabelText keyword={keyword} text={user.email} />)+ </span>+ ),+ }}+ </UserNameCell>+ );+};++const renderLabel = computed(() => {+ return getRenderLabelFunc({+ multiple: props.multiple,+ customLabel: (resource: AccountResource, keyword: string) =>+ customLabel(resource, keyword, true),+ showResourceName: false,+ });+});++const renderTag = computed(() => {+ return getRenderTagFunc({+ multiple: props.multiple,+ disabled: props.disabled,+ size: props.size,+ customLabel: (resource: AccountResource, keyword: string) =>+ customLabel(resource, keyword, false),+ });+});+</script>diff --git a/frontend/src/components/v2/Select/ServiceAccountSelect.vue b/frontend/src/components/v2/Select/ServiceAccountSelect.vuedeleted file mode 100644index 62e165f31d..0000000000--- a/frontend/src/components/v2/Select/ServiceAccountSelect.vue+++ /dev/null@@ -1,151 +0,0 @@-<template>- <RemoteResourceSelector- v-bind="$attrs"- :multiple="multiple"- :disabled="disabled"- :size="size"- :value="value"- :tag="!hasPermission"- :remote="hasPermission"- :additional-options="additionalOptions"- :render-label="renderLabel"- :render-tag="renderTag"- :search="handleSearch"- :filter="filter"- @update:value="(val) => $emit('update:value', val)"- />-</template>--<script lang="tsx" setup>-import { computedAsync } from "@vueuse/core";-import { computed } from "vue";-import { HighlightLabelText } from "@/components/v2";-import { UserNameCell } from "@/components/v2/Model/cells";-import { serviceAccountToUser, useServiceAccountStore } from "@/store";-import type { ServiceAccount } from "@/types/proto-es/v1/service_account_service_pb";-import { hasWorkspacePermissionV2 } from "@/utils";-import RemoteResourceSelector from "./RemoteResourceSelector/index.vue";-import type {- ResourceSelectOption,- SelectSize,-} from "./RemoteResourceSelector/types";-import {- getRenderLabelFunc,- getRenderTagFunc,-} from "./RemoteResourceSelector/utils";--const props = defineProps<{- multiple?: boolean;- disabled?: boolean;- size?: SelectSize;- value?: string | string[] | undefined; // serviceAccounts/{email}- filter?: (serviceAccount: ServiceAccount) => boolean;-}>();--defineEmits<{- // the value is serviceAccounts/{email}- (event: "update:value", value: string[] | string | undefined): void;-}>();--const serviceAccountStore = useServiceAccountStore();--const hasPermission = computed(() =>- hasWorkspacePermissionV2("bb.serviceAccounts.list")-);--const getOption = (- serviceAccount: ServiceAccount-): ResourceSelectOption<ServiceAccount> => ({- resource: serviceAccount,- value: serviceAccount.name,- label: serviceAccount.title,-});--const additionalOptions = computedAsync(async () => {- const options: ResourceSelectOption<ServiceAccount>[] = [];-- let names: string[] = [];- if (Array.isArray(props.value)) {- names = props.value;- } else if (props.value) {- names = [props.value];- }-- for (const name of names) {- const serviceAccount = await serviceAccountStore.getOrFetchServiceAccount(- name,- true- );- if (serviceAccount) {- options.push(getOption(serviceAccount));- }- }-- return options;-}, []);--const handleSearch = async (params: {- search: string;- pageToken: string;- pageSize: number;-}) => {- const { serviceAccounts, nextPageToken } =- await serviceAccountStore.listServiceAccounts({- pageSize: params.pageSize,- pageToken: params.pageToken,- showDeleted: false,- filter: {- query: params.search.toLowerCase(),- },- });-- return {- nextPageToken,- options: serviceAccounts.map(getOption),- };-};--const customLabel = (serviceAccount: ServiceAccount, keyword: string) => {- const user = serviceAccountToUser(serviceAccount);- return (- <UserNameCell- user={user}- allowEdit={false}- showMfaEnabled={false}- showSource={false}- showEmail={false}- link={false}- size="small"- keyword={keyword}- onClickUser={() => {}}- >- {{- suffix: () => (- <span class="textinfolabel truncate">- (- <HighlightLabelText keyword={keyword} text={serviceAccount.email} />- )- </span>- ),- }}- </UserNameCell>- );-};--const renderLabel = computed(() => {- return getRenderLabelFunc({- multiple: props.multiple,- customLabel,- showResourceName: false,- });-});--const renderTag = computed(() => {- return getRenderTagFunc({- multiple: props.multiple,- disabled: props.disabled,- size: props.size,- customLabel,- });-});-</script>diff --git a/frontend/src/components/v2/Select/UserSelect.vue b/frontend/src/components/v2/Select/UserSelect.vueindex 65733c571b..938fe0d346 100644--- a/frontend/src/components/v2/Select/UserSelect.vue+++ b/frontend/src/components/v2/Select/UserSelect.vue@@ -57,10 +57,6 @@ const userStore = useUserStore();const hasPermission = computed(() => hasWorkspacePermissionV2("bb.users.list"));const getFilter = (search: string): UserFilter => {- const filter = [];- if (search) {- filter.push(`(name.matches("${search}") || email.matches("${search}"))`);- }const allowedType = [UserType.USER];if (props.includeSystemBot) {allowedType.push(UserType.SYSTEM_BOT);diff --git a/frontend/src/components/v2/Select/WorkloadIdentitySelect.vue b/frontend/src/components/v2/Select/WorkloadIdentitySelect.vuedeleted file mode 100644index 593ab78ad3..0000000000--- a/frontend/src/components/v2/Select/WorkloadIdentitySelect.vue+++ /dev/null@@ -1,152 +0,0 @@-<template>- <RemoteResourceSelector- v-bind="$attrs"- :multiple="multiple"- :disabled="disabled"- :size="size"- :value="value"- :tag="!hasPermission"- :remote="hasPermission"- :additional-options="additionalOptions"- :render-label="renderLabel"- :render-tag="renderTag"- :search="handleSearch"- :filter="filter"- @update:value="(val) => $emit('update:value', val)"- />-</template>--<script lang="tsx" setup>-import { computedAsync } from "@vueuse/core";-import { computed } from "vue";-import { HighlightLabelText } from "@/components/v2";-import { UserNameCell } from "@/components/v2/Model/cells";-import { useWorkloadIdentityStore, workloadIdentityToUser } from "@/store";-import type { WorkloadIdentity } from "@/types/proto-es/v1/workload_identity_service_pb";-import { hasWorkspacePermissionV2 } from "@/utils";-import RemoteResourceSelector from "./RemoteResourceSelector/index.vue";-import type {- ResourceSelectOption,- SelectSize,-} from "./RemoteResourceSelector/types";-import {- getRenderLabelFunc,- getRenderTagFunc,-} from "./RemoteResourceSelector/utils";--const props = defineProps<{- multiple?: boolean;- disabled?: boolean;- size?: SelectSize;- value?: string | string[] | undefined; // workloadIdentities/{email}- filter?: (workloadIdentity: WorkloadIdentity) => boolean;-}>();--defineEmits<{- // the value is workloadIdentities/{email}- (event: "update:value", value: string[] | string | undefined): void;-}>();--const workloadIdentityStore = useWorkloadIdentityStore();--const hasPermission = computed(() =>- hasWorkspacePermissionV2("bb.workloadIdentities.list")-);--const getOption = (- workloadIdentity: WorkloadIdentity-): ResourceSelectOption<WorkloadIdentity> => ({- resource: workloadIdentity,- value: workloadIdentity.name,- label: workloadIdentity.title,-});--const additionalOptions = computedAsync(async () => {- const options: ResourceSelectOption<WorkloadIdentity>[] = [];-- let names: string[] = [];- if (Array.isArray(props.value)) {- names = props.value;- } else if (props.value) {- names = [props.value];- }-- for (const name of names) {- const workloadIdentity =- await workloadIdentityStore.getOrFetchWorkloadIdentity(name, true);- if (workloadIdentity) {- options.push(getOption(workloadIdentity));- }- }-- return options;-}, []);--const handleSearch = async (params: {- search: string;- pageToken: string;- pageSize: number;-}) => {- const { workloadIdentities, nextPageToken } =- await workloadIdentityStore.listWorkloadIdentities({- pageSize: params.pageSize,- pageToken: params.pageToken,- showDeleted: false,- filter: {- query: params.search.toLowerCase(),- },- });-- return {- nextPageToken,- options: workloadIdentities.map(getOption),- };-};--const customLabel = (workloadIdentity: WorkloadIdentity, keyword: string) => {- const user = workloadIdentityToUser(workloadIdentity);- return (- <UserNameCell- user={user}- allowEdit={false}- showMfaEnabled={false}- showSource={false}- showEmail={false}- link={false}- size="small"- keyword={keyword}- onClickUser={() => {}}- >- {{- suffix: () => (- <span class="textinfolabel truncate">- (- <HighlightLabelText- keyword={keyword}- text={workloadIdentity.email}- />- )- </span>- ),- }}- </UserNameCell>- );-};--const renderLabel = computed(() => {- return getRenderLabelFunc({- multiple: props.multiple,- customLabel,- showResourceName: false,- });-});--const renderTag = computed(() => {- return getRenderTagFunc({- multiple: props.multiple,- disabled: props.disabled,- size: props.size,- customLabel,- });-});-</script>diff --git a/frontend/src/components/v2/Select/index.ts b/frontend/src/components/v2/Select/index.tsindex ee7a6ff6da..8f9eafba33 100644--- a/frontend/src/components/v2/Select/index.ts+++ b/frontend/src/components/v2/Select/index.ts@@ -5,9 +5,8 @@ import GroupSelect from "./GroupSelect.vue";import InstanceSelect from "./InstanceSelect.vue";import ProjectSelect from "./ProjectSelect.vue";import RoleSelect from "./RoleSelect.vue";-import ServiceAccountSelect from "./ServiceAccountSelect.vue";import UserSelect from "./UserSelect.vue";-import WorkloadIdentitySelect from "./WorkloadIdentitySelect.vue";+import AccountSelect from "./AccountSelect.vue";export {AnnouncementLevelSelect,@@ -16,8 +15,7 @@ export {EnvironmentSelect,ProjectSelect,UserSelect,- ServiceAccountSelect,- WorkloadIdentitySelect,+ AccountSelect,GroupSelect,RoleSelect,};diff --git a/frontend/src/locales/en-US.json b/frontend/src/locales/en-US.jsonindex f14d940c15..4548e15607 100644--- a/frontend/src/locales/en-US.json+++ b/frontend/src/locales/en-US.json@@ -261,7 +261,8 @@"line": "Line","column": "Column","apply-to-database": "Apply to database",- "unlimited": "Unlimited"+ "unlimited": "Unlimited",+ "unknown": "Unknown"},"error-page": {"go-back-home": "Go back home"@@ -538,10 +539,8 @@"revoke-access-alert": "Are you sure to revoke access?","revoke-allusers-alert": "Revoke \"@:{'settings.members.all-users'}\" will revoke related roles from all other users in your workspace. Are you sure to continue?","grant-access": "Grant Access",- "select-user": "Select user | Select users",- "select-service-account": "Select service account | Select service accounts",- "select-workload-identity": "Select workload-identity | Select workload identities",- "select-group": "Select group | Select groups",+ "select-account": "Select account | Select accounts",+ "select-account-hint": "You can search for users and groups, or input the entire email to select the service account or workload identity.","select-in-project": "Select users or groups in {project}","select-role": "Select role | Select roles","assign-role": "Assign role | Assign roles"diff --git a/frontend/src/locales/es-ES.json b/frontend/src/locales/es-ES.jsonindex b82b4c143b..7dab4c5810 100644--- a/frontend/src/locales/es-ES.json+++ b/frontend/src/locales/es-ES.json@@ -255,6 +255,7 @@"column": "Columna","apply-to-database": "Aplicar a la base de datos","unlimited": "Ilimitado",+ "unknown": "Desconocido","danger-zone": "Danger Zone","archive-resource": "Archive {type}","delete-resource": "Delete {type}",@@ -538,10 +539,8 @@"revoke-access-alert": "¿Está seguro de revocar el acceso?","revoke-allusers-alert": "Revocar \"@:{'settings.members.all-users'}\" revocará los roles relacionados de todos los demás usuarios de su espacio de trabajo. ¿Desea continuar?","grant-access": "Conceder acceso",- "select-user": "Seleccionar usuario | Seleccionar usuarios",- "select-service-account": "Seleccionar cuenta de servicio | Seleccionar cuentas de servicio",- "select-workload-identity": "Seleccionar identidad de carga de trabajo | Seleccionar identidades de carga de trabajo",- "select-group": "Seleccionar grupo | Seleccionar grupos",+ "select-account": "Seleccionar cuenta | Seleccionar cuentas",+ "select-account-hint": "Puede buscar usuarios y grupos, o introducir el correo electrónico completo para seleccionar la cuenta de servicio o identidad de carga de trabajo.","select-in-project": "Seleccione usuarios o grupos en {project}","select-role": "Seleccionar rol | Seleccionar roles","assign-role": "Asignar rol | Asignar roles"diff --git a/frontend/src/locales/ja-JP.json b/frontend/src/locales/ja-JP.jsonindex 9f5b48f0f3..284f4a520a 100644--- a/frontend/src/locales/ja-JP.json+++ b/frontend/src/locales/ja-JP.json@@ -255,6 +255,7 @@"column": "列","apply-to-database": "データベースに適用","unlimited": "無制限",+ "unknown": "不明","danger-zone": "Danger Zone","archive-resource": "Archive {type}","delete-resource": "Delete {type}",@@ -538,10 +539,8 @@"revoke-access-alert": "アクセスを取り消してもよろしいですか?","revoke-allusers-alert": "「@:{'settings.members.all-users'}」を取り消すと、ワークスペース内の他のすべてのユーザーの関連ロールが取り消されます。続行しますか?","grant-access": "アクセスを許可する",- "select-user": "ユーザーを選択 | ユーザーを選択",- "select-service-account": "サービスアカウントを選択 | サービスアカウントを選択",- "select-workload-identity": "ワークロードアイデンティティを選択 | ワークロードアイデンティティを選択",- "select-group": "グループを選択 | グループを選択",+ "select-account": "アカウントを選択 | アカウントを選択",+ "select-account-hint": "ユーザーやグループを検索するか、完全なメールアドレスを入力してサービスアカウントまたはワークロードアイデンティティを選択できます。","select-in-project": "{project} 内のユーザーまたはグループを選択してください","select-role": "役割を選択 | 役割を選択","assign-role": "役割の割り当て | 役割の割り当て"diff --git a/frontend/src/locales/vi-VN.json b/frontend/src/locales/vi-VN.jsonindex 00a54eb79b..b02c4525ea 100644--- a/frontend/src/locales/vi-VN.json+++ b/frontend/src/locales/vi-VN.json@@ -255,6 +255,7 @@"column": "Cột","apply-to-database": "Áp dụng cho cơ sở dữ liệu","unlimited": "Không giới hạn",+ "unknown": "Không xác định","danger-zone": "Danger Zone","archive-resource": "Archive {type}","delete-resource": "Delete {type}",@@ -538,10 +539,8 @@"revoke-access-alert": "Bạn có chắc muốn thu hồi quyền truy cập?","revoke-allusers-alert": "Thu hồi \"@:{'settings.members.all-users'}\" sẽ thu hồi các vai trò liên quan từ tất cả người dùng khác trong không gian làm việc của bạn. Bạn có chắc chắn muốn tiếp tục không?","grant-access": "Cấp Quyền truy cập",- "select-user": "Chọn người dùng | Chọn người dùng",- "select-service-account": "Chọn tài khoản dịch vụ | Chọn tài khoản dịch vụ",- "select-workload-identity": "Chọn danh tính khối lượng công việc | Chọn danh tính khối lượng công việc",- "select-group": "Chọn nhóm | Chọn nhóm",+ "select-account": "Chọn tài khoản | Chọn tài khoản",+ "select-account-hint": "Bạn có thể tìm kiếm người dùng và nhóm, hoặc nhập toàn bộ email để chọn tài khoản dịch vụ hoặc danh tính khối lượng công việc.","select-in-project": "Chọn người dùng hoặc nhóm trong {project}","select-role": "Chọn vai trò | Chọn vai trò","assign-role": "Gán vai trò | Gán vai trò"diff --git a/frontend/src/locales/zh-CN.json b/frontend/src/locales/zh-CN.jsonindex 7345d50545..d4cc736fe7 100644--- a/frontend/src/locales/zh-CN.json+++ b/frontend/src/locales/zh-CN.json@@ -255,6 +255,7 @@"column": "列","apply-to-database": "应用到数据库","unlimited": "无限制",+ "unknown": "未知","danger-zone": "Danger Zone","archive-resource": "Archive {type}","delete-resource": "Delete {type}",@@ -538,10 +539,8 @@"revoke-access-alert": "您确定要撤销访问权限吗?","revoke-allusers-alert": "撤销“@:{'settings.members.all-users'}”将撤销您工作区中所有其他用户的相关角色。您确定要继续吗?","grant-access": "授予访问权限",- "select-user": "选择用户 | 选择用户",- "select-service-account": "选择服务账号 | 选择服务账号",- "select-workload-identity": "选择工作负载身份 | 选择工作负载身份",- "select-group": "选择组 | 选择组",+ "select-account": "选择账户 | 选择账户",+ "select-account-hint": "您可以搜索用户和组,或输入完整的电子邮件地址来选择服务账号或工作负载身份。","select-in-project": "选择 {project} 内的用户或群组","select-role": "选择角色 | 选择角色","assign-role": "分配角色 | 分配角色"diff --git a/frontend/src/store/modules/serviceAccount.ts b/frontend/src/store/modules/serviceAccount.tsindex 8a98f4e1d2..731f78ff89 100644--- a/frontend/src/store/modules/serviceAccount.ts+++ b/frontend/src/store/modules/serviceAccount.ts@@ -25,6 +25,7 @@ import { extractServiceAccountId, serviceAccountNamePrefix } from "./v1/common";export interface AccountFilter {query?: string;+ state?: State;}export const getAccountListFilter = (params: AccountFilter) => {@@ -33,10 +34,13 @@ export const getAccountListFilter = (params: AccountFilter) => {if (search) {filter.push(`(name.matches("${search}") || email.matches("${search}"))`);}+ if (params.state === State.DELETED) {+ filter.push(`state == "${State[params.state]}"`);+ }return filter.join(" && ");};-const ensureServiceAccountFullName = (identifier: string) => {+export const ensureServiceAccountFullName = (identifier: string) => {const id = extractServiceAccountId(identifier);return `${serviceAccountNamePrefix}${id}`;};@@ -83,7 +87,7 @@ export const useServiceAccountStore = defineStore("serviceAccount", () => {name,email,state: State.ACTIVE,- title: email,+ title: email.split("@")[0],}));};diff --git a/frontend/src/store/modules/v1/common.ts b/frontend/src/store/modules/v1/common.tsindex a9f8222b75..c12be57e1f 100644--- a/frontend/src/store/modules/v1/common.ts+++ b/frontend/src/store/modules/v1/common.ts@@ -177,6 +177,11 @@ export const getInstanceAndDatabaseId = (name: string): string[] => {return tokens;};+export const extractGroupEmail = (emailResource: string) => {+ const matches = emailResource.match(/^(?:group:|groups\/)(.+)$/);+ return matches?.[1] ?? emailResource;+};+export const extractUserId = (identifier: string) => {const matches = identifier.match(/^(?:user:|users\/)(.+)$/);return matches?.[1] ?? identifier;diff --git a/frontend/src/store/modules/v1/group.ts b/frontend/src/store/modules/v1/group.tsindex 274efa2993..5613937718 100644--- a/frontend/src/store/modules/v1/group.ts+++ b/frontend/src/store/modules/v1/group.ts@@ -16,7 +16,7 @@ import {UpdateGroupRequestSchema,} from "@/types/proto-es/v1/group_service_pb";import { hasWorkspacePermissionV2 } from "@/utils";-import { groupNamePrefix } from "./common";+import { extractGroupEmail, groupNamePrefix } from "./common";export interface GroupFilter {query?: string;@@ -36,11 +36,6 @@ const getListGroupFilter = (params: GroupFilter) => {return filter.join(" && ");};-export const extractGroupEmail = (emailResource: string) => {- const matches = emailResource.match(/^(?:group:|groups\/)(.+)$/);- return matches?.[1] ?? emailResource;-};-export const ensureGroupIdentifier = (id: string) => {const email = extractGroupEmail(id);return `${groupNamePrefix}${email}`;@@ -70,6 +65,12 @@ export const useGroupStore = defineStore("group", () => {groups: Group[];nextPageToken: string;}> => {+ if (!hasWorkspacePermissionV2("bb.groups.list")) {+ return {+ groups: [],+ nextPageToken: "",+ };+ }const request = create(ListGroupsRequestSchema, {pageSize: params.pageSize,pageToken: params.pageToken,diff --git a/frontend/src/store/modules/workloadIdentity.ts b/frontend/src/store/modules/workloadIdentity.tsindex 386a64ff25..059022a0fa 100644--- a/frontend/src/store/modules/workloadIdentity.ts+++ b/frontend/src/store/modules/workloadIdentity.ts@@ -27,7 +27,7 @@ import {workloadIdentityNamePrefix,} from "./v1/common";-const ensureWorkloadIdentityFullName = (identifier: string) => {+export const ensureWorkloadIdentityFullName = (identifier: string) => {const id = extractWorkloadIdentityId(identifier);return `${workloadIdentityNamePrefix}${id}`;};@@ -74,7 +74,7 @@ export const useWorkloadIdentityStore = defineStore("workloadIdentity", () => {name,email,state: State.ACTIVE,- title: email,+ title: email.split("@")[0],}));};@@ -87,7 +87,7 @@ export const useWorkloadIdentityStore = defineStore("workloadIdentity", () => {if (cacheByName.value.has(validName)) {return cacheByName.value.get(validName)!;}- const wi = await fetchWorkloadIdentity(name, silent);+ const wi = await fetchWorkloadIdentity(validName, silent);cacheByName.value.set(wi.name, wi);return wi;};diff --git a/frontend/src/types/proto-es/v1/service_account_service_pb.d.ts b/frontend/src/types/proto-es/v1/service_account_service_pb.d.tsindex 0f56842a7b..0ef6b9b5e2 100644--- a/frontend/src/types/proto-es/v1/service_account_service_pb.d.ts+++ b/frontend/src/types/proto-es/v1/service_account_service_pb.d.ts@@ -177,10 +177,12 @@ export declare type ListServiceAccountsRequest = Message<"bytebase.v1.ListServic* Supported filter:* - name: the service account name, support "==" and ".matches()" operator.* - email: the service account email, support "==" and ".matches()" operator.+ * - state: check State enum for values, support "==" operator.** For example:* name == "ed"* name.matches("ed")+ * state == "DELETED"* email == "[email protected]"* email.matches("ed")*diff --git a/frontend/src/types/proto-es/v1/workload_identity_service_pb.d.ts b/frontend/src/types/proto-es/v1/workload_identity_service_pb.d.tsindex cbd6fc4491..c1f9847abb 100644--- a/frontend/src/types/proto-es/v1/workload_identity_service_pb.d.ts+++ b/frontend/src/types/proto-es/v1/workload_identity_service_pb.d.ts@@ -178,10 +178,12 @@ export declare type ListWorkloadIdentitiesRequest = Message<"bytebase.v1.ListWor* Supported filter:* - name: the workload identity name, support "==" and ".matches()" operator.* - email: the workload identity email, support "==" and ".matches()" operator.+ * - state: check State enum for values, support "==" operator.** For example:* name == "ed"* name.matches("ed")+ * state == "DELETED"* email == "[email protected]"* email.matches("ed")*diff --git a/frontend/src/types/v1/group.ts b/frontend/src/types/v1/group.tsnew file mode 100644index 0000000000..83a3140dc9--- /dev/null+++ b/frontend/src/types/v1/group.ts@@ -0,0 +1,19 @@+import { create } from "@bufbuild/protobuf";+import { t } from "@/plugins/i18n";+import { extractGroupEmail } from "@/store/modules/v1/common";+import { type Group, GroupSchema } from "@/types/proto-es/v1/group_service_pb";+import { UNKNOWN_ID } from "../const";++export const unknownGroup = (name: string = ""): Group => {+ const group = create(GroupSchema, {+ name: `groups/${UNKNOWN_ID}`,+ title: t("common.unknown"),+ });+ if (name) {+ group.name = name;+ const email = extractGroupEmail(name);+ group.email = email;+ group.title = email.split("@")[0];+ }+ return group;+};diff --git a/frontend/src/types/v1/index.ts b/frontend/src/types/v1/index.tsindex 74ae4acde2..398853ba84 100644--- a/frontend/src/types/v1/index.ts+++ b/frontend/src/types/v1/index.ts@@ -5,6 +5,7 @@ export * from "./dataSource";export * from "./project";export * from "./projectWebhook";export * from "./user";+export * from "./group";export * from "./sql";export * from "./webTerminal";export * from "./issue";diff --git a/frontend/src/types/v1/user.ts b/frontend/src/types/v1/user.tsindex d1966322fa..649edf4ac8 100644--- a/frontend/src/types/v1/user.ts+++ b/frontend/src/types/v1/user.ts@@ -15,12 +15,13 @@ export const unknownUser = (name: string = ""): User => {name: UNKNOWN_USER_NAME,state: State.ACTIVE,userType: UserType.USER,+ title: t("common.unknown"),});if (name) {user.name = name;const email = extractUserId(name);user.email = email;- user.title = email;+ user.title = email.split("@")[0];}return user;};diff --git a/frontend/src/views/ProfileDashboard.vue b/frontend/src/views/ProfileDashboard.vueindex 5ff202c8c0..d362a74d47 100644--- a/frontend/src/views/ProfileDashboard.vue+++ b/frontend/src/views/ProfileDashboard.vue@@ -52,9 +52,6 @@<h1 v-else class="pb-1.5 text-2xl font-bold text-main truncate">{{ user.title }}</h1>- <ServiceAccountTag- v-if="user.userType === UserType.SERVICE_ACCOUNT"- /></div></div></div>@@ -235,7 +232,6 @@ import EmailInput from "@/components/EmailInput.vue";import { FeatureModal } from "@/components/FeatureGuard";import FeatureBadge from "@/components/FeatureGuard/FeatureBadge.vue";import LearnMoreLink from "@/components/LearnMoreLink.vue";-import ServiceAccountTag from "@/components/misc/ServiceAccountTag.vue";import NoPermissionPlaceholder from "@/components/Permission/NoPermissionPlaceholder.vue";import RegenerateRecoveryCodesView from "@/components/RegenerateRecoveryCodesView.vue";import { ActionConfirmModal } from "@/components/SchemaEditorLite";diff --git a/frontend/src/views/SettingWorkspaceUsers.vue b/frontend/src/views/SettingWorkspaceUsers.vueindex 5c5751700f..e4f8d72b63 100644--- a/frontend/src/views/SettingWorkspaceUsers.vue+++ b/frontend/src/views/SettingWorkspaceUsers.vue@@ -129,7 +129,7 @@<UserDataTableByGroup:groups="list":loading="loading"- :keyword="state.activeUserFilterText"+ :keyword="state.activeGroupFilterText"v-model:expanded-keys="expandedKeys"@group-selected="handleGroupSelected"@group-removed="handleGroupRemoved"@@ -141,13 +141,11 @@<template #suffix><div class="flex items-center gap-x-2">- <SearchBox- v-if="state.typeTab === 'USERS' || state.typeTab === 'GROUPS'"- v-model:value="state.activeUserFilterText"- />-<!-- USERS tab actions --><template v-if="state.typeTab === 'USERS'">+ <SearchBox+ v-model:value="state.activeUserFilterText"+ /><PermissionGuardWrapperv-slot="slotProps":permissions="['bb.settings.get']"@@ -177,7 +175,7 @@type="primary"class="capitalize":disabled="slotProps.disabled"- @click="handleCreateUser"+ @click="() => handleCreateUser(UserType.USER)"><template #icon><PlusIcon class="h-5 w-5" />@@ -197,7 +195,7 @@type="primary"class="capitalize":disabled="slotProps.disabled"- @click="handleCreateServiceAccount"+ @click="() => handleCreateUser(UserType.SERVICE_ACCOUNT)"><template #icon><PlusIcon class="h-5 w-5" />@@ -217,7 +215,7 @@type="primary"class="capitalize":disabled="slotProps.disabled"- @click="handleCreateWorkloadIdentity"+ @click="() => handleCreateUser(UserType.WORKLOAD_IDENTITY)"><template #icon><PlusIcon class="h-5 w-5" />@@ -229,6 +227,9 @@<!-- GROUPS tab actions --><template v-if="state.typeTab === 'GROUPS'">+ <SearchBox+ v-model:value="state.activeGroupFilterText"+ /><PermissionGuardWrapperv-slot="slotProps":permissions="['bb.settings.get']"@@ -259,6 +260,7 @@><template #trigger><NButton+ type="primary":disabled="slotProps.disabled ||settingV1Store.workspaceProfile.domains.length === 0 ||@@ -304,9 +306,6 @@<div class="flex justify-between items-center mt-2 mb-4"><p class="text-lg font-medium leading-7"><span>{{ $t("settings.members.inactive-users") }}</span>- <span class="ml-1 font-normal text-control-light">- ({{ inactiveUserCount }})- </span></p><div>@@ -325,7 +324,7 @@:show-roles="false":user-list="list":keyword="state.inactiveUserFilterText"- @update-user="handleUserRestore"+ @user-updated="handleUserRestore"/></template></PagedTable>@@ -344,9 +343,6 @@<div class="flex justify-between items-center mt-2 mb-4"><p class="text-lg font-medium leading-7"><span>{{ $t("settings.members.inactive-service-accounts") }}</span>- <span class="ml-1 font-normal text-control-light">- ({{ inactiveServiceAccountCount }})- </span></p></div>@@ -360,7 +356,7 @@:loading="loading":show-roles="false":user-list="list"- @update-user="handleServiceAccountRestore"+ @user-updated="handleUserRestore"/></template></PagedTable>@@ -381,9 +377,6 @@<span>{{$t("settings.members.inactive-workload-identities")}}</span>- <span class="ml-1 font-normal text-control-light">- ({{ inactiveWorkloadIdentityCount }})- </span></p></div>@@ -397,7 +390,7 @@:loading="loading":show-roles="false":user-list="list"- @update-user="handleWorkloadIdentityRestore"+ @user-updated="handleUserRestore"/></template></PagedTable>@@ -408,13 +401,12 @@<CreateUserDrawerv-if="state.showCreateUserDrawer":user="state.editingUser"- :initial-user-type="state.createUserType"@close="() => {state.showCreateUserDrawer = falsestate.editingUser = undefined- state.createUserType = undefined}"- @created="handleUserCreated"+ @created="handleUserUpdated"+ @updated="handleUserUpdated"/><CreateGroupDrawerv-if="state.showCreateGroupDrawer"@@ -474,6 +466,7 @@ import {useWorkloadIdentityStore,workloadIdentityToUser,} from "@/store/modules/workloadIdentity";+import { unknownUser } from "@/types";import { State } from "@/types/proto-es/v1/common_pb";import type { Group } from "@/types/proto-es/v1/group_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";@@ -494,6 +487,7 @@ const defaultTab: MemberTab = "USERS";type LocalState = {typeTab: MemberTab;activeUserFilterText: string;+ activeGroupFilterText: string;inactiveUserFilterText: string;showInactiveUserList: boolean;showInactiveServiceAccountList: boolean;@@ -503,12 +497,12 @@ type LocalState = {showAadSyncDrawer: boolean;editingGroup?: Group;editingUser?: User;- createUserType?: UserType;};const state = reactive<LocalState>({typeTab: defaultTab,activeUserFilterText: "",+ activeGroupFilterText: "",inactiveUserFilterText: "",showInactiveUserList: false,showInactiveServiceAccountList: false,@@ -587,7 +581,7 @@ const fetchGroupList = async ({pageToken,pageSize,filter: {- query: state.activeUserFilterText,+ query: state.activeGroupFilterText,},});return { list: groups, nextPageToken };@@ -654,10 +648,11 @@ const fetchInactiveServiceAccountList = async ({pageSize,pageToken,showDeleted: true,+ filter: {+ state: State.DELETED,+ },});- const users: User[] = response.serviceAccounts- .filter((sa) => sa.state === State.DELETED)- .map(serviceAccountToUser);+ const users: User[] = response.serviceAccounts.map(serviceAccountToUser);return { list: users, nextPageToken: response.nextPageToken };};@@ -672,28 +667,14 @@ const fetchInactiveWorkloadIdentityList = async ({pageSize,pageToken,showDeleted: true,+ filter: {+ state: State.DELETED,+ },});- const users: User[] = response.workloadIdentities- .filter((wi) => wi.state === State.DELETED)- .map(workloadIdentityToUser);+ const users: User[] = response.workloadIdentities.map(workloadIdentityToUser);return { list: users, nextPageToken: response.nextPageToken };};-watch(- () => state.activeUserFilterText,- () => {- if (state.typeTab === "USERS") {- userPagedTable.value?.refresh();- } else if (state.typeTab === "SERVICE_ACCOUNTS") {- serviceAccountPagedTable.value?.refresh();- } else if (state.typeTab === "WORKLOAD_IDENTITIES") {- workloadIdentityPagedTable.value?.refresh();- } else {- groupPagedTable.value?.refresh();- }- }-);-const fetchInactiveUserList = async ({pageToken,pageSize,@@ -705,6 +686,7 @@ const fetchInactiveUserList = async ({pageToken,pageSize,filter: {+ query: state.inactiveUserFilterText,state: State.DELETED,types: [UserType.USER, UserType.SYSTEM_BOT],},@@ -755,27 +737,6 @@ const activeWorkloadIdentityCount = computed(() => {});});-const inactiveUserCount = computed(() => {- return actuatorStore.countUser({- state: State.DELETED,- userTypes: [UserType.USER, UserType.SYSTEM_BOT],- });-});--const inactiveServiceAccountCount = computed(() => {- return actuatorStore.countUser({- state: State.DELETED,- userTypes: [UserType.SERVICE_ACCOUNT],- });-});--const inactiveWorkloadIdentityCount = computed(() => {- return actuatorStore.countUser({- state: State.DELETED,- userTypes: [UserType.WORKLOAD_IDENTITY],- });-});-const remainingUserCount = computed((): number => {return Math.max(0,@@ -836,81 +797,74 @@ const handleGroupRemoved = (group: Group) => {groupPagedTable.value?.removeCache(group);};-const handleCreateUser = () => {- state.createUserType = UserType.USER;+const handleCreateUser = (userType: UserType) => {+ state.editingUser = {+ ...unknownUser(),+ userType,+ title: "",+ };state.showCreateUserDrawer = true;};-const handleCreateServiceAccount = () => {- state.createUserType = UserType.SERVICE_ACCOUNT;- state.showCreateUserDrawer = true;-};--const handleCreateWorkloadIdentity = () => {- state.createUserType = UserType.WORKLOAD_IDENTITY;- state.showCreateUserDrawer = true;-};+const handleUserUpdated = (user: User) => {+ if (user.state === State.DELETED) {+ return handleUserArchived(user);+ }-const handleUserCreated = (user: User) => {- if (user.userType === UserType.SERVICE_ACCOUNT) {- serviceAccountPagedTable.value?.refresh().then(() => {- serviceAccountPagedTable.value?.updateCache([user]);- });- } else if (user.userType === UserType.WORKLOAD_IDENTITY) {- workloadIdentityPagedTable.value?.refresh().then(() => {- workloadIdentityPagedTable.value?.updateCache([user]);- });- } else {- userPagedTable.value?.refresh().then(() => {- userPagedTable.value?.updateCache([user]);- });+ switch (user.userType) {+ case UserType.SERVICE_ACCOUNT:+ return serviceAccountPagedTable.value?.updateCache([user]);+ case UserType.WORKLOAD_IDENTITY:+ return workloadIdentityPagedTable.value?.updateCache([user]);+ default:+ return userPagedTable.value?.updateCache([user]);}};-const handleUserUpdated = (user: User) => {- if (user.userType === UserType.SERVICE_ACCOUNT) {- if (user.state === State.DELETED) {- serviceAccountPagedTable.value?.removeCache(user);- } else {- serviceAccountPagedTable.value?.updateCache([user]);+const handleUserRestore = (user: User) => {+ if (user.state !== State.ACTIVE) {+ return;+ }+ switch (user.userType) {+ case UserType.SERVICE_ACCOUNT: {+ deletedServiceAccountPagedTable.value?.removeCache(user);+ serviceAccountPagedTable.value?.refresh();+ break;}- } else if (user.userType === UserType.WORKLOAD_IDENTITY) {- if (user.state === State.DELETED) {- workloadIdentityPagedTable.value?.removeCache(user);- } else {- workloadIdentityPagedTable.value?.updateCache([user]);+ case UserType.WORKLOAD_IDENTITY: {+ deletedWorkloadIdentityPagedTable.value?.removeCache(user);+ workloadIdentityPagedTable.value?.refresh();+ break;}- } else {- if (user.state === State.DELETED) {- userPagedTable.value?.removeCache(user);- } else {+ default: {+ deletedUserPagedTable.value?.removeCache(user);userPagedTable.value?.updateCache([user]);+ break;}}};-const handleServiceAccountRestore = (user: User) => {- if (user.state !== State.ACTIVE) {- return;- }- deletedServiceAccountPagedTable.value?.removeCache(user);- serviceAccountPagedTable.value?.refresh();-};--const handleWorkloadIdentityRestore = (user: User) => {- if (user.state !== State.ACTIVE) {+const handleUserArchived = (user: User) => {+ if (user.state !== State.DELETED) {return;}- deletedWorkloadIdentityPagedTable.value?.removeCache(user);- workloadIdentityPagedTable.value?.refresh();-};--const handleUserRestore = (user: User) => {- if (user.state !== State.ACTIVE) {- return;+ switch (user.userType) {+ case UserType.SERVICE_ACCOUNT: {+ serviceAccountPagedTable.value?.removeCache(user);+ deletedServiceAccountPagedTable.value?.refresh();+ break;+ }+ case UserType.WORKLOAD_IDENTITY: {+ workloadIdentityPagedTable.value?.removeCache(user);+ deletedWorkloadIdentityPagedTable.value?.refresh();+ break;+ }+ default: {+ userPagedTable.value?.removeCache(user);+ deletedUserPagedTable.value?.updateCache([user]);+ break;+ }}- deletedUserPagedTable.value?.removeCache(user);- userPagedTable.value?.refresh();};const handleGroupUpdated = (group: Group) => {diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yamlindex b6a0ca9c74..307da75382 100644--- a/proto/gen/grpc-doc/openapi.yaml+++ b/proto/gen/grpc-doc/openapi.yaml@@ -8033,10 +8033,12 @@ paths:Supported filter:- name: the service account name, support "==" and ".matches()" operator.- email: the service account email, support "==" and ".matches()" operator.+ - state: check State enum for values, support "==" operator.For example:name == "ed"name.matches("ed")+ state == "DELETED"email == "[email protected]"email.matches("ed")schema:@@ -8049,10 +8051,12 @@ paths:Supported filter:- name: the service account name, support "==" and ".matches()" operator.- email: the service account email, support "==" and ".matches()" operator.+ - state: check State enum for values, support "==" operator.For example:name == "ed"name.matches("ed")+ state == "DELETED"email == "[email protected]"email.matches("ed")responses:@@ -8380,10 +8384,12 @@ paths:Supported filter:- name: the workload identity name, support "==" and ".matches()" operator.- email: the workload identity email, support "==" and ".matches()" operator.+ - state: check State enum for values, support "==" operator.For example:name == "ed"name.matches("ed")+ state == "DELETED"email == "[email protected]"email.matches("ed")schema:@@ -8396,10 +8402,12 @@ paths:Supported filter:- name: the workload identity name, support "==" and ".matches()" operator.- email: the workload identity email, support "==" and ".matches()" operator.+ - state: check State enum for values, support "==" operator.For example:name == "ed"name.matches("ed")+ state == "DELETED"email == "[email protected]"email.matches("ed")responses:@@ -9103,10 +9111,12 @@ paths:Supported filter:- name: the service account name, support "==" and ".matches()" operator.- email: the service account email, support "==" and ".matches()" operator.+ - state: check State enum for values, support "==" operator.For example:name == "ed"name.matches("ed")+ state == "DELETED"email == "[email protected]"email.matches("ed")schema:@@ -9119,10 +9129,12 @@ paths:Supported filter:- name: the service account name, support "==" and ".matches()" operator.- email: the service account email, support "==" and ".matches()" operator.+ - state: check State enum for values, support "==" operator.For example:name == "ed"name.matches("ed")+ state == "DELETED"email == "[email protected]"email.matches("ed")responses:@@ -9906,10 +9918,12 @@ paths:Supported filter:- name: the workload identity name, support "==" and ".matches()" operator.- email: the workload identity email, support "==" and ".matches()" operator.+ - state: check State enum for values, support "==" operator.For example:name == "ed"name.matches("ed")+ state == "DELETED"email == "[email protected]"email.matches("ed")schema:@@ -9922,10 +9936,12 @@ paths:Supported filter:- name: the workload identity name, support "==" and ".matches()" operator.- email: the workload identity email, support "==" and ".matches()" operator.+ - state: check State enum for values, support "==" operator.For example:name == "ed"name.matches("ed")+ state == "DELETED"email == "[email protected]"email.matches("ed")responses:@@ -16759,10 +16775,12 @@ components:Supported filter:- name: the service account name, support "==" and ".matches()" operator.- email: the service account email, support "==" and ".matches()" operator.+ - state: check State enum for values, support "==" operator.For example:name == "ed"name.matches("ed")+ state == "DELETED"email == "[email protected]"email.matches("ed")title: ListServiceAccountsRequest@@ -16937,10 +16955,12 @@ components:Supported filter:- name: the workload identity name, support "==" and ".matches()" operator.- email: the workload identity email, support "==" and ".matches()" operator.+ - state: check State enum for values, support "==" operator.For example:name == "ed"name.matches("ed")+ state == "DELETED"email == "[email protected]"email.matches("ed")title: ListWorkloadIdentitiesRequestdiff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.mdindex b3fae86e45..636790c214 100644--- a/proto/gen/grpc-doc/v1/README.md+++ b/proto/gen/grpc-doc/v1/README.md@@ -10245,9 +10245,9 @@ When paginating, all other parameters provided to `ListServiceAccounts` must mat| show_deleted | [bool](#bool) | | Show deleted service accounts if specified. || filter | [string](#string) | | Filter is used to filter service accounts returned in the list. The syntax and semantics of CEL are documented at https://github.com/google/cel-spec-Supported filter: - name: the service account name, support "==" and ".matches()" operator. - email: the service account email, support "==" and ".matches()" operator.+Supported filter: - name: the service account name, support "==" and ".matches()" operator. - email: the service account email, support "==" and ".matches()" operator. - state: check State enum for values, support "==" operator.-For example: name == "ed" name.matches("ed") email == "[email protected]" email.matches("ed") |+For example: name == "ed" name.matches("ed") state == "DELETED" email == "[email protected]" email.matches("ed") |@@ -10729,9 +10729,9 @@ When paginating, all other parameters provided to `ListWorkloadIdentities` must| show_deleted | [bool](#bool) | | Show deleted workload identities if specified. || filter | [string](#string) | | Filter is used to filter workload identities returned in the list. The syntax and semantics of CEL are documented at https://github.com/google/cel-spec-Supported filter: - name: the workload identity name, support "==" and ".matches()" operator. - email: the workload identity email, support "==" and ".matches()" operator.+Supported filter: - name: the workload identity name, support "==" and ".matches()" operator. - email: the workload identity email, support "==" and ".matches()" operator. - state: check State enum for values, support "==" operator.-For example: name == "ed" name.matches("ed") email == "[email protected]" email.matches("ed") |+For example: name == "ed" name.matches("ed") state == "DELETED" email == "[email protected]" email.matches("ed") |diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.htmlindex 25b0077dac..488ff632b1 100644--- a/proto/gen/grpc-doc/v1/index.html+++ b/proto/gen/grpc-doc/v1/index.html@@ -28826,10 +28826,12 @@ The syntax and semantics of CEL are documented at https://github.com/google/cel-Supported filter:- name: the service account name, support "==" and ".matches()" operator.- email: the service account email, support "==" and ".matches()" operator.+- state: check State enum for values, support "==" operator.For example:name == "ed"name.matches("ed")+state == "DELETED"email == "[email protected]"email.matches("ed") </p></td></tr>@@ -30312,10 +30314,12 @@ The syntax and semantics of CEL are documented at https://github.com/google/cel-Supported filter:- name: the workload identity name, support "==" and ".matches()" operator.- email: the workload identity email, support "==" and ".matches()" operator.+- state: check State enum for values, support "==" operator.For example:name == "ed"name.matches("ed")+state == "DELETED"email == "[email protected]"email.matches("ed") </p></td></tr>diff --git a/proto/v1/v1/service_account_service.proto b/proto/v1/v1/service_account_service.protoindex 8d9d13129b..6f78f338f4 100644--- a/proto/v1/v1/service_account_service.proto+++ b/proto/v1/v1/service_account_service.proto@@ -175,10 +175,12 @@ message ListServiceAccountsRequest {// Supported filter:// - name: the service account name, support "==" and ".matches()" operator.// - email: the service account email, support "==" and ".matches()" operator.+ // - state: check State enum for values, support "==" operator.//// For example:// name == "ed"// name.matches("ed")+ // state == "DELETED"// email == "[email protected]"// email.matches("ed")string filter = 5;diff --git a/proto/v1/v1/workload_identity_service.proto b/proto/v1/v1/workload_identity_service.protoindex 2f00fd7133..1db6de2582 100644--- a/proto/v1/v1/workload_identity_service.proto+++ b/proto/v1/v1/workload_identity_service.proto@@ -176,10 +176,12 @@ message ListWorkloadIdentitiesRequest {// Supported filter:// - name: the workload identity name, support "==" and ".matches()" operator.// - email: the workload identity email, support "==" and ".matches()" operator.+ // - state: check State enum for values, support "==" operator.//// For example:// name == "ed"// name.matches("ed")+ // state == "DELETED"// email == "[email protected]"// email.matches("ed")string filter = 5;