fix(acceptance): poll current content after writes to tolerate CDN invalidation lag

acceptance/specs/rest-object-versioning.test.ts

@@ -127,6 +127,31 @@ async function getContent(
   )
 }
 
+/**
+ * CDN caches `GET /object/authenticated/:bucket/*`, and a write only invalidates
+ * asynchronously so we poll here for up to 15s to give it time
+ * for the cache to be updated.
+ */
+async function expectCurrentContent(
+  client: AcceptanceHttpClient,
+  token: string,
+  bucketName: string,
+  key: string,
+  expected: string
+) {
+  await vi.waitFor(
+    async () => {
+      // A stale cached error is possible too (e.g. a 400 read behind a delete marker).
+      const response = await getContent(client, token, bucketName, key, {
+        expectedStatus: [200, 400],
+      })
+      expect(response.status).toBe(200)
+      expect(response.body).toBe(expected)
+    },
+    { interval: 1_000, timeout: 15_000 }
+  )
+}
+
 async function deleteObject(
   client: AcceptanceHttpClient,
   token: string,
@@ -584,7 +609,7 @@ describeAcceptance(
         // The current row is now a delete marker; a plain (non-upsert) upload is
         // treated as re-creating the key rather than colliding with it.
         await putObject(client, token, bucketName, key, 'revived', { upsert: false })
-        expect((await getContent(client, token, bucketName, key)).body).toBe('revived')
+        await expectCurrentContent(client, token, bucketName, key, 'revived')
       } finally {
         await purgeVersionedBucket(client, token, bucketName)
       }
@@ -621,7 +646,7 @@ describeAcceptance(
         // no new row is added, and C's version disappears entirely (never archived).
         await putObject(client, token, bucketName, key, 'content-d')
         const vD = (await getInfo(client, token, bucketName, key)).json?.version
-        expect((await getContent(client, token, bucketName, key)).body).toBe('content-d')
+        await expectCurrentContent(client, token, bucketName, key, 'content-d')
         expect(vD).not.toBe(vC)
 
         rows = versionsOf(await listAllVersions(client, token, bucketName), key)
@@ -644,7 +669,7 @@ describeAcceptance(
         expect(rows).toHaveLength(4)
         const current = currentRowOf(rows, key)
         expect(current?.archived_at).toBeNull()
-        expect((await getContent(client, token, bucketName, key)).body).toBe('content-e')
+        await expectCurrentContent(client, token, bucketName, key, 'content-e')
 
         const dRow = rows.find((r) => r.version === vD)
         expect(dRow?.archived_at).not.toBeNull()
@@ -730,7 +755,7 @@ describeAcceptance(
         expect(restored.json?.version).toBe(contentVersion)
         expect(restored.json?.archived_at).toBeNull()
         expect(restored.json?.is_delete_marker).toBe(false)
-        expect((await getContent(client, token, bucketName, key)).body).toBe('original')
+        await expectCurrentContent(client, token, bucketName, key, 'original')
 
         const finalRows = versionsOf(await listAllVersions(client, token, bucketName), key)
         expect(finalRows).toHaveLength(1)
@@ -1046,7 +1071,7 @@ describeAcceptance(
           sourceKey: source,
           upsert: true,
         })
-        expect((await getContent(client, token, bucketName, dest)).body).toBe('from-source')
+        await expectCurrentContent(client, token, bucketName, dest, 'from-source')
         expect(
           (await getContent(client, token, bucketName, dest, { versionId: destOriginalVersion }))
             .body
@@ -1347,7 +1372,7 @@ describeAcceptance(
         } else {
           expect(current.version).toBe(uploadRow?.version)
           expect(marker.archived_at).not.toBeNull()
-          expect((await getContent(client, token, bucketName, key)).body).toBe('racing-upload')
+          await expectCurrentContent(client, token, bucketName, key, 'racing-upload')
         }
       } finally {
         await purgeVersionedBucket(client, token, bucketName)