apps/opensaps
2
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

Mogrus initialization fix, gitea PRs, regexp fix.

Browse Source 
Fixed Mogrus initialization to pass log level. Configuration to
follow.

OpenSAPS now fully working with Gitea's pull requests.

Fixed URL/URL names regexp for Gitlab and Gitea to include "+" in
them.
This commit is contained in:
Stanislav Nikitin 2017-11-11 13:00:50 +05:00
parent c9a111c832
commit e969b7018d
3 changed files with 443 additions and 290 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
context/context.go
View File

@ -50,7 +50,7 @@ func (c *Context) Initialize() {
l := mogrus.New()
l.Initialize()
c.Log = l.CreateLogger("opensaps")
c.Log.CreateOutput("stdout", os.Stdout, true)
c.Log.CreateOutput("stdout", os.Stdout, true, "debug")
c.Flagger = flagger.New(c.Log)
c.Flagger.Initialize()

163
parsers/gitea/giteaparser.go
View File

@ -28,16 +28,34 @@ import (
"lab.pztrn.name/pztrn/opensaps/slack/message"
)
type GiteaParser struct {}
type GiteaParser struct{}
func (gp GiteaParser) Initialize() {
c.Log.Infoln("Initializing Gitea parser...")
}
func (gp GiteaParser) parseBranchNew(message slackmessage.SlackMessage) map[string]string {
data := make(map[string]string)
data["message"] = "[Repo: {repo} | Branch: {branch}] {header_message}."
// Parse header.
// [0] is repo, [1] is branch.
header_data := gp.cutLinks(message.Text)
data["repo"] = header_data[0][1]
data["repo_url"] = header_data[0][0]
data["branch"] = header_data[1][1]
data["branch_url"] = header_data[1][0]
header_msg := strings.Split(message.Text, "] ")[1]
data["header_message"] = header_msg
return data
}
func (gp GiteaParser) cutLinks(data string) [][]string {
c.Log.Debugln("Passed:", data)
r := regexp.MustCompile("((https??://[a-zA-Z0-9.#!*/ _-]+)\\|([a-zA-Z0-9.#!*/ _-]+))")
r := regexp.MustCompile("((https??://[a-zA-Z0-9.#!*/ _-]+)\\|([a-zA-Z0-9.#!*/ _+-]+))")
found := r.FindAllStringSubmatch(data, -1)
@ -76,9 +94,9 @@ func (gp GiteaParser) parseCommitNew(message slackmessage.SlackMessage) map[stri
idx := 0
for i := range message.Attachments {
attachment_link := gp.cutLinks(message.Attachments[i].Text)
data["repeatable_item_commit" + strconv.Itoa(idx)] = attachment_link[0][1]
data["repeatable_item_commit" + strconv.Itoa(idx) + "_url"] = attachment_link[0][0]
data["repeatable_item_message" + strconv.Itoa(idx)] = strings.Split(message.Attachments[i].Text, ">: ")[1]
data["repeatable_item_commit"+strconv.Itoa(idx)] = attachment_link[0][1]
data["repeatable_item_commit"+strconv.Itoa(idx)+"_url"] = attachment_link[0][0]
data["repeatable_item_message"+strconv.Itoa(idx)] = strings.Split(message.Attachments[i].Text, ">: ")[1]
idx += 1
}
@ -93,6 +111,20 @@ func (gp GiteaParser) ParseMessage(message slackmessage.SlackMessage) map[string
var data map[string]string
if strings.Contains(message.Text, "new commit") && strings.Contains(message.Text, "pushed by ") {
data = gp.parseCommitNew(message)
} else if strings.Contains(message.Text, "Pull request closed") {
data = gp.parsePullRequestClosed(message)
} else if strings.Contains(message.Text, "Pull request edited") {
data = gp.parsePullRequestEdited(message)
} else if strings.Contains(message.Text, "Pull request labels updated") {
data = gp.parsePullRequestLabelsUpdated(message)
} else if strings.Contains(message.Text, "Pull request merged") {
data = gp.parsePullRequestMerged(message)
} else if strings.Contains(message.Text, "Pull request re-opened") {
data = gp.parsePullRequestReopened(message)
} else if strings.Contains(message.Text, "Pull request submitted") {
data = gp.parsePullRequestSubmitted(message)
} else if strings.Contains(message.Text, "branch created by") {
data = gp.parseBranchNew(message)
} else {
return map[string]string{"message": "Unknown message type:<br />" + fmt.Sprintf("%+v", message)}
}
@ -101,3 +133,124 @@ func (gp GiteaParser) ParseMessage(message slackmessage.SlackMessage) map[string
return data
}
func (gp GiteaParser) parsePullRequestClosed(message slackmessage.SlackMessage) map[string]string {
data := make(map[string]string)
data["message"] = "[Repo: {repo}] Pull request {pr} by {user} was closed."
// Parse header.
// [0] is repo, [1] is branch.
header_data := gp.cutLinks(message.Text)
data["pr"] = header_data[0][1]
data["pr_url"] = header_data[0][0]
data["user"] = header_data[1][1]
data["user_url"] = header_data[1][0]
repo := strings.Split(message.Text, "Pull request")[0]
repo = strings.TrimLeft(repo, "[")
repo = strings.TrimRight(repo, "] ")
data["repo"] = repo
return data
}
func (gp GiteaParser) parsePullRequestEdited(message slackmessage.SlackMessage) map[string]string {
data := make(map[string]string)
data["message"] = "[Repo: {repo}] Pull request {pr} was edited by {user}."
// Parse header.
// [0] is repo, [1] is branch.
header_data := gp.cutLinks(message.Text)
data["pr"] = header_data[0][1]
data["pr_url"] = header_data[0][0]
data["user"] = header_data[1][1]
data["user_url"] = header_data[1][0]
repo := strings.Split(message.Text, "Pull request")[0]
repo = strings.TrimLeft(repo, "[")
repo = strings.TrimRight(repo, "] ")
data["repo"] = repo
return data
}
func (gp GiteaParser) parsePullRequestLabelsUpdated(message slackmessage.SlackMessage) map[string]string {
data := make(map[string]string)
data["message"] = "[Repo: {repo}] Pull request {pr} by {user} labels was updated."
// Parse header.
// [0] is repo, [1] is branch.
header_data := gp.cutLinks(message.Text)
data["pr"] = header_data[0][1]
data["pr_url"] = header_data[0][0]
data["user"] = header_data[1][1]
data["user_url"] = header_data[1][0]
repo := strings.Split(message.Text, "Pull request")[0]
repo = strings.TrimLeft(repo, "[")
repo = strings.TrimRight(repo, "] ")
data["repo"] = repo
return data
}
func (gp GiteaParser) parsePullRequestMerged(message slackmessage.SlackMessage) map[string]string {
data := make(map[string]string)
data["message"] = "[Repo: {repo}] Pull request {pr} by {user} was merged."
// Parse header.
// [0] is repo, [1] is branch.
header_data := gp.cutLinks(message.Text)
data["pr"] = header_data[0][1]
data["pr_url"] = header_data[0][0]
data["user"] = header_data[1][1]
data["user_url"] = header_data[1][0]
repo := strings.Split(message.Text, "Pull request")[0]
repo = strings.TrimLeft(repo, "[")
repo = strings.TrimRight(repo, "] ")
data["repo"] = repo
return data
}
func (gp GiteaParser) parsePullRequestReopened(message slackmessage.SlackMessage) map[string]string {
data := make(map[string]string)
data["message"] = "[Repo: {repo}] Pull request {pr} by {user} was re-opened."
// Parse header.
// [0] is repo, [1] is branch.
header_data := gp.cutLinks(message.Text)
data["pr"] = header_data[0][1]
data["pr_url"] = header_data[0][0]
data["user"] = header_data[1][1]
data["user_url"] = header_data[1][0]
repo := strings.Split(message.Text, "Pull request")[0]
repo = strings.TrimLeft(repo, "[")
repo = strings.TrimRight(repo, "] ")
data["repo"] = repo
return data
}
func (gp GiteaParser) parsePullRequestSubmitted(message slackmessage.SlackMessage) map[string]string {
data := make(map[string]string)
data["message"] = "[Repo: {repo}] Pull request {pr} submitted by {user}."
header_data := gp.cutLinks(message.Text)
data["user"] = header_data[0][1]
data["user_url"] = header_data[0][0]
repo := strings.Split(message.Text, "Pull request")[0]
repo = strings.TrimLeft(repo, "[")
repo = strings.TrimRight(repo, "] ")
data["repo"] = repo
// There is a pull request description in attachments.
prdata := gp.cutLinks(message.Attachments[0].Title)
data["pr"] = prdata[0][1]
data["pr_url"] = prdata[0][0]
return data
}

22
parsers/gitlab/gitlabparser.go
View File

@ -28,10 +28,10 @@ import (
"lab.pztrn.name/pztrn/opensaps/slack/message"
)
type GitlabParser struct {}
type GitlabParser struct{}
func (gp GitlabParser) cutLinks(data string) [][]string {
r := regexp.MustCompile("((https??://[a-zA-Z0-9.#!*/ _-]+)\\|([a-zA-Z0-9.#!*/ _-]+))")
r := regexp.MustCompile("((https??://[a-zA-Z0-9.#!*/ _-]+)\\|([a-zA-Z0-9.#!*/ _+-]+))")
found := r.FindAllStringSubmatch(data, -1)
@ -73,9 +73,9 @@ func (gp GitlabParser) parseCommit(message slackmessage.SlackMessage) map[string
idx := 0
for i := range message.Attachments {
commit_data := gp.cutLinks(message.Attachments[i].Text)
data["repeatable_item_commit" + strconv.Itoa(idx)] = commit_data[0][1]
data["repeatable_item_commit" + strconv.Itoa(idx) + "_url"] = commit_data[0][0]
data["repeatable_item_commit_text" + strconv.Itoa(idx)] = strings.Split(message.Attachments[i].Text, ">: ")[1]
data["repeatable_item_commit"+strconv.Itoa(idx)] = commit_data[0][1]
data["repeatable_item_commit"+strconv.Itoa(idx)+"_url"] = commit_data[0][0]
data["repeatable_item_commit_text"+strconv.Itoa(idx)] = strings.Split(message.Attachments[i].Text, ">: ")[1]
idx += 1
}
@ -133,14 +133,14 @@ func (gp GitlabParser) parseIssueComment(message slackmessage.SlackMessage) map[
data["commented_on_issue_url"] = links_data[0][0]
data["project"] = links_data[1][1]
data["project_url"] = links_data[1][0]
data["issue_name"] = strings.Split(message.Text, links_data[1][1] + ">: ")[1]
data["issue_name"] = strings.Split(message.Text, links_data[1][1]+">: ")[1]
// Parse attachments, which contains comments.
data["repeatable_message"] = "{comment}{newline}"
data["repeatables"] = "comment"
idx := 0
for i := range message.Attachments {
data["repeatable_item_comment" + strconv.Itoa(idx)] = message.Attachments[i].Text
data["repeatable_item_comment"+strconv.Itoa(idx)] = message.Attachments[i].Text
idx += 1
}
data["repeatables_count"] = strconv.Itoa(idx)
@ -199,14 +199,14 @@ func (gp GitlabParser) parseMergeRequestComment(message slackmessage.SlackMessag
data["commented_on_merge_request_url"] = links_data[0][0]
data["project"] = links_data[1][1]
data["project_url"] = links_data[1][0]
data["merge_request_name"] = strings.Split(message.Text, links_data[1][1] + ">: ")[1]
data["merge_request_name"] = strings.Split(message.Text, links_data[1][1]+">: ")[1]
// Parse attachments, which contains comments.
data["repeatable_message"] = "{comment}{newline}"
data["repeatables"] = "comment"
idx := 0
for i := range message.Attachments {
data["repeatable_item_comment" + strconv.Itoa(idx)] = message.Attachments[i].Text
data["repeatable_item_comment"+strconv.Itoa(idx)] = message.Attachments[i].Text
idx += 1
}
data["repeatables_count"] = strconv.Itoa(idx)
@ -257,8 +257,8 @@ func (gp GitlabParser) parsePipelineMessage(message slackmessage.SlackMessage) m
data["status"] = status
user := strings.Split(message.Attachments[0].Text, "> by ")[1]
data["user"] = strings.Split(user, " " + status + " in")[0]
data["time"] = strings.Split(message.Attachments[0].Text, " " + status + " in ")[1]
data["user"] = strings.Split(user, " "+status+" in")[0]
data["time"] = strings.Split(message.Attachments[0].Text, " "+status+" in ")[1]
links_data := gp.cutLinks(message.Attachments[0].Text)
data["project"] = links_data[0][1]