@microsoft/teamsfx-core 2.0.6 → 2.0.7-alpha.8120e652f.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/constants.d.ts +1 -0
- package/build/common/constants.d.ts.map +1 -1
- package/build/common/constants.js +1 -0
- package/build/common/constants.js.map +1 -1
- package/build/common/deps-checker/checkerFactory.d.ts.map +1 -1
- package/build/common/deps-checker/checkerFactory.js +3 -0
- package/build/common/deps-checker/checkerFactory.js.map +1 -1
- package/build/common/deps-checker/constant/telemetry.d.ts +1 -0
- package/build/common/deps-checker/constant/telemetry.d.ts.map +1 -1
- package/build/common/deps-checker/constant/telemetry.js +1 -0
- package/build/common/deps-checker/constant/telemetry.js.map +1 -1
- package/build/common/deps-checker/coreDepsLoggerAdapter.d.ts +17 -0
- package/build/common/deps-checker/coreDepsLoggerAdapter.d.ts.map +1 -0
- package/build/common/deps-checker/coreDepsLoggerAdapter.js +47 -0
- package/build/common/deps-checker/coreDepsLoggerAdapter.js.map +1 -0
- package/build/common/deps-checker/coreDepsTelemetryAdapter.d.ts +16 -0
- package/build/common/deps-checker/coreDepsTelemetryAdapter.d.ts.map +1 -0
- package/build/common/deps-checker/coreDepsTelemetryAdapter.js +53 -0
- package/build/common/deps-checker/coreDepsTelemetryAdapter.js.map +1 -0
- package/build/common/deps-checker/depsChecker.d.ts +6 -1
- package/build/common/deps-checker/depsChecker.d.ts.map +1 -1
- package/build/common/deps-checker/depsChecker.js +6 -1
- package/build/common/deps-checker/depsChecker.js.map +1 -1
- package/build/common/deps-checker/index.d.ts +2 -0
- package/build/common/deps-checker/index.d.ts.map +1 -1
- package/build/common/deps-checker/index.js +2 -0
- package/build/common/deps-checker/index.js.map +1 -1
- package/build/common/deps-checker/internal/testToolChecker.d.ts +14 -3
- package/build/common/deps-checker/internal/testToolChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/testToolChecker.js +178 -75
- package/build/common/deps-checker/internal/testToolChecker.js.map +1 -1
- package/build/common/deps-checker/internal/vxTestAppChecker.d.ts.map +1 -1
- package/build/common/deps-checker/internal/vxTestAppChecker.js +3 -45
- package/build/common/deps-checker/internal/vxTestAppChecker.js.map +1 -1
- package/build/common/deps-checker/util/downloadHelper.d.ts +15 -0
- package/build/common/deps-checker/util/downloadHelper.d.ts.map +1 -0
- package/build/common/deps-checker/util/downloadHelper.js +59 -0
- package/build/common/deps-checker/util/downloadHelper.js.map +1 -0
- package/build/common/featureFlags.d.ts +1 -2
- package/build/common/featureFlags.d.ts.map +1 -1
- package/build/common/featureFlags.js +5 -9
- package/build/common/featureFlags.js.map +1 -1
- package/build/common/local/packageJsonHelper.d.ts +0 -1
- package/build/common/local/packageJsonHelper.d.ts.map +1 -1
- package/build/common/local/packageJsonHelper.js +1 -29
- package/build/common/local/packageJsonHelper.js.map +1 -1
- package/build/common/m365/packageService.d.ts.map +1 -1
- package/build/common/m365/packageService.js +16 -7
- package/build/common/m365/packageService.js.map +1 -1
- package/build/common/projectTypeChecker.d.ts +38 -0
- package/build/common/projectTypeChecker.d.ts.map +1 -0
- package/build/common/projectTypeChecker.js +217 -0
- package/build/common/projectTypeChecker.js.map +1 -0
- package/build/common/samples.d.ts +6 -4
- package/build/common/samples.d.ts.map +1 -1
- package/build/common/samples.js +64 -29
- package/build/common/samples.js.map +1 -1
- package/build/common/spec-parser/interfaces.d.ts +14 -1
- package/build/common/spec-parser/interfaces.d.ts.map +1 -1
- package/build/common/spec-parser/manifestUpdater.d.ts +2 -2
- package/build/common/spec-parser/manifestUpdater.d.ts.map +1 -1
- package/build/common/spec-parser/manifestUpdater.js +33 -19
- package/build/common/spec-parser/manifestUpdater.js.map +1 -1
- package/build/common/spec-parser/specFilter.d.ts +1 -1
- package/build/common/spec-parser/specFilter.d.ts.map +1 -1
- package/build/common/spec-parser/specFilter.js +2 -2
- package/build/common/spec-parser/specFilter.js.map +1 -1
- package/build/common/spec-parser/specParser.browser.d.ts.map +1 -1
- package/build/common/spec-parser/specParser.browser.js +5 -3
- package/build/common/spec-parser/specParser.browser.js.map +1 -1
- package/build/common/spec-parser/specParser.d.ts.map +1 -1
- package/build/common/spec-parser/specParser.js +36 -37
- package/build/common/spec-parser/specParser.js.map +1 -1
- package/build/common/spec-parser/utils.d.ts +12 -8
- package/build/common/spec-parser/utils.d.ts.map +1 -1
- package/build/common/spec-parser/utils.js +97 -34
- package/build/common/spec-parser/utils.js.map +1 -1
- package/build/common/telemetry.d.ts +17 -1
- package/build/common/telemetry.d.ts.map +1 -1
- package/build/common/telemetry.js +35 -1
- package/build/common/telemetry.js.map +1 -1
- package/build/common/templates-config.json +1 -1
- package/build/component/configManager/lifecycle.d.ts.map +1 -1
- package/build/component/configManager/lifecycle.js +1 -1
- package/build/component/configManager/lifecycle.js.map +1 -1
- package/build/component/constant/commonConstant.d.ts +1 -0
- package/build/component/constant/commonConstant.d.ts.map +1 -1
- package/build/component/constant/commonConstant.js +2 -0
- package/build/component/constant/commonConstant.js.map +1 -1
- package/build/component/coordinator/index.d.ts +2 -1
- package/build/component/coordinator/index.d.ts.map +1 -1
- package/build/component/coordinator/index.js +12 -2
- package/build/component/coordinator/index.js.map +1 -1
- package/build/component/driver/aad/error/aadManifestError.d.ts +9 -0
- package/build/component/driver/aad/error/aadManifestError.d.ts.map +1 -1
- package/build/component/driver/aad/error/aadManifestError.js +37 -1
- package/build/component/driver/aad/error/aadManifestError.js.map +1 -1
- package/build/component/driver/aad/utility/aadAppClient.d.ts.map +1 -1
- package/build/component/driver/aad/utility/aadAppClient.js +9 -6
- package/build/component/driver/aad/utility/aadAppClient.js.map +1 -1
- package/build/component/driver/aad/utility/aadManifestHelper.d.ts.map +1 -1
- package/build/component/driver/aad/utility/aadManifestHelper.js +6 -0
- package/build/component/driver/aad/utility/aadManifestHelper.js.map +1 -1
- package/build/component/driver/aad/utility/constants.d.ts +1 -0
- package/build/component/driver/aad/utility/constants.d.ts.map +1 -1
- package/build/component/driver/aad/utility/constants.js +1 -0
- package/build/component/driver/aad/utility/constants.js.map +1 -1
- package/build/component/driver/apiKey/create.d.ts.map +1 -1
- package/build/component/driver/apiKey/create.js +7 -3
- package/build/component/driver/apiKey/create.js.map +1 -1
- package/build/component/driver/deploy/azure/azureFunctionDeployDriver.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/azureFunctionDeployDriver.js.map +1 -1
- package/build/component/driver/deploy/azure/azureStaticWebAppGetDeploymentTokenDriver.d.ts +12 -0
- package/build/component/driver/deploy/azure/azureStaticWebAppGetDeploymentTokenDriver.d.ts.map +1 -0
- package/build/component/driver/deploy/azure/azureStaticWebAppGetDeploymentTokenDriver.js +71 -0
- package/build/component/driver/deploy/azure/azureStaticWebAppGetDeploymentTokenDriver.js.map +1 -0
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.d.ts +3 -2
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.js +5 -1
- package/build/component/driver/deploy/azure/impl/AzureZipDeployImpl.js.map +1 -1
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.d.ts +5 -0
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.d.ts.map +1 -1
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.js +21 -0
- package/build/component/driver/deploy/azure/impl/azureDeployImpl.js.map +1 -1
- package/build/component/driver/devTool/installDriver.d.ts +2 -1
- package/build/component/driver/devTool/installDriver.d.ts.map +1 -1
- package/build/component/driver/devTool/installDriver.js +5 -2
- package/build/component/driver/devTool/installDriver.js.map +1 -1
- package/build/component/driver/index.d.ts +1 -0
- package/build/component/driver/index.d.ts.map +1 -1
- package/build/component/driver/index.js +1 -0
- package/build/component/driver/index.js.map +1 -1
- package/build/component/driver/interface/provisionArgs.d.ts +3 -0
- package/build/component/driver/interface/provisionArgs.d.ts.map +1 -1
- package/build/component/driver/interface/stepDriver.d.ts +2 -1
- package/build/component/driver/interface/stepDriver.d.ts.map +1 -1
- package/build/component/driver/middleware/addSWADeployTelemetry.d.ts +7 -0
- package/build/component/driver/middleware/addSWADeployTelemetry.d.ts.map +1 -0
- package/build/component/driver/middleware/addSWADeployTelemetry.js +52 -0
- package/build/component/driver/middleware/addSWADeployTelemetry.js.map +1 -0
- package/build/component/driver/middleware/addStartAndEndTelemetry.d.ts +3 -0
- package/build/component/driver/middleware/addStartAndEndTelemetry.d.ts.map +1 -1
- package/build/component/driver/middleware/addStartAndEndTelemetry.js +2 -1
- package/build/component/driver/middleware/addStartAndEndTelemetry.js.map +1 -1
- package/build/component/driver/script/npxBuildDriver.d.ts.map +1 -1
- package/build/component/driver/script/npxBuildDriver.js +5 -1
- package/build/component/driver/script/npxBuildDriver.js.map +1 -1
- package/build/component/driver/script/scriptDriver.d.ts +12 -8
- package/build/component/driver/script/scriptDriver.d.ts.map +1 -1
- package/build/component/driver/script/scriptDriver.js +54 -36
- package/build/component/driver/script/scriptDriver.js.map +1 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.d.ts.map +1 -1
- package/build/component/driver/teamsApp/clients/appStudioClient.js +52 -33
- package/build/component/driver/teamsApp/clients/appStudioClient.js.map +1 -1
- package/build/component/driver/teamsApp/utils/telemetry.d.ts +7 -0
- package/build/component/driver/teamsApp/utils/telemetry.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/telemetry.js +3 -2
- package/build/component/driver/teamsApp/utils/telemetry.js.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.d.ts.map +1 -1
- package/build/component/driver/teamsApp/validateAppPackage.js +14 -8
- package/build/component/driver/teamsApp/validateAppPackage.js.map +1 -1
- package/build/component/generator/copilotPlugin/generator.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/generator.js +5 -4
- package/build/component/generator/copilotPlugin/generator.js.map +1 -1
- package/build/component/generator/copilotPlugin/helper.d.ts.map +1 -1
- package/build/component/generator/copilotPlugin/helper.js +6 -2
- package/build/component/generator/copilotPlugin/helper.js.map +1 -1
- package/build/component/generator/error.d.ts +5 -8
- package/build/component/generator/error.d.ts.map +1 -1
- package/build/component/generator/error.js +16 -16
- package/build/component/generator/error.js.map +1 -1
- package/build/component/generator/generator.d.ts +1 -1
- package/build/component/generator/generator.d.ts.map +1 -1
- package/build/component/generator/generator.js +16 -25
- package/build/component/generator/generator.js.map +1 -1
- package/build/component/generator/generatorAction.d.ts +4 -1
- package/build/component/generator/generatorAction.d.ts.map +1 -1
- package/build/component/generator/generatorAction.js +24 -6
- package/build/component/generator/generatorAction.js.map +1 -1
- package/build/component/generator/officeAddin/helperMethods.js +21 -20
- package/build/component/generator/officeAddin/helperMethods.js.map +1 -1
- package/build/component/generator/spfx/depsChecker/dependencyChecker.d.ts +1 -1
- package/build/component/generator/spfx/depsChecker/dependencyChecker.d.ts.map +1 -1
- package/build/component/generator/spfx/depsChecker/generatorChecker.d.ts +4 -3
- package/build/component/generator/spfx/depsChecker/generatorChecker.d.ts.map +1 -1
- package/build/component/generator/spfx/depsChecker/generatorChecker.js +30 -20
- package/build/component/generator/spfx/depsChecker/generatorChecker.js.map +1 -1
- package/build/component/generator/spfx/depsChecker/yoChecker.d.ts +3 -2
- package/build/component/generator/spfx/depsChecker/yoChecker.d.ts.map +1 -1
- package/build/component/generator/spfx/depsChecker/yoChecker.js +27 -18
- package/build/component/generator/spfx/depsChecker/yoChecker.js.map +1 -1
- package/build/component/generator/spfx/error.d.ts +2 -0
- package/build/component/generator/spfx/error.d.ts.map +1 -1
- package/build/component/generator/spfx/error.js +16 -1
- package/build/component/generator/spfx/error.js.map +1 -1
- package/build/component/generator/spfx/spfxGenerator.d.ts +3 -0
- package/build/component/generator/spfx/spfxGenerator.d.ts.map +1 -1
- package/build/component/generator/spfx/spfxGenerator.js +149 -20
- package/build/component/generator/spfx/spfxGenerator.js.map +1 -1
- package/build/component/generator/spfx/utils/constants.d.ts +3 -0
- package/build/component/generator/spfx/utils/constants.d.ts.map +1 -1
- package/build/component/generator/spfx/utils/constants.js +3 -0
- package/build/component/generator/spfx/utils/constants.js.map +1 -1
- package/build/component/generator/spfx/utils/telemetryEvents.d.ts +7 -8
- package/build/component/generator/spfx/utils/telemetryEvents.d.ts.map +1 -1
- package/build/component/generator/spfx/utils/telemetryEvents.js +5 -6
- package/build/component/generator/spfx/utils/telemetryEvents.js.map +1 -1
- package/build/component/generator/spfx/utils/utils.js +1 -1
- package/build/component/generator/utils.d.ts +5 -2
- package/build/component/generator/utils.d.ts.map +1 -1
- package/build/component/generator/utils.js +32 -12
- package/build/component/generator/utils.js.map +1 -1
- package/build/component/utils/common.d.ts +4 -1
- package/build/component/utils/common.d.ts.map +1 -1
- package/build/component/utils/common.js +21 -17
- package/build/component/utils/common.js.map +1 -1
- package/build/component/utils/envUtil.d.ts +1 -0
- package/build/component/utils/envUtil.d.ts.map +1 -1
- package/build/component/utils/envUtil.js +14 -2
- package/build/component/utils/envUtil.js.map +1 -1
- package/build/component/utils/fileOperation.d.ts +1 -1
- package/build/component/utils/fileOperation.d.ts.map +1 -1
- package/build/component/utils/fileOperation.js +34 -48
- package/build/component/utils/fileOperation.js.map +1 -1
- package/build/core/FxCore.d.ts +5 -0
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.js +48 -24
- package/build/core/FxCore.js.map +1 -1
- package/build/core/middleware/projectMigratorV3.d.ts +1 -1
- package/build/core/middleware/projectMigratorV3.d.ts.map +1 -1
- package/build/core/middleware/projectMigratorV3.js +10 -9
- package/build/core/middleware/projectMigratorV3.js.map +1 -1
- package/build/core/middleware/projectVersionChecker.js +4 -4
- package/build/core/middleware/projectVersionChecker.js.map +1 -1
- package/build/error/deploy.d.ts +6 -0
- package/build/error/deploy.d.ts.map +1 -1
- package/build/error/deploy.js +25 -1
- package/build/error/deploy.js.map +1 -1
- package/build/index.d.ts +1 -0
- package/build/index.d.ts.map +1 -1
- package/build/index.js +1 -0
- package/build/index.js.map +1 -1
- package/build/question/create.d.ts.map +1 -1
- package/build/question/create.js +14 -5
- package/build/question/create.js.map +1 -1
- package/build/question/generator.js +1 -3
- package/build/question/generator.js.map +1 -1
- package/build/question/options/CreateProjectOptions.js +1 -1
- package/build/question/options/CreateProjectOptions.js.map +1 -1
- package/build/question/options/CreateSampleProjectOptions.d.ts.map +1 -1
- package/build/question/options/CreateSampleProjectOptions.js +5 -1
- package/build/question/options/CreateSampleProjectOptions.js.map +1 -1
- package/build/question/options/DeployAadManifestOptions.js +1 -1
- package/build/question/options/DeployAadManifestOptions.js.map +1 -1
- package/build/question/options/PermissionGrantOptions.js +1 -1
- package/build/question/options/PermissionGrantOptions.js.map +1 -1
- package/build/question/options/PermissionListOptions.js +1 -1
- package/build/question/options/PermissionListOptions.js.map +1 -1
- package/build/question/other.d.ts +2 -1
- package/build/question/other.d.ts.map +1 -1
- package/build/question/other.js +22 -8
- package/build/question/other.js.map +1 -1
- package/build/question/questionNames.d.ts +1 -0
- package/build/question/questionNames.d.ts.map +1 -1
- package/build/question/questionNames.js +1 -0
- package/build/question/questionNames.js.map +1 -1
- package/build/ui/visitor.d.ts.map +1 -1
- package/build/ui/visitor.js +11 -2
- package/build/ui/visitor.js.map +1 -1
- package/package.json +14 -22
- package/resource/package.nls.json +27 -7
- package/resource/yaml-schema/v1.3/yaml.schema.json +42 -5
- package/templates/fallback/common.zip +0 -0
- package/templates/fallback/csharp.zip +0 -0
- package/templates/fallback/js.zip +0 -0
- package/templates/fallback/ts.zip +0 -0
- package/templates/plugins/resource/aad/auth/V3/Bot/Pages/BotAuthorizeEndPage.cshtml +55 -51
- package/templates/plugins/resource/aad/auth/bot/csharp/Pages/BotAuthorizeEndPage.cshtml +55 -51
- package/templates/plugins/resource/aad/auth/bot/js/public/auth-end.html +6 -2
- package/templates/plugins/resource/aad/auth/bot/ts/public/auth-end.html +5 -1
- package/templates/plugins/resource/aad/auth/tab/js/public/auth-end.html +16 -9
- package/templates/plugins/resource/aad/auth/tab/js/public/auth-start.html +11 -7
- package/templates/plugins/resource/aad/auth/tab/ts/public/auth-end.html +16 -9
- package/templates/plugins/resource/aad/auth/tab/ts/public/auth-start.html +11 -7
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aadAppClient.js","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/aadAppClient.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,+CAA8C;AAE9C,
|
|
1
|
+
{"version":3,"file":"aadAppClient.js","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/aadAppClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aadManifestHelper.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/aadManifestHelper.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"aadManifestHelper.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/aadManifestHelper.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAcvD,qBAAa,iBAAiB;WACd,qBAAqB,CAAC,QAAQ,EAAE,WAAW,GAAG,cAAc;WAwE5D,qBAAqB,CAAC,GAAG,EAAE,cAAc,GAAG,WAAW;WA+EvD,gBAAgB,CAAC,QAAQ,EAAE,WAAW,GAAG,MAAM;WA8C/C,uCAAuC,CAAC,QAAQ,EAAE,WAAW,GAAG,IAAI;CAuCnF"}
|
|
@@ -192,6 +192,9 @@ class AadManifestHelper {
|
|
|
192
192
|
var _a, _b;
|
|
193
193
|
const resourceIdOrName = requiredResourceAccessItem.resourceAppId;
|
|
194
194
|
let resourceId = resourceIdOrName;
|
|
195
|
+
if (!resourceIdOrName) {
|
|
196
|
+
throw new aadManifestError_1.MissingResourceAppIdUserError(componentName);
|
|
197
|
+
}
|
|
195
198
|
if (!isUUID_1.default(resourceIdOrName)) {
|
|
196
199
|
resourceId = (_a = map[resourceIdOrName]) === null || _a === void 0 ? void 0 : _a.id;
|
|
197
200
|
if (!resourceId) {
|
|
@@ -202,6 +205,9 @@ class AadManifestHelper {
|
|
|
202
205
|
(_b = requiredResourceAccessItem.resourceAccess) === null || _b === void 0 ? void 0 : _b.forEach((resourceAccessItem) => {
|
|
203
206
|
var _a, _b;
|
|
204
207
|
const resourceAccessIdOrName = resourceAccessItem.id;
|
|
208
|
+
if (!resourceAccessIdOrName) {
|
|
209
|
+
throw new aadManifestError_1.MissingResourceAccessIdUserError(componentName);
|
|
210
|
+
}
|
|
205
211
|
if (!isUUID_1.default(resourceAccessIdOrName)) {
|
|
206
212
|
let resourceAccessId;
|
|
207
213
|
if (resourceAccessItem.type === "Scope") {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aadManifestHelper.js","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/aadManifestHelper.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAIlC,0EAA0C;AAC1C,gDAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"aadManifestHelper.js","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/aadManifestHelper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/constants.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,cAAc;;;;;;;;;;;;CAY1B,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;CAGlC,CAAC;AAEF,eAAO,MAAM,eAAe;;;;;CAK3B,CAAC;AAEF,eAAO,MAAM,YAAY
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/constants.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,cAAc;;;;;;;;;;;;CAY1B,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;CAGlC,CAAC;AAEF,eAAO,MAAM,eAAe;;;;;CAK3B,CAAC;AAEF,eAAO,MAAM,YAAY;;;CAGxB,CAAC;AAEF,eAAO,MAAM,SAAS;;;CAGrB,CAAC"}
|
|
@@ -28,6 +28,7 @@ exports.permissionsKeys = {
|
|
|
28
28
|
};
|
|
29
29
|
exports.aadErrorCode = {
|
|
30
30
|
permissionErrorCode: "CannotDeleteOrUpdateEnabledEntitlement",
|
|
31
|
+
hostNameNotOnVerifiedDomain: "HostNameNotOnVerifiedDomain", // Using unverified domain in multi tenant scenario
|
|
31
32
|
};
|
|
32
33
|
exports.constants = {
|
|
33
34
|
aadAppPasswordDisplayName: "default",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/constants.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAErB,QAAA,cAAc,GAAG;IAC5B,kBAAkB,EAAE,sCAAsC;IAC1D,oBAAoB,EAAE,wCAAwC;IAC9D,iBAAiB,EAAE,qCAAqC;IACxD,iBAAiB,EAAE,qCAAqC;IACxD,mBAAmB,EAAE,uCAAuC;IAC5D,gBAAgB,EAAE,oCAAoC;IACtD,yBAAyB,EAAE,6CAA6C;IACxE,2BAA2B,EAAE,+CAA+C;IAC5E,wBAAwB,EAAE,4CAA4C;IACtE,oBAAoB,EAAE,wCAAwC;IAC9D,2BAA2B,EAAE,+CAA+C;CAC7E,CAAC;AAEW,QAAA,sBAAsB,GAAG;IACpC,MAAM,EAAE,kCAAkC;IAC1C,MAAM,EAAE,kCAAkC;CAC3C,CAAC;AAEW,QAAA,eAAe,GAAG;IAC7B,IAAI,EAAE,qBAAqB;IAC3B,KAAK,EAAE,OAAO;IACd,YAAY,EAAE,eAAe;IAC7B,IAAI,EAAE,MAAM;CACb,CAAC;AAEW,QAAA,YAAY,GAAG;IAC1B,mBAAmB,EAAE,wCAAwC;
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../src/component/driver/aad/utility/constants.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAErB,QAAA,cAAc,GAAG;IAC5B,kBAAkB,EAAE,sCAAsC;IAC1D,oBAAoB,EAAE,wCAAwC;IAC9D,iBAAiB,EAAE,qCAAqC;IACxD,iBAAiB,EAAE,qCAAqC;IACxD,mBAAmB,EAAE,uCAAuC;IAC5D,gBAAgB,EAAE,oCAAoC;IACtD,yBAAyB,EAAE,6CAA6C;IACxE,2BAA2B,EAAE,+CAA+C;IAC5E,wBAAwB,EAAE,4CAA4C;IACtE,oBAAoB,EAAE,wCAAwC;IAC9D,2BAA2B,EAAE,+CAA+C;CAC7E,CAAC;AAEW,QAAA,sBAAsB,GAAG;IACpC,MAAM,EAAE,kCAAkC;IAC1C,MAAM,EAAE,kCAAkC;CAC3C,CAAC;AAEW,QAAA,eAAe,GAAG;IAC7B,IAAI,EAAE,qBAAqB;IAC3B,KAAK,EAAE,OAAO;IACd,YAAY,EAAE,eAAe;IAC7B,IAAI,EAAE,MAAM;CACb,CAAC;AAEW,QAAA,YAAY,GAAG;IAC1B,mBAAmB,EAAE,wCAAwC;IAC7D,2BAA2B,EAAE,6BAA6B,EAAE,mDAAmD;CAChH,CAAC;AAEW,QAAA,SAAS,GAAG;IACvB,yBAAyB,EAAE,SAAS;IACpC,oBAAoB,EAAE,mCAAmC;CAC1D,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/apiKey/create.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAEtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/apiKey/create.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAEtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AA+BxD,qBACa,kBAAmB,YAAW,UAAU;IACnD,WAAW,SAA0D;IACrE,QAAQ,CAAC,aAAa,SAA2D;IAGpE,OAAO,CAClB,IAAI,EAAE,gBAAgB,EACtB,OAAO,EAAE,aAAa,EACtB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,eAAe,CAAC;IAgG3B,OAAO,CAAC,gBAAgB;IAUxB,OAAO,CAAC,gBAAgB;IAOxB,OAAO,CAAC,WAAW;IAKnB,OAAO,CAAC,cAAc;YAoBR,SAAS;IAoBvB,OAAO,CAAC,cAAc;IAUtB,OAAO,CAAC,YAAY;YA2BN,8BAA8B;CA0C7C"}
|
|
@@ -24,6 +24,8 @@ const question_1 = require("../../../question");
|
|
|
24
24
|
const spec_parser_1 = require("../../../common/spec-parser");
|
|
25
25
|
const common_1 = require("../../utils/common");
|
|
26
26
|
const apiKeyFailedToGetDomain_1 = require("./error/apiKeyFailedToGetDomain");
|
|
27
|
+
const featureFlags_1 = require("../../../common/featureFlags");
|
|
28
|
+
const telemetry_1 = require("../teamsApp/utils/telemetry");
|
|
27
29
|
const actionName = "apiKey/register"; // DO NOT MODIFY the name
|
|
28
30
|
const helpLink = "https://aka.ms/teamsfx-actions/apiKey-register";
|
|
29
31
|
let CreateApiKeyDriver = class CreateApiKeyDriver {
|
|
@@ -37,6 +39,7 @@ let CreateApiKeyDriver = class CreateApiKeyDriver {
|
|
|
37
39
|
const outputs = new Map();
|
|
38
40
|
try {
|
|
39
41
|
(_a = context.logProvider) === null || _a === void 0 ? void 0 : _a.info(localizeUtils_1.getLocalizedString(constants_1.logMessageKeys.startExecuteDriver, actionName));
|
|
42
|
+
telemetry_1.TelemetryUtils.init(context);
|
|
40
43
|
if (!outputEnvVarNames) {
|
|
41
44
|
throw new outputEnvironmentVariableUndefinedError_1.OutputEnvironmentVariableUndefinedError(actionName);
|
|
42
45
|
}
|
|
@@ -130,13 +133,14 @@ let CreateApiKeyDriver = class CreateApiKeyDriver {
|
|
|
130
133
|
async getDomain(args, context) {
|
|
131
134
|
const absolutePath = common_1.getAbsolutePath(args.apiSpecPath, context.projectPath);
|
|
132
135
|
const parser = new spec_parser_1.SpecParser(absolutePath, {
|
|
133
|
-
allowAPIKeyAuth:
|
|
136
|
+
allowAPIKeyAuth: featureFlags_1.isApiKeyEnabled(),
|
|
137
|
+
allowMultipleParameters: featureFlags_1.isMultipleParametersEnabled(),
|
|
134
138
|
});
|
|
135
139
|
const operations = await parser.list();
|
|
136
140
|
const domains = operations
|
|
137
141
|
.filter((value) => {
|
|
138
|
-
var _a;
|
|
139
|
-
return ((_a = value.auth) === null || _a === void 0 ? void 0 : _a.name) === args.name;
|
|
142
|
+
var _a, _b;
|
|
143
|
+
return ((_a = value.auth) === null || _a === void 0 ? void 0 : _a.type) === "apiKey" && ((_b = value.auth) === null || _b === void 0 ? void 0 : _b.name) === args.name;
|
|
140
144
|
})
|
|
141
145
|
.map((value) => {
|
|
142
146
|
return value.server;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/component/driver/apiKey/create.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,mCAAiC;AAEjC,iEAAmE;AAGnE,mFAAgF;AAChF,6CAA0C;AAC1C,mDAA6F;AAC7F,wDAA4F;AAC5F,8GAA2G;AAC3G,yEAAkF;AAClF,iDAAqE;AACrE,yEAAsE;AAEtE,wFAKsD;AACtD,0CAAyE;AACzE,iEAAmE;AACnE,iFAAmF;AACnF,qEAAuE;AACvE,4DAAyD;AACzD,gDAAkD;AAClD,6DAAyD;AACzD,+CAAqD;AACrD,6EAA+E;
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/component/driver/apiKey/create.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"azureFunctionDeployDriver.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/azure/azureFunctionDeployDriver.ts"],"names":[],"mappings":"AAEA;;GAEG;AAGH,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"azureFunctionDeployDriver.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/azure/azureFunctionDeployDriver.ts"],"names":[],"mappings":"AAEA;;GAEG;AAGH,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAS3D,qBACa,yBAA0B,YAAW,UAAU;IAC1D,QAAQ,CAAC,WAAW,EAAE,MAAM,CAE1B;IACF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAwB;IAE5D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAuD;IACtF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAiD;IAGlF,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;CAW3E"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"azureFunctionDeployDriver.js","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/azure/azureFunctionDeployDriver.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;AAClC;;GAEG;;;;;AAEH,mCAAiC;
|
|
1
|
+
{"version":3,"file":"azureFunctionDeployDriver.js","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/azure/azureFunctionDeployDriver.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;AAClC;;GAEG;;;;;AAEH,mCAAiC;AAGjC,6CAA0C;AAC1C,sFAAmF;AACnF,qEAAqE;AACrE,oEAAsE;AACtE,kEAA+D;AAE/D,MAAM,WAAW,GAAG,0BAA0B,CAAC;AAG/C,IAAa,yBAAyB,iCAAtC,MAAa,yBAAyB;IAAtC;QACW,gBAAW,GAAW,kCAAkB,CAC/C,iDAAiD,CAClD,CAAC;IAkBJ,CAAC;IAXC,KAAK,CAAC,OAAO,CAAC,IAAa,EAAE,GAAkB;QAC7C,MAAM,IAAI,GAAG,IAAI,uCAAkB,CACjC,IAAI,EACJ,GAAG,EACH,2BAAyB,CAAC,YAAY,EACtC,uDAAuD,EACvD,2BAAyB,CAAC,OAAO,EACjC,2BAAyB,CAAC,eAAe,CAC1C,CAAC;QACF,OAAO,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC;IAC1B,CAAC;CACF,CAAA;AAjByB,sCAAY,GAAG,oBAAoB,CAAC;AAC5D,iDAAiD;AACzB,iCAAO,GAAG,CAAC,iDAAiD,CAAC,CAAC;AAC9D,yCAAe,GAAG,CAAC,2CAA2C,CAAC,CAAC;AAGxF;IADC,aAAK,CAAC,CAAC,iDAAuB,CAAC,WAAW,EAAE,kCAAiB,CAAC,qBAAqB,CAAC,CAAC,CAAC;;;;wDAWtF;AApBU,yBAAyB;IADrC,gBAAO,CAAC,WAAW,CAAC;GACR,yBAAyB,CAqBrC;AArBY,8DAAyB"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { ExecutionResult, StepDriver } from "../../interface/stepDriver";
|
|
2
|
+
import { DriverContext } from "../../interface/commonArgs";
|
|
3
|
+
import { AzureStaticWebAppConfigArgs } from "../../interface/provisionArgs";
|
|
4
|
+
export declare class AzureStaticWebAppGetDeploymentTokenDriver implements StepDriver {
|
|
5
|
+
readonly description: string;
|
|
6
|
+
protected static readonly STORAGE_CONFIG_ARGS: (data: unknown, helpLink?: string | undefined) => AzureStaticWebAppConfigArgs;
|
|
7
|
+
protected static readonly HELP_LINK = "https://aka.ms/teamsfx-actions/swa-get-deployment-key";
|
|
8
|
+
protected static readonly RESOURCE_PATTERN: RegExp;
|
|
9
|
+
execute(args: unknown, ctx: DriverContext, outputEnvVarNames?: Map<string, string>): Promise<ExecutionResult>;
|
|
10
|
+
static run(args: unknown, ctx: DriverContext, outputEnvVarNames?: Map<string, string>): Promise<ExecutionResult>;
|
|
11
|
+
}
|
|
12
|
+
//# sourceMappingURL=azureStaticWebAppGetDeploymentTokenDriver.d.ts.map
|
package/build/component/driver/deploy/azure/azureStaticWebAppGetDeploymentTokenDriver.d.ts.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"azureStaticWebAppGetDeploymentTokenDriver.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/azure/azureStaticWebAppGetDeploymentTokenDriver.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAK3D,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAY5E,qBACa,yCAA0C,YAAW,UAAU;IAC1E,QAAQ,CAAC,WAAW,EAAE,MAAM,CAA6D;IAEzF,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,gFAE1C;IACH,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,2DAA2D;IAC9F,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,SACgE;IAGpG,OAAO,CACX,IAAI,EAAE,OAAO,EACb,GAAG,EAAE,aAAa,EAClB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,eAAe,CAAC;WAQd,GAAG,CACd,IAAI,EAAE,OAAO,EACb,GAAG,EAAE,aAAa,EAClB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,eAAe,CAAC;CA+B5B"}
|
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// Copyright (c) Microsoft Corporation.
|
|
3
|
+
// Licensed under the MIT license.
|
|
4
|
+
var AzureStaticWebAppGetDeploymentTokenDriver_1;
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.AzureStaticWebAppGetDeploymentTokenDriver = void 0;
|
|
7
|
+
const tslib_1 = require("tslib");
|
|
8
|
+
const typedi_1 = require("typedi");
|
|
9
|
+
const hooks_1 = require("@feathersjs/hooks");
|
|
10
|
+
const addStartAndEndTelemetry_1 = require("../../middleware/addStartAndEndTelemetry");
|
|
11
|
+
const commonConstant_1 = require("../../../constant/commonConstant");
|
|
12
|
+
const common_1 = require("../../../utils/common");
|
|
13
|
+
const azureResourceOperation_1 = require("../../../utils/azureResourceOperation");
|
|
14
|
+
const arm_appservice_1 = require("@azure/arm-appservice");
|
|
15
|
+
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
16
|
+
const localizeUtils_1 = require("../../../../common/localizeUtils");
|
|
17
|
+
const outputEnvironmentVariableUndefinedError_1 = require("../../error/outputEnvironmentVariableUndefinedError");
|
|
18
|
+
const ACTION_NAME = "azureStaticWebApps/getDeploymentToken";
|
|
19
|
+
let AzureStaticWebAppGetDeploymentTokenDriver = AzureStaticWebAppGetDeploymentTokenDriver_1 = class AzureStaticWebAppGetDeploymentTokenDriver {
|
|
20
|
+
constructor() {
|
|
21
|
+
this.description = localizeUtils_1.getLocalizedString("driver.deploy.getSWADeploymentToken");
|
|
22
|
+
}
|
|
23
|
+
async execute(args, ctx, outputEnvVarNames) {
|
|
24
|
+
try {
|
|
25
|
+
return await AzureStaticWebAppGetDeploymentTokenDriver_1.run(args, ctx, outputEnvVarNames);
|
|
26
|
+
}
|
|
27
|
+
catch (e) {
|
|
28
|
+
return { result: await common_1.errorHandle(e, ACTION_NAME, ctx.logProvider), summaries: [] };
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
static async run(args, ctx, outputEnvVarNames) {
|
|
32
|
+
var _a, _b;
|
|
33
|
+
const input = AzureStaticWebAppGetDeploymentTokenDriver_1.STORAGE_CONFIG_ARGS(args, AzureStaticWebAppGetDeploymentTokenDriver_1.HELP_LINK);
|
|
34
|
+
let outputKey;
|
|
35
|
+
if (!outputEnvVarNames || !outputEnvVarNames.has("deploymentToken")) {
|
|
36
|
+
throw new outputEnvironmentVariableUndefinedError_1.OutputEnvironmentVariableUndefinedError(ACTION_NAME);
|
|
37
|
+
}
|
|
38
|
+
else {
|
|
39
|
+
outputKey =
|
|
40
|
+
outputEnvVarNames.get("deploymentToken") === ""
|
|
41
|
+
? "SECRET_TAB_SWA_DEPLOYMENT_TOKEN"
|
|
42
|
+
: outputEnvVarNames.get("deploymentToken");
|
|
43
|
+
}
|
|
44
|
+
const resourceInfo = azureResourceOperation_1.parseAzureResourceId(input.resourceId, AzureStaticWebAppGetDeploymentTokenDriver_1.RESOURCE_PATTERN);
|
|
45
|
+
const azureTokenCredential = await azureResourceOperation_1.getAzureAccountCredential(ctx.azureAccountProvider);
|
|
46
|
+
const client = new arm_appservice_1.WebSiteManagementClient(azureTokenCredential, resourceInfo.subscriptionId);
|
|
47
|
+
const secrets = await client.staticSites.listStaticSiteSecrets(resourceInfo.resourceGroupName, resourceInfo.instanceId);
|
|
48
|
+
const deploymentKey = (_b = (_a = secrets === null || secrets === void 0 ? void 0 : secrets.properties) === null || _a === void 0 ? void 0 : _a.apiKey) !== null && _b !== void 0 ? _b : "";
|
|
49
|
+
const result = teamsfx_api_1.ok(new Map([[outputKey, deploymentKey]]));
|
|
50
|
+
return {
|
|
51
|
+
result: result,
|
|
52
|
+
summaries: [localizeUtils_1.getLocalizedString("driver.deploy.getSWADeploymentTokenSummary")],
|
|
53
|
+
};
|
|
54
|
+
}
|
|
55
|
+
};
|
|
56
|
+
AzureStaticWebAppGetDeploymentTokenDriver.STORAGE_CONFIG_ARGS = common_1.asFactory({
|
|
57
|
+
resourceId: common_1.asString,
|
|
58
|
+
});
|
|
59
|
+
AzureStaticWebAppGetDeploymentTokenDriver.HELP_LINK = "https://aka.ms/teamsfx-actions/swa-get-deployment-key";
|
|
60
|
+
AzureStaticWebAppGetDeploymentTokenDriver.RESOURCE_PATTERN = /\/subscriptions\/([^\/]*)\/resourceGroups\/([^\/]*)\/providers\/Microsoft.Web\/staticSites\/([^\/]*)/i;
|
|
61
|
+
tslib_1.__decorate([
|
|
62
|
+
hooks_1.hooks([addStartAndEndTelemetry_1.addStartAndEndTelemetry(ACTION_NAME, commonConstant_1.TelemetryConstant.DEPLOY_COMPONENT_NAME)]),
|
|
63
|
+
tslib_1.__metadata("design:type", Function),
|
|
64
|
+
tslib_1.__metadata("design:paramtypes", [Object, Object, Map]),
|
|
65
|
+
tslib_1.__metadata("design:returntype", Promise)
|
|
66
|
+
], AzureStaticWebAppGetDeploymentTokenDriver.prototype, "execute", null);
|
|
67
|
+
AzureStaticWebAppGetDeploymentTokenDriver = AzureStaticWebAppGetDeploymentTokenDriver_1 = tslib_1.__decorate([
|
|
68
|
+
typedi_1.Service(ACTION_NAME)
|
|
69
|
+
], AzureStaticWebAppGetDeploymentTokenDriver);
|
|
70
|
+
exports.AzureStaticWebAppGetDeploymentTokenDriver = AzureStaticWebAppGetDeploymentTokenDriver;
|
|
71
|
+
//# sourceMappingURL=azureStaticWebAppGetDeploymentTokenDriver.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"azureStaticWebAppGetDeploymentTokenDriver.js","sourceRoot":"","sources":["../../../../../src/component/driver/deploy/azure/azureStaticWebAppGetDeploymentTokenDriver.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;AAElC,mCAAiC;AAGjC,6CAA0C;AAC1C,sFAAmF;AACnF,qEAAqE;AACrE,kDAAyE;AAEzE,kFAG+C;AAC/C,0DAAgE;AAChE,wDAA6D;AAC7D,oEAAsE;AACtE,iHAA8G;AAE9G,MAAM,WAAW,GAAG,uCAAuC,CAAC;AAG5D,IAAa,yCAAyC,iDAAtD,MAAa,yCAAyC;IAAtD;QACW,gBAAW,GAAW,kCAAkB,CAAC,qCAAqC,CAAC,CAAC;IAyD3F,CAAC;IA/CC,KAAK,CAAC,OAAO,CACX,IAAa,EACb,GAAkB,EAClB,iBAAuC;QAEvC,IAAI;YACF,OAAO,MAAM,2CAAyC,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,EAAE,iBAAiB,CAAC,CAAC;SAC1F;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAW,CAAC,CAAC,EAAE,WAAW,EAAE,GAAG,CAAC,WAAW,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;SACtF;IACH,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,GAAG,CACd,IAAa,EACb,GAAkB,EAClB,iBAAuC;;QAEvC,MAAM,KAAK,GAAG,2CAAyC,CAAC,mBAAmB,CACzE,IAAI,EACJ,2CAAyC,CAAC,SAAS,CACpD,CAAC;QACF,IAAI,SAAiB,CAAC;QACtB,IAAI,CAAC,iBAAiB,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE;YACnE,MAAM,IAAI,iFAAuC,CAAC,WAAW,CAAC,CAAC;SAChE;aAAM;YACL,SAAS;gBACP,iBAAiB,CAAC,GAAG,CAAC,iBAAiB,CAAC,KAAK,EAAE;oBAC7C,CAAC,CAAC,iCAAiC;oBACnC,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,iBAAiB,CAAE,CAAC;SACjD;QACD,MAAM,YAAY,GAAG,6CAAoB,CACvC,KAAK,CAAC,UAAU,EAChB,2CAAyC,CAAC,gBAAgB,CAC3D,CAAC;QACF,MAAM,oBAAoB,GAAG,MAAM,kDAAyB,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;QACvF,MAAM,MAAM,GAAG,IAAI,wCAAuB,CAAC,oBAAoB,EAAE,YAAY,CAAC,cAAc,CAAC,CAAC;QAC9F,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,qBAAqB,CAC5D,YAAY,CAAC,iBAAiB,EAC9B,YAAY,CAAC,UAAU,CACxB,CAAC;QACF,MAAM,aAAa,GAAG,MAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,0CAAE,MAAM,mCAAI,EAAE,CAAC;QACxD,MAAM,MAAM,GAAyC,gBAAE,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/F,OAAO;YACL,MAAM,EAAE,MAAM;YACd,SAAS,EAAE,CAAC,kCAAkB,CAAC,4CAA4C,CAAC,CAAC;SAC9E,CAAC;IACJ,CAAC;CACF,CAAA;AAvD2B,6DAAmB,GAAG,kBAAS,CAA8B;IACrF,UAAU,EAAE,iBAAQ;CACrB,CAAC,CAAC;AACuB,mDAAS,GAAG,uDAAuD,CAAC;AACpE,0DAAgB,GACxC,uGAAuG,CAAC;AAG1G;IADC,aAAK,CAAC,CAAC,iDAAuB,CAAC,WAAW,EAAE,kCAAiB,CAAC,qBAAqB,CAAC,CAAC,CAAC;;6DAIjE,GAAG;;wEAOxB;AArBU,yCAAyC;IADrD,gBAAO,CAAC,WAAW,CAAC;GACR,yCAAyC,CA0DrD;AA1DY,8FAAyC"}
|
|
@@ -7,6 +7,7 @@ import { AzureUploadConfig, DeployContext, DeployStepArgs } from "../../../inter
|
|
|
7
7
|
import { AzureResourceInfo, DriverContext } from "../../../interface/commonArgs";
|
|
8
8
|
import { TokenCredential } from "@azure/core-auth";
|
|
9
9
|
import { LogProvider } from "@microsoft/teamsfx-api";
|
|
10
|
+
import { ReadStream } from "fs-extra";
|
|
10
11
|
export declare class AzureZipDeployImpl extends AzureDeployImpl {
|
|
11
12
|
pattern: RegExp;
|
|
12
13
|
private readonly serviceName;
|
|
@@ -31,7 +32,7 @@ export declare class AzureZipDeployImpl extends AzureDeployImpl {
|
|
|
31
32
|
* @param context log provider etc..
|
|
32
33
|
* @protected
|
|
33
34
|
*/
|
|
34
|
-
protected packageToZip(args: DeployStepArgs, context: DeployContext): Promise<
|
|
35
|
+
protected packageToZip(args: DeployStepArgs, context: DeployContext): Promise<ReadStream>;
|
|
35
36
|
/**
|
|
36
37
|
* call azure app service or azure function zip deploy method
|
|
37
38
|
* @param zipDeployEndpoint azure zip deploy endpoint
|
|
@@ -40,7 +41,7 @@ export declare class AzureZipDeployImpl extends AzureDeployImpl {
|
|
|
40
41
|
* @param logger log provider
|
|
41
42
|
* @protected
|
|
42
43
|
*/
|
|
43
|
-
zipDeployPackage(zipDeployEndpoint: string, zipBuffer:
|
|
44
|
+
zipDeployPackage(zipDeployEndpoint: string, zipBuffer: ReadStream, config: AzureUploadConfig, logger: LogProvider): Promise<string>;
|
|
44
45
|
/**
|
|
45
46
|
* create azure zip deploy endpoint
|
|
46
47
|
* @param siteName azure app service or azure function name
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AzureZipDeployImpl.d.ts","sourceRoot":"","sources":["../../../../../../src/component/driver/deploy/azure/impl/AzureZipDeployImpl.ts"],"names":[],"mappings":";AAGA;;GAEG;AACH,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAEL,iBAAiB,EACjB,aAAa,EACb,cAAc,EACf,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACjF,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"AzureZipDeployImpl.d.ts","sourceRoot":"","sources":["../../../../../../src/component/driver/deploy/azure/impl/AzureZipDeployImpl.ts"],"names":[],"mappings":";AAGA;;GAEG;AACH,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAEL,iBAAiB,EACjB,aAAa,EACb,cAAc,EACf,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACjF,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAYrD,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAEtC,qBAAa,kBAAmB,SAAQ,eAAe;IACrD,OAAO,SAC6F;IACpG,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,SAAS,CAAC,QAAQ,SAAC;IACnB,SAAS,CAAC,SAAS,EAAE,MAAM,MAAM,EAAE,CAAC;IACpC,SAAS,CAAC,cAAc,EAAE,MAAM,MAAM,EAAE,CAAC;gBAGvC,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,aAAa,EACtB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EAAE,EACnB,cAAc,EAAE,MAAM,EAAE;IAWpB,WAAW,CACf,IAAI,EAAE,cAAc,EACpB,aAAa,EAAE,iBAAiB,EAChC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,IAAI,CAAC;IAahB,SAAS,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,CAExD;IAEF;;;;;;;OAOG;IACU,SAAS,CACpB,IAAI,EAAE,cAAc,EACpB,aAAa,EAAE,iBAAiB,EAChC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,MAAM,CAAC;IAuClB;;;;;OAKG;cACa,YAAY,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,UAAU,CAAC;IAmB/F;;;;;;;OAOG;IAEG,gBAAgB,CACpB,iBAAiB,EAAE,MAAM,EACzB,SAAS,EAAE,UAAU,EACrB,MAAM,EAAE,iBAAiB,EACzB,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,MAAM,CAAC;IA0FlB;;;;OAIG;IACH,SAAS,CAAC,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAIxD,iBAAiB;CAGlB"}
|
|
@@ -19,6 +19,7 @@ const fileOperation_1 = require("../../../../utils/fileOperation");
|
|
|
19
19
|
const deploy_1 = require("../../../../../error/deploy");
|
|
20
20
|
const globalVars_1 = require("../../../../../core/globalVars");
|
|
21
21
|
const hooks_1 = require("@feathersjs/hooks");
|
|
22
|
+
const fs_extra_1 = require("fs-extra");
|
|
22
23
|
class AzureZipDeployImpl extends azureDeployImpl_1.AzureDeployImpl {
|
|
23
24
|
constructor(args, context, serviceName, helpLink, summaries, summaryPrepare) {
|
|
24
25
|
super(args, context);
|
|
@@ -146,6 +147,9 @@ class AzureZipDeployImpl extends azureDeployImpl_1.AzureDeployImpl {
|
|
|
146
147
|
throw new deploy_1.DeployZipPackageError(zipDeployEndpoint, e, this.helpLink);
|
|
147
148
|
}
|
|
148
149
|
}
|
|
150
|
+
finally {
|
|
151
|
+
zipBuffer.destroy();
|
|
152
|
+
}
|
|
149
153
|
}
|
|
150
154
|
if ((res === null || res === void 0 ? void 0 : res.status) !== commonConstant_1.HttpStatusCode.OK && (res === null || res === void 0 ? void 0 : res.status) !== commonConstant_1.HttpStatusCode.ACCEPTED) {
|
|
151
155
|
if (res === null || res === void 0 ? void 0 : res.status) {
|
|
@@ -171,7 +175,7 @@ class AzureZipDeployImpl extends azureDeployImpl_1.AzureDeployImpl {
|
|
|
171
175
|
tslib_1.__decorate([
|
|
172
176
|
hooks_1.hooks([globalVars_1.ErrorContextMW({ source: "Azure", component: "AzureZipDeployImpl" })]),
|
|
173
177
|
tslib_1.__metadata("design:type", Function),
|
|
174
|
-
tslib_1.__metadata("design:paramtypes", [String,
|
|
178
|
+
tslib_1.__metadata("design:paramtypes", [String, fs_extra_1.ReadStream, Object, Object]),
|
|
175
179
|
tslib_1.__metadata("design:returntype", Promise)
|
|
176
180
|
], AzureZipDeployImpl.prototype, "zipDeployPackage", null);
|
|
177
181
|
exports.AzureZipDeployImpl = AzureZipDeployImpl;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AzureZipDeployImpl.js","sourceRoot":"","sources":["../../../../../../src/component/driver/deploy/azure/impl/AzureZipDeployImpl.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC;;GAEG;AACH,uDAAoD;AAUpD,mDAAwD;AACxD,wEAAqE;AACrE,mCAAoC;AACpC,0DAAyC;AACzC,wEAAqE;AACrE,uEAAyE;AACzE,wDAAwB;AACxB,mEAAiE;AACjE,wDAAoE;AACpE,+DAAgE;AAChE,6CAA0C;
|
|
1
|
+
{"version":3,"file":"AzureZipDeployImpl.js","sourceRoot":"","sources":["../../../../../../src/component/driver/deploy/azure/impl/AzureZipDeployImpl.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,6 +20,11 @@ export declare abstract class AzureDeployImpl extends BaseDeployImpl {
|
|
|
20
20
|
* @param azureCredential azure user login credential
|
|
21
21
|
*/
|
|
22
22
|
abstract azureDeploy(args: DeployStepArgs, azureResource: AzureResourceInfo, azureCredential: TokenCredential): Promise<void>;
|
|
23
|
+
/**
|
|
24
|
+
* cleanup function after deployment is finished
|
|
25
|
+
* @protected
|
|
26
|
+
*/
|
|
27
|
+
protected cleanup(): Promise<void>;
|
|
23
28
|
/**
|
|
24
29
|
* check if resource id is legal and parse it
|
|
25
30
|
* @param resourceId deploy target
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"azureDeployImpl.d.ts","sourceRoot":"","sources":["../../../../../../src/component/driver/deploy/azure/impl/azureDeployImpl.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,cAAc,EACd,iBAAiB,EACjB,UAAU,EAEV,YAAY,EACb,MAAM,uCAAuC,CAAC;AAE/C,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,KAAK,UAAU,MAAM,uBAAuB,CAAC;AASpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"azureDeployImpl.d.ts","sourceRoot":"","sources":["../../../../../../src/component/driver/deploy/azure/impl/azureDeployImpl.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,cAAc,EACd,iBAAiB,EACjB,UAAU,EAEV,YAAY,EACb,MAAM,uCAAuC,CAAC;AAE/C,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,KAAK,UAAU,MAAM,uBAAuB,CAAC;AASpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAclD,8BAAsB,eAAgB,SAAQ,cAAc;IAC1D,SAAS,CAAC,gBAAgB,EAAE,UAAU,CAAC,uBAAuB,GAAG,SAAS,CAAC;IAE3E,gBAAuB,cAAc,gCAAkB;IAEvD;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAEzB,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,CAAa;IAElE,MAAM,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IA+BhD;;;;;OAKG;IACH,QAAQ,CAAC,WAAW,CAClB,IAAI,EAAE,cAAc,EACpB,aAAa,EAAE,iBAAiB,EAChC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,IAAI,CAAC;IAEhB;;;OAGG;cACa,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBxC;;;;OAIG;IACH,SAAS,CAAC,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,iBAAiB;IAIhE;;;;;;;OAOG;IAEU,iBAAiB,CAC5B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,iBAAiB,EACzB,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IAiEpC;;;;OAIG;IACG,uBAAuB,CAC3B,aAAa,EAAE,iBAAiB,EAChC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,iBAAiB,CAAC;cA+Fb,kBAAkB,CAAC,aAAa,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;CAWpF"}
|
|
@@ -20,6 +20,7 @@ const localizeUtils_1 = require("../../../../../common/localizeUtils");
|
|
|
20
20
|
const error_1 = require("../../../../../error");
|
|
21
21
|
const hooks_1 = require("@feathersjs/hooks");
|
|
22
22
|
const globalVars_1 = require("../../../../../core/globalVars");
|
|
23
|
+
const path_1 = tslib_1.__importDefault(require("path"));
|
|
23
24
|
class AzureDeployImpl extends baseDeployImpl_1.BaseDeployImpl {
|
|
24
25
|
constructor() {
|
|
25
26
|
super(...arguments);
|
|
@@ -43,8 +44,28 @@ class AzureDeployImpl extends baseDeployImpl_1.BaseDeployImpl {
|
|
|
43
44
|
return false;
|
|
44
45
|
}
|
|
45
46
|
await this.azureDeploy(inputs, azureResource, azureCredential);
|
|
47
|
+
await this.cleanup();
|
|
46
48
|
return true;
|
|
47
49
|
}
|
|
50
|
+
/**
|
|
51
|
+
* cleanup function after deployment is finished
|
|
52
|
+
* @protected
|
|
53
|
+
*/
|
|
54
|
+
async cleanup() {
|
|
55
|
+
if (this.zipFilePath && !this.dryRun && fs.existsSync(this.zipFilePath)) {
|
|
56
|
+
try {
|
|
57
|
+
await fs.remove(this.zipFilePath);
|
|
58
|
+
// if upper folder is empty, remove it
|
|
59
|
+
const parentFolder = path_1.default.dirname(this.zipFilePath);
|
|
60
|
+
if ((await fs.readdir(parentFolder)).length === 0) {
|
|
61
|
+
await fs.remove(parentFolder);
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
catch (e) {
|
|
65
|
+
this.logger.warning(`Failed to remove zip package. ${JSON.stringify(e, Object.getOwnPropertyNames(e))}`);
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
}
|
|
48
69
|
/**
|
|
49
70
|
* check if resource id is legal and parse it
|
|
50
71
|
* @param resourceId deploy target
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"azureDeployImpl.js","sourceRoot":"","sources":["../../../../../../src/component/driver/deploy/azure/impl/azureDeployImpl.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AASlC,qDAA4D;AAE5D,qDAAkD;AAClD,yCAAmC;AACnC,0EAAoD;AACpD,wEAAmF;AACnF,0DAAyC;AACzC,uDAA0D;AAC1D,wEAAqE;AACrE,qFAGkD;AAGlD,qDAA+B;AAC/B,qEAAqE;AACrE,iFAA4E;AAC5E,uEAA2F;AAC3F,gDAI8B;AAC9B,6CAA0C;AAC1C,+DAAgE;
|
|
1
|
+
{"version":3,"file":"azureDeployImpl.js","sourceRoot":"","sources":["../../../../../../src/component/driver/deploy/azure/impl/azureDeployImpl.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { FxError, Result } from "@microsoft/teamsfx-api";
|
|
2
|
+
import { TestToolReleaseType } from "../../../common/deps-checker";
|
|
2
3
|
import { DriverContext } from "../interface/commonArgs";
|
|
3
4
|
import { ExecutionResult, StepDriver } from "../interface/stepDriver";
|
|
4
5
|
import { WrapDriverContext } from "../util/wrapUtil";
|
|
@@ -17,7 +18,7 @@ export declare class ToolsInstallDriverImpl {
|
|
|
17
18
|
resolveLocalCertificate(trustDevCert: boolean, outputEnvVarNames?: Map<string, string>): Promise<Map<string, string>>;
|
|
18
19
|
resolveFuncCoreTools(version: string, symlinkDir?: string, outputEnvVarNames?: Map<string, string>): Promise<Map<string, string>>;
|
|
19
20
|
resolveDotnet(outputEnvVarNames?: Map<string, string>): Promise<Map<string, string>>;
|
|
20
|
-
resolveTestTool(versionRange: string, symlinkDir: string): Promise<void>;
|
|
21
|
+
resolveTestTool(releaseType: TestToolReleaseType, versionRange: string, symlinkDir: string): Promise<void>;
|
|
21
22
|
private validateArgs;
|
|
22
23
|
private setArgTelemetry;
|
|
23
24
|
private setDevCertTelemetry;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/devTool/installDriver.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"installDriver.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/devTool/installDriver.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAIL,mBAAmB,EAEpB,MAAM,8BAA8B,CAAC;AAMtC,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAUrD,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAsB/D,qBACa,kBAAmB,YAAW,UAAU;IACnD,WAAW,SAA6B;IACxC,QAAQ,CAAC,aAAa,SAAyD;IAEzE,GAAG,CACP,IAAI,EAAE,eAAe,EACrB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAK1C,OAAO,CACX,IAAI,EAAE,eAAe,EACrB,OAAO,EAAE,aAAa,EACtB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,eAAe,CAAC;IAUrB,IAAI,CACR,IAAI,EAAE,eAAe,EACrB,WAAW,EAAE,iBAAiB,EAC9B,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;CAMjD;AAED,qBAAa,sBAAsB;IACrB,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,iBAAiB;IAGxC,GAAG,CACP,IAAI,EAAE,eAAe,EACrB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAwCzB,uBAAuB,CAC3B,YAAY,EAAE,OAAO,EACrB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAqCzB,oBAAoB,CACxB,OAAO,EAAE,MAAM,EACf,UAAU,CAAC,EAAE,MAAM,EACnB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAwCzB,aAAa,CAAC,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAuCpF,eAAe,CACnB,WAAW,EAAE,mBAAmB,EAChC,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC;IA+BhB,OAAO,CAAC,YAAY;IAqCpB,OAAO,CAAC,eAAe;IAyBvB,OAAO,CAAC,mBAAmB;IAY3B,OAAO,CAAC,qBAAqB;CAe9B"}
|
|
@@ -91,7 +91,9 @@ class ToolsInstallDriverImpl {
|
|
|
91
91
|
dotnetRes.forEach((v, k) => res.set(k, v));
|
|
92
92
|
}
|
|
93
93
|
if (args.testTool) {
|
|
94
|
-
await this.resolveTestTool(
|
|
94
|
+
await this.resolveTestTool(
|
|
95
|
+
// Hardcode to npm release type if running from YAML
|
|
96
|
+
deps_checker_1.TestToolReleaseType.Npm, `${args.testTool.version}`, args.testTool.symlinkDir);
|
|
95
97
|
}
|
|
96
98
|
return res;
|
|
97
99
|
}
|
|
@@ -197,11 +199,12 @@ class ToolsInstallDriverImpl {
|
|
|
197
199
|
}
|
|
198
200
|
return res;
|
|
199
201
|
}
|
|
200
|
-
async resolveTestTool(versionRange, symlinkDir) {
|
|
202
|
+
async resolveTestTool(releaseType, versionRange, symlinkDir) {
|
|
201
203
|
var _a;
|
|
202
204
|
const checker = new testToolChecker_1.TestToolChecker();
|
|
203
205
|
const projectPath = this.context.projectPath;
|
|
204
206
|
const status = await checker.resolve({
|
|
207
|
+
releaseType,
|
|
205
208
|
versionRange,
|
|
206
209
|
symlinkDir,
|
|
207
210
|
projectPath,
|