Merge remote-tracking branch 'origin/main' into koesie10/split-remote-query-flows

Author: koesie10

extensions/ql-vscode/package-lock.json

@@ -1421,6 +1421,7 @@
     "proxyquire": "~2.1.3",
     "sinon": "~14.0.0",
     "sinon-chai": "~3.5.0",
+    "tar-stream": "^2.2.0",
     "through2": "^4.0.2",
     "ts-jest": "^29.0.1",
     "ts-json-schema-generator": "^1.1.2",

extensions/ql-vscode/package.json

@@ -16,7 +16,7 @@ import {
 export class DbTreeViewItem extends vscode.TreeItem {
   constructor(
     public readonly dbItem: DbItem | undefined,
-    public readonly iconPath: vscode.ThemeIcon | undefined,
+    public readonly icon: vscode.ThemeIcon | undefined,
     public readonly label: string,
     public readonly tooltip: string | undefined,
     public readonly collapsibleState: vscode.TreeItemCollapsibleState,

extensions/ql-vscode/src/databases/ui/db-tree-view-item.ts

@@ -2,14 +2,14 @@
  * Contains an assortment of helper constants and functions for working with dates.
  */
 
-const dateWithoutYearFormatter = new Intl.DateTimeFormat(undefined, {
+const dateWithoutYearFormatter = new Intl.DateTimeFormat('en-US', {
   month: 'short',
   day: 'numeric',
   hour: 'numeric',
   minute: '2-digit',
 });
 
-const dateFormatter = new Intl.DateTimeFormat(undefined, {
+const dateFormatter = new Intl.DateTimeFormat('en-US', {
   year: 'numeric',
   month: 'short',
   day: 'numeric',

extensions/ql-vscode/src/pure/date.ts

@@ -19,7 +19,7 @@ import { RequestError } from '@octokit/types/dist-types';
 import { QueryMetadata } from '../pure/interface-types';
 import { REPO_REGEX } from '../pure/helpers-pure';
 import * as ghApiClient from './gh-api/gh-api-client';
-import { getRepositorySelection, isValidSelection } from './repository-selection';
+import { getRepositorySelection, isValidSelection, RepositorySelection } from './repository-selection';
 import { Repository } from './shared/repository';
 
 export interface QlPack {
@@ -166,13 +166,24 @@ async function getPackedBundlePath(queryPackDir: string) {
   });
 }
 
+export interface PreparedRemoteQuery {
+  actionBranch: string;
+  base64Pack: string;
+  repoSelection: RepositorySelection;
+  queryFile: string;
+  queryMetadata: QueryMetadata | undefined;
+  controllerRepo: Repository;
+  queryStartTime: number;
+  language: string;
+}
+
 export async function prepareRemoteQueryRun(
   cliServer: cli.CodeQLCliServer,
   credentials: Credentials,
   uri: Uri | undefined,
   progress: ProgressCallback,
   token: CancellationToken,
-) {
+): Promise<PreparedRemoteQuery> {
   if (!(await cliServer.cliConstraints.supportsRemoteQueries())) {
     throw new Error(`Variant analysis is not supported by this version of CodeQL. Please upgrade to v${cli.CliVersionConstraint.CLI_VERSION_REMOTE_QUERIES
       } or later.`);

extensions/ql-vscode/src/remote-queries/run-remote-query.ts

@@ -214,7 +214,7 @@ describe('db panel', async () => {
   ): void {
     expect(item.label).to.equal(`Top ${n} repositories`);
     expect(item.tooltip).to.equal(`Top ${n} repositories of a language`);
-    expect(item.iconPath).to.deep.equal(new vscode.ThemeIcon('github'));
+    expect(item.icon).to.deep.equal(new vscode.ThemeIcon('github'));
     expect(item.collapsibleState).to.equal(vscode.TreeItemCollapsibleState.None);
   }
 
@@ -225,7 +225,7 @@ describe('db panel', async () => {
   ): void {
     expect(item.label).to.equal(listName);
     expect(item.tooltip).to.be.undefined;
-    expect(item.iconPath).to.be.undefined;
+    expect(item.icon).to.be.undefined;
     expect(item.collapsibleState).to.equal(vscode.TreeItemCollapsibleState.Collapsed);
     expect(item.children).to.be.ok;
     expect(item.children.length).to.equal(repos.length);
@@ -241,7 +241,7 @@ describe('db panel', async () => {
   ): void {
     expect(item.label).to.equal(ownerName);
     expect(item.tooltip).to.be.undefined;
-    expect(item.iconPath).to.deep.equal(new vscode.ThemeIcon('organization'));
+    expect(item.icon).to.deep.equal(new vscode.ThemeIcon('organization'));
     expect(item.collapsibleState).to.equal(vscode.TreeItemCollapsibleState.None);
     expect(item.children).to.be.ok;
     expect(item.children.length).to.equal(0);
@@ -253,7 +253,7 @@ describe('db panel', async () => {
   ): void {
     expect(item.label).to.equal(repoName);
     expect(item.tooltip).to.be.undefined;
-    expect(item.iconPath).to.deep.equal(new vscode.ThemeIcon('database'));
+    expect(item.icon).to.deep.equal(new vscode.ThemeIcon('database'));
     expect(item.collapsibleState).to.equal(vscode.TreeItemCollapsibleState.None);
   }
 });

extensions/ql-vscode/src/vscode-tests/minimal-workspace/databases/db-panel.test.ts

@@ -10,7 +10,7 @@ export interface QueryPackFS {
   directoryContents: (name: string) => string[];
 }
 
-export const readBundledPack = async (base64Pack: string): Promise<QueryPackFS> => {
+export async function readBundledPack(base64Pack: string): Promise<QueryPackFS> {
   const buffer = Buffer.from(base64Pack, 'base64');
   const stream = Readable.from(buffer);
 
@@ -73,4 +73,4 @@ export const readBundledPack = async (base64Pack: string): Promise<QueryPackFS>
         .map(dir => dir.substring(name.length + 1));
     },
   };
-};
+}