Bump axios & uuid and move @types/mocha to devDependencies (#148)

Azure · Sep 12, 2021 · cd3e613 · cd3e613
1 parent 110f9fd
commit cd3e613
Show file tree

Hide file tree

Showing 10 changed files with 947 additions and 2,200 deletions.
diff --git a/azure-kusto-data/example.js b/azure-kusto-data/example.js
@@ -4,7 +4,7 @@
 const KustoClient = require("azure-kusto-data").Client;
 const KustoConnectionStringBuilder = require("azure-kusto-data").KustoConnectionStringBuilder;
 const ClientRequestProperties = require("azure-kusto-data").ClientRequestProperties;
-const uuidv4 = require("uuid/v4");
+const { v4: uuidv4 } = require('uuid');
 
 const clusterConectionString = "https://<cluster>.<region>.kusto.windows.net";
 const database = "<databaseName>";

diff --git a/azure-kusto-data/package-lock.json b/azure-kusto-data/package-lock.json
diff --git a/azure-kusto-data/package.json b/azure-kusto-data/package.json
@@ -1,6 +1,6 @@
 {
   "name": "azure-kusto-data",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "description": "Azure Data Explorer Query SDK",
   "main": "index.js",
   "types": "index.d.ts",
@@ -35,14 +35,14 @@
   "dependencies": {
     "@azure/identity": "^1.3.0",
     "@azure/msal-node": "^1.1.0",
-    "@types/mocha": "^8.2.0",
     "@types/node": "^14.14.13",
     "@types/uuid": "^8.3.0",
-    "axios": "^0.21.1",
+    "axios": "^0.21.2",
     "moment": "^2.25.3",
-    "uuid": "^3.4.0"
+    "uuid": "^8.3.2"
   },
   "devDependencies": {
+    "@types/mocha": "^8.2.0",
     "mocha": "^7.1.2",
     "sinon": "^7.2.3",
     "tslint": "^6.1.3",

diff --git a/azure-kusto-data/source/client.ts b/azure-kusto-data/source/client.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import moment from "moment";
-import uuid from "uuid";
+import { v4 as uuidv4 } from 'uuid';
 import AadHelper from "./security";
 import {KustoResponseDataSet, KustoResponseDataSetV1, KustoResponseDataSetV2} from "./response";
 import ConnectionStringBuilder from "./connectionBuilder";
@@ -132,7 +132,7 @@ export class KustoClient {
             headers["Content-Type"] = "multipart/form-data";
         }
 
-        headers["x-ms-client-request-id"] = clientRequestId || clientRequestPrefix + `${uuid.v4()}`;
+        headers["x-ms-client-request-id"] = clientRequestId || clientRequestPrefix + `${uuidv4()}`;
 
         headers.Authorization = await this.aadHelper._getAuthHeader();
 

diff --git a/azure-kusto-data/test/clientTest.ts b/azure-kusto-data/test/clientTest.ts
@@ -3,8 +3,7 @@
 
 import assert from "assert";
 
-// tslint:disable-next-line:no-var-requires
-import uuid from "uuid";
+import { v4 as uuidv4 } from 'uuid';
 import moment from "moment";
 
 import {KustoClient} from "../source/client";
@@ -166,7 +165,7 @@ describe("KustoClient", function () {
         it("set clientRequestId for request", async function () {
             const url = "https://cluster.kusto.windows.net";
             const client = new KustoClient(url);
-            const clientRequestId = `MyApp.MyActivity;${uuid.v4()}`;
+            const clientRequestId = `MyApp.MyActivity;${uuidv4()}`;
             const application = "app1";
             const user = "user1";
 

diff --git a/azure-kusto-data/test/connectionBuilderTest.ts b/azure-kusto-data/test/connectionBuilderTest.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import assert from "assert";
-import uuid from "uuid";
+import { v4 as uuidv4 } from 'uuid';
 import {KustoConnectionStringBuilder} from "../source/connectionBuilder";
 
 describe("KustoConnectionStringBuilder", function () {
@@ -55,25 +55,25 @@ describe("KustoConnectionStringBuilder", function () {
 
         it("from string with app auth", function () {
 
-            const uuidv4 = uuid.v4();
+            const uuid = uuidv4();
             const key = "key of application";
 
             const kcsbs = [
-                new KustoConnectionStringBuilder(`localhost;Application client Id=${uuidv4};application Key=${key}`),
-                new KustoConnectionStringBuilder(`Data Source=localhost ; Application Client Id=${uuidv4}; Appkey =${key}`),
-                new KustoConnectionStringBuilder(` Addr = localhost ; AppClientId = ${uuidv4} ; AppKey =${key}`),
-                new KustoConnectionStringBuilder(`Network Address = localhost; AppClientId = ${uuidv4} ; AppKey =${key}`),
-                KustoConnectionStringBuilder.withAadApplicationKeyAuthentication("localhost", uuidv4, key)
+                new KustoConnectionStringBuilder(`localhost;Application client Id=${uuid};application Key=${key}`),
+                new KustoConnectionStringBuilder(`Data Source=localhost ; Application Client Id=${uuid}; Appkey =${key}`),
+                new KustoConnectionStringBuilder(` Addr = localhost ; AppClientId = ${uuid} ; AppKey =${key}`),
+                new KustoConnectionStringBuilder(`Network Address = localhost; AppClientId = ${uuid} ; AppKey =${key}`),
+                KustoConnectionStringBuilder.withAadApplicationKeyAuthentication("localhost", uuid, key)
             ];
 
             const kcsb1 = new KustoConnectionStringBuilder("server=localhost");
-            kcsb1.applicationClientId = uuidv4;
+            kcsb1.applicationClientId = uuid;
             kcsb1.applicationKey = key;
             kcsbs.push(kcsb1);
 
             for (const kcsb of kcsbs) {
                 assert.equal(kcsb.dataSource, "localhost");
-                assert.equal(kcsb.applicationClientId, uuidv4);
+                assert.equal(kcsb.applicationClientId, uuid);
                 assert.equal(kcsb.applicationKey, key);
                 assert.equal(kcsb.authorityId, "common");
                 const emptyFields = ["aadUserId", "password"];