Package vulnerability updates and 2.16.6 RC (#508)

* packaging and testing updates

updated package vulnerabilities

updated vscode -> vscode-test

updated version to 2.16.6-rc

* Changelog updates

* Updated travis.yml env vars for deployment

* Fix test path

* Added license (back) to modified files

Co-authored-by: Ryan Kelly <rykelly@microsoft.com>

.travis.yml

@@ -45,4 +45,4 @@ deploy:
 env:
   global:
   - ISPRODTAG=^v?[0-9]+\.[0-9]+\.[0-9]+$
-  - secure: QIU9zRXZ3ncIjbUuUMqY+AAtf17m7utHgIh8dG8nbK2u6XY0V30f8PDsgwJraSIF6k7HLnaC50eDMmMR2cPbgb4COTa9xmVqf1CHKkbVpgsJIP+PmV5TUQ+tczu1B65NrRfL/8Wki1vLgTLqSGjN54dk1npnTwLP46vryCJ2jYGsjcVDNKtaM7y5PNTiMSOPOSKYRNw36RX52O3+toxweyM5a4/p4dYU44QYY76YmMrgV1g7TcThzHbFe5q6eWjmkKlKm1Ckqru0vpPOPgd99BtR6ORMarW5/1wVZsDgDpgi6KyvbTrcnRadjioqYkoRTiPjCgHoJPxLgAv1rY2a84H9IKhhpc5PUe6HK+mMAnZGHieodCSqHFWtS3cPPpeiqW0nJCUPX9GqikA/uo+NIBN8WBaqfDO7JPUzWDJFxXmC1A3mMPahc1dvzu8OtwbJjC///R5k9wbKld8WTbe4OovVkPgR3kyY9Bw3ERYGFy4+voXiZI2b6rwNPKWVMNs+ugkBHM57lBTI7sWa8k1T8gu60A3144iRGJtIlkBt6Ghs70hN+E41f8tcDxluXU+LTy1Nh8IVnRpsIo3N+u+kKq0QB7yASAHiRuy/6bNI7LPO1PV0KdCNolAbIFTeqO9WGskdlBMaybDidEyytLdQakj57XnIwO1mQqB4UUyogOI=
+  - secure: Fwx31HtO+6jEytg8pvokuWaMj3slkHCGshMDVqgXYB69x833vYv1coZyEcRERqKECMnbq2v30UbThph7L1Nk0IYGjeLDaetTavHUzeVd+Qv/51r7iZ4KK71pkz0WraGcs6WHOFHhy9bN5qVvc84x8dUck7h9F+emnvMHkLgFle2TN5edb8HNOfdKzMzkk647VuqsKrQxJIOIIAJkiq3sShxXSNpY1Z0HGKw/idCsAcICOMeM5iRUPR4IJM5WCl0MroSLBkTgjEqIqg0MD5DAONIbRRYTbAoN39qoeVOv/Yt5e6k8GhNBcIUB3M4tuTPwXO9j5qc2Sx1IRA/WHAkxdgpK6o3CCQThFHriUXwZrpP5pUK4mAbWfdCK/l4JZJcdkQzkiIsccE1TkgOUMontYIXYmu0hspPC9PhAIXBs3djPw2QZJZIJ0v3ahLTX53Rz4Q6v10HWrmIpk+pJpJmaNQKIZL9XMaTts77xyCy8CK/XWw1gNj4Stohke8mrlYH0OGJ6VZMHz+MMIR0KhSuCMoZ1kAVQ9S3p0akrZdArfVUTWjvaWwAsCzK3vbHr0NsokHPrOymQ49jTbObeN3X4pkfrtkObao7H6NeslEg58AGL98awJuaUMJf980GzXz0jviICC6xWQQ5WFxILA3Ffl0UJkCLRRS+rifMVXFXOsl0=

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.16.6 (2021-01-26)
+### Changed
+* Updated package vulnerabilities
+* Migrated testing framework from `vscode` -> `vscode-test`
+
 ## 2.16.5 (2021-01-26)
 ### Changed
 * Updated package vulnerabilities

package.json

@@ -2,7 +2,7 @@
   "name": "azure-iot-toolkit",
   "displayName": "Azure IoT Hub",
   "description": "This extension is now a part of Azure IoT Tools extension pack. We highly recommend installing Azure IoT Tools to get full capabilities for Azure IoT development. Interact with Azure IoT Hub, IoT Device Management, IoT Edge Management, IoT Hub Device Simulation, IoT Hub Code Generation and IoT Hub Device Provisioning Service (DPS).",
-  "version": "2.16.5",
+  "version": "2.16.6-rc",
   "publisher": "vsciot-vscode",
   "aiKey": "0caaff90-cc1c-4def-b64c-3ef33615bc9b",
   "icon": "logo.png",
@@ -782,10 +782,9 @@
   "scripts": {
     "vscode:prepublish": "rimraf dist && webpack --mode production",
     "compile": "tsc -p ./",
-    "postinstall": "node ./node_modules/vscode/bin/install",
     "tslint": "tslint -t verbose src/**/*.ts test/**/*.ts --exclude src/**/*.d.ts",
     "version": "tsc -v",
-    "test": "node ./node_modules/vscode/bin/test",
+    "test": "npm run compile && node ./out/test/runTests.js",
     "webpack": "rimraf dist && webpack --mode development",
     "webpack-dev": "rimraf dist && webpack --mode development --watch"
   },
@@ -794,21 +793,21 @@
     "@types/express": "^4.17.7",
     "@types/fs-extra": "^9.0.1",
     "@types/keytar": "^4.4.2",
-    "@types/mocha": "^8.0.2",
+    "@types/mocha": "^8.2.1",
     "@types/node": "^14.6.0",
     "@types/node-fetch": "^2.5.7",
     "@types/terser-webpack-plugin": "^4.1.0",
+    "@types/vscode": "^1.40.0",
     "@types/webpack": "^4.41.21",
     "copy-webpack-plugin": "^6.0.3",
     "fail-on-errors-webpack-plugin": "^3.0.0",
-    "mocha": "^8.1.1",
+    "mocha": "^8.2.1",
     "rimraf": "^3.0.2",
     "shebang-loader": "0.0.1",
     "terser-webpack-plugin": "^4.1.0",
     "ts-loader": "^8.0.2",
     "tslint": "^6.1.3",
     "typescript": "^3.9.7",
-    "vscode": "^1.1.37",
     "webpack": "^4.44.1",
     "webpack-cli": "^3.3.12"
   },
@@ -828,6 +827,7 @@
     "express": "^4.16.3",
     "fecha": "^4.2.0",
     "fs-extra": "^9.0.1",
+    "glob": "^7.1.6",
     "handlebars": "^4.7.6",
     "numbro": "^2.3.1",
     "replace-in-file": "^6.1.0",
@@ -835,7 +835,8 @@
     "strip-json-comments": "^3.1.1",
     "uuid": "^8.3.0",
     "vscode-azureextensionui": "^0.35.0",
-    "vscode-extension-telemetry": "^0.1.6"
+    "vscode-extension-telemetry": "^0.1.6",
+    "vscode-test": "^1.4.1"
   },
   "extensionDependencies": [
     "ms-vscode.azure-account"

test/index.ts

@@ -1,24 +1,44 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license.
-//
-// PLEASE DO NOT MODIFY / DELETE UNLESS YOU KNOW WHAT YOU ARE DOING
-//
-// This file is providing the test runner to use when running extension tests.
-// By default the test runner in use is Mocha based.
-//
-// You can provide your own test runner if you want to override it by exporting
-// a function run(testRoot: string, clb: (error:Error) => void) that the extension
-// host can call to run the tests. The test runner is expected to use console.log
-// to report the results back to the caller. When the tests are finished, return
-// a possible error to the callback or null if none.
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
 
-import testRunner = require("vscode/lib/testrunner");
+import glob from "glob";
+import Mocha from "mocha";
+import { resolve } from "path";
 
-// You can directly control Mocha options by uncommenting the following lines
-// See https://github.com/mochajs/mocha/wiki/Using-mocha-programmatically#set-options for more info
-testRunner.configure({
-    ui: "tdd", 		// the TDD UI is being used in extension.test.ts (suite, test, etc.)
-    useColors: true, // colored output from test results
-});
+export function run(): Promise<void> {
+    // Create the mocha test
+    const mocha = new Mocha({
+        ui: "tdd",
+        color: true,
+    });
 
-module.exports = testRunner;
+    const testsRoot = resolve(__dirname, ".");
+
+    return new Promise((c, e) => {
+        glob("**/**.test.js", { cwd: testsRoot }, (err, files) => {
+            if (err) {
+                return e(err);
+            }
+
+            // Add files to the test suite
+            files.forEach((f) => mocha.addFile(resolve(testsRoot, f)));
+
+            try {
+                // Run the mocha test
+                mocha.run((failures) => {
+                    if (failures > 0) {
+                        e(new Error(`${failures} tests failed.`));
+                    } else {
+                        c();
+                    }
+                });
+            } catch (err) {
+                // tslint:disable-next-line no-console
+                console.error(err);
+                e(err);
+            }
+        });
+    });
+}

test/runTests.ts

@@ -0,0 +1,29 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { resolve } from "path";
+
+import { runTests } from "vscode-test";
+
+async function main() {
+    try {
+        // The folder containing the Extension Manifest package.json
+        // Passed to `--extensionDevelopmentPath`
+        const extensionDevelopmentPath = resolve(__dirname, "../../");
+
+        // The path to the extension test script
+        // Passed to --extensionTestsPath
+        const extensionTestsPath = resolve(__dirname, ".");
+
+        // Download VS Code, unzip it and run the integration test
+        await runTests({ extensionDevelopmentPath, extensionTestsPath });
+    } catch (err) {
+        // tslint:disable-next-line: no-console
+        console.error("Failed to run tests");
+        process.exit(1);
+    }
+}
+
+main();