From 51917559d364e55d8fa6ff0efb3a84aa9c283b83 Mon Sep 17 00:00:00 2001
From: Qu Xuan <quxuan@yunionyun.com>
Date: Thu, 9 Sep 2021 15:36:03 +0800
Subject: [PATCH] fix(region): sync apsara region

---
 pkg/multicloud/apsara/apsara.go | 42 +++++++++++++++++----------------
 pkg/multicloud/apsara/region.go |  5 +++-
 2 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/pkg/multicloud/apsara/apsara.go b/pkg/multicloud/apsara/apsara.go
index fc9cd41d34..0edc33ab96 100644
--- a/pkg/multicloud/apsara/apsara.go
+++ b/pkg/multicloud/apsara/apsara.go
@@ -71,7 +71,6 @@ type ApsaraClientConfig struct {
 	cpcfg        cloudprovider.ProviderConfig
 	accessKey    string
 	accessSecret string
-	endpoints    cloudprovider.SApsaraEndpoints
 	debug        bool
 }
 
@@ -79,8 +78,8 @@ func NewApsaraClientConfig(accessKey, accessSecret string, endpoint string, endp
 	cfg := &ApsaraClientConfig{
 		accessKey:    accessKey,
 		accessSecret: accessSecret,
-		endpoints:    endpoints,
 	}
+	cfg.cpcfg.SApsaraEndpoints = endpoints
 	cfg.cpcfg.URL = endpoint
 	return cfg
 }
@@ -132,32 +131,32 @@ func NewApsaraClient(cfg *ApsaraClientConfig) (*SApsaraClient, error) {
 func (self *SApsaraClient) getDomain(product string) string {
 	switch product {
 	case APSARA_PRODUCT_ECS:
-		if len(self.endpoints.EcsEndpoint) > 0 {
-			return self.endpoints.EcsEndpoint
+		if len(self.cpcfg.EcsEndpoint) > 0 {
+			return self.cpcfg.EcsEndpoint
 		}
 	case APSARA_PRODUCT_RAM:
-		if len(self.endpoints.RamEndpoint) > 0 {
-			return self.endpoints.RamEndpoint
+		if len(self.cpcfg.RamEndpoint) > 0 {
+			return self.cpcfg.RamEndpoint
 		}
 	case APSARA_PRODUCT_RDS:
-		if len(self.endpoints.RdsEndpoint) > 0 {
-			return self.endpoints.RdsEndpoint
+		if len(self.cpcfg.RdsEndpoint) > 0 {
+			return self.cpcfg.RdsEndpoint
 		}
 	case APSARA_PRODUCT_SLB:
-		if len(self.endpoints.SlbEndpoint) > 0 {
-			return self.endpoints.SlbEndpoint
+		if len(self.cpcfg.SlbEndpoint) > 0 {
+			return self.cpcfg.SlbEndpoint
 		}
 	case APSARA_PRODUCT_STS:
-		if len(self.endpoints.StsEndpoint) > 0 {
-			return self.endpoints.StsEndpoint
+		if len(self.cpcfg.StsEndpoint) > 0 {
+			return self.cpcfg.StsEndpoint
 		}
 	case APSARA_PRODUCT_VPC:
-		if len(self.endpoints.VpcEndpoint) > 0 {
-			return self.endpoints.VpcEndpoint
+		if len(self.cpcfg.VpcEndpoint) > 0 {
+			return self.cpcfg.VpcEndpoint
 		}
 	case APSARA_PRODUCT_KVSTORE:
-		if len(self.endpoints.KvsEndpoint) > 0 {
-			return self.endpoints.KvsEndpoint
+		if len(self.cpcfg.KvsEndpoint) > 0 {
+			return self.cpcfg.KvsEndpoint
 		}
 	}
 	return self.cpcfg.URL
@@ -312,8 +311,8 @@ func (self *SApsaraClient) trialRequest(apiName string, params map[string]string
 
 func (self *SApsaraClient) fetchRegions() error {
 	params := map[string]string{"AcceptLanguage": "zh-CN"}
-	if len(self.endpoints.DefaultRegion) > 0 {
-		params["RegionId"] = self.endpoints.DefaultRegion
+	if len(self.cpcfg.SApsaraEndpoints.DefaultRegion) > 0 {
+		params["RegionId"] = self.cpcfg.SApsaraEndpoints.DefaultRegion
 	}
 	body, err := self.ecsRequest("DescribeRegions", params)
 	if err != nil {
@@ -396,10 +395,13 @@ func (self *SApsaraClient) fetchBuckets() error {
 
 	ret := make([]cloudprovider.ICloudBucket, 0)
 	for _, bInfo := range result.Buckets {
-		regionId := bInfo.Location[4:]
+		regionId := bInfo.Location
+		if strings.HasPrefix(regionId, "oss-") {
+			regionId = regionId[4:]
+		}
 		region, err := self.getRegionByRegionId(regionId)
 		if err != nil {
-			log.Errorf("cannot find bucket's region %s", regionId)
+			log.Errorf("cannot find bucket %s region %s", bInfo.Name, regionId)
 			continue
 		}
 		b := SBucket{
diff --git a/pkg/multicloud/apsara/region.go b/pkg/multicloud/apsara/region.go
index afc3937df2..f6d3508986 100644
--- a/pkg/multicloud/apsara/region.go
+++ b/pkg/multicloud/apsara/region.go
@@ -942,7 +942,10 @@ func (region *SRegion) GetIBuckets() ([]cloudprovider.ICloudBucket, error) {
 	for i := range iBuckets {
 		loc := iBuckets[i].GetLocation()
 		// remove oss- prefix
-		if loc[4:] != region.GetId() {
+		if strings.HasPrefix(loc, "oss-") {
+			loc = loc[4:]
+		}
+		if loc != region.GetId() {
 			continue
 		}
 		ret = append(ret, iBuckets[i])