refactor: add prefix to constructor

Author: Hweinstock

packages/core/src/codewhisperer/commands/startSecurityScan.ts

@@ -35,7 +35,7 @@ import { telemetry } from '../../shared/telemetry/telemetry'
 import { ToolkitError, getTelemetryReasonDesc, isAwsError } from '../../shared/errors'
 import { AuthUtil } from '../util/authUtil'
 import path from 'path'
-import { getPrefixFromUseCase, ZipMetadata, ZipUtil } from '../util/zipUtil'
+import { ZipMetadata, ZipUtil } from '../util/zipUtil'
 import { debounce } from 'lodash'
 import { once } from '../../shared/utilities/functionUtils'
 import { randomUUID } from '../../shared/crypto'
@@ -106,7 +106,7 @@ export async function startSecurityScan(
     context: vscode.ExtensionContext,
     scope: CodeWhispererConstants.CodeAnalysisScope,
     initiatedByChat: boolean,
-    zipUtil: ZipUtil = new ZipUtil(getPrefixFromUseCase(CodeWhispererConstants.FeatureUseCase.CODE_SCAN)),
+    zipUtil: ZipUtil = new ZipUtil(CodeWhispererConstants.codeScanTruncDirPrefix),
     scanUuid?: string
 ) {
     const logger = getLoggerForScope(scope)

packages/core/src/codewhisperer/commands/startTestGeneration.ts

@@ -4,7 +4,7 @@
  */
 
 import { getLogger } from '../../shared/logger/logger'
-import { getPrefixFromUseCase, ZipUtil } from '../util/zipUtil'
+import { ZipUtil } from '../util/zipUtil'
 import { ArtifactMap } from '../client/codewhisperer'
 import { testGenerationLogsDir } from '../../shared/filesystemUtilities'
 import {
@@ -22,7 +22,7 @@ import { BuildStatus } from '../../amazonqTest/chat/session/session'
 import { fs } from '../../shared/fs/fs'
 import { Range } from '../client/codewhispereruserclient'
 import { getWorkspaceForFile } from '../../shared/utilities/workspaceUtils'
-import { FeatureUseCase } from '../indexNode'
+import * as CodeWhispererConstants from '../models/constants'
 
 // eslint-disable-next-line unicorn/no-null
 let spawnResult: ChildProcess | null = null
@@ -48,7 +48,7 @@ export async function startTestGenerationProcess(
          * Step 1: Zip the project
          */
 
-        const zipUtil = new ZipUtil(getPrefixFromUseCase(FeatureUseCase.TEST_GENERATION))
+        const zipUtil = new ZipUtil(CodeWhispererConstants.TestGenerationTruncDirPrefix)
         if (initialExecution) {
             const projectPath = getWorkspaceForFile(filePath) ?? ''
             const relativeTargetPath = path.relative(projectPath, filePath)

packages/core/src/codewhisperer/util/zipUtil.ts

@@ -457,12 +457,6 @@ interface GitDiffOptions {
     scope?: CodeWhispererConstants.CodeAnalysisScope
 }
 
-export function getPrefixFromUseCase(useCase: FeatureUseCase) {
-    return useCase === FeatureUseCase.TEST_GENERATION
-        ? CodeWhispererConstants.TestGenerationTruncDirPrefix
-        : CodeWhispererConstants.codeScanTruncDirPrefix
-}
-
 async function getGitDiffContentForProjects(
     projectPaths: string[],
     filepath?: string,

packages/core/src/test/codewhisperer/zipUtil.test.ts

@@ -10,8 +10,8 @@ import { join } from 'path'
 import path from 'path'
 import JSZip from 'jszip'
 import { getTestWorkspaceFolder } from '../../testInteg/integrationTestsUtilities'
-import { getPrefixFromUseCase, ZipUtil } from '../../codewhisperer/util/zipUtil'
-import { CodeAnalysisScope, codeScanTruncDirPrefix, FeatureUseCase } from '../../codewhisperer/models/constants'
+import { ZipUtil } from '../../codewhisperer/util/zipUtil'
+import { CodeAnalysisScope, codeScanTruncDirPrefix } from '../../codewhisperer/models/constants'
 import { ToolkitError } from '../../shared/errors'
 import { fs } from '../../shared/fs/fs'
 import { tempDirPath } from '../../shared/filesystemUtilities'
@@ -61,7 +61,7 @@ describe('zipUtil', function () {
     describe('generateZip', function () {
         let zipUtil: ZipUtil
         beforeEach(function () {
-            zipUtil = new ZipUtil(getPrefixFromUseCase(FeatureUseCase.CODE_SCAN))
+            zipUtil = new ZipUtil(CodeWhispererConstants.codeScanTruncDirPrefix)
         })
         afterEach(function () {
             sinon.restore()
@@ -132,7 +132,7 @@ describe('zipUtil', function () {
                 editBuilder.insert(new vscode.Position(0, 0), '// a comment\n')
             })
 
-            const zipMetadata2 = await new ZipUtil(getPrefixFromUseCase(FeatureUseCase.CODE_SCAN)).generateZip(
+            const zipMetadata2 = await new ZipUtil(CodeWhispererConstants.codeScanTruncDirPrefix).generateZip(
                 vscode.Uri.file(appCodePath),
                 CodeAnalysisScope.PROJECT
             )
@@ -170,7 +170,7 @@ describe('zipUtil', function () {
         let testTempDirPath: string
 
         beforeEach(function () {
-            zipUtil = new ZipUtil(getPrefixFromUseCase(FeatureUseCase.TEST_GENERATION))
+            zipUtil = new ZipUtil(CodeWhispererConstants.TestGenerationTruncDirPrefix)
             testTempDirPath = path.join(tempDirPath, CodeWhispererConstants.TestGenerationTruncDirPrefix)
             getZipDirPathStub = sinon.stub(zipUtil, 'getZipDirPath')
             getZipDirPathStub.callsFake(() => testTempDirPath)

packages/core/src/testE2E/codewhisperer/securityScan.test.ts

@@ -21,7 +21,7 @@ import {
 } from '../../codewhisperer/service/securityScanHandler'
 import { makeTemporaryToolkitFolder } from '../../shared/filesystemUtilities'
 import fs from '../../shared/fs/fs'
-import { getPrefixFromUseCase, ZipUtil } from '../../codewhisperer/util/zipUtil'
+import { ZipUtil } from '../../codewhisperer/util/zipUtil'
 import { randomUUID } from '../../shared/crypto'
 import { getWorkspacePaths } from '../../shared/utilities/workspaceUtils'
 
@@ -90,7 +90,7 @@ describe('CodeWhisperer security scan', async function () {
     */
     async function securityJobSetup(editor: vscode.TextEditor) {
         const codeScanStartTime = performance.now()
-        const zipUtil = new ZipUtil(getPrefixFromUseCase(CodeWhispererConstants.FeatureUseCase.CODE_SCAN))
+        const zipUtil = new ZipUtil(CodeWhispererConstants.codeScanTruncDirPrefix)
         const uri = editor.document.uri
 
         const projectPaths = getWorkspacePaths()

packages/core/src/testInteg/perf/startSecurityScan.test.ts

@@ -21,7 +21,7 @@ import {
 } from '../../test/testUtil'
 import { getTestWindow } from '../../test/shared/vscode/window'
 import { SeverityLevel } from '../../test/shared/vscode/message'
-import { CodeAnalysisScope, CodeWhispererConstants, getPrefixFromUseCase, ZipUtil } from '../../codewhisperer'
+import { CodeAnalysisScope, CodeWhispererConstants, ZipUtil } from '../../codewhisperer'
 import { getEqualOSTestOptions, performanceTest } from '../../shared/performance/performance'
 import { createClient } from '../../test/codewhisperer/testUtil'
 import { fs } from '../../shared'
@@ -81,7 +81,7 @@ describe('startSecurityScanPerformanceTest', function () {
                     getFetchStubWithResponse({ status: 200, statusText: 'testing stub' })
                     const commandSpy = sinon.spy(vscode.commands, 'executeCommand')
                     const securityScanRenderSpy = sinon.spy(diagnosticsProvider, 'initSecurityScanRender')
-                    const zipUtil = new ZipUtil(getPrefixFromUseCase(CodeWhispererConstants.FeatureUseCase.CODE_SCAN))
+                    const zipUtil = new ZipUtil(CodeWhispererConstants.codeScanTruncDirPrefix)
                     const zipSpy = sinon.spy(zipUtil)
                     const fsSpy = sinon.spy(fs)
                     await model.CodeScansState.instance.setScansEnabled(true)