Add color field to label struct

drone · Aug 19, 2020 · 1ccff59 · 1ccff59
1 parent 23aa7d5
commit 1ccff59
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/scm/driver/gitea/pr.go b/scm/driver/gitea/pr.go
@@ -96,7 +96,8 @@ type pr struct {
 	Created    time.Time  `json:"created_at"`
 	Updated    time.Time  `json:"updated_at"`
 	Labels     []struct {
-		Name string `json:"name"`
+		Name  string `json:"name"`
+		Color string `json:"color"`
 	} `json:"labels"`
 }
 
@@ -129,7 +130,8 @@ func convertPullRequest(src *pr) *scm.PullRequest {
 	var labels []scm.Label
 	for _, label := range src.Labels {
 		labels = append(labels, scm.Label{
-			Name: label.Name,
+			Name:  label.Name,
+			Color: label.Color,
 		})
 	}
 	return &scm.PullRequest{

diff --git a/scm/driver/github/pr.go b/scm/driver/github/pr.go
@@ -97,7 +97,8 @@ type pr struct {
 	CreatedAt time.Time   `json:"created_at"`
 	UpdatedAt time.Time   `json:"updated_at"`
 	Labels    []struct {
-		Name string `json:"name"`
+		Name  string `json:"name"`
+		Color string `json:"color"`
 	} `json:"labels"`
 }
 
@@ -129,7 +130,8 @@ func convertPullRequest(from *pr) *scm.PullRequest {
 	var labels []scm.Label
 	for _, label := range from.Labels {
 		labels = append(labels, scm.Label{
-			Name: label.Name,
+			Name:  label.Name,
+			Color: label.Color,
 		})
 	}
 	return &scm.PullRequest{

diff --git a/scm/driver/github/testdata/webhooks/pr_labeled.json b/scm/driver/github/testdata/webhooks/pr_labeled.json
@@ -55,7 +55,7 @@
         "node_id": "MDU6TGFiZWw2MzA2MzQ4MA==",
         "url": "https://api.github.com/repos/bradrydzewski/drone-test-go/labels/bug",
         "name": "bug",
-        "color": "fc2929",
+        "color": "fc2927",
         "default": true
       },
       {

diff --git a/scm/driver/github/testdata/webhooks/pr_labeled.json.golden b/scm/driver/github/testdata/webhooks/pr_labeled.json.golden
@@ -45,10 +45,12 @@
     "Updated": "2018-06-25T19:05:03Z",
     "labels": [
       {
-        "name": "bug"
+        "name": "bug",
+        "color": "fc2927"
       },
       {
-        "name": "documentation"
+        "name": "documentation",
+        "color": "fc2929"
       }
     ]
   },

diff --git a/scm/pr.go b/scm/pr.go
@@ -57,7 +57,8 @@ type (
 	}
 
 	Label struct {
-		Name string
+		Name  string
+		Color string
 	}
 
 	// PullRequestService provides access to pull request resources.