Merge pull request #468 from zakisk/imple-create-content-endpoint

Implement Content Add Endpoint for Bitbucket Server (stash)

Author: jenkins-x-bot

scm/driver/stash/content.go

@@ -33,7 +33,18 @@ func (s *contentService) List(ctx context.Context, repo, path, ref string) ([]*s
 }
 
 func (s *contentService) Create(ctx context.Context, repo, path string, params *scm.ContentParams) (*scm.Response, error) {
-	return nil, scm.ErrNotSupported
+	namespace, repoName := scm.Split(repo)
+	endpoint := fmt.Sprintf("rest/api/1.0/projects/%s/repos/%s/browse/%s", namespace, repoName, path)
+	message := params.Message
+	if params.Signature.Name != "" && params.Signature.Email != "" {
+		message = fmt.Sprintf("%s\nSigned-off-by: %s <%s>", params.Message, params.Signature.Name, params.Signature.Email)
+	}
+	in := &contentCreateUpdate{
+		Message: message,
+		Branch:  params.Branch,
+		Content: params.Data,
+	}
+	return s.client.do(ctx, "PUT", endpoint, in, nil)
 }
 
 func (s *contentService) Update(ctx context.Context, repo, path string, params *scm.ContentParams) (*scm.Response, error) {
@@ -43,3 +54,10 @@ func (s *contentService) Update(ctx context.Context, repo, path string, params *
 func (s *contentService) Delete(ctx context.Context, repo, path string, params *scm.ContentParams) (*scm.Response, error) {
 	return nil, scm.ErrNotSupported
 }
+
+type contentCreateUpdate struct {
+	Branch  string `json:"branch"`
+	Message string `json:"message"`
+	Content []byte `json:"content"`
+	Sha     string `json:"sourceCommitId"`
+}

scm/driver/stash/content_test.go

@@ -46,10 +46,31 @@ func TestContentFind(t *testing.T) {
 }
 
 func TestContentCreate(t *testing.T) {
-	content := new(contentService)
-	_, err := content.Create(context.Background(), "atlassian/atlaskit", "README", nil)
-	if err != scm.ErrNotSupported {
-		t.Errorf("Expect Not Supported error")
+	defer gock.Off()
+
+	gock.New("http://example.com:7990").
+		Put("/rest/api/1.0/projects/octocat/repos/hello-world/browse/README").
+		Reply(200).
+		Type("application/json").
+		File("testdata/content_create.json")
+
+	params := &scm.ContentParams{
+		Message: "my commit message",
+		Data:    []byte("bXkgbmV3IGZpbGUgY29udGVudHM="),
+		Signature: scm.Signature{
+			Name:  "Zaki",
+			Email: "[email protected]",
+		},
+	}
+
+	client, _ := New("http://example.com:7990")
+	resp, err := client.Contents.Create(context.Background(), "octocat/hello-world", "README", params)
+	if err != nil {
+		t.Error(err)
+	}
+
+	if resp.Status != 200 {
+		t.Error(err)
 	}
 }
 

scm/driver/stash/multipart.go

@@ -0,0 +1,26 @@
+package stash
+
+import "mime/multipart"
+
+type MultipartWriter struct {
+	Writer *multipart.Writer
+	Error  error
+}
+
+func (mw *MultipartWriter) Write(f, v string) {
+	if mw.Error != nil {
+		return
+	}
+	if v == "" {
+		return
+	}
+	mw.Error = mw.Writer.WriteField(f, v)
+}
+
+func (mw *MultipartWriter) Close() {
+	mw.Writer.Close()
+}
+
+func (mw *MultipartWriter) FormDataContentType() string {
+	return mw.Writer.FormDataContentType()
+}

scm/driver/stash/stash.go

@@ -9,7 +9,9 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
+	"fmt"
 	"io"
+	"mime/multipart"
 	"net/url"
 	"strings"
 
@@ -74,13 +76,32 @@ func (c *wrapper) do(ctx context.Context, method, path string, in, out interface
 	// if we are posting or putting data, we need to
 	// write it to the body of the request.
 	if in != nil {
-		buf := new(bytes.Buffer)
-		err := json.NewEncoder(buf).Encode(in) // #nosec
-		if err != nil {
-			return nil, err
+		switch contentInput := in.(type) {
+		case *contentCreateUpdate:
+			var b bytes.Buffer
+			mw := &MultipartWriter{Writer: multipart.NewWriter(&b)}
+			mw.Write("content", string(contentInput.Content))
+			mw.Write("message", contentInput.Message)
+			mw.Write("branch", contentInput.Branch)
+			mw.Write("sourceCommitId", contentInput.Sha)
+			if mw.Error != nil {
+				return nil, fmt.Errorf("error writing multipart-content. err: %s", mw.Error)
+			}
+			mw.Close()
+			req.Body = &b
+			req.Header = map[string][]string{
+				"Content-Type":      {mw.FormDataContentType()},
+				"x-atlassian-token": {"no-check"},
+			}
+		default:
+			buf := new(bytes.Buffer)
+			err := json.NewEncoder(buf).Encode(in) // #nosec
+			if err != nil {
+				return nil, err
+			}
+			req.Header.Add("Content-Type", "application/json")
+			req.Body = buf
 		}
-		req.Header.Add("Content-Type", "application/json")
-		req.Body = buf
 	}
 	req.Header.Add("X-Atlassian-Token", "no-check")
 

scm/driver/stash/testdata/content_create.json

@@ -0,0 +1,21 @@
+{
+    "id": "abcdef0123abcdef4567abcdef8987abcdef6543",
+    "displayId": "abcdef0123a",
+    "author": {
+        "name": "Zaki",
+        "emailAddress": "[email protected]"
+    },
+    "authorTimestamp": 1734286823374,
+    "committer": {
+        "name": "Zaki",
+        "emailAddress": "[email protected]"
+    },
+    "committerTimestamp": 1734286823374,
+    "message": "WIP on feature 1",
+    "parents": [
+        {
+            "id": "abcdef0123abcdef4567abcdef8987abcdef6543",
+            "displayId": "abcdef0"
+        }
+    ]
+}