add label to automerge

Author: bivas

bot/actions/automerge/automerge.go

@@ -17,13 +17,21 @@ type MergeableEventData interface {
 	Merge(mergeMethod string)
 }
 
-func (a *action) Apply(config bot.Configuration, meta bot.EventData) {
-	mergeable, ok := meta.(MergeableEventData)
-	if !ok {
-		util.Logger.Warning("Event data does not support merge. Check your configurations")
-		a.err = fmt.Errorf("Event data does not support merge")
-		return
+func (a *action) merge(meta bot.EventData) {
+	if a.rule.Label == "" {
+		mergeable, ok := meta.(MergeableEventData)
+		if !ok {
+			util.Logger.Warning("Event data does not support merge. Check your configurations")
+			a.err = fmt.Errorf("Event data does not support merge")
+			return
+		}
+		mergeable.Merge(a.rule.Strategy)
+	} else {
+		meta.AddLabel(a.rule.Label)
 	}
+}
+
+func (a *action) Apply(config bot.Configuration, meta bot.EventData) {
 	approvals := 0
 	assignees := util.StringSet{}
 	assignees.AddAll(meta.GetAssignees())
@@ -37,8 +45,12 @@ func (a *action) Apply(config bot.Configuration, meta bot.EventData) {
 			approvals++
 		}
 	}
-	if approvals >= a.rule.Require {
-		mergeable.Merge(a.rule.Strategy)
+	if a.rule.Require == 0 && assignees.Len() == 0 {
+		util.Logger.Debug("All assignees have approved the PR - merging")
+		a.merge(meta)
+	} else if a.rule.Require > 0 && approvals >= a.rule.Require {
+		util.Logger.Debug("Got %d required approvals for PR - merging", a.rule.Require)
+		a.merge(meta)
 	}
 }
 
@@ -50,6 +62,7 @@ func (*factory) BuildAction(config map[string]interface{}) bot.Action {
 	if e := mapstructure.Decode(config, &item); e != nil {
 		panic(e)
 	}
+	item.Defaults()
 	return &action{rule: &item}
 }
 

bot/actions/automerge/automerge.md

@@ -15,7 +15,8 @@ None
 ## Options
 
 - `strategy` (optional) - which strategy to use when merging. can be `merge`, `squash` or `rebase` (default: `merge`)
-- `require` (optional) - the number of approvals required (default: **1**)
+- `require` (optional) - the number of approvals required (default: **0** meaning require all assignees to approve)
+- `label` (optional) - label the issue instead of merging (dry-run)
 
 ## Example
 ```yaml
@@ -24,5 +25,11 @@ rules:
       automerge:
         require: 2
         strategy: squash
-        
+```
+or
+```yaml
+rules:
+    example:
+      automerge:
+        label: approved
 ```

bot/actions/automerge/automerge_test.go

@@ -29,6 +29,18 @@ func TestNotCapableToMerge(t *testing.T) {
 	assert.NotNil(t, action.err, "should be unable to merge")
 }
 
+func TestShouldNotMergeMergeMissingApprovals(t *testing.T) {
+	action := action{rule: &rule{}}
+	action.rule.Defaults()
+	config := &mock.MockConfiguration{}
+	mockEventData := mock.MockEventData{Assignees: []string{"user1", "user2"}, Comments: []bot.Comment{
+		{Commenter: "user1", Comment: "approved"},
+	}}
+	meta := &mockMergableEventData{MockEventData: mockEventData}
+	action.Apply(config, meta)
+	assert.False(t, meta.merged, "should not be merged")
+}
+
 func TestCapableToMerge(t *testing.T) {
 	action := action{rule: &rule{}}
 	action.rule.Defaults()
@@ -78,3 +90,17 @@ func TestSameApprovedComment(t *testing.T) {
 	action.Apply(config, meta)
 	assert.False(t, meta.merged, "should not be merged")
 }
+
+func TestLabel(t *testing.T) {
+	action := action{rule: &rule{Label: "approved"}}
+	action.rule.Defaults()
+	config := &mock.MockConfiguration{}
+	mockEventData := mock.MockEventData{Assignees: []string{"user1"}, Origin: "user2", Comments: []bot.Comment{
+		{Commenter: "user1", Comment: "approved"},
+	}}
+	meta := &mockMergableEventData{MockEventData: mockEventData}
+	action.Apply(config, meta)
+	assert.False(t, meta.merged, "should not be merged")
+	assert.Len(t, meta.AddedLabels, 1, "should label and not merge")
+	assert.Equal(t, "approved", meta.AddedLabels[0], "approved")
+}

bot/actions/automerge/rule.go

@@ -21,12 +21,10 @@ var (
 type rule struct {
 	Require  int    `mapstructure:"require"`
 	Strategy string `mapstructure:"strategy"`
+	Label    string `mapstructure:"label"`
 }
 
 func (r *rule) Defaults() {
-	if r.Require == 0 {
-		r.Require = 1
-	}
 	if r.Strategy == "" {
 		r.Strategy = "merge"
 	} else {