[stream]github 审核权限优化 #7812

TencentBlueKing · Oct 18, 2022 · 304f57d · 304f57d
1 parent 60932c7
commit 304f57d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/...eam/src/main/kotlin/com/tencent/devops/stream/trigger/actions/github/GithubPRActionGit.kt b/...eam/src/main/kotlin/com/tencent/devops/stream/trigger/actions/github/GithubPRActionGit.kt
@@ -36,6 +36,7 @@ import com.tencent.devops.common.webhook.pojo.code.github.isPrForkNotMergeEvent
 import com.tencent.devops.process.yaml.v2.enums.StreamMrEventAction
 import com.tencent.devops.process.yaml.v2.enums.StreamObjectKind
 import com.tencent.devops.process.yaml.v2.models.on.TriggerOn
+import com.tencent.devops.repository.pojo.enums.GithubAccessLevelEnum
 import com.tencent.devops.stream.dao.StreamBasicSettingDao
 import com.tencent.devops.stream.pojo.GitRequestEvent
 import com.tencent.devops.stream.pojo.enums.TriggerReason
@@ -119,7 +120,7 @@ class GithubPRActionGit(
             ).accessLevel
 
             // >= TRIAGE
-            accessLevel >= 20
+            accessLevel >= GithubAccessLevelEnum.TRIAGE.level
         } catch (error: ErrorCodeException) {
             false
         }

diff --git a/...-stream/src/main/kotlin/com/tencent/devops/stream/trigger/actions/tgit/TGitMrActionGit.kt b/...-stream/src/main/kotlin/com/tencent/devops/stream/trigger/actions/tgit/TGitMrActionGit.kt
@@ -41,6 +41,7 @@ import com.tencent.devops.common.webhook.pojo.code.git.isMrMergeEvent
 import com.tencent.devops.process.yaml.v2.enums.StreamMrEventAction
 import com.tencent.devops.process.yaml.v2.enums.StreamObjectKind
 import com.tencent.devops.process.yaml.v2.models.on.TriggerOn
+import com.tencent.devops.repository.pojo.enums.GitAccessLevelEnum
 import com.tencent.devops.scm.pojo.WebhookCommit
 import com.tencent.devops.scm.utils.code.git.GitUtils
 import com.tencent.devops.stream.dao.StreamBasicSettingDao
@@ -126,7 +127,7 @@ class TGitMrActionGit(
                 search = this.data.eventCommon.userId
             ).find { it.userId == this.data.eventCommon.userId }?.accessLevel
 
-            accessLevel != null && accessLevel >= 30
+            accessLevel != null && accessLevel >= GitAccessLevelEnum.DEVELOPER.level
         } catch (error: ErrorCodeException) {
             false
         }