[feat]: [PL-24913]: Add the support for create and update file in bitbucket server (#177)

DeepakPatankar · web-flow · commit 78b5e763f6cd · 2022-05-09T12:07:57.000+01:00
* [PL-24913]: Add the support for create and update api in bitbucket server
* [PL-24913]: Add the tests for create and update of file in bitbucket server
diff --git a/scm/driver/stash/content.go b/scm/driver/stash/content.go
@@ -28,11 +28,26 @@ func (s *contentService) Find(ctx context.Context, repo, path, ref string) (*scm
 }
 
 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)
+	in := &contentCreateUpdate{
+		Message: params.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) {
-	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)
+	in := &contentCreateUpdate{
+		Message: params.Message,
+		Branch:  params.Branch,
+		Content: params.Data,
+		Sha:     params.Sha,
+	}
+	return s.client.do(ctx, "PUT", endpoint, in, nil)
 }
 
 func (s *contentService) Delete(ctx context.Context, repo, path string, params *scm.ContentParams) (*scm.Response, error) {
@@ -53,6 +68,13 @@ type contents struct {
 	Values []string `json:"values"`
 }
 
+type contentCreateUpdate struct {
+	Branch  string `json:"branch"`
+	Message string `json:"message"`
+	Content []byte `json:"content"`
+	Sha     string `json:"sourceCommitId"`
+}
+
 func convertContentInfoList(from *contents) []*scm.ContentInfo {
 	to := []*scm.ContentInfo{}
 	for _, v := range from.Values {
diff --git a/scm/driver/stash/content_test.go b/scm/driver/stash/content_test.go
@@ -43,18 +43,75 @@ 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://localhost: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:  "Monalisa Octocat",
+			Email: "octocat@github.com",
+		},
+	}
+
+	client := NewDefault()
+	res, err := client.Contents.Create(
+		context.Background(),
+		"octocat/hello-world",
+		"README",
+		params,
+	)
+
+	if err != nil {
+		t.Error(err)
+		return
+	}
+
+	if res.Status != 200 {
+		t.Errorf("Unexpected Results")
 	}
 }
 
 func TestContentUpdate(t *testing.T) {
-	content := new(contentService)
-	_, err := content.Update(context.Background(), "atlassian/atlaskit", "README", nil)
-	if err != scm.ErrNotSupported {
-		t.Errorf("Expect Not Supported error")
+	defer gock.Off()
+
+	gock.New("http://localhost:7990").
+		Put("/rest/api/1.0/projects/octocat/repos/hello-world/browse/README").
+		Reply(200).
+		Type("application/json").
+		File("testdata/content_update.json")
+
+	params := &scm.ContentParams{
+		Message: "a new commit message",
+		Data:    []byte("bXkgdXBkYXRlZCBmaWxlIGNvbnRlbnRz"),
+		BlobID:  "95b966ae1c166bd92f8ae7d1c313e738c731dfc3",
+		Signature: scm.Signature{
+			Name:  "Monalisa Octocat",
+			Email: "octocat@github.com",
+		},
+	}
+
+	client := NewDefault()
+	res, err := client.Contents.Update(
+		context.Background(),
+		"octocat/hello-world",
+		"README",
+		params,
+	)
+
+	if err != nil {
+		t.Error(err)
+		return
+	}
+
+	if res.Status != 200 {
+		t.Errorf("Unexpected Results")
 	}
 }
 
diff --git a/scm/driver/stash/integration/content_test.go b/scm/driver/stash/integration/content_test.go
@@ -0,0 +1,62 @@
+package integration
+
+import (
+	"context"
+	"net/http"
+	"testing"
+
+	"github.com/drone/go-scm/scm"
+	"github.com/drone/go-scm/scm/driver/stash"
+	"github.com/drone/go-scm/scm/transport"
+)
+
+func TestCreateUpdateDeleteFileStash(t *testing.T) {
+	if token == "" {
+		t.Skip("Skipping, Acceptance test")
+	}
+	client, _ = stash.New(endpoint)
+	client.Client = &http.Client{
+		Transport: &transport.BasicAuth{
+			Username: username,
+			Password: token,
+		},
+	}
+	// get latest commit first
+	currentCommit, commitErr := GetCurrentCommitOfBranch(client, "master")
+	if commitErr != nil {
+		t.Errorf("we got an error %v", commitErr)
+	}
+	// create a new file
+	createParams := scm.ContentParams{
+		Message: "go-scm create crud file",
+		Data:    []byte("hello"),
+		Branch:  "master",
+		Sha:     currentCommit,
+	}
+	createResponse, createErr := client.Contents.Create(context.Background(), repoID, "README5", &createParams)
+	if createErr != nil {
+		t.Errorf("Contents.Create we got an error %v", createErr)
+	}
+	if createResponse.Status != http.StatusOK {
+		t.Errorf("Contents.Create we did not get a 201 back %v", createResponse.Status)
+	}
+	// get latest commit first
+	currentCommit, commitErr = GetCurrentCommitOfBranch(client, "main")
+	if commitErr != nil {
+		t.Errorf("we got an error %v", commitErr)
+	}
+	// update the file
+	updateParams := scm.ContentParams{
+		Message: "go-scm update crud file",
+		Data:    []byte("updated test data"),
+		Branch:  "master",
+		Sha:     currentCommit,
+	}
+	updateResponse, updateErr := client.Contents.Update(context.Background(), repoID, "README5", &updateParams)
+	if updateErr != nil {
+		t.Errorf("Contents.Update we got an error %v", updateErr)
+	}
+	if updateResponse.Status != http.StatusOK {
+		t.Errorf("Contents.Update we did not get a 201 back %v", updateResponse.Status)
+	}
+}
diff --git a/scm/driver/stash/integration/testSettings.go b/scm/driver/stash/integration/testSettings.go
@@ -1,16 +1,26 @@
 package integration
 
 import (
+	"context"
 	"os"
 
 	"github.com/drone/go-scm/scm"
 )
 
 var (
-	client   *scm.Client
-	token    = os.Getenv("BITBUCKET_SERVER_TOKEN")
+	client *scm.Client
+	token  = os.Getenv("BITBUCKET_SERVER_TOKEN")
+
 	endpoint = "https://bitbucket.dev.harness.io/"
 	repoID   = "har/scm-integration-test-repo"
 	username = "harnessadmin"
 	commitId = "f675c4b55841908d7c338c500c8f4cb844fd9be7"
 )
+
+func GetCurrentCommitOfBranch(client *scm.Client, branch string) (string, error) {
+	commits, _, err := client.Git.ListCommits(context.Background(), repoID, scm.CommitListOptions{Ref: branch})
+	if err != nil {
+		return "", err
+	}
+	return commits[0].Sha, nil
+}
diff --git a/scm/driver/stash/stash.go b/scm/driver/stash/stash.go
@@ -11,6 +11,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"mime/multipart"
 	"net/url"
 	"strings"
 
@@ -74,10 +75,37 @@ 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)
-		json.NewEncoder(buf).Encode(in)
-		req.Header["Content-Type"] = []string{"application/json"}
-		req.Body = buf
+		switch content := in.(type) {
+		case *contentCreateUpdate:
+			// add the content to the multipart
+			var b bytes.Buffer
+			w := multipart.NewWriter(&b)
+			// add the other fields
+			if content.Message != "" {
+				_ = w.WriteField("content", string(content.Content))
+			}
+			if content.Message != "" {
+				_ = w.WriteField("message", content.Message)
+			}
+			if content.Branch != "" {
+				_ = w.WriteField("branch", content.Branch)
+			}
+			if content.Sha != "" {
+				_ = w.WriteField("sourceCommitId", content.Sha)
+			}
+			w.Close()
+			// write the multipart response to the body
+			req.Body = &b
+			// write the content type that contains the length of the multipart
+			req.Header = map[string][]string{
+				"Content-Type": {w.FormDataContentType()},
+			}
+		default:
+			buf := new(bytes.Buffer)
+			json.NewEncoder(buf).Encode(in)
+			req.Header["Content-Type"] = []string{"application/json"}
+			req.Body = buf
+		}
 	}
 
 	// execute the http request
diff --git a/scm/driver/stash/testdata/content_create.json b/scm/driver/stash/testdata/content_create.json
@@ -0,0 +1,21 @@
+{
+    "id": "abcdef0123abcdef4567abcdef8987abcdef6543",
+    "displayId": "abcdef0123a",
+    "author": {
+        "name": "charlie",
+        "emailAddress": "charlie@example.com"
+    },
+    "authorTimestamp": 1636089306104,
+    "committer": {
+        "name": "charlie",
+        "emailAddress": "charlie@example.com"
+    },
+    "committerTimestamp": 1636089306104,
+    "message": "WIP on feature 1",
+    "parents": [
+        {
+            "id": "abcdef0123abcdef4567abcdef8987abcdef6543",
+            "displayId": "abcdef0"
+        }
+    ]
+}
diff --git a/scm/driver/stash/testdata/content_update.json b/scm/driver/stash/testdata/content_update.json
@@ -0,0 +1,21 @@
+{
+    "id": "abcdef0123abcdef4567abcdef8987abcdef6543",
+    "displayId": "abcdef0123a",
+    "author": {
+        "name": "charlie",
+        "emailAddress": "charlie@example.com"
+    },
+    "authorTimestamp": 1636089306104,
+    "committer": {
+        "name": "charlie",
+        "emailAddress": "charlie@example.com"
+    },
+    "committerTimestamp": 1636089306104,
+    "message": "WIP on feature 1",
+    "parents": [
+        {
+            "id": "abcdef0123abcdef4567abcdef8987abcdef6543",
+            "displayId": "abcdef0"
+        }
+    ]
+}
