chore: Changes & fixes

fortify · Sep 21, 2023 · 358e860 · 358e860
1 parent 25d88d4
commit 358e860
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/setup/.husky/pre-commit b/setup/.husky/pre-commit
@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+cd setup && NODE_OPTIONS=--openssl-legacy-provider npm run build && git add dist/
diff --git a/setup/dist/index.js b/setup/dist/index.js
@@ -6599,7 +6599,9 @@ function installFcli() {
             core.info(`Using fcli ${fcliVersion} from cache`);
         }
         else {
-            const baseUrl = `https://github.com/fortify-ps/fcli/releases/download/${fcliVersion}`;
+            const baseUrl = fcliVersion === 'latest'
+                ? 'https://github.com/fortify/fcli/releases/latest/download'
+                : `https://github.com/fortify/fcli/releases/download/${fcliVersion}`;
             let installPath = '/opt/fortify/fcli';
             core.info(`Installing fcli ${fcliVersion} from ${baseUrl}`);
             // TODO Verify download hashes

diff --git a/setup/src/main.ts b/setup/src/main.ts
@@ -9,10 +9,12 @@ import * as exec from '@actions/exec';
 async function installFcli(): Promise<void> {
 	const fcliVersion = getFcliVersion();
 	let cachedPath = tc.find('fcli', fcliVersion);
-	if ( cachedPath ) {
+	if (cachedPath) {
 		core.info(`Using fcli ${fcliVersion} from cache`);
 	} else {
-		const baseUrl = `https://github.com/fortify-ps/fcli/releases/download/${fcliVersion}`
+		const baseUrl = fcliVersion === 'latest'
+			? 'https://github.com/fortify/fcli/releases/latest/download'
+			: `https://github.com/fortify/fcli/releases/download/${fcliVersion}`
 		let installPath = '/opt/fortify/fcli';
 		core.info(`Installing fcli ${fcliVersion} from ${baseUrl}`);
 		// TODO Verify download hashes
@@ -46,9 +48,9 @@ function getFcliVersion(): string {
 }
 
 async function installTool(toolName: string, toolVersion: string): Promise<void> {
-	if ( toolVersion!=='none') {
+	if (toolVersion !== 'none') {
 		let installPath = tc.find(toolName, toolVersion);
-		if ( installPath ) {
+		if (installPath) {
 			core.info(`Using ${toolName} ${toolVersion} from cache`);
 		} else {
 			core.info(`Installing ${toolName} ${toolVersion}`);
@@ -61,10 +63,10 @@ async function installTool(toolName: string, toolVersion: string): Promise<void>
 }
 
 async function main(): Promise<void> {
-	const tools = [ 'sc-client', 'fod-uploader', 'vuln-exporter']
+	const tools = ['sc-client', 'fod-uploader', 'vuln-exporter']
 	try {
 		await installFcli();
-		for ( const tool of tools ) {
+		for (const tool of tools) {
 			await installTool(tool, core.getInput(tool))
 		}
 	} catch (err) {