From e662ee528be2906708f58f178f2b87bb9594b2ed Mon Sep 17 00:00:00 2001
From: Leon Stein <leons727@gmail.com>
Date: Tue, 28 Dec 2021 11:42:23 -0500
Subject: [PATCH] remove AMAZON_AWS_HOST export, fix regex per review feedback

Signed-off-by: Leon Stein <leons727@gmail.com>
---
 packages/backend-common/src/reading/AwsS3UrlReader.ts | 10 +++-------
 packages/integration/src/awsS3/config.ts              |  6 +++---
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/packages/backend-common/src/reading/AwsS3UrlReader.ts b/packages/backend-common/src/reading/AwsS3UrlReader.ts
index b6655ecd0e..1fca72e91c 100644
--- a/packages/backend-common/src/reading/AwsS3UrlReader.ts
+++ b/packages/backend-common/src/reading/AwsS3UrlReader.ts
@@ -30,7 +30,6 @@ import getRawBody from 'raw-body';
 import {
   AwsS3Integration,
   ScmIntegrations,
-  AMAZON_AWS_HOST,
   AwsS3IntegrationConfig,
 } from '@backstage/integration';
 import { ForwardedError, NotModifiedError } from '@backstage/errors';
@@ -75,9 +74,9 @@ const parseURL = (
   }
 
   // Only extract region from *.amazonaws.com hosts
-  if (config.host === AMAZON_AWS_HOST) {
+  if (config.host === 'amazonaws.com') {
     // At this point bucket prefix is removed from host for virtual hosted URLs
-    const match = host.match(/^s3\.([a-z\d-]+)\.amazonaws.com$/);
+    const match = host.match(/^s3\.([a-z\d-]+)\.amazonaws\.com$/);
     if (!match) {
       throw new Error(
         `invalid AWS S3 URL, cannot parse region from host in ${url}`,
@@ -105,10 +104,7 @@ export class AwsS3UrlReader implements UrlReader {
       const s3 = new S3({
         apiVersion: '2006-03-01',
         credentials: creds,
-        endpoint:
-          integration.config.host === AMAZON_AWS_HOST
-            ? undefined
-            : integration.config.endpoint,
+        endpoint: integration.config.endpoint,
         s3ForcePathStyle: integration.config.s3ForcePathStyle,
       });
       const reader = new AwsS3UrlReader(integration, {
diff --git a/packages/integration/src/awsS3/config.ts b/packages/integration/src/awsS3/config.ts
index ccbc09a45a..48a9f28c9f 100644
--- a/packages/integration/src/awsS3/config.ts
+++ b/packages/integration/src/awsS3/config.ts
@@ -16,7 +16,7 @@
 
 import { Config } from '@backstage/config';
 
-export const AMAZON_AWS_HOST = 'amazonaws.com';
+const AMAZON_AWS_HOST = 'amazonaws.com';
 
 /**
  * The configuration parameters for a single AWS S3 provider.
@@ -83,12 +83,12 @@ export function readAwsS3IntegrationConfig(
       pathname = url.pathname;
     } catch {
       throw new Error(
-        `Invalid awsS3 integration config, endpoint '${endpoint}' is not a valid URL`,
+        `invalid awsS3 integration config, endpoint '${endpoint}' is not a valid URL`,
       );
     }
     if (pathname !== '/') {
       throw new Error(
-        `Invalid awsS3 integration config, endpoints cannot contain path, got '${endpoint}'`,
+        `invalid awsS3 integration config, endpoints cannot contain path, got '${endpoint}'`,
       );
     }
   } else {