Merge pull request #856 from ioito/hotfix/qx-qcloud-query-cache

fix(qcloud): remove cache from qcloud
yunionio · Apr 7, 2024 · c86e783 · c86e783
2 parents bac128c + f96a13d
commit c86e783
Show file tree

Hide file tree

Showing 9 changed files with 199 additions and 337 deletions.
diff --git a/pkg/multicloud/qcloud/host.go b/pkg/multicloud/qcloud/host.go
@@ -77,13 +77,7 @@ func (self *SHost) _createVM(name, hostname string, imgId string, sysDisk cloudp
 	publicIpBw int, publicIpChargeType cloudprovider.TElasticipChargeType,
 	tags map[string]string, osType string,
 ) (string, error) {
-	net := self.zone.getNetworkById(networkId)
-	if net == nil {
-		return "", fmt.Errorf("invalid network ID %s", networkId)
-	}
-
 	var err error
-
 	keypair := ""
 	if len(publicKey) > 0 {
 		keypair, err = self.zone.region.syncKeypair(publicKey)

diff --git a/pkg/multicloud/qcloud/instance.go b/pkg/multicloud/qcloud/instance.go
@@ -214,7 +214,7 @@ func (self *SInstance) GetInstanceType() string {
 }
 
 func (self *SInstance) getVpc() (*SVpc, error) {
-	return self.host.zone.region.getVpc(self.VirtualPrivateCloud.VpcId)
+	return self.host.zone.region.GetVpc(self.VirtualPrivateCloud.VpcId)
 }
 
 func (self *SInstance) GetIDisks() ([]cloudprovider.ICloudDisk, error) {

diff --git a/pkg/multicloud/qcloud/qcloud.go b/pkg/multicloud/qcloud/qcloud.go
@@ -18,7 +18,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/url"
 	"strconv"
@@ -436,11 +436,11 @@ func (client *SQcloudClient) getSdkClient(regionId string) (*common.Client, erro
 	httpClient := client.cpcfg.AdaptiveTimeoutHttpClient()
 	ts, _ := httpClient.Transport.(*http.Transport)
 	cli.WithHttpTransport(cloudprovider.GetCheckTransport(ts, func(req *http.Request) (func(resp *http.Response) error, error) {
-		body, err := ioutil.ReadAll(req.Body)
+		body, err := io.ReadAll(req.Body)
 		if err != nil {
 			return nil, errors.Wrapf(err, "ioutil.ReadAll")
 		}
-		req.Body = ioutil.NopCloser(bytes.NewBuffer(body))
+		req.Body = io.NopCloser(bytes.NewBuffer(body))
 		params, err := url.ParseQuery(string(body))
 		if err != nil {
 			return nil, errors.Wrapf(err, "ParseQuery(%s)", string(body))
@@ -807,7 +807,7 @@ func (client *SQcloudClient) fetchBuckets() error {
 		}
 		name := bInfo.Name[:slashPos]
 		region, err := client.getIRegionByRegionId(bInfo.Region)
-		var zone cloudprovider.ICloudZone
+		var zone *SZone = nil
 		if err != nil {
 			log.Errorf("fail to find region %s", bInfo.Region)
 			// possibly a zone, try zone
@@ -824,10 +824,12 @@ func (client *SQcloudClient) fetchBuckets() error {
 				continue
 			}
 			zoneId := bInfo.Region
-			zone, _ = region.(*SRegion).getZoneById(bInfo.Region)
-			if zone != nil {
-				zoneId = zone.GetId()
+			zone, err = region.(*SRegion).getZoneById(bInfo.Region)
+			if err != nil {
+				log.Errorf("fail to find zone %s", zoneId)
+				continue
 			}
+			zoneId = zone.GetId()
 			log.Debugf("find zonal bucket %s", zoneId)
 		}
 		b := SBucket{
@@ -838,7 +840,7 @@ func (client *SQcloudClient) fetchBuckets() error {
 			CreateDate: createAt,
 		}
 		if zone != nil {
-			b.zone = zone.(*SZone)
+			b.zone = zone
 		}
 		ret = append(ret, &b)
 	}