address review comments

Author: takirala

scm/driver/gitea/pr.go

@@ -126,9 +126,11 @@ func convertPullRequests(src []*pr) []*scm.PullRequest {
 }
 
 func convertPullRequest(src *pr) *scm.PullRequest {
-	var labels []string
+	var labels []scm.Label
 	for _, label := range src.Labels {
-		labels = append(labels, label.Name)
+		labels = append(labels, scm.Label{
+			Name: label.Name,
+		})
 	}
 	return &scm.PullRequest{
 		Number:  src.Number,

scm/driver/github/pr.go

@@ -126,9 +126,11 @@ func convertPullRequestList(from []*pr) []*scm.PullRequest {
 }
 
 func convertPullRequest(from *pr) *scm.PullRequest {
-	var labels []string
+	var labels []scm.Label
 	for _, label := range from.Labels {
-		labels = append(labels, label.Name)
+		labels = append(labels, scm.Label{
+			Name: label.Name,
+		})
 	}
 	return &scm.PullRequest{
 		Number: from.Number,

scm/driver/github/testdata/webhooks/pr_labeled.json

@@ -57,6 +57,14 @@
         "name": "bug",
         "color": "fc2929",
         "default": true
+      },
+      {
+        "id": 63063480,
+        "node_id": "MDU6TGFiZWw2MzA2MzQ4MA==",
+        "url": "https://api.github.com/repos/bradrydzewski/drone-test-go/labels/bug",
+        "name": "documentation",
+        "color": "fc2929",
+        "default": true
       }
     ],
     "milestone": null,

scm/driver/github/testdata/webhooks/pr_labeled.json.golden

@@ -43,7 +43,14 @@
     },
     "Created": "2018-06-22T23:54:09Z",
     "Updated": "2018-06-25T19:05:03Z",
-    "labels": ["bug"]
+    "labels": [
+      {
+        "name": "bug"
+      },
+      {
+        "name": "documentation"
+      }
+    ]
   },
   "Sender": {
     "Login": "bradrydzewski",

scm/driver/gitlab/pr.go

@@ -133,6 +133,12 @@ func convertPullRequestList(from []*pr) []*scm.PullRequest {
 }
 
 func convertPullRequest(from *pr) *scm.PullRequest {
+	var labels []scm.Label
+	for _, label := range from.Labels {
+		labels = append(labels, scm.Label{
+			Name: label,
+		})
+	}
 	return &scm.PullRequest{
 		Number: from.Number,
 		Title:  from.Title,
@@ -151,7 +157,7 @@ func convertPullRequest(from *pr) *scm.PullRequest {
 		},
 		Created: from.Created,
 		Updated: from.Updated,
-		Labels:  from.Labels,
+		Labels:  labels,
 	}
 }
 

scm/driver/gitlab/testdata/merge.json

@@ -22,7 +22,7 @@
     "assignee": null,
     "source_project_id": 32732,
     "target_project_id": 32732,
-    "labels": [],
+    "labels": ["bug", "documentation"],
     "work_in_progress": false,
     "milestone": null,
     "merge_when_pipeline_succeeds": false,

scm/driver/gitlab/testdata/merge.json.golden

@@ -17,5 +17,12 @@
     },
     "Created": "2015-12-18T18:29:53.563Z",
     "Updated": "2015-12-18T18:30:22.522Z",
-    "Labels" : []
+    "Labels": [
+        {
+            "name": "bug"
+        },
+        {
+            "name": "documentation"
+        }
+    ]
 }

scm/driver/gitlab/testdata/merges.json

@@ -23,7 +23,7 @@
         "assignee": null,
         "source_project_id": 32732,
         "target_project_id": 32732,
-        "labels": [],
+        "labels": ["bug", "documentation"],
         "work_in_progress": false,
         "milestone": null,
         "merge_when_pipeline_succeeds": false,

scm/driver/gitlab/testdata/merges.json.golden

@@ -18,6 +18,13 @@
         },
         "Created": "2015-12-18T18:29:53.563Z",
         "Updated": "2015-12-18T18:30:22.522Z",
-        "Labels": []
+        "Labels": [
+            {
+                "name": "bug"
+            },
+            {
+                "name": "documentation"
+            }
+        ]
     }
 ]

scm/pr.go

@@ -28,7 +28,7 @@ type (
 		Author  User
 		Created time.Time
 		Updated time.Time
-		Labels  []string
+		Labels  []Label
 	}
 
 	// PullRequestInput provides the input fields required for creating a pull request.
@@ -56,6 +56,10 @@ type (
 		Deleted bool
 	}
 
+	Label struct {
+		Name string
+	}
+
 	// PullRequestService provides access to pull request resources.
 	PullRequestService interface {
 		// Find returns the repository pull request by number.