mrva/vscode-codeql
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main' into aeisenberg/flush-cache-on-db-remove

Browse Source
This commit is contained in:
Andrew Eisenberg
2024-05-22 22:42:54 +00:00
parent 376d6b75d6 db0d062443
commit 6c92a5b800
6 changed files with 23 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
extensions/ql-vscode/package-lock.json generated
View File

@@ -30,7 +30,7 @@
"node-fetch": "^2.6.7",
"p-queue": "^8.0.1",
"react": "^18.3.1",
"react-dom": "^18.2.0",
"react-dom": "^18.3.1",
"semver": "^7.6.2",
"source-map": "^0.7.4",
"source-map-support": "^0.5.21",
@@ -84,7 +84,7 @@
"@types/node": "18.18.*",
"@types/node-fetch": "^2.5.2",
"@types/react": "^18.3.1",
"@types/react-dom": "^18.2.18",
"@types/react-dom": "^18.3.0",
"@types/sarif": "^2.1.2",
"@types/semver": "^7.5.8",
"@types/stream-json": "^1.7.1",
@@ -7817,9 +7817,9 @@
}
},
"node_modules/@types/react-dom": {
"version": "18.2.18",
"resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.18.tgz",
"integrity": "sha512-TJxDm6OfAX2KJWJdMEVTwWke5Sc/E/RlnPGvGfS0W7+6ocy2xhDVQVh/KvC2Uf7kACs+gDytdusDSdWfWkaNzw==",
"version": "18.3.0",
"resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.0.tgz",
"integrity": "sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg==",
"dev": true,
"dependencies": {
"@types/react": "*"
@@ -24891,15 +24891,15 @@
"dev": true
},
"node_modules/react-dom": {
"version": "18.2.0",
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
"integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==",
"version": "18.3.1",
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
"integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
"dependencies": {
"loose-envify": "^1.1.0",
"scheduler": "^0.23.0"
"scheduler": "^0.23.2"
},
"peerDependencies": {
"react": "^18.2.0"
"react": "^18.3.1"
}
},
"node_modules/react-element-to-jsx-string": {
@@ -25917,9 +25917,9 @@
}
},
"node_modules/scheduler": {
"version": "0.23.0",
"resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz",
"integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==",
"version": "0.23.2",
"resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
"integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
"dependencies": {
"loose-envify": "^1.1.0"
}

4
extensions/ql-vscode/package.json
View File

@@ -1988,7 +1988,7 @@
"node-fetch": "^2.6.7",
"p-queue": "^8.0.1",
"react": "^18.3.1",
"react-dom": "^18.2.0",
"react-dom": "^18.3.1",
"semver": "^7.6.2",
"source-map": "^0.7.4",
"source-map-support": "^0.5.21",
@@ -2042,7 +2042,7 @@
"@types/node": "18.18.*",
"@types/node-fetch": "^2.5.2",
"@types/react": "^18.3.1",
"@types/react-dom": "^18.2.18",
"@types/react-dom": "^18.3.0",
"@types/sarif": "^2.1.2",
"@types/semver": "^7.5.8",
"@types/stream-json": "^1.7.1",

5
extensions/ql-vscode/src/config.ts
View File

@@ -680,11 +680,6 @@ export function getVariantAnalysisDefaultResultsSort(): SortKey {
*/
const ACTION_BRANCH = new Setting("actionBranch", VARIANT_ANALYSIS_SETTING);
export const VARIANT_ANALYSIS_ENABLE_GHEC_DR = new Setting(
"enableGhecDr",
VARIANT_ANALYSIS_SETTING,
);
export function getActionBranch(): string {
return ACTION_BRANCH.getValue<string>() || "main";
}

14
extensions/ql-vscode/src/variant-analysis/ghec-dr.ts
View File

@@ -1,18 +1,10 @@
import {
VARIANT_ANALYSIS_ENABLE_GHEC_DR,
hasEnterpriseUri,
hasGhecDrUri,
} from "../config";
import { hasEnterpriseUri, hasGhecDrUri } from "../config";
/**
* Determines whether MRVA should be enabled or not for the current GitHub host.
* MRVA is enabled on github.com and GHEC-DR.
* This is based on the `github-enterprise.uri` setting.
*/
export function isVariantAnalysisEnabledForGitHubHost(): boolean {
return (
// MRVA is always enabled on github.com
!hasEnterpriseUri() ||
// MRVA can be enabled on GHEC-DR using a feature flag
(hasGhecDrUri() && !!VARIANT_ANALYSIS_ENABLE_GHEC_DR.getValue<boolean>())
);
return !hasEnterpriseUri() || hasGhecDrUri();
}

2
extensions/ql-vscode/supported_cli_versions.json
View File

@@ -1,5 +1,5 @@
[
"v2.17.2",
"v2.17.3",
"v2.16.6",
"v2.15.5",
"v2.14.6",

35
extensions/ql-vscode/test/vscode-tests/minimal-workspace/variant-analysis/ghec-dr.test.ts
View File

@@ -1,16 +1,13 @@
import { ConfigurationTarget } from "vscode";
import {
VARIANT_ANALYSIS_ENABLE_GHEC_DR,
VSCODE_GITHUB_ENTERPRISE_URI_SETTING,
} from "../../../../src/config";
import { VSCODE_GITHUB_ENTERPRISE_URI_SETTING } from "../../../../src/config";
import { isVariantAnalysisEnabledForGitHubHost } from "../../../../src/variant-analysis/ghec-dr";
describe("checkVariantAnalysisEnabled", () => {
it("returns cleanly when no enterprise URI is set", async () => {
it("returns true when no enterprise URI is set", async () => {
expect(isVariantAnalysisEnabledForGitHubHost()).toBe(true);
});
it("returns false when GHES enterprise URI is set and variant analysis feature flag is not set", async () => {
it("returns false when GHES enterprise URI is set", async () => {
await VSCODE_GITHUB_ENTERPRISE_URI_SETTING.updateValue(
"https://github.example.com",
ConfigurationTarget.Global,
@@ -18,35 +15,11 @@ describe("checkVariantAnalysisEnabled", () => {
expect(isVariantAnalysisEnabledForGitHubHost()).toBe(false);
});
it("returns false when GHES enterprise URI is set and variant analysis feature flag is set", async () => {
await VSCODE_GITHUB_ENTERPRISE_URI_SETTING.updateValue(
"https://github.example.com",
ConfigurationTarget.Global,
);
await VARIANT_ANALYSIS_ENABLE_GHEC_DR.updateValue(
"true",
ConfigurationTarget.Global,
);
expect(isVariantAnalysisEnabledForGitHubHost()).toBe(false);
});
it("returns false when GHEC-DR URI is set and variant analysis feature flag is not set", async () => {
it("returns true when a GHEC-DR URI is set", async () => {
await VSCODE_GITHUB_ENTERPRISE_URI_SETTING.updateValue(
"https://example.ghe.com",
ConfigurationTarget.Global,
);
expect(isVariantAnalysisEnabledForGitHubHost()).toBe(false);
});
it("returns true when GHEC-DR URI is set and variant analysis feature flag is set", async () => {
await VSCODE_GITHUB_ENTERPRISE_URI_SETTING.updateValue(
"https://example.ghe.com",
ConfigurationTarget.Global,
);
await VARIANT_ANALYSIS_ENABLE_GHEC_DR.updateValue(
"true",
ConfigurationTarget.Global,
);
expect(isVariantAnalysisEnabledForGitHubHost()).toBe(true);
});
});