Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: 创建项目时，增加是否创建本地权限参数 #879 #882

Merged
merged 4 commits into from
Aug 7, 2023
Merged

feat: 创建项目时，增加是否创建本地权限参数 #879 #882

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
35aab2e
feat: 创建项目时，增加是否创建本地权限参数 #879
yaoxuwan Jul 3, 2023
0b1b265
feat: 创建项目时，增加是否创建本地权限参数 #879
yaoxuwan Jul 4, 2023
d805705
feat: 创建项目时，增加是否创建本地权限参数 #879
yaoxuwan Jul 4, 2023
31a80f5
feat: 创建项目时，增加是否创建本地权限参数 #879
yaoxuwan Aug 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...i/src/main/kotlin/com/tencent/bkrepo/common/artifact/event/project/ProjectCreatedEvent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ import com.tencent.bkrepo.common.artifact.event.base.EventType
*/
data class ProjectCreatedEvent(
override val projectId: String,
override val userId: String
override val userId: String,
val createPermission: Boolean
) : ArtifactEvent(
type = EventType.PROJECT_CREATED,
projectId = projectId,
Expand Down
8 changes: 7 additions & 1 deletion ...on/src/main/kotlin/com/tencent/bkrepo/replication/replica/edge/EdgePullReplicaExecutor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,13 @@ class EdgePullReplicaExecutor(
localProjectId: String,
localRepoName: String,
): RepositoryDetail {
val projectCreateRequest = ProjectCreateRequest(localProjectId, localProjectId, null, centerRepo.createdBy)
val projectCreateRequest = ProjectCreateRequest(
name = localProjectId,
displayName = localProjectId,
description = null,
createPermission = true,
operator = centerRepo.createdBy
)
try {
projectClient.createProject(projectCreateRequest)
} catch (e: RemoteErrorCodeException) {
Expand Down
2 changes: 2 additions & 0 deletions ...sitory/src/main/kotlin/com/tencent/bkrepo/repository/pojo/project/ProjectCreateRequest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ data class ProjectCreateRequest(
val displayName: String,
@ApiModelProperty("描述", required = true)
val description: String? = null,
@ApiModelProperty("创建权限", required = false)
val createPermission: Boolean = true,
@ApiModelProperty("操作用户", required = false)
val operator: String = SYSTEM_USER
) : ProjectRequest
3 changes: 3 additions & 0 deletions ...tory/src/main/kotlin/com/tencent/bkrepo/repository/listener/ResourcePermissionListener.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ class ResourcePermissionListener(
*/
fun handle(event: ProjectCreatedEvent) {
with(event) {
if (!createPermission) {
return
}
if (isAuthedNormalUser(userId) && isNeedLocalPermission(projectId)) {
val projectManagerRoleId = roleResource.createProjectManage(projectId).data!!
userResource.addUserRole(userId, projectManagerRoleId)
Expand Down
3 changes: 2 additions & 1 deletion .../biz-repository/src/main/kotlin/com/tencent/bkrepo/repository/util/ProjectEventFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ object ProjectEventFactory {
with(request) {
return ProjectCreatedEvent(
projectId = name,
userId = operator
userId = operator,
createPermission = createPermission
)
}
}
Expand Down
30 changes: 15 additions & 15 deletions ...iz-repository/src/test/kotlin/com/tencent/bkrepo/repository/service/ProjectServiceTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,63 +70,63 @@ class ProjectServiceTest @Autowired constructor(
@Test
@DisplayName("测试创建项目")
fun `test create project`() {
val request = ProjectCreateRequest(UT_PROJECT_ID, UT_PROJECT_DISPLAY, UT_PROJECT_DESC, UT_USER)
val request = ProjectCreateRequest(UT_PROJECT_ID, UT_PROJECT_DISPLAY, UT_PROJECT_DESC, true, UT_USER)
projectService.createProject(request)
}

@Test
@DisplayName("测试创建同名项目")
fun `should throw exception when project exists`() {
val request = ProjectCreateRequest(UT_PROJECT_ID, UT_PROJECT_DISPLAY, UT_PROJECT_DESC, UT_USER)
val request = ProjectCreateRequest(UT_PROJECT_ID, UT_PROJECT_DISPLAY, UT_PROJECT_DESC, true, UT_USER)
projectService.createProject(request)
assertThrows<ErrorCodeException> { projectService.createProject(request) }
}

@Test
@DisplayName("测试非法项目名称")
fun `should throw exception with illegal name`() {
var request = ProjectCreateRequest("1", UT_PROJECT_DISPLAY, UT_PROJECT_DESC, UT_USER)
var request = ProjectCreateRequest("1", UT_PROJECT_DISPLAY, UT_PROJECT_DESC, true, UT_USER)
assertThrows<ErrorCodeException> { projectService.createProject(request) }

request = ProjectCreateRequest("11", UT_PROJECT_DISPLAY, UT_PROJECT_DESC, UT_USER)
request = ProjectCreateRequest("11", UT_PROJECT_DISPLAY, UT_PROJECT_DESC, true, UT_USER)
assertThrows<ErrorCodeException> { projectService.createProject(request) }

request = ProjectCreateRequest("a".repeat(33), UT_PROJECT_DISPLAY, UT_PROJECT_DESC, UT_USER)
request = ProjectCreateRequest("a".repeat(33), UT_PROJECT_DISPLAY, UT_PROJECT_DESC, true, UT_USER)
assertThrows<ErrorCodeException> { projectService.createProject(request) }

request = ProjectCreateRequest("test_1", UT_PROJECT_DISPLAY, UT_PROJECT_DESC, UT_USER)
request = ProjectCreateRequest("test_1", UT_PROJECT_DISPLAY, UT_PROJECT_DESC, true, UT_USER)
projectService.createProject(request)

request = ProjectCreateRequest("test-1", UT_PROJECT_DISPLAY, UT_PROJECT_DESC, UT_USER)
request = ProjectCreateRequest("test-1", UT_PROJECT_DISPLAY, UT_PROJECT_DESC, true, UT_USER)
projectService.createProject(request)

request = ProjectCreateRequest("a1", UT_PROJECT_DISPLAY, UT_PROJECT_DESC, UT_USER)
request = ProjectCreateRequest("a1", UT_PROJECT_DISPLAY, UT_PROJECT_DESC, true, UT_USER)
projectService.createProject(request)

request = ProjectCreateRequest("_prebuild", UT_PROJECT_DISPLAY, UT_PROJECT_DESC, UT_USER)
request = ProjectCreateRequest("_prebuild", UT_PROJECT_DISPLAY, UT_PROJECT_DESC, true, UT_USER)
projectService.createProject(request)

request = ProjectCreateRequest("CODECC_a1", UT_PROJECT_DISPLAY, UT_PROJECT_DESC, UT_USER)
request = ProjectCreateRequest("CODECC_a1", UT_PROJECT_DISPLAY, UT_PROJECT_DESC, true, UT_USER)
projectService.createProject(request)
}

@Test
@DisplayName("测试非法项目显示名")
fun `should throw exception with illegal display name`() {
var request = ProjectCreateRequest(UT_PROJECT_ID, "", UT_PROJECT_DESC, UT_USER)
var request = ProjectCreateRequest(UT_PROJECT_ID, "", UT_PROJECT_DESC, true, UT_USER)
assertThrows<ErrorCodeException> { projectService.createProject(request) }

request = ProjectCreateRequest(UT_PROJECT_ID, "1".repeat(33), UT_PROJECT_DESC, UT_USER)
request = ProjectCreateRequest(UT_PROJECT_ID, "1".repeat(33), UT_PROJECT_DESC, true, UT_USER)
assertThrows<ErrorCodeException> { projectService.createProject(request) }

request = ProjectCreateRequest(UT_PROJECT_ID, "1".repeat(1), UT_PROJECT_DESC, UT_USER)
request = ProjectCreateRequest(UT_PROJECT_ID, "1".repeat(1), UT_PROJECT_DESC, true, UT_USER)
assertThrows<ErrorCodeException> { projectService.createProject(request) }

request = ProjectCreateRequest(UT_PROJECT_ID, "1".repeat(32), UT_PROJECT_DESC, UT_USER)
request = ProjectCreateRequest(UT_PROJECT_ID, "1".repeat(32), UT_PROJECT_DESC, true, UT_USER)
projectService.createProject(request)

removeAllProject()
request = ProjectCreateRequest(UT_PROJECT_ID, "123-abc", UT_PROJECT_DESC, UT_USER)
request = ProjectCreateRequest(UT_PROJECT_ID, "123-abc", UT_PROJECT_DESC, true, UT_USER)
projectService.createProject(request)
}

Expand Down
8 changes: 7 additions & 1 deletion ...repository/src/test/kotlin/com/tencent/bkrepo/repository/service/RepositoryServiceTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,13 @@ class RepositoryServiceTest @Autowired constructor(
fun beforeAll() {
initMock()
if (!projectService.checkExist(UT_PROJECT_ID)) {
val projectCreateRequest = ProjectCreateRequest(UT_PROJECT_ID, UT_REPO_NAME, UT_REPO_DISPLAY, UT_USER)
val projectCreateRequest = ProjectCreateRequest(
name = UT_PROJECT_ID,
displayName = UT_REPO_NAME,
description = UT_REPO_DISPLAY,
createPermission = true,
operator = UT_USER
)
projectService.createProject(projectCreateRequest)
}
val request = StorageCredentialsCreateRequest(UT_STORAGE_CREDENTIALS_KEY, storageCredentials, UT_REGION)
Expand Down
10 changes: 8 additions & 2 deletions ...y/biz-repository/src/test/kotlin/com/tencent/bkrepo/repository/service/ServiceBaseTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,13 @@ open class ServiceBaseTest {
credentialsKey: String? = null
) {
if (!projectService.checkExist(UT_PROJECT_ID)) {
val projectCreateRequest = ProjectCreateRequest(UT_PROJECT_ID, UT_REPO_NAME, UT_REPO_DISPLAY, UT_USER)
val projectCreateRequest = ProjectCreateRequest(
name = UT_PROJECT_ID,
displayName = UT_REPO_NAME,
description = UT_REPO_DISPLAY,
createPermission = true,
operator = UT_USER
)
projectService.createProject(projectCreateRequest)
}
if (!repositoryService.checkExist(UT_PROJECT_ID, UT_REPO_NAME)) {
Expand All @@ -180,7 +186,7 @@ open class ServiceBaseTest {
projectService: ProjectService,
projectId: String = UT_PROJECT_ID
): ProjectInfo {
val projectCreateRequest = ProjectCreateRequest(projectId, UT_REPO_NAME, UT_REPO_DISPLAY, UT_USER)
val projectCreateRequest = ProjectCreateRequest(projectId, UT_REPO_NAME, UT_REPO_DISPLAY, true, UT_USER)
return projectService.createProject(projectCreateRequest)
}

Expand Down
Loading