Merge pull request #17 from hejieehe/bug_16

bug: 修复Push事件引发的空指针异常 #16

Author: mingshewhe

CHANGELOG.md

@@ -10,3 +10,8 @@
 ##### 2025-04-03
 ### 修复
 - bug: 修复TGIT MR触发action变量异常 #14 [链接](https://github.com/bkdevops-projects/devops-scm/issues/14)
+
+# 1.0.2
+##### 2025-04-24
+### 修复
+- bug: 修复Push事件引发的空指针异常 #16 [链接](https://github.com/bkdevops-projects/devops-scm/issues/16)

buildSrc/src/main/kotlin/Versions.kt

@@ -1,6 +1,6 @@
 object Release {
     const val Group = "com.tencent.bk.devops.scm"
-    const val Version = "1.0.1"
+    const val Version = "1.0.2"
 }
 
 object Versions {

devops-scm-api/src/main/java/com/tencent/devops/scm/api/constant/WebhookI18Code.java

@@ -6,6 +6,8 @@
 public interface WebhookI18Code {
     // git push事件描述
     String GIT_PUSH_EVENT_DESC = "bkGitPushEventDesc";
+    // git push创建分支事件描述
+    String GIT_PUSH_CREATE_EVENT_DESC = "bkGitPushCreateEventDesc";
     // git push删除事件描述
     String GIT_PUSH_DELETE_EVENT_DESC = "bkGitPushDeleteEventDesc";
 

devops-scm-api/src/main/java/com/tencent/devops/scm/api/pojo/webhook/git/GitPushHook.java

@@ -1,5 +1,8 @@
 package com.tencent.devops.scm.api.pojo.webhook.git;
 
+import static com.tencent.devops.scm.api.constant.WebhookI18Code.GIT_PUSH_CREATE_EVENT_DESC;
+import static com.tencent.devops.scm.api.constant.WebhookI18Code.GIT_PUSH_DELETE_EVENT_DESC;
+import static com.tencent.devops.scm.api.constant.WebhookI18Code.GIT_PUSH_EVENT_DESC;
 import static com.tencent.devops.scm.api.constant.WebhookOutputCode.BK_REPO_GIT_WEBHOOK_BRANCH;
 import static com.tencent.devops.scm.api.constant.WebhookOutputCode.BK_REPO_GIT_WEBHOOK_COMMIT_ID;
 import static com.tencent.devops.scm.api.constant.WebhookOutputCode.BK_REPO_GIT_WEBHOOK_PUSH_AFTER_COMMIT;
@@ -29,8 +32,8 @@
 import static com.tencent.devops.scm.api.constant.WebhookOutputCode.PIPELINE_WEBHOOK_COMMIT_MESSAGE;
 import static com.tencent.devops.scm.api.constant.WebhookOutputCode.PIPELINE_WEBHOOK_EVENT_TYPE;
 import static com.tencent.devops.scm.api.constant.WebhookOutputCode.PIPELINE_WEBHOOK_REVISION;
+import static com.tencent.devops.scm.api.enums.EventAction.DELETE;
 
-import com.tencent.devops.scm.api.constant.WebhookI18Code;
 import com.tencent.devops.scm.api.enums.EventAction;
 import com.tencent.devops.scm.api.pojo.Change;
 import com.tencent.devops.scm.api.pojo.Commit;
@@ -70,6 +73,7 @@ public class GitPushHook implements Webhook {
     private String before;
     private String after;
     private Commit commit;
+    private String link;
     private User sender;
     private List<Commit> commits;
     // 变更的文件路径
@@ -94,18 +98,14 @@ public String getUserName() {
 
     @Override
     public ScmI18Variable getEventDesc() {
-        String code = WebhookI18Code.GIT_PUSH_EVENT_DESC;
-        if (action == EventAction.DELETE) {
-            code = WebhookI18Code.GIT_PUSH_DELETE_EVENT_DESC;
-        }
         List<String> params = Arrays.asList(
                 GitUtils.trimRef(ref),
-                commit.getLink(),
+                link,
                 GitUtils.getShortSha(commit.getSha()),
                 sender.getName()
         );
         return ScmI18Variable.builder()
-                .code(code)
+                .code(getI18Code())
                 .params(params)
                 .build();
     }
@@ -137,7 +137,7 @@ public Map<String, Object> outputs() {
         outputParams.put(PIPELINE_GIT_REPO_URL, repo.getHttpUrl());
         outputParams.put(PIPELINE_GIT_REF, "refs/heads/" + ref);
         outputParams.put(CI_BRANCH, ref);
-        if (action == EventAction.DELETE) {
+        if (action == DELETE) {
             outputParams.put(PIPELINE_GIT_EVENT, "delete");
         } else {
             outputParams.put(PIPELINE_GIT_EVENT, "push");
@@ -169,4 +169,19 @@ public Map<String, Object> outputs() {
     public Boolean skipCi() {
         return skipCi;
     }
+
+    private String getI18Code() {
+        String code;
+        switch (action) {
+            case NEW_BRANCH:
+                code = GIT_PUSH_CREATE_EVENT_DESC;
+                break;
+            case DELETE:
+                code = GIT_PUSH_DELETE_EVENT_DESC;
+                break;
+            default:
+                code = GIT_PUSH_EVENT_DESC;
+        }
+        return code;
+    }
 }

devops-scm-provider/devops-scm-provider-git/devops-scm-provider-tgit/src/main/java/com/tencent/devops/scm/provider/git/tgit/TGitWebhookParser.java

@@ -154,18 +154,34 @@ private GitTagHook parseTagHook(String body) {
         );
 
         String refName = GitUtils.trimRef(src.getRef());
-        String linkUrl = String.format("%s/-/tags/%s", repo.getWebUrl(), refName);
+        // Tag 最新的commit
+        Commit commit = null;
+        String linkUrl;
+        //  组装tag链接
+        switch (action) {
+            case DELETE:
+                linkUrl = repo.getWebUrl();
+                commit = Commit.builder()
+                        .sha(src.getBefore())
+                        .message("")
+                        .build();
+                break;
+            case CREATE:
+                linkUrl = String.format("%s/-/tags/%s", repo.getWebUrl(), refName);
+                commit = CollectionUtils.emptyIfNull(src.getCommits())
+                    .stream()
+                    .findFirst()
+                    .map(TGitObjectConverter::convertCommit)
+                    .orElse(null);
+                break;
+            default:
+                linkUrl = "";
+        }
         Reference ref = Reference.builder()
                 .name(refName)
                 .sha(sha)
                 .linkUrl(linkUrl)
                 .build();
-        // Tag 最新的commit
-        Commit commit = CollectionUtils.emptyIfNull(src.getCommits())
-                .stream()
-                .findFirst()
-                .map(TGitObjectConverter::convertCommit)
-                .orElse(null);
         Map<String, Object> extras = fillTagExtra(src);
 
         return GitTagHook.builder()
@@ -471,6 +487,7 @@ private GitPushHook convertPushHook(TGitPushEvent src) {
                 .sha(src.getCheckoutSha())
                 .author(author)
                 .committer(author)
+                .message("")
                 .build();
         if (!src.getCommits().isEmpty()) {
             TGitEventCommit lastCommit = src.getCommits().get(0);
@@ -514,14 +531,32 @@ private GitPushHook convertPushHook(TGitPushEvent src) {
                 .stream()
                 .map(TGitObjectConverter::convertCommit)
                 .collect(Collectors.toList());
+        String ref = GitUtils.trimRef(src.getRef());
+        String link;
+        // 根据事件动作封装事件详情链接
+        switch (action) {
+            case NEW_BRANCH:
+                link = (new StringBuilder())
+                        .append(repository.getWebUrl())
+                        .append("/tree/")
+                        .append(ref)
+                        .toString();
+                break;
+            case DELETE:
+                link = repository.getWebUrl();
+                break;
+            default:
+                link = commit.getLink();
+        }
         return GitPushHook.builder()
                 .action(action)
-                .ref(GitUtils.trimRef(src.getRef()))
+                .ref(ref)
                 .eventType(TGitEventType.PUSH.name())
                 .repo(repository)
                 .before(src.getBefore())
                 .after(src.getAfter())
                 .commit(commit)
+                .link(link)
                 .sender(user)
                 .commits(commits)
                 .changes(changes)