From cb8f9d9d90ab17bf164b07dff25986eef7993aa9 Mon Sep 17 00:00:00 2001 From: Charles Gagnon Date: Mon, 3 May 2021 16:18:11 -0700 Subject: [PATCH] Use official Microsoft ads-kerberos (#15316) * Use @microsoft/ads-kerberos * Bundle ads-kerberos --- extensions/big-data-cluster/.vscodeignore | 10 +++++----- .../big-data-cluster/extension.webpack.config.js | 2 +- extensions/big-data-cluster/package.json | 2 +- .../big-data-cluster/src/bigDataCluster/auth.ts | 2 +- extensions/big-data-cluster/yarn.lock | 14 +++++++------- extensions/mssql/.vscodeignore | 10 +++++----- extensions/mssql/extension.webpack.config.js | 2 +- extensions/mssql/package.json | 2 +- extensions/mssql/src/util/auth.ts | 2 +- extensions/mssql/yarn.lock | 14 +++++++------- 10 files changed, 30 insertions(+), 30 deletions(-) diff --git a/extensions/big-data-cluster/.vscodeignore b/extensions/big-data-cluster/.vscodeignore index 84f994a5d2..8c2a960c91 100644 --- a/extensions/big-data-cluster/.vscodeignore +++ b/extensions/big-data-cluster/.vscodeignore @@ -7,8 +7,8 @@ tsconfig.json yarn.lock node_modules -!node_modules/ads-kerberos2/package.json -!node_modules/ads-kerberos2/LICENSE -!node_modules/ads-kerberos2/lib -!node_modules/ads-kerberos2/index.js -!node_modules/ads-kerberos2/build/Release/kerberos.node +!node_modules/@microsoft/ads-kerberos/package.json +!node_modules/@microsoft/ads-kerberos/LICENSE +!node_modules/@microsoft/ads-kerberos/lib +!node_modules/@microsoft/ads-kerberos/index.js +!node_modules/@microsoft/ads-kerberos/build/Release/kerberos.node diff --git a/extensions/big-data-cluster/extension.webpack.config.js b/extensions/big-data-cluster/extension.webpack.config.js index 02ba06bfc1..248726ff49 100644 --- a/extensions/big-data-cluster/extension.webpack.config.js +++ b/extensions/big-data-cluster/extension.webpack.config.js @@ -15,6 +15,6 @@ module.exports = withDefaults({ extension: './src/extension.ts' }, externals: { - 'ads-kerberos2': 'commonjs ads-kerberos2' + '@microsoft/ads-kerberos': 'commonjs @microsoft/ads-kerberos' } }); diff --git a/extensions/big-data-cluster/package.json b/extensions/big-data-cluster/package.json index 67edfa26f1..6187bd22a3 100644 --- a/extensions/big-data-cluster/package.json +++ b/extensions/big-data-cluster/package.json @@ -350,7 +350,7 @@ ] }, "dependencies": { - "ads-kerberos2": "^1.1.3", + "@microsoft/ads-kerberos": "^1.1.3", "request": "^2.88.0", "vscode-nls": "^4.0.0" }, diff --git a/extensions/big-data-cluster/src/bigDataCluster/auth.ts b/extensions/big-data-cluster/src/bigDataCluster/auth.ts index 90e43f05db..f35c282ba9 100644 --- a/extensions/big-data-cluster/src/bigDataCluster/auth.ts +++ b/extensions/big-data-cluster/src/bigDataCluster/auth.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as kerberos from 'ads-kerberos2'; +import * as kerberos from '@microsoft/ads-kerberos'; import * as vscode from 'vscode'; export async function authenticateKerberos(hostname: string): Promise { diff --git a/extensions/big-data-cluster/yarn.lock b/extensions/big-data-cluster/yarn.lock index e9fa74ba92..3b2695d8c0 100644 --- a/extensions/big-data-cluster/yarn.lock +++ b/extensions/big-data-cluster/yarn.lock @@ -2,6 +2,13 @@ # yarn lockfile v1 +"@microsoft/ads-kerberos@^1.1.3": + version "1.1.3" + resolved "https://registry.yarnpkg.com/@microsoft/ads-kerberos/-/ads-kerberos-1.1.3.tgz#a10c6d2d0751c0b67548d51a4bc45a7c33d00088" + integrity sha512-jlji4IUfkA/4idYBN9tyouCwurfyGZrDzMGlaUmx9/vtwRvdoEFCg959WfhShcfMPVLku/bztmLeZtN1ifccnQ== + dependencies: + nan "^2.14.0" + "@types/caseless@*": version "0.12.2" resolved "https://registry.yarnpkg.com/@types/caseless/-/caseless-0.12.2.tgz#f65d3d6389e01eeb458bd54dc8f52b95a9463bc8" @@ -27,13 +34,6 @@ resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-2.3.5.tgz#9da44ed75571999b65c37b60c9b2b88db54c585d" integrity sha512-SCcK7mvGi3+ZNz833RRjFIxrn4gI1PPR3NtuIS+6vMkvmsGjosqTJwRt5bAEFLRz+wtJMWv8+uOnZf2hi2QXTg== -ads-kerberos2@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/ads-kerberos2/-/ads-kerberos2-1.1.3.tgz#2f52c228579c45e7ea975c64070f33d2fdfafb58" - integrity sha512-mSHGHcVuST50I7nekS2gPH9mDDkeoZQagP2mit8Ry2EhAFxXXw/px1wESPe+M60SzSHbXaJ+orV5izoB2Mee9w== - dependencies: - nan "^2.14.0" - ajv@^6.5.5: version "6.10.0" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1" diff --git a/extensions/mssql/.vscodeignore b/extensions/mssql/.vscodeignore index 2fc8525ad0..6882421578 100644 --- a/extensions/mssql/.vscodeignore +++ b/extensions/mssql/.vscodeignore @@ -5,8 +5,8 @@ extension.webpack.config.js yarn.lock .vscode node_modules -!node_modules/ads-kerberos2/package.json -!node_modules/ads-kerberos2/LICENSE -!node_modules/ads-kerberos2/lib -!node_modules/ads-kerberos2/index.js -!node_modules/ads-kerberos2/build/Release/kerberos.node +!node_modules/@microsoft/ads-kerberos/package.json +!node_modules/@microsoft/ads-kerberos/LICENSE +!node_modules/@microsoft/ads-kerberos/lib +!node_modules/@microsoft/ads-kerberos/index.js +!node_modules/@microsoft/ads-kerberos/build/Release/kerberos.node diff --git a/extensions/mssql/extension.webpack.config.js b/extensions/mssql/extension.webpack.config.js index f07dd73378..765072bc8b 100644 --- a/extensions/mssql/extension.webpack.config.js +++ b/extensions/mssql/extension.webpack.config.js @@ -15,6 +15,6 @@ module.exports = withDefaults({ main: './src/main.ts' }, externals: { - 'ads-kerberos2': 'commonjs ads-kerberos2' + '@microsoft/ads-kerberos': 'commonjs @microsoft/ads-kerberos' } }); diff --git a/extensions/mssql/package.json b/extensions/mssql/package.json index 0813bda632..52a505ea8f 100644 --- a/extensions/mssql/package.json +++ b/extensions/mssql/package.json @@ -1256,7 +1256,7 @@ } }, "dependencies": { - "ads-kerberos2": "^1.1.3", + "@microsoft/ads-kerberos": "^1.1.3", "buffer-stream-reader": "^0.1.1", "bytes": "^3.1.0", "dataprotocol-client": "github:Microsoft/sqlops-dataprotocolclient#1.2.2", diff --git a/extensions/mssql/src/util/auth.ts b/extensions/mssql/src/util/auth.ts index 4d519faa16..0106eaf998 100644 --- a/extensions/mssql/src/util/auth.ts +++ b/extensions/mssql/src/util/auth.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as kerberos from 'ads-kerberos2'; +import * as kerberos from '@microsoft/ads-kerberos'; import * as vscode from 'vscode'; export enum AuthType { diff --git a/extensions/mssql/yarn.lock b/extensions/mssql/yarn.lock index 7d5a014a3b..add1e1561b 100644 --- a/extensions/mssql/yarn.lock +++ b/extensions/mssql/yarn.lock @@ -182,6 +182,13 @@ resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw== +"@microsoft/ads-kerberos@^1.1.3": + version "1.1.3" + resolved "https://registry.yarnpkg.com/@microsoft/ads-kerberos/-/ads-kerberos-1.1.3.tgz#a10c6d2d0751c0b67548d51a4bc45a7c33d00088" + integrity sha512-jlji4IUfkA/4idYBN9tyouCwurfyGZrDzMGlaUmx9/vtwRvdoEFCg959WfhShcfMPVLku/bztmLeZtN1ifccnQ== + dependencies: + nan "^2.14.0" + "@types/bytes@^3.0.0": version "3.1.0" resolved "https://registry.yarnpkg.com/@types/bytes/-/bytes-3.1.0.tgz#835a3e4aea3b4d7604aca216a78de372bff3ecc3" @@ -236,13 +243,6 @@ resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.0.tgz#fef1904e4668b6e5ecee60c52cc6a078ffa6697d" integrity sha512-I99sngh224D0M7XgW1s120zxCt3VYQ3IQsuw3P3jbq5GG4yc79+ZjyKznyOGIQrflfylLgcfekeZW/vk0yng6A== -ads-kerberos2@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/ads-kerberos2/-/ads-kerberos2-1.1.3.tgz#2f52c228579c45e7ea975c64070f33d2fdfafb58" - integrity sha512-mSHGHcVuST50I7nekS2gPH9mDDkeoZQagP2mit8Ry2EhAFxXXw/px1wESPe+M60SzSHbXaJ+orV5izoB2Mee9w== - dependencies: - nan "^2.14.0" - agent-base@4, agent-base@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"