tests

Author: jpinkney-aws

packages/amazonq/test/e2e/lsp/lspInstallerUtil.ts

@@ -14,6 +14,7 @@ import {
     ManifestResolver,
     request,
     TargetContent,
+    ToolkitError,
 } from 'aws-core-vscode/shared'
 import * as semver from 'semver'
 import { assertTelemetry } from 'aws-core-vscode/test'
@@ -201,12 +202,6 @@ export function createLspInstallerTests({
                         id: lspConfig.id,
                         manifestLocation: 'remote',
                         languageServerSetupStage: 'getManifest',
-                        result: 'Failed',
-                    },
-                    {
-                        id: lspConfig.id,
-                        manifestLocation: 'cache',
-                        languageServerSetupStage: 'getManifest',
                         result: 'Succeeded',
                     },
                     {
@@ -282,6 +277,58 @@ export function createLspInstallerTests({
                 const download = await createInstaller(lspConfig).resolve()
                 assert.ok(download.assetDirectory.endsWith('-rc.0'))
             })
+
+            it('throws on firewall error', async () => {
+                // Stub the manifest resolver to return a valid manifest
+                sandbox.stub(ManifestResolver.prototype, 'resolve').resolves({
+                    manifestSchemaVersion: '0.0.0',
+                    artifactId: 'foo',
+                    artifactDescription: 'foo',
+                    isManifestDeprecated: false,
+                    versions: [createVersion('1.0.0', targetContents)],
+                })
+
+                // Fail all HTTP requests for the language server
+                sandbox.stub(request, 'fetch').returns({
+                    response: Promise.resolve({
+                        ok: false,
+                    }),
+                } as any)
+
+                // This should now throw a NetworkConnectivityError
+                await assert.rejects(
+                    async () => await installer.resolve(),
+                    (err: ToolkitError) => {
+                        assert.strictEqual(err.code, 'NetworkConnectivityError')
+                        assert.ok(err.message.includes('Unable to download dependencies'))
+                        return true
+                    }
+                )
+
+                // Verify telemetry for the failed attempts
+                // const expectedTelemetry: Partial<LanguageServerSetup>[] = [
+                //     {
+                //         id: lspConfig.id,
+                //         manifestLocation: 'remote',
+                //         languageServerSetupStage: 'getManifest',
+                //         result: 'Failed',
+                //     },
+                //     {
+                //         id: lspConfig.id,
+                //         languageServerLocation: 'cache',
+                //         languageServerSetupStage: 'getServer',
+                //         result: 'Failed',
+                //     },
+                //     {
+                //         id: lspConfig.id,
+                //         languageServerLocation: 'remote',
+                //         languageServerSetupStage: 'getServer',
+                //         result: 'Failed',
+                //     },
+                // ]
+
+                // assertTelemetry('languageServer_setup', expectedTelemetry)
+            })
         })
     })
 }

packages/core/src/shared/lsp/manifestResolver.ts

@@ -69,7 +69,6 @@ export class ManifestResolver {
 
             const localManifest = await this.getLocalManifest(true).catch(() => undefined)
             if (localManifest) {
-                localManifest.location = 'remote'
                 return localManifest
             } else {
                 // Will emit a `languageServer_setup` result=failed metric...