github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #47401 from justinsb/fix_39374

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 47922, 47195, 47241, 47095, 47401)

AWS: Set CredentialsChainVerboseErrors

This avoids a rather confusing error message.

Fix #39374

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-06-22 21:33:34 -07:00 committed by GitHub
commit be0b045072
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/cloudprovider/providers/aws/aws.go
View File

@ -504,10 +504,13 @@ func (p *awsSDKProvider) getCrossRequestRetryDelay(regionName string) *CrossRequ
} }
func (p *awsSDKProvider) Compute(regionName string) (EC2, error) { func (p *awsSDKProvider) Compute(regionName string) (EC2, error) {
service := ec2.New(session.New(&aws.Config{ awsConfig := &aws.Config{
Region: &regionName, Region: &regionName,
Credentials: p.creds, Credentials: p.creds,
})) }
awsConfig = awsConfig.WithCredentialsChainVerboseErrors(true)
service := ec2.New(session.New(awsConfig))
p.addHandlers(regionName, &service.Handlers) p.addHandlers(regionName, &service.Handlers)
@ -518,10 +521,13 @@ func (p *awsSDKProvider) Compute(regionName string) (EC2, error) {
} }
func (p *awsSDKProvider) LoadBalancing(regionName string) (ELB, error) { func (p *awsSDKProvider) LoadBalancing(regionName string) (ELB, error) {
elbClient := elb.New(session.New(&aws.Config{ awsConfig := &aws.Config{
Region: &regionName, Region: &regionName,
Credentials: p.creds, Credentials: p.creds,
})) }
awsConfig = awsConfig.WithCredentialsChainVerboseErrors(true)
elbClient := elb.New(session.New(awsConfig))
p.addHandlers(regionName, &elbClient.Handlers) p.addHandlers(regionName, &elbClient.Handlers)
@ -529,10 +535,13 @@ func (p *awsSDKProvider) LoadBalancing(regionName string) (ELB, error) {
} }
func (p *awsSDKProvider) Autoscaling(regionName string) (ASG, error) { func (p *awsSDKProvider) Autoscaling(regionName string) (ASG, error) {
client := autoscaling.New(session.New(&aws.Config{ awsConfig := &aws.Config{
Region: &regionName, Region: &regionName,
Credentials: p.creds, Credentials: p.creds,
})) }
awsConfig = awsConfig.WithCredentialsChainVerboseErrors(true)
client := autoscaling.New(session.New(awsConfig))
p.addHandlers(regionName, &client.Handlers) p.addHandlers(regionName, &client.Handlers)