Merge pull request #2084 from github/koesie10/remove-remote-queries

Remove remaining remote queries code

Author: koesie10

extensions/ql-vscode/src/extension.ts

@@ -10,7 +10,6 @@ import {
   languages,
   ProgressLocation,
   ProgressOptions,
-  ProviderResult,
   QuickPickItem,
   Range,
   Uri,
@@ -101,14 +100,13 @@ import {
   withProgress,
 } from "./commandRunner";
 import { CodeQlStatusBarHandler } from "./status-bar";
-import { URLSearchParams } from "url";
 import {
   handleDownloadPacks,
   handleInstallPackDependencies,
 } from "./packaging";
 import { HistoryItemLabelProvider } from "./query-history/history-item-label-provider";
 import {
-  exportSelectedRemoteQueryResults,
+  exportSelectedVariantAnalysisResults,
   exportVariantAnalysisResults,
 } from "./remote-queries/export-results";
 import { EvalLogViewer } from "./eval-log-viewer";
@@ -1077,8 +1075,6 @@ async function activateWithInstalledDistribution(
     ),
   );
 
-  registerRemoteQueryTextProvider();
-
   // The "runVariantAnalysis" command is internal-only.
   ctx.subscriptions.push(
     commandRunnerWithProgress(
@@ -1177,7 +1173,7 @@ async function activateWithInstalledDistribution(
 
   ctx.subscriptions.push(
     commandRunner("codeQL.exportSelectedVariantAnalysisResults", async () => {
-      await exportSelectedRemoteQueryResults(qhm);
+      await exportSelectedVariantAnalysisResults(qhm);
     }),
   );
 
@@ -1613,21 +1609,6 @@ async function initializeLogging(ctx: ExtensionContext): Promise<void> {
 
 const checkForUpdatesCommand = "codeQL.checkForUpdatesToCLI";
 
-/**
- * This text provider lets us open readonly files in the editor.
- *
- * TODO: Consolidate this with the 'codeql' text provider in query-history-manager.ts.
- */
-function registerRemoteQueryTextProvider() {
-  workspace.registerTextDocumentContentProvider("remote-query", {
-    provideTextDocumentContent(uri: Uri): ProviderResult<string> {
-      const params = new URLSearchParams(uri.query);
-
-      return params.get("queryText");
-    },
-  });
-}
-
 const avoidVersionCheck = "avoid-version-check-at-startup";
 const lastVersionChecked = "last-version-checked";
 async function assertVSCodeVersionGreaterThan(

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

@@ -1,9 +1,4 @@
 import * as sarif from "sarif";
-import { AnalysisResults } from "../remote-queries/shared/analysis-result";
-import {
-  AnalysisSummary,
-  RemoteQueryResult,
-} from "../remote-queries/shared/remote-query-result";
 import {
   RawResultSet,
   ResultRow,
@@ -58,13 +53,6 @@ export interface QueryMetadata {
   scored?: string;
 }
 
-export interface PreviousExecution {
-  queryName: string;
-  time: string;
-  databaseName: string;
-  durationSeconds: number;
-}
-
 export type SarifInterpretationData = {
   t: "SarifInterpretationData";
   /**
@@ -222,11 +210,6 @@ export interface OpenFileMsg {
   filePath: string;
 }
 
-export interface OpenVirtualFileMsg {
-  t: "openVirtualFile";
-  queryText: string;
-}
-
 /**
  * Message from the results view to toggle the display of
  * query diagnostics.
@@ -353,12 +336,6 @@ export interface SetComparisonsMessage {
   readonly databaseUri: string;
 }
 
-export enum DiffKind {
-  Add = "Add",
-  Remove = "Remove",
-  Change = "Change",
-}
-
 /**
  * from is the set of rows that have changes in the "from" query.
  * to is the set of rows that have changes in the "to" query.
@@ -407,56 +384,6 @@ export interface ParsedResultSets {
   resultSet: ResultSet;
 }
 
-export type FromRemoteQueriesMessage =
-  | ViewLoadedMsg
-  | RemoteQueryErrorMessage
-  | OpenFileMsg
-  | OpenVirtualFileMsg
-  | RemoteQueryDownloadAnalysisResultsMessage
-  | RemoteQueryDownloadAllAnalysesResultsMessage
-  | RemoteQueryExportResultsMessage
-  | CopyRepoListMessage
-  | TelemetryMessage;
-
-export type ToRemoteQueriesMessage =
-  | SetRemoteQueryResultMessage
-  | SetAnalysesResultsMessage;
-
-export interface SetRemoteQueryResultMessage {
-  t: "setRemoteQueryResult";
-  queryResult: RemoteQueryResult;
-}
-
-export interface SetAnalysesResultsMessage {
-  t: "setAnalysesResults";
-  analysesResults: AnalysisResults[];
-}
-
-export interface RemoteQueryErrorMessage {
-  t: "remoteQueryError";
-  error: string;
-}
-
-export interface RemoteQueryDownloadAnalysisResultsMessage {
-  t: "remoteQueryDownloadAnalysisResults";
-  analysisSummary: AnalysisSummary;
-}
-
-export interface RemoteQueryDownloadAllAnalysesResultsMessage {
-  t: "remoteQueryDownloadAllAnalysesResults";
-  analysisSummaries: AnalysisSummary[];
-}
-
-export interface RemoteQueryExportResultsMessage {
-  t: "remoteQueryExportResults";
-  queryId: string;
-}
-
-export interface CopyRepoListMessage {
-  t: "copyRepoList";
-  queryId: string;
-}
-
 export interface SetVariantAnalysisMessage {
   t: "setVariantAnalysis";
   variantAnalysis: VariantAnalysis;

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

@@ -22,7 +22,7 @@ export function getRawQueryName(item: QueryHistoryInfo): string {
 
 /**
  * Gets an identifier for the query history item which could be
- * a local/remote query or a variant analysis. This id isn't guaranteed
+ * a local query or a variant analysis. This id isn't guaranteed
  * to be unique for each item in the query history.
  * @param item the history item.
  * @returns the id of the query or variant analysis.

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

@@ -755,14 +755,12 @@ export class QueryHistoryManager extends DisposableObject {
     ) {
       // show original query file on double click
       await this.handleOpenQuery(finalSingleItem, [finalSingleItem]);
-    } else {
+    } else if (
+      finalSingleItem.t === "variant-analysis" ||
+      finalSingleItem.status === QueryStatus.Completed
+    ) {
       // show results on single click (if results view is available)
-      if (
-        finalSingleItem.t === "variant-analysis" ||
-        finalSingleItem.status === QueryStatus.Completed
-      ) {
-        await this.openQueryResults(finalSingleItem);
-      }
+      await this.openQueryResults(finalSingleItem);
     }
   }
 
@@ -797,6 +795,8 @@ export class QueryHistoryManager extends DisposableObject {
       return this.variantAnalysisManager.getVariantAnalysisStorageLocation(
         queryHistoryItem.variantAnalysis.id,
       );
+    } else {
+      assertNever(queryHistoryItem);
     }
 
     throw new Error("Unable to get query directory");
@@ -830,6 +830,8 @@ export class QueryHistoryManager extends DisposableObject {
         ),
         "timestamp",
       );
+    } else {
+      assertNever(finalSingleItem);
     }
 
     if (externalFilePath) {
@@ -994,6 +996,8 @@ export class QueryHistoryManager extends DisposableObject {
             "codeQL.cancelVariantAnalysis",
             item.variantAnalysis.id,
           );
+        } else {
+          assertNever(item);
         }
       }
     });
@@ -1185,17 +1189,19 @@ export class QueryHistoryManager extends DisposableObject {
       multiSelect,
     );
 
-    // Remote queries only
-    if (!this.assertSingleQuery(finalMultiSelect) || !finalSingleItem) {
+    // Variant analyses only
+    if (
+      !this.assertSingleQuery(finalMultiSelect) ||
+      !finalSingleItem ||
+      finalSingleItem.t !== "variant-analysis"
+    ) {
       return;
     }
 
-    if (finalSingleItem.t === "variant-analysis") {
-      await commands.executeCommand(
-        "codeQL.copyVariantAnalysisRepoList",
-        finalSingleItem.variantAnalysis.id,
-      );
-    }
+    await commands.executeCommand(
+      "codeQL.copyVariantAnalysisRepoList",
+      finalSingleItem.variantAnalysis.id,
+    );
   }
 
   async handleExportResults(
@@ -1207,17 +1213,19 @@ export class QueryHistoryManager extends DisposableObject {
       multiSelect,
     );
 
-    if (!this.assertSingleQuery(finalMultiSelect) || !finalSingleItem) {
+    // Variant analysis only
+    if (
+      !this.assertSingleQuery(finalMultiSelect) ||
+      !finalSingleItem ||
+      finalSingleItem.t !== "variant-analysis"
+    ) {
       return;
     }
 
-    // Variant analysis only
-    if (finalSingleItem.t === "variant-analysis") {
-      await commands.executeCommand(
-        "codeQL.exportVariantAnalysisResults",
-        finalSingleItem.variantAnalysis.id,
-      );
-    }
+    await commands.executeCommand(
+      "codeQL.exportVariantAnalysisResults",
+      finalSingleItem.variantAnalysis.id,
+    );
   }
 
   addQuery(item: QueryHistoryInfo) {
@@ -1290,7 +1298,7 @@ the file in the file explorer and dragging it into the workspace.`,
     singleItem: QueryHistoryInfo,
     multiSelect: QueryHistoryInfo[],
   ): Promise<CompletedLocalQueryInfo | undefined> {
-    // Remote queries cannot be compared
+    // Variant analyses cannot be compared
     if (
       singleItem.t !== "local" ||
       multiSelect.some((s) => s.t !== "local") ||

extensions/ql-vscode/src/remote-queries/download-link.ts

@@ -21,7 +21,6 @@ import {
 } from "./markdown-generation";
 import { pluralize } from "../pure/word";
 import { VariantAnalysisManager } from "./variant-analysis-manager";
-import { assertNever } from "../pure/helpers-pure";
 import {
   VariantAnalysis,
   VariantAnalysisScannedRepository,
@@ -35,32 +34,28 @@ import {
 import { Credentials } from "../common/authentication";
 
 /**
- * Exports the results of the currently-selected remote query or variant analysis.
+ * Exports the results of the currently-selected variant analysis.
  */
-export async function exportSelectedRemoteQueryResults(
+export async function exportSelectedVariantAnalysisResults(
   queryHistoryManager: QueryHistoryManager,
 ): Promise<void> {
   const queryHistoryItem = queryHistoryManager.getCurrentQueryHistoryItem();
-  if (!queryHistoryItem || queryHistoryItem.t === "local") {
+  if (!queryHistoryItem || queryHistoryItem.t !== "variant-analysis") {
     throw new Error(
       "No variant analysis results currently open. To open results, click an item in the query history view.",
     );
   }
 
-  if (queryHistoryItem.t === "variant-analysis") {
-    return commands.executeCommand(
-      "codeQL.exportVariantAnalysisResults",
-      queryHistoryItem.variantAnalysis.id,
-    );
-  } else {
-    assertNever(queryHistoryItem);
-  }
+  return commands.executeCommand(
+    "codeQL.exportVariantAnalysisResults",
+    queryHistoryItem.variantAnalysis.id,
+  );
 }
 
 const MAX_VARIANT_ANALYSIS_EXPORT_PROGRESS_STEPS = 2;
 
 /**
- * Exports the results of the given or currently-selected remote query.
+ * Exports the results of the given or currently-selected variant analysis.
  * The user is prompted to select the export format.
  */
 export async function exportVariantAnalysisResults(