Fix issues where bulk copy fails.

Author: bstopp

src/storage/object/copy.js

@@ -21,11 +21,10 @@ import { putObjectWithVersion } from '../version/put.js';
 import { listCommand } from '../utils/list.js';
 import { hasPermission } from '../../utils/auth.js';
 
-const MAX_KEYS = 900;
+const MAX_KEYS = 2;
 
 export const copyFile = async (config, env, daCtx, sourceKey, details, isRename) => {
   const Key = `${sourceKey.replace(details.source, details.destination)}`;
-
   if (!hasPermission(daCtx, sourceKey, 'read') || !hasPermission(daCtx, Key, 'write')) {
     return {
       $metadata: {
@@ -81,11 +80,12 @@ export const copyFile = async (config, env, daCtx, sourceKey, details, isRename)
           env,
           { bucket: daCtx.bucket, org: daCtx.org, key: sourceKey },
         );
+        const body = await original.body.transformToString();
         return /* await */ putObjectWithVersion(env, daCtx, {
           bucket: daCtx.bucket,
           org: daCtx.org,
           key: Key,
-          body: original.body,
+          body,
           contentLength: original.contentLength,
           type: original.contentType,
         });
@@ -105,7 +105,7 @@ export const copyFile = async (config, env, daCtx, sourceKey, details, isRename)
   } finally {
     if (Key.endsWith('.html')) {
       // Reset the collab cached state for the copied object
-      await invalidateCollab('syncAdmin', `${daCtx.origin}/source/${daCtx.org}/${Key}`, env);
+      await invalidateCollab('syncadmin', `${daCtx.origin}/source/${daCtx.org}/${Key}`, env);
     }
   }
 };

src/storage/utils/version.js

@@ -13,25 +13,8 @@ import {
   S3Client,
 } from '@aws-sdk/client-s3';
 
-export function createBucketIfMissing(client) {
-  client.middlewareStack.add(
-    (next) => async (args) => {
-      // eslint-disable-next-line no-param-reassign
-      args.request.headers['cf-create-bucket-if-missing'] = 'true';
-      return next(args);
-    },
-    {
-      step: 'build',
-      name: 'createIfMissingMiddleware',
-      tags: ['METADATA', 'CREATE-BUCKET-IF-MISSING'],
-    },
-  );
-  return client;
-}
-
 export function ifNoneMatch(config) {
   const client = new S3Client(config);
-  createBucketIfMissing(client);
   client.middlewareStack.add(
     (next) => async (args) => {
       // eslint-disable-next-line no-param-reassign
@@ -49,7 +32,6 @@ export function ifNoneMatch(config) {
 
 export function ifMatch(config, match) {
   const client = new S3Client(config);
-  createBucketIfMissing(client);
   client.middlewareStack.add(
     (next) => async (args) => {
       // eslint-disable-next-line no-param-reassign

src/storage/version/put.js

@@ -16,7 +16,7 @@ import {
 
 import getS3Config from '../utils/config.js';
 import {
-  createBucketIfMissing, ifMatch, ifNoneMatch,
+  ifMatch, ifNoneMatch,
 } from '../utils/version.js';
 import getObject from '../object/get.js';
 
@@ -39,7 +39,7 @@ export async function putVersion(config, {
 }, noneMatch = true) {
   const length = ContentLength ?? getContentLength(Body);
 
-  const client = noneMatch ? ifNoneMatch(config) : createBucketIfMissing(new S3Client(config));
+  const client = noneMatch ? ifNoneMatch(config) : new S3Client(config);
   const input = {
     Bucket, Key: `${Org}/.da-versions/${ID}/${Version}.${Ext}`, Body, Metadata, ContentLength: length,
   };
@@ -118,7 +118,6 @@ export async function putObjectWithVersion(env, daCtx, update, body) {
       Label,
     },
   });
-
   if (versionResp.status !== 200 && versionResp.status !== 412) {
     return versionResp.status;
   }
@@ -132,7 +131,6 @@ export async function putObjectWithVersion(env, daCtx, update, body) {
   });
   try {
     const resp = await client.send(command);
-
     return resp.$metadata.httpStatusCode;
   } catch (e) {
     if (e.$metadata.httpStatusCode === 412) {