allow for branches with slashes in them

voxpupuli · Jun 28, 2024 · c5441a9 · c5441a9
1 parent c88b9a9
commit c5441a9
Show file tree

Hide file tree

Showing 5 changed files with 10 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"
-	"path"
+	"strings"
 
 	"github.com/gin-gonic/gin"
 	"github.com/mcdafydd/go-azuredevops/azuredevops"
@@ -59,5 +59,5 @@ func (d *Data) azureDevopsDeleted(e *azuredevops.GitPush) bool {
 }
 
 func (d *Data) parseBranch(e *azuredevops.GitPush) string {
-	return path.Base(*e.RefUpdates[0].Name)
+	return strings.TrimPrefix(*e.RefUpdates[0].Name, prefix)
 }
diff --git a/lib/parsers/bitbucket-server.go b/lib/parsers/bitbucket-server.go
@@ -2,7 +2,7 @@ package parsers
 
 import (
 	"fmt"
-	"path"
+	"strings"
 
 	"github.com/gin-gonic/gin"
 	bitbucketserver "github.com/go-playground/webhooks/v6/bitbucket-server"
@@ -40,5 +40,5 @@ func (d *Data) bitbucketServerDeleted(c bitbucketserver.RepositoryReferenceChang
 }
 
 func (d *Data) bsParseBranch(e bitbucketserver.RepositoryReferenceChangedPayload) string {
-	return path.Base(e.Changes[0].ReferenceID)
+	return strings.TrimPrefix(e.Changes[0].ReferenceID, prefix)
 }
diff --git a/lib/parsers/github.go b/lib/parsers/github.go
@@ -3,7 +3,7 @@ package parsers
 import (
 	"fmt"
 	"io/ioutil"
-	"path"
+	"strings"
 
 	"github.com/gin-gonic/gin"
 	"github.com/google/go-github/v39/github"
@@ -23,7 +23,7 @@ func (d *Data) parseGithub(c *gin.Context) error {
 
 	switch e := event.(type) {
 	case *github.PushEvent:
-		d.Branch = path.Base(*e.Ref)
+		d.Branch = strings.TrimPrefix(*e.Ref, prefix)
 		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"
-	"path"
+	"strings"
 
 	"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 = path.Base(e.Ref)
+		d.Branch = strings.TrimPrefix(e.Ref, prefix)
 		d.Deleted = d.gitlabDeleted(e.After)
 		d.ModuleName = e.Project.Name
 		d.RepoName = e.Project.PathWithNamespace

diff --git a/lib/parsers/parser.go b/lib/parsers/parser.go
@@ -8,6 +8,8 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
+const prefix = "refs/heads/"
+
 type Data struct {
 	Branch     string
 	Deleted    bool