[Unified Recorder] Call proxy-tool through dev-tool

common/tools/dev-tool/package.json

@@ -41,6 +41,7 @@
   "private": true,
   "prettier": "../eslint-plugin-azure-sdk/prettier.json",
   "dependencies": {
+    "concurrently": "^6.3.0",
     "chalk": "~4.1.1",
     "dotenv": "^8.2.0",
     "fs-extra": "^8.1.0",
@@ -56,6 +57,7 @@
     "@rollup/plugin-json": "^4.0.0",
     "@rollup/plugin-multi-entry": "^3.0.0",
     "@rollup/plugin-node-resolve": "^8.0.0",
+    "@types/concurrently": "^6.3.0",
     "@types/chai": "^4.1.6",
     "@types/chai-as-promised": "^7.1.0",
     "@types/fs-extra": "^8.0.0",

common/tools/dev-tool/src/commands/index.ts

@@ -12,7 +12,9 @@ const log = createPrinter("dev-tool");
 export const baseCommands = {
   about: () => import("./about"),
   package: () => import("./package"),
-  samples: () => import("./samples")
+  samples: () => import("./samples"),
+  "test-proxy": () => import("./test-proxy"),
+  run: () => import("./run")
 } as const;
 
 /**

common/tools/dev-tool/src/commands/run/index.ts

@@ -0,0 +1,12 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license
+
+import { subCommand, makeCommandInfo } from "../../framework/command";
+
+export const commandInfo = makeCommandInfo("run", "run scripts such as test:node");
+
+export default subCommand(commandInfo, {
+  "test:node-ts-input": () => import("./testNodeTSInput"),
+  "test:node-js-input": () => import("./testNodeJSInput"),
+  "test:browser": () => import("./testBrowser")
+});

common/tools/dev-tool/src/commands/run/testBrowser.ts

@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license
+
+import { leafCommand, makeCommandInfo } from "../../framework/command";
+import { runTestsWithProxyTool } from "./testUtils";
+
+export const commandInfo = makeCommandInfo(
+  "test:browser",
+  "runs the browser tests using karma with the default and the provided options; starts the proxy-tool in record and playback modes",
+  {
+    karma: {
+      kind: "string",
+      description: "Karma options (such as --single-run)",
+      default: "--single-run"
+    }
+  }
+);
+
+export default leafCommand(commandInfo, async (options) => {
+  return runTestsWithProxyTool({
+    command: `karma start ${options.karma}`,
+    name: "browser-tests"
+  });
+});

common/tools/dev-tool/src/commands/run/testNodeJSInput.ts

@@ -0,0 +1,25 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license
+
+import { leafCommand, makeCommandInfo } from "../../framework/command";
+import { runTestsWithProxyTool } from "./testUtils";
+
+export const commandInfo = makeCommandInfo(
+  "test:node-js-input",
+  "runs the node tests using mocha with the default and the provided options; starts the proxy-tool in record and playback modes",
+  {
+    mocha: {
+      kind: "string",
+      description:
+        "Mocha options along with the bundled test file(JS) with rollup as expected by mocha",
+      default: '--timeout 5000000 "dist-esm/test/{,!(browser)/**/}/*.spec.js"'
+    }
+  }
+);
+
+export default leafCommand(commandInfo, async (options) => {
+  return runTestsWithProxyTool({
+    command: `nyc mocha -r esm --require source-map-support/register --reporter ../../../common/tools/mocha-multi-reporter.js --full-trace ${options.mocha}`,
+    name: "node-tests"
+  });
+});

common/tools/dev-tool/src/commands/run/testNodeTSInput.ts

@@ -0,0 +1,25 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license
+
+import { leafCommand, makeCommandInfo } from "../../framework/command";
+import { runTestsWithProxyTool } from "./testUtils";
+
+export const commandInfo = makeCommandInfo(
+  "test:node-ts-input",
+  "runs the node tests using mocha with the default and the provided options; starts the proxy-tool in record and playback modes",
+  {
+    mocha: {
+      kind: "string",
+      description:
+        "Mocha options along with the test files(glob pattern) in TS as expected by mocha",
+      default: '--timeout 1200000 --exclude "test/**/browser/*.spec.ts" "test/**/*.spec.ts"'
+    }
+  }
+);
+
+export default leafCommand(commandInfo, async (options) => {
+  return runTestsWithProxyTool({
+    command: `mocha -r esm -r ts-node/register --reporter ../../../common/tools/mocha-multi-reporter.js --full-trace ${options.mocha}`,
+    name: "node-tests"
+  });
+});

common/tools/dev-tool/src/commands/run/testUtils.ts

@@ -0,0 +1,44 @@
+import { isProxyToolActive } from "../../util/testProxyUtils";
+import concurrently from "concurrently";
+import { createPrinter } from "../../util/printer";
+
+const log = createPrinter("preparing-proxy-tool");
+
+async function shouldRunProxyTool(): Promise<boolean> {
+  const mode = process.env.TEST_MODE;
+  if (mode === "live") {
+    return false; // No need to start the proxy tool in the live mode
+  } else {
+    try {
+      await isProxyToolActive();
+      // No need to run a new one if it is already active
+      // Especially, CI uses this path
+      log.info(
+        `Proxy tool seems to be active, not attempting to start the test proxy at http://localhost:5000 & https://localhost:5001.\n`
+      );
+      return false;
+    } catch (error) {
+      if ((error as { code: string }).code === "ECONNREFUSED") {
+        // Proxy tool is not active, attempt to start the proxy tool now
+        return true;
+      } else {
+        throw error;
+      }
+    }
+  }
+}
+
+export async function runTestsWithProxyTool(testCommandObj: concurrently.CommandObj) {
+  const testProxyCMD = "dev-tool test-proxy start";
+  if (
+    await shouldRunProxyTool() // Boolean to figure out if we need to run just the mocha command or the test-proxy too
+  ) {
+    await concurrently([{ command: testProxyCMD }, testCommandObj], {
+      killOthers: ["failure", "success"],
+      successCondition: "first"
+    });
+  } else {
+    await concurrently([testCommandObj]);
+  }
+  return true;
+}

common/tools/dev-tool/src/commands/test-proxy/index.ts

@@ -0,0 +1,13 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license
+
+import { subCommand, makeCommandInfo } from "../../framework/command";
+
+export const commandInfo = makeCommandInfo(
+  "test-proxy",
+  "runs the proxy-tool with the `docker run ...` command"
+);
+
+export default subCommand(commandInfo, {
+  start: () => import("./start")
+});

common/tools/dev-tool/src/commands/test-proxy/start.ts

@@ -0,0 +1,18 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+import { leafCommand, makeCommandInfo } from "../../framework/command";
+import { config } from "dotenv";
+import { startProxyTool } from "../../util/testProxyUtils";
+config();
+
+export const commandInfo = makeCommandInfo(
+  "test-proxy",
+  "runs the proxy-tool with the `docker run ...` command",
+  {}
+);
+
+export default leafCommand(commandInfo, async (_options) => {
+  await startProxyTool(undefined);
+  return true;
+});

common/tools/dev-tool/src/util/testProxyUtils.ts

@@ -0,0 +1,83 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+import { spawn } from "child_process";
+import path from "path";
+import { IncomingMessage, request, RequestOptions } from "http";
+import fs from "fs-extra";
+import { createPrinter } from "./printer";
+
+const log = createPrinter("test-proxy");
+export async function startProxyTool(mode: string | undefined) {
+  log.info(`===TEST_MODE="${mode}"===`);
+  log.info(
+    `Attempting to start test proxy at http://localhost:5000 & https://localhost:5001.\n`
+  );
+
+  const subprocess = spawn(await getDockerRunCommand(), [], {
+    shell: true
+  });
+
+  const outFileName = "test-proxy-output.log";
+  const out = fs.createWriteStream(`./${outFileName}`,{flags:'a'});
+  subprocess.stdout.pipe(out);
+  subprocess.stderr.pipe(out);
+
+  log.info(`Check the output file "${outFileName}" for test-proxy logs.`);
+}
+
+async function getRootLocation(start?: string): Promise<string> {
+  start ??= process.cwd();
+  if (await fs.pathExists(path.join(start, "rush.json"))) {
+    return start;
+  } else {
+    const nextPath = path.resolve(start, "..");
+    if (nextPath === start) {
+      throw new Error("Reached filesystem root, but no rush.json was found.");
+    } else {
+      return getRootLocation(nextPath);
+    }
+  }
+}
+
+async function getDockerRunCommand() {
+  const repoRoot = await getRootLocation(); // /workspaces/azure-sdk-for-js/
+  const testProxyRecordingsLocation = "/etc/testproxy";
+  const allowLocalhostAccess = "--add-host host.docker.internal:host-gateway";
+  const imageToLoad = `azsdkengsys.azurecr.io/engsys/testproxy-lin:${await getImageTag()}`;
+  return `docker run -v ${repoRoot}:${testProxyRecordingsLocation} -p 5001:5001 -p 5000:5000 ${allowLocalhostAccess} ${imageToLoad}`;
+}
+
+export async function isProxyToolActive() {
+  await makeRequest("http://localhost:5000/info/available", {});
+  log.info(`Proxy tool seems to be active at http://localhost:5000\n`);
+}
+
+async function makeRequest(uri: string, requestOptions: RequestOptions): Promise<IncomingMessage> {
+  return new Promise<IncomingMessage>((resolve, reject) => {
+    const req = request(uri, requestOptions, resolve);
+    req.once("error", reject);
+    req.end();
+  });
+}
+
+async function getImageTag() {
+  // Grab the tag from the `/eng/common/testproxy/docker-start-proxy.ps1` file [..is used to run the proxy-tool in the CI]
+  //
+  // $SELECTED_IMAGE_TAG = "1147815";
+  // (Bot regularly updates the tag in the file above.)
+  try {
+    const contentInPWSHScript = await fs.readFile(
+      `${path.join(await getRootLocation(), "eng/common/testproxy/docker-start-proxy.ps1")}`,
+      "utf-8"
+    );
+    const tag = contentInPWSHScript.match(/\$SELECTED_IMAGE_TAG \= \"(.*)\"/)![1];
+    log.info(`Image tag obtained from the powershell script => ${tag}\n`);
+    return tag;
+  } catch (_) {
+    log.warn(
+      `Unable to get the image tag from the powershell script, trying "latest" tag instead\n`
+    );
+    return "latest";
+  }
+}

sdk/test-utils/recorder-new/package.json

@@ -21,20 +21,20 @@
     "clean": "rimraf dist dist-esm test-dist typings *.tgz *.log",
     "extract-api": "echo skipped",
     "format": "prettier --write --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.ts\" \"test/**/*.ts\" \"*.{js,json}\"",
-    "integration-test:browser": "echo skipped",
-    "integration-test:node": "echo skipped",
+    "integration-test:browser": "concurrently \"npm run tests:server\" \"npm run test:browser-with-proxy\" --kill-others --success first",
+    "integration-test:node": "concurrently \"npm run tests:server\" \"npm run test:node-with-proxy\" --kill-others --success first",
+    "test:node-with-proxy": "dev-tool run test:node-ts-input --mocha=\"--timeout 1200000 'test/*.spec.ts'\"",
+    "test:browser-with-proxy": "dev-tool run test:browser",
     "integration-test": "npm run integration-test:node && npm run integration-test:browser",
     "tests:server": "cross-env TS_NODE_COMPILER_OPTIONS=\"{\\\"module\\\": \\\"commonjs\\\"}\" ts-node test/utils/server.ts",
-    "temp-integration-test:browser": "concurrently \"npm run tests:server\" \"karma start --single-run\" --kill-others --success first",
-    "temp-integration-test:node": "concurrently \"npm run tests:server\" \"nyc mocha -r esm --require ts-node/register --reporter ../../../common/tools/mocha-multi-reporter.js --timeout 5000000 --full-trace 'test/*.spec.ts'\" --kill-others --success first",
     "lint:fix": "eslint package.json src test --ext .ts --fix --fix-type [problem,suggestion]",
     "lint": "eslint package.json src test --ext .ts -f html -o recorder-lintReport.html || exit 0",
     "pack": "npm pack 2>&1",
-    "unit-test:browser": "echo skipped",
-    "unit-test:node": "echo skipped",
+    "unit-test:browser": "npm run integration-test:browser",
+    "unit-test:node": "npm run integration-test:node",
     "unit-test": "npm run unit-test:node && npm run unit-test:browser",
     "test:browser": "npm run clean && npm run build && npm run temp-integration-test:browser",
-    "test:node": "npm run clean && npm run build:test && npm run temp-integration-test:node",
+    "test:node": "npm run clean && npm run build:test && npm run integration-test:node",
     "test": "npm run clean && npm run build:test && npm run unit-test",
     "docs": "echo Skipped."
   },

sdk/test-utils/testing-recorder-new/README.md

@@ -12,3 +12,4 @@ You will need to create a local `.env` file under the same directory as this rea
       "STORAGE_CONNECTION_STRING",
       "STORAGE_SAS_URL",
       "TABLES_SAS_CONNECTION_STRING"
+```

sdk/test-utils/testing-recorder-new/package.json

@@ -17,14 +17,14 @@
     "clean": "rimraf dist dist-esm test-dist types *.tgz",
     "extract-api": "echo skipped",
     "format": "prettier --write --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.ts\" \"test/**/*.ts\" \"*.{js,json}\"",
-    "integration-test:browser": "karma start --single-run",
-    "integration-test:node": "mocha -r esm --require ts-node/register --reporter ../../../common/tools/mocha-multi-reporter.js --timeout 1200000 --full-trace \"test/*.spec.ts\"",
+    "integration-test:browser": "dev-tool run test:browser",
+    "integration-test:node": "dev-tool run test:node-ts-input --mocha=\"--timeout 1200000 'test/*.spec.ts'\"",
     "integration-test": "npm run integration-test:node && npm run integration-test:browser",
     "lint:fix": "eslint package.json src test --ext .ts --fix --fix-type [problem,suggestion]",
     "lint": "eslint package.json src test --ext .ts -f html -o recorder-lintReport.html || exit 0",
     "pack": "npm pack 2>&1",
-    "unit-test:browser": "echo skipped",
-    "unit-test:node": "echo skipped",
+    "unit-test:browser": "npm run integration-test:browser",
+    "unit-test:node": "npm run integration-test:node",
     "unit-test": "npm run unit-test:node && npm run unit-test:browser",
     "test:browser": "npm run clean && npm run build && npm run integration-test:browser",
     "test:node": "npm run clean && npm run build:test && npm run integration-test:node",