Rename remote-queries directories to variant-analysis

.gitattributes

@@ -22,7 +22,7 @@ CHANGELOG.md                merge=union
 
 # Mark some JSON files containing test data as generated so they are not included
 # as part of diffs or language statistics.
-extensions/ql-vscode/src/stories/remote-queries/data/*.json     linguist-generated
+extensions/ql-vscode/src/stories/variant-analysis/data/*.json     linguist-generated
 
 # Always use LF line endings, also on Windows
 * text=auto eol=lf

CODEOWNERS

@@ -1,4 +1,3 @@
 **/* @github/codeql-vscode-reviewers
-**/remote-queries/ @github/code-scanning-secexp-reviewers
 **/variant-analysis/ @github/code-scanning-secexp-reviewers
 **/databases/ @github/code-scanning-secexp-reviewers

extensions/ql-vscode/scripts/add-fields-to-scenarios.ts

@@ -20,8 +20,8 @@ import { throttling } from "@octokit/plugin-throttling";
 import { getFiles } from "./util/files";
 import type { GitHubApiRequest } from "../src/mocks/gh-api-request";
 import { isGetVariantAnalysisRequest } from "../src/mocks/gh-api-request";
-import { VariantAnalysis } from "../src/remote-queries/gh-api/variant-analysis";
-import { RepositoryWithMetadata } from "../src/remote-queries/gh-api/repository";
+import { VariantAnalysis } from "../src/variant-analysis/gh-api/variant-analysis";
+import { RepositoryWithMetadata } from "../src/variant-analysis/gh-api/repository";
 
 const extensionDirectory = resolve(__dirname, "..");
 const scenariosDirectory = resolve(extensionDirectory, "src/mocks/scenarios");

extensions/ql-vscode/src/databases/ui/db-panel.ts

@@ -29,7 +29,7 @@ import { DbManager } from "../db-manager";
 import { DbTreeDataProvider } from "./db-tree-data-provider";
 import { DbTreeViewItem } from "./db-tree-view-item";
 import { getGitHubUrl } from "./db-tree-view-item-action";
-import { getControllerRepo } from "../../remote-queries/run-remote-query";
+import { getControllerRepo } from "../../variant-analysis/run-remote-query";
 import { getErrorMessage } from "../../pure/helpers-pure";
 import { Credentials } from "../../common/authentication";
 

extensions/ql-vscode/src/extension.ts

@@ -108,7 +108,7 @@ import { HistoryItemLabelProvider } from "./query-history/history-item-label-pro
 import {
   exportSelectedVariantAnalysisResults,
   exportVariantAnalysisResults,
-} from "./remote-queries/export-results";
+} from "./variant-analysis/export-results";
 import { EvalLogViewer } from "./eval-log-viewer";
 import { SummaryLanguageSupport } from "./log-insights/summary-language-support";
 import { JoinOrderScannerProvider } from "./log-insights/join-order";
@@ -117,16 +117,16 @@ import { createInitialQueryInfo } from "./run-queries-shared";
 import { LegacyQueryRunner } from "./legacy-query-server/legacyRunner";
 import { NewQueryRunner } from "./query-server/query-runner";
 import { QueryRunner } from "./queryRunner";
-import { VariantAnalysisView } from "./remote-queries/variant-analysis-view";
-import { VariantAnalysisViewSerializer } from "./remote-queries/variant-analysis-view-serializer";
+import { VariantAnalysisView } from "./variant-analysis/variant-analysis-view";
+import { VariantAnalysisViewSerializer } from "./variant-analysis/variant-analysis-view-serializer";
 import {
   VariantAnalysis,
   VariantAnalysisScannedRepository,
-} from "./remote-queries/shared/variant-analysis";
-import { VariantAnalysisManager } from "./remote-queries/variant-analysis-manager";
-import { createVariantAnalysisContentProvider } from "./remote-queries/variant-analysis-content-provider";
+} from "./variant-analysis/shared/variant-analysis";
+import { VariantAnalysisManager } from "./variant-analysis/variant-analysis-manager";
+import { createVariantAnalysisContentProvider } from "./variant-analysis/variant-analysis-content-provider";
 import { VSCodeMockGitHubApiServer } from "./mocks/vscode-mock-gh-api-server";
-import { VariantAnalysisResultsManager } from "./remote-queries/variant-analysis-results-manager";
+import { VariantAnalysisResultsManager } from "./variant-analysis/variant-analysis-results-manager";
 import { ExtensionApp } from "./common/vscode/vscode-app";
 import { RepositoriesFilterSortStateWithIds } from "./pure/variant-analysis-filter-sort";
 import { DbModule } from "./databases/db-module";

extensions/ql-vscode/src/interface-utils.ts

@@ -109,11 +109,7 @@ export function tryResolveLocation(
   }
 }
 
-export type WebviewView =
-  | "results"
-  | "compare"
-  | "remote-queries"
-  | "variant-analysis";
+export type WebviewView = "results" | "compare" | "variant-analysis";
 
 export interface WebviewMessage {
   t: string;

extensions/ql-vscode/src/mocks/gh-api-request.ts

@@ -1,8 +1,8 @@
-import { Repository } from "../remote-queries/gh-api/repository";
+import { Repository } from "../variant-analysis/gh-api/repository";
 import {
   VariantAnalysis,
   VariantAnalysisRepoTask,
-} from "../remote-queries/gh-api/variant-analysis";
+} from "../variant-analysis/gh-api/variant-analysis";
 
 // Types that represent requests/responses from the GitHub API
 // that we need to mock.

extensions/ql-vscode/src/pure/interface-types.ts

@@ -10,7 +10,7 @@ import {
   VariantAnalysis,
   VariantAnalysisScannedRepositoryResult,
   VariantAnalysisScannedRepositoryState,
-} from "../remote-queries/shared/variant-analysis";
+} from "../variant-analysis/shared/variant-analysis";
 import { RepositoriesFilterSortStateWithIds } from "./variant-analysis-filter-sort";
 
 /**

extensions/ql-vscode/src/pure/location-link-utils.ts

@@ -1,4 +1,4 @@
-import { FileLink } from "../remote-queries/shared/analysis-result";
+import { FileLink } from "../variant-analysis/shared/analysis-result";
 
 export function createRemoteFileRef(
   fileLink: FileLink,

extensions/ql-vscode/src/pure/sarif-utils.ts

@@ -1,5 +1,5 @@
 import * as Sarif from "sarif";
-import type { HighlightedRegion } from "../remote-queries/shared/analysis-result";
+import type { HighlightedRegion } from "../variant-analysis/shared/analysis-result";
 import { ResolvableLocationValue } from "./bqrs-cli-types";
 
 export interface SarifLink {

extensions/ql-vscode/src/pure/variant-analysis-filter-sort.ts

@@ -1,7 +1,7 @@
 import {
   Repository,
   RepositoryWithMetadata,
-} from "../remote-queries/shared/repository";
+} from "../variant-analysis/shared/repository";
 import { parseDate } from "./date";
 
 export enum SortKey {

extensions/ql-vscode/src/query-history/query-history-info.ts

@@ -5,7 +5,7 @@ import { pluralize } from "../pure/word";
 import {
   hasRepoScanCompleted,
   getActionsWorkflowRunUrl as getVariantAnalysisActionsWorkflowRunUrl,
-} from "../remote-queries/shared/variant-analysis";
+} from "../variant-analysis/shared/variant-analysis";
 
 export type QueryHistoryInfo = LocalQueryInfo | VariantAnalysisHistoryItem;
 

extensions/ql-vscode/src/query-history/query-history-manager.ts

@@ -60,9 +60,9 @@ import EvalLogTreeBuilder from "../eval-log-tree-builder";
 import { EvalLogData, parseViewerData } from "../pure/log-summary-parser";
 import { QueryWithResults } from "../run-queries-shared";
 import { QueryRunner } from "../queryRunner";
-import { VariantAnalysisManager } from "../remote-queries/variant-analysis-manager";
+import { VariantAnalysisManager } from "../variant-analysis/variant-analysis-manager";
 import { VariantAnalysisHistoryItem } from "./variant-analysis-history-item";
-import { getTotalResultCount } from "../remote-queries/shared/variant-analysis";
+import { getTotalResultCount } from "../variant-analysis/shared/variant-analysis";
 import { HistoryTreeDataProvider } from "./history-tree-data-provider";
 import { redactableError } from "../pure/errors";
 

extensions/ql-vscode/src/query-history/variant-analysis-history-item.ts

@@ -1,5 +1,5 @@
 import { QueryStatus } from "../query-status";
-import { VariantAnalysis } from "../remote-queries/shared/variant-analysis";
+import { VariantAnalysis } from "../variant-analysis/shared/variant-analysis";
 
 /**
  * Information about a variant analysis.

extensions/ql-vscode/src/query-status.ts

@@ -1,5 +1,5 @@
 import { assertNever } from "./pure/helpers-pure";
-import { VariantAnalysisStatus } from "./remote-queries/shared/variant-analysis";
+import { VariantAnalysisStatus } from "./variant-analysis/shared/variant-analysis";
 
 export enum QueryStatus {
   InProgress = "InProgress",

extensions/ql-vscode/src/stories/common/CodePaths.stories.tsx

@@ -4,7 +4,7 @@ import { ComponentStory, ComponentMeta } from "@storybook/react";
 import { ThemeProvider } from "@primer/react";
 
 import { CodePaths } from "../../view/common";
-import type { CodeFlow } from "../../remote-queries/shared/analysis-result";
+import type { CodeFlow } from "../../variant-analysis/shared/analysis-result";
 
 export default {
   title: "Code Paths",

extensions/ql-vscode/src/stories/variant-analysis/AnalysisAlertResult.stories.tsx

@@ -3,7 +3,7 @@ import * as React from "react";
 import { ComponentStory, ComponentMeta } from "@storybook/react";
 
 import AnalysisAlertResult from "../../view/variant-analysis/AnalysisAlertResult";
-import type { AnalysisAlert } from "../../remote-queries/shared/analysis-result";
+import type { AnalysisAlert } from "../../variant-analysis/shared/analysis-result";
 
 export default {
   title: "Variant Analysis/Analysis Alert Result",

extensions/ql-vscode/src/stories/variant-analysis/FailureReasonAlert.stories.tsx

@@ -1,7 +1,7 @@
 import * as React from "react";
 
 import { ComponentMeta, ComponentStory } from "@storybook/react";
-import { VariantAnalysisFailureReason } from "../../remote-queries/shared/variant-analysis";
+import { VariantAnalysisFailureReason } from "../../variant-analysis/shared/variant-analysis";
 import { FailureReasonAlert } from "../../view/variant-analysis/FailureReasonAlert";
 
 export default {

extensions/ql-vscode/src/stories/variant-analysis/RepoRow.stories.tsx

@@ -6,12 +6,12 @@ import { VariantAnalysisContainer } from "../../view/variant-analysis/VariantAna
 import {
   VariantAnalysisRepoStatus,
   VariantAnalysisScannedRepositoryDownloadStatus,
-} from "../../remote-queries/shared/variant-analysis";
+} from "../../variant-analysis/shared/variant-analysis";
 import {
   AnalysisAlert,
   AnalysisRawResults,
-} from "../../remote-queries/shared/analysis-result";
-import { createMockRepositoryWithMetadata } from "../../../test/factories/remote-queries/shared/repository";
+} from "../../variant-analysis/shared/analysis-result";
+import { createMockRepositoryWithMetadata } from "../../../test/factories/variant-analysis/shared/repository";
 
 import * as analysesResults from "../data/analysesResultsMessage.json";
 import * as rawResults from "../data/rawResults.json";

extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysis.stories.tsx

@@ -11,9 +11,9 @@ import {
   VariantAnalysisScannedRepositoryResult,
   VariantAnalysisScannedRepositoryState,
   VariantAnalysisStatus,
-} from "../../remote-queries/shared/variant-analysis";
-import { createMockVariantAnalysis } from "../../../test/factories/remote-queries/shared/variant-analysis";
-import { createMockRepositoryWithMetadata } from "../../../test/factories/remote-queries/shared/repository";
+} from "../../variant-analysis/shared/variant-analysis";
+import { createMockVariantAnalysis } from "../../../test/factories/variant-analysis/shared/variant-analysis";
+import { createMockRepositoryWithMetadata } from "../../../test/factories/variant-analysis/shared/repository";
 
 export default {
   title: "Variant Analysis/Variant Analysis",

extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisActions.stories.tsx

@@ -3,7 +3,7 @@ import * as React from "react";
 import { ComponentMeta, ComponentStory } from "@storybook/react";
 
 import { VariantAnalysisContainer } from "../../view/variant-analysis/VariantAnalysisContainer";
-import { VariantAnalysisStatus } from "../../remote-queries/shared/variant-analysis";
+import { VariantAnalysisStatus } from "../../variant-analysis/shared/variant-analysis";
 import { VariantAnalysisActions } from "../../view/variant-analysis/VariantAnalysisActions";
 
 export default {

extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisAnalyzedRepos.stories.tsx

@@ -10,11 +10,11 @@ import {
   VariantAnalysisRepoStatus,
   VariantAnalysisScannedRepositoryDownloadStatus,
   VariantAnalysisStatus,
-} from "../../remote-queries/shared/variant-analysis";
-import { AnalysisAlert } from "../../remote-queries/shared/analysis-result";
-import { createMockVariantAnalysis } from "../../../test/factories/remote-queries/shared/variant-analysis";
-import { createMockRepositoryWithMetadata } from "../../../test/factories/remote-queries/shared/repository";
-import { createMockScannedRepo } from "../../../test/factories/remote-queries/shared/scanned-repositories";
+} from "../../variant-analysis/shared/variant-analysis";
+import { AnalysisAlert } from "../../variant-analysis/shared/analysis-result";
+import { createMockVariantAnalysis } from "../../../test/factories/variant-analysis/shared/variant-analysis";
+import { createMockRepositoryWithMetadata } from "../../../test/factories/variant-analysis/shared/repository";
+import { createMockScannedRepo } from "../../../test/factories/variant-analysis/shared/scanned-repositories";
 
 import * as analysesResults from "../data/analysesResultsMessage.json";
 

extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisHeader.stories.tsx

@@ -7,9 +7,9 @@ import { VariantAnalysisHeader } from "../../view/variant-analysis/VariantAnalys
 import {
   VariantAnalysisRepoStatus,
   VariantAnalysisStatus,
-} from "../../remote-queries/shared/variant-analysis";
-import { createMockVariantAnalysis } from "../../../test/factories/remote-queries/shared/variant-analysis";
-import { createMockScannedRepo } from "../../../test/factories/remote-queries/shared/scanned-repositories";
+} from "../../variant-analysis/shared/variant-analysis";
+import { createMockVariantAnalysis } from "../../../test/factories/variant-analysis/shared/variant-analysis";
+import { createMockScannedRepo } from "../../../test/factories/variant-analysis/shared/scanned-repositories";
 
 export default {
   title: "Variant Analysis/Variant Analysis Header",

extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisOutcomePanels.stories.tsx

@@ -8,10 +8,10 @@ import { VariantAnalysisOutcomePanels } from "../../view/variant-analysis/Varian
 import {
   VariantAnalysisRepoStatus,
   VariantAnalysisStatus,
-} from "../../remote-queries/shared/variant-analysis";
-import { createMockScannedRepo } from "../../../test/factories/remote-queries/shared/scanned-repositories";
-import { createMockVariantAnalysis } from "../../../test/factories/remote-queries/shared/variant-analysis";
-import { createMockRepositoryWithMetadata } from "../../../test/factories/remote-queries/shared/repository";
+} from "../../variant-analysis/shared/variant-analysis";
+import { createMockScannedRepo } from "../../../test/factories/variant-analysis/shared/scanned-repositories";
+import { createMockVariantAnalysis } from "../../../test/factories/variant-analysis/shared/variant-analysis";
+import { createMockRepositoryWithMetadata } from "../../../test/factories/variant-analysis/shared/repository";
 import {
   defaultFilterSortState,
   RepositoriesFilterSortState,

extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisSkippedRepositoriesTab.stories.tsx

@@ -4,7 +4,7 @@ import { ComponentMeta, ComponentStory } from "@storybook/react";
 
 import { VariantAnalysisContainer } from "../../view/variant-analysis/VariantAnalysisContainer";
 import { VariantAnalysisSkippedRepositoriesTab } from "../../view/variant-analysis/VariantAnalysisSkippedRepositoriesTab";
-import { createMockRepositoryWithMetadata } from "../../../test/factories/remote-queries/shared/repository";
+import { createMockRepositoryWithMetadata } from "../../../test/factories/variant-analysis/shared/repository";
 
 export default {
   title: "Variant Analysis/Variant Analysis Skipped Repositories Tab",

extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisStats.stories.tsx

@@ -4,7 +4,7 @@ import { ComponentStory, ComponentMeta } from "@storybook/react";
 
 import { VariantAnalysisContainer } from "../../view/variant-analysis/VariantAnalysisContainer";
 import { VariantAnalysisStats } from "../../view/variant-analysis/VariantAnalysisStats";
-import { VariantAnalysisStatus } from "../../remote-queries/shared/variant-analysis";
+import { VariantAnalysisStatus } from "../../variant-analysis/shared/variant-analysis";
 
 export default {
   title: "Variant Analysis/Variant Analysis Stats",

extensions/ql-vscode/src/view/common/CodePaths/CodeFlowsDropdown.tsx

@@ -2,7 +2,7 @@ import * as React from "react";
 import { ChangeEvent, SetStateAction, useCallback } from "react";
 import { VSCodeDropdown, VSCodeOption } from "@vscode/webview-ui-toolkit/react";
 
-import { CodeFlow } from "../../../remote-queries/shared/analysis-result";
+import { CodeFlow } from "../../../variant-analysis/shared/analysis-result";
 
 const getCodeFlowName = (codeFlow: CodeFlow) => {
   const filePath =

extensions/ql-vscode/src/view/common/CodePaths/CodePath.tsx

@@ -4,7 +4,7 @@ import {
   AnalysisMessage,
   CodeFlow,
   ResultSeverity,
-} from "../../../remote-queries/shared/analysis-result";
+} from "../../../variant-analysis/shared/analysis-result";
 import { ThreadPath } from "./ThreadPath";
 
 type CodePathProps = {

extensions/ql-vscode/src/view/common/CodePaths/CodePaths.tsx

@@ -9,7 +9,7 @@ import {
   AnalysisMessage,
   CodeFlow,
   ResultSeverity,
-} from "../../../remote-queries/shared/analysis-result";
+} from "../../../variant-analysis/shared/analysis-result";
 import { CodePathsOverlay } from "./CodePathsOverlay";
 import { useTelemetryOnChange } from "../telemetry";
 

extensions/ql-vscode/src/view/common/CodePaths/CodePathsOverlay.tsx

@@ -6,7 +6,7 @@ import {
   AnalysisMessage,
   CodeFlow,
   ResultSeverity,
-} from "../../../remote-queries/shared/analysis-result";
+} from "../../../variant-analysis/shared/analysis-result";
 import { useTelemetryOnChange } from "../telemetry";
 import { SectionTitle } from "../SectionTitle";
 import { VerticalSpace } from "../VerticalSpace";

extensions/ql-vscode/src/view/common/CodePaths/ThreadPath.tsx

@@ -6,7 +6,7 @@ import {
   AnalysisMessage,
   ResultSeverity,
   ThreadFlow,
-} from "../../../remote-queries/shared/analysis-result";
+} from "../../../variant-analysis/shared/analysis-result";
 import { SectionTitle } from "../SectionTitle";
 import { FileCodeSnippet } from "../FileCodeSnippet";
 

extensions/ql-vscode/src/view/common/CodePaths/__tests__/CodePaths.spec.tsx

@@ -3,8 +3,8 @@ import { render as reactRender, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { CodePaths, CodePathsProps } from "../CodePaths";
 
-import { createMockCodeFlows } from "../../../../../test/factories/remote-queries/shared/CodeFlow";
-import { createMockAnalysisMessage } from "../../../../../test/factories/remote-queries/shared/AnalysisMessage";
+import { createMockCodeFlows } from "../../../../../test/factories/variant-analysis/shared/CodeFlow";
+import { createMockAnalysisMessage } from "../../../../../test/factories/variant-analysis/shared/AnalysisMessage";
 
 describe(CodePaths.name, () => {
   const render = (props?: CodePathsProps) =>

extensions/ql-vscode/src/view/common/FileCodeSnippet/CodeSnippetCode.tsx

@@ -1,7 +1,7 @@
 import * as React from "react";
 import styled from "styled-components";
 
-import { HighlightedRegion } from "../../../remote-queries/shared/analysis-result";
+import { HighlightedRegion } from "../../../variant-analysis/shared/analysis-result";
 import {
   parseHighlightedLine,
   shouldHighlightLine,

extensions/ql-vscode/src/view/common/FileCodeSnippet/CodeSnippetLine.tsx

@@ -5,7 +5,7 @@ import {
   AnalysisMessage,
   HighlightedRegion,
   ResultSeverity,
-} from "../../../remote-queries/shared/analysis-result";
+} from "../../../variant-analysis/shared/analysis-result";
 import { CodeSnippetCode } from "./CodeSnippetCode";
 import { CodeSnippetMessage } from "./CodeSnippetMessage";
 

extensions/ql-vscode/src/view/common/FileCodeSnippet/CodeSnippetMessage.tsx

@@ -5,7 +5,7 @@ import { VSCodeLink } from "@vscode/webview-ui-toolkit/react";
 import {
   AnalysisMessage,
   ResultSeverity,
-} from "../../../remote-queries/shared/analysis-result";
+} from "../../../variant-analysis/shared/analysis-result";
 import { createRemoteFileRef } from "../../../pure/location-link-utils";
 import { VerticalSpace } from "../VerticalSpace";
 import { sendTelemetry } from "../telemetry";

extensions/ql-vscode/src/view/common/FileCodeSnippet/FileCodeSnippet.tsx

@@ -8,7 +8,7 @@ import {
   FileLink,
   HighlightedRegion,
   ResultSeverity,
-} from "../../../remote-queries/shared/analysis-result";
+} from "../../../variant-analysis/shared/analysis-result";
 import { createRemoteFileRef } from "../../../pure/location-link-utils";
 import { CodeSnippetMessage } from "./CodeSnippetMessage";
 import { CodeSnippetLine } from "./CodeSnippetLine";

extensions/ql-vscode/src/view/variant-analysis/AnalysisAlertResult.tsx

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { AnalysisAlert } from "../../remote-queries/shared/analysis-result";
+import { AnalysisAlert } from "../../variant-analysis/shared/analysis-result";
 import { CodePaths, FileCodeSnippet } from "../common";
 
 const AnalysisAlertResult = ({ alert }: { alert: AnalysisAlert }) => {

extensions/ql-vscode/src/view/variant-analysis/AnalyzedRepoItemContent.tsx

@@ -3,13 +3,13 @@ import styled from "styled-components";
 import {
   AnalysisAlert,
   AnalysisRawResults,
-} from "../../remote-queries/shared/analysis-result";
+} from "../../variant-analysis/shared/analysis-result";
 import AnalysisAlertResult from "./AnalysisAlertResult";
 import RawResultsTable from "./RawResultsTable";
 import {
   VariantAnalysisRepoStatus,
   VariantAnalysisScannedRepositoryDownloadStatus,
-} from "../../remote-queries/shared/variant-analysis";
+} from "../../variant-analysis/shared/variant-analysis";
 import { Alert } from "../common";
 
 const ContentContainer = styled.div`