opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 10:46:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

support aws china

Browse Source
This commit is contained in:
TangBin
2018-11-03 17:31:46 +08:00
parent 69c14a20b1
commit bab62348fc
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/awscli/main.go
+2 -1
View File
@@ -14,6 +14,7 @@ import (
type BaseOptions struct {
Help bool `help:"Show help"`
AccessUrl string `help:"Access key" default:"$AWS_ACCESS_URL" choices:"ChinaCloud|InternationalCloud"`
AccessKey string `help:"Access key" default:"$AWS_ACCESS_KEY"`
Secret string `help:"Secret" default:"$AWS_SECRET"`
RegionId string `help:"RegionId" default:"$AWS_REGION"`
@@ -69,7 +70,7 @@ func newClient(options *BaseOptions) (*aws.SRegion, error) {
return nil, fmt.Errorf("Missing secret")
}
cli, err := aws.NewAwsClient("", "", options.AccessKey, options.Secret)
cli, err := aws.NewAwsClient("", "", options.AccessUrl,options.AccessKey, options.Secret)
if err != nil {
return nil, err
}
pkg/util/aws/aws.go
+13 -4
View File
@@ -15,20 +15,22 @@ const (
CLOUD_PROVIDER_AWS = models.CLOUD_PROVIDER_AWS
CLOUD_PROVIDER_AWS_CN = "AWS"
AWS_DEFAULT_REGION = "us-west-1"
AWS_INTERNATIONAL_DEFAULT_REGION = "us-west-1"
AWS_CHINA_DEFAULT_REGION = "cn-north-1"
AWS_API_VERSION = "2018-10-10"
)
type SAwsClient struct {
providerId string
providerName string
accessUrl string // 服务区域 ChinaCloud | InternationalCloud
accessKey string
secret string
iregions []cloudprovider.ICloudRegion
}
func NewAwsClient(providerId string, providerName string, accessKey string, secret string) (*SAwsClient, error) {
client := SAwsClient{providerId: providerId, providerName: providerName, accessKey: accessKey, secret: secret}
func NewAwsClient(providerId string, providerName string, accessUrl string, accessKey string, secret string) (*SAwsClient, error) {
client := SAwsClient{providerId: providerId, providerName: providerName, accessUrl: accessUrl, accessKey: accessKey, secret: secret}
err := client.fetchRegions()
if err != nil {
return nil, err
@@ -37,8 +39,15 @@ func NewAwsClient(providerId string, providerName string, accessKey string, secr
}
func (self *SAwsClient) getDefaultSession() (*session.Session, error) {
defaultRegion := AWS_INTERNATIONAL_DEFAULT_REGION
switch self.accessKey {
case "InternationalCloud":
defaultRegion = AWS_INTERNATIONAL_DEFAULT_REGION
case "ChinaCloud":
defaultRegion = AWS_CHINA_DEFAULT_REGION
}
return session.NewSession(&sdk.Config{
Region: sdk.String(AWS_DEFAULT_REGION),
Region: sdk.String(defaultRegion),
Credentials: credentials.NewStaticCredentials(self.accessKey, self.secret, ""),
})
}
pkg/util/aws/provider/provider.go
+1 -1
View File
@@ -14,7 +14,7 @@ func (self *SAwsProviderFactory) GetId() string {
}
func (self *SAwsProviderFactory) GetProvider(providerId, providerName, url, account, secret string) (cloudprovider.ICloudProvider, error) {
client, err := aws.NewAwsClient(providerId, providerName, account, secret)
client, err := aws.NewAwsClient(providerId, providerName, url, account, secret)
if err != nil {
return nil, err
}