From 9a8d9d5af8f11b9f08c73aca4b82420e636d77e4 Mon Sep 17 00:00:00 2001 From: Chris Millar Date: Mon, 30 Jun 2025 10:11:39 -0600 Subject: [PATCH] Revert "fix: versioning timestamp for version and document itself (#144)" This reverts commit a384662b6ecd9af80b3ad9ead5fa9b6763ebfcc2. --- src/storage/version/put.js | 9 ++------- test/storage/version/put.test.js | 8 +++----- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/storage/version/put.js b/src/storage/version/put.js index 3b71244b..78989b71 100644 --- a/src/storage/version/put.js +++ b/src/storage/version/put.js @@ -120,7 +120,7 @@ export async function putObjectWithVersion(env, daCtx, update, body, guid) { Ext: daCtx.ext, Metadata: { Users: current.metadata?.users || JSON.stringify([{ email: 'anonymous' }]), - Timestamp, + Timestamp: current.metadata?.timestamp || Timestamp, Path: current.metadata?.path || Path, Label, }, @@ -134,12 +134,7 @@ export async function putObjectWithVersion(env, daCtx, update, body, guid) { const command = new PutObjectCommand({ ...input, Metadata: { - ID, - Version: crypto.randomUUID(), - Users, - Timestamp: current.metadata?.timestamp || Timestamp, - Path, - Preparsingstore, + ID, Version: crypto.randomUUID(), Users, Timestamp, Path, Preparsingstore, }, }); try { diff --git a/test/storage/version/put.test.js b/test/storage/version/put.test.js index b3f3f247..50321161 100644 --- a/test/storage/version/put.test.js +++ b/test/storage/version/put.test.js @@ -146,7 +146,6 @@ describe('Version Put', () => { metadata: { id: 'x123', version: 'aaa-bbb', - timestamp: 1750765279755, }, status: 200 }; @@ -202,7 +201,7 @@ describe('Version Put', () => { assert.equal('x123', s3Sent[0].input.Metadata.ID); assert.equal('/a/x.html', s3Sent[0].input.Metadata.Path); assert.notEqual('aaa-bbb', s3Sent[0].input.Metadata.Version); - assert.strictEqual(1750765279755, s3Sent[0].input.Metadata.Timestamp); + assert(s3Sent[0].input.Metadata.Timestamp > 0); }); it('Put Object With Version don\'t store content', async () => { @@ -499,8 +498,8 @@ describe('Version Put', () => { assert.equal('', input.Body, 'Empty body for HEAD'); assert.equal(0, input.ContentLength, 'Should have used 0 as content length for HEAD'); assert.equal('/q', input.Metadata.Path); + assert.equal(123, input.Metadata.Timestamp); assert.equal('[{"email":"anonymous"}]', input.Metadata.Users); - assert(input.Metadata.Timestamp > 0); }); it('Test putObjectWithVersion BODY', async () => { @@ -564,8 +563,8 @@ describe('Version Put', () => { assert.equal('Somebody...', input.Body); assert.equal(616, input.ContentLength); assert.equal('/qwerty', input.Metadata.Path); + assert.equal(1234, input.Metadata.Timestamp); assert.equal('[{"email":"anonymous"}]', input.Metadata.Users); - assert(input.Metadata.Timestamp > 0); assert.equal(1, sentToS3_2.length); const input2 = sentToS3_2[0].input; @@ -575,7 +574,6 @@ describe('Version Put', () => { assert.equal('/mypath', input2.Key); assert.equal('/mypath', input2.Metadata.Path); assert.equal('[{"email":"hi@acme.com"}]', input2.Metadata.Users); - assert.strictEqual(1234, input2.Metadata.Timestamp); assert(input2.Metadata.Version && input2.Metadata.Version !== 101); }); });