update field names

Signed-off-by: Sean Holcomb <seanholcomb@gmail.com>

pkg/filter21/cloudcost/fields.go

@@ -4,11 +4,11 @@ package cloudcost
 type CloudCostField string
 
 const (
-	FieldInvoiceEntity CloudCostField = "invoiceEntity"
-	FieldAccount       CloudCostField = "account"
-	FieldProvider      CloudCostField = "provider"
-	FieldProviderID    CloudCostField = "providerID"
-	FieldCategory      CloudCostField = "category"
-	FieldService       CloudCostField = "service"
-	FieldLabel         CloudCostField = "label"
+	FieldInvoiceEntityID CloudCostField = "invoiceEntityID"
+	FieldAccountID       CloudCostField = "accountID"
+	FieldProvider        CloudCostField = "provider"
+	FieldProviderID      CloudCostField = "providerID"
+	FieldCategory        CloudCostField = "category"
+	FieldService         CloudCostField = "service"
+	FieldLabel           CloudCostField = "label"
 )

pkg/filter21/cloudcost/parser.go

@@ -5,8 +5,8 @@ import "github.com/opencost/opencost/pkg/filter21/ast"
 // a slice of all the cloud costs field instances the lexer should recognize as
 // valid left-hand comparators
 var cloudCostFilterFields []*ast.Field = []*ast.Field{
-	ast.NewField(FieldInvoiceEntity),
-	ast.NewField(FieldAccount),
+	ast.NewField(FieldInvoiceEntityID),
+	ast.NewField(FieldAccountID),
 	ast.NewField(FieldProvider),
 	ast.NewField(FieldProviderID),
 	ast.NewField(FieldCategory),

pkg/kubecost/cloudcostmatcher.go

@@ -46,9 +46,9 @@ func cloudCostFieldMap(cc *CloudCost, identifier ast.Identifier) (string, error)
 		return "", fmt.Errorf("cannot map field from identifier with nil field")
 	}
 	switch ccfilter.CloudCostField(identifier.Field.Name) {
-	case ccfilter.FieldInvoiceEntity:
+	case ccfilter.FieldInvoiceEntityID:
 		return cc.Properties.InvoiceEntityID, nil
-	case ccfilter.FieldAccount:
+	case ccfilter.FieldAccountID:
 		return cc.Properties.AccountID, nil
 	case ccfilter.FieldProvider:
 		return cc.Properties.Provider, nil