check

Author: BenAlvo1

.github/workflows/update-cli.yml

@@ -1,32 +1,52 @@
-name: Update checkmarx ast cli
+name: Update Checkmarx AST CLI
+
 on:
   workflow_dispatch:
+    inputs:
+      new_cli_version:
+        description: 'New CLI version'
+        required: false
   schedule:
     - cron: '0 0 * * *'
 
 jobs:
   update-checkmarx-cli:
     runs-on: ubuntu-latest
+
     steps:
       - uses: actions/checkout@v4
 
+      # Fetch the latest Checkmarx AST CLI version
       - name: Get Latest Checkmarx API version
         id: checkmarx-ast-cli
         run: |
-          echo ::set-output name=release_tag::$(curl -sL https://api.github.com/repos/Checkmarx/ast-cli/releases/latest | jq -r ".tag_name")
-          echo ::set-output name=current_tag::$(<checkmarx-ast-cli.version)
+          LATEST_VERSION=$(curl -sL https://api.github.com/repos/Checkmarx/ast-cli/releases/latest | jq -r ".tag_name")
+          CURRENT_VERSION=$(<checkmarx-ast-cli.version)
+          echo ::set-output name=release_tag::$LATEST_VERSION
+          echo ::set-output name=current_tag::$CURRENT_VERSION
 
-      - name: Update Checkmarx cli version
+      # Update the version file if the latest version differs
+      - name: Update Checkmarx CLI version in version file
         if: steps.checkmarx-ast-cli.outputs.current_tag != steps.checkmarx-ast-cli.outputs.release_tag
         env:
           RELEASE_TAG: ${{ steps.checkmarx-ast-cli.outputs.release_tag }}
         run: |
-          # Update current release
           echo ${{ steps.checkmarx-ast-cli.outputs.release_tag }} > checkmarx-ast-cli.version
 
+      # Update the TypeScript file's cliVersion field
+      - name: Update cliVersion in CxInstaller.ts
+        if: steps.checkmarx-ast-cli.outputs.current_tag != steps.checkmarx-ast-cli.outputs.release_tag
+        env:
+          NEW_CLI_VERSION: ${{ steps.checkmarx-ast-cli.outputs.release_tag }}
+        run: |
+          FILE_PATH="src/your-file-containing-CxInstaller.ts"
+          # Update the cliVersion field in the TypeScript file
+          sed -i "s/\(private cliVersion = '\)[^']*\(';\)/\1${NEW_CLI_VERSION}\2/" $FILE_PATH
+
+      # Create a Pull Request with the version changes
       - name: Create Pull Request
         if: steps.checkmarx-ast-cli.outputs.current_tag != steps.checkmarx-ast-cli.outputs.release_tag
-        uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c #v6
+        uses: peter-evans/create-pull-request@v6
         with:
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
           commit-message: Update checkmarx-ast-cli to ${{ steps.checkmarx-ast-cli.outputs.release_tag }}

src/main/osinstaller/CxInstaller.ts

@@ -12,19 +12,16 @@ type SupportedPlatforms = 'win32' | 'darwin' | 'linux';
 
 export class CxInstaller {
     private readonly platform: string;
-    private cliVersion: string;
+    private cliVersion = '2.2.6';
     private readonly resourceDirPath: string;
-    private readonly cliDefaultVersion = '2.2.6'; // This will be used if the version file is not found. Should be updated with the latest version.
     private static installSemaphore = new Semaphore(1);  // Semaphore with 1 slot
 
     constructor(platform: string) {
         this.platform = platform;
         this.resourceDirPath = path.join(__dirname, `../wrapper/resources`);
     }
 
-    async getDownloadURL(): Promise<string> {
-        const cliVersion = await this.readASTCLIVersion();
-
+    getDownloadURL(): string {
         const platforms: Record<SupportedPlatforms, { platform: string; extension: string }> = {
             win32: {platform: 'windows', extension: 'zip'},
             darwin: {platform: 'darwin', extension: 'tar.gz'},
@@ -38,7 +35,7 @@ export class CxInstaller {
             throw new Error('Unsupported platform or architecture');
         }
 
-        return `https://download.checkmarx.com/CxOne/CLI/${cliVersion}/ast-cli_${cliVersion}_${platformData.platform}_x64.${platformData.extension}`;
+        return `https://download.checkmarx.com/CxOne/CLI/${this.cliVersion}/ast-cli_${this.cliVersion}_${platformData.platform}_x64.${platformData.extension}`;
     }
 
     getExecutablePath(): string {
@@ -56,7 +53,7 @@ export class CxInstaller {
                 logger.info('Executable already installed.');
                 return;
             }
-            const url = await this.getDownloadURL();
+            const url = this.getDownloadURL();
             const zipPath = path.join(this.resourceDirPath, this.getCompressFolderName());
 
             await this.downloadFile(url, zipPath);
@@ -105,20 +102,6 @@ export class CxInstaller {
     checkExecutableExists(): boolean {
         return fs.existsSync(this.getExecutablePath());
     }
-
-    async readASTCLIVersion(): Promise<string> {
-        if (this.cliVersion) {
-            return this.cliVersion;
-        }
-        try {
-            const versionFilePath = path.join(process.cwd(), 'checkmarx-ast-cli.version');
-            const versionContent = await fsPromises.readFile(versionFilePath, 'utf-8');
-            return versionContent.trim();
-        } catch (error) {
-            logger.error('Error reading AST CLI version: ' + error.message);
-            return this.cliDefaultVersion;
-        }
-    }
 
     getCompressFolderName(): string {
         return `ast-cli.${this.platform === 'win32' ? 'zip' : 'tar.gz'}`;