Merge branch 'dev' of https://github.com/azure/go-autorest into dev

Azure · Oct 17, 2019 · 0b055be · 0b055be
2 parents 056d5c6 + 6d8e7e7
commit 0b055be
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/autorest/azure/cli/profile.go b/autorest/azure/cli/profile.go
@@ -51,9 +51,13 @@ type User struct {
 
 const azureProfileJSON = "azureProfile.json"
 
+func configDir() string {
+	return os.Getenv("AZURE_CONFIG_DIR")
+}
+
 // ProfilePath returns the path where the Azure Profile is stored from the Azure CLI
 func ProfilePath() (string, error) {
-	if cfgDir := os.Getenv("AZURE_CONFIG_DIR"); cfgDir != "" {
+	if cfgDir := configDir(); cfgDir != "" {
 		return filepath.Join(cfgDir, azureProfileJSON), nil
 	}
 	return homedir.Expand("~/.azure/" + azureProfileJSON)

diff --git a/autorest/azure/cli/token.go b/autorest/azure/cli/token.go
@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
+	"path/filepath"
 	"regexp"
 	"runtime"
 	"strconv"
@@ -44,6 +45,8 @@ type Token struct {
 	UserID           string `json:"userId"`
 }
 
+const accessTokensJSON = "accessTokens.json"
+
 // ToADALToken converts an Azure CLI `Token`` to an `adal.Token``
 func (t Token) ToADALToken() (converted adal.Token, err error) {
 	tokenExpirationDate, err := ParseExpirationDate(t.ExpiresOn)
@@ -68,17 +71,19 @@ func (t Token) ToADALToken() (converted adal.Token, err error) {
 // AccessTokensPath returns the path where access tokens are stored from the Azure CLI
 // TODO(#199): add unit test.
 func AccessTokensPath() (string, error) {
-	// Azure-CLI allows user to customize the path of access tokens thorugh environment variable.
-	var accessTokenPath = os.Getenv("AZURE_ACCESS_TOKEN_FILE")
-	var err error
+	// Azure-CLI allows user to customize the path of access tokens through environment variable.
+	if accessTokenPath := os.Getenv("AZURE_ACCESS_TOKEN_FILE"); accessTokenPath != "" {
+		return accessTokenPath, nil
+	}
 
-	// Fallback logic to default path on non-cloud-shell environment.
-	// TODO(#200): remove the dependency on hard-coding path.
-	if accessTokenPath == "" {
-		accessTokenPath, err = homedir.Expand("~/.azure/accessTokens.json")
+	// Azure-CLI allows user to customize the path to Azure config directory through environment variable.
+	if cfgDir := configDir(); cfgDir != "" {
+		return filepath.Join(cfgDir, accessTokensJSON), nil
 	}
 
-	return accessTokenPath, err
+	// Fallback logic to default path on non-cloud-shell environment.
+	// TODO(#200): remove the dependency on hard-coding path.
+	return homedir.Expand("~/.azure/" + accessTokensJSON)
 }
 
 // ParseExpirationDate parses either a Azure CLI or CloudShell date into a time object