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 #5537 from ioito/automated-cherry-pick-of-#5536-upstream-release-3.1

Browse Source 
Automated cherry pick of #5536: fix: 修复谷歌云 cloud-provider-clirc 显示错误问题
This commit is contained in:
yunion-ci-robot
2020-03-17 08:13:14 +08:00
committed by GitHub
parent cafc8dedc7 0f31a7d479
commit 892b769d3a
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/multicloud/google/provider/provider.go
+17 -3
View File
@@ -125,11 +125,25 @@ func (self *SGoogleProviderFactory) GetProvider(providerId, providerName, url, a
}, nil
}
func parseAccount(account, secret string) (projectId string, clientEmail string, privateKey string, privateKeyId string) {
accountInfo := strings.Split(account, "/")
if len(accountInfo) == 2 {
projectId, clientEmail = accountInfo[0], accountInfo[1]
}
secretInfo := strings.Split(secret, "/")
if len(secretInfo) >= 2 {
privateKeyId, privateKey = secretInfo[0], strings.Join(secretInfo[1:], "/")
}
return
}
func (self *SGoogleProviderFactory) GetClientRC(url, account, secret string) (map[string]string, error) {
projectId, clientEmail, privateKey, privateKeyId := parseAccount(account, secret)
return map[string]string{
"ALIYUN_ACCESS_KEY": account,
"ALIYUN_SECRET": secret,
"ALIYUN_REGION": google.GOOGLE_DEFAULT_REGION,
"GOOGLE_CLIENT_EMAIL": clientEmail,
"GOOGLE_PROJECT_ID": projectId,
"GOOGLE_PRIVATE_KEY_ID": privateKeyId,
"GOOGLE_PRIVATE_KEY": privateKey,
}, nil
}