Always check env when building HCP Client (#673)

hashicorp · Nov 14, 2023 · 98b1d6b · 98b1d6b
1 parent 0ca1f76
commit 98b1d6b
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/internal/clients/client.go b/internal/clients/client.go
@@ -85,13 +85,11 @@ type ClientConfig struct {
 // NewClient creates a new Client that is capable of making HCP requests
 func NewClient(config ClientConfig) (*Client, error) {
 	// Build the HCP Config options
-	var opts []hcpConfig.HCPConfigOption
+	opts := []hcpConfig.HCPConfigOption{hcpConfig.FromEnv()}
 	if config.ClientID != "" && config.ClientSecret != "" {
 		opts = append(opts, hcpConfig.WithClientCredentials(config.ClientID, config.ClientSecret))
 	} else if config.CredentialFile != "" {
 		opts = append(opts, hcpConfig.WithCredentialFilePath(config.CredentialFile))
-	} else {
-		opts = append(opts, hcpConfig.FromEnv())
 	}
 
 	// Create the HCP Config