templates fixes

Author: jsinglet

src/CodeQLToolkit.Core/Properties/launchSettings.json

@@ -2,7 +2,7 @@
   "profiles": {
     "CodeQLToolkit.Core": {
       "commandName": "Project",
-      "commandLineArgs": "--base C:\\Projects\\codeql-development-lifecycle-toolkit\\example  bundle set enable-custom-bundles"
+      "commandLineArgs": "bundle init --use-runner ubuntu-latest --language cpp --automation-type actions --development --overwrite-existing"
     }
   }
 }

src/CodeQLToolkit.Features/Bundle/Lifecycle/BaseLifecycleTarget.cs

@@ -8,12 +8,7 @@ namespace CodeQLToolkit.Features.Bundle.Lifecycle
 {
     abstract public class BaseLifecycleTarget : ILifecycleTarget
     {
-        public int NumThreads { get; set; }     
         public string UseRunner { get; set; }   
 
-        public string ExtraArgs { get; set; }
-
-        
-
     }
 }

src/CodeQLToolkit.Features/Bundle/Lifecycle/BundleLifecycleFeature.cs

@@ -1,12 +1,7 @@
-using CodeQLToolkit.Features.CodeQL.Lifecycle.Targets;
-using CodeQLToolkit.Features.CodeQL.Lifecycle;
-using CodeQLToolkit.Features.Test.Lifecycle.Targets;
-using CodeQLToolkit.Features.Test.Lifecycle.Targets.Actions;
+using CodeQLToolkit.Features.CodeQL.Lifecycle;
 using CodeQLToolkit.Shared.Utils;
 using System.CommandLine;
-using System.Reflection;
 using CodeQLToolkit.Features.Bundle.Lifecycle.Targets;
-using CodeQLToolkit.Features.Test.Lifecycle;
 
 namespace CodeQLToolkit.Features.Bundle.Lifecycle
 {

src/CodeQLToolkit.Features/Bundle/Lifecycle/Targets/Actions/InitLifecycleTarget.cs

@@ -6,6 +6,7 @@
 
 namespace CodeQLToolkit.Features.Bundle.Lifecycle.Targets.Actions
 {
+    [AutomationType(AutomationType.ACTIONS)]
     public class InitLifecycleTarget : BaseLifecycleTarget
     {
 

src/CodeQLToolkit.Features/CodeQLToolkit.Features.csproj

@@ -11,7 +11,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Folder Include="Bundle\Lifecycle\Targets\Actions\" />
     <Folder Include="Bundle\Models\" />
     <Folder Include="Pack\" />
     <Folder Include="Templates\Validation\Actions\" />
@@ -22,6 +21,12 @@
   </ItemGroup>
 
   <ItemGroup>
+    <None Update="Templates\Bundle\Actions\install-qlt.liquid">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Templates\Bundle\Actions\run-bundle-integration-tests.liquid">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Update="Templates\Query\codeql-workspace.liquid">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

src/CodeQLToolkit.Features/Templates/Bundle/Actions/install-qlt.liquid

@@ -0,0 +1,82 @@
+name: Fetch and Install QLT
+description: |
+  Fetches and installs QLT. 
+inputs:
+  qlt-version:
+    description: |
+      The version of QLT to be downloaded.
+    required: false
+    default: 'latest'
+
+  add-to-path:
+    description: |
+      Add QLT to the system path
+    required: false
+    default: 'true'
+
+outputs:
+  qlt-home:
+    description: 'The directory containing the QLT installation'
+    value: ${{ steps.install-qlt.outputs.qlt-home }}
+
+runs:
+  using: composite
+  steps:
+    - name: Install QLT
+      id: install-qlt
+      env:
+        RUNNER_OS: ${{ runner.os }}
+        RUNNER_TEMP: ${{ runner.temp }}
+        ADD_TO_PATH: ${{ inputs.add-to-path }}
+        QLT_VERSION: ${{ inputs.qlt-version }}
+        QLT_HOME: ${{ inputs.qlt-home }}
+        GITHUB_TOKEN: ${{ github.token }}
+
+      shell: bash
+      run: |
+        echo -e "\e[0;32m[QLT]\e[0m Determining QLT release for $RUNNER_OS"
+        case $RUNNER_OS in
+          "Linux")
+            RELEASE_PATTERN="qlt-linux-x86_64.zip"
+            ;;
+          *)
+            echo "::error::Unsupported runner operating system $RUNNER_OS"
+            exit 1
+            ;;
+        esac
+        echo -e "\e[0;32m[QLT]\e[0m Selected $RELEASE_PATTERN"
+
+        if [ "$QLT_HOME" == "" ]
+        then
+          echo -e "\e[0;32m[QLT]\e[0m Creating temporary QLT home"
+          QLT_HOME=$(mktemp -d -p $RUNNER_TEMP qlt-home-XXXXXXXXXX)
+        else
+          echo -e "\e[0;32m[QLT]\e[0m Creating CodeQL home at $QLT_HOME"
+          mkdir -p $QLT_HOME
+        fi
+
+        echo -e "\e[0;32m[QLT]\e[0m Changing directory to $QLT_HOME"
+        pushd $QLT_HOME
+
+        echo -e "\e[0;32m[QLT]\e[0m Downloading QLT version $QLT_VERSION"
+        if [ "$QLT_VERSION" == "latest" ]
+        then
+          # download the actual bundle 
+          gh release download -R advanced-security/codeql-development-toolkit --pattern "$RELEASE_PATTERN"
+        else
+          gh release download "$QLT_VERSION" -R advanced-security/codeql-development-toolkit --pattern "$RELEASE_PATTERN"
+        fi
+        echo -e "\e[0;32m[QLT]\e[0m Unpacking QLT"
+        unzip $RELEASE_PATTERN
+        
+        if [ "$ADD_TO_PATH" == "true" ]
+        then
+          echo -e "\e[0;32m[QLT]\e[0m Adding QLT '$(pwd)/qlt' to system path"
+          echo "$(pwd)" >> $GITHUB_PATH
+        fi
+
+        echo -e "\e[0;32m[QLT]\e[0m Setting output parameter qlt-home to $(pwd)"
+        echo "qlt-home=$(pwd)" >> $GITHUB_OUTPUT
+
+        popd
+        echo -e "\e[0;32m[QLT]\e[0m Done."