fix(region): currency rate exchange (#20335)

yunionio · May 21, 2024 · 78a1832 · 78a1832
1 parent f91ceb8
commit 78a1832
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/util/yunionmeta/meta.go b/pkg/util/yunionmeta/meta.go
@@ -115,15 +115,15 @@ func (self *SSkuResourcesMeta) head(url string) (http.Header, jsonutils.JSONObje
 	return _header, resp, err
 }
 
-func (self *SSkuResourcesMeta) GetCurrencyRate(currency string) (float64, error) {
-	url := fmt.Sprintf("%s/%s", self.CurrencyExchangeBase, currency)
+func (self *SSkuResourcesMeta) GetCurrencyRate(src, dest string) (float64, error) {
+	url := fmt.Sprintf("%s/%s-%s", self.CurrencyExchangeBase, src, dest)
 	header, _, err := self.head(url)
 	if err != nil {
 		return 0.0, errors.Wrapf(err, "head %s", url)
 	}
 	rate := header.Get("x-oss-meta-rate")
 	if len(rate) == 0 {
-		return 0.0, errors.Wrapf(cloudprovider.ErrNotFound, "x-oss-meta-rate %s", currency)
+		return 0.0, errors.Wrapf(cloudprovider.ErrNotFound, "x-oss-meta-rate %s -> %s", src, dest)
 	}
 	return strconv.ParseFloat(rate, 64)
 }

diff --git a/pkg/util/yunionmeta/meta_test.go b/pkg/util/yunionmeta/meta_test.go
@@ -29,7 +29,7 @@ func TestCurrencyRate(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Unmarshal meta error: %v", err)
 	}
-	rate, err := meta.GetCurrencyRate("USD")
+	rate, err := meta.GetCurrencyRate("CNY", "USD")
 	if err != nil {
 		t.Fatalf("get used rate error: %v", rate)
 	}