Remvoe base path prefix from script path

Author: DefCon-007

dist/index.js

@@ -34168,6 +34168,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.generatePRComment = exports.createOrUpdateComment = exports.getActionCommentId = exports.getPullRequestNumber = void 0;
 const core = __importStar(__nccwpck_require__(2186));
 const github = __importStar(__nccwpck_require__(5438));
+const k6helper_1 = __nccwpck_require__(1034);
 const { context } = github;
 const { eventName, payload } = context;
 const { repo, owner } = context.repo;
@@ -34276,10 +34277,10 @@ async function generatePRComment(testRunUrlsMap) {
     core.debug('Generating PR comment');
     let testRunUrls = '';
     for (const [scriptPath, testRunUrl] of Object.entries(testRunUrlsMap)) {
-        testRunUrls += `🔗 [${scriptPath}](${testRunUrl})\n`;
+        testRunUrls += `🔗 [${(0, k6helper_1.cleanScriptPath)(scriptPath)}](${testRunUrl})\n`;
     }
     let comment = `# Performance Test Results 🚀
-  
+
   Select a test run from below to view the test progress and results on Grafana Cloud K6:
 
   ${testRunUrls}
@@ -34289,20 +34290,21 @@ async function generatePRComment(testRunUrlsMap) {
         pullRequestNumber = await getPullRequestNumber();
     }
     catch (error) {
-        core.error(`Error getting pull request number`);
-        core.error(error);
+        core.debug(`Got following error in getting pull request number`);
+        core.debug(error);
     }
     if (!pullRequestNumber) {
-        core.debug('Pull request number not found skipping comment creation');
+        core.warning('Unable to get pull request number for the commit, skipping comment creation');
         return;
     }
     try {
         await createOrUpdateComment(pullRequestNumber, comment);
         core.debug('Comment created successfully');
     }
     catch (error) {
-        core.error(`Error creating comment on pull request: ${pullRequestNumber}`);
-        core.error(error);
+        core.warning('Error creating comment on pull request');
+        core.debug(`Following error occurred in creating comment on pull request: ${pullRequestNumber}`);
+        core.debug(error);
     }
 }
 exports.generatePRComment = generatePRComment;
@@ -34387,9 +34389,17 @@ async function run() {
             set: (target, key, value) => {
                 target[key] = value;
                 if (Object.keys(target).length === TOTAL_TEST_RUNS) {
-                    if (isCloud && shouldCommentCloudTestRunUrlOnPR) {
-                        // Generate PR comment with test run URLs
-                        allPromises.push((0, githubHelper_1.generatePRComment)(target));
+                    // All test run cloud urls are available
+                    if (isCloud) {
+                        // Log test run URLs to the console
+                        console.log('🌐 Test run URLs:');
+                        for (const [script, url] of Object.entries(target)) {
+                            console.log(`  ${(0, k6helper_1.cleanScriptPath)(script)}: ${url}`);
+                        }
+                        if (shouldCommentCloudTestRunUrlOnPR) {
+                            // Generate PR comment with test run URLs
+                            allPromises.push((0, githubHelper_1.generatePRComment)(target));
+                        }
                     }
                 }
                 return true;
@@ -34708,8 +34718,8 @@ exports.parseK6Output = parseK6Output;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.validateTestPaths = void 0;
-// Common helper functions used in the action 
+exports.cleanScriptPath = exports.validateTestPaths = void 0;
+// Common helper functions used in the action
 const child_process_1 = __nccwpck_require__(2081);
 async function validateTestPaths(testPaths) {
     /**
@@ -34745,6 +34755,20 @@ async function validateTestPaths(testPaths) {
     return validK6TestPaths;
 }
 exports.validateTestPaths = validateTestPaths;
+function cleanScriptPath(scriptPath) {
+    /**
+     * Cleans the script path by removing the base directory prefix if it is present.
+     *
+     * @export
+     * @param {string} scriptPath - The script path to clean
+     * @return {string} - Cleaned script path
+     *
+     * */
+    const baseDir = process.env['GITHUB_WORKSPACE'] || '';
+    const cleanedScriptPath = scriptPath.replace(baseDir, '');
+    return scriptPath.trim();
+}
+exports.cleanScriptPath = cleanScriptPath;
 
 
 /***/ }),

src/githubHelper.ts

@@ -1,5 +1,6 @@
 import * as core from '@actions/core';
 import * as github from '@actions/github';
+import { cleanScriptPath } from './k6helper';
 import { TestRunUrlsMap } from './types';
 
 const { context } = github;
@@ -131,7 +132,7 @@ export async function generatePRComment(testRunUrlsMap: TestRunUrlsMap): Promise
 
   let testRunUrls = '';
   for (const [scriptPath, testRunUrl] of Object.entries(testRunUrlsMap)) {
-    testRunUrls += `🔗 [${scriptPath}](${testRunUrl})\n`;
+    testRunUrls += `🔗 [${cleanScriptPath(scriptPath)}](${testRunUrl})\n`;
   }
 
   let comment = `# Performance Test Results 🚀

src/index.ts

@@ -4,7 +4,7 @@ import { spawn } from 'child_process';
 import * as fs from 'fs-extra';
 import { generatePRComment } from './githubHelper';
 import { parseK6Output } from './k6OutputParser';
-import { validateTestPaths } from './k6helper';
+import { cleanScriptPath, validateTestPaths } from './k6helper';
 import { TestRunUrlsMap } from './types';
 
 const TEST_PIDS: number[] = [];
@@ -59,9 +59,18 @@ export async function run(): Promise<void> {
                 set: (target: TestRunUrlsMap, key: string, value: string) => {
                     target[key] = value;
                     if (Object.keys(target).length === TOTAL_TEST_RUNS) {
-                        if (isCloud && shouldCommentCloudTestRunUrlOnPR) {
-                            // Generate PR comment with test run URLs
-                            allPromises.push(generatePRComment(target));
+                        // All test run cloud urls are available
+                        if (isCloud) {
+                            // Log test run URLs to the console
+                            console.log('🌐 Test run URLs:');
+                            for (const [script, url] of Object.entries(target)) {
+                                console.log(`  ${cleanScriptPath(script)}: ${url}`);
+                            }
+
+                            if (shouldCommentCloudTestRunUrlOnPR) {
+                                // Generate PR comment with test run URLs
+                                allPromises.push(generatePRComment(target));
+                            }
                         }
                     }
                     return true;

src/k6helper.ts

@@ -1,4 +1,4 @@
-// Common helper functions used in the action 
+// Common helper functions used in the action
 import { spawn } from 'child_process';
 
 export async function validateTestPaths(testPaths: string[]): Promise<string[]> {
@@ -44,4 +44,20 @@ export async function validateTestPaths(testPaths: string[]): Promise<string[]>
     await Promise.all(allPromises);
 
     return validK6TestPaths;
+}
+
+export function cleanScriptPath(scriptPath: string): string {
+    /**
+     * Cleans the script path by removing the base directory prefix if it is present.
+     *
+     * @export
+     * @param {string} scriptPath - The script path to clean
+     * @return {string} - Cleaned script path
+     *
+     * */
+    const baseDir = process.env['GITHUB_WORKSPACE'] || '';
+    const cleanedScriptPath = scriptPath.replace(baseDir, '');
+
+    return cleanedScriptPath.trim();
+
 }