add bundle to flow

Author: jsinglet

.github/workflows/internal-pr-bundle-integration-test-cpp.yml

@@ -67,7 +67,7 @@ jobs:
         languages: ${{ matrix.language }}
         queries: security-extended
         source-root: integration-tests/cpp/src/  # Path containing the example application 
-        tools: ${{ env.QLT_CODEQL_HOME }}/../out/codeql-bundle.tar.gz
+        tools: ${{ env.QLT_CODEQL_BUNDLE_PATH }}
 
     - name: Autobuild
       uses: github/codeql-action/autobuild@v2
@@ -93,14 +93,13 @@ jobs:
           ${{ steps.analysis.outputs.sarif-output }}/*.sarif
         if-no-files-found: error
 
-    # - name: Upload Bundle Used
-    #   uses: actions/upload-artifact@v2
-    #   with:
-    #     name: codeql-bundle.tar.gz
-    #     path: |
-    #       ${{ env.QLT_CODEQL_HOME }}/../out/codeql-bundle.tar.gz
-    #     if-no-files-found: error
-
+    - name: Upload Bundle Used
+      uses: actions/upload-artifact@v2
+      with:
+        name: codeql-bundle.tar.gz
+        path: |
+          ${{ env.QLT_CODEQL_BUNDLE_PATH }}
+        if-no-files-found: error
 
     - name: Validate SARIF Results
       shell: bash

src/CodeQLToolkit.Features/CodeQL/Commands/Targets/InstallCommand.cs

@@ -58,13 +58,22 @@ public override void Run()
 
                 Environment.SetEnvironmentVariable("QLT_CODEQL_HOME", installation.CodeQLHome);
                 Environment.SetEnvironmentVariable("QLT_CODEQL_PATH", installation.CodeQLToolBinary);
+                if (CustomBundles || QuickBundles)
+                {
+                    Environment.SetEnvironmentVariable("QLT_CODEQL_BUNDLE_PATH", installation.CustomBundleOutputBundle);
+                }
 
                 if (AutomationTypeHelper.AutomationTypeFromString(AutomationTarget) == AutomationType.ACTIONS)
                 {
                     if (Environment.GetEnvironmentVariable("GITHUB_ENV") != null && File.Exists(Environment.GetEnvironmentVariable("GITHUB_ENV")))
                     {
+                        
                         File.AppendAllText(Environment.GetEnvironmentVariable("GITHUB_ENV"), $"QLT_CODEQL_HOME={installation.CodeQLHome}" + "\n");
                         File.AppendAllText(Environment.GetEnvironmentVariable("GITHUB_ENV"), $"QLT_CODEQL_PATH={installation.CodeQLToolBinary}" + "\n");
+                        if (CustomBundles || QuickBundles)
+                        {
+                            File.AppendAllText(Environment.GetEnvironmentVariable("GITHUB_ENV"), $"QLT_CODEQL_BUNDLE_PATH={installation.CustomBundleOutputBundle}" + "\n");
+                        }
                     }
                 }
 

src/CodeQLToolkit.Shared/CodeQL/RESOLUTION.md

@@ -47,9 +47,10 @@ For a bundle installation the mapping is as follows:
 
 - `CodeQLCLIBundle` - The bundle downloaded from `github/codeql-action/releases` to base the bundle on. 
 
-In all cases, at the end of the execution two environment variables are set:
+In all cases, at the end of the execution two to three environment variables are set:
 - `QLT_CODEQL_PATH` - The path to the CodeQL binary. 
 - `QLT_CODEQL_HOME` - The root installation of CodeQL
+- `QLT_CODEQL_BUNDLE_PATH` - The path to the bundle created by QLT.
 
 ## Idents within the Installation Directory