From 8b6e30e62266832405628ee18988aa28a1ed79e8 Mon Sep 17 00:00:00 2001
From: Sean Tan <seant@splunk.com>
Date: Tue, 24 Aug 2021 18:39:08 -0700
Subject: [PATCH] Finish up changes Signed-off-by: Sean Tan <seant@splunk.com>

---
 packages/backend-common/api-report.md         | 29 ++++---------------
 .../src/reading/AwsS3UrlReader.ts             |  2 +-
 2 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/packages/backend-common/api-report.md b/packages/backend-common/api-report.md
index 1c1b66042b..65f5cc0410 100644
--- a/packages/backend-common/api-report.md
+++ b/packages/backend-common/api-report.md
@@ -38,11 +38,12 @@ import { Writable } from 'stream';
 //
 // @public (undocumented)
 export class AwsS3UrlReader implements UrlReader {
-  // Warning: (ae-forgotten-export) The symbol "ReadTreeResponseFactory" needs to be exported by the entry point index.d.ts
   constructor(
     integration: AwsS3Integration,
-    s3: S3,
-    treeResponseFactory: ReadTreeResponseFactory,
+    deps: {
+      s3: S3;
+      treeResponseFactory: ReadTreeResponseFactory;
+    },
   );
   // Warning: (ae-forgotten-export) The symbol "ReaderFactory" needs to be exported by the entry point index.d.ts
   //
@@ -195,27 +196,6 @@ export class DatabaseManager {
   static fromConfig(config: Config): DatabaseManager;
 }
 
-// Warning: (ae-missing-release-tag) "DefaultReadTreeResponseFactory" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public (undocumented)
-export class DefaultReadTreeResponseFactory implements ReadTreeResponseFactory {
-  constructor(workDir: string);
-  // (undocumented)
-  static create(options: { config: Config }): DefaultReadTreeResponseFactory;
-  // Warning: (ae-forgotten-export) The symbol "FromReadableArrayOptions" needs to be exported by the entry point index.d.ts
-  //
-  // (undocumented)
-  fromReadableArray(
-    options: FromReadableArrayOptions,
-  ): Promise<ReadTreeResponse>;
-  // Warning: (ae-forgotten-export) The symbol "FromArchiveOptions" needs to be exported by the entry point index.d.ts
-  //
-  // (undocumented)
-  fromTarArchive(options: FromArchiveOptions): Promise<ReadTreeResponse>;
-  // (undocumented)
-  fromZipArchive(options: FromArchiveOptions): Promise<ReadTreeResponse>;
-}
-
 // Warning: (ae-missing-release-tag) "DockerContainerRunner" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
@@ -699,6 +679,7 @@ export function useHotMemoize<T>(_module: NodeModule, valueFactory: () => T): T;
 //
 // src/cache/types.d.ts:34:5 - (ae-forgotten-export) The symbol "ClientOptions" needs to be exported by the entry point index.d.ts
 // src/middleware/errorHandler.d.ts:17:26 - (tsdoc-malformed-html-name) Invalid HTML element: A space is not allowed here
+// src/reading/AwsS3UrlReader.d.ts:11:9 - (ae-forgotten-export) The symbol "ReadTreeResponseFactory" needs to be exported by the entry point index.d.ts
 // src/reading/types.d.ts:108:5 - (ae-forgotten-export) The symbol "ReadTreeResponseDirOptions" needs to be exported by the entry point index.d.ts
 // src/service/types.d.ts:12:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
 // src/service/types.d.ts:22:8 - (tsdoc-param-tag-missing-hyphen) The @param block should be followed by a parameter name and then a hyphen
diff --git a/packages/backend-common/src/reading/AwsS3UrlReader.ts b/packages/backend-common/src/reading/AwsS3UrlReader.ts
index 593a66cfcc..c48d16cc69 100644
--- a/packages/backend-common/src/reading/AwsS3UrlReader.ts
+++ b/packages/backend-common/src/reading/AwsS3UrlReader.ts
@@ -169,7 +169,6 @@ export class AwsS3UrlReader implements UrlReader {
   async readTree(url: string): Promise<ReadTreeResponse> {
     try {
       const { path, bucket, region } = parseURL(url);
-      aws.config.update({ region: region });
 
       let moreKeys = true;
       let awsS3Readables: Readable[] = [];
@@ -189,6 +188,7 @@ export class AwsS3UrlReader implements UrlReader {
             ContinuationToken: continuationToken,
           };
         }
+        aws.config.update({ region: region });
         const { Contents, IsTruncated, NextContinuationToken } =
           await this.deps.s3.listObjectsV2(params).promise();
         const responses = await Promise.all(