enhanced k8 copyFrom and its testCase

Signed-off-by: Jeromy Cannon <[email protected]>

Author: jeromy-cannon

src/core/k8.mjs

@@ -567,12 +567,14 @@ export class K8 {
       const destPath = path.join(destDir, srcFile)
 
       // download the tar file to a temp location
-      const tmpFile = `${this._tempFileFor(srcFile)}.tar`
+      // const tmpFile = `${this._tempFileFor(srcFile)}.tar`
+      const tmpFile = this._tempFileFor(srcFile)
 
       const self = this
       return new Promise((resolve, reject) => {
         const execInstance = new k8s.Exec(this.kubeConfig)
-        const command = ['tar', 'cf', '-', '-C', srcDir, srcFile]
+        // const command = ['tar', '-cf', '-', '-C', srcDir, srcFile]
+        const command = ['cat', `${srcDir}/${srcFile}`]
         const outputFileStream = fs.createWriteStream(tmpFile)
         const outputPassthroughStream = new stream.PassThrough({ highWaterMark: 10 * 1024 * 1024 })
         const errStream = new stream.PassThrough()
@@ -605,7 +607,7 @@ export class K8 {
           errStream,
           null,
           false,
-          async ({ status }) => {
+          ({ status }) => {
             if (status === 'Failure') {
               self._deleteTempFile(tmpFile)
               const errorMessage = `tar command failed with status Failure while copying from ${podName}:${srcDir}/${srcFile} to ${destPath}`
@@ -630,48 +632,50 @@ export class K8 {
               }
 
               outputFileStream.end()
-              let rejection
               outputFileStream.close(() => {
                 this.logger.debug(`finished closing writerStream copying from ${podName}:${srcDir}/${srcFile} to ${destPath}`)
 
                 try {
+                  fs.copyFileSync(tmpFile, destPath)
                   // extract the downloaded file
-                  tar.x({
-                    file: tmpFile,
-                    cwd: destDir
-                  }).then(() => {
-                    self._deleteTempFile(tmpFile)
-
-                    const stat = fs.statSync(destPath)
-                    if (stat && stat.size === srcFileSize) {
-                      this.logger.info(`Finished successfully copying from ${podName}:${srcDir}/${srcFile} to ${destPath}`)
+                  // tar.x({
+                  //   file: tmpFile,
+                  //   cwd: destDir
+                  // }).then(() => {
+                  // self._deleteTempFile(tmpFile)
+                  this.logger.debug(`tmpFile=${tmpFile}`)
+
+                  const stat = fs.statSync(destPath)
+                  let rejection
+                  if (stat && stat.size === srcFileSize) {
+                    this.logger.info(`Finished successfully copying from ${podName}:${srcDir}/${srcFile} to ${destPath}`)
+                  } else {
+                    rejection = true
+                    if (!stat) {
+                      additionalErrorMessageDetail = ', statSync returned no file status for the destination file'
                     } else {
-                      rejection = true
-                      if (!stat) {
-                        additionalErrorMessageDetail = ', statSync returned no file status for the destination file'
-                      } else {
-                        additionalErrorMessageDetail = `, stat.size=${stat.size} != srcFileSize=${srcFileSize}`
-                      }
+                      additionalErrorMessageDetail = `, stat.size=${stat.size} != srcFileSize=${srcFileSize}`
                     }
-                  }).catch((err) => {
-                    this.logger.error(`failed copying from ${podName}:${srcDir}/${srcFile} to ${destPath} to download file completely: ${destPath}${additionalErrorMessageDetail}`, err)
-                    rejection = true
-                  })
+                  }
+
+                  if (rejection) {
+                    const errorMessage = `failed copying from ${podName}:${srcDir}/${srcFile} to ${destPath} to download file completely: ${destPath}${additionalErrorMessageDetail}`
+                    this.logger.error(errorMessage)
+                    return reject(new FullstackTestingError(errorMessage))
+                  } else {
+                    return resolve(true)
+                  }
+                  // }).catch((err) => {
+                  //   const errorMessage = `failed copying from ${podName}:${srcDir}/${srcFile} to ${destPath} to download file completely: ${destPath}${additionalErrorMessageDetail}`
+                  //   this.logger.error(errorMessage, err)
+                  //   return reject(new FullstackTestingError(errorMessage, err))
+                  // })
                 } catch (e) {
                   const errorMessage = `failed to complete copying from ${podName}:${srcDir}/${srcFile} to ${destPath} to extract file: ${destPath}`
                   this.logger.error(errorMessage, e)
-                  rejection = true
-                  throw new FullstackTestingError(errorMessage, e)
+                  return reject(new FullstackTestingError(errorMessage, e))
                 }
               })
-
-              if (rejection) {
-                const errorMessage = `failed copying from ${podName}:${srcDir}/${srcFile} to ${destPath} to download file completely: ${destPath}${additionalErrorMessageDetail}`
-                this.logger.error(errorMessage)
-                return reject(new FullstackTestingError(errorMessage))
-              } else {
-                return resolve(true)
-              }
             })
           })
 

test/data/build-v0.54.0-alpha.4.zip

@@ -173,32 +173,40 @@ describe('K8', () => {
     await expect(k8.hasDir(podName, containerName, '/tmp')).resolves.toBeTruthy()
   }, defaultTimeout)
 
-  it('should be able to copy a file to and from a container', async () => {
-    const pods = await k8.waitForPodReady([`app=${podLabelValue}`], 1, 20)
-    expect(pods.length).toStrictEqual(1)
-    const localTmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'k8-test'))
-    const remoteTmpDir = '/tmp'
-    const localFilePath = 'test/data/pem/keys/a-private-node0.pem'
-    const fileName = path.basename(localFilePath)
-    const remoteFilePath = `${remoteTmpDir}/a-private-node0.pem`
-    const originalFileHash = crypto.createHash('sha384').update(localFilePath).digest().toString()
-    const originalStat = fs.statSync(localFilePath)
+  describe.each([
+    { localFilePath: 'test/data/pem/keys/a-private-node0.pem' },
+    { localFilePath: 'test/data/build-v0.54.0-alpha.4.zip' }
+  ])('test copyTo and copyFrom', (input) => {
+    it('should be able to copy a file to and from a container', async () => {
+      const pods = await k8.waitForPodReady([`app=${podLabelValue}`], 1, 20)
+      expect(pods.length).toStrictEqual(1)
+      const localTmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'k8-test'))
+      const remoteTmpDir = '/tmp'
+      const localFilePath = input.localFilePath
+      const fileName = path.basename(localFilePath)
+      const remoteFilePath = `${remoteTmpDir}/${fileName}`
+      const originalFileData = fs.readFileSync(localFilePath)
+      const originalFileHash = crypto.createHash('sha384').update(originalFileData).digest('hex')
+      const originalStat = fs.statSync(localFilePath)
 
-    // upload the file
-    await expect(k8.copyTo(podName, containerName, localFilePath, remoteTmpDir)).resolves.toBeTruthy()
+      // upload the file
+      await expect(k8.copyTo(podName, containerName, localFilePath, remoteTmpDir)).resolves.toBeTruthy()
 
-    // download the same file
-    await expect(k8.copyFrom(podName, containerName, remoteFilePath, localTmpDir)).resolves.toBeTruthy()
-    const downloadedFilePath = path.join(localTmpDir, fileName)
-    const downloadedFileHash = crypto.createHash('sha384').update(downloadedFilePath).digest().toString()
-    const downloadedStat = fs.statSync(downloadedFilePath)
+      // download the same file
+      await expect(k8.copyFrom(podName, containerName, remoteFilePath, localTmpDir)).resolves.toBeTruthy()
+      const downloadedFilePath = path.join(localTmpDir, fileName)
+      const downloadedFileData = fs.readFileSync(downloadedFilePath)
+      const downloadedFileHash = crypto.createHash('sha384').update(downloadedFileData).digest('hex')
+      const downloadedStat = fs.statSync(downloadedFilePath)
 
-    expect(downloadedFileHash, 'downloaded file hash should match original file hash').toEqual(originalFileHash)
-    // rm file inside the container
-    await expect(k8.execContainer(podName, containerName, ['rm', '-f', remoteFilePath])).resolves
+      expect(downloadedStat.size, 'downloaded file size should match original file size').toEqual(originalStat.size)
+      expect(downloadedFileHash, 'downloaded file hash should match original file hash').toEqual(originalFileHash)
+      // rm file inside the container
+      await expect(k8.execContainer(podName, containerName, ['rm', '-f', remoteFilePath])).resolves
 
-    fs.rmdirSync(localTmpDir, { recursive: true })
-  }, defaultTimeout)
+      fs.rmdirSync(localTmpDir, { recursive: true })
+    }, defaultTimeout)
+  })
 
   it('should be able to port forward gossip port', (done) => {
     const podName = Templates.renderNetworkPodName('node1')