/
patch.go
437 lines (401 loc) · 14 KB
/
patch.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
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
package operations
import (
"context"
"fmt"
"os"
"strings"
"github.com/evergreen-ci/evergreen"
"github.com/evergreen-ci/evergreen/model/patch"
restmodel "github.com/evergreen-ci/evergreen/rest/model"
"github.com/evergreen-ci/utility"
"github.com/mongodb/grip"
"github.com/pkg/errors"
"github.com/urfave/cli"
)
const (
patchDescriptionFlagName = "description"
patchVerboseFlagName = "verbose"
patchTriggerAliasFlag = "trigger-alias"
repeatDefinitionFlag = "repeat"
repeatFailedDefinitionFlag = "repeat-failed"
repeatPatchIdFlag = "repeat-patch"
includeModulesFlag = "include-modules"
autoDescriptionFlag = "auto-description"
)
func getPatchFlags(flags ...cli.Flag) []cli.Flag {
return mergeFlagSlices(
addProjectFlag(flags...),
addPatchFinalizeFlag(),
addVariantsFlag(),
addParameterFlag(),
addPatchBrowseFlag(),
addSyncBuildVariantsFlag(),
addSyncTasksFlag(),
addSyncStatusesFlag(),
addSyncTimeoutFlag(),
addLargeFlag(),
addSkipConfirmFlag(),
addRefFlag(),
addUncommittedChangesFlag(),
addReuseFlags(),
addPreserveCommitsFlag(
cli.BoolFlag{
Name: joinFlagNames(jsonFlagName, "j"),
Usage: "outputs the patch as a JSON object; suppresses warnings and confirmations",
},
cli.StringSliceFlag{
Name: joinFlagNames(tasksFlagName, "t"),
Usage: "task names (\"all\" for all tasks)",
},
cli.StringFlag{
Name: joinFlagNames(patchAliasFlagName, "a"),
Usage: "patch alias (set by project admin) or local alias (set individually in evergreen.yml)",
},
cli.StringFlag{
Name: joinFlagNames(patchDescriptionFlagName, "d"),
Usage: "description for the patch",
},
cli.BoolFlag{
Name: joinFlagNames(autoDescriptionFlag, "ad"),
Usage: "use last commit message as the patch description",
},
cli.BoolFlag{
Name: patchVerboseFlagName,
Usage: "show patch summary",
},
cli.StringSliceFlag{
Name: patchTriggerAliasFlag,
Usage: "patch trigger alias (set by project admin) specifying tasks from other projects",
},
cli.StringFlag{
Name: pathFlagName,
Usage: "path to an Evergreen project configuration file",
},
cli.StringSliceFlag{
Name: joinFlagNames(regexVariantsFlagName, "rv"),
Usage: "regex variant names",
},
cli.StringSliceFlag{
Name: joinFlagNames(regexTasksFlagName, "rt"),
Usage: "regex task names",
},
))
}
func Patch() cli.Command {
return cli.Command{
Name: "patch",
Before: mergeBeforeFuncs(
autoUpdateCLI,
setPlainLogger,
mutuallyExclusiveArgs(false, patchDescriptionFlagName, autoDescriptionFlag),
mutuallyExclusiveArgs(false, preserveCommitsFlag, uncommittedChangesFlag),
mutuallyExclusiveArgs(false, repeatDefinitionFlag, repeatPatchIdFlag, repeatFailedDefinitionFlag),
func(c *cli.Context) error {
catcher := grip.NewBasicCatcher()
for _, status := range utility.SplitCommas(c.StringSlice(syncStatusesFlagName)) {
if !utility.StringSliceContains(evergreen.SyncStatuses, status) {
catcher.Errorf("invalid sync status '%s'", status)
}
}
return catcher.Resolve()
},
),
Aliases: []string{"create-patch", "submit-patch"},
Usage: "submit a new patch to Evergreen",
Flags: getPatchFlags(
cli.BoolFlag{
Name: includeModulesFlag,
Usage: "if this boolean is set, Evergreen will include module diffs using changes from defined module paths",
},
),
Action: func(c *cli.Context) error {
confPath := c.Parent().String(confFlagName)
outputJSON := c.Bool(jsonFlagName)
args := c.Args()
params := &patchParams{
Project: c.String(projectFlagName),
Path: c.String(pathFlagName),
Variants: utility.SplitCommas(c.StringSlice(variantsFlagName)),
Tasks: utility.SplitCommas(c.StringSlice(tasksFlagName)),
RegexVariants: utility.SplitCommas(c.StringSlice(regexVariantsFlagName)),
RegexTasks: utility.SplitCommas(c.StringSlice(regexTasksFlagName)),
SyncBuildVariants: utility.SplitCommas(c.StringSlice(syncBuildVariantsFlagName)),
SyncTasks: utility.SplitCommas(c.StringSlice(syncTasksFlagName)),
SyncStatuses: utility.SplitCommas(c.StringSlice(syncStatusesFlagName)),
SyncTimeout: c.Duration(syncTimeoutFlagName),
SkipConfirm: c.Bool(skipConfirmFlagName) || outputJSON,
Description: c.String(patchDescriptionFlagName),
AutoDescription: c.Bool(autoDescriptionFlag),
Finalize: c.Bool(patchFinalizeFlagName),
Browse: c.Bool(patchBrowseFlagName),
ShowSummary: c.Bool(patchVerboseFlagName),
Large: c.Bool(largeFlagName),
Alias: c.String(patchAliasFlagName),
Ref: c.String(refFlagName),
Uncommitted: c.Bool(uncommittedChangesFlag),
PreserveCommits: c.Bool(preserveCommitsFlag),
TriggerAliases: utility.SplitCommas(c.StringSlice(patchTriggerAliasFlag)),
RepeatPatchId: c.String(repeatPatchIdFlag),
RepeatDefinition: c.Bool(repeatDefinitionFlag) || c.String(repeatPatchIdFlag) != "",
RepeatFailed: c.Bool(repeatFailedDefinitionFlag),
}
var err error
includeModules := c.Bool(includeModulesFlag)
paramsPairs := c.StringSlice(parameterFlagName)
params.Parameters, err = getParametersFromInput(paramsPairs)
if err != nil {
return err
}
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
conf, err := NewClientSettings(confPath)
if err != nil {
return errors.Wrap(err, "loading configuration")
}
params.PreserveCommits = params.PreserveCommits || conf.PreserveCommits
if !params.SkipConfirm {
var keepGoing bool
keepGoing, err = confirmUncommittedChanges("", params.PreserveCommits, params.Uncommitted || conf.UncommittedChanges)
if err != nil {
return errors.Wrap(err, "confirming uncommitted changes")
}
if keepGoing && utility.StringSliceContains(params.Variants, "all") && utility.StringSliceContains(params.Tasks, "all") {
keepGoing = confirm(`For some projects, scheduling all tasks/variants may result in a very large patch build. Continue?`, true)
}
if !keepGoing {
return errors.New("patch aborted")
}
}
comm, err := conf.setupRestCommunicator(ctx, !outputJSON)
if err != nil {
return errors.Wrap(err, "setting up REST communicator")
}
defer comm.Close()
ac, rc, err := conf.getLegacyClients()
if err != nil {
return errors.Wrap(err, "setting up legacy Evergreen client")
}
ref, err := params.validatePatchCommand(ctx, conf, ac, comm)
if err != nil {
return err
}
params.Description = params.getDescription()
hasTasks := len(params.Tasks) > 0 || len(params.RegexTasks) > 0
hasVariants := len(params.Variants) > 0 || len(params.RegexVariants) > 0
if hasTasks && !hasVariants {
grip.Warningf("warning - you specified tasks without specifying variants")
}
if hasVariants && !hasTasks {
grip.Warningf("warning - you specified variants without specifying tasks")
}
isReusing := params.RepeatDefinition || params.RepeatFailed
hasTasksOrVariants := len(params.Tasks) > 0 || len(params.Variants) > 0
hasRegexTasksOrVariants := len(params.RegexTasks) > 0 || len(params.RegexVariants) > 0
if isReusing && (hasTasksOrVariants || hasRegexTasksOrVariants || len(params.Alias) > 0) {
return errors.Errorf("can't define tasks, variants, regex tasks, regex variants or aliases when reusing previous patch's tasks and variants")
}
remote, err := gitGetRemote("", ref.Owner, ref.Repo)
if err != nil {
// TODO: DEVPROD-3740 Change this back to an error
grip.WarningWhen(!outputJSON, fmt.Sprintf("warning - you do not have a remote tracking your Evergreen project. The project to track is https://github.com/%s/%s", ref.Owner, ref.Repo))
}
diffData, err := loadGitData("", remote, ref.Branch, params.Ref, "", params.PreserveCommits, args...)
if err != nil {
return err
}
if err = params.validateSubmission(diffData); err != nil {
return err
}
var originalFinalize bool
// If including modules, don't finalize the patch until we've checked all modules for changes.
if includeModules {
originalFinalize = params.Finalize
params.Finalize = false
}
newPatch, err := params.createPatch(ac, diffData)
if err != nil {
return err
}
patchId := newPatch.Id.Hex()
if includeModules {
proj, err := rc.GetPatchedConfig(patchId)
if err != nil {
return err
}
for _, module := range proj.Modules {
modulePath, err := params.getModulePath(conf, module.Name)
if err != nil {
grip.Error(err)
continue
}
if err = addModuleToPatch(params, args, conf, newPatch, &module, modulePath); err != nil {
grip.ErrorWhen(!outputJSON, fmt.Sprintf("Error adding module '%s' to patch: %s", module.Name, err))
}
}
}
if originalFinalize {
if err = ac.FinalizePatch(patchId); err != nil {
return errors.Wrapf(err, "finalizing patch '%s'", patchId)
}
}
outputParams := outputPatchParams{
patches: []patch.Patch{*newPatch},
uiHost: conf.UIServerHost,
outputJSON: outputJSON,
}
if err = params.displayPatch(ac, outputParams); err != nil {
grip.Error(err)
}
params.setDefaultProject(conf)
return nil
},
}
}
func getParametersFromInput(params []string) ([]patch.Parameter, error) {
res := []patch.Parameter{}
catcher := grip.NewBasicCatcher()
for _, param := range params {
pair := strings.Split(param, "=")
if len(pair) < 2 {
catcher.Errorf("could not parse parameter '%s' in key=value format", param)
}
key := pair[0]
val := strings.Join(pair[1:], "=")
res = append(res, patch.Parameter{Key: key, Value: val})
}
return res, catcher.Resolve()
}
func PatchFile() cli.Command {
const (
baseFlagName = "base"
diffPathFlagName = "diff-file"
diffPatchIdFlagName = "diff-patchId"
)
return cli.Command{
Name: "patch-file",
Usage: "submit patch using a diff file",
Flags: getPatchFlags(
cli.StringFlag{
Name: joinFlagNames("base", "b"),
Usage: "githash of base",
},
cli.StringFlag{
Name: diffPathFlagName,
Usage: "path to a file for diff of the patch",
},
cli.StringFlag{
Name: diffPatchIdFlagName,
Usage: "patch id to fetch the full diff (including modules) from",
},
cli.StringFlag{
Name: patchAuthorFlag,
Usage: "optionally define the patch author by providing an Evergreen username; " +
"if not found or provided, will default to the submitter",
},
),
Before: mergeBeforeFuncs(
autoUpdateCLI,
mutuallyExclusiveArgs(false, patchDescriptionFlagName, autoDescriptionFlag),
mutuallyExclusiveArgs(false, diffPathFlagName, diffPatchIdFlagName),
mutuallyExclusiveArgs(false, baseFlagName, diffPatchIdFlagName),
),
Action: func(c *cli.Context) error {
diffPatchId := c.String(diffPatchIdFlagName)
diffFilePath := c.String(diffPathFlagName)
if diffPatchId == "" && diffFilePath != "" {
if _, err := os.Stat(diffFilePath); os.IsNotExist(err) {
return errors.Errorf("file '%s' does not exist", diffFilePath)
}
}
confPath := c.Parent().String(confFlagName)
params := &patchParams{
Project: c.String(projectFlagName),
Variants: utility.SplitCommas(c.StringSlice(variantsFlagName)),
Tasks: utility.SplitCommas(c.StringSlice(tasksFlagName)),
Alias: c.String(patchAliasFlagName),
SkipConfirm: c.Bool(skipConfirmFlagName),
Description: c.String(patchDescriptionFlagName),
AutoDescription: c.Bool(autoDescriptionFlag),
Finalize: c.Bool(patchFinalizeFlagName),
ShowSummary: c.Bool(patchVerboseFlagName),
Large: c.Bool(largeFlagName),
SyncTasks: utility.SplitCommas(c.StringSlice(syncTasksFlagName)),
PatchAuthor: c.String(patchAuthorFlag),
}
var err error
diffPath := c.String(diffPathFlagName)
base := c.String(baseFlagName)
paramsPairs := c.StringSlice(parameterFlagName)
params.Parameters, err = getParametersFromInput(paramsPairs)
if err != nil {
return err
}
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
conf, err := NewClientSettings(confPath)
if err != nil {
return errors.Wrap(err, "loading configuration")
}
comm, err := conf.setupRestCommunicator(ctx, true)
if err != nil {
return errors.Wrap(err, "setting up REST communicator")
}
defer comm.Close()
ac, _, err := conf.getLegacyClients()
if err != nil {
return errors.Wrap(err, "setting up legacy Evergreen client")
}
if _, err = params.validatePatchCommand(ctx, conf, ac, comm); err != nil {
return err
}
params.Description = params.getDescription()
var diffData localDiff
var rp *restmodel.APIRawPatch
if diffPatchId == "" {
fullPatch, err := os.ReadFile(diffPath)
if err != nil {
return errors.Wrapf(err, "reading diff file '%s'", diffPath)
}
diffData.fullPatch = string(fullPatch)
diffData.base = base
} else {
rp, err = comm.GetRawPatchWithModules(ctx, diffPatchId)
if err != nil {
return errors.Wrap(err, "getting raw patch with modules")
}
if rp == nil {
return errors.Wrap(err, "patch not found")
}
diffData.fullPatch = rp.Patch.Diff
diffData.base = rp.Patch.Githash
}
if err = params.validateSubmission(&diffData); err != nil {
return err
}
newPatch, err := params.createPatch(ac, &diffData)
if err != nil {
return err
}
if rp != nil {
for _, module := range rp.RawModules {
moduleParams := UpdatePatchModuleParams{
patchID: newPatch.Id.Hex(),
module: module.Name,
patch: module.Diff,
base: module.Githash,
}
if err = ac.UpdatePatchModule(moduleParams); err != nil {
return err
}
grip.Infof("Module '%s' updated.", module.Name)
}
}
outputParams := outputPatchParams{
patches: []patch.Patch{*newPatch},
uiHost: conf.UIServerHost,
outputJSON: c.Bool(jsonFlagName),
}
return params.displayPatch(ac, outputParams)
},
}
}