feat(action): Add codeql_version input and update CodeQL installation logic

Author: GeekMasher

Cargo.lock

@@ -20,11 +20,9 @@ anyhow = "1"
 thiserror = "2"
 dotenvy = "0.15"
 # Actions
-ghactions = { version = "^0.15", features = ["dotenvy", "log", "generate", "octocrab", "toolcache"] }
-ghactions-core = { version = "^0.15" }
-ghastoolkit = "^0.7.2"
+ghactions = { version = "^0.16", features = ["dotenvy", "log", "generate", "octocrab", "toolcache"] }
+ghastoolkit = { version = "^0.8", features = ["toolcache"] }
 
 # GitHub API
 octocrab = "^0.44"
 openssl = { version = "0.10", features = ["vendored"] }
-

Cargo.toml

@@ -21,7 +21,5 @@ RUN apk update && \
     rm -rf /var/cache/apk/*
 
 COPY --from=builder /app/target/codeql-extractor-action /usr/local/bin/codeql-extractor-action
-COPY --from=builder /app/entrypoint.sh /entrypoint.sh
-
-ENTRYPOINT [ "sh", "/entrypoint.sh" ]
 
+ENTRYPOINT [ "codeql-extractor-action" ]

Dockerfile

@@ -15,6 +15,9 @@ inputs:
   language:
     description: Language(s) to use
     required: true
+  codeql_version:
+    description: CodeQL Version
+    default: latest
   attestation:
     description: Attestation
     default: 'false'

action.yml

@@ -36,6 +36,10 @@ pub struct Action {
     #[input(description = "Language(s) to use", split = ",", required = true)]
     language: Vec<String>,
 
+    /// CodeQL Version
+    #[input(description = "CodeQL Version", default = "latest")]
+    codeql_version: String,
+
     /// Attestation
     #[input(description = "Attestation", default = "false")]
     attestation: bool,
@@ -96,6 +100,10 @@ impl Action {
         Ok(())
     }
 
+    pub fn codeql_version(&self) -> &str {
+        &self.codeql_version
+    }
+
     pub fn attestation(&self) -> bool {
         self.attestation
     }

src/action.rs

@@ -1,7 +1,7 @@
 use std::path::PathBuf;
 
 use anyhow::{Context, Result};
-use ghactions::{ActionTrait, ToolCache, group, groupend};
+use ghactions::{ActionTrait, group, groupend};
 use ghastoolkit::codeql::database::queries::CodeQLQueries;
 use ghastoolkit::{CodeQL, CodeQLDatabase};
 use log::{debug, info};
@@ -18,10 +18,23 @@ async fn main() -> Result<()> {
 
     group!("Setting up Extractor");
 
-    let client = octocrab::instance();
+    let client = action.octocrab()?;
 
-    let toolcache = ToolCache::new();
-    debug!("ToolCache :: {:?}", toolcache);
+    let mut codeql = CodeQL::init()
+        .build()
+        .await
+        .context("Failed to create CodeQL instance")?;
+
+    if !codeql.is_installed().await {
+        let codeql_version = action.codeql_version();
+        log::info!("CodeQL not installed, installing {}...", codeql_version);
+        codeql.install(&client, codeql_version).await?;
+        log::info!("CodeQL installed");
+    } else {
+        log::info!("CodeQL already installed");
+    }
+
+    log::info!("CodeQL :: {:?}", codeql);
 
     // Extractor
     let extractor_repo = action.extractor_repository()?;
@@ -44,12 +57,7 @@ async fn main() -> Result<()> {
     .context("Failed to fetch extractor")?;
     log::info!("Extractor :: {:?}", extractor);
 
-    let codeql = CodeQL::init()
-        .search_path(extractor)
-        .build()
-        .await
-        .context("Failed to create CodeQL instance")?;
-    log::info!("CodeQL :: {:?}", codeql);
+    codeql.append_search_path(extractor.display().to_string());
 
     let languages = codeql.get_languages().await?;
     log::info!("Languages :: {:#?}", languages);