Merge pull request #21100 from cjwagner/fix-blockade-compile

k8s-ci-robot · web-flow · commit f04e9eabffae · 2021-03-01T15:14:15.000-08:00
Fix blockade regexp compilation.
diff --git a/prow/plugins/config.go b/prow/plugins/config.go
@@ -1168,15 +1168,15 @@ func compileRegexpsAndDurations(pc *Configuration) error {
 	}
 	pc.CherryPickUnapproved.BranchRe = branchRe
 
-	for _, blockade := range pc.Blockades {
-		if blockade.BranchRegexp == nil {
+	for i := range pc.Blockades {
+		if pc.Blockades[i].BranchRegexp == nil {
 			continue
 		}
-		branchRe, err := regexp.Compile(*blockade.BranchRegexp)
+		branchRe, err := regexp.Compile(*pc.Blockades[i].BranchRegexp)
 		if err != nil {
-			return fmt.Errorf("failed to compile blockade branchregexp: %q, error: %v", *blockade.BranchRegexp, err)
+			return fmt.Errorf("failed to compile blockade branchregexp: %q, error: %v", *pc.Blockades[i].BranchRegexp, err)
 		}
-		blockade.BranchRe = branchRe
+		pc.Blockades[i].BranchRe = branchRe
 	}
 
 	commentRe, err := regexp.Compile(pc.Heart.CommentRegexp)

Original file line number	Diff line number	Diff line change
`@@ -1168,15 +1168,15 @@ func compileRegexpsAndDurations(pc *Configuration) error {`
`1168`	`1168`	`}`
`1169`	`1169`	`pc.CherryPickUnapproved.BranchRe = branchRe`
`1170`	`1170`
`1171`		`- for _, blockade := range pc.Blockades {`
`1172`		`- if blockade.BranchRegexp == nil {`
	`1171`	`+ for i := range pc.Blockades {`
	`1172`	`+ if pc.Blockades[i].BranchRegexp == nil {`
`1173`	`1173`	`continue`
`1174`	`1174`	`}`
`1175`		`- branchRe, err := regexp.Compile(*blockade.BranchRegexp)`
	`1175`	`+ branchRe, err := regexp.Compile(*pc.Blockades[i].BranchRegexp)`
`1176`	`1176`	`if err != nil {`
`1177`		`- return fmt.Errorf("failed to compile blockade branchregexp: %q, error: %v", *blockade.BranchRegexp, err)`
	`1177`	`+ return fmt.Errorf("failed to compile blockade branchregexp: %q, error: %v", *pc.Blockades[i].BranchRegexp, err)`
`1178`	`1178`	`}`
`1179`		`- blockade.BranchRe = branchRe`
	`1179`	`+ pc.Blockades[i].BranchRe = branchRe`
`1180`	`1180`	`}`
`1181`	`1181`
`1182`	`1182`	`commentRe, err := regexp.Compile(pc.Heart.CommentRegexp)`