|
|
@@ -52,6 +52,7 @@ type GCP struct {
|
|
|
DownloadPricingDataLock sync.RWMutex
|
|
|
ReservedInstances []*GCPReservedInstance
|
|
|
Config *ProviderConfig
|
|
|
+ serviceKeyProvided bool
|
|
|
*CustomProvider
|
|
|
}
|
|
|
|
|
|
@@ -250,6 +251,7 @@ func (gcp *GCP) UpdateConfig(r io.Reader, updateType string) (*CustomPricing, er
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
|
+ gcp.serviceKeyProvided = true
|
|
|
}
|
|
|
} else if updateType == AthenaInfoUpdateType {
|
|
|
a := AwsAthenaInfo{}
|
|
|
@@ -390,12 +392,12 @@ func (gcp *GCP) ExternalAllocations(start string, end string, aggregators []stri
|
|
|
AND usage_start_time >= "%s" AND usage_start_time < "%s"
|
|
|
GROUP BY service, keys
|
|
|
)`, c.BillingDataDataset, aggregator, filterType, filterValue, start, end)
|
|
|
- klog.V(3).Infof("Querying \"%s\" with : %s", c.ProjectID, queryString)
|
|
|
+ klog.V(4).Infof("Querying \"%s\" with : %s", c.ProjectID, queryString)
|
|
|
gcpOOC, err := gcp.multiLabelQuery(queryString, aggregators)
|
|
|
s = append(s, gcpOOC...)
|
|
|
qerr = err
|
|
|
}
|
|
|
- if qerr != nil {
|
|
|
+ if qerr != nil && gcp.serviceKeyProvided {
|
|
|
klog.Infof("Error querying gcp: %s", qerr)
|
|
|
}
|
|
|
return s, qerr
|