Skip to content

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

refactor: remove project owner requirement for IAM policy (#18963)

Danny Xu747d3a85e0ca
diff --git a/backend/api/v1/project_service.go b/backend/api/v1/project_service.go
index 45bb82f86c..0c71c7f452 100644
--- a/backend/api/v1/project_service.go
+++ b/backend/api/v1/project_service.go
@@ -577,14 +577,9 @@ func (s *ProjectService) SetIamPolicy(ctx context.Context, req *connect.Request[
return nil, connect.NewError(connect.CodeAborted, errors.Errorf("there is concurrent update to the project iam policy, please refresh and try again"))
}
- existProjectOwner, err := validateIAMPolicy(ctx, s.store, req.Msg.Policy, oldIamPolicyMsg)
- if err != nil {
+ if err := validateIAMPolicy(ctx, s.store, req.Msg.Policy, oldIamPolicyMsg); err != nil {
return nil, err
}
- // Must contain one owner binding.
- if !existProjectOwner {
- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("IAM Policy must have at least one binding with %s", common.ProjectOwner))
- }
policy, err := convertToStoreIamPolicy(req.Msg.Policy)
if err != nil {
@@ -1031,17 +1026,17 @@ func validateIAMPolicy(
stores *store.Store,
policy *v1pb.IamPolicy,
oldPolicyMessage *store.IamPolicyMessage,
-) (bool, error) {
+) error {
if policy == nil {
- return false, connect.NewError(connect.CodeInvalidArgument, errors.New("IAM Policy is required"))
+ return connect.NewError(connect.CodeInvalidArgument, errors.New("IAM Policy is required"))
}
if len(policy.Bindings) == 0 {
- return false, connect.NewError(connect.CodeInvalidArgument, errors.New("IAM Binding is empty"))
+ return connect.NewError(connect.CodeInvalidArgument, errors.New("IAM Binding is empty"))
}
workspaceProfileSetting, err := stores.GetWorkspaceProfileSetting(ctx)
if err != nil {
- return false, connect.NewError(connect.CodeInternal, errors.New("failed to get workspace profile setting"))
+ return connect.NewError(connect.CodeInternal, errors.New("failed to get workspace profile setting"))
}
var maximumRoleExpiration *durationpb.Duration
if workspaceProfileSetting != nil {
@@ -1050,7 +1045,7 @@ func validateIAMPolicy(
roleMessages, err := stores.ListRoles(ctx, &store.FindRoleMessage{})
if err != nil {
- return false, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to list roles"))
+ return connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to list roles"))
}
existingBindings := make(map[string]bool)
@@ -1059,15 +1054,11 @@ func validateIAMPolicy(
existingBindings[identifier] = true
}
- existProjectOwner := false
bindings := []*v1pb.Binding{}
for _, binding := range policy.Bindings {
if len(binding.Members) == 0 {
continue
}
- if binding.Role == fmt.Sprintf("roles/%s", common.ProjectOwner) {
- existProjectOwner = true
- }
identifier := getBindingIdentifier(binding.Role, binding.Condition)
if !existingBindings[identifier] {
@@ -1075,7 +1066,7 @@ func validateIAMPolicy(
}
}
- return existProjectOwner, validateBindings(bindings, roleMessages, maximumRoleExpiration)
+ return validateBindings(bindings, roleMessages, maximumRoleExpiration)
}
func validateBindings(bindings []*v1pb.Binding, roles []*store.RoleMessage, maximumRoleExpiration *durationpb.Duration) error {
diff --git a/backend/api/v1/workspace_service.go b/backend/api/v1/workspace_service.go
index 2e80a72d8a..1b71e62024 100644
--- a/backend/api/v1/workspace_service.go
+++ b/backend/api/v1/workspace_service.go
@@ -56,7 +56,7 @@ func (s *WorkspaceService) SetIamPolicy(ctx context.Context, req *connect.Reques
return nil, connect.NewError(connect.CodeAborted, errors.New("there is concurrent update to the workspace iam policy, please refresh and try again"))
}
- if _, err := validateIAMPolicy(ctx, s.store, request.Policy, policyMessage); err != nil {
+ if err := validateIAMPolicy(ctx, s.store, request.Policy, policyMessage); err != nil {
return nil, err
}
diff --git a/frontend/src/components/ProjectMember/ProjectMemberRolePanel/index.vue b/frontend/src/components/ProjectMember/ProjectMemberRolePanel/index.vue
index e5ce2a3d10..f1738ac4ae 100644
--- a/frontend/src/components/ProjectMember/ProjectMemberRolePanel/index.vue
+++ b/frontend/src/components/ProjectMember/ProjectMemberRolePanel/index.vue
@@ -55,25 +55,13 @@
class="w-full px-2 py-2 flex flex-row justify-start items-center gap-x-1"
>
<span class="textlabel">{{ displayRoleTitle(role.role) }}</span>
- <NTooltip
- :disabled="
- allowRemoveRole(role.role) ||
- role.role !== PresetRoleType.PROJECT_OWNER
- "
+ <MiniActionButton
+ type="error"
+ :disabled="!allowRemoveRole(role.role)"
+ @click.prevent="handleDeleteRole(role.role)"
>
- <template #trigger>
- <MiniActionButton
- type="error"
- :disabled="!allowRemoveRole(role.role)"
- @click.prevent="handleDeleteRole(role.role)"
- >
- <TrashIcon class="w-4 h-4" />
- </MiniActionButton>
- </template>
- <div>
- {{ $t("project.members.cannot-remove-last-owner") }}
- </div>
- </NTooltip>
+ <TrashIcon class="w-4 h-4" />
+ </MiniActionButton>
</div>
<NDataTable
size="small"
@@ -173,7 +161,6 @@ import {
checkRoleContainsAnyPermission,
displayRoleTitle,
hasProjectPermissionV2,
- memberMapToRolesInProjectIAM,
} from "@/utils";
import { buildConditionExpr, convertFromExpr } from "@/utils/issue/cel";
import AddProjectMembersPanel from "../AddProjectMember/AddProjectMembersPanel.vue";
@@ -341,30 +328,21 @@ const getDataTableColumns = (
</MiniActionButton>
{(roleList.value.find((r) => r.role === role)?.singleBindingList
?.length ?? 0) > 1 && (
- <NTooltip
- disabled={allowDeleteCondition(singleBinding)}
- v-slots={{
- trigger: () => (
- <MiniActionButton
- type="error"
- disabled={!allowDeleteCondition(singleBinding)}
- onClick={() => {
- const item = roleList.value.find((r) => r.role === role);
- if (item) {
- const index =
- item.singleBindingList.indexOf(singleBinding);
- if (index >= 0) {
- handleDeleteCondition(item, index);
- }
- }
- }}
- >
- <TrashIcon class="w-4 h-4" />
- </MiniActionButton>
- ),
- default: () => t("project.members.cannot-remove-last-owner"),
+ <MiniActionButton
+ type="error"
+ disabled={!allowDeleteCondition(singleBinding)}
+ onClick={() => {
+ const item = roleList.value.find((r) => r.role === role);
+ if (item) {
+ const index = item.singleBindingList.indexOf(singleBinding);
+ if (index >= 0) {
+ handleDeleteCondition(item, index);
+ }
+ }
}}
- />
+ >
+ <TrashIcon class="w-4 h-4" />
+ </MiniActionButton>
)}
</div>
),
@@ -374,10 +352,7 @@ const getDataTableColumns = (
return columns;
};
-// To prevent user accidentally removing roles and lock the project permanently, we take following measures:
-// 1. Disallow removing the last OWNER.
-// 2. Allow workspace roles who can manage project. This helps when the project OWNER is no longer available.
-const allowRemoveRole = (role: string) => {
+const allowRemoveRole = (_role: string) => {
if (props.project.state === State.DELETED) {
return false;
}
@@ -385,14 +360,6 @@ const allowRemoveRole = (role: string) => {
return true;
}
- if (role === PresetRoleType.PROJECT_OWNER) {
- const memberMap = memberMapToRolesInProjectIAM(iamPolicy.value, role);
- // If there is only one owner, disallow removing.
- if (memberMap.size <= 1) {
- return false;
- }
- }
-
return true;
};
diff --git a/frontend/src/locales/en-US.json b/frontend/src/locales/en-US.json
index aa6628e45a..d7fc6f00bd 100644
--- a/frontend/src/locales/en-US.json
+++ b/frontend/src/locales/en-US.json
@@ -1940,7 +1940,6 @@
"edit": "Edit member - {member}",
"view-by-members": "View by members",
"view-by-roles": "View by roles",
- "cannot-remove-last-owner": "Cannot remove the last owner of a project",
"revoke-role-from-user": "Revoke '{role}' from '{user}'",
"never-expires": "Never",
"role-description": "Role description",
diff --git a/frontend/src/locales/es-ES.json b/frontend/src/locales/es-ES.json
index 740471c78d..31918a636c 100644
--- a/frontend/src/locales/es-ES.json
+++ b/frontend/src/locales/es-ES.json
@@ -1940,7 +1940,6 @@
"edit": "Editar miembro - {member}",
"view-by-members": "Ver por miembros",
"view-by-roles": "Ver por roles",
- "cannot-remove-last-owner": "No se puede eliminar el último propietario de un proyecto",
"revoke-role-from-user": "Revocar '{role}' de '{user}'",
"never-expires": "Nunca caduca",
"role-description": "El rol de un miembro determina qué puede hacer en el proyecto.",
diff --git a/frontend/src/locales/ja-JP.json b/frontend/src/locales/ja-JP.json
index 0e6e8384b8..5da3b83d25 100644
--- a/frontend/src/locales/ja-JP.json
+++ b/frontend/src/locales/ja-JP.json
@@ -1940,7 +1940,6 @@
"edit": "メンバーの編集 - {member}",
"view-by-members": "メンバー別に見る",
"view-by-roles": "役割ごとに表示",
- "cannot-remove-last-owner": "プロジェクトの最後の所有者を削除できません",
"revoke-role-from-user": "「{user}」{role} のロールを削除します",
"never-expires": "有効期限が切れることはありません",
"role-description": "役割の説明",
diff --git a/frontend/src/locales/vi-VN.json b/frontend/src/locales/vi-VN.json
index de22ea225c..79d0439cd3 100644
--- a/frontend/src/locales/vi-VN.json
+++ b/frontend/src/locales/vi-VN.json
@@ -1940,7 +1940,6 @@
"edit": "Chỉnh sửa thành viên - {member}",
"view-by-members": "Xem theo thành viên",
"view-by-roles": "Xem theo vai trò",
- "cannot-remove-last-owner": "Không thể xóa chủ sở hữu cuối cùng của một dự án",
"revoke-role-from-user": "Thu hồi '{role}' từ '{user}'",
"never-expires": "Không bao giờ",
"role-description": "Mô tả vai trò",
diff --git a/frontend/src/locales/zh-CN.json b/frontend/src/locales/zh-CN.json
index dc321037a0..018df5521a 100644
--- a/frontend/src/locales/zh-CN.json
+++ b/frontend/src/locales/zh-CN.json
@@ -1940,7 +1940,6 @@
"edit": "编辑成员 - {member}",
"view-by-members": "按成员查看",
"view-by-roles": "按角色查看",
- "cannot-remove-last-owner": "无法移除项目的最后一个所有者",
"revoke-role-from-user": "删除'{user}'{role}的角色",
"never-expires": "永不过期",
"role-description": "角色描述",