From 63ad4ea3f9605d54eac6d28ed6e3c04831ed2696 Mon Sep 17 00:00:00 2001 From: Ruud Senden <8635138+rsenden@users.noreply.github.com> Date: Sun, 24 Sep 2023 00:29:35 +0200 Subject: [PATCH] chore: Add support for bugtracker-utility --- setup/dist/index.js | 9 +++++++-- setup/src/main.ts | 7 +++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/setup/dist/index.js b/setup/dist/index.js index 57d2aa9..fadddaf 100644 --- a/setup/dist/index.js +++ b/setup/dist/index.js @@ -6719,8 +6719,13 @@ function exportVariables(toolName, toolVersion, installPath) { case 'fod-uploader': cmd = 'FoDUpload'; break; + case 'bugtracker-utility': + cmd = 'FortifyBugTrackerUtility'; + break; + } + if (cmd) { + core.exportVariable(varBaseName + '_CMD', core.toPlatformPath(`${installPath}/bin/${cmd}`)); } - core.exportVariable(varBaseName + '_CMD', core.toPlatformPath(`${installPath}/bin/${cmd}`)); } /** * Get the configured tool version for the given tool. @@ -6747,7 +6752,7 @@ function main() { const internalFcliPath = yield installIfNotCached('', 'fcli', INTERNAL_FCLI_VERSION, core.debug); const internalFcliCmd = core.toPlatformPath(`${internalFcliPath}/bin/fcli`); // Install user-specified tools - const tools = ['fcli', 'sc-client', 'fod-uploader', 'vuln-exporter']; + const tools = ['fcli', 'sc-client', 'fod-uploader', 'vuln-exporter', 'bugtracker-utility']; for (const tool of tools) { yield installAndConfigure(internalFcliCmd, tool, getToolVersion(tool)); } diff --git a/setup/src/main.ts b/setup/src/main.ts index 19ec6cf..9cdc0bc 100644 --- a/setup/src/main.ts +++ b/setup/src/main.ts @@ -119,8 +119,11 @@ function exportVariables(toolName: string, toolVersion: string, installPath: str case 'sc-client': cmd = 'scancentral'; break; case 'vuln-exporter': cmd = 'FortifyVulnerabilityExporter'; break; case 'fod-uploader': cmd = 'FoDUpload'; break; + case 'bugtracker-utility': cmd = 'FortifyBugTrackerUtility'; break; + } + if (cmd) { + core.exportVariable(varBaseName+'_CMD', core.toPlatformPath(`${installPath}/bin/${cmd}`)); } - core.exportVariable(varBaseName+'_CMD', core.toPlatformPath(`${installPath}/bin/${cmd}`)); } /** @@ -149,7 +152,7 @@ async function main(): Promise { const internalFcliCmd = core.toPlatformPath(`${internalFcliPath}/bin/fcli`); // Install user-specified tools - const tools = ['fcli', 'sc-client', 'fod-uploader', 'vuln-exporter'] + const tools = ['fcli', 'sc-client', 'fod-uploader', 'vuln-exporter', 'bugtracker-utility'] for (const tool of tools) { await installAndConfigure(internalFcliCmd, tool, getToolVersion(tool)); }