Merge pull request #3961 from github/aeisenberg/add-actions

Add "actions" as an analysis language

Author: aeisenberg

extensions/ql-vscode/src/common/query-language.ts

@@ -1,4 +1,5 @@
 export enum QueryLanguage {
+  Actions = "actions",
   CSharp = "csharp",
   Cpp = "cpp",
   Go = "go",
@@ -12,6 +13,8 @@ export enum QueryLanguage {
 
 export function getLanguageDisplayName(language: string): string {
   switch (language) {
+    case QueryLanguage.Actions:
+      return "Actions";
     case QueryLanguage.CSharp:
       return "C#";
     case QueryLanguage.Cpp:
@@ -36,6 +39,7 @@ export function getLanguageDisplayName(language: string): string {
 }
 
 export const PACKS_BY_QUERY_LANGUAGE = {
+  [QueryLanguage.Actions]: ["codeql/actions-queries"],
   [QueryLanguage.Cpp]: ["codeql/cpp-queries"],
   [QueryLanguage.CSharp]: [
     "codeql/csharp-queries",
@@ -50,7 +54,7 @@ export const PACKS_BY_QUERY_LANGUAGE = {
 };
 
 export const dbSchemeToLanguage: Record<string, QueryLanguage> = {
-  "semmlecode.javascript.dbscheme": QueryLanguage.Javascript,
+  "semmlecode.javascript.dbscheme": QueryLanguage.Javascript, // This can also be QueryLanguage.Actions
   "semmlecode.cpp.dbscheme": QueryLanguage.Cpp,
   "semmlecode.dbscheme": QueryLanguage.Java,
   "semmlecode.python.dbscheme": QueryLanguage.Python,
@@ -61,6 +65,18 @@ export const dbSchemeToLanguage: Record<string, QueryLanguage> = {
   "swift.dbscheme": QueryLanguage.Swift,
 };
 
+export const languageToDbScheme = Object.entries(dbSchemeToLanguage).reduce(
+  (acc, [k, v]) => {
+    acc[v] = k;
+    return acc;
+  },
+  {} as { [k: string]: string },
+);
+
+// Actions dbscheme is the same as Javascript dbscheme
+languageToDbScheme[QueryLanguage.Actions] =
+  languageToDbScheme[QueryLanguage.Javascript];
+
 export function isQueryLanguage(language: string): language is QueryLanguage {
   return Object.values(QueryLanguage).includes(language as QueryLanguage);
 }

extensions/ql-vscode/src/language-selection-panel/language-selection-data-provider.ts

@@ -9,6 +9,7 @@ import {
 
 const ALL_LANGUAGE_SELECTION_OPTIONS = [
   undefined, // All languages
+  QueryLanguage.Actions,
   QueryLanguage.Cpp,
   QueryLanguage.CSharp,
   QueryLanguage.Go,

extensions/ql-vscode/src/query-history/store/query-history-dto.ts

@@ -14,6 +14,7 @@ export type QueryHistoryItemDto =
   | QueryHistoryVariantAnalysisDto;
 
 export enum QueryLanguageDto {
+  Actions = "actions",
   CSharp = "csharp",
   Cpp = "cpp",
   Go = "go",

extensions/ql-vscode/src/query-history/store/query-history-language-domain-mapper.ts

@@ -6,6 +6,8 @@ export function mapQueryLanguageToDto(
   language: QueryLanguage,
 ): QueryLanguageDto {
   switch (language) {
+    case QueryLanguage.Actions:
+      return QueryLanguageDto.Actions;
     case QueryLanguage.CSharp:
       return QueryLanguageDto.CSharp;
     case QueryLanguage.Cpp:

extensions/ql-vscode/src/query-history/store/query-history-language-dto-mapper.ts

@@ -6,6 +6,8 @@ export function mapQueryLanguageToDomainModel(
   language: QueryLanguageDto,
 ): QueryLanguage {
   switch (language) {
+    case QueryLanguageDto.Actions:
+      return QueryLanguage.Actions;
     case QueryLanguageDto.CSharp:
       return QueryLanguage.CSharp;
     case QueryLanguageDto.Cpp:

extensions/ql-vscode/test/vscode-tests/cli-integration/local-queries/skeleton-query-wizard.test.ts

@@ -78,6 +78,7 @@ describe("SkeletonQueryWizard", () => {
       getSupportedLanguages: jest
         .fn()
         .mockResolvedValue([
+          "actions",
           "ruby",
           "rust",
           "javascript",

extensions/ql-vscode/test/vscode-tests/cli-integration/run-cli.test.ts

@@ -16,7 +16,7 @@ import { faker } from "@faker-js/faker";
 import { getActivatedExtension } from "../global.helper";
 import type { BaseLogger } from "../../../src/common/logging";
 import { getQlPackForDbscheme } from "../../../src/databases/qlpack";
-import { dbSchemeToLanguage } from "../../../src/common/query-language";
+import { languageToDbScheme } from "../../../src/common/query-language";
 
 /**
  * Perform proper integration tests by running the CLI
@@ -27,14 +27,6 @@ describe("Use cli", () => {
 
   let logSpy: jest.SpiedFunction<BaseLogger["log"]>;
 
-  const languageToDbScheme = Object.entries(dbSchemeToLanguage).reduce(
-    (acc, [k, v]) => {
-      acc[v] = k;
-      return acc;
-    },
-    {} as { [k: string]: string },
-  );
-
   beforeEach(async () => {
     const extension = await getActivatedExtension();
     cli = extension.cliServer;
@@ -107,12 +99,17 @@ describe("Use cli", () => {
   itWithCodeQL()(
     "should resolve printAST queries for supported languages",
     async () => {
-      for (const lang of supportedLanguages) {
+      for (let lang of supportedLanguages) {
         if (lang === "go") {
           // The codeql-go submodule is not available in the integration tests.
           return;
         }
 
+        if (lang === "actions") {
+          // The actions queries use the javascript dbscheme.
+          lang = "javascript";
+        }
+
         console.log(`resolving printAST queries for ${lang}`);
         const pack = await getQlPackForDbscheme(cli, languageToDbScheme[lang]);
         expect(pack.dbschemePack).toContain(lang);