Merge branch 'main' into jono/ap-3896-detect-github-merge-queue-builds

chromaui · Jan 16, 2024 · 61a8285 · 61a8285
2 parents 661bcd0 + c0a46bd
commit 61a8285
Show file tree

Hide file tree

Showing 2 changed files with 96 additions and 3 deletions.
diff --git a/node-src/lib/upload.ts b/node-src/lib/upload.ts
@@ -109,7 +109,8 @@ export async function uploadBuild(
       UploadBuildMutation,
       {
         buildId: ctx.announcedBuild.id,
-        files: batch.map(({ contentLength, targetPath }) => ({
+        files: batch.map(({ contentHash, contentLength, targetPath }) => ({
+          contentHash,
           contentLength,
           filePath: targetPath,
         })),

diff --git a/node-src/tasks/upload.test.ts b/node-src/tasks/upload.test.ts
@@ -492,6 +492,98 @@ describe('uploadStorybook', () => {
     });
   });
 
+  it('batches calls to uploadBuild mutation', async () => {
+    const client = { runQuery: vi.fn() };
+    client.runQuery.mockReturnValueOnce({
+      uploadBuild: {
+        info: {
+          sentinelUrls: [],
+          targets: Array.from({ length: 1000 }, (_, i) => ({
+            contentType: 'application/javascript',
+            filePath: `${i}.js`,
+            formAction: `https://s3.amazonaws.com/presigned?${i}.js`,
+            formFields: {},
+          })),
+        },
+        userErrors: [],
+      },
+    });
+    client.runQuery.mockReturnValueOnce({
+      uploadBuild: {
+        info: {
+          sentinelUrls: [],
+          targets: [
+            {
+              contentType: 'application/javascript',
+              filePath: `1000.js`,
+              formAction: `https://s3.amazonaws.com/presigned?1000.js`,
+              formFields: {},
+            },
+          ],
+        },
+        userErrors: [],
+      },
+    });
+
+    createReadStreamMock.mockReturnValue({ pipe: vi.fn((x) => x) } as any);
+    http.fetch.mockReturnValue({ ok: true });
+
+    const fileInfo = {
+      lengths: Array.from({ length: 1001 }, (_, i) => ({ knownAs: `${i}.js`, contentLength: i })),
+      paths: Array.from({ length: 1001 }, (_, i) => `${i}.js`),
+      total: Array.from({ length: 1001 }, (_, i) => i).reduce((a, v) => a + v),
+    };
+    const ctx = {
+      client,
+      env,
+      log,
+      http,
+      sourceDir: '/static/',
+      options: {},
+      fileInfo,
+      announcedBuild: { id: '1' },
+    } as any;
+    await uploadStorybook(ctx, {} as any);
+
+    expect(client.runQuery).toHaveBeenCalledTimes(2);
+    expect(client.runQuery).toHaveBeenCalledWith(expect.stringMatching(/UploadBuildMutation/), {
+      buildId: '1',
+      files: Array.from({ length: 1000 }, (_, i) => ({
+        contentHash: undefined,
+        contentLength: i,
+        filePath: `${i}.js`,
+      })),
+    });
+    expect(client.runQuery).toHaveBeenCalledWith(expect.stringMatching(/UploadBuildMutation/), {
+      buildId: '1',
+      files: [{ contentHash: undefined, contentLength: 1000, filePath: `1000.js` }], // 0-based index makes this file #1001
+    });
+
+    // Empty files are not uploaded
+    expect(http.fetch).not.toHaveBeenCalledWith(
+      'https://s3.amazonaws.com/presigned?0.js',
+      expect.objectContaining({ body: expect.any(FormData), method: 'POST' }),
+      expect.objectContaining({ retries: 0 })
+    );
+    expect(http.fetch).toHaveBeenCalledWith(
+      'https://s3.amazonaws.com/presigned?1.js',
+      expect.objectContaining({ body: expect.any(FormData), method: 'POST' }),
+      expect.objectContaining({ retries: 0 })
+    );
+    expect(http.fetch).toHaveBeenCalledWith(
+      'https://s3.amazonaws.com/presigned?999.js',
+      expect.objectContaining({ body: expect.any(FormData), method: 'POST' }),
+      expect.objectContaining({ retries: 0 })
+    );
+    expect(http.fetch).toHaveBeenCalledWith(
+      'https://s3.amazonaws.com/presigned?1000.js',
+      expect.objectContaining({ body: expect.any(FormData), method: 'POST' }),
+      expect.objectContaining({ retries: 0 })
+    );
+    expect(ctx.uploadedBytes).toBe(500500);
+    expect(ctx.uploadedFiles).toBe(1000);
+  });
+
   describe('with file hashes', () => {
     it('retrieves file upload locations and uploads only returned targets', async () => {
       const client = { runQuery: vi.fn() };
@@ -539,8 +631,8 @@ describe('uploadStorybook', () => {
       expect(client.runQuery).toHaveBeenCalledWith(expect.stringMatching(/UploadBuildMutation/), {
         buildId: '1',
         files: [
-          { contentLength: 42, filePath: 'iframe.html' },
-          { contentLength: 42, filePath: 'index.html' },
+          { contentHash: 'iframe', contentLength: 42, filePath: 'iframe.html' },
+          { contentHash: 'index', contentLength: 42, filePath: 'index.html' },
         ],
         zip: false,
       });