refactor!: use fs/promises (#1432)

dherault · May 18, 2022 · f744897 · f744897
1 parent c812f3b
commit f744897
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 15 deletions.
diff --git a/src/lambda/LambdaFunction.js b/src/lambda/LambdaFunction.js
@@ -1,6 +1,6 @@
 import { dirname, join, resolve } from 'path'
-import { emptyDir, ensureDir, readFile, remove, writeFile } from 'fs-extra'
 import { performance } from 'perf_hooks'
+import { emptyDir, ensureDir, readFile, remove, writeFile } from 'fs-extra'
 import jszip from 'jszip'
 import HandlerRunner from './handler-runner/index.js'
 import LambdaContext from './LambdaContext.js'

diff --git a/src/lambda/handler-runner/docker-runner/DockerContainer.js b/src/lambda/handler-runner/docker-runner/DockerContainer.js
@@ -1,13 +1,13 @@
+import { createHash } from 'crypto'
+import { createWriteStream, unlinkSync } from 'fs'
 import { platform } from 'os'
+import { dirname, join, sep } from 'path'
+import { Lambda } from 'aws-sdk'
 import execa from 'execa'
+import { ensureDir, pathExists, readFile, writeFile } from 'fs-extra'
+import jszip from 'jszip'
 import fetch from 'node-fetch'
 import pRetry from 'p-retry'
-import { Lambda } from 'aws-sdk'
-import jszip from 'jszip'
-import { createWriteStream, unlinkSync } from 'fs'
-import { readFile, writeFile, ensureDir, pathExists } from 'fs-extra'
-import { dirname, join, sep } from 'path'
-import crypto from 'crypto'
 import DockerImage from './DockerImage.js'
 import debugLog from '../../../debugLog.js'
 import { logLayers, logWarning } from '../../../serverlessLog.js'
@@ -367,7 +367,7 @@ export default class DockerContainer {
         logLayers(`[${layerName}] Unzipping to .layers directory`)
       }
 
-      const data = await readFile(`${layerZipFile}`)
+      const data = await readFile(layerZipFile)
       const zip = await jszip.loadAsync(data)
       await Promise.all(
         keys(zip.files).map(async (filename) => {
@@ -388,7 +388,7 @@ export default class DockerContainer {
         logLayers(`[${layerName}] Removing zip file`)
       }
 
-      unlinkSync(`${layerZipFile}`)
+      unlinkSync(layerZipFile)
     } finally {
       if (this.log) layerProgress.remove()
     }
@@ -475,10 +475,7 @@ export default class DockerContainer {
   }
 
   #getLayersSha256() {
-    return crypto
-      .createHash('sha256')
-      .update(stringify(this.#layers))
-      .digest('hex')
+    return createHash('sha256').update(stringify(this.#layers)).digest('hex')
   }
 
   get isRunning() {

diff --git a/src/lambda/handler-runner/go-runner/GoRunner.js b/src/lambda/handler-runner/go-runner/GoRunner.js
@@ -1,10 +1,9 @@
-import { promises as fsPromises } from 'fs'
+import { mkdir, readFile, rmdir, writeFile } from 'fs/promises'
 import { EOL } from 'os'
 import { sep, resolve, parse as pathParse } from 'path'
 import process, { chdir, cwd } from 'process'
 import execa, { sync } from 'execa'
 
-const { writeFile, readFile, mkdir, rmdir } = fsPromises
 const { parse, stringify } = JSON
 
 const PAYLOAD_IDENTIFIER = 'offline_payload'