Use costmodelenv

Signed-off-by: Anders Swanson <anders.swanson@oracle.com>

pkg/cloud/oracle/provider.go

@@ -3,7 +3,6 @@ package oracle
 import (
 	"fmt"
 	"io"
-	"os"
 	"strconv"
 	"sync"
 	"time"
@@ -109,10 +108,7 @@ func (o *Oracle) DownloadPricingData() error {
 		return err
 	}
 	if o.RateCardStore == nil {
-		url := os.Getenv("OCI_PRICING_URL")
-		if len(url) == 0 {
-			url = defaultPricingURL
-		}
+		url := env.GetOCIPricingURL()
 		o.RateCardStore = NewRateCardStore(url, cfg.CurrencyCode)
 	}
 	if _, err := o.RateCardStore.Refresh(); err != nil {

pkg/cloud/oracle/ratecard.go

@@ -13,7 +13,6 @@ import (
 
 // 1 month = 744 hours by price list documentation.
 const hoursPerMonth = 24 * 31
-const defaultPricingURL = "https://apexapps.oracle.com/pls/apex/cetools/api/v1/products"
 
 type RateCardStore struct {
 	shapesEndpoint string

pkg/env/costmodelenv.go

@@ -118,6 +118,8 @@ const (
 	CloudCostRefreshRateHoursEnvVar = "CLOUD_COST_REFRESH_RATE_HOURS"
 	CloudCostQueryWindowDaysEnvVar  = "CLOUD_COST_QUERY_WINDOW_DAYS"
 	CloudCostRunWindowDaysEnvVar    = "CLOUD_COST_RUN_WINDOW_DAYS"
+
+	OCIPricingURL = "OCI_PRICING_URL"
 )
 
 const DefaultConfigMountPath = "/var/configs"
@@ -633,3 +635,7 @@ func GetCloudCostQueryWindowDays() int64 {
 func GetCloudCostRunWindowDays() int64 {
 	return env.GetInt64(CloudCostRunWindowDaysEnvVar, 3)
 }
+
+func GetOCIPricingURL() string {
+	return env.Get(OCIPricingURL, "https://apexapps.oracle.com/pls/apex/cetools/api/v1/products")
+}