First go

Signed-off-by: Sean Tan <seant@splunk.com>

packages/backend-common/src/reading/AwsS3UrlReader.ts

@@ -187,6 +187,10 @@ export class AwsS3UrlReader implements UrlReader {
         const { Contents, IsTruncated, NextContinuationToken } = await this.s3
           .listObjectsV2(params)
           .promise();
+<<<<<<< HEAD
+=======
+
+>>>>>>> First go
         const responses = await Promise.all(
           (Contents || []).map(({ Key }) => {
             const s3Response = this.s3

packages/backend-common/src/reading/types.ts

@@ -174,6 +174,13 @@ export type FromReadableArrayOptions = {
   etag: string;
 };
 
+export type FromReadableArrayOptions = {
+  // An array of readable streams
+  stream: Readable[];
+  // etag of the file tree
+  etag: string;
+};
+
 export interface ReadTreeResponseFactory {
   fromTarArchive(options: FromArchiveOptions): Promise<ReadTreeResponse>;
   fromZipArchive(options: FromArchiveOptions): Promise<ReadTreeResponse>;