Merge branch 'main' into bmw/1es

microsoft · Feb 2, 2024 · 55520b1 · 55520b1
2 parents 14ee213 + f43e74b
commit 55520b1
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 48 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,7 +1,7 @@
 {
     "editor.codeActionsOnSave": {
-        "source.fixAll.eslint": true,
-        "source.organizeImports": true
+        "source.fixAll.eslint": "explicit",
+        "source.organizeImports": "explicit"
     },
     "editor.detectIndentation": false,
     "editor.formatOnSave": true,

diff --git a/appservice/package-lock.json b/appservice/package-lock.json
diff --git a/appservice/package.json b/appservice/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@microsoft/vscode-azext-azureappservice",
     "author": "Microsoft Corporation",
-    "version": "2.3.4",
+    "version": "2.3.6",
     "description": "Common tools for developing Azure App Service extensions for VS Code",
     "tags": [
         "azure",
@@ -40,7 +40,7 @@
         "@azure/core-client": "^1.7.2",
         "@azure/core-rest-pipeline": "^1.10.3",
         "@azure/storage-blob": "^12.3.0",
-        "@microsoft/vscode-azext-azureutils": "^2.0.6",
+        "@microsoft/vscode-azext-azureutils": "2.0.2",
         "@microsoft/vscode-azext-github": "^1.0.0",
         "@microsoft/vscode-azext-utils": "^2.1.0",
         "dayjs": "^1.11.2",

diff --git a/appservice/src/SiteClient.ts b/appservice/src/SiteClient.ts
@@ -323,9 +323,7 @@ export class SiteClient implements IAppSettingsClient {
     }
 
     public async zipPushDeploy(context: IActionContext, file: RequestBodyType, rawQueryParameters: KuduModels.PushDeploymentZipPushDeployOptionalParams): Promise<AzExtPipelineResponse> {
-        const client: ServiceClient = await createGenericClient(context, this._site.subscription, {
-            endpoint: this._site.subscription.environment.managementEndpointUrl,
-        });
+        const client: ServiceClient = await createGenericClient(context, this._site.subscription);
         const queryParameters = convertQueryParamsValuesToString(rawQueryParameters);
         const queryString = new URLSearchParams(queryParameters).toString();
         const request = createPipelineRequest({
@@ -338,9 +336,7 @@ export class SiteClient implements IAppSettingsClient {
     }
 
     public async warPushDeploy(context: IActionContext, file: RequestBodyType, rawQueryParameters: KuduModels.PushDeploymentWarPushDeployOptionalParams): Promise<AzExtPipelineResponse> {
-        const client: ServiceClient = await createGenericClient(context, this._site.subscription, {
-            endpoint: this._site.subscription.environment.managementEndpointUrl,
-        });
+        const client: ServiceClient = await createGenericClient(context, this._site.subscription);
         const queryParameters = convertQueryParamsValuesToString(rawQueryParameters);
         const queryString = new URLSearchParams(queryParameters).toString();
         const request = createPipelineRequest({
@@ -355,9 +351,7 @@ export class SiteClient implements IAppSettingsClient {
     // TODO: only supporting /zip endpoint for now, but should support /zipurl as well
     public async flexDeploy(context: IActionContext, file: RequestBodyType,
         rawQueryParameters: { remoteBuild?: boolean, Deployer?: string }): Promise<AzExtPipelineResponse> {
-        const client: ServiceClient = await createGenericClient(context, this._site.subscription, {
-            endpoint: this._site.subscription.environment.managementEndpointUrl,
-        });
+        const client: ServiceClient = await createGenericClient(context, this._site.subscription);
         const queryParameters = convertQueryParamsValuesToString(rawQueryParameters);
         const queryString = new URLSearchParams(queryParameters).toString();
         const request = createPipelineRequest({
@@ -370,9 +364,7 @@ export class SiteClient implements IAppSettingsClient {
     }
 
     public async deploy(context: IActionContext, id: string): Promise<AzExtPipelineResponse> {
-        const client: ServiceClient = await createGenericClient(context, this._site.subscription, {
-            endpoint: this._site.subscription.environment.managementEndpointUrl,
-        });
+        const client: ServiceClient = await createGenericClient(context, this._site.subscription);
         return await client.sendRequest(createPipelineRequest({
             method: 'PUT',
             url: `${this._site.kuduUrl}/api/deployments/${id}`
@@ -383,7 +375,6 @@ export class SiteClient implements IAppSettingsClient {
     public async getDeployResults(context: IActionContext): Promise<KuduModels.DeployResult[]> {
         const client: ServiceClient = await createGenericClient(context, this._site.subscription, {
             addStatusCodePolicy: true,
-            endpoint: this._site.subscription.environment.managementEndpointUrl,
         });
         const response: AzExtPipelineResponse = await client.sendRequest(createPipelineRequest({
             method: 'GET',
@@ -403,7 +394,6 @@ export class SiteClient implements IAppSettingsClient {
     public async getDeployResult(context: IActionContext, deployId: string): Promise<KuduModels.DeployResult> {
         const client: ServiceClient = await createGenericClient(context, this._site.subscription, {
             addStatusCodePolicy: true,
-            endpoint: this._site.subscription.environment.managementEndpointUrl,
         });
         const response: AzExtPipelineResponse = await client.sendRequest(createPipelineRequest({
             method: 'GET',
@@ -416,7 +406,6 @@ export class SiteClient implements IAppSettingsClient {
     public async getLogEntry(context: IActionContext, deployId: string): Promise<KuduModels.LogEntry[]> {
         const client: ServiceClient = await createGenericClient(context, this._site.subscription, {
             addStatusCodePolicy: true,
-            endpoint: this._site.subscription.environment.managementEndpointUrl,
         });
         const response: AzExtPipelineResponse = await client.sendRequest(createPipelineRequest({
             method: 'GET',
@@ -437,7 +426,6 @@ export class SiteClient implements IAppSettingsClient {
     public async getLogEntryDetails(context: IActionContext, deployId: string, logId: string): Promise<KuduModels.LogEntry[]> {
         const client: ServiceClient = await createGenericClient(context, this._site.subscription, {
             addStatusCodePolicy: true,
-            endpoint: this._site.subscription.environment.managementEndpointUrl,
         });
         const response: AzExtPipelineResponse = await client.sendRequest(createPipelineRequest({
             method: 'GET',
@@ -454,19 +442,15 @@ export class SiteClient implements IAppSettingsClient {
     }
 
     public async vfsGetItem(context: IActionContext, url: string): Promise<AzExtPipelineResponse> {
-        const client: ServiceClient = await createGenericClient(context, this._site.subscription, {
-            endpoint: this._site.subscription.environment.managementEndpointUrl,
-        });
+        const client: ServiceClient = await createGenericClient(context, this._site.subscription);
         return await client.sendRequest(createPipelineRequest({
             method: 'GET',
             url,
         }));
     }
 
     public async vfsPutItem(context: IActionContext, data: string | ArrayBuffer, url: string, rawHeaders?: {}): Promise<AzExtPipelineResponse> {
-        const client: ServiceClient = await createGenericClient(context, this._site.subscription, {
-            endpoint: this._site.subscription.environment.managementEndpointUrl,
-        });
+        const client: ServiceClient = await createGenericClient(context, this._site.subscription);
         const headers = createHttpHeaders(rawHeaders);
         return await client.sendRequest(createPipelineRequest({
             method: 'PUT',

diff --git a/appservice/src/deploy/wizard/DeployExecuteStepBase.ts b/appservice/src/deploy/wizard/DeployExecuteStepBase.ts
@@ -51,7 +51,7 @@ function getLinuxFxVersionForTelemetry(config: SiteConfigResource): string {
 }
 
 async function setDeploymentTelemetry(context: InnerDeployContext, config: SiteConfigResource, aspPromise: Promise<AppServicePlan | undefined>): Promise<void> {
-    context.telemetry.properties.sourceHash = await randomUtils.getPseudononymousStringHash(context.workspaceFolder.uri.fsPath);
+    context.telemetry.properties.sourceHash = await randomUtils.getPseudononymousStringHash(context.fsPath);
     context.telemetry.properties.destHash = await randomUtils.getPseudononymousStringHash(context.site.fullName);
     context.telemetry.properties.scmType = String(config.scmType);
     context.telemetry.properties.isSlot = context.site.isSlot ? 'true' : 'false';

diff --git a/appservice/src/deploy/wizard/DeployLocalGitExecuteStep.ts b/appservice/src/deploy/wizard/DeployLocalGitExecuteStep.ts
@@ -9,6 +9,6 @@ import { DeployExecuteStepBase } from "./DeployExecuteStepBase";
 
 export class DeployLocalGitExecuteStep extends DeployExecuteStepBase {
     public async deployCore(context: InnerDeployContext): Promise<void> {
-        await localGitDeploy(context.site, { fsPath: context.workspaceFolder.uri.fsPath }, context);
+        await localGitDeploy(context.site, { fsPath: context.fsPath }, context);
     }
 }
diff --git a/appservice/src/deploy/wizard/PostDeploySyncTriggersExecuteStep.ts b/appservice/src/deploy/wizard/PostDeploySyncTriggersExecuteStep.ts
@@ -17,7 +17,8 @@ export class PostDeploySyncTriggersExecuteStep extends AzureWizardExecuteStep<In
         }
     }
 
-    public shouldExecute(_context: InnerDeployContext): boolean {
-        return true;
+    public shouldExecute(context: InnerDeployContext): boolean {
+        // this gets set in `waitForDeploymentToComplete` for consumption plans or storage account deployments
+        return !!context.syncTriggersPostDeploy;
     }
 }
diff --git a/appservice/src/deploy/wizard/createDeployWizard.ts b/appservice/src/deploy/wizard/createDeployWizard.ts
@@ -42,7 +42,7 @@ export async function createDeployExecuteSteps(context: InnerDeployContext): Pro
             executeSteps.push(new DeployWarExecuteStep());
         } else if (javaRuntime && /^java/i.test(javaRuntime) && !context.site.isFunctionApp) {
             const pathFileMap = new Map<string, string>([
-                [path.basename(context.workspaceFolder.uri.fsPath), 'app.jar']
+                [path.basename(context.fsPath), 'app.jar']
             ]);
             executeSteps.push(new DeployZipPushExecuteStep(pathFileMap));
         } else if (context.deployMethod === 'flexconsumption') {
@@ -55,9 +55,7 @@ export async function createDeployExecuteSteps(context: InnerDeployContext): Pro
     }
 
     executeSteps.push(new PostDeployTaskExecuteStep(config))
-    if (context.syncTriggersPostDeploy) {
-        executeSteps.push(new PostDeploySyncTriggersExecuteStep());
-    }
+    executeSteps.push(new PostDeploySyncTriggersExecuteStep());
 
     return executeSteps;
 }
diff --git a/appservice/src/deploy/wizard/deployZip/DeployFlexExecuteStep.ts b/appservice/src/deploy/wizard/deployZip/DeployFlexExecuteStep.ts
@@ -21,7 +21,7 @@ export class DeployFlexExecuteStep extends DeployZipBaseExecuteStep {
         };
 
         return await runWithZipStream(context, {
-            fsPath: context.workspaceFolder.uri.fsPath,
+            fsPath: context.fsPath,
             site: context.site,
             pathFileMap: this.pathFileMap,
             callback,

diff --git a/appservice/src/deploy/wizard/deployZip/DeployWarExecuteStep.ts b/appservice/src/deploy/wizard/deployZip/DeployWarExecuteStep.ts
@@ -12,12 +12,12 @@ import { DeployZipBaseExecuteStep } from "./DeployZipBaseExecuteStep";
 
 export class DeployWarExecuteStep extends DeployZipBaseExecuteStep {
     public async deployZip(context: InnerDeployContext): Promise<void> {
-        if (getFileExtension(context.workspaceFolder.uri.fsPath) !== 'war') {
+        if (getFileExtension(context.fsPath) !== 'war') {
             throw new Error(l10n.t('Path specified is not a war file'));
         }
 
         const kuduClient = await context.site.createClient(context);
-        await kuduClient.warPushDeploy(context, () => fs.createReadStream(context.workspaceFolder.uri.fsPath), {
+        await kuduClient.warPushDeploy(context, () => fs.createReadStream(context.fsPath), {
             isAsync: true,
             author: publisherName,
             deployer: publisherName,

diff --git a/appservice/src/deploy/wizard/deployZip/DeployZipBaseExecuteStep.ts b/appservice/src/deploy/wizard/deployZip/DeployZipBaseExecuteStep.ts
@@ -16,7 +16,7 @@ export abstract class DeployZipBaseExecuteStep extends DeployExecuteStepBase {
     }
 
     public async deployCore(context: InnerDeployContext): Promise<void> {
-        const fsPath = context.workspaceFolder.uri.fsPath;
+        const fsPath = context.fsPath;
         if (!(await AzExtFsExtra.pathExists(fsPath))) {
             throw new Error(l10n.t('Failed to deploy path that does not exist: {0}', fsPath));
         }

diff --git a/appservice/src/deploy/wizard/deployZip/DeployZipPushExecuteStep.ts b/appservice/src/deploy/wizard/deployZip/DeployZipPushExecuteStep.ts
@@ -23,7 +23,7 @@ export class DeployZipPushExecuteStep extends DeployZipBaseExecuteStep {
         };
 
         return await runWithZipStream(context, {
-            fsPath: context.workspaceFolder.uri.fsPath,
+            fsPath: context.fsPath,
             site: context.site,
             pathFileMap: this.pathFileMap,
             callback,