Use separate urls for querying and downloading of LS (microsoft#3078)

* Use separate urls for querying and downloading
* Fix tests

Author: DonJayamanne

src/client/activation/languageServer/languageServerPackageRepository.ts

@@ -7,7 +7,8 @@ import { inject, injectable } from 'inversify';
 import { AzureBlobStoreNugetRepository } from '../../common/nuget/azureBlobStoreNugetRepository';
 import { IServiceContainer } from '../../ioc/types';
 
-const azureBlobStorageAccount = 'https://pvsc.azureedge.net';
+const azureBlobStorageAccount = 'https://pvsc.blob.core.windows.net';
+const azureCDNBlobStorageAccount = 'https://pvsc.azureedge.net';
 
 export enum LanguageServerDownloadChannel {
     stable = 'stable',
@@ -24,20 +25,20 @@ export enum LanguageServerPackageStorageContainers {
 @injectable()
 export class StableLanguageServerPackageRepository extends AzureBlobStoreNugetRepository {
     constructor(@inject(IServiceContainer) serviceContainer: IServiceContainer) {
-        super(serviceContainer, azureBlobStorageAccount, LanguageServerPackageStorageContainers.stable);
+        super(serviceContainer, azureBlobStorageAccount, LanguageServerPackageStorageContainers.stable, azureCDNBlobStorageAccount);
     }
 }
 
 @injectable()
 export class BetaLanguageServerPackageRepository extends AzureBlobStoreNugetRepository {
     constructor(@inject(IServiceContainer) serviceContainer: IServiceContainer) {
-        super(serviceContainer, azureBlobStorageAccount, LanguageServerPackageStorageContainers.beta);
+        super(serviceContainer, azureBlobStorageAccount, LanguageServerPackageStorageContainers.beta, azureCDNBlobStorageAccount);
     }
 }
 
 @injectable()
 export class DailyLanguageServerPackageRepository extends AzureBlobStoreNugetRepository {
     constructor(@inject(IServiceContainer) serviceContainer: IServiceContainer) {
-        super(serviceContainer, azureBlobStorageAccount, LanguageServerPackageStorageContainers.daily);
+        super(serviceContainer, azureBlobStorageAccount, LanguageServerPackageStorageContainers.daily, azureCDNBlobStorageAccount);
     }
 }

src/client/common/nuget/azureBlobStoreNugetRepository.ts

@@ -15,14 +15,15 @@ import { INugetRepository, INugetService, NugetPackage } from './types';
 export class AzureBlobStoreNugetRepository implements INugetRepository {
     constructor(@inject(IServiceContainer) private readonly serviceContainer: IServiceContainer,
         @unmanaged() protected readonly azureBlobStorageAccount: string,
-        @unmanaged() protected readonly azureBlobStorageContainer: string) { }
+        @unmanaged() protected readonly azureBlobStorageContainer: string,
+        @unmanaged() protected readonly azureCDNBlobStorageAccount: string) { }
     public async getPackages(packageName: string): Promise<NugetPackage[]> {
-        return this.listPackages(this.azureBlobStorageAccount, this.azureBlobStorageContainer, packageName);
+        return this.listPackages(this.azureBlobStorageAccount, this.azureBlobStorageContainer, packageName, this.azureCDNBlobStorageAccount);
     }
 
     @captureTelemetry(PYTHON_LANGUAGE_SERVER_LIST_BLOB_STORE_PACKAGES)
     @traceVerbose('Listing Nuget Packages')
-    public listPackages(azureBlobStorageAccount: string, azureBlobStorageContainer: string, packageName: string) {
+    protected listPackages(azureBlobStorageAccount: string, azureBlobStorageContainer: string, packageName: string, azureCDNBlobStorageAccount: string) {
         // tslint:disable-next-line:no-require-imports
         const az = require('azure-storage') as typeof azStorageTypes;
         const blobStore = az.createBlobServiceAnonymous(azureBlobStorageAccount);
@@ -39,7 +40,7 @@ export class AzureBlobStoreNugetRepository implements INugetRepository {
                     resolve(result.entries.map(item => {
                         return {
                             package: item.name,
-                            uri: `${azureBlobStorageAccount}/${azureBlobStorageContainer}/${item.name}`,
+                            uri: `${azureCDNBlobStorageAccount}/${azureBlobStorageContainer}/${item.name}`,
                             version: nugetService.getVersionFromPackageFileName(item.name)
                         };
                     }));

src/test/activation/languageServer/languageServerPackageRepository.unit.test.ts

@@ -35,7 +35,7 @@ suite('Language Server Download Channels', () => {
         }
         const instance = new class extends classToCreate {
             constructor() { super(serviceContainer.object); }
-            public get storageAccount() { return this.azureBlobStorageAccount; }
+            public get storageAccount() { return this.azureCDNBlobStorageAccount; }
             public get storageContainer() { return this.azureBlobStorageContainer; }
         }();
 

src/test/activation/languageServer/languageServerPackageService.test.ts

@@ -21,6 +21,9 @@ import { PlatformService } from '../../../client/common/platform/platformService
 import { IPlatformService } from '../../../client/common/platform/types';
 import { IServiceContainer } from '../../../client/ioc/types';
 
+const azureBlobStorageAccount = 'https://pvsc.blob.core.windows.net';
+const azureCDNBlobStorageAccount = 'https://pvsc.azureedge.net';
+
 suite('Language Server Package Service', () => {
     let serviceContainer: typeMoq.IMock<IServiceContainer>;
     setup(() => {
@@ -76,7 +79,7 @@ suite('Language Server Package Service', () => {
         const platformService = new PlatformService();
         serviceContainer.setup(c => c.get(typeMoq.It.isValue(IPlatformService))).returns(() => platformService);
         const defaultStorageChannel = LanguageServerPackageStorageContainers.stable;
-        const nugetRepo = new AzureBlobStoreNugetRepository(serviceContainer.object, 'https://pvsc.azureedge.net', defaultStorageChannel);
+        const nugetRepo = new AzureBlobStoreNugetRepository(serviceContainer.object, azureBlobStorageAccount, defaultStorageChannel, azureCDNBlobStorageAccount);
         serviceContainer.setup(c => c.get(typeMoq.It.isValue(INugetRepository))).returns(() => nugetRepo);
         const lsPackageService = new LanguageServerPackageService(serviceContainer.object);
         const packageName = lsPackageService.getNugetPackageName();

src/test/common/nuget/azureBobStoreRepository.test.ts

@@ -15,6 +15,9 @@ import { PlatformService } from '../../../client/common/platform/platformService
 import { IPlatformService } from '../../../client/common/platform/types';
 import { IServiceContainer } from '../../../client/ioc/types';
 
+const azureBlobStorageAccount = 'https://pvsc.blob.core.windows.net';
+const azureCDNBlobStorageAccount = 'https://pvsc.azureedge.net';
+
 suite('Nuget Azure Storage Repository', () => {
     let serviceContainer: typeMoq.IMock<IServiceContainer>;
     let httpClient: typeMoq.IMock<IHttpClient>;
@@ -29,7 +32,7 @@ suite('Nuget Azure Storage Repository', () => {
         serviceContainer.setup(c => c.get(typeMoq.It.isValue(INugetService))).returns(() => nugetService.object);
         const defaultStorageChannel = LanguageServerPackageStorageContainers.stable;
 
-        repo = new AzureBlobStoreNugetRepository(serviceContainer.object, 'https://pvsc.azureedge.net', defaultStorageChannel);
+        repo = new AzureBlobStoreNugetRepository(serviceContainer.object, azureBlobStorageAccount, defaultStorageChannel, azureCDNBlobStorageAccount);
     });
 
     test('Get all packages', async function () {