forked from kubernetes-retired/contrib
/
cherrypick-clear-after-merge.go
214 lines (178 loc) · 6.33 KB
/
cherrypick-clear-after-merge.go
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
/*
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package mungers
import (
"fmt"
"strings"
"k8s.io/contrib/mungegithub/features"
"k8s.io/contrib/mungegithub/github"
"github.com/golang/glog"
"github.com/spf13/cobra"
)
const (
clearAfterMergeName = "cherrypick-clear-after-merge"
)
// ClearPickAfterMerge will remove the the cherrypick-candidate label from
// any PR that does not have a 'release' milestone set.
type ClearPickAfterMerge struct {
features *features.Features
}
func init() {
RegisterMungerOrDie(&ClearPickAfterMerge{})
}
// Name is the name usable in --pr-mungers
func (c *ClearPickAfterMerge) Name() string { return clearAfterMergeName }
// RequiredFeatures is a slice of 'features' that must be provided
func (c *ClearPickAfterMerge) RequiredFeatures() []string { return []string{features.RepoFeatureName} }
// Initialize will initialize the munger
func (c *ClearPickAfterMerge) Initialize(config *github.Config, features *features.Features) error {
c.features = features
return nil
}
// EachLoop is called at the start of every munge loop
func (c *ClearPickAfterMerge) EachLoop() error { return nil }
// AddFlags will add any request flags to the cobra `cmd`
func (c *ClearPickAfterMerge) AddFlags(cmd *cobra.Command, config *github.Config) {}
func handleFound(obj *github.MungeObject, branch string) error {
msg := fmt.Sprintf("Commit found in the %q branch appears to be this PR. Removing the %q label. If this is an error find help to get your PR picked.", branch, cpCandidateLabel)
obj.WriteComment(msg)
obj.RemoveLabel(cpCandidateLabel)
return nil
}
// foundLog will return if the given `logString` exists on the branch in question.
// it will also return the actual logs for further processing
func (c *ClearPickAfterMerge) foundLog(branch string, logString string) (bool, string) {
args := []string{"merge-base", "origin/master", "origin/" + branch}
out, err := c.features.Repos.GitCommand(args)
base := string(out)
if err != nil {
glog.Errorf("Unable to find the fork point for branch %s. %s:%v", branch, base, err)
return false, ""
}
lines := strings.Split(base, "\n")
if len(lines) < 1 {
glog.Errorf("Found 0 lines splitting the results of git merge-base")
}
base = lines[0]
// if release-1.2 branched from master at abcdef123 this should result in:
// abcdef123..origin/release-1.2
logRefs := fmt.Sprintf("%s..origin/%s", base, branch)
args = []string{"log", "--pretty=tformat:%H%n%s%n%b", "--grep", logString, logRefs}
out, err = c.features.Repos.GitCommand(args)
logs := string(out)
if err != nil {
glog.Errorf("Error grepping logs out=%q: %v", logs, err)
return false, ""
}
glog.V(10).Infof("args:%v", args)
glog.V(10).Infof("Searching for %q in %q", logString, logs)
if !strings.Contains(logs, logString) {
return false, ""
}
return true, logs
}
// Can we find a commit in the changelog that looks like it was done using git cherry-pick -m1 -x ?
func (c *ClearPickAfterMerge) foundByPickDashX(obj *github.MungeObject, branch string) bool {
sha := obj.MergeCommit()
if sha == nil {
glog.Errorf("Unable to get SHA of merged PR %d", *obj.Issue.Number)
return false
}
cherrypickMsg := fmt.Sprintf("(cherry picked from commit %s)", *sha)
found, logs := c.foundLog(branch, cherrypickMsg)
if !found {
return false
}
// double check for the 'non -x' message
logMsg := fmt.Sprintf("Merge pull request #%d from ", *obj.Issue.Number)
if !strings.Contains(logs, logMsg) {
return false
}
glog.Infof("Found cherry-pick for %d using -x information in branch %q", *obj.Issue.Number, branch)
return true
}
// Can we find a commit in the changelog that looks like it was done using git cherry-pick -m1 ?
func (c *ClearPickAfterMerge) foundByPickWithoutDashX(obj *github.MungeObject, branch string) bool {
logMsg := fmt.Sprintf("Merge pull request #%d from ", *obj.Issue.Number)
found, _ := c.foundLog(branch, logMsg)
if found {
glog.Infof("Found cherry-pick for %d using log matching for `git cherry-pick` in branch %q", *obj.Issue.Number, branch)
}
return found
}
// Check that the commit messages for all commits in the PR are on the branch
func (c *ClearPickAfterMerge) foundByAllCommits(obj *github.MungeObject, branch string) bool {
commits, err := obj.GetCommits()
if err != nil {
glog.Infof("unable to get commits")
return false
}
for _, commit := range commits {
if commit.Commit == nil {
return false
}
if commit.Commit.Message == nil {
return false
}
found, _ := c.foundLog(branch, *commit.Commit.Message)
if !found {
return false
}
}
return true
}
// Can we find a commit in the changelog that looks like it was done using the hack/cherry_pick_pull.sh script ?
func (c *ClearPickAfterMerge) foundByScript(obj *github.MungeObject, branch string) bool {
logMsg := fmt.Sprintf("Cherry pick of #%d on %s.", *obj.Issue.Number, branch)
found, _ := c.foundLog(branch, logMsg)
if found {
glog.Infof("Found cherry-pick for %d using log matching for `hack/cherry_pick_pull.sh` in branch %q", *obj.Issue.Number, branch)
}
return found
}
// Munge is the workhorse the will actually make updates to the PR
func (c *ClearPickAfterMerge) Munge(obj *github.MungeObject) {
if !obj.IsPR() {
return
}
if !obj.HasLabel(cpCandidateLabel) {
return
}
if merged, err := obj.IsMerged(); !merged || err != nil {
return
}
releaseMilestone := obj.ReleaseMilestone()
if releaseMilestone == "" || len(releaseMilestone) != 4 {
glog.Errorf("Found invalid milestone: %q", releaseMilestone)
return
}
rel := releaseMilestone[1:]
branch := "release-" + rel
if c.foundByPickDashX(obj, branch) {
handleFound(obj, branch)
return
}
if c.foundByAllCommits(obj, branch) {
handleFound(obj, branch)
return
}
if c.foundByPickWithoutDashX(obj, branch) {
handleFound(obj, branch)
return
}
if c.foundByScript(obj, branch) {
handleFound(obj, branch)
return
}
return
}