remove AdmZip work

Author: Hweinstock

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

@@ -11,8 +11,7 @@ import { prepareRepoData, TelemetryHelper } from '../../amazonqFeatureDev'
 import { AmazonqCreateUpload, fs, getRandomString } from '../../shared'
 import { Span } from '../../shared/telemetry'
 import { FileSystem } from '../../shared/fs/fs'
-import AdmZip from 'adm-zip'
-import { assertEfficientAdmZip, getFsCallsUpperBound } from './utilities'
+import { getFsCallsUpperBound } from './utilities'
 
 type resultType = {
     zipFileBuffer: Buffer
@@ -21,9 +20,7 @@ type resultType = {
 
 type setupResult = {
     workspace: WorkspaceFolder
-    initialZip: AdmZip
     fsSpy: sinon.SinonSpiedInstance<FileSystem>
-    zipSpy: sinon.SinonSpiedInstance<AdmZip>
     numFiles: number
     fileSize: number
 }
@@ -53,26 +50,18 @@ function performanceTestWrapper(numFiles: number, fileSize: number) {
             const telemetry = new TelemetryHelper()
             return {
                 setup: async () => {
-                    const initialZip = new AdmZip()
                     const fsSpy = sinon.spy(fs)
-                    const zipSpy = sinon.spy(initialZip)
                     const workspace = await createTestWorkspace(numFiles, {
                         fileNamePrefix: 'file',
                         fileContent: getRandomString(fileSize),
                         fileNameSuffix: '.md',
                     })
-                    return { workspace, initialZip, fsSpy, zipSpy, numFiles, fileSize }
+                    return { workspace, fsSpy, numFiles, fileSize }
                 },
                 execute: async (setup: setupResult) => {
-                    return await prepareRepoData(
-                        [setup.workspace.uri.fsPath],
-                        [setup.workspace],
-                        telemetry,
-                        {
-                            record: () => {},
-                        } as unknown as Span<AmazonqCreateUpload>,
-                        setup.initialZip
-                    )
+                    return await prepareRepoData([setup.workspace.uri.fsPath], [setup.workspace], telemetry, {
+                        record: () => {},
+                    } as unknown as Span<AmazonqCreateUpload>)
                 },
                 verify: async (setup: setupResult, result: resultType) => {
                     verifyResult(setup, result, telemetry, numFiles * fileSize)
@@ -89,7 +78,6 @@ function verifyResult(setup: setupResult, result: resultType, telemetry: Telemet
     assert.strictEqual(result.zipFileChecksum.length, 44)
 
     assert.ok(getFsCallsUpperBound(setup.fsSpy) <= setup.numFiles * 4, 'total system calls should be under 4 per file')
-    assertEfficientAdmZip(setup.zipSpy, setup.numFiles)
 }
 
 describe('prepareRepoData', function () {

packages/core/src/testInteg/perf/utilities.ts

@@ -2,10 +2,8 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import assert from 'assert'
 import * as sinon from 'sinon'
 import { FileSystem } from '../../shared/fs/fs'
-import AdmZip from 'adm-zip'
 
 /**
  * Provide an upper bound on total number of system calls done through our fs module.
@@ -49,20 +47,3 @@ export function getFsWritesUpperBound(fsSpy: sinon.SinonSpiedInstance<FileSystem
         fsSpy.copy.callCount
     )
 }
-/**
- * Check that each file is added to zip at most (factor * numFiles + offset) times, and written to buffer done exactly once.
- * @param zipSpy spied AdmZip instance used by code.
- * @param numFiles number of files in the workspace expected to be zipped.
- */
-export function assertEfficientAdmZip(
-    zipSpy: sinon.SinonSpiedInstance<AdmZip>,
-    numFiles: number,
-    factor: number = 1,
-    offset: number = 0
-): void | never {
-    assert.ok(
-        zipSpy.addLocalFile.callCount <= factor * numFiles + offset,
-        'add files to zip at factor*numFiles + offset times'
-    )
-    assert.strictEqual(zipSpy.toBuffer.callCount, 1, 'creates buffer once')
-}

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

@@ -12,15 +12,13 @@ import { performanceTest } from '../../shared/performance/performance'
 import { zipCode } from '../../codewhisperer/indexNode'
 import { FileSystem } from '../../shared/fs/fs'
 import AdmZip from 'adm-zip'
-import { assertEfficientAdmZip, getFsCallsUpperBound } from './utilities'
+import { getFsCallsUpperBound } from './utilities'
 
 interface SetupResult {
     tempDir: string
     tempFileName: string
     transformQManifest: ZipManifest
     fsSpy: sinon.SinonSpiedInstance<FileSystem>
-    zipSpy: sinon.SinonSpiedInstance<AdmZip>
-    zip: AdmZip
 }
 
 async function setup(numberOfFiles: number, fileSize: number): Promise<SetupResult> {
@@ -34,12 +32,10 @@ async function setup(numberOfFiles: number, fileSize: number): Promise<SetupResu
         })
     ).uri.fsPath
     const fsSpy = sinon.spy(fs)
-    const zip = new AdmZip()
-    const zipSpy = sinon.spy(zip)
     const transformQManifest = new ZipManifest()
     transformByQState.setProjectPath(tempDir)
     transformQManifest.customBuildCommand = CodeWhispererConstants.skipUnitTestsBuildCommand
-    return { tempDir, tempFileName, transformQManifest, fsSpy, zipSpy, zip }
+    return { tempDir, tempFileName, transformQManifest, fsSpy }
 }
 
 function performanceTestWrapper(numberOfFiles: number, fileSize: number) {
@@ -67,18 +63,15 @@ function performanceTestWrapper(numberOfFiles: number, fileSize: number) {
             return {
                 setup: async () => await setup(numberOfFiles, fileSize),
                 execute: async (setup: SetupResult) => {
-                    await zipCode(
-                        {
-                            dependenciesFolder: {
-                                path: setup.tempDir,
-                                name: setup.tempFileName,
-                            },
-                            humanInTheLoopFlag: false,
-                            modulePath: setup.tempDir,
-                            zipManifest: setup.transformQManifest,
+                    await zipCode({
+                        dependenciesFolder: {
+                            path: setup.tempDir,
+                            name: setup.tempFileName,
                         },
-                        setup.zip
-                    )
+                        humanInTheLoopFlag: false,
+                        modulePath: setup.tempDir,
+                        zipManifest: setup.transformQManifest,
+                    })
                 },
                 verify: async (setup: SetupResult) => {
                     assert.ok(
@@ -88,7 +81,6 @@ function performanceTestWrapper(numberOfFiles: number, fileSize: number) {
                     )
 
                     assert.ok(getFsCallsUpperBound(setup.fsSpy) <= 15)
-                    assertEfficientAdmZip(setup.zipSpy, numberOfFiles, 2, 1)
                 },
             }
         }