Enhance pipeline message and pr title

.vscode/settings.json

@@ -9,10 +9,6 @@
   "go.lintTool": "golangci-lint",
   "go.lintFlags": ["--fast"],
   "go.buildTags": "test",
-  "gopls": {
-    // cspell:words gopls
-    "buildFlags": ["-tags=test"]
-  },
   "eslint.workingDirectories": ["./web"],
   "prettier.ignorePath": "./web/.prettierignore",
   // Auto fix

server/api/pipeline.go

@@ -84,7 +84,7 @@ func createTmpPipeline(event model.WebhookEvent, commit *model.Commit, user *mod
 		Timestamp: time.Now().UTC().Unix(),
 
 		Avatar:  user.Avatar,
-		Message: "MANUAL PIPELINE @ " + opts.Branch,
+		Message: "manual pipeline @" + opts.Branch,
 
 		Ref:                 opts.Branch,
 		AdditionalVariables: opts.Variables,

server/forge/bitbucket/convert.go

@@ -176,13 +176,14 @@ func convertPullHook(from *internal.PullRequestHook) *model.Pipeline {
 			from.PullRequest.Source.Branch.Name,
 			from.PullRequest.Dest.Branch.Name,
 		),
-		ForgeURL:  from.PullRequest.Links.HTML.Href,
-		Branch:    from.PullRequest.Dest.Branch.Name,
-		Message:   from.PullRequest.Desc,
-		Avatar:    from.Actor.Links.Avatar.Href,
-		Author:    from.Actor.Login,
-		Sender:    from.Actor.Login,
-		Timestamp: from.PullRequest.Updated.UTC().Unix(),
+		ForgeURL:           from.PullRequest.Links.HTML.Href,
+		Branch:             from.PullRequest.Dest.Branch.Name,
+		PRTitleDescription: from.PullRequest.Title + "\n" + from.PullRequest.Desc,
+		Message:            "", // TODO: get last commit message
+		Avatar:             from.Actor.Links.Avatar.Href,
+		Author:             from.Actor.Login,
+		Sender:             from.Actor.Login,
+		Timestamp:          from.PullRequest.Updated.UTC().Unix(),
 	}
 }
 

server/forge/bitbucketdatacenter/convert.go

@@ -89,10 +89,17 @@ func convertRepositoryPushEvent(ev *bb.RepositoryPushEvent, baseURL string) *mod
 		return nil
 	}
 
+	message := ""
+	if ev.ToCommit != nil {
+		message = ev.ToCommit.Message
+	} else if len(ev.Commits) > 0 {
+		message = ev.Commits[0].Message
+	}
+
 	pipeline := &model.Pipeline{
 		Commit:    change.ToHash,
 		Branch:    change.Ref.DisplayID,
-		Message:   "",
+		Message:   message,
 		Avatar:    bitbucketAvatarURL(baseURL, ev.Actor.Slug),
 		Author:    authorLabel(ev.Actor.Name),
 		Email:     ev.Actor.Email,
@@ -112,17 +119,17 @@ func convertRepositoryPushEvent(ev *bb.RepositoryPushEvent, baseURL string) *mod
 
 func convertPullRequestEvent(ev *bb.PullRequestEvent, baseURL string) *model.Pipeline {
 	pipeline := &model.Pipeline{
-		Commit:    ev.PullRequest.Source.Latest,
-		Branch:    ev.PullRequest.Source.DisplayID,
-		Title:     ev.PullRequest.Title,
-		Message:   "",
-		Avatar:    bitbucketAvatarURL(baseURL, ev.Actor.Slug),
-		Author:    authorLabel(ev.Actor.Name),
-		Email:     ev.Actor.Email,
-		Timestamp: time.Time(ev.Date).UTC().Unix(),
-		Ref:       fmt.Sprintf("refs/pull-requests/%d/from", ev.PullRequest.ID),
-		ForgeURL:  fmt.Sprintf("%s/projects/%s/repos/%s/commits/%s", baseURL, ev.PullRequest.Source.Repository.Project.Key, ev.PullRequest.Source.Repository.Slug, ev.PullRequest.Source.Latest),
-		Refspec:   fmt.Sprintf("%s:%s", ev.PullRequest.Source.DisplayID, ev.PullRequest.Target.DisplayID),
+		Commit:             ev.PullRequest.Source.Latest,
+		Branch:             ev.PullRequest.Source.DisplayID,
+		PRTitleDescription: ev.PullRequest.Title,
+		Message:            "", // TODO: get message from last commit to pr
+		Avatar:             bitbucketAvatarURL(baseURL, ev.Actor.Slug),
+		Author:             authorLabel(ev.Actor.Name),
+		Email:              ev.Actor.Email,
+		Timestamp:          time.Time(ev.Date).UTC().Unix(),
+		Ref:                fmt.Sprintf("refs/pull-requests/%d/from", ev.PullRequest.ID),
+		ForgeURL:           fmt.Sprintf("%s/projects/%s/repos/%s/commits/%s", baseURL, ev.PullRequest.Source.Repository.Project.Key, ev.PullRequest.Source.Repository.Slug, ev.PullRequest.Source.Latest),
+		Refspec:            fmt.Sprintf("%s:%s", ev.PullRequest.Source.DisplayID, ev.PullRequest.Target.DisplayID),
 	}
 
 	if ev.EventKey == bb.EventKeyPullRequestMerged || ev.EventKey == bb.EventKeyPullRequestDeclined || ev.EventKey == bb.EventKeyPullRequestDeleted {

server/forge/forgejo/helper.go

@@ -128,12 +128,21 @@ func pipelineFromTag(hook *pushHook) *model.Pipeline {
 	)
 	ref := strings.TrimPrefix(hook.Ref, "refs/tags/")
 
+	var message string
+	if len(hook.Commits) > 0 {
+		message = hook.Commits[0].Message
+		if len(hook.Commits) == 1 {
+		}
+	} else {
+		message = hook.HeadCommit.Message
+	}
+
 	return &model.Pipeline{
 		Event:     model.EventTag,
 		Commit:    hook.Sha,
 		Ref:       fmt.Sprintf("refs/tags/%s", ref),
 		ForgeURL:  fmt.Sprintf("%s/src/tag/%s", hook.Repo.HTMLURL, ref),
-		Message:   fmt.Sprintf("created tag %s", ref),
+		Message:   message,
 		Avatar:    avatar,
 		Author:    hook.Sender.UserName,
 		Sender:    hook.Sender.UserName,
@@ -155,17 +164,17 @@ func pipelineFromPullRequest(hook *pullRequestHook) *model.Pipeline {
 	}
 
 	pipeline := &model.Pipeline{
-		Event:    event,
-		Commit:   hook.PullRequest.Head.Sha,
-		ForgeURL: hook.PullRequest.HTMLURL,
-		Ref:      fmt.Sprintf("refs/pull/%d/head", hook.Number),
-		Branch:   hook.PullRequest.Base.Ref,
-		Message:  hook.PullRequest.Title,
-		Author:   hook.PullRequest.Poster.UserName,
-		Avatar:   avatar,
-		Sender:   hook.Sender.UserName,
-		Email:    hook.Sender.Email,
-		Title:    hook.PullRequest.Title,
+		Event:              event,
+		Commit:             hook.PullRequest.Head.Sha,
+		ForgeURL:           hook.PullRequest.HTMLURL,
+		Ref:                fmt.Sprintf("refs/pull/%d/head", hook.Number),
+		Branch:             hook.PullRequest.Base.Ref,
+		Author:             hook.PullRequest.Poster.UserName,
+		Avatar:             avatar,
+		Sender:             hook.Sender.UserName,
+		Email:              hook.Sender.Email,
+		PRTitleDescription: hook.PullRequest.Title + "\n" + hook.PullRequest.Body,
+		Message:            "", // TODO: get message from last commit to pr
 		Refspec: fmt.Sprintf("%s:%s",
 			hook.PullRequest.Head.Ref,
 			hook.PullRequest.Base.Ref,
@@ -187,7 +196,7 @@ func pipelineFromRelease(hook *releaseHook) *model.Pipeline {
 		Ref:          fmt.Sprintf("refs/tags/%s", hook.Release.TagName),
 		ForgeURL:     hook.Release.HTMLURL,
 		Branch:       hook.Release.Target,
-		Message:      fmt.Sprintf("created release %s", hook.Release.Title),
+		Message:      hook.Release.Title + "\n" + hook.Release.Note,
 		Avatar:       avatar,
 		Author:       hook.Sender.UserName,
 		Sender:       hook.Sender.UserName,

server/forge/forgejo/parse_test.go

@@ -204,19 +204,19 @@ func TestForgejoParser(t *testing.T) {
 				},
 			},
 			pipe: &model.Pipeline{
-				Author:            "gordon",
-				Event:             "pull_request",
-				Commit:            "0d1a26e67d8f5eaf1f6ba5c57fc3c7d91ac0fd1c",
-				Branch:            "main",
-				Ref:               "refs/pull/1/head",
-				Refspec:           "feature/changes:main",
-				Title:             "Update the README with new information",
-				Message:           "Update the README with new information",
-				Sender:            "gordon",
-				Avatar:            "http://1.gravatar.com/avatar/8c58a0be77ee441bb8f8595b7f1b4e87",
-				Email:             "[email protected]",
-				ForgeURL:          "http://forgejo.golang.org/gordon/hello-world/pull/1",
-				PullRequestLabels: []string{},
+				Author:             "gordon",
+				Event:              "pull_request",
+				Commit:             "0d1a26e67d8f5eaf1f6ba5c57fc3c7d91ac0fd1c",
+				Branch:             "main",
+				Ref:                "refs/pull/1/head",
+				Refspec:            "feature/changes:main",
+				PRTitleDescription: "Update the README with new information",
+				Message:            "Update the README with new information",
+				Sender:             "gordon",
+				Avatar:             "http://1.gravatar.com/avatar/8c58a0be77ee441bb8f8595b7f1b4e87",
+				Email:              "[email protected]",
+				ForgeURL:           "http://forgejo.golang.org/gordon/hello-world/pull/1",
+				PullRequestLabels:  []string{},
 			},
 		},
 		{
@@ -243,18 +243,18 @@ func TestForgejoParser(t *testing.T) {
 				},
 			},
 			pipe: &model.Pipeline{
-				Author:   "test",
-				Event:    "pull_request",
-				Commit:   "788ed8d02d3b7fcfcf6386dbcbca696aa1d4dc25",
-				Branch:   "main",
-				Ref:      "refs/pull/2/head",
-				Refspec:  "test-patch-1:main",
-				Title:    "New Pull",
-				Message:  "New Pull",
-				Sender:   "test",
-				Avatar:   "http://127.0.0.1:3000/avatars/dd46a756faad4727fb679320751f6dea",
-				Email:    "[email protected]",
-				ForgeURL: "http://127.0.0.1:3000/Test-CI/multi-line-secrets/pulls/2",
+				Author:             "test",
+				Event:              "pull_request",
+				Commit:             "788ed8d02d3b7fcfcf6386dbcbca696aa1d4dc25",
+				Branch:             "main",
+				Ref:                "refs/pull/2/head",
+				Refspec:            "test-patch-1:main",
+				PRTitleDescription: "New Pull",
+				Message:            "New Pull",
+				Sender:             "test",
+				Avatar:             "http://127.0.0.1:3000/avatars/dd46a756faad4727fb679320751f6dea",
+				Email:              "[email protected]",
+				ForgeURL:           "http://127.0.0.1:3000/Test-CI/multi-line-secrets/pulls/2",
 				PullRequestLabels: []string{
 					"Kind/Bug",
 					"Kind/Security",
@@ -284,19 +284,19 @@ func TestForgejoParser(t *testing.T) {
 				},
 			},
 			pipe: &model.Pipeline{
-				Author:            "anbraten",
-				Event:             "pull_request_closed",
-				Commit:            "d555a5dd07f4d0148a58d4686ec381502ae6a2d4",
-				Branch:            "main",
-				Ref:               "refs/pull/1/head",
-				Refspec:           "anbraten-patch-1:main",
-				Title:             "Adjust file",
-				Message:           "Adjust file",
-				Sender:            "anbraten",
-				Avatar:            "https://seccdn.libravatar.org/avatar/fc9b6fe77c6b732a02925a62a81f05a0?d=identicon",
-				Email:             "[email protected]",
-				ForgeURL:          "https://forgejo.com/anbraten/test-repo/pulls/1",
-				PullRequestLabels: []string{},
+				Author:             "anbraten",
+				Event:              "pull_request_closed",
+				Commit:             "d555a5dd07f4d0148a58d4686ec381502ae6a2d4",
+				Branch:             "main",
+				Ref:                "refs/pull/1/head",
+				Refspec:            "anbraten-patch-1:main",
+				PRTitleDescription: "Adjust file",
+				Message:            "Adjust file",
+				Sender:             "anbraten",
+				Avatar:             "https://seccdn.libravatar.org/avatar/fc9b6fe77c6b732a02925a62a81f05a0?d=identicon",
+				Email:              "[email protected]",
+				ForgeURL:           "https://forgejo.com/anbraten/test-repo/pulls/1",
+				PullRequestLabels:  []string{},
 			},
 		},
 		{
@@ -322,19 +322,19 @@ func TestForgejoParser(t *testing.T) {
 				},
 			},
 			pipe: &model.Pipeline{
-				Author:            "anbraten",
-				Event:             "pull_request_closed",
-				Commit:            "d555a5dd07f4d0148a58d4686ec381502ae6a2d4",
-				Branch:            "main",
-				Ref:               "refs/pull/1/head",
-				Refspec:           "anbraten-patch-1:main",
-				Title:             "Adjust file",
-				Message:           "Adjust file",
-				Sender:            "anbraten",
-				Avatar:            "https://seccdn.libravatar.org/avatar/fc9b6fe77c6b732a02925a62a81f05a0?d=identicon",
-				Email:             "[email protected]",
-				ForgeURL:          "https://forgejo.com/anbraten/test-repo/pulls/1",
-				PullRequestLabels: []string{},
+				Author:             "anbraten",
+				Event:              "pull_request_closed",
+				Commit:             "d555a5dd07f4d0148a58d4686ec381502ae6a2d4",
+				Branch:             "main",
+				Ref:                "refs/pull/1/head",
+				Refspec:            "anbraten-patch-1:main",
+				PRTitleDescription: "Adjust file",
+				Message:            "Adjust file",
+				Sender:             "anbraten",
+				Avatar:             "https://seccdn.libravatar.org/avatar/fc9b6fe77c6b732a02925a62a81f05a0?d=identicon",
+				Email:              "[email protected]",
+				ForgeURL:           "https://forgejo.com/anbraten/test-repo/pulls/1",
+				PullRequestLabels:  []string{},
 			},
 		},
 		{

server/forge/gitea/fixtures/hooks.go

@@ -1414,7 +1414,7 @@ const HookRelease = `
     "tag_name": "0.0.5",
     "target_commitish": "main",
     "name": "Version 0.0.5",
-    "body": "",
+    "body": "release notes",
     "url": "https://git.xxx/api/v1/repos/anbraten/demo/releases/48",
     "html_url": "https://git.xxx/anbraten/demo/releases/tag/0.0.5",
     "tarball_url": "https://git.xxx/anbraten/demo/archive/0.0.5.tar.gz",