Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix multiple ssh key #1338

Merged
merged 2 commits into from
May 7, 2019
Merged

fix multiple ssh key #1338

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e868ba
fix multiple ssh key
almariah Apr 24, 2019
a7563e4
use MkdirAll instead of Mkdir for sshDir
almariah May 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions workflow/artifacts/git/git.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,20 @@ func writePrivateKey(key string, insecureIgnoreHostKey bool) error {
return errors.InternalWrapError(err)
}
sshDir := fmt.Sprintf("%s/.ssh", usr.HomeDir)
err = os.Mkdir(sshDir, 0700)
if err != nil {
return errors.InternalWrapError(err)

if _, err = os.Stat(sshDir); err != nil {

if os.IsNotExist(err) {

err = os.Mkdir(sshDir, 0700)
if err != nil {
return errors.InternalWrapError(err)
}

} else {
return errors.InternalWrapError(err)
}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should just change os.Mkdir to os.MkdirAll which is an no-op if the directory already exists. The fix would then just be a one line change.

}

if insecureIgnoreHostKey {
Expand Down