Merge branch 'master' into pr-create

Author: Chun-Hung Hsiao

CHANGELOG.md

@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 - Fix issue with GitHub enterprise deep link including API prefix, from [@bradrydzewski](https://github.com/bradrydzewski).
+- Fix issue with GitHub deploy hooks for commits having an invalid reference, from [@bradrydzewski](https://github.com/bradrydzewski).
 
 ## [1.6.0]
 ### Added

scm/content.go

@@ -16,10 +16,12 @@ type (
 	// ContentParams provide parameters for creating and
 	// updating repository content.
 	ContentParams struct {
-		Ref     string
-		Branch  string
-		Message string
-		Data    []byte
+		Ref       string
+		Branch    string
+		Message   string
+		Data      []byte
+		Sha       string
+		Signature Signature
 	}
 
 	// ContentInfo stores the kind of any content in a repository.

scm/driver/bitbucket/repo.go

@@ -13,6 +13,11 @@ import (
 	"github.com/drone/go-scm/scm"
 )
 
+type cloneLink struct {
+	link
+	Name string `json:"name"`
+}
+
 type repository struct {
 	UUID       string    `json:"uuid"`
 	SCM        string    `json:"scm"`
@@ -24,6 +29,10 @@ type repository struct {
 		Type string `json:"type"`
 		Name string `json:"name"`
 	} `json:"mainbranch"`
+	Links struct {
+		HTML  link        `json:"html"`
+		Clone []cloneLink `json:"clone"`
+	} `json:"links"`
 }
 
 type perms struct {
@@ -176,16 +185,36 @@ func convertRepository(from *repository) *scm.Repository {
 		ID:        from.UUID,
 		Name:      name,
 		Namespace: namespace,
-		Link:      fmt.Sprintf("https://bitbucket.org/%s", from.FullName),
+		Link:      from.Links.HTML.Href,
 		Branch:    from.Mainbranch.Name,
 		Private:   from.IsPrivate,
-		Clone:     fmt.Sprintf("https://bitbucket.org/%s.git", from.FullName),
-		CloneSSH:  fmt.Sprintf("[email protected]:%s.git", from.FullName),
+		CloneSSH:  extractCloneLink(from.Links.Clone, "ssh"),
+		Clone:     anonymizeLink(extractCloneLink(from.Links.Clone, "https", "http")),
 		Created:   from.CreatedOn,
 		Updated:   from.UpdatedOn,
 	}
 }
 
+func extractCloneLink(links []cloneLink, names ...string) (href string) {
+	for _, name := range names {
+		for _, link := range links {
+			if link.Name == name && link.Href != "" {
+				return link.Href
+			}
+		}
+	}
+	return
+}
+
+func anonymizeLink(link string) (href string) {
+	parsed, err := url.Parse(link)
+	if err != nil {
+		return link
+	}
+	parsed.User = nil
+	return parsed.String()
+}
+
 func convertPerms(from *perms) *scm.Perm {
 	to := new(scm.Perm)
 	if len(from.Values) != 1 {

scm/driver/gitea/repo.go

@@ -189,6 +189,7 @@ func convertRepository(src *repository) *scm.Repository {
 		Private:   src.Private,
 		Clone:     src.CloneURL,
 		CloneSSH:  src.SSHURL,
+		Link:      src.HTMLURL,
 	}
 }
 

scm/driver/gitea/testdata/repo.json.golden

@@ -11,7 +11,7 @@
     "Private": true,
     "Clone": "https://try.gitea.io/go-gitea/gitea.git",
     "CloneSSH": "[email protected]:go-gitea/gitea.git",
-    "Link": "",
+    "Link": "https://try.gitea.io/go-gitea/gitea",
     "Created": "0001-01-01T00:00:00Z",
     "Updated": "0001-01-01T00:00:00Z"
 }

scm/driver/gitea/testdata/repos.json.golden

@@ -12,7 +12,7 @@
         "Private": true,
         "Clone": "https://try.gitea.io/go-gitea/gitea.git",
         "CloneSSH": "[email protected]:go-gitea/gitea.git",
-        "Link": "",
+        "Link": "https://try.gitea.io/go-gitea/gitea",
         "Created": "0001-01-01T00:00:00Z",
         "Updated": "0001-01-01T00:00:00Z"
     }

scm/driver/gitea/testdata/webhooks/branch_create.json.golden

@@ -12,7 +12,7 @@
     "Private": true,
     "Clone": "http://try.gitea.io/gogits/hello-world.git",
     "CloneSSH": "git@localhost:gogits/hello-world.git",
-    "Link": "",
+    "Link": "http://try.gitea.io/gogits/hello-world",
     "Created": "0001-01-01T00:00:00Z",
     "Updated": "0001-01-01T00:00:00Z"
   },

scm/driver/gitea/testdata/webhooks/branch_delete.json.golden

@@ -12,7 +12,7 @@
     "Private": true,
     "Clone": "http://try.gitea.io/gogits/hello-world.git",
     "CloneSSH": "git@localhost:gogits/hello-world.git",
-    "Link": "",
+    "Link": "http://try.gitea.io/gogits/hello-world",
     "Created": "0001-01-01T00:00:00Z",
     "Updated": "0001-01-01T00:00:00Z"
   },

scm/driver/gitea/testdata/webhooks/issue_comment_created.json.golden

@@ -9,7 +9,7 @@
     "Private": true,
     "Clone": "http://try.gitea.io/gogits/hello-world.git",
     "CloneSSH": "git@localhost:gogits/hello-world.git",
-    "Link": "",
+    "Link": "http://try.gitea.io/gogits/hello-world",
     "Created": "0001-01-01T00:00:00Z",
     "Updated": "0001-01-01T00:00:00Z"
   },

scm/driver/gitea/testdata/webhooks/issues_opened.json.golden

@@ -9,7 +9,7 @@
     "Private": true,
     "Clone": "http://try.gitea.io/gogits/hello-world.git",
     "CloneSSH": "git@localhost:gogits/hello-world.git",
-    "Link": "",
+    "Link": "http://try.gitea.io/gogits/hello-world",
     "Created": "0001-01-01T00:00:00Z",
     "Updated": "0001-01-01T00:00:00Z"
   },