Change ParseConfigFile to use full path+file instead of just path

buzzsurfr · Mar 4, 2020 · 142f1a9 · 142f1a9
1 parent 23c39bb
commit 142f1a9
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/cloud/aws/profile.go b/cloud/aws/profile.go
@@ -4,6 +4,7 @@ import (
 	"errors"
 	"os"
 	"os/exec"
+	"path/filepath"
 	"sort"
 
 	"github.com/aws/aws-sdk-go/aws"
@@ -112,7 +113,7 @@ func FromConfigFile(findDefault bool) (Profiles, error) {
 	}
 
 	// Parse AWS config file
-	profiles, err = parseConfigFile(awsConfigPath, findDefault)
+	profiles, err = parseConfigFile(filepath.Join(awsConfigPath, "credentials"), findDefault)
 	if err != nil {
 		return Profiles{}, err
 	}
@@ -127,9 +128,8 @@ func parseConfigFile(path string, findDefault bool) (Profiles, error) {
 	var profiles Profiles
 
 	v := viper.New()
-	v.SetConfigName("credentials")
+	v.SetConfigFile(path)
 	v.SetConfigType("ini")
-	v.AddConfigPath(path)
 	err := v.ReadInConfig()
 	if err != nil {
 		return profiles, err // Returning profiles since it's empty here