@microsoft/teamsfx-core 1.9.1-alpha.300caa689.0 → 1.10.0-rc.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/common/azure-hosting/azureAppServiceHosting.js +1 -1
- package/build/common/azure-hosting/azureAppServiceHosting.js.map +1 -1
- package/build/common/azure-hosting/azureFunctionHosting.d.ts +1 -2
- package/build/common/azure-hosting/azureFunctionHosting.d.ts.map +1 -1
- package/build/common/azure-hosting/azureFunctionHosting.js +4 -4
- package/build/common/azure-hosting/azureFunctionHosting.js.map +1 -1
- package/build/common/azure-hosting/azureHosting.d.ts +3 -1
- package/build/common/azure-hosting/azureHosting.d.ts.map +1 -1
- package/build/common/azure-hosting/azureHosting.js +12 -5
- package/build/common/azure-hosting/azureHosting.js.map +1 -1
- package/build/common/azure-hosting/azureOps.d.ts +4 -4
- package/build/common/azure-hosting/azureOps.d.ts.map +1 -1
- package/build/common/azure-hosting/azureOps.js +14 -3
- package/build/common/azure-hosting/azureOps.js.map +1 -1
- package/build/common/azure-hosting/interfaces.d.ts +6 -0
- package/build/common/azure-hosting/interfaces.d.ts.map +1 -1
- package/build/common/azure-hosting/messages.d.ts +9 -0
- package/build/common/azure-hosting/messages.d.ts.map +1 -0
- package/build/common/azure-hosting/messages.js +15 -0
- package/build/common/azure-hosting/messages.js.map +1 -0
- package/build/common/azure-hosting/utils.d.ts +2 -1
- package/build/common/azure-hosting/utils.d.ts.map +1 -1
- package/build/common/azure-hosting/utils.js +4 -1
- package/build/common/azure-hosting/utils.js.map +1 -1
- package/build/common/deps-checker/constant/helpLink.d.ts +1 -0
- package/build/common/deps-checker/constant/helpLink.d.ts.map +1 -1
- package/build/common/deps-checker/constant/helpLink.js +2 -1
- package/build/common/deps-checker/constant/helpLink.js.map +1 -1
- package/build/common/deps-checker/constant/message.d.ts +1 -0
- package/build/common/deps-checker/constant/message.d.ts.map +1 -1
- package/build/common/deps-checker/constant/message.js +1 -0
- package/build/common/deps-checker/constant/message.js.map +1 -1
- package/build/common/deps-checker/depsError.d.ts +3 -0
- package/build/common/deps-checker/depsError.d.ts.map +1 -1
- package/build/common/deps-checker/depsError.js +8 -1
- package/build/common/deps-checker/depsError.js.map +1 -1
- package/build/common/deps-checker/depsManager.js +1 -1
- package/build/common/deps-checker/depsManager.js.map +1 -1
- package/build/common/deps-checker/internal/funcToolChecker.d.ts +1 -0
- package/build/common/deps-checker/internal/funcToolChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/funcToolChecker.js +36 -0
- package/build/common/deps-checker/internal/funcToolChecker.js.map +1 -1
- package/build/common/deps-checker/internal/nodeChecker.d.ts +7 -0
- package/build/common/deps-checker/internal/nodeChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/nodeChecker.js +2 -1
- package/build/common/deps-checker/internal/nodeChecker.js.map +1 -1
- package/build/common/templates-config.json +2 -2
- package/build/plugins/resource/appstudio/constants.d.ts +2 -2
- package/build/plugins/resource/appstudio/constants.d.ts.map +1 -1
- package/build/plugins/resource/appstudio/constants.js +3 -3
- package/build/plugins/resource/appstudio/constants.js.map +1 -1
- package/build/plugins/resource/appstudio/index.js +4 -4
- package/build/plugins/resource/appstudio/index.js.map +1 -1
- package/build/plugins/resource/appstudio/plugin.js +4 -4
- package/build/plugins/resource/appstudio/plugin.js.map +1 -1
- package/build/plugins/resource/bot/dotnet/plugin.js +3 -3
- package/build/plugins/resource/bot/dotnet/plugin.js.map +1 -1
- package/build/plugins/resource/bot/errors.d.ts +4 -0
- package/build/plugins/resource/bot/errors.d.ts.map +1 -1
- package/build/plugins/resource/bot/errors.js +61 -1
- package/build/plugins/resource/bot/errors.js.map +1 -1
- package/build/plugins/resource/bot/index.d.ts +0 -2
- package/build/plugins/resource/bot/index.d.ts.map +1 -1
- package/build/plugins/resource/bot/index.js +21 -77
- package/build/plugins/resource/bot/index.js.map +1 -1
- package/build/plugins/resource/bot/v2/common.js +7 -7
- package/build/plugins/resource/bot/v2/common.js.map +1 -1
- package/build/plugins/resource/bot/v2/enum.d.ts +4 -0
- package/build/plugins/resource/bot/v2/enum.d.ts.map +1 -1
- package/build/plugins/resource/bot/v2/enum.js +6 -1
- package/build/plugins/resource/bot/v2/enum.js.map +1 -1
- package/build/plugins/resource/bot/v2/index.d.ts +1 -1
- package/build/plugins/resource/bot/v2/index.d.ts.map +1 -1
- package/build/plugins/resource/bot/v2/index.js +18 -15
- package/build/plugins/resource/bot/v2/index.js.map +1 -1
- package/build/plugins/resource/bot/v2/mapping.d.ts +3 -2
- package/build/plugins/resource/bot/v2/mapping.d.ts.map +1 -1
- package/build/plugins/resource/bot/v2/mapping.js +18 -6
- package/build/plugins/resource/bot/v2/mapping.js.map +1 -1
- package/build/plugins/resource/bot/v2/plugin.d.ts +5 -4
- package/build/plugins/resource/bot/v2/plugin.d.ts.map +1 -1
- package/build/plugins/resource/bot/v2/plugin.js +56 -50
- package/build/plugins/resource/bot/v2/plugin.js.map +1 -1
- package/package.json +3 -3
- package/resource/package.nls.cs.json +642 -0
- package/resource/package.nls.de.json +642 -0
- package/resource/package.nls.es.json +642 -0
- package/resource/package.nls.fr.json +642 -0
- package/resource/package.nls.it.json +642 -0
- package/resource/package.nls.ja.json +642 -0
- package/resource/package.nls.json +2 -1
- package/resource/package.nls.ko.json +642 -0
- package/resource/package.nls.pl.json +642 -0
- package/resource/package.nls.pt-BR.json +642 -0
- package/resource/package.nls.ru.json +642 -0
- package/resource/package.nls.tr.json +642 -0
- package/resource/package.nls.zh-Hans.json +642 -0
- package/resource/package.nls.zh-Hant.json +642 -0
- package/templates/fallback/blazor-base.csharp.default.zip +0 -0
- package/templates/fallback/bot.csharp.command-and-response.zip +0 -0
- package/templates/fallback/bot.csharp.default.zip +0 -0
- package/templates/fallback/bot.csharp.notification-webapi.zip +0 -0
- package/templates/fallback/bot.js.command-and-response.zip +0 -0
- package/templates/fallback/bot.js.default.zip +0 -0
- package/templates/fallback/bot.js.m365.zip +0 -0
- package/templates/fallback/bot.js.notification-function-base.zip +0 -0
- package/templates/fallback/bot.js.notification-restify.zip +0 -0
- package/templates/fallback/bot.js.notification-trigger-http.zip +0 -0
- package/templates/fallback/bot.js.notification-trigger-timer.zip +0 -0
- package/templates/fallback/bot.ts.command-and-response.zip +0 -0
- package/templates/fallback/bot.ts.default.zip +0 -0
- package/templates/fallback/bot.ts.m365.zip +0 -0
- package/templates/fallback/bot.ts.notification-function-base.zip +0 -0
- package/templates/fallback/bot.ts.notification-restify.zip +0 -0
- package/templates/fallback/bot.ts.notification-trigger-http.zip +0 -0
- package/templates/fallback/bot.ts.notification-trigger-timer.zip +0 -0
- package/templates/fallback/bot.ts.notification.zip +0 -0
- package/templates/fallback/function-base.js.default.zip +0 -0
- package/templates/fallback/function-base.ts.default.zip +0 -0
- package/templates/fallback/function-triggers.js.HTTPTrigger.zip +0 -0
- package/templates/fallback/function-triggers.ts.HTTPTrigger.zip +0 -0
- package/templates/fallback/tab.csharp.default.zip +0 -0
- package/templates/fallback/tab.js.default.zip +0 -0
- package/templates/fallback/tab.js.m365.zip +0 -0
- package/templates/fallback/tab.js.non-sso.zip +0 -0
- package/templates/fallback/tab.ts.default.zip +0 -0
- package/templates/fallback/tab.ts.m365.zip +0 -0
- package/templates/fallback/tab.ts.non-sso.zip +0 -0
- package/templates/plugins/resource/hosting/bicep/botFunction/botFunctionProvision.template.bicep +2 -0
|
@@ -25,7 +25,7 @@ class AzureAppServiceHosting extends azureHosting_1.AzureHosting {
|
|
|
25
25
|
}
|
|
26
26
|
async deploy(resourceId, tokenProvider, buffer) {
|
|
27
27
|
await super.deploy(resourceId, tokenProvider, buffer);
|
|
28
|
-
await utils_1.azureWebSiteDeploy(resourceId, tokenProvider, buffer);
|
|
28
|
+
await utils_1.azureWebSiteDeploy(resourceId, tokenProvider, buffer, this.logger);
|
|
29
29
|
return teamsfx_api_1.Void;
|
|
30
30
|
}
|
|
31
31
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"azureAppServiceHosting.js","sourceRoot":"","sources":["../../../src/common/azure-hosting/azureAppServiceHosting.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,iDAA8C;AAC9C,6CAA2C;AAC3C,wDAA6D;AAC7D,mCAA6C;AAE7C,MAAM,UAAU,GAAG,sDAAsD,CAAC;AAC1E,MAAM,QAAQ,GAAG,iDAAiD,CAAC;AACnE,MAAM,cAAc,GAAG,kDAAkD,CAAC;AAC1E,MAAM,eAAe,GAAG,wCAAwC,CAAC;AAEjE,MAAa,sBAAuB,SAAQ,2BAAY;IAAxD;;QACE,iBAAY,GAAG,IAAI,CAAC;QACpB,aAAQ,GAAG,wBAAW,CAAC,UAAU,CAAC;QAClC,cAAS,GAAG;YACV,UAAU,EAAE,UAAU;YACtB,QAAQ,EAAE,QAAQ;YAClB,cAAc,EAAE,cAAc;YAC9B,eAAe,EAAE,eAAe;SACjC,CAAC;IAOJ,CAAC;IALC,KAAK,CAAC,MAAM,CAAC,UAAkB,EAAE,aAA4B,EAAE,MAAc;QAC3E,MAAM,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;QACtD,MAAM,0BAAkB,CAAC,UAAU,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"azureAppServiceHosting.js","sourceRoot":"","sources":["../../../src/common/azure-hosting/azureAppServiceHosting.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,iDAA8C;AAC9C,6CAA2C;AAC3C,wDAA6D;AAC7D,mCAA6C;AAE7C,MAAM,UAAU,GAAG,sDAAsD,CAAC;AAC1E,MAAM,QAAQ,GAAG,iDAAiD,CAAC;AACnE,MAAM,cAAc,GAAG,kDAAkD,CAAC;AAC1E,MAAM,eAAe,GAAG,wCAAwC,CAAC;AAEjE,MAAa,sBAAuB,SAAQ,2BAAY;IAAxD;;QACE,iBAAY,GAAG,IAAI,CAAC;QACpB,aAAQ,GAAG,wBAAW,CAAC,UAAU,CAAC;QAClC,cAAS,GAAG;YACV,UAAU,EAAE,UAAU;YACtB,QAAQ,EAAE,QAAQ;YAClB,cAAc,EAAE,cAAc;YAC9B,eAAe,EAAE,eAAe;SACjC,CAAC;IAOJ,CAAC;IALC,KAAK,CAAC,MAAM,CAAC,UAAkB,EAAE,aAA4B,EAAE,MAAc;QAC3E,MAAM,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;QACtD,MAAM,0BAAkB,CAAC,UAAU,EAAE,aAAa,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QACzE,OAAO,kBAAI,CAAC;IACd,CAAC;CACF;AAfD,wDAeC"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { AzureHosting } from "./azureHosting";
|
|
3
3
|
import { ServiceType } from "./interfaces";
|
|
4
|
-
import { TokenProvider } from "@microsoft/teamsfx-api";
|
|
5
|
-
import { Void } from "../../plugins";
|
|
4
|
+
import { TokenProvider, Void } from "@microsoft/teamsfx-api";
|
|
6
5
|
export declare class AzureFunctionHosting extends AzureHosting {
|
|
7
6
|
configurable: boolean;
|
|
8
7
|
hostType: ServiceType;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"azureFunctionHosting.d.ts","sourceRoot":"","sources":["../../../src/common/azure-hosting/azureFunctionHosting.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"azureFunctionHosting.d.ts","sourceRoot":"","sources":["../../../src/common/azure-hosting/azureFunctionHosting.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAU7D,qBAAa,oBAAqB,SAAQ,YAAY;IACpD,YAAY,UAAQ;IACpB,QAAQ,cAAyB;IACjC,SAAS;;;;;MAKP;IAEI,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAY9F"}
|
|
@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
5
5
|
exports.AzureFunctionHosting = void 0;
|
|
6
6
|
const azureHosting_1 = require("./azureHosting");
|
|
7
7
|
const interfaces_1 = require("./interfaces");
|
|
8
|
-
const
|
|
8
|
+
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
9
9
|
const utils_1 = require("./utils");
|
|
10
10
|
const azureOps_1 = require("./azureOps");
|
|
11
11
|
const tools_1 = require("../tools");
|
|
@@ -27,9 +27,9 @@ class AzureFunctionHosting extends azureHosting_1.AzureHosting {
|
|
|
27
27
|
}
|
|
28
28
|
async deploy(resourceId, tokenProvider, buffer) {
|
|
29
29
|
await super.deploy(resourceId, tokenProvider, buffer);
|
|
30
|
-
const client = await utils_1.azureWebSiteDeploy(resourceId, tokenProvider, buffer);
|
|
31
|
-
await azureOps_1.AzureOperations.restartWebApp(client, tools_1.getResourceGroupNameFromResourceId(resourceId), tools_1.getSiteNameFromResourceId(resourceId));
|
|
32
|
-
return
|
|
30
|
+
const client = await utils_1.azureWebSiteDeploy(resourceId, tokenProvider, buffer, this.logger);
|
|
31
|
+
await azureOps_1.AzureOperations.restartWebApp(client, tools_1.getResourceGroupNameFromResourceId(resourceId), tools_1.getSiteNameFromResourceId(resourceId), this.logger);
|
|
32
|
+
return teamsfx_api_1.Void;
|
|
33
33
|
}
|
|
34
34
|
}
|
|
35
35
|
exports.AzureFunctionHosting = AzureFunctionHosting;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"azureFunctionHosting.js","sourceRoot":"","sources":["../../../src/common/azure-hosting/azureFunctionHosting.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,iDAA8C;AAC9C,6CAA2C;
|
|
1
|
+
{"version":3,"file":"azureFunctionHosting.js","sourceRoot":"","sources":["../../../src/common/azure-hosting/azureFunctionHosting.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,iDAA8C;AAC9C,6CAA2C;AAC3C,wDAA6D;AAC7D,mCAA6C;AAC7C,yCAA6C;AAC7C,oCAAyF;AAEzF,MAAM,kBAAkB,GAAG,2DAA2D,CAAC;AACvF,MAAM,gBAAgB,GAAG,mDAAmD,CAAC;AAC7E,MAAM,gBAAgB,GAAG,yDAAyD,CAAC;AACnF,MAAM,eAAe,GAAG,+CAA+C,CAAC;AAExE,MAAa,oBAAqB,SAAQ,2BAAY;IAAtD;;QACE,iBAAY,GAAG,IAAI,CAAC;QACpB,aAAQ,GAAG,wBAAW,CAAC,SAAS,CAAC;QACjC,cAAS,GAAG;YACV,UAAU,EAAE,kBAAkB;YAC9B,QAAQ,EAAE,gBAAgB;YAC1B,gBAAgB,EAAE,gBAAgB;YAClC,eAAe,EAAE,eAAe;SACjC,CAAC;IAcJ,CAAC;IAZC,KAAK,CAAC,MAAM,CAAC,UAAkB,EAAE,aAA4B,EAAE,MAAc;QAC3E,MAAM,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;QACtD,MAAM,MAAM,GAAG,MAAM,0BAAkB,CAAC,UAAU,EAAE,aAAa,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAExF,MAAM,0BAAe,CAAC,aAAa,CACjC,MAAM,EACN,0CAAkC,CAAC,UAAU,CAAC,EAC9C,iCAAyB,CAAC,UAAU,CAAC,EACrC,IAAI,CAAC,MAAM,CACZ,CAAC;QACF,OAAO,kBAAI,CAAC;IACd,CAAC;CACF;AAtBD,oDAsBC"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { ResourceTemplate, TokenProvider, Void } from "@microsoft/teamsfx-api";
|
|
3
3
|
import { Context } from "@microsoft/teamsfx-api/build/v2";
|
|
4
|
-
import { BicepContext } from "./interfaces";
|
|
4
|
+
import { BicepContext, Logger } from "./interfaces";
|
|
5
5
|
export declare abstract class AzureHosting {
|
|
6
6
|
abstract hostType: string;
|
|
7
7
|
abstract configurable: boolean;
|
|
8
8
|
reference: any;
|
|
9
|
+
logger?: Logger;
|
|
9
10
|
protected getBicepTemplateFolder(): string;
|
|
10
11
|
generateBicep(bicepContext: BicepContext, pluginId: string): Promise<ResourceTemplate>;
|
|
11
12
|
static replacePluginId(module: string, pluginId: string): string;
|
|
@@ -18,5 +19,6 @@ export declare abstract class AzureHosting {
|
|
|
18
19
|
* @param buffer zip file stream buffer
|
|
19
20
|
*/
|
|
20
21
|
deploy(resourceId: string, tokenProvider: TokenProvider, buffer: Buffer): Promise<Void>;
|
|
22
|
+
setLogger(logger: any): void;
|
|
21
23
|
}
|
|
22
24
|
//# sourceMappingURL=azureHosting.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"azureHosting.d.ts","sourceRoot":"","sources":["../../../src/common/azure-hosting/azureHosting.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAC/E,OAAO,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAM1D,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"azureHosting.d.ts","sourceRoot":"","sources":["../../../src/common/azure-hosting/azureHosting.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAC/E,OAAO,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAM1D,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAGpD,8BAAsB,YAAY;IAChC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC;IAE/B,SAAS,EAAE,GAAG,CAAa;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,SAAS,CAAC,sBAAsB,IAAI,MAAM;IAWpC,aAAa,CAAC,YAAY,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA6C5F,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAK1D,WAAW,CAAC,YAAY,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAsBpF,SAAS,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5C;;;;;OAKG;IACG,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI7F,SAAS,CAAC,MAAM,EAAE,GAAG,GAAG,IAAI;CAG7B"}
|
|
@@ -10,6 +10,7 @@ const path_1 = tslib_1.__importDefault(require("path"));
|
|
|
10
10
|
const __1 = require("..");
|
|
11
11
|
const constants_1 = require("../constants");
|
|
12
12
|
const folder_1 = require("../../folder");
|
|
13
|
+
const messages_1 = require("./messages");
|
|
13
14
|
class AzureHosting {
|
|
14
15
|
constructor() {
|
|
15
16
|
this.reference = undefined;
|
|
@@ -18,6 +19,7 @@ class AzureHosting {
|
|
|
18
19
|
return path_1.default.join(folder_1.getTemplatesFolder(), "plugins", "resource", "hosting", "bicep", this.hostType);
|
|
19
20
|
}
|
|
20
21
|
async generateBicep(bicepContext, pluginId) {
|
|
22
|
+
var _a, _b;
|
|
21
23
|
// * The order matters.
|
|
22
24
|
// * 0: Provision Orchestration, 1: Provision Module, 2: Configuration Orchestration, 3: Configuration Module
|
|
23
25
|
const bicepFiles = [constants_1.Bicep.ProvisionFileName, `${this.hostType}Provision.template.bicep`];
|
|
@@ -36,6 +38,7 @@ class AzureHosting {
|
|
|
36
38
|
if (await fs.pathExists(parameterFilePath)) {
|
|
37
39
|
parameters = await fs.readJson(parameterFilePath);
|
|
38
40
|
}
|
|
41
|
+
(_b = (_a = this.logger) === null || _a === void 0 ? void 0 : _a.info) === null || _b === void 0 ? void 0 : _b.call(_a, messages_1.Messages.generateBicep(this.hostType));
|
|
39
42
|
return {
|
|
40
43
|
Provision: {
|
|
41
44
|
Orchestration: modules[0],
|
|
@@ -56,21 +59,22 @@ class AzureHosting {
|
|
|
56
59
|
return module.replace(/PluginIdPlaceholder/g, pluginId);
|
|
57
60
|
}
|
|
58
61
|
async updateBicep(bicepContext, pluginId) {
|
|
62
|
+
var _a, _b, _c, _d;
|
|
59
63
|
// * The order matters.
|
|
60
64
|
// * 0: Configuration Orchestration, 1: Configuration Module
|
|
61
65
|
if (!this.configurable) {
|
|
66
|
+
(_b = (_a = this.logger) === null || _a === void 0 ? void 0 : _a.debug) === null || _b === void 0 ? void 0 : _b.call(_a, messages_1.Messages.updateBicep(this.hostType));
|
|
62
67
|
return {};
|
|
63
68
|
}
|
|
64
69
|
const bicepFile = `${this.hostType}Configuration.template.bicep`;
|
|
65
70
|
const bicepTemplateDir = this.getBicepTemplateFolder();
|
|
66
71
|
let module = await __1.generateBicepFromFile(path_1.default.join(bicepTemplateDir, bicepFile), bicepContext);
|
|
67
72
|
module = AzureHosting.replacePluginId(module, pluginId);
|
|
73
|
+
(_d = (_c = this.logger) === null || _c === void 0 ? void 0 : _c.info) === null || _d === void 0 ? void 0 : _d.call(_c, messages_1.Messages.updateBicep(this.hostType));
|
|
68
74
|
return {
|
|
69
|
-
Configuration:
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
}
|
|
73
|
-
: undefined,
|
|
75
|
+
Configuration: {
|
|
76
|
+
Modules: { [this.hostType]: module },
|
|
77
|
+
},
|
|
74
78
|
Reference: this.reference,
|
|
75
79
|
};
|
|
76
80
|
}
|
|
@@ -86,6 +90,9 @@ class AzureHosting {
|
|
|
86
90
|
async deploy(resourceId, tokenProvider, buffer) {
|
|
87
91
|
return teamsfx_api_1.Void;
|
|
88
92
|
}
|
|
93
|
+
setLogger(logger) {
|
|
94
|
+
this.logger = logger;
|
|
95
|
+
}
|
|
89
96
|
}
|
|
90
97
|
exports.AzureHosting = AzureHosting;
|
|
91
98
|
//# sourceMappingURL=azureHosting.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"azureHosting.js","sourceRoot":"","sources":["../../../src/common/azure-hosting/azureHosting.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAA+E;AAE/E,qDAA+B;AAC/B,wDAAwB;AACxB,0BAA2C;AAC3C,4CAAqC;AACrC,yCAAkD;
|
|
1
|
+
{"version":3,"file":"azureHosting.js","sourceRoot":"","sources":["../../../src/common/azure-hosting/azureHosting.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAA+E;AAE/E,qDAA+B;AAC/B,wDAAwB;AACxB,0BAA2C;AAC3C,4CAAqC;AACrC,yCAAkD;AAElD,yCAAsC;AAEtC,MAAsB,YAAY;IAAlC;QAIE,cAAS,GAAQ,SAAS,CAAC;IAuG7B,CAAC;IApGW,sBAAsB;QAC9B,OAAO,cAAI,CAAC,IAAI,CACd,2BAAkB,EAAE,EACpB,SAAS,EACT,UAAU,EACV,SAAS,EACT,OAAO,EACP,IAAI,CAAC,QAAQ,CACd,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,YAA0B,EAAE,QAAgB;;QAC9D,uBAAuB;QACvB,6GAA6G;QAC7G,MAAM,UAAU,GAAG,CAAC,iBAAK,CAAC,iBAAiB,EAAE,GAAG,IAAI,CAAC,QAAQ,0BAA0B,CAAC,CAAC;QACzF,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,UAAU,CAAC,IAAI,CAAC,iBAAK,CAAC,cAAc,CAAC,CAAC;YACtC,UAAU,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,8BAA8B,CAAC,CAAC;SACjE;QAED,MAAM,gBAAgB,GAAG,IAAI,CAAC,sBAAsB,EAAE,CAAC;QACvD,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/B,UAAU,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;YAChC,MAAM,MAAM,GAAG,MAAM,yBAAqB,CACxC,cAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,QAAQ,CAAC,EACrC,YAAY,CACb,CAAC;YACF,OAAO,YAAY,CAAC,eAAe,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QACxD,CAAC,CAAC,CACH,CAAC;QAEF,kEAAkE;QAClE,IAAI,UAAU,CAAC;QACf,MAAM,iBAAiB,GAAG,cAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,iBAAK,CAAC,iBAAiB,CAAC,CAAC;QAC/E,IAAI,MAAM,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE;YAC1C,UAAU,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;SACnD;QAED,MAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,mDAAG,mBAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;QAE3D,OAAO;YACL,SAAS,EAAE;gBACT,aAAa,EAAE,OAAO,CAAC,CAAC,CAAC;gBACzB,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE;aACzC;YACD,aAAa,EAAE,IAAI,CAAC,YAAY;gBAC9B,CAAC,CAAC;oBACE,aAAa,EAAE,OAAO,CAAC,CAAC,CAAC;oBACzB,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE;iBACzC;gBACH,CAAC,CAAC,SAAS;YACb,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,UAAU,EAAE,UAAU;SACH,CAAC;IACxB,CAAC;IAED,MAAM,CAAC,eAAe,CAAC,MAAc,EAAE,QAAgB;QACrD,iDAAiD;QACjD,OAAO,MAAM,CAAC,OAAO,CAAC,sBAAsB,EAAE,QAAQ,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,YAA0B,EAAE,QAAgB;;QAC5D,uBAAuB;QACvB,4DAA4D;QAC5D,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;YACtB,MAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,KAAK,mDAAG,mBAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC1D,OAAO,EAAsB,CAAC;SAC/B;QACD,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,QAAQ,8BAA8B,CAAC;QAEjE,MAAM,gBAAgB,GAAG,IAAI,CAAC,sBAAsB,EAAE,CAAC;QACvD,IAAI,MAAM,GAAG,MAAM,yBAAqB,CAAC,cAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,SAAS,CAAC,EAAE,YAAY,CAAC,CAAC;QAC/F,MAAM,GAAG,YAAY,CAAC,eAAe,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAExD,MAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,mDAAG,mBAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;QAEzD,OAAO;YACL,aAAa,EAAE;gBACb,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE;aACrC;YACD,SAAS,EAAE,IAAI,CAAC,SAAS;SACN,CAAC;IACxB,CAAC;IACD,KAAK,CAAC,SAAS,CAAC,GAAY;QAC1B,OAAO,kBAAI,CAAC;IACd,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,MAAM,CAAC,UAAkB,EAAE,aAA4B,EAAE,MAAc;QAC3E,OAAO,kBAAI,CAAC;IACd,CAAC;IAED,SAAS,CAAC,MAAW;QACnB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;CACF;AA3GD,oCA2GC"}
|
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import * as appService from "@azure/arm-appservice";
|
|
3
|
-
import { AzurePublishingCredentials, AzureUploadConfig } from "./interfaces";
|
|
3
|
+
import { AzurePublishingCredentials, AzureUploadConfig, Logger } from "./interfaces";
|
|
4
4
|
/**
|
|
5
5
|
* operate int azure
|
|
6
6
|
*/
|
|
7
7
|
export declare class AzureOperations {
|
|
8
8
|
static readonly axiosInstance: import("axios").AxiosInstance;
|
|
9
9
|
static listPublishingCredentials(webSiteMgmtClient: appService.WebSiteManagementClient, resourceGroup: string, siteName: string): Promise<AzurePublishingCredentials>;
|
|
10
|
-
static zipDeployPackage(zipDeployEndpoint: string, zipBuffer: Buffer, config: AzureUploadConfig): Promise<string>;
|
|
11
|
-
static checkDeployStatus(location: string, config: AzureUploadConfig): Promise<void>;
|
|
12
|
-
static restartWebApp(webSiteMgmtClient: appService.WebSiteManagementClient, resourceGroup: string, siteName: string): Promise<void>;
|
|
10
|
+
static zipDeployPackage(zipDeployEndpoint: string, zipBuffer: Buffer, config: AzureUploadConfig, logger?: Logger): Promise<string>;
|
|
11
|
+
static checkDeployStatus(location: string, config: AzureUploadConfig, logger?: Logger): Promise<void>;
|
|
12
|
+
static restartWebApp(webSiteMgmtClient: appService.WebSiteManagementClient, resourceGroup: string, siteName: string, logger?: Logger): Promise<void>;
|
|
13
13
|
}
|
|
14
14
|
export declare function isHttpCodeOkOrCreated(code: number | undefined): boolean;
|
|
15
15
|
export declare function isHttpCodeAccepted(code: number | undefined): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"azureOps.d.ts","sourceRoot":"","sources":["../../../src/common/azure-hosting/azureOps.ts"],"names":[],"mappings":";AAGA,OAAO,KAAK,UAAU,MAAM,uBAAuB,CAAC;AAWpD,OAAO,EAIL,0BAA0B,EAC1B,iBAAiB,
|
|
1
|
+
{"version":3,"file":"azureOps.d.ts","sourceRoot":"","sources":["../../../src/common/azure-hosting/azureOps.ts"],"names":[],"mappings":";AAGA,OAAO,KAAK,UAAU,MAAM,uBAAuB,CAAC;AAWpD,OAAO,EAIL,0BAA0B,EAC1B,iBAAiB,EACjB,MAAM,EACP,MAAM,cAAc,CAAC;AAGtB;;GAEG;AACH,qBAAa,eAAe;IAC1B,gBAAuB,aAAa,gCAAkB;WAElC,yBAAyB,CAC3C,iBAAiB,EAAE,UAAU,CAAC,uBAAuB,EACrD,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,0BAA0B,CAAC;WAkBlB,gBAAgB,CAClC,iBAAiB,EAAE,MAAM,EACzB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,iBAAiB,EACzB,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,CAAC;WAkBE,iBAAiB,CACnC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,iBAAiB,EACzB,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC;WA0BI,aAAa,CAC/B,iBAAiB,EAAE,UAAU,CAAC,uBAAuB,EACrD,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,EAChB,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC;CAajB;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAEvE;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAEpE"}
|
|
@@ -8,6 +8,7 @@ const axios_1 = tslib_1.__importDefault(require("axios"));
|
|
|
8
8
|
const hostingError_1 = require("./hostingError");
|
|
9
9
|
const hostingConstant_1 = require("./hostingConstant");
|
|
10
10
|
const tools_1 = require("../tools");
|
|
11
|
+
const messages_1 = require("./messages");
|
|
11
12
|
/**
|
|
12
13
|
* operate int azure
|
|
13
14
|
*/
|
|
@@ -25,7 +26,8 @@ class AzureOperations {
|
|
|
25
26
|
}
|
|
26
27
|
return listResponse;
|
|
27
28
|
}
|
|
28
|
-
static async zipDeployPackage(zipDeployEndpoint, zipBuffer, config) {
|
|
29
|
+
static async zipDeployPackage(zipDeployEndpoint, zipBuffer, config, logger) {
|
|
30
|
+
var _a;
|
|
29
31
|
let res;
|
|
30
32
|
try {
|
|
31
33
|
res = await AzureOperations.axiosInstance.post(zipDeployEndpoint, zipBuffer, config);
|
|
@@ -34,11 +36,15 @@ class AzureOperations {
|
|
|
34
36
|
throw new hostingError_1.ZipDeployError(e);
|
|
35
37
|
}
|
|
36
38
|
if (!res || !isHttpCodeAccepted(res === null || res === void 0 ? void 0 : res.status)) {
|
|
39
|
+
if (res === null || res === void 0 ? void 0 : res.status) {
|
|
40
|
+
(_a = logger === null || logger === void 0 ? void 0 : logger.error) === null || _a === void 0 ? void 0 : _a.call(logger, messages_1.Messages.deployFailed(res.status));
|
|
41
|
+
}
|
|
37
42
|
throw new hostingError_1.ZipDeployError();
|
|
38
43
|
}
|
|
39
44
|
return res.headers.location;
|
|
40
45
|
}
|
|
41
|
-
static async checkDeployStatus(location, config) {
|
|
46
|
+
static async checkDeployStatus(location, config, logger) {
|
|
47
|
+
var _a;
|
|
42
48
|
let res;
|
|
43
49
|
for (let i = 0; i < hostingConstant_1.DeployStatusConstant.RETRY_TIMES; ++i) {
|
|
44
50
|
try {
|
|
@@ -55,13 +61,18 @@ class AzureOperations {
|
|
|
55
61
|
return;
|
|
56
62
|
}
|
|
57
63
|
else {
|
|
64
|
+
if (res.status) {
|
|
65
|
+
(_a = logger === null || logger === void 0 ? void 0 : logger.error) === null || _a === void 0 ? void 0 : _a.call(logger, messages_1.Messages.deployFailed(res.status));
|
|
66
|
+
}
|
|
58
67
|
throw new hostingError_1.DeployStatusError();
|
|
59
68
|
}
|
|
60
69
|
}
|
|
61
70
|
}
|
|
62
71
|
throw new hostingError_1.DeployTimeoutError();
|
|
63
72
|
}
|
|
64
|
-
static async restartWebApp(webSiteMgmtClient, resourceGroup, siteName) {
|
|
73
|
+
static async restartWebApp(webSiteMgmtClient, resourceGroup, siteName, logger) {
|
|
74
|
+
var _a;
|
|
75
|
+
(_a = logger === null || logger === void 0 ? void 0 : logger.info) === null || _a === void 0 ? void 0 : _a.call(logger, messages_1.Messages.restartFunction(siteName));
|
|
65
76
|
let res;
|
|
66
77
|
try {
|
|
67
78
|
res = await webSiteMgmtClient.webApps.restart(resourceGroup, siteName);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"azureOps.js","sourceRoot":"","sources":["../../../src/common/azure-hosting/azureOps.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAGlC,0DAAyC;AACzC,iDAMwB;AACxB,uDAAyD;AACzD,oCAAuC;AASvC;;GAEG;AACH,MAAa,eAAe;IAGnB,MAAM,CAAC,KAAK,CAAC,yBAAyB,CAC3C,iBAAqD,EACrD,aAAqB,EACrB,QAAgB;QAEhB,IAAI,YAAwC,CAAC;QAC7C,IAAI;YACF,YAAY,GAAG,MAAM,iBAAiB,CAAC,OAAO,CAAC,yBAAyB,CACtE,aAAa,EACb,QAAQ,CACT,CAAC;SACH;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,IAAI,6CAA8B,CAAC,CAAC,CAAC,CAAC;SAC7C;QAED,IAAI,CAAC,YAAY,IAAI,CAAC,qBAAqB,CAAC,YAAY,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE;YAC1E,MAAM,IAAI,6CAA8B,EAAE,CAAC;SAC5C;QAED,OAAO,YAAY,CAAC;IACtB,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAClC,iBAAyB,EACzB,SAAiB,EACjB,MAAyB
|
|
1
|
+
{"version":3,"file":"azureOps.js","sourceRoot":"","sources":["../../../src/common/azure-hosting/azureOps.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,4 +36,10 @@ export declare type AxiosHeaderWithLocation = {
|
|
|
36
36
|
};
|
|
37
37
|
};
|
|
38
38
|
export declare type AxiosZipDeployResult = AxiosHeaderWithLocation & AxiosOnlyStatusResult;
|
|
39
|
+
export interface Logger {
|
|
40
|
+
debug?: (message: string) => void;
|
|
41
|
+
info?: (message: string) => void;
|
|
42
|
+
warning?: (message: string) => void;
|
|
43
|
+
error?: (message: string) => void;
|
|
44
|
+
}
|
|
39
45
|
//# sourceMappingURL=interfaces.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../src/common/azure-hosting/interfaces.ts"],"names":[],"mappings":"AAGA,oBAAY,WAAW;IACrB,UAAU,WAAW;IACrB,SAAS,gBAAgB;IACzB,UAAU,eAAe;CAC1B;AAED,oBAAY,YAAY,GAAG,MAAM,EAAE,CAAC;AAEpC,oBAAY,YAAY,GAAG;IAAE,OAAO,EAAE,MAAM,EAAE,CAAC;IAAC,OAAO,EAAE,YAAY,CAAA;CAAE,CAAC;AAExE,oBAAY,iBAAiB,GAAG;IAC9B,OAAO,EAAE;QACP,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,aAAa,EAAE,MAAM,CAAC;KACvB,CAAC;IACF,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,oBAAY,0BAA0B,GAAG;IACvC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B,GAAG,6BAA6B,CAAC;AAElC,oBAAY,qBAAqB,GAAG;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,oBAAY,6BAA6B,GAAG;IAC1C,SAAS,EAAE;QACT,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;CACH,CAAC;AAEF,oBAAY,uBAAuB,GAAG;IACpC,OAAO,EAAE;QACP,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;CACH,CAAC;AAEF,oBAAY,oBAAoB,GAAG,uBAAuB,GAAG,qBAAqB,CAAC"}
|
|
1
|
+
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../src/common/azure-hosting/interfaces.ts"],"names":[],"mappings":"AAGA,oBAAY,WAAW;IACrB,UAAU,WAAW;IACrB,SAAS,gBAAgB;IACzB,UAAU,eAAe;CAC1B;AAED,oBAAY,YAAY,GAAG,MAAM,EAAE,CAAC;AAEpC,oBAAY,YAAY,GAAG;IAAE,OAAO,EAAE,MAAM,EAAE,CAAC;IAAC,OAAO,EAAE,YAAY,CAAA;CAAE,CAAC;AAExE,oBAAY,iBAAiB,GAAG;IAC9B,OAAO,EAAE;QACP,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,aAAa,EAAE,MAAM,CAAC;KACvB,CAAC;IACF,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,oBAAY,0BAA0B,GAAG;IACvC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B,GAAG,6BAA6B,CAAC;AAElC,oBAAY,qBAAqB,GAAG;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,oBAAY,6BAA6B,GAAG;IAC1C,SAAS,EAAE;QACT,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;CACH,CAAC;AAEF,oBAAY,uBAAuB,GAAG;IACpC,OAAO,EAAE;QACP,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;CACH,CAAC;AAEF,oBAAY,oBAAoB,GAAG,uBAAuB,GAAG,qBAAqB,CAAC;AAEnF,MAAM,WAAW,MAAM;IACrB,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACjC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACnC"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
export declare class Messages {
|
|
2
|
+
static generateBicep: (hostType: string) => string;
|
|
3
|
+
static updateBicep: (hostType: string) => string;
|
|
4
|
+
static skipUpdateBicep: (hostType: string) => string;
|
|
5
|
+
static deploy: (endpoint: string, bytes: number) => string;
|
|
6
|
+
static restartFunction: (siteName: string) => string;
|
|
7
|
+
static deployFailed: (status: number) => string;
|
|
8
|
+
}
|
|
9
|
+
//# sourceMappingURL=messages.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../../../src/common/azure-hosting/messages.ts"],"names":[],"mappings":"AAGA,qBAAa,QAAQ;IACnB,MAAM,CAAC,aAAa,aAAc,MAAM,KAAG,MAAM,CACS;IAC1D,MAAM,CAAC,WAAW,aAAc,MAAM,KAAG,MAAM,CACS;IACxD,MAAM,CAAC,eAAe,aAAc,MAAM,KAAG,MAAM,CACH;IAChD,MAAM,CAAC,MAAM,aAAc,MAAM,SAAS,MAAM,KAAG,MAAM,CACO;IAChE,MAAM,CAAC,eAAe,aAAc,MAAM,KAAG,MAAM,CACJ;IAE/C,MAAM,CAAC,YAAY,WAAY,MAAM,KAAG,MAAM,CACO;CACtD"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// Copyright (c) Microsoft Corporation.
|
|
3
|
+
// Licensed under the MIT license.
|
|
4
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
+
exports.Messages = void 0;
|
|
6
|
+
class Messages {
|
|
7
|
+
}
|
|
8
|
+
exports.Messages = Messages;
|
|
9
|
+
Messages.generateBicep = (hostType) => `Successfully generate bicep template for ${hostType}.`;
|
|
10
|
+
Messages.updateBicep = (hostType) => `Successfully update bicep template for ${hostType}.`;
|
|
11
|
+
Messages.skipUpdateBicep = (hostType) => `Skip update bicep template for ${hostType}.`;
|
|
12
|
+
Messages.deploy = (endpoint, bytes) => `Successfully deploy to endpoint ${endpoint}: ${bytes} bytes`;
|
|
13
|
+
Messages.restartFunction = (siteName) => `Restarting Azure Function App ${siteName}.`;
|
|
14
|
+
Messages.deployFailed = (status) => `Deployment is failed with error code: ${status}.`;
|
|
15
|
+
//# sourceMappingURL=messages.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../../src/common/azure-hosting/messages.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,MAAa,QAAQ;;AAArB,4BAcC;AAbQ,sBAAa,GAAG,CAAC,QAAgB,EAAU,EAAE,CAClD,4CAA4C,QAAQ,GAAG,CAAC;AACnD,oBAAW,GAAG,CAAC,QAAgB,EAAU,EAAE,CAChD,0CAA0C,QAAQ,GAAG,CAAC;AACjD,wBAAe,GAAG,CAAC,QAAgB,EAAU,EAAE,CACpD,kCAAkC,QAAQ,GAAG,CAAC;AACzC,eAAM,GAAG,CAAC,QAAgB,EAAE,KAAa,EAAU,EAAE,CAC1D,mCAAmC,QAAQ,KAAK,KAAK,QAAQ,CAAC;AACzD,wBAAe,GAAG,CAAC,QAAgB,EAAU,EAAE,CACpD,iCAAiC,QAAQ,GAAG,CAAC;AAExC,qBAAY,GAAG,CAAC,MAAc,EAAU,EAAE,CAC/C,yCAAyC,MAAM,GAAG,CAAC"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
import { ArmTemplateResult } from "../armInterface";
|
|
3
3
|
import { TokenProvider } from "@microsoft/teamsfx-api";
|
|
4
4
|
import * as appService from "@azure/arm-appservice";
|
|
5
|
+
import { Logger } from "./interfaces";
|
|
5
6
|
export declare function mergeTemplates(templates: ArmTemplateResult[]): ArmTemplateResult;
|
|
6
|
-
export declare function azureWebSiteDeploy(resourceId: string, tokenProvider: TokenProvider, buffer: Buffer): Promise<appService.WebSiteManagementClient>;
|
|
7
|
+
export declare function azureWebSiteDeploy(resourceId: string, tokenProvider: TokenProvider, buffer: Buffer, logger?: Logger): Promise<appService.WebSiteManagementClient>;
|
|
7
8
|
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/common/azure-hosting/utils.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAEvD,OAAO,KAAK,UAAU,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/common/azure-hosting/utils.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAEvD,OAAO,KAAK,UAAU,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAqB,MAAM,EAAE,MAAM,cAAc,CAAC;AAYzD,wBAAgB,cAAc,CAAC,SAAS,EAAE,iBAAiB,EAAE,GAAG,iBAAiB,CAuBhF;AAuDD,wBAAsB,kBAAkB,CACtC,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAiB7C"}
|
|
@@ -10,6 +10,7 @@ const azureOps_1 = require("./azureOps");
|
|
|
10
10
|
const hostingConstant_1 = require("./hostingConstant");
|
|
11
11
|
const hostingError_1 = require("./hostingError");
|
|
12
12
|
const tools_1 = require("../tools");
|
|
13
|
+
const messages_1 = require("./messages");
|
|
13
14
|
function mergeTemplates(templates) {
|
|
14
15
|
const existsProvision = templates.some((it) => it.Provision);
|
|
15
16
|
const existsParameters = templates.some((it) => it.Parameters);
|
|
@@ -69,7 +70,8 @@ async function getAzureDeployConfig(subscriptionId, rgName, siteName, tokenProvi
|
|
|
69
70
|
webSiteMgmtClient,
|
|
70
71
|
];
|
|
71
72
|
}
|
|
72
|
-
async function azureWebSiteDeploy(resourceId, tokenProvider, buffer) {
|
|
73
|
+
async function azureWebSiteDeploy(resourceId, tokenProvider, buffer, logger) {
|
|
74
|
+
var _a;
|
|
73
75
|
const subscriptionId = tools_1.getSubscriptionIdFromResourceId(resourceId);
|
|
74
76
|
const rgName = tools_1.getResourceGroupNameFromResourceId(resourceId);
|
|
75
77
|
const siteName = tools_1.getSiteNameFromResourceId(resourceId);
|
|
@@ -77,6 +79,7 @@ async function azureWebSiteDeploy(resourceId, tokenProvider, buffer) {
|
|
|
77
79
|
const zipDeployEndpoint = getZipDeployEndpoint(siteName);
|
|
78
80
|
const statusUrl = await azureOps_1.AzureOperations.zipDeployPackage(zipDeployEndpoint, buffer, config);
|
|
79
81
|
await azureOps_1.AzureOperations.checkDeployStatus(statusUrl, config);
|
|
82
|
+
(_a = logger === null || logger === void 0 ? void 0 : logger.info) === null || _a === void 0 ? void 0 : _a.call(logger, messages_1.Messages.deploy(zipDeployEndpoint, buffer.byteLength));
|
|
80
83
|
return client;
|
|
81
84
|
}
|
|
82
85
|
exports.azureWebSiteDeploy = azureWebSiteDeploy;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/common/azure-hosting/utils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAKlC,0EAAoD;AAEpD,yCAAmC;AACnC,yCAA6C;AAC7C,uDAAoF;AACpF,iDAAmD;AACnD,oCAIkB;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/common/azure-hosting/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export declare const defaultHelpLink = "https://aka.ms/teamsfx-envchecker-help";
|
|
2
2
|
export declare const validationSettingsHelpLink: string;
|
|
3
|
+
export declare const functionDepsVersionsLink = "https://aka.ms/functions-node-versions";
|
|
3
4
|
export declare const nodeNotFoundHelpLink: string;
|
|
4
5
|
export declare const nodeNotSupportedForAzureHelpLink: string;
|
|
5
6
|
export declare const nodeNotSupportedForFunctionsHelpLink: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpLink.d.ts","sourceRoot":"","sources":["../../../../src/common/deps-checker/constant/helpLink.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,eAAe,2CAA2C,CAAC;AACxE,eAAO,MAAM,0BAA0B,QAAyD,CAAC;AAEjG,eAAO,MAAM,oBAAoB,QAAoC,CAAC;AACtE,eAAO,MAAM,gCAAgC,QAAsD,CAAC;AACpG,eAAO,MAAM,oCAAoC,QAAwD,CAAC;AAC1G,eAAO,MAAM,+BAA+B,QAAqD,CAAC;AAElG,eAAO,MAAM,yBAAyB,QAA8C,CAAC;AACrF,eAAO,MAAM,2BAA2B,QAA2C,CAAC;AACpF,eAAO,MAAM,2BAA2B,QAAsC,CAAC;AAC/E,eAAO,MAAM,qCAAqC,QAAqD,CAAC;AAExG,eAAO,MAAM,oBAAoB,QAA0C,CAAC"}
|
|
1
|
+
{"version":3,"file":"helpLink.d.ts","sourceRoot":"","sources":["../../../../src/common/deps-checker/constant/helpLink.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,eAAe,2CAA2C,CAAC;AACxE,eAAO,MAAM,0BAA0B,QAAyD,CAAC;AAEjG,eAAO,MAAM,wBAAwB,2CAA2C,CAAC;AAEjF,eAAO,MAAM,oBAAoB,QAAoC,CAAC;AACtE,eAAO,MAAM,gCAAgC,QAAsD,CAAC;AACpG,eAAO,MAAM,oCAAoC,QAAwD,CAAC;AAC1G,eAAO,MAAM,+BAA+B,QAAqD,CAAC;AAElG,eAAO,MAAM,yBAAyB,QAA8C,CAAC;AACrF,eAAO,MAAM,2BAA2B,QAA2C,CAAC;AACpF,eAAO,MAAM,2BAA2B,QAAsC,CAAC;AAC/E,eAAO,MAAM,qCAAqC,QAAqD,CAAC;AAExG,eAAO,MAAM,oBAAoB,QAA0C,CAAC"}
|
|
@@ -2,9 +2,10 @@
|
|
|
2
2
|
// Copyright (c) Microsoft Corporation.
|
|
3
3
|
// Licensed under the MIT license.
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.ngrokInstallHelpLink = exports.dotnetNotSupportTargetVersionHelpLink = exports.dotnetManualInstallHelpLink = exports.dotnetFailToInstallHelpLink = exports.dotnetExplanationHelpLink = exports.nodeNotSupportedForSPFxHelpLink = exports.nodeNotSupportedForFunctionsHelpLink = exports.nodeNotSupportedForAzureHelpLink = exports.nodeNotFoundHelpLink = exports.validationSettingsHelpLink = exports.defaultHelpLink = void 0;
|
|
5
|
+
exports.ngrokInstallHelpLink = exports.dotnetNotSupportTargetVersionHelpLink = exports.dotnetManualInstallHelpLink = exports.dotnetFailToInstallHelpLink = exports.dotnetExplanationHelpLink = exports.nodeNotSupportedForSPFxHelpLink = exports.nodeNotSupportedForFunctionsHelpLink = exports.nodeNotSupportedForAzureHelpLink = exports.nodeNotFoundHelpLink = exports.functionDepsVersionsLink = exports.validationSettingsHelpLink = exports.defaultHelpLink = void 0;
|
|
6
6
|
exports.defaultHelpLink = "https://aka.ms/teamsfx-envchecker-help";
|
|
7
7
|
exports.validationSettingsHelpLink = `${exports.defaultHelpLink}#teams-toolkit-validation-settings`;
|
|
8
|
+
exports.functionDepsVersionsLink = "https://aka.ms/functions-node-versions";
|
|
8
9
|
exports.nodeNotFoundHelpLink = `${exports.defaultHelpLink}#nodenotfound`;
|
|
9
10
|
exports.nodeNotSupportedForAzureHelpLink = `${exports.defaultHelpLink}#nodenotsupported-azure-hosting`;
|
|
10
11
|
exports.nodeNotSupportedForFunctionsHelpLink = `${exports.defaultHelpLink}#nodenotsupported-azure-functions`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpLink.js","sourceRoot":"","sources":["../../../../src/common/deps-checker/constant/helpLink.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAErB,QAAA,eAAe,GAAG,wCAAwC,CAAC;AAC3D,QAAA,0BAA0B,GAAG,GAAG,uBAAe,oCAAoC,CAAC;AAEpF,QAAA,oBAAoB,GAAG,GAAG,uBAAe,eAAe,CAAC;AACzD,QAAA,gCAAgC,GAAG,GAAG,uBAAe,iCAAiC,CAAC;AACvF,QAAA,oCAAoC,GAAG,GAAG,uBAAe,mCAAmC,CAAC;AAC7F,QAAA,+BAA+B,GAAG,GAAG,uBAAe,gCAAgC,CAAC;AAErF,QAAA,yBAAyB,GAAG,GAAG,uBAAe,yBAAyB,CAAC;AACxE,QAAA,2BAA2B,GAAG,GAAG,uBAAe,sBAAsB,CAAC;AACvE,QAAA,2BAA2B,GAAG,GAAG,uBAAe,iBAAiB,CAAC;AAClE,QAAA,qCAAqC,GAAG,GAAG,uBAAe,gCAAgC,CAAC;AAE3F,QAAA,oBAAoB,GAAG,GAAG,uBAAe,qBAAqB,CAAC"}
|
|
1
|
+
{"version":3,"file":"helpLink.js","sourceRoot":"","sources":["../../../../src/common/deps-checker/constant/helpLink.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAErB,QAAA,eAAe,GAAG,wCAAwC,CAAC;AAC3D,QAAA,0BAA0B,GAAG,GAAG,uBAAe,oCAAoC,CAAC;AAEpF,QAAA,wBAAwB,GAAG,wCAAwC,CAAC;AAEpE,QAAA,oBAAoB,GAAG,GAAG,uBAAe,eAAe,CAAC;AACzD,QAAA,gCAAgC,GAAG,GAAG,uBAAe,iCAAiC,CAAC;AACvF,QAAA,oCAAoC,GAAG,GAAG,uBAAe,mCAAmC,CAAC;AAC7F,QAAA,+BAA+B,GAAG,GAAG,uBAAe,gCAAgC,CAAC;AAErF,QAAA,yBAAyB,GAAG,GAAG,uBAAe,yBAAyB,CAAC;AACxE,QAAA,2BAA2B,GAAG,GAAG,uBAAe,sBAAsB,CAAC;AACvE,QAAA,2BAA2B,GAAG,GAAG,uBAAe,iBAAiB,CAAC;AAClE,QAAA,qCAAqC,GAAG,GAAG,uBAAe,gCAAgC,CAAC;AAE3F,QAAA,oBAAoB,GAAG,GAAG,uBAAe,qBAAqB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message.d.ts","sourceRoot":"","sources":["../../../../src/common/deps-checker/constant/message.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,QAAQ
|
|
1
|
+
{"version":3,"file":"message.d.ts","sourceRoot":"","sources":["../../../../src/common/deps-checker/constant/message.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuCpB,CAAC"}
|
|
@@ -16,6 +16,7 @@ exports.Messages = {
|
|
|
16
16
|
needInstallFuncCoreTool: localizeUtils_1.getLocalizedString("depChecker.needInstallFuncCoreTool"),
|
|
17
17
|
failToInstallFuncCoreTool: localizeUtils_1.getLocalizedString("depChecker.failToInstallFuncCoreTool"),
|
|
18
18
|
failToValidateFuncCoreTool: localizeUtils_1.getLocalizedString("depChecker.failToValidateFuncCoreTool"),
|
|
19
|
+
funcNodeNotMatched: localizeUtils_1.getLocalizedString("depChecker.funcNodeNotMatched"),
|
|
19
20
|
startInstallNgrok: localizeUtils_1.getLocalizedString("depChecker.startInstallNgrok"),
|
|
20
21
|
finishInstallNgrok: localizeUtils_1.getLocalizedString("depChecker.finishInstallNgrok"),
|
|
21
22
|
needInstallNgrok: localizeUtils_1.getLocalizedString("depChecker.needInstallNgrok"),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message.js","sourceRoot":"","sources":["../../../../src/common/deps-checker/constant/message.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,uDAA2E;AAE9D,QAAA,QAAQ,GAAG;IACtB,mBAAmB,EAAE,kCAAkB,CAAC,gCAAgC,CAAC;IACzE,mBAAmB,EAAE;QACnB,gCAAgB,CAAC,sCAAsC,CAAC;QACxD,kCAAkB,CAAC,sCAAsC,CAAC;KAC3D;IAED,4BAA4B,EAAE,kCAAkB,CAAC,yCAAyC,CAAC;IAC3F,6BAA6B,EAAE,kCAAkB,CAAC,0CAA0C,CAAC;IAC7F,6BAA6B,EAAE,kCAAkB,CAAC,0CAA0C,CAAC;IAC7F,uBAAuB,EAAE,kCAAkB,CAAC,oCAAoC,CAAC;IACjF,yBAAyB,EAAE,kCAAkB,CAAC,sCAAsC,CAAC;IACrF,0BAA0B,EAAE,kCAAkB,CAAC,uCAAuC,CAAC;
|
|
1
|
+
{"version":3,"file":"message.js","sourceRoot":"","sources":["../../../../src/common/deps-checker/constant/message.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,uDAA2E;AAE9D,QAAA,QAAQ,GAAG;IACtB,mBAAmB,EAAE,kCAAkB,CAAC,gCAAgC,CAAC;IACzE,mBAAmB,EAAE;QACnB,gCAAgB,CAAC,sCAAsC,CAAC;QACxD,kCAAkB,CAAC,sCAAsC,CAAC;KAC3D;IAED,4BAA4B,EAAE,kCAAkB,CAAC,yCAAyC,CAAC;IAC3F,6BAA6B,EAAE,kCAAkB,CAAC,0CAA0C,CAAC;IAC7F,6BAA6B,EAAE,kCAAkB,CAAC,0CAA0C,CAAC;IAC7F,uBAAuB,EAAE,kCAAkB,CAAC,oCAAoC,CAAC;IACjF,yBAAyB,EAAE,kCAAkB,CAAC,sCAAsC,CAAC;IACrF,0BAA0B,EAAE,kCAAkB,CAAC,uCAAuC,CAAC;IACvF,kBAAkB,EAAE,kCAAkB,CAAC,+BAA+B,CAAC;IAEvE,iBAAiB,EAAE,kCAAkB,CAAC,8BAA8B,CAAC;IACrE,kBAAkB,EAAE,kCAAkB,CAAC,+BAA+B,CAAC;IACvE,gBAAgB,EAAE,kCAAkB,CAAC,6BAA6B,CAAC;IACnE,kBAAkB,EAAE,kCAAkB,CAAC,+BAA+B,CAAC;IACvE,mBAAmB,EAAE,kCAAkB,CAAC,gCAAgC,CAAC;IAEzE,cAAc,EAAE,kCAAkB,CAAC,2BAA2B,CAAC;IAC/D,mBAAmB,EAAE,kCAAkB,CAAC,gCAAgC,CAAC;IACzE,eAAe,EAAE,kCAAkB,CAAC,4BAA4B,CAAC;IACjE,mBAAmB,EAAE,kCAAkB,CAAC,gCAAgC,CAAC;IACzE,sBAAsB,EAAE,kCAAkB,CAAC,mCAAmC,CAAC;IAC/E,mBAAmB,EAAE,kCAAkB,CAAC,gCAAgC,CAAC;IAEzE,YAAY,EAAE,kCAAkB,CAAC,yBAAyB,CAAC;IAC3D,gBAAgB,EAAE,kCAAkB,CAAC,6BAA6B,CAAC;IAEnE,cAAc,EAAE,kCAAkB,CAAC,2BAA2B,CAAC;IAC/D,YAAY,EAAE,kCAAkB,CAAC,yBAAyB,CAAC;IAE3D,iBAAiB,EAAE,kCAAkB,CAAC,8BAA8B,CAAC;IAErE,gCAAgC,EAAE,kCAAkB,CAClD,6CAA6C,CAC9C;CACF,CAAC"}
|
|
@@ -11,6 +11,9 @@ export declare class NodeNotSupportedError extends DepsCheckerError {
|
|
|
11
11
|
export declare class LinuxNotSupportedError extends DepsCheckerError {
|
|
12
12
|
constructor(helpLink: string);
|
|
13
13
|
}
|
|
14
|
+
export declare class FuncNodeNotMatchedError extends DepsCheckerError {
|
|
15
|
+
constructor(message: string, helpLink: string);
|
|
16
|
+
}
|
|
14
17
|
export declare class BackendExtensionsInstallError extends DepsCheckerError {
|
|
15
18
|
constructor(message: string, helpLink: string);
|
|
16
19
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"depsError.d.ts","sourceRoot":"","sources":["../../../src/common/deps-checker/depsError.ts"],"names":[],"mappings":"AAGA,qBAAa,gBAAiB,SAAQ,KAAK;IACzC,SAAgB,QAAQ,EAAE,MAAM,CAAC;gBAErB,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;CAM9C;AAED,qBAAa,iBAAkB,SAAQ,gBAAgB;gBACzC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;CAK9C;AAED,qBAAa,qBAAsB,SAAQ,gBAAgB;gBAC7C,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;CAK9C;AACD,qBAAa,sBAAuB,SAAQ,gBAAgB;gBAC9C,QAAQ,EAAE,MAAM;CAK7B;AAED,qBAAa,6BAA8B,SAAQ,gBAAgB;gBACrD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;CAK9C"}
|
|
1
|
+
{"version":3,"file":"depsError.d.ts","sourceRoot":"","sources":["../../../src/common/deps-checker/depsError.ts"],"names":[],"mappings":"AAGA,qBAAa,gBAAiB,SAAQ,KAAK;IACzC,SAAgB,QAAQ,EAAE,MAAM,CAAC;gBAErB,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;CAM9C;AAED,qBAAa,iBAAkB,SAAQ,gBAAgB;gBACzC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;CAK9C;AAED,qBAAa,qBAAsB,SAAQ,gBAAgB;gBAC7C,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;CAK9C;AACD,qBAAa,sBAAuB,SAAQ,gBAAgB;gBAC9C,QAAQ,EAAE,MAAM;CAK7B;AAED,qBAAa,uBAAwB,SAAQ,gBAAgB;gBAC/C,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;CAK9C;AAED,qBAAa,6BAA8B,SAAQ,gBAAgB;gBACrD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;CAK9C"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// Copyright (c) Microsoft Corporation.
|
|
3
3
|
// Licensed under the MIT license.
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.BackendExtensionsInstallError = exports.LinuxNotSupportedError = exports.NodeNotSupportedError = exports.NodeNotFoundError = exports.DepsCheckerError = void 0;
|
|
5
|
+
exports.BackendExtensionsInstallError = exports.FuncNodeNotMatchedError = exports.LinuxNotSupportedError = exports.NodeNotSupportedError = exports.NodeNotFoundError = exports.DepsCheckerError = void 0;
|
|
6
6
|
class DepsCheckerError extends Error {
|
|
7
7
|
constructor(message, helpLink) {
|
|
8
8
|
super(message);
|
|
@@ -32,6 +32,13 @@ class LinuxNotSupportedError extends DepsCheckerError {
|
|
|
32
32
|
}
|
|
33
33
|
}
|
|
34
34
|
exports.LinuxNotSupportedError = LinuxNotSupportedError;
|
|
35
|
+
class FuncNodeNotMatchedError extends DepsCheckerError {
|
|
36
|
+
constructor(message, helpLink) {
|
|
37
|
+
super(message, helpLink);
|
|
38
|
+
Object.setPrototypeOf(this, FuncNodeNotMatchedError.prototype);
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
exports.FuncNodeNotMatchedError = FuncNodeNotMatchedError;
|
|
35
42
|
class BackendExtensionsInstallError extends DepsCheckerError {
|
|
36
43
|
constructor(message, helpLink) {
|
|
37
44
|
super(message, helpLink);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"depsError.js","sourceRoot":"","sources":["../../../src/common/deps-checker/depsError.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,MAAa,gBAAiB,SAAQ,KAAK;IAGzC,YAAY,OAAe,EAAE,QAAgB;QAC3C,KAAK,CAAC,OAAO,CAAC,CAAC;QAEf,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC;IAC1D,CAAC;CACF;AATD,4CASC;AAED,MAAa,iBAAkB,SAAQ,gBAAgB;IACrD,YAAY,OAAe,EAAE,QAAgB;QAC3C,KAAK,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAEzB,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,iBAAiB,CAAC,SAAS,CAAC,CAAC;IAC3D,CAAC;CACF;AAND,8CAMC;AAED,MAAa,qBAAsB,SAAQ,gBAAgB;IACzD,YAAY,OAAe,EAAE,QAAgB;QAC3C,KAAK,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAEzB,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,qBAAqB,CAAC,SAAS,CAAC,CAAC;IAC/D,CAAC;CACF;AAND,sDAMC;AACD,MAAa,sBAAuB,SAAQ,gBAAgB;IAC1D,YAAY,QAAgB;QAC1B,KAAK,CAAC,yBAAyB,EAAE,QAAQ,CAAC,CAAC;QAE3C,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,sBAAsB,CAAC,SAAS,CAAC,CAAC;IAChE,CAAC;CACF;AAND,wDAMC;AAED,MAAa,6BAA8B,SAAQ,gBAAgB;IACjE,YAAY,OAAe,EAAE,QAAgB;QAC3C,KAAK,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAEzB,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,6BAA6B,CAAC,SAAS,CAAC,CAAC;IACvE,CAAC;CACF;AAND,sEAMC"}
|
|
1
|
+
{"version":3,"file":"depsError.js","sourceRoot":"","sources":["../../../src/common/deps-checker/depsError.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,MAAa,gBAAiB,SAAQ,KAAK;IAGzC,YAAY,OAAe,EAAE,QAAgB;QAC3C,KAAK,CAAC,OAAO,CAAC,CAAC;QAEf,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC;IAC1D,CAAC;CACF;AATD,4CASC;AAED,MAAa,iBAAkB,SAAQ,gBAAgB;IACrD,YAAY,OAAe,EAAE,QAAgB;QAC3C,KAAK,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAEzB,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,iBAAiB,CAAC,SAAS,CAAC,CAAC;IAC3D,CAAC;CACF;AAND,8CAMC;AAED,MAAa,qBAAsB,SAAQ,gBAAgB;IACzD,YAAY,OAAe,EAAE,QAAgB;QAC3C,KAAK,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAEzB,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,qBAAqB,CAAC,SAAS,CAAC,CAAC;IAC/D,CAAC;CACF;AAND,sDAMC;AACD,MAAa,sBAAuB,SAAQ,gBAAgB;IAC1D,YAAY,QAAgB;QAC1B,KAAK,CAAC,yBAAyB,EAAE,QAAQ,CAAC,CAAC;QAE3C,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,sBAAsB,CAAC,SAAS,CAAC,CAAC;IAChE,CAAC;CACF;AAND,wDAMC;AAED,MAAa,uBAAwB,SAAQ,gBAAgB;IAC3D,YAAY,OAAe,EAAE,QAAgB;QAC3C,KAAK,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAEzB,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,uBAAuB,CAAC,SAAS,CAAC,CAAC;IACjE,CAAC;CACF;AAND,0DAMC;AAED,MAAa,6BAA8B,SAAQ,gBAAgB;IACjE,YAAY,OAAe,EAAE,QAAgB;QAC3C,KAAK,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAEzB,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,6BAA6B,CAAC,SAAS,CAAC,CAAC;IACvE,CAAC;CACF;AAND,sEAMC"}
|
|
@@ -54,7 +54,7 @@ class DepsManager {
|
|
|
54
54
|
async resolve(type, shouldInstall, doctor = false) {
|
|
55
55
|
const checker = checkerFactory_1.CheckerFactory.createChecker(type, doctor ? this.emptyLogger : this.logger, this.telemetry);
|
|
56
56
|
let error = undefined;
|
|
57
|
-
if (shouldInstall
|
|
57
|
+
if (shouldInstall) {
|
|
58
58
|
const result = await checker.resolve();
|
|
59
59
|
error = result.isErr() ? result.error : undefined;
|
|
60
60
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"depsManager.js","sourceRoot":"","sources":["../../../src/common/deps-checker/depsManager.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,6CAAuD;AAEvD,+CAAgE;AAChE,qDAAkD;AAuBlD,MAAa,WAAW;IActB,YAAY,MAAkB,EAAE,SAAwB;QACtD,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,KAAK,CAAC,sBAAsB,CAAC,CAAC;SACrC;QACD,IAAI,CAAC,SAAS,EAAE;YACd,MAAM,KAAK,CAAC,sBAAsB,CAAC,CAAC;SACrC;QAED,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,WAAW,GAAG,IAAI,wBAAW,EAAE,CAAC;IACvC,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,kBAAkB,CAC7B,YAAwB,EACxB,EAAE,QAAQ,GAAG,IAAI,EAAE,MAAM,GAAG,KAAK,EAAe;QAEhD,IAAI,CAAC,YAAY,IAAI,YAAY,CAAC,MAAM,IAAI,CAAC,EAAE;YAC7C,OAAO,EAAE,CAAC;SACX;QAED,MAAM,WAAW,GAAe,WAAW,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;QACzE,MAAM,MAAM,GAAuB,EAAE,CAAC;QACtC,IAAI,aAAa,GAAG,IAAI,CAAC;QACzB,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE;YAC9B,MAAM,MAAM,GAAqB,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;YACjF,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAEpB,IAAI,QAAQ,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;gBACnC,aAAa,GAAG,KAAK,CAAC;aACvB;SACF;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEM,KAAK,CAAC,SAAS,CAAC,SAAqB;QAC1C,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,MAAM,IAAI,CAAC,EAAE;YACvC,OAAO,EAAE,CAAC;SACX;QACD,MAAM,MAAM,GAAuB,EAAE,CAAC;QACtC,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE;YAC5B,MAAM,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;SAC9C;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,KAAK,CAAC,OAAO,CACnB,IAAc,EACd,aAAsB,EACtB,MAAM,GAAG,KAAK;QAEd,MAAM,OAAO,GAAgB,+BAAc,CAAC,aAAa,CACvD,IAAI,EACJ,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,EACvC,IAAI,CAAC,SAAS,CACf,CAAC;QACF,IAAI,KAAK,GAAG,SAAS,CAAC;QAEtB,IAAI,aAAa,
|
|
1
|
+
{"version":3,"file":"depsManager.js","sourceRoot":"","sources":["../../../src/common/deps-checker/depsManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,7 @@ export declare class FuncToolChecker implements DepsChecker {
|
|
|
16
16
|
getDepsInfo(): Promise<DepsInfo>;
|
|
17
17
|
resolve(): Promise<Result<boolean, DepsCheckerError>>;
|
|
18
18
|
isInstalled(): Promise<boolean>;
|
|
19
|
+
private checkGlobalFuncAndNode;
|
|
19
20
|
isPortableFuncInstalled(): Promise<boolean>;
|
|
20
21
|
isGlobalFuncInstalled(): Promise<boolean>;
|
|
21
22
|
install(): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"funcToolChecker.d.ts","sourceRoot":"","sources":["../../../../src/common/deps-checker/internal/funcToolChecker.ts"],"names":[],"mappings":"AAMA,OAAO,EAAoB,MAAM,EAAW,MAAM,wBAAwB,CAAC;AAI3E,OAAO,EAAE,gBAAgB,
|
|
1
|
+
{"version":3,"file":"funcToolChecker.d.ts","sourceRoot":"","sources":["../../../../src/common/deps-checker/internal/funcToolChecker.ts"],"names":[],"mappings":"AAMA,OAAO,EAAoB,MAAM,EAAW,MAAM,wBAAwB,CAAC;AAI3E,OAAO,EAAE,gBAAgB,EAAmD,MAAM,cAAc,CAAC;AAIjG,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAIvD,oBAAY,WAAW;IACrB,EAAE,MAAM;IACR,EAAE,MAAM;IACR,EAAE,MAAM;IACR,EAAE,MAAM;CACT;AAwBD,qBAAa,eAAgB,YAAW,WAAW;IACjD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAa;IACrC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAgB;gBAE/B,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa;IAK3C,WAAW,IAAI,OAAO,CAAC,QAAQ,CAAC;IAahC,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;IAwBrD,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;YAoB9B,sBAAsB;IAsBvB,uBAAuB,IAAI,OAAO,CAAC,OAAO,CAAC;IAsB3C,qBAAqB,IAAI,OAAO,CAAC,OAAO,CAAC;IAKzC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;YAqBvB,uBAAuB;YAcvB,QAAQ;IAyBtB,OAAO,CAAC,iBAAiB;IAQzB,OAAO,CAAC,MAAM,CAAC,qBAAqB;IAIpC,OAAO,CAAC,MAAM,CAAC,eAAe;IAI9B,OAAO,CAAC,MAAM,CAAC,uBAAuB;IAUzB,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;IAUhC,yBAAyB,IAAI,MAAM,EAAE;YAO9B,gBAAgB;YAYhB,sBAAsB;YAgBtB,MAAM;YAoBN,OAAO;YAWP,kBAAkB;YAWlB,WAAW;YAYX,qBAAqB;IAyCnC,OAAO,CAAC,cAAc;YAIR,mBAAmB;CAqBlC;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI,CAmBxE"}
|