feat: propagate per-function timeout in deploy (#6676)

Co-authored-by: Antonio Rodríguez <[email protected]>
netlify · May 29, 2024 · f3cc8cc · f3cc8cc · github-actions · May 29, 2024
1 parent b0e512e
commit f3cc8cc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/utils/deploy/hash-fns.ts b/src/utils/deploy/hash-fns.ts
@@ -169,6 +169,7 @@ const hashFns = async (
       runtime,
       runtimeVersion,
       trafficRules,
+      timeout,
     }) => ({
       filepath: functionPath,
       root: tmpDir,
@@ -182,6 +183,7 @@ const hashFns = async (
       displayName,
       generator,
       invocationMode,
+      timeout,
       buildData,
       priority,
       trafficRules,

diff --git a/src/utils/deploy/upload-files.ts b/src/utils/deploy/upload-files.ts
@@ -17,7 +17,7 @@ const uploadFiles = async (api, deployId, uploadList, { concurrentUpload, maxRet
 
   // @ts-expect-error TS(7006) FIXME: Parameter 'fileObj' implicitly has an 'any' type.
   const uploadFile = async (fileObj, index) => {
-    const { assetType, body, filepath, invocationMode, normalizedPath, runtime } = fileObj
+    const { assetType, body, filepath, invocationMode, normalizedPath, runtime, timeout } = fileObj
 
     const readStreamCtor = () => body ?? fs.createReadStream(filepath)
 
@@ -47,6 +47,7 @@ const uploadFiles = async (api, deployId, uploadList, { concurrentUpload, maxRet
             body: readStreamCtor,
             deployId,
             invocationMode,
+            timeout,
             name: encodeURI(normalizedPath),
             runtime,
           }