grim/convey

golint "no else necessary for return" fixes

2018-01-14, Gary Kramlich
93014ac12e40
Parents 3a25f695c306
Children 310962069a9a
golint "no else necessary for return" fixes
3 files changed, 12 insertions(+), 12 deletions(-)
  • +2 -2
    path/path.go
  • +3 -3
    ssh/agent.go
  • +7 -7
    stages/stages.go
    • --- a/path/path.go Sun Jan 14 03:13:25 2018 -0600
    +++ b/path/path.go Sun Jan 14 03:13:49 2018 -0600
    @@ -86,10 +86,10 @@
    // if there was no error, we're done
    if err == nil {
    return filepath.Join(realPath, stripped), nil
    - } else {
    - realPath = dir
    }
    + realPath = dir
    +
    i++
    if i >= 10 {
    break
    --- a/ssh/agent.go Sun Jan 14 03:13:25 2018 -0600
    +++ b/ssh/agent.go Sun Jan 14 03:13:49 2018 -0600
    @@ -51,10 +51,10 @@
    // if the user doesn't care which key and we have a key, return true
    if len(keys) > 0 {
    return true, nil
    - } else {
    - // if the user doesn't care which key but we have no keys, return an error
    - return false, fmt.Errorf("no ssh keys available")
    }
    +
    + // if the user doesn't care which key but we have no keys, return an error
    + return false, fmt.Errorf("no ssh keys available")
    }
    uIdentity := strings.ToUpper(identity)
    --- a/stages/stages.go Sun Jan 14 03:13:25 2018 -0600
    +++ b/stages/stages.go Sun Jan 14 03:13:49 2018 -0600
    @@ -120,13 +120,13 @@
    // now return the result from the stageRes channel
    return <-stageRes
    - } else {
    - // serial execution
    - for _, taskName := range s.Tasks {
    - err := s.runTask(path, taskName, stageEnv, taskMap, st)
    - if err != nil {
    - return err
    - }
    + }
    +
    + // serial execution
    + for _, taskName := range s.Tasks {
    + err := s.runTask(path, taskName, stageEnv, taskMap, st)
    + if err != nil {
    + return err
    }
    }