diff --git a/lib/entry-points.js b/lib/entry-points.js index 091132b1c..95a5a92ba 100644 --- a/lib/entry-points.js +++ b/lib/entry-points.js @@ -149248,6 +149248,13 @@ async function loadRepositoryProperties(repositoryNwo, logger) { } // src/config/db-config.ts +var defaultSuites = /* @__PURE__ */ new Set([ + "security-experimental", + "security-extended", + "security-and-quality", + "code-quality", + "code-scanning" +]); var ORG_SCHEMA = { /** An array of model pack names. */ "model-packs": optional(array(string)) @@ -154002,13 +154009,6 @@ ${extensionContents}` ); return diffRangeDir; } -var defaultSuites = /* @__PURE__ */ new Set([ - "security-experimental", - "security-extended", - "security-and-quality", - "code-quality", - "code-scanning" -]); function resolveQuerySuiteAlias(language, maybeSuite) { if (defaultSuites.has(maybeSuite)) { return `${language}-${maybeSuite}.qls`; diff --git a/src/analyze.test.ts b/src/analyze.test.ts index 7523d239b..80fc7a547 100644 --- a/src/analyze.test.ts +++ b/src/analyze.test.ts @@ -7,12 +7,12 @@ import * as sinon from "sinon"; import { CodeQuality, CodeScanning, RiskAssessment } from "./analyses"; import { runQueries, - defaultSuites, resolveQuerySuiteAlias, addSarifExtension, diffRangeExtensionPackContents, } from "./analyze"; import { createStubCodeQL } from "./codeql"; +import { defaultSuites } from "./config/db-config"; import { Feature } from "./feature-flags"; import { BuiltInLanguage } from "./languages"; import { getRunnerLogger } from "./logging"; diff --git a/src/analyze.ts b/src/analyze.ts index 8f9071168..d585fd6d8 100644 --- a/src/analyze.ts +++ b/src/analyze.ts @@ -9,6 +9,7 @@ import { getTemporaryDirectory } from "./actions-util"; import * as analyses from "./analyses"; import { setupCppAutobuild } from "./autobuild"; import { type CodeQL } from "./codeql"; +import { defaultSuites } from "./config/db-config"; import * as configUtils from "./config-utils"; import { getCsharpTempDependencyDir, @@ -357,15 +358,6 @@ dataExtensions: return diffRangeDir; } -// A set of default query suite names that are understood by the CLI. -export const defaultSuites: Set = new Set([ - "security-experimental", - "security-extended", - "security-and-quality", - "code-quality", - "code-scanning", -]); - /** * If `maybeSuite` is the name of a default query suite, it is resolved into the corresponding * query suite name for the given `language`. Otherwise, `maybeSuite` is returned as is. diff --git a/src/config/db-config.ts b/src/config/db-config.ts index 7b5bdbd8c..44c671bae 100644 --- a/src/config/db-config.ts +++ b/src/config/db-config.ts @@ -33,6 +33,15 @@ export interface QuerySpec { uses: string; } +// A set of default query suite names that are understood by the CLI. +export const defaultSuites: Set = new Set([ + "security-experimental", + "security-extended", + "security-and-quality", + "code-quality", + "code-scanning", +]); + const ORG_SCHEMA = { /** An array of model pack names. */ "model-packs": json.optional(json.array(json.string)),