From abdda4a888fa200bf6fe10c41356908ec7a1f093 Mon Sep 17 00:00:00 2001
From: Adrian Manteza <amanteza@yas.getyardstick.com>
Date: Fri, 18 Mar 2022 14:57:52 +0000
Subject: [PATCH] dont include the endpoint_url parameter at all

---
 app/helpers/aws_helper.py    | 15 ++++++++-------
 app/main.py                  | 29 +++++++++++++++++++++--------
 app/services/loft_service.py |  1 -
 3 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/app/helpers/aws_helper.py b/app/helpers/aws_helper.py
index fb75c8b..893298a 100644
--- a/app/helpers/aws_helper.py
+++ b/app/helpers/aws_helper.py
@@ -7,13 +7,14 @@ session = boto3.Session(
     aws_access_key_id=ApplicationConfigs.aws_access_key_id,
     aws_secret_access_key=ApplicationConfigs.aws_secret_key)
 
-s3 = session.resource('s3',
-                      region_name=ApplicationConfigs.region_name,
-                      endpoint_url=ApplicationConfigs.endpoint_url)
-sqs = session.client('sqs',
-                     region_name=ApplicationConfigs.region_name,
-                     endpoint_url=ApplicationConfigs.endpoint_url)
-
+# ToDo: Figure out a much better way of doing this.
+# LocalStack wants endpoint_url, while prod doesnt :(
+if ApplicationConfigs.local_dev_env:
+    s3  = session.resource('s3', region_name=ApplicationConfigs.region_name, endpoint_url=ApplicationConfigs.endpoint_url)
+    sqs = session.client('sqs', region_name=ApplicationConfigs.region_name, endpoint_url=ApplicationConfigs.endpoint_url)
+else:
+    s3  = session.resource('s3', region_name=ApplicationConfigs.region_name)
+    sqs = session.client('sqs', region_name=ApplicationConfigs.region_name)
 
 def get_key_from_message(body):
     return body['Records'][0]['s3']['object']['key']
diff --git a/app/main.py b/app/main.py
index 59b6e9e..5c188a0 100644
--- a/app/main.py
+++ b/app/main.py
@@ -26,14 +26,27 @@ class ServiceListener(Consumer):
 
 def main():
     logging.info('Starting Solver Service (v1.1.4)...')
-    listener = ServiceListener(
-        None,
-        ApplicationConfigs.sqs_queue,
-        create_queue=False,
-        region_name=ApplicationConfigs.region_name,
-        aws_access_key=ApplicationConfigs.aws_access_key_id,
-        aws_secret_key=ApplicationConfigs.aws_secret_key,
-        endpoint_url=ApplicationConfigs.endpoint_url)
+
+    # ToDo: Figure out a much better way of doing this.
+    # LocalStack wants 'endpoint_url', while prod doesnt :(
+    if ApplicationConfigs.local_dev_env:
+        listener = ServiceListener(
+            None,
+            ApplicationConfigs.sqs_queue,
+            create_queue=False,
+            region_name=ApplicationConfigs.region_name,
+            aws_access_key=ApplicationConfigs.aws_access_key_id,
+            aws_secret_key=ApplicationConfigs.aws_secret_key,
+            endpoint_url=ApplicationConfigs.endpoint_url)
+    else:
+        listener = ServiceListener(
+            None,
+            ApplicationConfigs.sqs_queue,
+            create_queue=False,
+            region_name=ApplicationConfigs.region_name,
+            aws_access_key=ApplicationConfigs.aws_access_key_id,
+            aws_secret_key=ApplicationConfigs.aws_secret_key)
+
     listener.listen()
 
 
diff --git a/app/services/loft_service.py b/app/services/loft_service.py
index 6369c3c..b999e48 100644
--- a/app/services/loft_service.py
+++ b/app/services/loft_service.py
@@ -14,7 +14,6 @@ from models.target import Target
 
 from services.base import Base
 
-
 class LoftService(Base):
 
     def process(self):