From 6575f2359cfd25b13b2a3a741453abcc04c10b61 Mon Sep 17 00:00:00 2001
From: Sean Tan <seant@splunk.com>
Date: Fri, 13 Aug 2021 16:30:05 -0700
Subject: [PATCH] First go

Signed-off-by: Sean Tan <seant@splunk.com>
---
 packages/backend-common/src/reading/AwsS3UrlReader.ts | 4 ++++
 packages/backend-common/src/reading/types.ts          | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/packages/backend-common/src/reading/AwsS3UrlReader.ts b/packages/backend-common/src/reading/AwsS3UrlReader.ts
index 615a095e50..6c2d55972b 100644
--- a/packages/backend-common/src/reading/AwsS3UrlReader.ts
+++ b/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
diff --git a/packages/backend-common/src/reading/types.ts b/packages/backend-common/src/reading/types.ts
index 8d896408c3..448e678435 100644
--- a/packages/backend-common/src/reading/types.ts
+++ b/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>;