Merge main

Author: nturinski

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 1.17.2 - 2025-05-01
+
+### Fixes
+* [[4494]](https://github.com/microsoft/vscode-azurefunctions/pull/4494) Fixes function triggers not appearing under the "Functions" node in the remote view after deploying
+* [[4493]](https://github.com/microsoft/vscode-azurefunctions/pull/4493) Incomplete telemetry data capture in specific scenarios.
+
 ## 1.17.1 - 2025-04-09
 
 ### Fixes

package-lock.json

@@ -2,7 +2,7 @@
     "name": "vscode-azurefunctions",
     "displayName": "Azure Functions",
     "description": "%azureFunctions.description%",
-    "version": "1.17.1",
+    "version": "1.17.2",
     "publisher": "ms-azuretools",
     "icon": "resources/azure-functions.png",
     "aiKey": "0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255",

package.json

@@ -27,6 +27,7 @@ export class SubscriptionListStep extends AzureWizardPromptStep<IFuncDeployConte
         if (this._picks.length === 1) {
             this._oneSubscription = true;
             context.subscription = this._picks[0].data;
+            context.telemetry.properties.subscriptionId = context.subscription.subscriptionId;
         }
     }
 

src/commands/SubscriptionListStep.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { type NameValuePair, type Site, type SiteConfig, type WebSiteManagementClient } from '@azure/arm-appservice';
+import { type FunctionsDeploymentStorageAuthentication, type NameValuePair, type Site, type SiteConfig, type WebSiteManagementClient } from '@azure/arm-appservice';
 import { type Identity } from '@azure/arm-resources';
 import { BlobServiceClient } from '@azure/storage-blob';
 import { ParsedSite, WebsiteOS, type CustomLocation, type IAppServiceWizardContext } from '@microsoft/vscode-azext-azureappservice';
@@ -96,11 +96,7 @@ export class FunctionAppCreateStep extends AzureWizardExecuteStepWithActivityOut
                 storage: {
                     type: 'blobContainer',
                     value: `${context.storageAccount?.primaryEndpoints?.blob}app-package-${context.newSiteName?.substring(0, 32)}-${randomUtils.getRandomHexString(7)}`,
-                    authentication: {
-                        userAssignedIdentityResourceId: undefined,
-                        type: 'StorageAccountConnectionString',
-                        storageAccountConnectionStringName: 'DEPLOYMENT_STORAGE_CONNECTION_STRING'
-                    }
+                    authentication: createDeploymentStorageAuthentication(context)
                 }
             },
             runtime: {
@@ -116,6 +112,15 @@ export class FunctionAppCreateStep extends AzureWizardExecuteStepWithActivityOut
         }
 
         return site;
+
+        function createDeploymentStorageAuthentication(context: IFlexFunctionAppWizardContext): FunctionsDeploymentStorageAuthentication {
+            const hasManagedIdentity: boolean = !!context.managedIdentity;
+            return {
+                userAssignedIdentityResourceId: hasManagedIdentity ? context.managedIdentity?.id : undefined,
+                type: hasManagedIdentity ? 'UserAssignedIdentity' : 'StorageAccountConnectionString',
+                storageAccountConnectionStringName: hasManagedIdentity ? undefined : 'DEPLOYMENT_STORAGE_CONNECTION_STRING',
+            };
+        }
     }
 
     private async createNewSite(context: IFunctionAppWizardContext, stack?: FullFunctionAppStack): Promise<Site> {
@@ -190,7 +195,8 @@ export class FunctionAppCreateStep extends AzureWizardExecuteStepWithActivityOut
                 name: contentShareKey,
                 value: getNewFileShareName(nonNullProp(context, 'newSiteName'))
             });
-        } else if (isFlex) {
+            // only add this setting for flex apps, if we're not using managed identity
+        } else if (isFlex && !context.managedIdentity) {
             appSettings.push({
                 name: 'DEPLOYMENT_STORAGE_CONNECTION_STRING',
                 value: storageConnectionString