opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-01 15:07:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(region): sku.meta use global proxy

Browse Source
This commit is contained in:
Qu Xuan
2020-12-24 17:22:43 +08:00
parent 9868addd4d
commit a8cc140b52
2 changed files with 10 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/skus_tools.go
+4 -1
View File
@@ -414,7 +414,10 @@ func SyncServerSkusByRegion(ctx context.Context, userCred mcclient.TokenCredenti
func FetchSkuResourcesMeta() (*SSkuResourcesMeta, error) {
s := auth.GetAdminSession(context.Background(), options.Options.Region, "")
meta, err := modules.OfflineCloudmeta.GetSkuSourcesMeta(s)
transport := httputils.GetTransport(true)
transport.Proxy = options.Options.HttpTransportProxyFunc()
client := &http.Client{Transport: transport}
meta, err := modules.OfflineCloudmeta.GetSkuSourcesMeta(s, client)
if err != nil {
return nil, errors.Wrap(err, "fetchSkuSourceUrls.GetSkuSourcesMeta")
}
pkg/mcclient/modules/mod_skus.go
+6 -22
View File
@@ -15,16 +15,16 @@
package modules
import (
"context"
"fmt"
"io/ioutil"
"net/http"
"strings"
"yunion.io/x/jsonutils"
"yunion.io/x/pkg/errors"
"yunion.io/x/onecloud/pkg/mcclient"
"yunion.io/x/onecloud/pkg/mcclient/modulebase"
"yunion.io/x/onecloud/pkg/util/httputils"
)
type SkusManager struct {
@@ -90,28 +90,12 @@ func (self *SkusManager) GetSkus(s *mcclient.ClientSession, providerId, regionId
return ret, nil
}
func (self *OfflineCloudmetaManager) GetSkuSourcesMeta(s *mcclient.ClientSession) (jsonutils.JSONObject, error) {
func (self *OfflineCloudmetaManager) GetSkuSourcesMeta(s *mcclient.ClientSession, client *http.Client) (jsonutils.JSONObject, error) {
baseUrl, err := s.GetServiceVersionURL(self.ServiceType(), self.EndpointType(), self.GetApiVersion())
if err != nil {
return nil, err
}
baseUrl = strings.TrimLeft(baseUrl, "/")
metaUrl := strings.Join([]string{baseUrl, "sku.meta"}, "/")
resp, err := http.Get(metaUrl)
if err != nil {
return nil, errors.Wrap(err, "OfflineCloudmetaManager.GetSkuSourcesMeta.Get")
}
defer resp.Body.Close()
content, err := ioutil.ReadAll(resp.Body)
if err != nil {
return nil, errors.Wrap(err, "OfflineCloudmetaManager.GetSkuSourcesMeta.ReadAll")
}
meta, err := jsonutils.Parse(content)
if err != nil {
return nil, errors.Wrap(err, "OfflineCloudmetaManager.GetSkuSourcesMeta.Parse")
}
return meta, nil
url := strings.TrimSuffix(baseUrl, "/") + "/sku.meta"
_, body, err := httputils.JSONRequest(client, context.TODO(), "GET", url, nil, nil, false)
return body, err
}