@@ -150,9 +150,9 @@ func ensureUUID(groupsFile, uuid, group string) (string, error) {
150150 return "" , fmt .Errorf ("UUID, %s, already in use for group %s" , uuid , value )
151151 }
152152 // Group name already in use with different UUID
153- for cur_id , groupName := range groupsMap {
153+ for curID , groupName := range groupsMap {
154154 if groupName == group {
155- return "" , fmt .Errorf ("%s already used as group name for %s" , group , cur_id )
155+ return "" , fmt .Errorf ("%s already used as group name for %s" , group , curID )
156156 }
157157 }
158158
@@ -282,12 +282,12 @@ func labelAccessExistsFunc(groupName string) func(map[string][]string) bool {
282282 }
283283}
284284
285- func verifyInTree (workDir , host , cur_branch string , configMap map [string ][]string , verify func (map [string ][]string ) bool ) (bool , error ) {
285+ func verifyInTree (workDir , host , curBranch string , configMap map [string ][]string , verify func (map [string ][]string ) bool ) (bool , error ) {
286286 if verify (configMap ) {
287287 return true , nil
288288 } else if inheritance := getInheritedRepo (configMap ); inheritance != "" {
289- parent_branch := cur_branch + "_parent"
290- if err := fetchMetaConfig (host , inheritance , parent_branch , workDir ); err != nil {
289+ parentBranch := curBranch + "_parent"
290+ if err := fetchMetaConfig (host , inheritance , parentBranch , workDir ); err != nil {
291291 // This likely won't happen, but if the fail is due to switching branches, we want to fail
292292 if strings .Contains (err .Error (), "failed to switch" ) {
293293 return false , fmt .Errorf ("unable to fetch refs/meta/config for %s: %w" , inheritance , err )
@@ -300,28 +300,28 @@ func verifyInTree(workDir, host, cur_branch string, configMap map[string][]strin
300300 return false , fmt .Errorf ("failed to read project.config file: %w" , err )
301301 }
302302 newConfig , _ := configToMap (string (data ))
303- ret , err := verifyInTree (workDir , host , parent_branch , newConfig , verify )
303+ ret , err := verifyInTree (workDir , host , parentBranch , newConfig , verify )
304304 if err != nil {
305305 return false , fmt .Errorf ("failed to check if lines in config for %s/%s: %w" , host , inheritance , err )
306306 }
307- if err := execInDir (os .Stdout , os .Stderr , workDir , "git" , "checkout" , cur_branch ); err != nil {
308- return false , fmt .Errorf ("failed to checkout %s, %w" , cur_branch , err )
307+ if err := execInDir (os .Stdout , os .Stderr , workDir , "git" , "checkout" , curBranch ); err != nil {
308+ return false , fmt .Errorf ("failed to checkout %s, %w" , curBranch , err )
309309 }
310- if err := execInDir (os .Stdout , os .Stderr , workDir , "git" , "branch" , "-D" , parent_branch ); err != nil {
311- return false , fmt .Errorf ("failed to delete %s branch, %w" , parent_branch , err )
310+ if err := execInDir (os .Stdout , os .Stderr , workDir , "git" , "branch" , "-D" , parentBranch ); err != nil {
311+ return false , fmt .Errorf ("failed to delete %s branch, %w" , parentBranch , err )
312312 }
313313 return ret , nil
314314 }
315315 return false , nil
316316}
317317
318- func ensureProjectConfig (workDir , config , host , cur_branch , groupName string ) (string , error ) {
318+ func ensureProjectConfig (workDir , config , host , curBranch , groupName string ) (string , error ) {
319319 configMap , orderedKeys := configToMap (config )
320320
321321 // Check that prow automation robot has access to refs/*
322322 accessLines := []string {}
323323 readAccessLine := fmt .Sprintf (prowReadAccessFormat , groupName )
324- prowReadAccess , err := verifyInTree (workDir , host , cur_branch , configMap , lineInMatchingHeaderFunc (accessRefsRegex , readAccessLine ))
324+ prowReadAccess , err := verifyInTree (workDir , host , curBranch , configMap , lineInMatchingHeaderFunc (accessRefsRegex , readAccessLine ))
325325 if err != nil {
326326 return "" , fmt .Errorf ("failed to check if needed lines in config: %w" , err )
327327 }
@@ -331,7 +331,7 @@ func ensureProjectConfig(workDir, config, host, cur_branch, groupName string) (s
331331
332332 // Check that the line "label-verified" = ... group GROUPNAME exists under ANY header
333333 labelAccessLine := fmt .Sprintf (prowLabelAccessFormat , groupName )
334- prowLabelAccess , err := verifyInTree (workDir , host , cur_branch , configMap , labelAccessExistsFunc (groupName ))
334+ prowLabelAccess , err := verifyInTree (workDir , host , curBranch , configMap , labelAccessExistsFunc (groupName ))
335335 if err != nil {
336336 return "" , fmt .Errorf ("failed to check if needed lines in config: %w" , err )
337337 }
@@ -341,7 +341,7 @@ func ensureProjectConfig(workDir, config, host, cur_branch, groupName string) (s
341341 configMap , orderedKeys = addSection (accessHeader , configMap , orderedKeys , accessLines )
342342
343343 // We need to be less exact with the Label-Verified header so we are just checking if it exists anywhere:
344- labelExists , err := verifyInTree (workDir , host , cur_branch , configMap , labelExists )
344+ labelExists , err := verifyInTree (workDir , host , curBranch , configMap , labelExists )
345345 if err != nil {
346346 return "" , fmt .Errorf ("failed to check if needed lines in config: %w" , err )
347347 }
@@ -352,13 +352,13 @@ func ensureProjectConfig(workDir, config, host, cur_branch, groupName string) (s
352352
353353}
354354
355- func updatePojectConfig (workDir , host , cur_branch , groupName string ) error {
355+ func updatePojectConfig (workDir , host , curBranch , groupName string ) error {
356356 data , err := os .ReadFile (path .Join (workDir , projectConfigFile ))
357357 if err != nil {
358358 return fmt .Errorf ("failed to read project.config file: %w" , err )
359359 }
360360
361- newData , err := ensureProjectConfig (workDir , string (data ), host , cur_branch , groupName )
361+ newData , err := ensureProjectConfig (workDir , string (data ), host , curBranch , groupName )
362362 if err != nil {
363363 return fmt .Errorf ("failed to ensure updated project config: %w" , err )
364364 }
0 commit comments