Allow key-based yaml anchoring

Author: RensR

engine/cld/pipeline/input/yaml.go

@@ -128,27 +128,41 @@ func GetAllChangesetsInOrder(changesets any) ([]ChangesetItem, error) {
 	return result, nil
 }
 
+// anyToJSONMapKey stringifies a map key for JSON-compatible maps.
+func anyToJSONMapKey(v any) string {
+	switch k := v.(type) {
+	case string:
+		return k
+	case json.Number:
+		return k.String()
+	case int:
+		return strconv.Itoa(k)
+	case int64:
+		return strconv.FormatInt(k, 10)
+	case uint64:
+		return strconv.FormatUint(k, 10)
+	case float64:
+		if k == math.Trunc(k) && (k >= 1e15 || k <= -1e15) {
+			return strconv.FormatFloat(k, 'f', 0, 64)
+		}
+
+		return strconv.FormatFloat(k, 'f', -1, 64)
+	default:
+		return fmt.Sprintf("%v", k)
+	}
+}
+
+func isYAMLMergeKey(node *yaml.Node) bool {
+	return node != nil && node.Kind == yaml.ScalarNode && (node.Value == "<<" || node.Tag == "!!merge")
+}
+
 // ConvertToJSONSafe recursively converts map[interface{}]interface{} to map[string]any.
 func ConvertToJSONSafe(data any) (any, error) {
 	switch v := data.(type) {
 	case map[interface{}]interface{}:
 		result := make(map[string]any)
 		for key, value := range v {
-			var keyStr string
-			switch k := key.(type) {
-			case string:
-				keyStr = k
-			case int:
-				keyStr = strconv.Itoa(k)
-			case int64:
-				keyStr = strconv.FormatInt(k, 10)
-			case uint64:
-				keyStr = strconv.FormatUint(k, 10)
-			case float64:
-				keyStr = strconv.FormatFloat(k, 'f', -1, 64)
-			default:
-				keyStr = fmt.Sprintf("%v", k)
-			}
+			keyStr := anyToJSONMapKey(key)
 
 			convertedValue, err := ConvertToJSONSafe(value)
 			if err != nil {
@@ -345,7 +359,22 @@ func YamlNodeToAny(node *yaml.Node) any {
 		for i := 0; i+1 < len(node.Content); i += 2 {
 			key := node.Content[i]
 			value := node.Content[i+1]
-			out[key.Value] = YamlNodeToAny(value)
+			if isYAMLMergeKey(key) {
+				mergeMap, ok := YamlNodeToAny(value).(map[string]any)
+				if !ok {
+					continue
+				}
+				for mk, mv := range mergeMap {
+					if _, exists := out[mk]; !exists {
+						out[mk] = mv
+					}
+				}
+
+				continue
+			}
+
+			keyStr := anyToJSONMapKey(YamlNodeToAny(key))
+			out[keyStr] = YamlNodeToAny(value)
 		}
 
 		return out

engine/cld/pipeline/input/yaml_test.go

@@ -7,6 +7,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
+	"gopkg.in/yaml.v3"
 
 	"github.com/smartcontractkit/chainlink-deployments-framework/engine/cld/domain"
 )
@@ -185,6 +186,97 @@ func TestYamlNodeToAny_Nil(t *testing.T) {
 	require.Nil(t, got)
 }
 
+func TestYamlNodeToAny_AliasMapKeys(t *testing.T) {
+	t.Parallel()
+
+	yamlContent := `
+sel: &sel_sepolia 16015286601757825753
+other: &sel_arb 3478487238524512106
+chains:
+  *sel_sepolia: &cfg
+    qualifier: UltraFastCurse
+    timelockMinDelay: 0
+  *sel_arb: *cfg
+`
+	var root yaml.Node
+	require.NoError(t, yaml.Unmarshal([]byte(yamlContent), &root))
+
+	doc := YamlNodeToAny(&root).(map[string]any)
+	chains := doc["chains"].(map[string]any)
+
+	require.Equal(t, map[string]any{
+		"16015286601757825753": map[string]any{
+			"qualifier":        "UltraFastCurse",
+			"timelockMinDelay": json.Number("0"),
+		},
+		"3478487238524512106": map[string]any{
+			"qualifier":        "UltraFastCurse",
+			"timelockMinDelay": json.Number("0"),
+		},
+	}, chains)
+}
+
+func TestYamlNodeToAny_MergeKeys(t *testing.T) {
+	t.Parallel()
+
+	yamlContent := `
+base: &base_cfg
+  qualifier: UltraFastCurse
+  timelockMinDelay: 0
+chains:
+  16015286601757825753:
+    <<: *base_cfg
+    proposer:
+      quorum: 1
+`
+	var root yaml.Node
+	require.NoError(t, yaml.Unmarshal([]byte(yamlContent), &root))
+
+	doc := YamlNodeToAny(&root).(map[string]any)
+	chains := doc["chains"].(map[string]any)
+	chain := chains["16015286601757825753"].(map[string]any)
+
+	require.Equal(t, "UltraFastCurse", chain["qualifier"])
+	require.Equal(t, json.Number("0"), chain["timelockMinDelay"])
+	require.Equal(t, map[string]any{"quorum": json.Number("1")}, chain["proposer"])
+}
+
+func TestBuildChangesetInputJSON_AliasChainSelectorKeys(t *testing.T) {
+	t.Parallel()
+
+	yamlContent := `
+environment: staging_testnet
+domain: ccv
+changesets:
+  - deploy_mcms:
+      chainOverrides:
+        - &sel_sepolia 16015286601757825753
+      payload:
+        adapterVersion: "1.0.0"
+        chains:
+          *sel_sepolia:
+            qualifier: UltraFastCurse
+            timelockMinDelay: 0
+`
+	dpYAML, err := ParseYAMLBytes([]byte(yamlContent))
+	require.NoError(t, err)
+
+	changesets, err := GetAllChangesetsInOrder(dpYAML.Changesets)
+	require.NoError(t, err)
+	require.Len(t, changesets, 1)
+
+	inputJSON, err := BuildChangesetInputJSON(changesets[0].Name, changesets[0].Data)
+	require.NoError(t, err)
+
+	var decoded map[string]any
+	require.NoError(t, json.Unmarshal([]byte(inputJSON), &decoded))
+
+	payload := decoded["payload"].(map[string]any)
+	chains := payload["chains"].(map[string]any)
+	require.Contains(t, chains, "16015286601757825753")
+	require.NotContains(t, chains, "sel_sepolia")
+}
+
 func TestSetChangesetEnvironmentVariable(t *testing.T) {
 	t.Parallel()