Merge pull request #9701 from fcfang123/issue-9690

feat：支持给一组用户添加流水线权限 #9690
TencentBlueKing · Jan 4, 2024 · e854091 · e854091
2 parents 751a786 + c7b6627
commit e854091
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/src/backend/ci/buildSrc/src/main/kotlin/constants/Versions.kt b/src/backend/ci/buildSrc/src/main/kotlin/constants/Versions.kt
@@ -46,7 +46,7 @@ object Versions {
     const val jjwt = "0.11.5"
     const val Okhttp = "4.9.0"
     const val jgit = "5.13.1.202206130422-r"
-    const val iam = "1.0.0"
+    const val iam = "1.0.1"
     const val disklrucache = "2.0.2"
     const val BkCrypto = "1.1.3"
     const val audit = "1.0.8"

diff --git a/...ore/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/vo/IamGroupMemberInfoVo.kt b/...ore/auth/api-auth/src/main/kotlin/com/tencent/devops/auth/pojo/vo/IamGroupMemberInfoVo.kt
@@ -46,5 +46,7 @@ data class IamGroupMemberInfoVo(
     @ApiModelProperty("过期时间戳")
     val expiredAt: Long,
     @ApiModelProperty("过期时间展示")
-    val expiredDisplay: String
+    val expiredDisplay: String,
+    @ApiModelProperty("是否直接加入")
+    val directAdded: Boolean? = null
 )
diff --git a/...uth-rbac/src/main/kotlin/com/tencent/devops/auth/service/PermissionGradeManagerService.kt b/...uth-rbac/src/main/kotlin/com/tencent/devops/auth/service/PermissionGradeManagerService.kt
@@ -169,6 +169,7 @@ class PermissionGradeManagerService @Autowired constructor(
                 .authorization_scopes(authorizationScopes)
                 .subject_scopes(subjectScopes)
                 .sync_perm(true)
+                .syncSubjectTemplate(true)
                 .groupName(manageGroupConfig.groupName)
                 .build()
             val gradeManagerId = iamV2ManagerService.createManagerV2(createManagerDTO)
@@ -200,6 +201,7 @@ class PermissionGradeManagerService @Autowired constructor(
                 .authorizationScopes(authorizationScopes)
                 .subjectScopes(subjectScopes)
                 .syncPerm(true)
+                .syncSubjectTemplate(true)
                 .groupName(manageGroupConfig.groupName)
                 .applicant(userId)
                 .reason(
@@ -421,6 +423,7 @@ class PermissionGradeManagerService @Autowired constructor(
             val managerRoleGroupDTO = ManagerRoleGroupDTO.builder()
                 .groups(listOf(managerRoleGroup))
                 .createAttributes(false)
+                .syncSubjectTemplate(true)
                 .build()
             val iamGroupId = iamV2ManagerService.batchCreateRoleGroupV2(gradeManagerId, managerRoleGroupDTO)
             authResourceGroupDao.create(

diff --git a/...bac/src/main/kotlin/com/tencent/devops/auth/service/RbacPermissionResourceGroupService.kt b/...bac/src/main/kotlin/com/tencent/devops/auth/service/RbacPermissionResourceGroupService.kt
@@ -193,7 +193,8 @@ class RbacPermissionResourceGroupService @Autowired constructor(
                     createdTime = createTime,
                     status = status,
                     expiredAt = expiredAt,
-                    expiredDisplay = expiredDisplay
+                    expiredDisplay = expiredDisplay,
+                    directAdded = result.directAdded.toBoolean()
                 )
             } else {
                 val status = GroupMemberStatus.NOT_JOINED.name