Simplify branch parsing in the parsers

voxpupuli · Aug 23, 2021 · be8d7b5 · be8d7b5
1 parent 43cdfb3
commit be8d7b5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/lib/parsers/azure-devops.go b/lib/parsers/azure-devops.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
-	"strings"
+	"path"
 
 	"github.com/gin-gonic/gin"
 	"github.com/mcdafydd/go-azuredevops/azuredevops"
@@ -57,5 +57,5 @@ func (d *Data) AzureDevopsDeleted(e *azuredevops.GitPush) bool {
 }
 
 func (d *Data) ParseBranch(e *azuredevops.GitPush) string {
-	return strings.ReplaceAll(*e.RefUpdates[0].Name, "refs/heads/", "")
+	return path.Base(*e.RefUpdates[0].Name)
 }
diff --git a/lib/parsers/bitbucket-server.go b/lib/parsers/bitbucket-server.go
@@ -2,7 +2,7 @@ package parsers
 
 import (
 	"fmt"
-	"strings"
+	"path"
 
 	"github.com/gin-gonic/gin"
 	bitbucketserver "github.com/go-playground/webhooks/v6/bitbucket-server"
@@ -38,5 +38,5 @@ func (d *Data) BitbucketServerDeleted(c bitbucketserver.RepositoryReferenceChang
 }
 
 func (d *Data) BsParseBranch(e bitbucketserver.RepositoryReferenceChangedPayload) string {
-	return strings.ReplaceAll(e.Changes[0].ReferenceID, "refs/heads/", "")
+	return path.Base(e.Changes[0].ReferenceID)
 }
diff --git a/lib/parsers/github.go b/lib/parsers/github.go
@@ -3,7 +3,7 @@ package parsers
 import (
 	"fmt"
 	"io/ioutil"
-	"strings"
+	"path"
 
 	"github.com/gin-gonic/gin"
 	"github.com/google/go-github/github"
@@ -23,7 +23,7 @@ func (d *Data) ParseGithub(c *gin.Context) error {
 
 	switch e := event.(type) {
 	case *github.PushEvent:
-		d.Branch = strings.ReplaceAll(*e.Ref, "refs/heads/", "")
+		d.Branch = path.Base(*e.Ref)
 		d.Deleted = *e.Deleted
 		d.ModuleName = *e.Repo.Name
 		d.RepoName = *e.Repo.FullName

diff --git a/lib/parsers/gitlab.go b/lib/parsers/gitlab.go
@@ -3,7 +3,7 @@ package parsers
 import (
 	"fmt"
 	"io/ioutil"
-	"strings"
+	"path"
 
 	"github.com/gin-gonic/gin"
 	"github.com/xanzy/go-gitlab"
@@ -22,7 +22,7 @@ func (d *Data) ParseGitlab(c *gin.Context) error {
 
 	switch e := event.(type) {
 	case *gitlab.PushEvent:
-		d.Branch = strings.ReplaceAll(e.Ref, "refs/heads/", "")
+		d.Branch = path.Base(e.Ref)
 		d.Deleted = d.GitlabDeleted(e)
 		d.ModuleName = e.Project.Name
 		d.RepoName = e.Project.PathWithNamespace