Use the v1 index.json for all templates not just v2 (#4652)

Author: nturinski

src/templates/script/PysteinTemplateProvider.ts

@@ -32,7 +32,7 @@ export class PysteinTemplateProvider extends ScriptBundleTemplateProvider {
     protected _language: string;
 
     public async getLatestTemplates(context: IActionContext, latestTemplateVersion: string): Promise<ITemplates> {
-        const release: bundleFeedUtils.ITemplatesReleaseV2 = await bundleFeedUtils.getReleaseV2(latestTemplateVersion);
+        const release = await bundleFeedUtils.getRelease(latestTemplateVersion, 'v2') as bundleFeedUtils.ITemplatesReleaseV2;
         const language = this.getResourcesLanguage();
         const resourcesUrl: string = release.resources.replace('{locale}', language);
         const urls: string[] = [release.userPrompts ?? release.bindings, resourcesUrl, release.functions];

src/templates/script/ScriptBundleTemplateProvider.ts

@@ -31,8 +31,7 @@ export class ScriptBundleTemplateProvider extends ScriptTemplateProvider {
     }
 
     public async getLatestTemplates(context: IActionContext, latestTemplateVersion: string): Promise<ITemplates> {
-        const bundleMetadata: IBundleMetadata | undefined = await this.getBundleInfo();
-        const release: bundleFeedUtils.ITemplatesReleaseV1 = await bundleFeedUtils.getRelease(context, bundleMetadata, latestTemplateVersion);
+        const release = await bundleFeedUtils.getRelease(latestTemplateVersion, 'v1') as bundleFeedUtils.ITemplatesReleaseV1;
 
         const language: string = this.getResourcesLanguage();
         const resourcesUrl: string = release.resources.replace('{locale}', language);

src/utils/bundleFeedUtils.ts

@@ -61,14 +61,17 @@ export namespace bundleFeedUtils {
         }
     }
 
-    export async function getRelease(context: IActionContext, bundleMetadata: IBundleMetadata | undefined, templateVersion: string): Promise<ITemplatesReleaseV1> {
-        const feed: IBundleFeed = await getBundleFeed(context, bundleMetadata);
-        return feed.templates.v1[templateVersion];
-    }
-
-    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
+    export async function getRelease(templateVersion: string, version: 'v1' | 'v2'): Promise<ITemplatesReleaseV1 | ITemplatesReleaseV2> {
+        // build the url ourselves because the index-v2.json file is no longer publishing version updates
         const functionsCdn: string = 'https://cdn.functions.azure.com/public/ExtensionBundles/Microsoft.Azure.Functions.ExtensionBundle/';
+        if (version === 'v1') {
+            return {
+                functions: `${functionsCdn}${templateVersion}/StaticContent/v1/templates/templates.json`,
+                bindings: `${functionsCdn}${templateVersion}/StaticContent/v1/bindings/bindings.json`,
+                resources: `${functionsCdn}${templateVersion}/StaticContent/v1/resources/Resources.{locale}.json`,
+            };
+        }
+
         return {
             functions: `${functionsCdn}${templateVersion}/StaticContent/v2/templates/templates.json`,
             bindings: `${functionsCdn}${templateVersion}/StaticContent/v2/bindings/userPrompts.json`,