fix: docker build cache EOF

Author: LouisHaftmann

lib/storage/defineStorageDriver.ts

@@ -19,7 +19,6 @@ export interface StorageDriver {
     partNumber: number
     data: ReadableStream
     chunkStart: number
-    chunkEnd: number
   }) => Promise<{
     eTag: string | null
   }>

lib/storage/index.ts

@@ -33,7 +33,6 @@ export interface Storage {
     uploadId: number
     chunkStream: ReadableStream<Buffer>
     chunkStart: number
-    chunkEnd: number
     chunkIndex: number
   }) => Promise<void>
   commitCache: (uploadId: number | string, size: number) => Promise<void>
@@ -108,7 +107,7 @@ export async function initializeStorage() {
             cacheId: uploadId,
           }
         },
-        async uploadChunk({ uploadId, chunkStream, chunkStart, chunkEnd, chunkIndex }) {
+        async uploadChunk({ uploadId, chunkStream, chunkStart, chunkIndex }) {
           const upload = await db
             .selectFrom('uploads')
             .selectAll()
@@ -121,10 +120,6 @@ export async function initializeStorage() {
             return
           }
 
-          if (chunkEnd === chunkStart) {
-            throw new Error('Chunk end must be greater than chunk start')
-          }
-
           const partNumber = chunkIndex + 1
 
           const objectName = getObjectNameFromKey(upload.key, upload.version)
@@ -135,7 +130,6 @@ export async function initializeStorage() {
               partNumber,
               data: chunkStream,
               chunkStart,
-              chunkEnd,
             })
             await db
               .insertInto('upload_parts')
@@ -152,15 +146,14 @@ export async function initializeStorage() {
                 driverUploadId: upload.driver_upload_id,
                 uploadId,
                 chunkStart,
-                chunkEnd,
                 partNumber,
               },
               err,
             )
             throw err
           }
 
-          logger.debug('Upload:', { uploadId, chunkStart, chunkEnd, partNumber })
+          logger.debug('Upload:', { uploadId, chunkStart, partNumber })
         },
         async commitCache(uploadId) {
           const upload = await db

routes/_apis/artifactcache/caches/[cacheId].patch.ts

@@ -47,7 +47,6 @@ export default defineEventHandler(async (event) => {
     uploadId: cacheId,
     chunkStream: stream as ReadableStream<Buffer>,
     chunkStart: start,
-    chunkEnd: end,
     chunkIndex,
   })
 })

routes/upload/[cacheId].put.ts

@@ -1,4 +1,5 @@
 import { Buffer } from 'node:buffer'
+import { randomUUID } from 'node:crypto'
 
 import { z } from 'zod'
 import { logger } from '~/lib/logger'
@@ -22,6 +23,8 @@ export default defineEventHandler(async (event) => {
 
   if (getQuery(event).comp === 'blocklist') {
     setResponseStatus(event, 201)
+    // prevent random EOF error with in tonistiigi/go-actions-cache caused by missing request id
+    setHeader(event, 'x-ms-request-id', randomUUID())
     return
   }
 
@@ -42,30 +45,23 @@ export default defineEventHandler(async (event) => {
     throw createError({ statusCode: 400, statusMessage: 'Request body must be a stream' })
   }
 
-  const contentLengthHeader = getHeader(event, 'content-length')
-  const contentLength = Number.parseInt(contentLengthHeader ?? '')
-  if (!contentLengthHeader || Number.isNaN(contentLength)) {
-    logger.debug("Upload: 'content-length' header not found")
-    throw createError({ statusCode: 400, statusMessage: "'content-length' header is required" })
-  }
-
   const userAgent = getHeader(event, 'user-agent')
 
   // 1 MB for docker buildx
   // 64 MB for everything else
   const chunkSize = userAgent && userAgent.startsWith('azsdk-go-azblob') ? MB : 64 * MB
   const start = chunkIndex * chunkSize
-  const end = start + contentLength - 1
 
   const adapter = await useStorageAdapter()
   await adapter.uploadChunk({
     uploadId: cacheId,
     chunkStream: stream as ReadableStream<Buffer>,
     chunkStart: start,
-    chunkEnd: end,
     chunkIndex,
   })
 
+  // prevent random EOF error with in tonistiigi/go-actions-cache caused by missing request id
+  setHeader(event, 'x-ms-request-id', randomUUID())
   setResponseStatus(event, 201)
 })