opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11171 from ioito/automated-cherry-pick-of-#11170-upstream-release-3.7

Browse Source 
Automated cherry pick of #11170: fix(region): avoid aws session not assume role
This commit is contained in:
Zexi Li
2021-05-20 18:53:01 +08:00
committed by GitHub
parent c93624a093 78a9a1ea80
commit bba05e4702
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/multicloud/aws/aws.go
+8 -5
View File
@@ -106,7 +106,7 @@ type SAwsClient struct {
iregions []cloudprovider.ICloudRegion
iBuckets []cloudprovider.ICloudBucket
sessions map[string]*session.Session
sessions map[string]map[bool]*session.Session
}
func NewAwsClient(cfg *AwsClientConfig) (*SAwsClient, error) {
@@ -227,9 +227,12 @@ func (self *SAwsClient) fetchRegions() ([]SRegion, error) {
func (client *SAwsClient) getAwsSession(regionId string, assumeRole bool) (*session.Session, error) {
if client.sessions == nil {
client.sessions = make(map[string]*session.Session)
client.sessions = make(map[string]map[bool]*session.Session)
}
if sess, ok := client.sessions[regionId]; ok {
if _, ok := client.sessions[regionId]; !ok {
client.sessions[regionId] = make(map[bool]*session.Session)
}
if sess, ok := client.sessions[regionId][assumeRole]; ok {
return sess, nil
}
httpClient := client.cpcfg.AdaptiveTimeoutHttpClient()
@@ -263,8 +266,8 @@ func (client *SAwsClient) getAwsSession(regionId string, assumeRole bool) (*sess
s.Config.LogLevel = &logLevel
}
client.sessions[regionId] = s
return client.sessions[regionId], nil
client.sessions[regionId][assumeRole] = s
return client.sessions[regionId][assumeRole], nil
}
func (region *SRegion) getAwsElasticacheClient() (*elasticache.ElastiCache, error) {