From 38018080cc765b9bee04da6cf5fbc7754cff5392 Mon Sep 17 00:00:00 2001
From: Qiu Jian <qiujian@yunionyun.com>
Date: Mon, 16 Nov 2020 12:57:54 +0800
Subject: [PATCH] fix: qcloud create bucket without appId

---
 pkg/multicloud/qcloud/bucket.go | 16 +++++++++++++---
 pkg/multicloud/qcloud/qcloud.go |  2 +-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/pkg/multicloud/qcloud/bucket.go b/pkg/multicloud/qcloud/bucket.go
index 15f424d4d8..3da6b0ffb4 100644
--- a/pkg/multicloud/qcloud/bucket.go
+++ b/pkg/multicloud/qcloud/bucket.go
@@ -39,7 +39,7 @@ const (
 type SBucket struct {
 	multicloud.SBaseBucket
 
-	AppId string
+	appId string
 
 	region *SRegion
 	zone   *SZone
@@ -54,7 +54,7 @@ func (b *SBucket) GetProjectId() string {
 }
 
 func (b *SBucket) GetGlobalId() string {
-	if b.AppId == b.region.client.appId {
+	if b.getAppId() == b.region.client.appId {
 		return b.Name
 	} else {
 		return b.getFullName()
@@ -141,8 +141,18 @@ func (b *SBucket) SetAcl(aclStr cloudprovider.TBucketACLType) error {
 	return nil
 }
 
+func (b *SBucket) getAppId() string {
+	if len(b.appId) > 0 {
+		return b.appId
+	}
+	if b.zone != nil {
+		return b.zone.region.client.appId
+	}
+	return b.region.client.appId
+}
+
 func (b *SBucket) getFullName() string {
-	return fmt.Sprintf("%s-%s", b.Name, b.AppId)
+	return fmt.Sprintf("%s-%s", b.Name, b.getAppId())
 }
 
 func (b *SBucket) getBucketUrlHost() string {
diff --git a/pkg/multicloud/qcloud/qcloud.go b/pkg/multicloud/qcloud/qcloud.go
index 81452de963..54610ab5de 100644
--- a/pkg/multicloud/qcloud/qcloud.go
+++ b/pkg/multicloud/qcloud/qcloud.go
@@ -787,7 +787,7 @@ func (client *SQcloudClient) fetchBuckets() error {
 		}
 		b := SBucket{
 			region:     region.(*SRegion),
-			AppId:      appId,
+			appId:      appId,
 			Name:       name,
 			Location:   bInfo.Region,
 			CreateDate: createAt,