Only use specified HTTP client for AWS creds if one is passed in. (#3161

) Probably fixes #3159
hashicorp · Aug 14, 2017 · e2cad8a · e2cad8a
1 parent db646c2
commit e2cad8a
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/helper/awsutil/generate_credentials.go b/helper/awsutil/generate_credentials.go
@@ -68,7 +68,9 @@ func (c *CredentialsConfig) GenerateCredentialChain() (*credentials.Credentials,
 	if c.Region != "" {
 		def.Config.Region = aws.String(c.Region)
 	}
-	def.Config.HTTPClient = c.HTTPClient
+	if c.HTTPClient != nil {
+		def.Config.HTTPClient = c.HTTPClient
+	}
 
 	providers = append(providers, defaults.RemoteCredProvider(*def.Config, def.Handlers))