fix: convert makeProxyConfig to sync to allow proxy configs to be loa… (

#725) * fix: convert makeProxyConfig to sync to allow proxy configs to be loaded before use * fix: remove toString() as return type changed to string now --------- Co-authored-by: Paras <pmiparas@amazon.com>
aws · Jan 16, 2025 · 7ea8150 · 7ea8150
1 parent 73048a7
commit 7ea8150
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/server/aws-lsp-codewhisperer/src/language-server/codeWhispererService.ts b/server/aws-lsp-codewhisperer/src/language-server/codeWhispererService.ts
@@ -59,9 +59,7 @@ export abstract class CodeWhispererServiceBase {
     abstract generateSuggestions(request: GenerateSuggestionsRequest): Promise<GenerateSuggestionsResponse>
 
     constructor(workspace: Workspace, codeWhispererRegion: string, codeWhispererEndpoint: string) {
-        ;(async () => {
-            this.proxyConfig = await makeProxyConfig(workspace)
-        })()
+        this.proxyConfig = makeProxyConfig(workspace)
         this.codeWhispererRegion = codeWhispererRegion
         this.codeWhispererEndpoint = codeWhispererEndpoint
     }

diff --git a/server/aws-lsp-codewhisperer/src/language-server/utils.ts b/server/aws-lsp-codewhisperer/src/language-server/utils.ts
@@ -131,7 +131,7 @@ export function getEndPositionForAcceptedSuggestion(content: string, startPositi
     return endPosition
 }
 
-export const makeProxyConfig = async (workspace: Workspace) => {
+export const makeProxyConfig = (workspace: Workspace) => {
     let additionalAwsConfig: ConfigurationOptions = {}
     // short term solution to fix webworker bundling, broken due to this node.js specific logic in here
     const isNodeJS: boolean = typeof process !== 'undefined' && process.release && process.release.name === 'node'
@@ -140,7 +140,7 @@ export const makeProxyConfig = async (workspace: Workspace) => {
     if (proxyUrl) {
         const certs = isNodeJS
             ? process.env.AWS_CA_BUNDLE
-                ? [await workspace.fs.readFile(process.env.AWS_CA_BUNDLE)]
+                ? [workspace.fs.readFileSync(process.env.AWS_CA_BUNDLE)]
                 : undefined
             : undefined
         const agent = new HttpsProxyAgent({