add private field Client.apiKeySet

Keep backward compatibility for users who emitted an empty X-Auth-Token (verbatim `X-Auth-Token: ` and end of line). Could happen in tests and whatnot. Signed-off-by: Jakub Bielecki <[email protected]>
equinixmetal-archive · Oct 28, 2022 · b386c0b · b386c0b
1 parent c8f9431
commit b386c0b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/clientopt.go b/clientopt.go
@@ -13,6 +13,7 @@ func WithAuth(consumerToken string, apiKey string) ClientOpt {
 	return func(c *Client) error {
 		c.ConsumerToken = consumerToken
 		c.APIKey = apiKey
+		c.apiKeySet = true
 
 		return nil
 	}

diff --git a/packngo.go b/packngo.go
@@ -90,6 +90,7 @@ type Client struct {
 	UserAgent     string
 	ConsumerToken string
 	APIKey        string
+	apiKeySet     bool
 	header        http.Header
 
 	RateLimit Rate
@@ -424,12 +425,14 @@ func NewClient(opts ...ClientOpt) (*Client, error) {
 		}
 	}
 
-	if c.APIKey == "" {
+	if !c.apiKeySet {
 		c.APIKey = os.Getenv(authTokenEnvVar)
-	}
 
-	if c.APIKey == "" {
-		return nil, fmt.Errorf("you must export %s", authTokenEnvVar)
+		if c.APIKey == "" {
+			return nil, fmt.Errorf("you must export %s", authTokenEnvVar)
+		}
+
+		c.apiKeySet = true
 	}
 
 	return c, nil