From 0a6453e2417ec8a3bf9c87b1780a09e1ebf806d1 Mon Sep 17 00:00:00 2001
From: Ethan Chiu <ethanchewy@github.com>
Date: Tue, 23 Jun 2020 14:19:51 -0400
Subject: [PATCH] Clean up file path for error message

---
 src/Runner.Worker/ActionManifestManager.cs | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/Runner.Worker/ActionManifestManager.cs b/src/Runner.Worker/ActionManifestManager.cs
index 6cd05081a..22c960d2a 100644
--- a/src/Runner.Worker/ActionManifestManager.cs
+++ b/src/Runner.Worker/ActionManifestManager.cs
@@ -34,10 +34,13 @@ namespace GitHub.Runner.Worker
     public sealed class ActionManifestManager : RunnerService, IActionManifestManager
     {
         private TemplateSchema _actionManifestSchema;
+        private IHostContext _hostContext;
         public override void Initialize(IHostContext hostContext)
         {
             base.Initialize(hostContext);
 
+            _hostContext = hostContext;
+
             var assembly = Assembly.GetExecutingAssembly();
             var json = default(string);
             using (var stream = assembly.GetManifestResourceStream("GitHub.Runner.Worker.action_yaml.json"))
@@ -56,13 +59,19 @@ namespace GitHub.Runner.Worker
         {
             var templateContext = CreateContext(executionContext);
             ActionDefinitionData actionDefinition = new ActionDefinitionData();
+
+            // Clean up file name real quick
+            // Instead of using Regex which can be computationally expensive, 
+            // we can just remove the # of characters from the fileName according to the length of the basePath
+            string basePath = _hostContext.GetDirectory(WellKnownDirectory.Actions);
+            var fileName = manifestFile.Remove(0, basePath.Length + 1);
+
             try
             {
                 var token = default(TemplateToken);
 
                 // Get the file ID
-                var fileId = templateContext.GetFileId(manifestFile);
-                var fileName = templateContext.GetFileName(fileId);
+                var fileId = templateContext.GetFileId(fileName);
 
                 // Add this file to the FileTable in executionContext
                 executionContext.FileTable.Add(fileName);
@@ -124,7 +133,7 @@ namespace GitHub.Runner.Worker
                     executionContext.Error(error.Message);
                 }
 
-                throw new ArgumentException($"Fail to load {manifestFile}");
+                throw new ArgumentException($"Fail to load {fileName}");
             }
 
             if (actionDefinition.Execution == null)