@aws/lsp-codewhisperer 0.0.3 → 0.0.4

package/out/language-server/netTransformServer.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NetTransformServer = exports.NetTransformServerFactory = void 0;
+const codeWhispererService_1 = require("./codeWhispererService");
+/**
+ *
+ * @param createService Inject service instance based on credentials provider.
+ * @returns  NetTransform server
+ */
+const NetTransformServerFactory = createService => ({ credentialsProvider, lsp, workspace, telemetry, logging }) => {
+    const service = createService(credentialsProvider);
+    const onExecuteCommandHandler = async (params, _token) => {
+        //Placeholder for logic
+    };
+    // Do the thing
+    lsp.onExecuteCommand(onExecuteCommandHandler);
+    // Disposable
+    return () => {
+        // Do nothing
+    };
+};
+exports.NetTransformServerFactory = NetTransformServerFactory;
+/**
+ * Default NetTransformServer using Token authentication.
+ */
+exports.NetTransformServer = (0, exports.NetTransformServerFactory)(credentialsProvider => new codeWhispererService_1.CodeWhispererServiceToken(credentialsProvider, {}));
+//# sourceMappingURL=netTransformServer.js.map

package/out/language-server/netTransformServer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"netTransformServer.js","sourceRoot":"","sources":["../../src/language-server/netTransformServer.ts"],"names":[],"mappings":";;;AAMA,iEAAkE;AAElE;;;;GAIG;AACI,MAAM,yBAAyB,GAGlC,aAAa,CAAC,EAAE,CAChB,CAAC,EAAE,mBAAmB,EAAE,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,EAAE;IAC5D,MAAM,OAAO,GAAG,aAAa,CAAC,mBAAmB,CAAC,CAAA;IAClD,MAAM,uBAAuB,GAAG,KAAK,EACjC,MAA4B,EAC5B,MAAyB,EACb,EAAE;QACd,uBAAuB;IAC3B,CAAC,CAAA;IAED,eAAe;IACf,GAAG,CAAC,gBAAgB,CAAC,uBAAuB,CAAC,CAAA;IAE7C,aAAa;IACb,OAAO,GAAG,EAAE;QACR,aAAa;IACjB,CAAC,CAAA;AACL,CAAC,CAAA;AApBQ,QAAA,yBAAyB,6BAoBjC;AAEL;;GAEG;AACU,QAAA,kBAAkB,GAAG,IAAA,iCAAyB,EACvD,mBAAmB,CAAC,EAAE,CAAC,IAAI,gDAAyB,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAChF,CAAA"}

package/out/language-server/proxy-server.d.ts

@@ -1,2 +1,2 @@
-export declare const CodeWhispererServerTokenProxy: import("@aws/language-server-runtimes").Server;
-export declare const CodeWhispererSecurityScanServerTokenProxy: import("@aws/language-server-runtimes").Server;
+export declare const CodeWhispererServerTokenProxy: import("@aws/language-server-runtimes/server-interface").Server;
+export declare const CodeWhispererSecurityScanServerTokenProxy: import("@aws/language-server-runtimes/server-interface").Server;

package/out/language-server/securityScan/securityScanDiagnosticsProvider.d.ts

@@ -0,0 +1,29 @@
+import { Logging, Lsp, Diagnostic, Position, Range, TextDocumentContentChangeEvent } from '@aws/language-server-runtimes/server-interface';
+import { AggregatedCodeScanIssue, CodeScanIssue } from './types';
+declare class SecurityScanDiagnosticsProvider {
+    private diagnostics;
+    private lsp;
+    private logging;
+    private findings;
+    constructor(lsp: Lsp, logging: Logging);
+    resetDiagnostics(): void;
+    createDiagnostics(findings: AggregatedCodeScanIssue[]): Promise<void>;
+    mapScanIssueToDiagnostics(issue: CodeScanIssue): Diagnostic;
+    validateDiagnostics(uri: string, e: TextDocumentContentChangeEvent): Promise<void>;
+    getChangedDiagnosticRange(diagnosticRange: Range, documentChangeRange?: Range): Range;
+    isPositionInRange: (position: Position, range: Range) => boolean;
+    handleHover: () => void;
+    getLineOffset(range: Range, text: string): number;
+    createDiagnosticsRange(startLine: number, endLine: number): {
+        start: {
+            line: number;
+            character: number;
+        };
+        end: {
+            line: number;
+            character: number;
+        };
+    };
+    publishDiagnostics(uri: string, diagnostics: Diagnostic[]): Promise<void>;
+}
+export default SecurityScanDiagnosticsProvider;

package/out/language-server/securityScan/securityScanDiagnosticsProvider.js

@@ -0,0 +1,129 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const server_interface_1 = require("@aws/language-server-runtimes/server-interface");
+const vscode_uri_1 = require("vscode-uri");
+class SecurityScanDiagnosticsProvider {
+    constructor(lsp, logging) {
+        this.isPositionInRange = (position, range) => {
+            if (position.line < range.start.line || position.line > range.end.line) {
+                return false;
+            }
+            return true;
+        };
+        this.handleHover = () => {
+            this.lsp.onHover(({ position, textDocument }) => {
+                for (let [uri, diagnostics] of this.diagnostics) {
+                    if (uri !== vscode_uri_1.URI.parse(textDocument.uri).path) {
+                        continue;
+                    }
+                    for (const diagnostic of diagnostics) {
+                        if (this.isPositionInRange(position, diagnostic.range)) {
+                            const hover = {
+                                contents: diagnostic.message,
+                                range: diagnostic.range,
+                            };
+                            return hover;
+                        }
+                    }
+                }
+            });
+        };
+        this.diagnostics = new Map();
+        this.lsp = lsp;
+        this.logging = logging;
+        this.findings = [];
+    }
+    resetDiagnostics() {
+        this.findings.forEach(finding => {
+            this.logging.log(finding.filePath);
+            this.publishDiagnostics(finding.filePath, []);
+        });
+        this.diagnostics = new Map();
+    }
+    async createDiagnostics(findings) {
+        this.findings = findings;
+        for (const finding of findings) {
+            const path = vscode_uri_1.URI.file(finding.filePath).path;
+            const diagnostics = finding.issues.map(issue => this.mapScanIssueToDiagnostics(issue));
+            if (!this.diagnostics.has(path)) {
+                this.diagnostics.set(path, diagnostics);
+            }
+            this.diagnostics.set(path, [...(this.diagnostics.get(finding.filePath) || []), ...diagnostics]);
+            await this.publishDiagnostics(finding.filePath, diagnostics);
+        }
+    }
+    mapScanIssueToDiagnostics(issue) {
+        return server_interface_1.Diagnostic.create(this.createDiagnosticsRange(issue.startLine, issue.endLine), `${issue.title} - ${issue.description.text}`, 2, issue.relatedVulnerabilities.join(','), 'Detected by CodeWhisperer');
+    }
+    async validateDiagnostics(uri, e) {
+        const path = vscode_uri_1.URI.parse(uri).path;
+        const currentDiagnostics = this.diagnostics.get(path);
+        if (!currentDiagnostics) {
+            return;
+        }
+        // range will be omitted if the change is for entire document
+        const changeStartLine = e.range?.start?.line;
+        const changeEndLine = e.range?.end?.line;
+        const nextDiagnostics = currentDiagnostics.map(diagnostic => {
+            if (changeStartLine && changeStartLine > diagnostic.range.end.line) {
+                // change has no overlap with diagnostic
+                return diagnostic;
+            }
+            else if (changeEndLine && changeEndLine < diagnostic.range.start.line) {
+                // change is before diagnostic range, update diagnostic range
+                const lineOffset = this.getLineOffset(e.range, e.text);
+                return {
+                    ...diagnostic,
+                    range: this.createDiagnosticsRange(diagnostic.range.start.line + lineOffset, diagnostic.range.end.line + lineOffset),
+                };
+            }
+            else {
+                // change is within diagnostic range, update range and messaging to re-scan
+                const newRange = this.getChangedDiagnosticRange(diagnostic.range, e.range);
+                return diagnostic.severity === 2
+                    ? {
+                        ...diagnostic,
+                        severity: 3,
+                        message: `Re-scan to validate the fix: ${diagnostic.message}`,
+                        range: newRange,
+                    }
+                    : diagnostic;
+            }
+        });
+        this.diagnostics.set(path, nextDiagnostics);
+        await this.publishDiagnostics(uri, nextDiagnostics);
+    }
+    getChangedDiagnosticRange(diagnosticRange, documentChangeRange) {
+        if (!documentChangeRange) {
+            return diagnosticRange;
+        }
+        const start = Math.max(diagnosticRange.start.line, documentChangeRange.start.line);
+        const end = Math.min(diagnosticRange.end.line, documentChangeRange.end.line);
+        return this.createDiagnosticsRange(start, end === start ? start + 1 : end);
+    }
+    getLineOffset(range, text) {
+        const originLines = range.end.line - range.start.line + 1;
+        const changedLines = text.split('\n').length;
+        return changedLines - originLines;
+    }
+    createDiagnosticsRange(startLine, endLine) {
+        return {
+            start: {
+                line: startLine,
+                character: 0,
+            },
+            end: {
+                line: endLine,
+                character: 0,
+            },
+        };
+    }
+    async publishDiagnostics(uri, diagnostics) {
+        await this.lsp.publishDiagnostics({
+            uri,
+            diagnostics: diagnostics,
+        });
+    }
+}
+exports.default = SecurityScanDiagnosticsProvider;
+//# sourceMappingURL=securityScanDiagnosticsProvider.js.map

package/out/language-server/securityScan/securityScanDiagnosticsProvider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"securityScanDiagnosticsProvider.js","sourceRoot":"","sources":["../../../src/language-server/securityScan/securityScanDiagnosticsProvider.ts"],"names":[],"mappings":";;AAAA,qFAQuD;AACvD,2CAAgC;AAGhC,MAAM,+BAA+B;IAMjC,YAAY,GAAQ,EAAE,OAAgB;QAuFtC,sBAAiB,GAAG,CAAC,QAAkB,EAAE,KAAY,EAAE,EAAE;YACrD,IAAI,QAAQ,CAAC,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;gBACrE,OAAO,KAAK,CAAA;YAChB,CAAC;YACD,OAAO,IAAI,CAAA;QACf,CAAC,CAAA;QAED,gBAAW,GAAG,GAAG,EAAE;YACf,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,EAAE,QAAQ,EAAE,YAAY,EAAE,EAAE,EAAE;gBAC5C,KAAK,IAAI,CAAC,GAAG,EAAE,WAAW,CAAC,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;oBAC9C,IAAI,GAAG,KAAK,gBAAG,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;wBAC3C,SAAQ;oBACZ,CAAC;oBACD,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;wBACnC,IAAI,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;4BACrD,MAAM,KAAK,GAAU;gCACjB,QAAQ,EAAE,UAAU,CAAC,OAAO;gCAC5B,KAAK,EAAE,UAAU,CAAC,KAAK;6BAC1B,CAAA;4BACD,OAAO,KAAK,CAAA;wBAChB,CAAC;oBACL,CAAC;gBACL,CAAC;YACL,CAAC,CAAC,CAAA;QACN,CAAC,CAAA;QA9GG,IAAI,CAAC,WAAW,GAAG,IAAI,GAAG,EAAE,CAAA;QAC5B,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAA;IACtB,CAAC;IAED,gBAAgB;QACZ,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YAC5B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;YAClC,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;QACjD,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,WAAW,GAAG,IAAI,GAAG,EAAE,CAAA;IAChC,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,QAAmC;QACvD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QACxB,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC7B,MAAM,IAAI,GAAG,gBAAG,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAA;YAC5C,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC,CAAA;YACtF,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC9B,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,WAAW,CAAC,CAAA;YAC3C,CAAC;YACD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,EAAE,GAAG,WAAW,CAAC,CAAC,CAAA;YAC/F,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAA;QAChE,CAAC;IACL,CAAC;IAED,yBAAyB,CAAC,KAAoB;QAC1C,OAAO,6BAAU,CAAC,MAAM,CACpB,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC,EAC3D,GAAG,KAAK,CAAC,KAAK,MAAM,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,EAC5C,CAAC,EACD,KAAK,CAAC,sBAAsB,CAAC,IAAI,CAAC,GAAG,CAAC,EACtC,2BAA2B,CAC9B,CAAA;IACL,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,GAAW,EAAE,CAAiC;QACpE,MAAM,IAAI,GAAG,gBAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAA;QAChC,MAAM,kBAAkB,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACrD,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACtB,OAAM;QACV,CAAC;QACD,6DAA6D;QAC7D,MAAM,eAAe,GAAI,CAAS,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAA;QACrD,MAAM,aAAa,GAAI,CAAS,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAA;QACjD,MAAM,eAAe,GAAiB,kBAAkB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;YACtE,IAAI,eAAe,IAAI,eAAe,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;gBACjE,wCAAwC;gBACxC,OAAO,UAAU,CAAA;YACrB,CAAC;iBAAM,IAAI,aAAa,IAAI,aAAa,GAAG,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;gBACtE,6DAA6D;gBAC7D,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAE,CAAS,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,CAAA;gBAC/D,OAAO;oBACH,GAAG,UAAU;oBACb,KAAK,EAAE,IAAI,CAAC,sBAAsB,CAC9B,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,GAAG,UAAU,EACxC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,GAAG,UAAU,CACzC;iBACJ,CAAA;YACL,CAAC;iBAAM,CAAC;gBACJ,2EAA2E;gBAC3E,MAAM,QAAQ,GAAG,IAAI,CAAC,yBAAyB,CAAC,UAAU,CAAC,KAAK,EAAG,CAAS,CAAC,KAAK,CAAC,CAAA;gBACnF,OAAO,UAAU,CAAC,QAAQ,KAAK,CAAC;oBAC5B,CAAC,CAAC;wBACI,GAAG,UAAU;wBACb,QAAQ,EAAE,CAAC;wBACX,OAAO,EAAE,gCAAgC,UAAU,CAAC,OAAO,EAAE;wBAC7D,KAAK,EAAE,QAAQ;qBAClB;oBACH,CAAC,CAAC,UAAU,CAAA;YACpB,CAAC;QACL,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,eAAe,CAAC,CAAA;QAC3C,MAAM,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,eAAe,CAAC,CAAA;IACvD,CAAC;IAED,yBAAyB,CAAC,eAAsB,EAAE,mBAA2B;QACzE,IAAI,CAAC,mBAAmB,EAAE,CAAC;YACvB,OAAO,eAAe,CAAA;QAC1B,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,EAAE,mBAAmB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAClF,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,EAAE,mBAAmB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QAC5E,OAAO,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,GAAG,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;IAC9E,CAAC;IA4BD,aAAa,CAAC,KAAY,EAAE,IAAY;QACpC,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,CAAA;QACzD,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAA;QAC5C,OAAO,YAAY,GAAG,WAAW,CAAA;IACrC,CAAC;IAED,sBAAsB,CAAC,SAAiB,EAAE,OAAe;QACrD,OAAO;YACH,KAAK,EAAE;gBACH,IAAI,EAAE,SAAS;gBACf,SAAS,EAAE,CAAC;aACf;YACD,GAAG,EAAE;gBACD,IAAI,EAAE,OAAO;gBACb,SAAS,EAAE,CAAC;aACf;SACJ,CAAA;IACL,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,GAAW,EAAE,WAAyB;QAC3D,MAAM,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAAC;YAC9B,GAAG;YACH,WAAW,EAAE,WAAW;SAC3B,CAAC,CAAA;IACN,CAAC;CACJ;AACD,kBAAe,+BAA+B,CAAA"}

package/out/language-server/securityScan/securityScanHandler.d.ts

@@ -1,17 +1,24 @@
 /// <reference types="node" />
-import { Workspace } from '@aws/language-server-runtimes/out/features';
+import { Logging, Workspace, CancellationToken, CancellationTokenSource } from '@aws/language-server-runtimes/server-interface';
 import { ArtifactMap, CreateUploadUrlResponse } from '../../client/token/codewhispererbearertokenclient';
 import { CodeWhispererServiceToken } from '../codeWhispererService';
-import { AggregatedCodeScanIssue, RawCodeScanIssue } from './types';
+import { AggregatedCodeScanIssue } from './types';
 export declare class SecurityScanHandler {
     private client;
     private workspace;
-    constructor(client: CodeWhispererServiceToken, workspace: Workspace);
+    private logging;
+    tokenSource: CancellationTokenSource;
+    constructor(client: CodeWhispererServiceToken, workspace: Workspace, logging: Logging);
     getMd5(content: Buffer): string;
+    throwIfCancelled(token: CancellationToken): void;
+    cancelSecurityScan(): void;
     createCodeResourcePresignedUrlHandler(zipContent: Buffer): Promise<ArtifactMap>;
-    uploadArtifactToS3(zipBuffer: Buffer, resp: CreateUploadUrlResponse): Promise<import("got").Response<string>>;
+    uploadArtifactToS3(zipBuffer: Buffer, resp: CreateUploadUrlResponse): Promise<void>;
     createScanJob(artifactMap: ArtifactMap, languageName: string): Promise<import("aws-sdk/lib/request").PromiseResult<import("../../client/token/codewhispererbearertokenclient").StartCodeAnalysisResponse, import("aws-sdk").AWSError>>;
     pollScanJobStatus(jobId: string): Promise<string>;
     listScanResults(jobId: string, projectPath: string): Promise<AggregatedCodeScanIssue[]>;
-    mapToAggregatedList(codeScanIssueMap: Map<string, RawCodeScanIssue[]>, aggregatedCodeScanIssueList: AggregatedCodeScanIssue[], json: string, projectPath: string): void;
+    mapToAggregatedList(json: string, projectPath: string): Promise<AggregatedCodeScanIssue[]>;
+}
+export declare class SecurityScanCancelledError extends Error {
+    constructor(message?: string);
 }

package/out/language-server/securityScan/securityScanHandler.js

@@ -1,29 +1,53 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SecurityScanHandler = void 0;
+exports.SecurityScanCancelledError = exports.SecurityScanHandler = void 0;
+const server_interface_1 = require("@aws/language-server-runtimes/server-interface");
 const got_1 = require("got");
 const js_md5_1 = require("js-md5");
 const path = require("path");
 const commonUtil_1 = require("../dependencyGraph/commonUtil");
 class SecurityScanHandler {
-    constructor(client, workspace) {
+    constructor(client, workspace, logging) {
         this.client = client;
         this.workspace = workspace;
+        this.logging = logging;
+        this.tokenSource = new server_interface_1.CancellationTokenSource();
     }
     getMd5(content) {
         return js_md5_1.md5.base64(content);
     }
+    throwIfCancelled(token) {
+        if (token.isCancellationRequested) {
+            this.tokenSource.dispose();
+            this.tokenSource = new server_interface_1.CancellationTokenSource();
+            throw new SecurityScanCancelledError('Security Scan has been cancelled');
+        }
+    }
+    cancelSecurityScan() {
+        this.tokenSource.cancel();
+    }
     async createCodeResourcePresignedUrlHandler(zipContent) {
         const request = {
             contentMd5: this.getMd5(zipContent),
             artifactType: 'SourceCode',
         };
-        const response = await this.client.createUploadUrl(request);
-        await this.uploadArtifactToS3(zipContent, response);
-        const artifactMap = {
-            SourceCode: response.uploadId,
-        };
-        return artifactMap;
+        try {
+            this.logging.log('Prepare for uploading src context...');
+            const response = await this.client.createUploadUrl(request);
+            this.logging.log(`Request id: ${response.$response.requestId}`);
+            this.logging.log(`Complete Getting presigned Url for uploading src context.`);
+            this.logging.log(`Uploading src context...`);
+            await this.uploadArtifactToS3(zipContent, response);
+            this.logging.log(`Complete uploading src context.`);
+            const artifactMap = {
+                SourceCode: response.uploadId,
+            };
+            return artifactMap;
+        }
+        catch (error) {
+            this.logging.log(`Error creating upload artifacts url: ${error}`);
+            throw error;
+        }
     }
     async uploadArtifactToS3(zipBuffer, resp) {
         const encryptionContext = `{"uploadId":"${resp.uploadId}"}`;
@@ -42,8 +66,11 @@ class SecurityScanHandler {
                 'Content-Type': 'application/zip',
                 'x-amz-server-side-encryption-context': Buffer.from(encryptionContext, 'utf8').toString('base64'),
             };
-        const response = await got_1.default.put(resp.uploadUrl, { body: zipBuffer, headers: headersObj });
-        return response;
+        const response = await got_1.default.put(resp.uploadUrl, {
+            body: zipBuffer,
+            headers: headersObj,
+        });
+        this.logging.log(`StatusCode: ${response.statusCode}`);
     }
     async createScanJob(artifactMap, languageName) {
         const req = {
@@ -52,10 +79,19 @@ class SecurityScanHandler {
                 languageName,
             },
         };
-        const resp = await this.client.startCodeAnalysis(req);
-        return resp;
+        this.logging.log(`Creating scan job...`);
+        try {
+            const resp = await this.client.startCodeAnalysis(req);
+            this.logging.log(`Request id: ${resp.$response.requestId}`);
+            return resp;
+        }
+        catch (error) {
+            this.logging.log(`Error while creating scan job: ${error}`);
+            throw error;
+        }
     }
     async pollScanJobStatus(jobId) {
+        this.logging.log(`Polling scan job status...`);
         let status = 'Pending';
         let timer = 0;
         const codeScanJobPollingIntervalSeconds = 1;
@@ -66,30 +102,36 @@ class SecurityScanHandler {
                 jobId: jobId,
             };
             const resp = await this.client.getCodeAnalysis(req);
+            this.logging.log(`Request id: ${resp.$response.requestId}`);
             if (resp.status !== 'Pending') {
                 status = resp.status;
+                this.logging.log(`Scan job status: ${status}`);
+                this.logging.log(`Complete Polling scan job status.`);
                 break;
             }
             await (0, commonUtil_1.sleep)(codeScanJobPollingIntervalSeconds * 1000);
             timer += codeScanJobPollingIntervalSeconds;
             if (timer > codeScanJobTimeoutSeconds) {
+                this.logging.log(`Scan job status: ${status}`);
+                this.logging.log(`Scan job timeout.`);
                 throw new Error('Scan job timeout.');
             }
         }
         return status;
     }
     async listScanResults(jobId, projectPath) {
-        const codeScanIssueMap = new Map();
-        const aggregatedCodeScanIssueList = [];
         const request = {
             jobId,
             codeAnalysisFindingsSchema: 'codeanalysis/findings/1.0',
         };
         const response = await this.client.listCodeAnalysisFindings(request);
-        this.mapToAggregatedList(codeScanIssueMap, aggregatedCodeScanIssueList, response.codeAnalysisFindings, projectPath);
+        this.logging.log(`Request id: ${response.$response.requestId}`);
+        const aggregatedCodeScanIssueList = await this.mapToAggregatedList(response.codeAnalysisFindings, projectPath);
         return aggregatedCodeScanIssueList;
     }
-    mapToAggregatedList(codeScanIssueMap, aggregatedCodeScanIssueList, json, projectPath) {
+    async mapToAggregatedList(json, projectPath) {
+        const codeScanIssueMap = new Map();
+        const aggregatedCodeScanIssueList = [];
         const codeScanIssues = JSON.parse(json);
         codeScanIssues.forEach(issue => {
             if (codeScanIssueMap.has(issue.filePath)) {
@@ -106,8 +148,8 @@ class SecurityScanHandler {
                 codeScanIssueMap.set(issue.filePath, [issue]);
             }
         });
-        codeScanIssueMap.forEach(async (issues, key) => {
-            const filePath = path.join(projectPath, '..', key);
+        for (const [relFilePath, issues] of codeScanIssueMap) {
+            const filePath = path.join(projectPath, relFilePath);
             const fileExists = await this.workspace.fs.exists(filePath);
             if (fileExists) {
                 const aggregatedCodeScanIssue = {
@@ -132,8 +174,16 @@ class SecurityScanHandler {
                 };
                 aggregatedCodeScanIssueList.push(aggregatedCodeScanIssue);
             }
-        });
+        }
+        return aggregatedCodeScanIssueList;
     }
 }
 exports.SecurityScanHandler = SecurityScanHandler;
+class SecurityScanCancelledError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = 'SecurityScanCancelledError';
+    }
+}
+exports.SecurityScanCancelledError = SecurityScanCancelledError;
 //# sourceMappingURL=securityScanHandler.js.map

package/out/language-server/securityScan/securityScanHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"securityScanHandler.js","sourceRoot":"","sources":["../../../src/language-server/securityScan/securityScanHandler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"securityScanHandler.js","sourceRoot":"","sources":["../../../src/language-server/securityScan/securityScanHandler.ts"],"names":[],"mappings":"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"}

package/out/language-server/securityScan/securityScanHandler.test.js

@@ -46,11 +46,12 @@ describe('securityScanHandler', () => {
     let client;
     let workspace;
     let securityScanhandler;
+    const mockedLogging = (0, ts_sinon_1.stubInterface)();
     beforeEach(async () => {
         // Set up the server with a mock service
         client = (0, ts_sinon_1.stubInterface)();
         workspace = (0, ts_sinon_1.stubInterface)();
-        securityScanhandler = new securityScanHandler_1.SecurityScanHandler(client, workspace);
+        securityScanhandler = new securityScanHandler_1.SecurityScanHandler(client, workspace, mockedLogging);
     });
     describe('Test createCodeResourcePresignedUrlHandler', () => {
         let putStub;
@@ -62,7 +63,7 @@ describe('securityScanHandler', () => {
                 kmsKeyArn: 'ResourceArn',
                 ...mocked$Response,
             });
-            putStub = Sinon.stub(got_1.default, 'put');
+            putStub = Sinon.stub(got_1.default, 'put').resolves({ statusCode: 'Success' });
         });
         it('returns correct source code', async () => {
             const expectedSourceCode = 'dummy-upload-id';

package/out/language-server/securityScan/securityScanHandler.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"securityScanHandler.test.js","sourceRoot":"","sources":["../../../src/language-server/securityScan/securityScanHandler.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"securityScanHandler.test.js","sourceRoot":"","sources":["../../../src/language-server/securityScan/securityScanHandler.test.ts"],"names":[],"mappings":"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"}

package/out/language-server/securityScan/types.d.ts

@@ -1,3 +1,4 @@
+import { ExecuteCommandParams } from '@aws/language-server-runtimes/server-interface';
 export interface RecommendationDescription {
     text: string;
     markdown: string;
@@ -47,3 +48,15 @@ export interface AggregatedCodeScanIssue {
     filePath: string;
     issues: CodeScanIssue[];
 }
+export type SecurityScanStatus = 'Succeeded' | 'Failed' | 'InProgress' | 'Cancelled';
+export interface SecurityScanRequestParams extends ExecuteCommandParams {
+    command: 'aws/codewhisperer/runSecurityScan';
+}
+export interface SecurityScanResponseParams {
+    result: SecurityScanResult;
+    error?: string;
+}
+export interface SecurityScanResult {
+    status: SecurityScanStatus;
+    scannedFiles?: string;
+}

package/out/language-server/session/sessionManager.d.ts

@@ -1,5 +1,4 @@
-import { InlineCompletionStates } from '@aws/language-server-runtimes/out/features/lsp/inline-completions/protocolExtensions';
-import { Position } from 'vscode-languageserver';
+import { InlineCompletionStates, Position } from '@aws/language-server-runtimes/server-interface';
 import { CodewhispererAutomatedTriggerType, CodewhispererTriggerType } from '../auto-trigger/autoTrigger';
 import { GenerateSuggestionsRequest, ResponseContext, Suggestion } from '../codeWhispererService';
 import { CodewhispererLanguage } from '../languageDetection';

package/out/language-server/session/sessionManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"sessionManager.js","sourceRoot":"","sources":["../../../src/language-server/session/sessionManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sessionManager.js","sourceRoot":"","sources":["../../../src/language-server/session/sessionManager.ts"],"names":[],"mappings":"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"}

package/out/language-server/telemetry/codePercentage.d.ts

@@ -1,4 +1,4 @@
-import { Telemetry } from '@aws/language-server-runtimes/out/features';
+import { Telemetry } from '@aws/language-server-runtimes/server-interface';
 export declare class CodePercentageTracker {
     private buckets;
     private intervalId;

package/out/language-server/telemetry/types.d.ts

@@ -66,3 +66,23 @@ export interface CodeWhispererUserDecisionEvent {
     codewhispererSuggestionReferences?: string[];
     codewhispererSuggestionReferenceCount: number;
 }
+export type Result = 'Succeeded' | 'Failed' | 'Cancelled';
+export interface SecurityScanEvent {
+    codewhispererCodeScanJobId?: string;
+    codewhispererLanguage: CodewhispererLanguage;
+    codewhispererCodeScanProjectBytes?: number;
+    codewhispererCodeScanSrcPayloadBytes: number;
+    codewhispererCodeScanBuildPayloadBytes?: number;
+    codewhispererCodeScanSrcZipFileBytes: number;
+    codewhispererCodeScanBuildZipFileBytes?: number;
+    codewhispererCodeScanLines: number;
+    duration: number;
+    contextTruncationDuration: number;
+    artifactsUploadDuration: number;
+    codeScanServiceInvocationsDuration: number;
+    result: Result;
+    reason?: string;
+    codewhispererCodeScanTotalIssues: number;
+    codewhispererCodeScanIssuesWithFixes: number;
+    credentialStartUrl: string | undefined;
+}

package/out/language-server/telemetry/userTriggerDecision.test.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const testing_1 = require("@aws/language-server-runtimes/out/testing");
+const server_interface_1 = require("@aws/language-server-runtimes/server-interface");
+const testing_1 = require("@aws/language-server-runtimes/testing");
 const assert = require("assert");
 const ts_sinon_1 = require("ts-sinon");
-const vscode_languageserver_1 = require("vscode-languageserver");
 const vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
 const codeWhispererServer_1 = require("../codeWhispererServer");
 const sessionManager_1 = require("../session/sessionManager");
@@ -127,13 +127,13 @@ describe('Telemetry', () => {
         const autoTriggerInlineCompletionWithReferences = async () => await features.doInlineCompletionWithReferences({
             textDocument: { uri: SOME_FILE.uri },
             position: AUTO_TRIGGER_POSITION,
-            context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Automatic },
-        }, vscode_languageserver_1.CancellationToken.None);
+            context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Automatic },
+        }, server_interface_1.CancellationToken.None);
         const manualTriggerInlineCompletionWithReferences = async () => await features.doInlineCompletionWithReferences({
             textDocument: { uri: SOME_FILE.uri },
             position: { line: 0, character: 0 },
-            context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Invoked },
-        }, vscode_languageserver_1.CancellationToken.None);
+            context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Invoked },
+        }, server_interface_1.CancellationToken.None);
         beforeEach(async () => {
             // Set up the server with a mock service, returning predefined recommendations
             service = (0, ts_sinon_1.stubInterface)();
@@ -749,8 +749,8 @@ describe('Telemetry', () => {
         const autoTriggerInlineCompletionWithReferences = async () => await features.doInlineCompletionWithReferences({
             textDocument: { uri: SOME_FILE.uri },
             position: AUTO_TRIGGER_POSITION,
-            context: { triggerKind: vscode_languageserver_1.InlineCompletionTriggerKind.Automatic },
-        }, vscode_languageserver_1.CancellationToken.None);
+            context: { triggerKind: server_interface_1.InlineCompletionTriggerKind.Automatic },
+        }, server_interface_1.CancellationToken.None);
         beforeEach(async () => {
             // Set up the server with a mock service, returning predefined recommendations
             service = (0, ts_sinon_1.stubInterface)();