Empty auth token env variables are equal to being unset

samcoe · samcoe · commit 2eb40f8a14e5 · 2020-11-12T10:09:08.000+03:00
diff --git a/cmd/gh/main.go b/cmd/gh/main.go
@@ -243,8 +243,8 @@ func basicClient(currentVersion string) (*api.Client, error) {
 	}
 	opts = append(opts, api.AddHeader("User-Agent", fmt.Sprintf("GitHub CLI %s", currentVersion)))
 
-	token, _, found := config.AuthTokenFromEnv(ghinstance.Default())
-	if !found {
+	token, _ := config.AuthTokenFromEnv(ghinstance.Default())
+	if token == "" {
 		if c, err := config.ParseDefaultConfig(); err == nil {
 			token, _ = c.Get(ghinstance.Default(), "oauth_token")
 		}
diff --git a/internal/config/from_env.go b/internal/config/from_env.go
@@ -30,8 +30,8 @@ func (c *envConfig) Hosts() ([]string, error) {
 			hasDefault = true
 		}
 	}
-	_, _, found := AuthTokenFromEnv(ghinstance.Default())
-	if (err != nil || !hasDefault) && found {
+	token, _ := AuthTokenFromEnv(ghinstance.Default())
+	if (err != nil || !hasDefault) && token != "" {
 		hosts = append([]string{ghinstance.Default()}, hosts...)
 		return hosts, nil
 	}
@@ -45,7 +45,7 @@ func (c *envConfig) Get(hostname, key string) (string, error) {
 
 func (c *envConfig) GetWithSource(hostname, key string) (string, string, error) {
 	if hostname != "" && key == "oauth_token" {
-		if token, env, found := AuthTokenFromEnv(hostname); found {
+		if token, env := AuthTokenFromEnv(hostname); token != "" {
 			return token, env, nil
 		}
 	}
@@ -55,28 +55,26 @@ func (c *envConfig) GetWithSource(hostname, key string) (string, string, error)
 
 func (c *envConfig) CheckWriteable(hostname, key string) error {
 	if hostname != "" && key == "oauth_token" {
-		if _, env, found := AuthTokenFromEnv(hostname); found {
+		if token, env := AuthTokenFromEnv(hostname); token != "" {
 			return fmt.Errorf("read-only token in %s cannot be modified", env)
 		}
 	}
 
 	return c.Config.CheckWriteable(hostname, key)
 }
 
-func AuthTokenFromEnv(hostname string) (string, string, bool) {
+func AuthTokenFromEnv(hostname string) (string, string) {
 	if ghinstance.IsEnterprise(hostname) {
-		if token, found := os.LookupEnv(GH_ENTERPRISE_TOKEN); found {
-			return token, GH_ENTERPRISE_TOKEN, found
+		if token := os.Getenv(GH_ENTERPRISE_TOKEN); token != "" {
+			return token, GH_ENTERPRISE_TOKEN
 		}
 
-		token, found := os.LookupEnv(GITHUB_ENTERPRISE_TOKEN)
-		return token, GITHUB_ENTERPRISE_TOKEN, found
+		return os.Getenv(GITHUB_ENTERPRISE_TOKEN), GITHUB_ENTERPRISE_TOKEN
 	}
 
-	if token, found := os.LookupEnv(GH_TOKEN); found {
-		return token, GH_TOKEN, found
+	if token := os.Getenv(GH_TOKEN); token != "" {
+		return token, GH_TOKEN
 	}
 
-	token, found := os.LookupEnv(GITHUB_TOKEN)
-	return token, GITHUB_TOKEN, found
+	return os.Getenv(GITHUB_TOKEN), GITHUB_TOKEN
 }
diff --git a/internal/config/from_env_test.go b/internal/config/from_env_test.go
@@ -260,29 +260,10 @@ func TestInheritEnv(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if tt.GITHUB_TOKEN != "" {
-				os.Setenv("GITHUB_TOKEN", tt.GITHUB_TOKEN)
-			} else {
-				os.Unsetenv("GITHUB_TOKEN")
-			}
-
-			if tt.GITHUB_ENTERPRISE_TOKEN != "" {
-				os.Setenv("GITHUB_ENTERPRISE_TOKEN", tt.GITHUB_ENTERPRISE_TOKEN)
-			} else {
-				os.Unsetenv("GITHUB_ENTERPRISE_TOKEN")
-			}
-
-			if tt.GH_TOKEN != "" {
-				os.Setenv("GH_TOKEN", tt.GH_TOKEN)
-			} else {
-				os.Unsetenv("GH_TOKEN")
-			}
-
-			if tt.GH_ENTERPRISE_TOKEN != "" {
-				os.Setenv("GH_ENTERPRISE_TOKEN", tt.GH_ENTERPRISE_TOKEN)
-			} else {
-				os.Unsetenv("GH_ENTERPRISE_TOKEN")
-			}
+			os.Setenv("GITHUB_TOKEN", tt.GITHUB_TOKEN)
+			os.Setenv("GITHUB_ENTERPRISE_TOKEN", tt.GITHUB_ENTERPRISE_TOKEN)
+			os.Setenv("GH_TOKEN", tt.GH_TOKEN)
+			os.Setenv("GH_ENTERPRISE_TOKEN", tt.GH_ENTERPRISE_TOKEN)
 
 			baseCfg := NewFromString(tt.baseConfig)
 			cfg := InheritEnv(baseCfg)

Original file line number	Diff line number	Diff line change
`@@ -243,8 +243,8 @@ func basicClient(currentVersion string) (*api.Client, error) {`
`243`	`243`	`}`
`244`	`244`	`opts = append(opts, api.AddHeader("User-Agent", fmt.Sprintf("GitHub CLI %s", currentVersion)))`
`245`	`245`
`246`		`- token, _, found := config.AuthTokenFromEnv(ghinstance.Default())`
`247`		`- if !found {`
	`246`	`+ token, _ := config.AuthTokenFromEnv(ghinstance.Default())`
	`247`	`+ if token == "" {`
`248`	`248`	`if c, err := config.ParseDefaultConfig(); err == nil {`
`249`	`249`	`token, _ = c.Get(ghinstance.Default(), "oauth_token")`
`250`	`250`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,8 @@ func (c *envConfig) Hosts() ([]string, error) {`
`30`	`30`	`hasDefault = true`
`31`	`31`	`}`
`32`	`32`	`}`
`33`		`- _, _, found := AuthTokenFromEnv(ghinstance.Default())`
`34`		`- if (err != nil \|\| !hasDefault) && found {`
	`33`	`+ token, _ := AuthTokenFromEnv(ghinstance.Default())`
	`34`	`+ if (err != nil \|\| !hasDefault) && token != "" {`
`35`	`35`	`hosts = append([]string{ghinstance.Default()}, hosts...)`
`36`	`36`	`return hosts, nil`
`37`	`37`	`}`
`@@ -45,7 +45,7 @@ func (c *envConfig) Get(hostname, key string) (string, error) {`
`45`	`45`
`46`	`46`	`func (c *envConfig) GetWithSource(hostname, key string) (string, string, error) {`
`47`	`47`	`if hostname != "" && key == "oauth_token" {`
`48`		`- if token, env, found := AuthTokenFromEnv(hostname); found {`
	`48`	`+ if token, env := AuthTokenFromEnv(hostname); token != "" {`
`49`	`49`	`return token, env, nil`
`50`	`50`	`}`
`51`	`51`	`}`
`@@ -55,28 +55,26 @@ func (c *envConfig) GetWithSource(hostname, key string) (string, string, error)`
`55`	`55`
`56`	`56`	`func (c *envConfig) CheckWriteable(hostname, key string) error {`
`57`	`57`	`if hostname != "" && key == "oauth_token" {`
`58`		`- if _, env, found := AuthTokenFromEnv(hostname); found {`
	`58`	`+ if token, env := AuthTokenFromEnv(hostname); token != "" {`
`59`	`59`	`return fmt.Errorf("read-only token in %s cannot be modified", env)`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`return c.Config.CheckWriteable(hostname, key)`
`64`	`64`	`}`
`65`	`65`
`66`		`-func AuthTokenFromEnv(hostname string) (string, string, bool) {`
	`66`	`+func AuthTokenFromEnv(hostname string) (string, string) {`
`67`	`67`	`if ghinstance.IsEnterprise(hostname) {`
`68`		`- if token, found := os.LookupEnv(GH_ENTERPRISE_TOKEN); found {`
`69`		`- return token, GH_ENTERPRISE_TOKEN, found`
	`68`	`+ if token := os.Getenv(GH_ENTERPRISE_TOKEN); token != "" {`
	`69`	`+ return token, GH_ENTERPRISE_TOKEN`
`70`	`70`	`}`
`71`	`71`
`72`		`- token, found := os.LookupEnv(GITHUB_ENTERPRISE_TOKEN)`
`73`		`- return token, GITHUB_ENTERPRISE_TOKEN, found`
	`72`	`+ return os.Getenv(GITHUB_ENTERPRISE_TOKEN), GITHUB_ENTERPRISE_TOKEN`
`74`	`73`	`}`
`75`	`74`
`76`		`- if token, found := os.LookupEnv(GH_TOKEN); found {`
`77`		`- return token, GH_TOKEN, found`
	`75`	`+ if token := os.Getenv(GH_TOKEN); token != "" {`
	`76`	`+ return token, GH_TOKEN`
`78`	`77`	`}`
`79`	`78`
`80`		`- token, found := os.LookupEnv(GITHUB_TOKEN)`
`81`		`- return token, GITHUB_TOKEN, found`
	`79`	`+ return os.Getenv(GITHUB_TOKEN), GITHUB_TOKEN`
`82`	`80`	`}`