Allow tags to be yaml-object both key: value pair and {key: name, value: value} object list

Author: egut

__tests__/utils.test.ts

@@ -37,6 +37,41 @@ describe('Parse Tags', () => {
     const json = parseTags(JSON.stringify([{ Key: 'Test', Value: 'Value' }]))
     expect(json).toEqual([{ Key: 'Test', Value: 'Value' }])
   })
+
+  test('returns valid Array from YAML key-value object format', async () => {
+    const yaml = `
+Key1: Value1
+Key2: Value2
+`
+    const result = parseTags(yaml)
+    expect(result).toEqual([
+      { Key: 'Key1', Value: 'Value1' },
+      { Key: 'Key2', Value: 'Value2' }
+    ])
+  })
+
+  test('returns valid Array from YAML array format', async () => {
+    const yaml = `
+- Key: keyname1
+  Value: value1
+- Key: keyname2
+  Value: value2
+`
+    const result = parseTags(yaml)
+    expect(result).toEqual([
+      { Key: 'keyname1', Value: 'value1' },
+      { Key: 'keyname2', Value: 'value2' }
+    ])
+  })
+
+  test('returns undefined for invalid YAML', async () => {
+    const invalidYaml = `
+    Key1: 'Value1
+    Key2: Value2
+    `
+    const result = parseTags(invalidYaml)
+    expect(result).toBeUndefined()
+  })
 })
 
 describe('Parse Parameters', () => {

package.json

@@ -36,7 +36,8 @@
     "@actions/core": "^1.10.0",
     "@aws-sdk/client-cloudformation": "^3.474.0",
     "@smithy/node-http-handler": "3.0.0",
-    "https-proxy-agent": "^5.0.1"
+    "https-proxy-agent": "^5.0.1",
+    "js-yaml": "^4.1.0"
   },
   "devDependencies": {
     "@types/jest": "^29.2.3",

src/utils.ts

@@ -16,13 +16,43 @@ export function isUrl(s: string): boolean {
 }
 
 export function parseTags(s: string): Tag[] | undefined {
-  let json
+  if (!s || s.trim() === '') {
+    return undefined;
+  }
+
+  let tags;
+
+  // Try to parse as JSON first (backward compatibility)
+  try {
+    tags = JSON.parse(s);
+    return tags;
+  } catch (_) {
+    // JSON parsing failed, try to parse as YAML
+  }
 
+  // If JSON parsing fails, try to handle as YAML
   try {
-    json = JSON.parse(s)
-  } catch (_) {}
+    const yaml = require('js-yaml');
+    const parsed = yaml.load(s);
+    
+    if (!parsed) {
+      return undefined;
+    }
+
+    // Handle the two YAML structure formats
+    if (Array.isArray(parsed)) {
+      // Already in the format [{Key: 'key', Value: 'value'}, ...]
+      return parsed;
+    } else if (typeof parsed === 'object') {
+      // Convert from {Key1: 'Value1', Key2: 'Value2'} format
+      return Object.entries(parsed).map(([Key, Value]) => ({ Key, Value }));
+    }
+  } catch (_) {
+    // YAML parsing failed
+    return undefined;
+  }
 
-  return json
+  return undefined;
 }
 
 export function parseARNs(s: string): string[] | undefined {