From b739c98560e8b7c81664291ba1af16e228809ec3 Mon Sep 17 00:00:00 2001
From: Christopher Schleiden <cschleiden@github.com>
Date: Wed, 4 Jan 2023 11:52:19 -0800
Subject: [PATCH] Use "job" instead of "job-id"

---
 .../src/context/workflow-context.ts           |  2 +-
 .../src/utils/find-token.test.ts              | 28 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/actions-languageservice/src/context/workflow-context.ts b/actions-languageservice/src/context/workflow-context.ts
index 1754ffc..6ba3f28 100644
--- a/actions-languageservice/src/context/workflow-context.ts
+++ b/actions-languageservice/src/context/workflow-context.ts
@@ -33,7 +33,7 @@ export function getWorkflowContext(
   // Iterate through the token path to find the job and step
   for (const token of tokenPath) {
     switch (token.definition?.key) {
-      case "job-id": {
+      case "job": {
         const jobID = (token as StringToken).value;
         context.job = template.jobs.find(job => job.id.value === jobID);
         break;
diff --git a/actions-languageservice/src/utils/find-token.test.ts b/actions-languageservice/src/utils/find-token.test.ts
index f79e561..bc9143f 100644
--- a/actions-languageservice/src/utils/find-token.test.ts
+++ b/actions-languageservice/src/utils/find-token.test.ts
@@ -145,7 +145,7 @@ jobs:
         ["workflow-root-strict", TokenType.Mapping],
         ["jobs", TokenType.String, "jobs"],
         ["jobs", TokenType.Mapping],
-        ["job-id", TokenType.String, "build"],
+        ["job", TokenType.String, "build"],
         ["job-factory", TokenType.Mapping],
         ["runs-on", TokenType.String, "runs-on"],
         ["runs-on", TokenType.Sequence]
@@ -180,7 +180,7 @@ jobs:
         ["workflow-root-strict", TokenType.Mapping],
         ["jobs", TokenType.String, "jobs"],
         ["jobs", TokenType.Mapping],
-        ["job-id", TokenType.String, "build"],
+        ["job", TokenType.String, "build"],
         ["job-factory", TokenType.Mapping],
         ["runs-on", TokenType.String, "runs-on"]
       ],
@@ -201,7 +201,7 @@ jobs:
         ["workflow-root-strict", TokenType.Mapping],
         ["jobs", TokenType.String, "jobs"],
         ["jobs", TokenType.Mapping],
-        ["job-id", TokenType.String, "build"],
+        ["job", TokenType.String, "build"],
         ["job-factory", TokenType.Mapping]
       ],
       parent: ["job-factory", TokenType.Mapping],
@@ -221,7 +221,7 @@ jobs:
         ["workflow-root-strict", TokenType.Mapping],
         ["jobs", TokenType.String, "jobs"],
         ["jobs", TokenType.Mapping],
-        ["job-id", TokenType.String, "build"],
+        ["job", TokenType.String, "build"],
         ["job-factory", TokenType.Mapping]
       ],
       parent: ["job-factory", TokenType.Mapping],
@@ -241,7 +241,7 @@ jobs:
         ["workflow-root-strict", TokenType.Mapping],
         ["jobs", TokenType.String, "jobs"],
         ["jobs", TokenType.Mapping],
-        ["job-id", TokenType.String, "build"],
+        ["job", TokenType.String, "build"],
         ["job-factory", TokenType.Mapping]
       ],
       parent: ["job-factory", TokenType.Mapping],
@@ -261,10 +261,10 @@ jobs:
         ["workflow-root-strict", TokenType.Mapping],
         ["jobs", TokenType.String, "jobs"],
         ["jobs", TokenType.Mapping],
-        ["job-id", TokenType.String, "build"]
+        ["job", TokenType.String, "build"]
       ],
       parent: ["jobs", TokenType.Mapping],
-      key: ["job-id", TokenType.String, "build"],
+      key: ["job", TokenType.String, "build"],
       token: [null, TokenType.String, "continue-on-error:foo"]
     });
   });
@@ -280,7 +280,7 @@ jobs:
         ["workflow-root-strict", TokenType.Mapping],
         ["jobs", TokenType.String, "jobs"],
         ["jobs", TokenType.Mapping],
-        ["job-id", TokenType.String, "build"],
+        ["job", TokenType.String, "build"],
         ["job-factory", TokenType.Mapping]
       ],
       parent: ["job-factory", TokenType.Mapping],
@@ -300,7 +300,7 @@ jobs:
         ["workflow-root-strict", TokenType.Mapping],
         ["jobs", TokenType.String, "jobs"],
         ["jobs", TokenType.Mapping],
-        ["job-id", TokenType.String, "build"],
+        ["job", TokenType.String, "build"],
         ["job-factory", TokenType.Mapping]
       ],
       parent: ["job-factory", TokenType.Mapping],
@@ -320,10 +320,10 @@ jobs:
         ["workflow-root-strict", TokenType.Mapping],
         ["jobs", TokenType.String, "jobs"],
         ["jobs", TokenType.Mapping],
-        ["job-id", TokenType.String, "build"]
+        ["job", TokenType.String, "build"]
       ],
       parent: ["jobs", TokenType.Mapping],
-      key: ["job-id", TokenType.String, "build"],
+      key: ["job", TokenType.String, "build"],
       token: [null, TokenType.String, "runs-"]
     });
   });
@@ -340,10 +340,10 @@ jobs:
         ["workflow-root-strict", TokenType.Mapping],
         ["jobs", TokenType.String, "jobs"],
         ["jobs", TokenType.Mapping],
-        ["job-id", TokenType.String, "build"]
+        ["job", TokenType.String, "build"]
       ],
       parent: ["jobs", TokenType.Mapping],
-      key: ["job-id", TokenType.String, "build"],
+      key: ["job", TokenType.String, "build"],
       token: [null, TokenType.String, "runs-"]
     });
   });
@@ -360,7 +360,7 @@ jobs:
         ["workflow-root-strict", TokenType.Mapping],
         ["jobs", TokenType.String, "jobs"],
         ["jobs", TokenType.Mapping],
-        ["job-id", TokenType.String, "build"],
+        ["job", TokenType.String, "build"],
         ["job-factory", TokenType.Mapping],
         ["runs-on", TokenType.String, "runs-on"]
       ],