@microsoft/vscode-azext-azureappservice - npm Package Compare versions

Comparing version 2.1.0 to 2.1.1

out/src/deploy/deployZip.js

@@ -24,5 +24,10 @@ "use strict";
         const kuduClient = yield site.createClient(context);
-        const response = yield (0, runWithZipStream_1.runWithZipStream)(context, {
-            fsPath, site, pathFileMap,
-            callback: (zipStream) => __awaiter(this, void 0, void 0, function* () {
+        const callback = context.deployMethod === 'flexconsumption' ?
+            (zipStream) => __awaiter(this, void 0, void 0, function* () {
+                return yield kuduClient.flexDeploy(context, () => zipStream, {
+                    remoteBuild: context.flexConsumptionRemoteBuild,
+                    Deployer: 'az-code'
+                });
+            }) :
+            (zipStream) => __awaiter(this, void 0, void 0, function* () {
                 return yield kuduClient.zipPushDeploy(context, () => zipStream, {
@@ -34,3 +39,5 @@ author: constants_1.publisherName,
                 });
-            })
+            });
+        const response = yield (0, runWithZipStream_1.runWithZipStream)(context, {
+            fsPath, site, pathFileMap, callback
         });
@@ -37,0 +44,0 @@ let locationUrl;

out/src/deploy/IDeployContext.d.ts

@@ -19,5 +19,6 @@ import { IActionContext } from '@microsoft/vscode-azext-utils';
      */
-    deployMethod?: 'zip' | 'storage';
+    deployMethod?: 'zip' | 'storage' | 'flexconsumption';
+    flexConsumptionRemoteBuild?: boolean;
     stopAppBeforeDeploy?: boolean;
     syncTriggersPostDeploy?: boolean;
 }

out/src/deploy/runWithZipStream.js

@@ -121,3 +121,6 @@ "use strict";
             const funcIgnoreContents = (yield fse.readFile(gitignorePath)).toString();
-            ignore = funcIgnoreContents.split('\n').map(l => l.trim());
+            ignore = funcIgnoreContents
+                .split('\n')
+                .map(l => l.trim())
+                .filter(s => s !== '');
         }
@@ -124,0 +127,0 @@ return yield globby('**/*', Object.assign({ gitignore: true,

out/src/deploy/showDeployConfirmation.d.ts

@@ -0,3 +1,9 @@
+import { MessageItem } from "vscode";
 import { ParsedSite } from '../SiteClient';
 import { IDeployContext } from './IDeployContext';
 export declare function showDeployConfirmation(context: IDeployContext, site: ParsedSite, deployCommandId: string): Promise<void>;
+export declare function showCustomDeployConfirmation(context: IDeployContext, site: ParsedSite, deployCommandId: string, options?: {
+    placeHolder?: string;
+    items?: MessageItem[];
+    learnMoreLink?: string;
+}): Promise<MessageItem>;

out/src/deploy/showDeployConfirmation.js

@@ -16,3 +16,3 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.showDeployConfirmation = void 0;
+exports.showCustomDeployConfirmation = exports.showDeployConfirmation = void 0;
 const vscode_azext_utils_1 = require("@microsoft/vscode-azext-utils");
@@ -27,4 +27,10 @@ const path_1 = require("path");
     return __awaiter(this, void 0, void 0, function* () {
-        const warning = vscode_1.l10n.t('Are you sure you want to deploy to "{0}"? This will overwrite any previous deployment and cannot be undone.', site.fullName);
-        const items = [{ title: vscode_1.l10n.t('Deploy') }];
+        yield showCustomDeployConfirmation(context, site, deployCommandId);
+    });
+}
+exports.showDeployConfirmation = showDeployConfirmation;
+function showCustomDeployConfirmation(context, site, deployCommandId, options) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const placeHolder = (options === null || options === void 0 ? void 0 : options.placeHolder) || vscode_1.l10n.t('Are you sure you want to deploy to "{0}"? This will overwrite any previous deployment and cannot be undone.', site.fullName);
+        const items = [{ title: vscode_1.l10n.t('Deploy') }].concat((options === null || options === void 0 ? void 0 : options.items) || []);
         const resetDefault = { title: 'Reset default' };
@@ -34,3 +40,7 @@ if (context.appSource === IDeployContext_1.AppSource.setting) {
         }
-        const result = yield context.ui.showWarningMessage(warning, { modal: true, stepName: 'confirmDestructiveDeployment' }, ...items);
+        const result = yield context.ui.showWarningMessage(placeHolder, {
+            modal: true,
+            stepName: 'confirmDestructiveDeployment',
+            learnMoreLink: options === null || options === void 0 ? void 0 : options.learnMoreLink
+        }, ...items);
         // a temporary workaround for this issue:
@@ -48,5 +58,6 @@ // https://github.com/Microsoft/vscode-azureappservice/issues/844
         }
+        return result;
     });
 }
-exports.showDeployConfirmation = showDeployConfirmation;
+exports.showCustomDeployConfirmation = showCustomDeployConfirmation;
 //# sourceMappingURL=showDeployConfirmation.js.map

out/src/index.d.ts

@@ -0,1 +1,2 @@
+export * from './KuduModels';
 export * from './SiteClient';
@@ -29,3 +30,2 @@ export * from './TunnelProxy';
 export * from './editScmType';
-export * from './KuduModels';
 export { registerAppServiceExtensionVariables } from './extensionVariables';
@@ -32,0 +32,0 @@ export * from './pingFunctionApp';

out/src/index.js

@@ -22,2 +22,3 @@ "use strict";
 exports.registerAppServiceExtensionVariables = exports.disconnectRepo = exports.tryRunPreDeployTask = exports.runPreDeployTask = exports.handleFailedPreDeployTask = exports.WebsiteOS = exports.AppKind = void 0;
+__exportStar(require("./KuduModels"), exports);
 __exportStar(require("./SiteClient"), exports);
@@ -57,3 +58,2 @@ __exportStar(require("./TunnelProxy"), exports);
 __exportStar(require("./editScmType"), exports);
-__exportStar(require("./KuduModels"), exports);
 var extensionVariables_1 = require("./extensionVariables");
@@ -60,0 +60,0 @@ Object.defineProperty(exports, "registerAppServiceExtensionVariables", { enumerable: true, get: function () { return extensionVariables_1.registerAppServiceExtensionVariables; } });

out/src/SiteClient.d.ts

@@ -56,2 +56,3 @@ import type { AppServicePlan, FunctionEnvelope, FunctionSecrets, HostKeys, Site, SiteConfigResource, SiteLogsConfig, SiteSourceControl, SlotConfigNamesResource, SourceControl, StringDictionary, User, WebAppsListFunctionKeysResponse, WebJob, WebSiteInstanceStatus, WebSiteManagementClient } from '@azure/arm-appservice';
     getIsConsumption(context: IActionContext): Promise<boolean>;
+    getIsConsumptionV2(context: IActionContext): Promise<boolean>;
     stop(): Promise<void>;
@@ -93,4 +94,8 @@ start(): Promise<void>;
     listFunctionKeys(functionName: string): Promise<IFunctionKeys>;
-    zipPushDeploy(context: IActionContext, file: RequestBodyType, queryParameters: KuduModels.PushDeploymentZipPushDeployOptionalParams): Promise<AzExtPipelineResponse>;
-    warPushDeploy(context: IActionContext, file: RequestBodyType, queryParameters: KuduModels.PushDeploymentWarPushDeployOptionalParams): Promise<AzExtPipelineResponse>;
+    zipPushDeploy(context: IActionContext, file: RequestBodyType, rawQueryParameters: KuduModels.PushDeploymentZipPushDeployOptionalParams): Promise<AzExtPipelineResponse>;
+    warPushDeploy(context: IActionContext, file: RequestBodyType, rawQueryParameters: KuduModels.PushDeploymentWarPushDeployOptionalParams): Promise<AzExtPipelineResponse>;
+    flexDeploy(context: IActionContext, file: RequestBodyType, rawQueryParameters: {
+        remoteBuild?: boolean;
+        Deployer?: string;
+    }): Promise<AzExtPipelineResponse>;
     deploy(context: IActionContext, id: string): Promise<AzExtPipelineResponse>;
@@ -97,0 +102,0 @@ getDeployResults(context: IActionContext): Promise<KuduModels.DeployResult[]>;

out/src/SiteClient.js

@@ -20,2 +20,3 @@ "use strict";
 const vscode_azext_utils_1 = require("@microsoft/vscode-azext-utils");
+const url_1 = require("url");
 const AppKind_1 = require("./createAppService/AppKind");
@@ -99,2 +100,13 @@ const tryGetSiteResource_1 = require("./tryGetSiteResource");
     }
+    getIsConsumptionV2(context) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this._site.isFunctionApp) {
+                const sku = yield this.getCachedSku(context);
+                return !!sku && sku.toLowerCase() === 'flexconsumption';
+            }
+            else {
+                return false;
+            }
+        });
+    }
     stop() {
@@ -309,7 +321,7 @@ return __awaiter(this, void 0, void 0, function* () {
     }
-    zipPushDeploy(context, file, queryParameters) {
+    zipPushDeploy(context, file, rawQueryParameters) {
         return __awaiter(this, void 0, void 0, function* () {
             const client = yield (0, vscode_azext_azureutils_1.createGenericClient)(context, this._site.subscription);
-            const queryOptions = (0, kuduUtils_1.convertQueryParamsValuesToString)(queryParameters);
-            const queryString = Object.keys(queryOptions).map(key => key + '=' + queryOptions[key]).join('&');
+            const queryParameters = (0, kuduUtils_1.convertQueryParamsValuesToString)(rawQueryParameters);
+            const queryString = new url_1.URLSearchParams(queryParameters).toString();
             const request = (0, core_rest_pipeline_1.createPipelineRequest)({
@@ -323,7 +335,7 @@ method: 'POST',
     }
-    warPushDeploy(context, file, queryParameters) {
+    warPushDeploy(context, file, rawQueryParameters) {
         return __awaiter(this, void 0, void 0, function* () {
             const client = yield (0, vscode_azext_azureutils_1.createGenericClient)(context, this._site.subscription);
-            const queryOptions = (0, kuduUtils_1.convertQueryParamsValuesToString)(queryParameters);
-            const queryString = Object.keys(queryOptions).map(key => key + '=' + queryOptions[key]).join('&');
+            const queryParameters = (0, kuduUtils_1.convertQueryParamsValuesToString)(rawQueryParameters);
+            const queryString = new url_1.URLSearchParams(queryParameters).toString();
             const request = (0, core_rest_pipeline_1.createPipelineRequest)({
@@ -337,2 +349,16 @@ method: 'POST',
     }
+    // TODO: only supporting /zip endpoint for now, but should support /zipurl as well
+    flexDeploy(context, file, rawQueryParameters) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const client = yield (0, vscode_azext_azureutils_1.createGenericClient)(context, this._site.subscription);
+            const queryParameters = (0, kuduUtils_1.convertQueryParamsValuesToString)(rawQueryParameters);
+            const queryString = new url_1.URLSearchParams(queryParameters).toString();
+            const request = (0, core_rest_pipeline_1.createPipelineRequest)({
+                method: 'POST',
+                url: `${this._site.kuduUrl}/api/deploy/zip?${queryString}`,
+                body: file,
+            });
+            return yield client.sendRequest(request);
+        });
+    }
     deploy(context, id) {
@@ -339,0 +365,0 @@ return __awaiter(this, void 0, void 0, function* () {

package.json

 {
     "name": "@microsoft/vscode-azext-azureappservice",
     "author": "Microsoft Corporation",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "description": "Common tools for developing Azure App Service extensions for VS Code",
@@ -6,0 +6,0 @@ "tags": [

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

370576

increased by0.78%

Lines of code

6707

increased by0.89%

No dependency changes