From 79ff4200944656369e03959e3a86e5c59213bba9 Mon Sep 17 00:00:00 2001
From: Rafael da Fonseca <rafael.fonseca@wildlifestudios.com>
Date: Fri, 14 Mar 2025 09:19:57 +0000
Subject: [PATCH] Apply var naming change suggestions

Signed-off-by: Rafael da Fonseca <rafael.fonseca@wildlifestudios.com>
---
 pkg/chart/v2/loader/load.go | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkg/chart/v2/loader/load.go b/pkg/chart/v2/loader/load.go
index 7cc47415a..e87436218 100644
--- a/pkg/chart/v2/loader/load.go
+++ b/pkg/chart/v2/loader/load.go
@@ -303,23 +303,23 @@ func MergeMapLists(a, b []any) []any {
 			continue
 		}
 
-		var mergeKey string
-		var mergeValue interface{}
+		var uniqueKey string
+		var dedupValue interface{}
 		for k, v := range mapEntry {
 			if strings.HasPrefix(k, mergePrefix) {
-				mergeKey = k
-				mergeValue = v
+				uniqueKey = k
+				dedupValue = v
 				bj, ok := b[j].(map[string]any)
 				if !ok {
 					continue
 				}
-				bj[strings.TrimPrefix(mergeKey, mergePrefix)] = v
-				delete(bj, mergeKey)
+				bj[strings.TrimPrefix(uniqueKey, mergePrefix)] = v
+				delete(bj, uniqueKey)
 				break
 			}
 		}
-		if len(mergeKey) > 0 {
-			strippedMergeKey := strings.TrimPrefix(mergeKey, mergePrefix)
+		if len(uniqueKey) > 0 {
+			strippedMergeKey := strings.TrimPrefix(uniqueKey, mergePrefix)
 
 			for i, sourceMapEntry := range out {
 				sourceMapEntry, ok := sourceMapEntry.(map[string]any)
@@ -327,7 +327,7 @@ func MergeMapLists(a, b []any) []any {
 					continue
 				}
 				for k, v := range sourceMapEntry {
-					if (k == strippedMergeKey || k == mergeKey) && v == mergeValue {
+					if (k == strippedMergeKey || k == uniqueKey) && v == dedupValue {
 						mergedMapEntry := MergeMaps(sourceMapEntry, mapEntry)
 						out[i] = mergedMapEntry
 						break