feat: 触发器的自定义触发控制回调增加事件类型 TencentBlueKing#11196

hejieehe · Nov 8, 2024 · 246193a · 246193a
1 parent a55e150
commit 246193a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/...hook/src/main/kotlin/com/tencent/devops/common/webhook/service/code/filter/ThirdFilter.kt b/...hook/src/main/kotlin/com/tencent/devops/common/webhook/service/code/filter/ThirdFilter.kt
@@ -25,11 +25,13 @@ class ThirdFilter(
     private val thirdSecretToken: String? = null,
     private val gitScmService: GitScmService,
     private val callbackCircuitBreakerRegistry: CircuitBreakerRegistry?,
-    private val failedReason: String = ""
+    private val failedReason: String = "",
+    private val eventType: String
 ) : WebhookFilter {
 
     companion object {
         private const val FILTER_TOKEN_HEADER = "X-DEVOPS-FILTER-TOKEN"
+        private const val FILTER_EVENT_TYPE_HEADER = "X-DEVOPS-EVENT-TYPE"
         private const val MAX_RETRY_COUNT = 3
         private val logger = LoggerFactory.getLogger(ThirdFilter::class.java)
     }
@@ -63,7 +65,8 @@ class ThirdFilter(
                 projectId = projectId,
                 pipelineId = pipelineId,
                 event = event,
-                changeFiles = changeFiles
+                changeFiles = changeFiles,
+                eventType = eventType
             )
         )
         val builder = Request.Builder()
@@ -77,6 +80,7 @@ class ThirdFilter(
                 credentialId = thirdSecretToken
             )
             builder.addHeader(FILTER_TOKEN_HEADER, thirdSecretTokenValue)
+            builder.addHeader(FILTER_EVENT_TYPE_HEADER, eventType)
         }
         return HttpRetryUtils.retry(MAX_RETRY_COUNT) {
             OkhttpUtils.doShortHttp(request = builder.build()).use { response ->

diff --git a/...otlin/com/tencent/devops/common/webhook/service/code/handler/tgit/TGitMrTriggerHandler.kt b/...otlin/com/tencent/devops/common/webhook/service/code/handler/tgit/TGitMrTriggerHandler.kt
@@ -318,7 +318,8 @@ class TGitMrTriggerHandler(
                 thirdSecretToken = thirdSecretToken,
                 gitScmService = gitScmService,
                 callbackCircuitBreakerRegistry = callbackCircuitBreakerRegistry,
-                failedReason = I18Variable(code = WebhookI18nConstants.THIRD_FILTER_NOT_MATCH).toJsonStr()
+                failedReason = I18Variable(code = WebhookI18nConstants.THIRD_FILTER_NOT_MATCH).toJsonStr(),
+                eventType = getEventType().name
             )
             return listOf(
                 wipFilter, userFilter, targetBranchFilter,

diff --git a/...lin/com/tencent/devops/common/webhook/service/code/handler/tgit/TGitPushTriggerHandler.kt b/...lin/com/tencent/devops/common/webhook/service/code/handler/tgit/TGitPushTriggerHandler.kt
@@ -284,7 +284,8 @@ class TGitPushTriggerHandler(
                 thirdSecretToken = thirdSecretToken,
                 gitScmService = gitScmService,
                 callbackCircuitBreakerRegistry = callbackCircuitBreakerRegistry,
-                failedReason = I18Variable(code = WebhookI18nConstants.THIRD_FILTER_NOT_MATCH).toJsonStr()
+                failedReason = I18Variable(code = WebhookI18nConstants.THIRD_FILTER_NOT_MATCH).toJsonStr(),
+                eventType = getEventType().name
             )
             return listOf(
                 userFilter, branchFilter, skipCiFilter,

diff --git a/...ok/src/main/kotlin/com/tencent/devops/common/webhook/service/code/pojo/ThirdFilterBody.kt b/...ok/src/main/kotlin/com/tencent/devops/common/webhook/service/code/pojo/ThirdFilterBody.kt
@@ -6,5 +6,6 @@ data class ThirdFilterBody(
     val projectId: String,
     val pipelineId: String,
     val event: CodeWebhookEvent,
-    val changeFiles: Set<String>? = emptySet()
+    val changeFiles: Set<String>? = emptySet(),
+    val eventType: String
 )