Skip to content
This repository was archived by the owner on Dec 19, 2017. It is now read-only.

SharedAuth: don't rely on HOME, use go-homedir instead for Windows compat #231

Open
sinbad wants to merge 2 commits into
base: master
Choose a base branch
from
Open

SharedAuth: don't rely on HOME, use go-homedir instead for Windows compat #231

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ce7f9c
SharedAuth: use os/user to locate home directory instead of HOME for …
sinbad Feb 23, 2015
5086221
Replaced os/user with mitchellh/go-homedir to avoid cgo depencency
sinbad Feb 23, 2015
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
12 changes: 8 additions & 4 deletions aws/aws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ import (
"fmt"
"io/ioutil"
"os"
"path/filepath"

"github.com/mitchellh/go-homedir"
"github.com/vaughan0/go-ini"
)

Expand Down Expand Up @@ -355,12 +357,14 @@ func SharedAuth() (auth Auth, err error) {

var credentialsFile = os.Getenv("AWS_CREDENTIAL_FILE")
if credentialsFile == "" {
var homeDir = os.Getenv("HOME")
if homeDir == "" {
err = errors.New("Could not get HOME")
// Don't hard-code HOME env var, on Windows it's USERPROFILE, HOME may not be defined
// Use os/user instead for platform consistency
home, herr := homedir.Dir()
if herr != nil {
err = errors.New("Could not get user home directory")
return
}
credentialsFile = homeDir + "/.aws/credentials"
credentialsFile = filepath.Join(home, ".aws", "credentials")
}

file, err := ini.LoadFile(credentialsFile)
Expand Down