diff --git a/.github/workflows/check-expected-release-files.yml b/.github/workflows/check-expected-release-files.yml index edcc499dc8..a066cbde55 100644 --- a/.github/workflows/check-expected-release-files.yml +++ b/.github/workflows/check-expected-release-files.yml @@ -15,7 +15,7 @@ defaults: jobs: check-expected-release-files: - runs-on: ubuntu-latest + runs-on: ubuntu-slim permissions: contents: read diff --git a/.github/workflows/debug-artifacts-failure-safe.yml b/.github/workflows/debug-artifacts-failure-safe.yml index c938c51e65..1a09b3d9ee 100644 --- a/.github/workflows/debug-artifacts-failure-safe.yml +++ b/.github/workflows/debug-artifacts-failure-safe.yml @@ -79,7 +79,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Download all artifacts - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 - name: Check expected artifacts exist run: | LANGUAGES="cpp csharp go java javascript python" diff --git a/.github/workflows/debug-artifacts-safe.yml b/.github/workflows/debug-artifacts-safe.yml index 3e7282f820..ea513521f1 100644 --- a/.github/workflows/debug-artifacts-safe.yml +++ b/.github/workflows/debug-artifacts-safe.yml @@ -73,7 +73,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Download all artifacts - uses: actions/download-artifact@v5 + uses: actions/download-artifact@v6 - name: Check expected artifacts exist run: | VERSIONS="stable-v2.20.3 default linked nightly-latest" diff --git a/.github/workflows/label-pr-size.yml b/.github/workflows/label-pr-size.yml index 83ec360f57..965a4a8587 100644 --- a/.github/workflows/label-pr-size.yml +++ b/.github/workflows/label-pr-size.yml @@ -16,7 +16,7 @@ permissions: jobs: sizeup: name: Label PR with size - runs-on: ubuntu-latest + runs-on: ubuntu-slim steps: - name: Run sizeup diff --git a/.github/workflows/post-release-mergeback.yml b/.github/workflows/post-release-mergeback.yml index b5c0f27b54..c59e6c8890 100644 --- a/.github/workflows/post-release-mergeback.yml +++ b/.github/workflows/post-release-mergeback.yml @@ -24,7 +24,7 @@ defaults: jobs: merge-back: - runs-on: ubuntu-latest + runs-on: ubuntu-slim environment: Automation if: github.repository == 'github/codeql-action' env: diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml index 82fa18e3b8..dad6fce39a 100644 --- a/.github/workflows/prepare-release.yml +++ b/.github/workflows/prepare-release.yml @@ -29,7 +29,7 @@ defaults: jobs: prepare: name: "Prepare release" - runs-on: ubuntu-latest + runs-on: ubuntu-slim if: github.repository == 'github/codeql-action' permissions: diff --git a/.github/workflows/publish-immutable-action.yml b/.github/workflows/publish-immutable-action.yml index effe2255a2..9350bf2b28 100644 --- a/.github/workflows/publish-immutable-action.yml +++ b/.github/workflows/publish-immutable-action.yml @@ -10,7 +10,7 @@ defaults: jobs: publish: - runs-on: ubuntu-latest + runs-on: ubuntu-slim permissions: contents: read id-token: write diff --git a/.github/workflows/update-bundle.yml b/.github/workflows/update-bundle.yml index 8c0f8274e7..f2c3cd40cb 100644 --- a/.github/workflows/update-bundle.yml +++ b/.github/workflows/update-bundle.yml @@ -20,7 +20,7 @@ defaults: jobs: update-bundle: if: github.event.release.prerelease && startsWith(github.event.release.tag_name, 'codeql-bundle-') - runs-on: ubuntu-latest + runs-on: ubuntu-slim permissions: contents: write # needed to push commits pull-requests: write # needed to create pull requests diff --git a/.github/workflows/update-release-branch.yml b/.github/workflows/update-release-branch.yml index 69700a35f6..830ed7c2a5 100644 --- a/.github/workflows/update-release-branch.yml +++ b/.github/workflows/update-release-branch.yml @@ -26,7 +26,7 @@ jobs: update: timeout-minutes: 45 - runs-on: ubuntu-latest + runs-on: ubuntu-slim if: github.event_name == 'workflow_dispatch' needs: [prepare] env: @@ -77,7 +77,7 @@ jobs: backport: timeout-minutes: 45 - runs-on: ubuntu-latest + runs-on: ubuntu-slim environment: Automation needs: [prepare] if: ${{ (github.event_name == 'push') && needs.prepare.outputs.backport_target_branches != '[]' }} diff --git a/.github/workflows/update-supported-enterprise-server-versions.yml b/.github/workflows/update-supported-enterprise-server-versions.yml index 35d4ba01f4..b6cbe01510 100644 --- a/.github/workflows/update-supported-enterprise-server-versions.yml +++ b/.github/workflows/update-supported-enterprise-server-versions.yml @@ -9,7 +9,7 @@ jobs: update-supported-enterprise-server-versions: name: Update Supported Enterprise Server Versions timeout-minutes: 45 - runs-on: ubuntu-latest + runs-on: ubuntu-slim if: github.repository == 'github/codeql-action' permissions: contents: write # needed to push commits diff --git a/CHANGELOG.md b/CHANGELOG.md index 834e7ef701..a193a99516 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ See the [releases page](https://github.com/github/codeql-action/releases) for the relevant changes to the CodeQL CLI and language packs. +## 3.31.2 - 30 Oct 2025 + +No user facing changes. + ## 3.31.1 - 30 Oct 2025 - The `add-snippets` input has been removed from the `analyze` action. This input has been deprecated since CodeQL Action 3.26.4 in August 2024 when this removal was announced. diff --git a/lib/analyze-action-post.js b/lib/analyze-action-post.js index 05cb4071df..d99d2e7492 100644 --- a/lib/analyze-action-post.js +++ b/lib/analyze-action-post.js @@ -26468,7 +26468,7 @@ var require_package = __commonJS({ "package.json"(exports2, module2) { module2.exports = { name: "codeql", - version: "3.31.1", + version: "3.31.2", private: true, description: "CodeQL action", scripts: { @@ -26506,7 +26506,6 @@ var require_package = __commonJS({ "@octokit/request-error": "^7.0.1", "@schemastore/package": "0.0.10", archiver: "^7.0.1", - "console-log-level": "^1.4.1", "fast-deep-equal": "^3.1.3", "follow-redirects": "^1.15.11", "get-folder-size": "^5.0.0", @@ -26526,7 +26525,6 @@ var require_package = __commonJS({ "@microsoft/eslint-formatter-sarif": "^3.1.0", "@octokit/types": "^15.0.1", "@types/archiver": "^6.0.4", - "@types/console-log-level": "^1.4.5", "@types/follow-redirects": "^1.14.4", "@types/js-yaml": "^4.0.9", "@types/node": "20.19.9", diff --git a/lib/analyze-action.js b/lib/analyze-action.js index b63a2bbd32..b4673d364b 100644 --- a/lib/analyze-action.js +++ b/lib/analyze-action.js @@ -26468,7 +26468,7 @@ var require_package = __commonJS({ "package.json"(exports2, module2) { module2.exports = { name: "codeql", - version: "3.31.1", + version: "3.31.2", private: true, description: "CodeQL action", scripts: { @@ -26506,7 +26506,6 @@ var require_package = __commonJS({ "@octokit/request-error": "^7.0.1", "@schemastore/package": "0.0.10", archiver: "^7.0.1", - "console-log-level": "^1.4.1", "fast-deep-equal": "^3.1.3", "follow-redirects": "^1.15.11", "get-folder-size": "^5.0.0", @@ -26526,7 +26525,6 @@ var require_package = __commonJS({ "@microsoft/eslint-formatter-sarif": "^3.1.0", "@octokit/types": "^15.0.1", "@types/archiver": "^6.0.4", - "@types/console-log-level": "^1.4.5", "@types/follow-redirects": "^1.14.4", "@types/js-yaml": "^4.0.9", "@types/node": "20.19.9", @@ -83617,9 +83615,9 @@ async function deleteActionsCache(id) { } function isEnablementError(msg) { return [ - /Code Security must be enabled/, - /Advanced Security must be enabled/, - /Code Scanning is not enabled/ + /Code Security must be enabled/i, + /Advanced Security must be enabled/i, + /Code Scanning is not enabled/i ].some((pattern) => pattern.test(msg)); } function getFeatureEnablementError(message) { diff --git a/lib/autobuild-action.js b/lib/autobuild-action.js index c71d2ee533..9b63e25db9 100644 --- a/lib/autobuild-action.js +++ b/lib/autobuild-action.js @@ -26468,7 +26468,7 @@ var require_package = __commonJS({ "package.json"(exports2, module2) { module2.exports = { name: "codeql", - version: "3.31.1", + version: "3.31.2", private: true, description: "CodeQL action", scripts: { @@ -26506,7 +26506,6 @@ var require_package = __commonJS({ "@octokit/request-error": "^7.0.1", "@schemastore/package": "0.0.10", archiver: "^7.0.1", - "console-log-level": "^1.4.1", "fast-deep-equal": "^3.1.3", "follow-redirects": "^1.15.11", "get-folder-size": "^5.0.0", @@ -26526,7 +26525,6 @@ var require_package = __commonJS({ "@microsoft/eslint-formatter-sarif": "^3.1.0", "@octokit/types": "^15.0.1", "@types/archiver": "^6.0.4", - "@types/console-log-level": "^1.4.5", "@types/follow-redirects": "^1.14.4", "@types/js-yaml": "^4.0.9", "@types/node": "20.19.9", diff --git a/lib/init-action-post.js b/lib/init-action-post.js index 5747f2b80a..166355c0c3 100644 --- a/lib/init-action-post.js +++ b/lib/init-action-post.js @@ -26468,7 +26468,7 @@ var require_package = __commonJS({ "package.json"(exports2, module2) { module2.exports = { name: "codeql", - version: "3.31.1", + version: "3.31.2", private: true, description: "CodeQL action", scripts: { @@ -26506,7 +26506,6 @@ var require_package = __commonJS({ "@octokit/request-error": "^7.0.1", "@schemastore/package": "0.0.10", archiver: "^7.0.1", - "console-log-level": "^1.4.1", "fast-deep-equal": "^3.1.3", "follow-redirects": "^1.15.11", "get-folder-size": "^5.0.0", @@ -26526,7 +26525,6 @@ var require_package = __commonJS({ "@microsoft/eslint-formatter-sarif": "^3.1.0", "@octokit/types": "^15.0.1", "@types/archiver": "^6.0.4", - "@types/console-log-level": "^1.4.5", "@types/follow-redirects": "^1.14.4", "@types/js-yaml": "^4.0.9", "@types/node": "20.19.9", @@ -116760,9 +116758,9 @@ async function listActionsCaches(key, ref) { } function isEnablementError(msg) { return [ - /Code Security must be enabled/, - /Advanced Security must be enabled/, - /Code Scanning is not enabled/ + /Code Security must be enabled/i, + /Advanced Security must be enabled/i, + /Code Scanning is not enabled/i ].some((pattern) => pattern.test(msg)); } function getFeatureEnablementError(message) { diff --git a/lib/init-action.js b/lib/init-action.js index 377490f0b2..90a8e1a295 100644 --- a/lib/init-action.js +++ b/lib/init-action.js @@ -26468,7 +26468,7 @@ var require_package = __commonJS({ "package.json"(exports2, module2) { module2.exports = { name: "codeql", - version: "3.31.1", + version: "3.31.2", private: true, description: "CodeQL action", scripts: { @@ -26506,7 +26506,6 @@ var require_package = __commonJS({ "@octokit/request-error": "^7.0.1", "@schemastore/package": "0.0.10", archiver: "^7.0.1", - "console-log-level": "^1.4.1", "fast-deep-equal": "^3.1.3", "follow-redirects": "^1.15.11", "get-folder-size": "^5.0.0", @@ -26526,7 +26525,6 @@ var require_package = __commonJS({ "@microsoft/eslint-formatter-sarif": "^3.1.0", "@octokit/types": "^15.0.1", "@types/archiver": "^6.0.4", - "@types/console-log-level": "^1.4.5", "@types/follow-redirects": "^1.14.4", "@types/js-yaml": "^4.0.9", "@types/node": "20.19.9", @@ -80928,9 +80926,9 @@ async function getRepositoryProperties(repositoryNwo) { } function isEnablementError(msg) { return [ - /Code Security must be enabled/, - /Advanced Security must be enabled/, - /Code Scanning is not enabled/ + /Code Security must be enabled/i, + /Advanced Security must be enabled/i, + /Code Scanning is not enabled/i ].some((pattern) => pattern.test(msg)); } function getFeatureEnablementError(message) { diff --git a/lib/resolve-environment-action.js b/lib/resolve-environment-action.js index 523b6f76ab..f8deb4f5f7 100644 --- a/lib/resolve-environment-action.js +++ b/lib/resolve-environment-action.js @@ -26468,7 +26468,7 @@ var require_package = __commonJS({ "package.json"(exports2, module2) { module2.exports = { name: "codeql", - version: "3.31.1", + version: "3.31.2", private: true, description: "CodeQL action", scripts: { @@ -26506,7 +26506,6 @@ var require_package = __commonJS({ "@octokit/request-error": "^7.0.1", "@schemastore/package": "0.0.10", archiver: "^7.0.1", - "console-log-level": "^1.4.1", "fast-deep-equal": "^3.1.3", "follow-redirects": "^1.15.11", "get-folder-size": "^5.0.0", @@ -26526,7 +26525,6 @@ var require_package = __commonJS({ "@microsoft/eslint-formatter-sarif": "^3.1.0", "@octokit/types": "^15.0.1", "@types/archiver": "^6.0.4", - "@types/console-log-level": "^1.4.5", "@types/follow-redirects": "^1.14.4", "@types/js-yaml": "^4.0.9", "@types/node": "20.19.9", diff --git a/lib/setup-codeql-action.js b/lib/setup-codeql-action.js index 6d15211e0b..c90441d7db 100644 --- a/lib/setup-codeql-action.js +++ b/lib/setup-codeql-action.js @@ -26468,7 +26468,7 @@ var require_package = __commonJS({ "package.json"(exports2, module2) { module2.exports = { name: "codeql", - version: "3.31.1", + version: "3.31.2", private: true, description: "CodeQL action", scripts: { @@ -26506,7 +26506,6 @@ var require_package = __commonJS({ "@octokit/request-error": "^7.0.1", "@schemastore/package": "0.0.10", archiver: "^7.0.1", - "console-log-level": "^1.4.1", "fast-deep-equal": "^3.1.3", "follow-redirects": "^1.15.11", "get-folder-size": "^5.0.0", @@ -26526,7 +26525,6 @@ var require_package = __commonJS({ "@microsoft/eslint-formatter-sarif": "^3.1.0", "@octokit/types": "^15.0.1", "@types/archiver": "^6.0.4", - "@types/console-log-level": "^1.4.5", "@types/follow-redirects": "^1.14.4", "@types/js-yaml": "^4.0.9", "@types/node": "20.19.9", @@ -79277,9 +79275,9 @@ async function getAnalysisKey() { } function isEnablementError(msg) { return [ - /Code Security must be enabled/, - /Advanced Security must be enabled/, - /Code Scanning is not enabled/ + /Code Security must be enabled/i, + /Advanced Security must be enabled/i, + /Code Scanning is not enabled/i ].some((pattern) => pattern.test(msg)); } function getFeatureEnablementError(message) { diff --git a/lib/start-proxy-action-post.js b/lib/start-proxy-action-post.js index 124b72b57b..51d7e05b5a 100644 --- a/lib/start-proxy-action-post.js +++ b/lib/start-proxy-action-post.js @@ -26468,7 +26468,7 @@ var require_package = __commonJS({ "package.json"(exports2, module2) { module2.exports = { name: "codeql", - version: "3.31.1", + version: "3.31.2", private: true, description: "CodeQL action", scripts: { @@ -26506,7 +26506,6 @@ var require_package = __commonJS({ "@octokit/request-error": "^7.0.1", "@schemastore/package": "0.0.10", archiver: "^7.0.1", - "console-log-level": "^1.4.1", "fast-deep-equal": "^3.1.3", "follow-redirects": "^1.15.11", "get-folder-size": "^5.0.0", @@ -26526,7 +26525,6 @@ var require_package = __commonJS({ "@microsoft/eslint-formatter-sarif": "^3.1.0", "@octokit/types": "^15.0.1", "@types/archiver": "^6.0.4", - "@types/console-log-level": "^1.4.5", "@types/follow-redirects": "^1.14.4", "@types/js-yaml": "^4.0.9", "@types/node": "20.19.9", diff --git a/lib/start-proxy-action.js b/lib/start-proxy-action.js index 428d6bb201..272feaf97d 100644 --- a/lib/start-proxy-action.js +++ b/lib/start-proxy-action.js @@ -45004,7 +45004,7 @@ var require_package = __commonJS({ "package.json"(exports2, module2) { module2.exports = { name: "codeql", - version: "3.31.1", + version: "3.31.2", private: true, description: "CodeQL action", scripts: { @@ -45042,7 +45042,6 @@ var require_package = __commonJS({ "@octokit/request-error": "^7.0.1", "@schemastore/package": "0.0.10", archiver: "^7.0.1", - "console-log-level": "^1.4.1", "fast-deep-equal": "^3.1.3", "follow-redirects": "^1.15.11", "get-folder-size": "^5.0.0", @@ -45062,7 +45061,6 @@ var require_package = __commonJS({ "@microsoft/eslint-formatter-sarif": "^3.1.0", "@octokit/types": "^15.0.1", "@types/archiver": "^6.0.4", - "@types/console-log-level": "^1.4.5", "@types/follow-redirects": "^1.14.4", "@types/js-yaml": "^4.0.9", "@types/node": "20.19.9", diff --git a/lib/upload-lib.js b/lib/upload-lib.js index cca934f1c5..6564d32246 100644 --- a/lib/upload-lib.js +++ b/lib/upload-lib.js @@ -27765,7 +27765,7 @@ var require_package = __commonJS({ "package.json"(exports2, module2) { module2.exports = { name: "codeql", - version: "3.31.1", + version: "3.31.2", private: true, description: "CodeQL action", scripts: { @@ -27803,7 +27803,6 @@ var require_package = __commonJS({ "@octokit/request-error": "^7.0.1", "@schemastore/package": "0.0.10", archiver: "^7.0.1", - "console-log-level": "^1.4.1", "fast-deep-equal": "^3.1.3", "follow-redirects": "^1.15.11", "get-folder-size": "^5.0.0", @@ -27823,7 +27822,6 @@ var require_package = __commonJS({ "@microsoft/eslint-formatter-sarif": "^3.1.0", "@octokit/types": "^15.0.1", "@types/archiver": "^6.0.4", - "@types/console-log-level": "^1.4.5", "@types/follow-redirects": "^1.14.4", "@types/js-yaml": "^4.0.9", "@types/node": "20.19.9", @@ -82148,9 +82146,9 @@ function computeAutomationID(analysis_key, environment) { } function isEnablementError(msg) { return [ - /Code Security must be enabled/, - /Advanced Security must be enabled/, - /Code Scanning is not enabled/ + /Code Security must be enabled/i, + /Advanced Security must be enabled/i, + /Code Scanning is not enabled/i ].some((pattern) => pattern.test(msg)); } function getFeatureEnablementError(message) { diff --git a/lib/upload-sarif-action-post.js b/lib/upload-sarif-action-post.js index 9afc814e0c..70270b6b75 100644 --- a/lib/upload-sarif-action-post.js +++ b/lib/upload-sarif-action-post.js @@ -26468,7 +26468,7 @@ var require_package = __commonJS({ "package.json"(exports2, module2) { module2.exports = { name: "codeql", - version: "3.31.1", + version: "3.31.2", private: true, description: "CodeQL action", scripts: { @@ -26506,7 +26506,6 @@ var require_package = __commonJS({ "@octokit/request-error": "^7.0.1", "@schemastore/package": "0.0.10", archiver: "^7.0.1", - "console-log-level": "^1.4.1", "fast-deep-equal": "^3.1.3", "follow-redirects": "^1.15.11", "get-folder-size": "^5.0.0", @@ -26526,7 +26525,6 @@ var require_package = __commonJS({ "@microsoft/eslint-formatter-sarif": "^3.1.0", "@octokit/types": "^15.0.1", "@types/archiver": "^6.0.4", - "@types/console-log-level": "^1.4.5", "@types/follow-redirects": "^1.14.4", "@types/js-yaml": "^4.0.9", "@types/node": "20.19.9", diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js index dadf6548f0..e19dfe8c3c 100644 --- a/lib/upload-sarif-action.js +++ b/lib/upload-sarif-action.js @@ -26468,7 +26468,7 @@ var require_package = __commonJS({ "package.json"(exports2, module2) { module2.exports = { name: "codeql", - version: "3.31.1", + version: "3.31.2", private: true, description: "CodeQL action", scripts: { @@ -26506,7 +26506,6 @@ var require_package = __commonJS({ "@octokit/request-error": "^7.0.1", "@schemastore/package": "0.0.10", archiver: "^7.0.1", - "console-log-level": "^1.4.1", "fast-deep-equal": "^3.1.3", "follow-redirects": "^1.15.11", "get-folder-size": "^5.0.0", @@ -26526,7 +26525,6 @@ var require_package = __commonJS({ "@microsoft/eslint-formatter-sarif": "^3.1.0", "@octokit/types": "^15.0.1", "@types/archiver": "^6.0.4", - "@types/console-log-level": "^1.4.5", "@types/follow-redirects": "^1.14.4", "@types/js-yaml": "^4.0.9", "@types/node": "20.19.9", @@ -82193,9 +82191,9 @@ function computeAutomationID(analysis_key, environment) { } function isEnablementError(msg) { return [ - /Code Security must be enabled/, - /Advanced Security must be enabled/, - /Code Scanning is not enabled/ + /Code Security must be enabled/i, + /Advanced Security must be enabled/i, + /Code Scanning is not enabled/i ].some((pattern) => pattern.test(msg)); } function getFeatureEnablementError(message) { diff --git a/package-lock.json b/package-lock.json index 9cd43e5bd1..325e3eac85 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "codeql", - "version": "4.31.1", + "version": "4.31.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "codeql", - "version": "4.31.1", + "version": "4.31.2", "license": "MIT", "dependencies": { "@actions/artifact": "^4.0.0", @@ -23,7 +23,6 @@ "@octokit/request-error": "^7.0.1", "@schemastore/package": "0.0.10", "archiver": "^7.0.1", - "console-log-level": "^1.4.1", "fast-deep-equal": "^3.1.3", "follow-redirects": "^1.15.11", "get-folder-size": "^5.0.0", @@ -43,7 +42,6 @@ "@microsoft/eslint-formatter-sarif": "^3.1.0", "@octokit/types": "^15.0.1", "@types/archiver": "^6.0.4", - "@types/console-log-level": "^1.4.5", "@types/follow-redirects": "^1.14.4", "@types/js-yaml": "^4.0.9", "@types/node": "20.19.9", @@ -2486,11 +2484,6 @@ "dev": true, "license": "MIT" }, - "node_modules/@types/console-log-level": { - "version": "1.4.5", - "dev": true, - "license": "MIT" - }, "node_modules/@types/estree": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz", @@ -4506,12 +4499,6 @@ "node": "^14.18.0 || >=16.10.0" } }, - "node_modules/console-log-level": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/console-log-level/-/console-log-level-1.4.1.tgz", - "integrity": "sha512-VZzbIORbP+PPcN/gg3DXClTLPLg5Slwd5fL2MIc+o1qZ4BXBvWyc6QxPk6T/Mkr6IVjRpoAGf32XxP3ZWMVRcQ==", - "license": "MIT" - }, "node_modules/convert-to-spaces": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/convert-to-spaces/-/convert-to-spaces-2.0.1.tgz", diff --git a/package.json b/package.json index fd48191ec3..ad767956b3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "codeql", - "version": "3.31.1", + "version": "3.31.2", "private": true, "description": "CodeQL action", "scripts": { @@ -38,7 +38,6 @@ "@octokit/request-error": "^7.0.1", "@schemastore/package": "0.0.10", "archiver": "^7.0.1", - "console-log-level": "^1.4.1", "fast-deep-equal": "^3.1.3", "follow-redirects": "^1.15.11", "get-folder-size": "^5.0.0", @@ -58,7 +57,6 @@ "@microsoft/eslint-formatter-sarif": "^3.1.0", "@octokit/types": "^15.0.1", "@types/archiver": "^6.0.4", - "@types/console-log-level": "^1.4.5", "@types/follow-redirects": "^1.14.4", "@types/js-yaml": "^4.0.9", "@types/node": "20.19.9", diff --git a/src/api-client.test.ts b/src/api-client.test.ts index 29e3ef852e..d3a5ce2bca 100644 --- a/src/api-client.test.ts +++ b/src/api-client.test.ts @@ -171,37 +171,30 @@ test("wrapApiConfigurationError correctly wraps specific configuration errors", ); // Enablement errors. - const codeSecurityNotEnabledError = new util.HTTPError( + const enablementErrorMessages = [ "Code Security must be enabled for this repository to use code scanning", - 403, - ); - res = api.wrapApiConfigurationError(codeSecurityNotEnabledError); - t.deepEqual( - res, - new util.ConfigurationError( - api.getFeatureEnablementError(codeSecurityNotEnabledError.message), - ), - ); - const advancedSecurityNotEnabledError = new util.HTTPError( "Advanced Security must be enabled for this repository to use code scanning", - 403, - ); - res = api.wrapApiConfigurationError(advancedSecurityNotEnabledError); - t.deepEqual( - res, - new util.ConfigurationError( - api.getFeatureEnablementError(advancedSecurityNotEnabledError.message), - ), - ); - const codeScanningNotEnabledError = new util.HTTPError( "Code Scanning is not enabled for this repository. Please enable code scanning in the repository settings.", - 403, - ); - res = api.wrapApiConfigurationError(codeScanningNotEnabledError); - t.deepEqual( - res, - new util.ConfigurationError( - api.getFeatureEnablementError(codeScanningNotEnabledError.message), - ), - ); + ]; + const transforms = [ + (msg: string) => msg, + (msg: string) => msg.toLowerCase(), + (msg: string) => msg.toLocaleUpperCase(), + ]; + + for (const enablementErrorMessage of enablementErrorMessages) { + for (const transform of transforms) { + const enablementError = new util.HTTPError( + transform(enablementErrorMessage), + 403, + ); + res = api.wrapApiConfigurationError(enablementError); + t.deepEqual( + res, + new util.ConfigurationError( + api.getFeatureEnablementError(enablementError.message), + ), + ); + } + } }); diff --git a/src/api-client.ts b/src/api-client.ts index f271c27910..e14048337f 100644 --- a/src/api-client.ts +++ b/src/api-client.ts @@ -285,9 +285,9 @@ export async function getRepositoryProperties(repositoryNwo: RepositoryNwo) { function isEnablementError(msg: string) { return [ - /Code Security must be enabled/, - /Advanced Security must be enabled/, - /Code Scanning is not enabled/, + /Code Security must be enabled/i, + /Advanced Security must be enabled/i, + /Code Scanning is not enabled/i, ].some((pattern) => pattern.test(msg)); }