Bläddra i källkod

updated url in gcp provider to include currencyCode

Calvin Wang 5 år sedan
förälder
incheckning
de5a3f14ee
1 ändrade filer med 7 tillägg och 3 borttagningar
  1. 7 3
      pkg/cloud/gcpprovider.go

+ 7 - 3
pkg/cloud/gcpprovider.go

@@ -575,7 +575,7 @@ type GCPPricing struct {
 type PricingInfo struct {
 type PricingInfo struct {
 	Summary                string             `json:"summary"`
 	Summary                string             `json:"summary"`
 	PricingExpression      *PricingExpression `json:"pricingExpression"`
 	PricingExpression      *PricingExpression `json:"pricingExpression"`
-	CurrencyConversionRate int                `json:"currencyConversionRate"`
+	CurrencyConversionRate float64            `json:"currencyConversionRate"`
 	EffectiveTime          string             `json:""`
 	EffectiveTime          string             `json:""`
 }
 }
 
 
@@ -874,7 +874,11 @@ func (gcp *GCP) parsePage(r io.Reader, inputKeys map[string]Key, pvKeys map[stri
 
 
 func (gcp *GCP) parsePages(inputKeys map[string]Key, pvKeys map[string]PVKey) (map[string]*GCPPricing, error) {
 func (gcp *GCP) parsePages(inputKeys map[string]Key, pvKeys map[string]PVKey) (map[string]*GCPPricing, error) {
 	var pages []map[string]*GCPPricing
 	var pages []map[string]*GCPPricing
-	url := "https://cloudbilling.googleapis.com/v1/services/6F81-5844-456A/skus?key=" + gcp.APIKey
+	c, err := gcp.GetConfig()
+	if err != nil {
+		return nil, err
+	}
+	url := "https://cloudbilling.googleapis.com/v1/services/6F81-5844-456A/skus?key=" + gcp.APIKey + "&currencyCode=" + c.CurrencyCode
 	klog.V(2).Infof("Fetch GCP Billing Data from URL: %s", url)
 	klog.V(2).Infof("Fetch GCP Billing Data from URL: %s", url)
 	var parsePagesHelper func(string) error
 	var parsePagesHelper func(string) error
 	parsePagesHelper = func(pageToken string) error {
 	parsePagesHelper = func(pageToken string) error {
@@ -894,7 +898,7 @@ func (gcp *GCP) parsePages(inputKeys map[string]Key, pvKeys map[string]PVKey) (m
 		pages = append(pages, page)
 		pages = append(pages, page)
 		return parsePagesHelper(token)
 		return parsePagesHelper(token)
 	}
 	}
-	err := parsePagesHelper("")
+	err = parsePagesHelper("")
 	if err != nil {
 	if err != nil {
 		return nil, err
 		return nil, err
 	}
 	}