Add file support (#65)

This commit adds the ability to list files and retrieve blobs from
Bitbucket.

Author: mfb2

bitbucket.go

@@ -45,6 +45,8 @@ type repository interface {
 	UpdatePipelineConfig(opt RepositoryPipelineOptions) (*Pipeline, error)
 	AddPipelineVariable(opt RepositoryPipelineVariableOptions) (*PipelineVariable, error)
 	AddPipelineKeyPair(opt RepositoryPipelineKeyPairOptions) (*PipelineKeyPair, error)
+	ListFiles(opt RepositoryFilesOptions) (*[]RepositoryFile, error)
+	GetFileBlob(opt RepositoryBlobOptions) (*RepositoryBlob, error)
 }
 
 type repositories interface {
@@ -114,6 +116,19 @@ type RepositoryOptions struct {
 	Project     string `json:"project"`
 }
 
+type RepositoryFilesOptions struct {
+	Owner    string `json:"owner"`
+	RepoSlug string `json:"repo_slug"`
+	Ref      string `json:"ref"`
+}
+
+type RepositoryBlobOptions struct {
+	Owner    string `json:"owner"`
+	RepoSlug string `json:"repo_slug"`
+	Ref      string `json:"ref"`
+	Path     string `json:"path"`
+}
+
 type PullRequestsOptions struct {
 	ID                string   `json:"id"`
 	CommentID         string   `json:"comment_id"`

client.go

@@ -140,6 +140,21 @@ func injectClient(a *auth) *Client {
 	return c
 }
 
+func (c *Client) executeRaw(method string, urlStr string, text string) ([]byte, error) {
+	body := strings.NewReader(text)
+
+	req, err := http.NewRequest(method, urlStr, body)
+	if err != nil {
+		return nil, err
+	}
+	if text != "" {
+		req.Header.Set("Content-Type", "application/json")
+	}
+
+	c.authenticateRequest(req)
+	return c.doRawRequest(req, false)
+}
+
 func (c *Client) execute(method string, urlStr string, text string) (interface{}, error) {
 	// Use pagination if changed from default value
 	const DEC_RADIX = 10
@@ -263,7 +278,22 @@ func (c *Client) authenticateRequest(req *http.Request) {
 }
 
 func (c *Client) doRequest(req *http.Request, emptyResponse bool) (interface{}, error) {
+	resBodyBytes, err := c.doRawRequest(req, emptyResponse)
+	if err != nil {
+		return nil, err
+	}
 
+	var result interface{}
+	err = json.Unmarshal(resBodyBytes, &result)
+	if err != nil {
+		log.Println("Could not unmarshal JSON payload, returning raw response")
+		return resBodyBytes, err
+	}
+
+	return result, nil
+}
+
+func (c *Client) doRawRequest(req *http.Request, emptyResponse bool) ([]byte, error) {
 	resp, err := c.HttpClient.Do(req)
 	if err != nil {
 		return nil, err
@@ -284,18 +314,7 @@ func (c *Client) doRequest(req *http.Request, emptyResponse bool) (interface{},
 		return nil, fmt.Errorf("response body is nil")
 	}
 
-	resBodyBytes, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return nil, err
-	}
-
-	var result interface{}
-	err = json.Unmarshal(resBodyBytes, &result)
-	if err != nil {
-		return nil, err
-	}
-
-	return result, nil
+	return ioutil.ReadAll(resp.Body)
 }
 
 func (c *Client) requestUrl(template string, args ...interface{}) string {

repository.go

@@ -3,6 +3,7 @@ package bitbucket
 import (
 	"encoding/json"
 	"os"
+	"path"
 
 	"github.com/k0kubun/pp"
 	"github.com/mitchellh/mapstructure"
@@ -26,6 +27,20 @@ type Repository struct {
 	Links       map[string]interface{}
 }
 
+type RepositoryFile struct {
+	Mimetype   string
+	Links      map[string]interface{}
+	Path       string
+	Commit     map[string]interface{}
+	Attributes []string
+	Type       string
+	Size       int
+}
+
+type RepositoryBlob struct {
+	Content []byte
+}
+
 type Pipeline struct {
 	Type       string
 	Enabled    bool
@@ -68,6 +83,30 @@ func (r *Repository) Get(ro *RepositoryOptions) (*Repository, error) {
 	return decodeRepository(response)
 }
 
+func (r *Repository) ListFiles(ro *RepositoryFilesOptions) ([]RepositoryFile, error) {
+	filePath := path.Join("/repositories", ro.Owner, ro.RepoSlug, "src")
+	urlStr := r.c.requestUrl(filePath)
+	response, err := r.c.execute("GET", urlStr, "")
+	if err != nil {
+		return nil, err
+	}
+
+	return decodeRepositoryFiles(response)
+}
+
+func (r *Repository) GetFileBlob(ro *RepositoryBlobOptions) (*RepositoryBlob, error) {
+	filePath := path.Join("/repositories", ro.Owner, ro.RepoSlug, "src", ro.Ref, ro.Path)
+	urlStr := r.c.requestUrl(filePath)
+	response, err := r.c.executeRaw("GET", urlStr, "")
+	if err != nil {
+		return nil, err
+	}
+
+	blob := RepositoryBlob{Content: response}
+
+	return &blob, nil
+}
+
 func (r *Repository) Delete(ro *RepositoryOptions) (interface{}, error) {
 	urlStr := r.c.requestUrl("/repositories/%s/%s", ro.Owner, ro.RepoSlug)
 	return r.c.execute("DELETE", urlStr, "")
@@ -219,6 +258,22 @@ func decodeRepository(repoResponse interface{}) (*Repository, error) {
 	return repository, nil
 }
 
+func decodeRepositoryFiles(repoResponse interface{}) ([]RepositoryFile, error) {
+	repoFileMap := repoResponse.(map[string]interface{})
+
+	if repoFileMap["type"] == "error" {
+		return nil, DecodeError(repoFileMap)
+	}
+
+	var repositoryFiles = new([]RepositoryFile)
+	err := mapstructure.Decode(repoFileMap["values"], repositoryFiles)
+	if err != nil {
+		return nil, err
+	}
+
+	return *repositoryFiles, nil
+}
+
 func decodePipelineRepository(repoResponse interface{}) (*Pipeline, error) {
 	repoMap := repoResponse.(map[string]interface{})
 
@@ -266,3 +321,11 @@ func decodePipelineKeyPairRepository(repoResponse interface{}) (*PipelineKeyPair
 
 	return pipelineKeyPair, nil
 }
+
+func (rf RepositoryFile) String() string {
+	return rf.Path
+}
+
+func (rb RepositoryBlob) String() string {
+	return string(rb.Content)
+}