Merge branch 'main' into nat/managedIdentityBasic

nturinski · web-flow · commit 33b2a1cebfba · 2025-03-11T14:16:17.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## 1.16.3 - 2025-03-10
+
+### Changed
+* [[4397](https://github.com/microsoft/vscode-azurefunctions/pull/4397)] Automatically collect subscription and resource information for telemetry. [How to disable telemetry reporting](https://code.visualstudio.com/docs/supporting/FAQ#_how-to-disable-telemetry-reporting)
+* [[4400](https://github.com/microsoft/vscode-azurefunctions/pull/4400)] Require VS Code version 1.95.0 (October 2024) or greater
+
 ## 1.16.2 - 2025-02-10
 
 ### Added
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,12 +2,12 @@
     "name": "vscode-azurefunctions",
     "displayName": "Azure Functions",
     "description": "%azureFunctions.description%",
-    "version": "1.16.2",
+    "version": "1.16.4-alpha",
     "publisher": "ms-azuretools",
     "icon": "resources/azure-functions.png",
     "aiKey": "0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255",
     "engines": {
-        "vscode": "^1.82.0"
+        "vscode": "^1.95.0"
     },
     "repository": {
         "type": "git",
@@ -1305,7 +1305,7 @@
         "@types/node": "^16.18.36",
         "@types/ps-tree": "^1.1.0",
         "@types/semver": "^5.5.0",
-        "@types/vscode": "^1.81.0",
+        "@types/vscode": "^1.95.0",
         "@types/websocket": "^1.0.0",
         "@types/xml2js": "^0.4.5",
         "@types/xregexp": "4.3.0",
@@ -1348,7 +1348,7 @@
         "@microsoft/vscode-azext-azureappsettings": "^0.2.2",
         "@microsoft/vscode-azext-azureutils": "^3.1.5",
         "@microsoft/vscode-azext-serviceconnector": "^0.1.3",
-        "@microsoft/vscode-azext-utils": "^2.5.7",
+        "@microsoft/vscode-azext-utils": "^2.6.3",
         "@microsoft/vscode-azureresources-api": "^2.0.4",
         "cross-fetch": "^4.0.0",
         "escape-string-regexp": "^4.0.0",
diff --git a/src/How to parse v2 Templates.md b/src/How to parse v2 Templates.md
@@ -2,7 +2,7 @@
 
 ### Bundle feed
 
-The templates come from the extension [bundle feed](https://functionscdn.azureedge.net/public/ExtensionBundles/Microsoft.Azure.Functions.ExtensionBundle/index-v2.json) under the `templates.v2` property.
+The templates come from the extension [bundle feed](https://cdn.functions.azure.com/public/ExtensionBundles/Microsoft.Azure.Functions.ExtensionBundle/index-v2.json) under the `templates.v2` property.
 The extension looks at the `bundleVersions` to determine what the latest version is. It then uses the three properties `functions`, `userPrompts`, and `resources` to retrieve the jsons used to parse the templates.
 
 **NOTE: For v1, we use `bindings` instead of `userPrompts`**
diff --git a/src/commands/SubscriptionListStep.ts b/src/commands/SubscriptionListStep.ts
@@ -14,6 +14,7 @@ export class SubscriptionListStep extends AzureWizardPromptStep<IFuncDeployConte
     private _oneSubscription: boolean = false;
     public async prompt(context: IFuncDeployContext): Promise<void> {
         context.subscription = (await context.ui.showQuickPick(this._picks, { placeHolder: l10n.t("Select a subscription") })).data;
+        context.telemetry.properties.subscriptionId = context.subscription.subscriptionId;
     }
 
     public shouldPrompt(_: IFuncDeployContext): boolean {
diff --git a/src/commands/deploy/FunctionAppListStep.ts b/src/commands/deploy/FunctionAppListStep.ts
@@ -17,6 +17,7 @@ import { type IFuncDeployContext } from "./deploy";
 export class FunctionAppListStep extends AzureWizardPromptStep<IFuncDeployContext> {
     public async prompt(context: IFuncDeployContext): Promise<void> {
         context.site = (await context.ui.showQuickPick(this.getPicks(context), { placeHolder: vscode.l10n.t("Select a function app") })).data;
+        context.telemetry.properties.resourceId = context.site?.id;
     }
 
     public shouldPrompt(context: IFuncDeployContext): boolean {
diff --git a/src/templates/README.md b/src/templates/README.md
@@ -1,6 +1,6 @@
 # Azure Function Templates
 
-The code in this folder is used to parse and model the [function templates](https://github.com/Azure/azure-webjobs-sdk-templates) provided by the [Azure Functions CLI Feed](https://aka.ms/AAbbk68). The Functions CLI Feed provides a central location to get the latest version of all templates used for functions.
+The code in this folder is used to parse and model the [function templates](https://github.com/Azure/azure-webjobs-sdk-templates) provided by the [Azure Functions CLI Feed](https://aka.ms/funcCliFeedV4). The Functions CLI Feed provides a central location to get the latest version of all templates used for functions.
 
 ## Template Sources
 
@@ -24,9 +24,9 @@ Backup templates should be updated every time there is a major change in the lat
 
 ## Script Templates
 
-Basic script templates (i.e. http and timer) are retrieved from the 'templates' property in each entry of the [CLI Feed](https://aka.ms/AAbbk68). More advanced templates (i.e. blob and cosmos) are retrieved from another feed specific to the extension bundle for that project. For example, the default bundle is 'Microsoft.Azure.Functions.ExtensionBundle' and the matching feed is https://functionscdn.azureedge.net/public/ExtensionBundles/Microsoft.Azure.Functions.ExtensionBundle/index-v2.json
+Basic script templates (i.e. http and timer) are retrieved from the 'templates' property in each entry of the [CLI Feed](https://aka.ms/funcCliFeedV4). More advanced templates (i.e. blob and cosmos) are retrieved from another feed specific to the extension bundle for that project. For example, the default bundle is 'Microsoft.Azure.Functions.ExtensionBundle' and the matching feed is https://cdn.functions.azure.com/public/ExtensionBundles/Microsoft.Azure.Functions.ExtensionBundle/index-v2.json
 
-> NOTE: Both template feeds support 'staging' environments for us to test against before moving to production. The main CLI Feed uses a "vX-prerelease" tag, while the bundle feed has a completely different url leveraging "functionscdnstaging" instead of "functionscdn".
+> NOTE: Both template feeds support 'staging' environments for us to test against before moving to production. The main CLI Feed uses a "vX-prerelease" tag, while the bundle feed has a completely different url leveraging "cdn-staging.functions.azure.com" instead of "cdn.functions.azure.com ".
 
 In both cases, the templates are split into three parts: templates.json, bindings.json, and resources.json. See below for an example of the schema for the TimerTrigger template:
 
diff --git a/src/utils/bundleFeedUtils.ts b/src/utils/bundleFeedUtils.ts
@@ -68,7 +68,7 @@ export namespace bundleFeedUtils {
 
     export async function getReleaseV2(templateVersion: string): Promise<ITemplatesReleaseV2> {
         // build the url ourselves because the index-v2.json file is no longer publishing version updates for v2 templates
-        const functionsCdn: string = 'https://functionscdn.azureedge.net/public/ExtensionBundles/Microsoft.Azure.Functions.ExtensionBundle/';
+        const functionsCdn: string = 'https://cdn.functions.azure.com/public/ExtensionBundles/Microsoft.Azure.Functions.ExtensionBundle/';
         return {
             functions: `${functionsCdn}${templateVersion}/StaticContent/v2/templates/templates.json`,
             bindings: `${functionsCdn}${templateVersion}/StaticContent/v2/bindings/userPrompts.json`,
@@ -113,10 +113,10 @@ export namespace bundleFeedUtils {
         let url: string;
         const templateProvider = ext.templateProvider.get(context);
         if (!envVarUri && bundleId === defaultBundleId && templateProvider.templateSource !== TemplateSource.Staging) {
-            url = 'https://aka.ms/AA66i2x';
+            url = 'https://aka.ms/bundleFeedUtilsV2';
         } else {
-            const suffix: string = templateProvider.templateSource === TemplateSource.Staging ? 'staging' : '';
-            const baseUrl: string = envVarUri || `https://functionscdn${suffix}.azureedge.net/public`;
+            const suffix: string = templateProvider.templateSource === TemplateSource.Staging ? '-staging' : '';
+            const baseUrl: string = envVarUri || `https://cdn${suffix}.functions.azure.com/public`;
             url = `${baseUrl}/ExtensionBundles/${bundleId}/index-v2.json`;
         }
 
diff --git a/src/utils/cliFeedUtils.ts b/src/utils/cliFeedUtils.ts
@@ -11,7 +11,7 @@ import { localize } from '../localize';
 import { feedUtils } from './feedUtils';
 
 export namespace cliFeedUtils {
-    const funcCliFeedV4Url: string = 'https://aka.ms/AAbbk68';
+    const funcCliFeedV4Url: string = 'https://aka.ms/funcCliFeedV4';
 
     interface ICliFeed {
         tags: {
diff --git a/src/utils/treeUtils.ts b/src/utils/treeUtils.ts
@@ -8,7 +8,7 @@ import * as path from 'path';
 import { ext } from '../extensionVariables';
 
 export namespace treeUtils {
-    export function getIconPath(iconName: string): TreeItemIconPath {
+    export function getIconPath(iconName: string): string {
         return path.join(getResourcesPath(), `${iconName}.svg`);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ export class SubscriptionListStep extends AzureWizardPromptStep<IFuncDeployConte`
`14`	`14`	`private _oneSubscription: boolean = false;`
`15`	`15`	`public async prompt(context: IFuncDeployContext): Promise<void> {`
`16`	`16`	`context.subscription = (await context.ui.showQuickPick(this._picks, { placeHolder: l10n.t("Select a subscription") })).data;`
	`17`	`+ context.telemetry.properties.subscriptionId = context.subscription.subscriptionId;`
`17`	`18`	`}`
`18`	`19`
`19`	`20`	`public shouldPrompt(_: IFuncDeployContext): boolean {`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ import { type IFuncDeployContext } from "./deploy";`
`17`	`17`	`export class FunctionAppListStep extends AzureWizardPromptStep<IFuncDeployContext> {`
`18`	`18`	`public async prompt(context: IFuncDeployContext): Promise<void> {`
`19`	`19`	`context.site = (await context.ui.showQuickPick(this.getPicks(context), { placeHolder: vscode.l10n.t("Select a function app") })).data;`
	`20`	`+ context.telemetry.properties.resourceId = context.site?.id;`
`20`	`21`	`}`
`21`	`22`
`22`	`23`	`public shouldPrompt(context: IFuncDeployContext): boolean {`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import * as path from 'path';`
`8`	`8`	`import { ext } from '../extensionVariables';`
`9`	`9`
`10`	`10`	`export namespace treeUtils {`
`11`		`- export function getIconPath(iconName: string): TreeItemIconPath {`
	`11`	`+ export function getIconPath(iconName: string): string {`
`12`	`12`	return path.join(getResourcesPath(), `${iconName}.svg`);
`13`	`13`	`}`
`14`	`14`