code review: rename variable to be more self documenting

Signed-off-by: Alex Meijer <ameijer@kubecost.com>

pkg/kubecost/allocation.go

@@ -247,13 +247,13 @@ func (pva *PVAllocation) Equal(that *PVAllocation) bool {
 }
 
 type ProportionalAssetResourceCost struct {
-	Cluster            string  `json:"cluster"`
-	Node               string  `json:"node,omitempty"`
-	ProviderID         string  `json:"providerID,omitempty"`
-	CPUPercentage      float64 `json:"cpuPercentage"`
-	GPUPercentage      float64 `json:"gpuPercentage"`
-	RAMPercentage      float64 `json:"ramPercentage"`
-	ResourcePercentage float64 `json:"resourcePercentage"`
+	Cluster                    string  `json:"cluster"`
+	Node                       string  `json:"node,omitempty"`
+	ProviderID                 string  `json:"providerID,omitempty"`
+	CPUPercentage              float64 `json:"cpuPercentage"`
+	GPUPercentage              float64 `json:"gpuPercentage"`
+	RAMPercentage              float64 `json:"ramPercentage"`
+	NodeResourceCostPercentage float64 `json:"nodeResourceCostPercentage"`
 }
 
 func (parc ProportionalAssetResourceCost) Key(insertByNode bool) string {
@@ -274,13 +274,13 @@ func (parcs ProportionalAssetResourceCosts) Insert(parc ProportionalAssetResourc
 	}
 	if curr, ok := parcs[parc.Key(insertByNode)]; ok {
 		parcs[parc.Key(insertByNode)] = ProportionalAssetResourceCost{
-			Node:               curr.Node,
-			Cluster:            curr.Cluster,
-			ProviderID:         curr.ProviderID,
-			CPUPercentage:      curr.CPUPercentage + parc.CPUPercentage,
-			GPUPercentage:      curr.GPUPercentage + parc.GPUPercentage,
-			RAMPercentage:      curr.RAMPercentage + parc.RAMPercentage,
-			ResourcePercentage: curr.ResourcePercentage + parc.ResourcePercentage,
+			Node:                       curr.Node,
+			Cluster:                    curr.Cluster,
+			ProviderID:                 curr.ProviderID,
+			CPUPercentage:              curr.CPUPercentage + parc.CPUPercentage,
+			GPUPercentage:              curr.GPUPercentage + parc.GPUPercentage,
+			RAMPercentage:              curr.RAMPercentage + parc.RAMPercentage,
+			NodeResourceCostPercentage: curr.NodeResourceCostPercentage + parc.NodeResourceCostPercentage,
 		}
 	} else {
 		parcs[parc.Key(insertByNode)] = parc
@@ -1772,16 +1772,16 @@ func deriveProportionalAssetResourceCostsFromIdleCoefficients(idleCoeffs map[str
 	}
 
 	// compute the resource usage percentage based on the weighted fractions
-	resourcePercentage := (ramPct * ramFraction) + (cpuPct * cpuFraction) + (gpuPct * gpuFraction)
+	nodeResourceCostPercentage := (ramPct * ramFraction) + (cpuPct * cpuFraction) + (gpuPct * gpuFraction)
 
 	return ProportionalAssetResourceCost{
-		Cluster:            allocation.Properties.Cluster,
-		Node:               allocation.Properties.Node,
-		ProviderID:         allocation.Properties.ProviderID,
-		CPUPercentage:      cpuPct,
-		GPUPercentage:      gpuPct,
-		RAMPercentage:      ramPct,
-		ResourcePercentage: resourcePercentage,
+		Cluster:                    allocation.Properties.Cluster,
+		Node:                       allocation.Properties.Node,
+		ProviderID:                 allocation.Properties.ProviderID,
+		CPUPercentage:              cpuPct,
+		GPUPercentage:              gpuPct,
+		RAMPercentage:              ramPct,
+		NodeResourceCostPercentage: nodeResourceCostPercentage,
 	}, nil
 }
 

pkg/kubecost/allocation_test.go

@@ -1080,7 +1080,7 @@ func TestAllocationSet_AggregateBy(t *testing.T) {
 						CPUPercentage:      0.5,
 						GPUPercentage:      0.5,
 						RAMPercentage:      0.8125,
-						ResourcePercentage: 0.6785714285714285,
+						NodeResourceCostPercentage: 0.6785714285714285,
 					},
 				},
 				"namespace2": ProportionalAssetResourceCosts{
@@ -1091,7 +1091,7 @@ func TestAllocationSet_AggregateBy(t *testing.T) {
 						CPUPercentage:      0.5,
 						GPUPercentage:      0.5,
 						RAMPercentage:      0.1875,
-						ResourcePercentage: 0.3214285714285714,
+						NodeResourceCostPercentage: 0.3214285714285714,
 					},
 					"cluster2": ProportionalAssetResourceCost{
 						Cluster:            "cluster2",
@@ -1100,7 +1100,7 @@ func TestAllocationSet_AggregateBy(t *testing.T) {
 						CPUPercentage:      0.5,
 						GPUPercentage:      0.5,
 						RAMPercentage:      0.5,
-						ResourcePercentage: 0.5,
+						NodeResourceCostPercentage: 0.5,
 					},
 				},
 			},
@@ -1518,7 +1518,7 @@ func TestAllocationSet_AggregateBy(t *testing.T) {
 						CPUPercentage:      0.5,
 						GPUPercentage:      0.5,
 						RAMPercentage:      0.8125,
-						ResourcePercentage: 0.6785714285714285,
+						NodeResourceCostPercentage: 0.6785714285714285,
 					},
 					"cluster2,node2": ProportionalAssetResourceCost{
 						Cluster:            "cluster2",
@@ -1527,7 +1527,7 @@ func TestAllocationSet_AggregateBy(t *testing.T) {
 						CPUPercentage:      0.5,
 						GPUPercentage:      0.5,
 						RAMPercentage:      0.5,
-						ResourcePercentage: 0.5,
+						NodeResourceCostPercentage: 0.5,
 					},
 				},
 				"namespace2": {
@@ -1538,7 +1538,7 @@ func TestAllocationSet_AggregateBy(t *testing.T) {
 						CPUPercentage:      0.5,
 						GPUPercentage:      0.5,
 						RAMPercentage:      0.1875,
-						ResourcePercentage: 0.3214285714285714,
+						NodeResourceCostPercentage: 0.3214285714285714,
 					},
 					"cluster2,node1": ProportionalAssetResourceCost{
 						Cluster:            "cluster2",
@@ -1547,7 +1547,7 @@ func TestAllocationSet_AggregateBy(t *testing.T) {
 						CPUPercentage:      1,
 						GPUPercentage:      1,
 						RAMPercentage:      1,
-						ResourcePercentage: 1,
+						NodeResourceCostPercentage: 1,
 					},
 					"cluster2,node2": ProportionalAssetResourceCost{
 						Cluster:            "cluster2",
@@ -1556,7 +1556,7 @@ func TestAllocationSet_AggregateBy(t *testing.T) {
 						CPUPercentage:      0.5,
 						GPUPercentage:      0.5,
 						RAMPercentage:      0.5,
-						ResourcePercentage: 0.5,
+						NodeResourceCostPercentage: 0.5,
 					},
 				},
 				"namespace3": {
@@ -1567,7 +1567,7 @@ func TestAllocationSet_AggregateBy(t *testing.T) {
 						CPUPercentage:      1,
 						GPUPercentage:      1,
 						RAMPercentage:      1,
-						ResourcePercentage: 1,
+						NodeResourceCostPercentage: 1,
 					},
 					"cluster2,node2": ProportionalAssetResourceCost{
 						Cluster:            "cluster2",
@@ -1576,7 +1576,7 @@ func TestAllocationSet_AggregateBy(t *testing.T) {
 						CPUPercentage:      0.5,
 						GPUPercentage:      0.5,
 						RAMPercentage:      0.5,
-						ResourcePercentage: 0.5,
+						NodeResourceCostPercentage: 0.5,
 					},
 				},
 			},