fix skill-id option for legacy skills (#489)

alexa · Aug 9, 2023 · 3a71908 · 3a71908
1 parent fbb3247
commit 3a71908
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 48 deletions.
diff --git a/bin/askx-skill.ts b/bin/askx-skill.ts
diff --git a/bin/askx-smapi.ts b/bin/askx-smapi.ts
diff --git a/bin/askx-util.ts b/bin/askx-util.ts
diff --git a/lib/commands/option-model.json b/lib/commands/option-model.json
@@ -46,10 +46,12 @@
     "description": "run skill in the specified simulation mode (currently supports DEFAULT / NFI_ISOLATED_SIMULATION)",
     "alias": null,
     "stringInput": "REQUIRED",
-    "rule": [{
-      "type": "ENUM",
-      "values": ["DEFAULT", "NFI_ISOLATED_SIMULATION"]
-    }]
+    "rule": [
+      {
+        "type": "ENUM",
+        "values": ["DEFAULT", "NFI_ISOLATED_SIMULATION"]
+      }
+    ]
   },
   "skill-id": {
     "name": "skill-id",
@@ -59,7 +61,7 @@
     "rule": [
       {
         "type": "REGEX",
-        "regex": "^amzn\\d\\.ask\\.skill\\.\\w{8}-\\w{4}-\\w{4}-\\w{4}-\\w{12}$"
+        "regex": "^amzn\\d((\\.ask\\.skill)|(\\.echo-sdk-ams\\.app))\\.\\w{8}-\\w{4}-\\w{4}-\\w{4}-\\w{12}$"
       }
     ]
   },

diff --git a/test/unit/commands/option-validator-test.js b/test/unit/commands/option-validator-test.js
@@ -111,13 +111,14 @@ describe("Command test - Option validator test", () => {
 
       const skillOptions = {
         optionValid: "amzn1.ask.skill.1234abcd-12ab-abcd-1234-123456789012",
+        optionValidLegacy: "amzn1.echo-sdk-ams.app.1234abcd-12ab-abcd-1234-123456789012",
         optionInvalid: "amzn1.ask.skill",
       };
 
       const skillRegex = [
         {
           type: "REGEX",
-          regex: "^amzn\\d\\.ask\\.skill\\.\\w{8}-\\w{4}-\\w{4}-\\w{4}-\\w{12}$",
+          regex: "^amzn\\d((\\.ask\\.skill)|(\\.echo-sdk-ams\\.app))\\.\\w{8}-\\w{4}-\\w{4}-\\w{4}-\\w{12}$",
         },
       ];
 
@@ -130,6 +131,10 @@ describe("Command test - Option validator test", () => {
         optionValidator.validateOptionRules(skillOptions, "optionValid", skillRegex);
       }).not.throw();
 
+      expect(() => {
+        optionValidator.validateOptionRules(skillOptions, "optionValidLegacy", skillRegex);
+      }).not.throw();
+
       // invalid regex expectations
       expect(() => {
         optionValidator.validateOptionRules(skillOptions, "optionInvalid", skillRegex);