Fix compare change api result for harness (#267)

* Fix compare change api result for harness

Author: shubham149

go.mod

@@ -1,6 +1,7 @@
 module github.com/drone/go-scm
 
 require (
+	github.com/bluekeyes/go-gitdiff v0.7.1
 	github.com/google/go-cmp v0.2.0
 	github.com/h2non/gock v1.0.9
 	github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32 // indirect

go.sum

@@ -1,3 +1,5 @@
+github.com/bluekeyes/go-gitdiff v0.7.1 h1:graP4ElLRshr8ecu0UtqfNTCHrtSyZd3DABQm/DWesQ=
+github.com/bluekeyes/go-gitdiff v0.7.1/go.mod h1:QpfYYO1E0fTVHVZAZKiRjtSGY9823iCdvGXBcEzHGbM=
 github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/h2non/gock v1.0.9 h1:17gCehSo8ZOgEsFKpQgqHiR7VLyjxdAG3lkhVvO9QZU=

scm/driver/harness/git.go

@@ -7,10 +7,10 @@ package harness
 import (
 	"context"
 	"fmt"
-	"io"
 	"strings"
 	"time"
 
+	"github.com/bluekeyes/go-gitdiff/gitdiff"
 	"github.com/drone/go-scm/scm"
 )
 
@@ -81,17 +81,9 @@ func (s *gitService) ListChanges(ctx context.Context, repo, ref string, _ scm.Li
 func (s *gitService) CompareChanges(ctx context.Context, repo, source, target string, _ scm.ListOptions) ([]*scm.Change, *scm.Response, error) {
 	harnessURI := buildHarnessURI(s.client.account, s.client.organization, s.client.project, repo)
 	path := fmt.Sprintf("api/v1/repos/%s/compare/%s...%s", harnessURI, source, target)
-	res, err := s.client.do(ctx, "GET", path, nil, nil)
-	// convert response to a string
 	buf := new(strings.Builder)
-	_, _ = io.Copy(buf, res.Body)
-	changes := []*scm.Change{
-		{
-			Path: "not implemented",
-			Sha:  buf.String(),
-		},
-	}
-	return changes, res, err
+	res, err := s.client.do(ctx, "GET", path, nil, buf)
+	return convertCompareChanges(buf.String()), res, err
 }
 
 // native data structures
@@ -172,6 +164,26 @@ func convertCommitList(src []*commitInfo) []*scm.Commit {
 	return dst
 }
 
+func convertCompareChanges(src string) []*scm.Change {
+	files, _, err := gitdiff.Parse(strings.NewReader(src))
+	if err != nil {
+		return nil
+	}
+
+	changes := make([]*scm.Change, 0)
+	for _, f := range files {
+		changes = append(changes, &scm.Change{
+			Path:         f.NewName,
+			PrevFilePath: f.OldName,
+			Added:        f.IsNew,
+			Deleted:      f.IsDelete,
+			Renamed:      f.IsRename,
+		})
+	}
+
+	return changes
+}
+
 func convertCommitInfo(src *commitInfo) *scm.Commit {
 	return &scm.Commit{
 		Sha:     src.Sha,

scm/driver/harness/git_test.go

@@ -7,6 +7,7 @@ package harness
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"io/ioutil"
 	"net/http"
 	"testing"
@@ -207,3 +208,46 @@ func TestCreateBranch(t *testing.T) {
 	}
 
 }
+
+func TestCompareChanges(t *testing.T) {
+	source := "a24d87c887957954d6f872bac3676f12cb9f50a2"
+	target := "5d1eb44a2aae537e5fa649dce3ff8c306af1527e"
+	defer gock.Off()
+
+	gock.New(gockOrigin).
+		Get(fmt.Sprintf("/gateway/code/api/v1/repos/px7xd_BFRCi-pfWPYXVjvw/default/codeciintegration/thomas/+/compare/%s...%s", source, target)).
+		Reply(200).
+		Type("application/json").
+		File("testdata/gitdiff.json")
+
+	client, _ := New(gockOrigin, harnessOrg, harnessAccount, harnessProject)
+	client.Client = &http.Client{
+		Transport: &transport.Custom{
+			Before: func(r *http.Request) {
+				r.Header.Set("x-api-key", harnessPAT)
+			},
+		},
+	}
+	got, result, err := client.Git.CompareChanges(context.Background(), harnessRepo, source, target, scm.ListOptions{})
+	if err != nil {
+		t.Error(err)
+		return
+	}
+
+	if result.Status != 200 {
+		t.Errorf("Unexpected Results")
+	}
+
+	want := []*scm.Change{}
+	raw, _ := ioutil.ReadFile("testdata/gitdiff.json.golden")
+	wantErr := json.Unmarshal(raw, &want)
+	if wantErr != nil {
+		t.Error(wantErr)
+		return
+	}
+
+	if diff := cmp.Diff(got, want); diff != "" {
+		t.Errorf("Unexpected Results")
+		t.Log(diff)
+	}
+}

scm/driver/harness/testdata/gitdiff.json

@@ -0,0 +1,25 @@
+diff --git a/five b/five
+new file mode 100644
+index 0000000..54f9d6d
+--- /dev/null
++++ b/five
+@@ -0,0 +1 @@
++five
+diff --git a/two b/four
+similarity index 100%
+rename from two
+rename to four
+diff --git a/one b/one
+index 5626abf..9c0408b 100644
+--- a/one
++++ b/one
+@@ -1 +1,2 @@
+ one
++modified to two
+diff --git a/three b/three
+deleted file mode 100644
+index 2bdf67a..0000000
+--- a/three
++++ /dev/null
+@@ -1 +0,0 @@
+-three

scm/driver/harness/testdata/gitdiff.json.golden

@@ -0,0 +1,38 @@
+[
+    {
+        "Path": "five",
+        "Added": true,
+        "Renamed": false,
+        "Deleted": false,
+        "Sha": "",
+        "BlobID": "",
+        "PrevFilePath": ""
+    },
+    {
+        "Path": "four",
+        "Added": false,
+        "Renamed": true,
+        "Deleted": false,
+        "Sha": "",
+        "BlobID": "",
+        "PrevFilePath": "two"
+    },
+    {
+        "Path": "one",
+        "Added": false,
+        "Renamed": false,
+        "Deleted": false,
+        "Sha": "",
+        "BlobID": "",
+        "PrevFilePath": "one"
+    },
+    {
+        "Path": "",
+        "Added": false,
+        "Renamed": false,
+        "Deleted": true,
+        "Sha": "",
+        "BlobID": "",
+        "PrevFilePath": "three"
+    }
+]