dont include the endpoint_url parameter at all

This commit is contained in:
Adrian Manteza 2022-03-18 14:57:52 +00:00
parent f893754f4c
commit abdda4a888
3 changed files with 29 additions and 16 deletions

View File

@ -7,13 +7,14 @@ session = boto3.Session(
aws_access_key_id=ApplicationConfigs.aws_access_key_id, aws_access_key_id=ApplicationConfigs.aws_access_key_id,
aws_secret_access_key=ApplicationConfigs.aws_secret_key) aws_secret_access_key=ApplicationConfigs.aws_secret_key)
s3 = session.resource('s3', # ToDo: Figure out a much better way of doing this.
region_name=ApplicationConfigs.region_name, # LocalStack wants endpoint_url, while prod doesnt :(
endpoint_url=ApplicationConfigs.endpoint_url) if ApplicationConfigs.local_dev_env:
sqs = session.client('sqs', s3 = session.resource('s3', region_name=ApplicationConfigs.region_name, endpoint_url=ApplicationConfigs.endpoint_url)
region_name=ApplicationConfigs.region_name, sqs = session.client('sqs', region_name=ApplicationConfigs.region_name, endpoint_url=ApplicationConfigs.endpoint_url)
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): def get_key_from_message(body):
return body['Records'][0]['s3']['object']['key'] return body['Records'][0]['s3']['object']['key']

View File

@ -26,14 +26,27 @@ class ServiceListener(Consumer):
def main(): def main():
logging.info('Starting Solver Service (v1.1.4)...') logging.info('Starting Solver Service (v1.1.4)...')
listener = ServiceListener(
None, # ToDo: Figure out a much better way of doing this.
ApplicationConfigs.sqs_queue, # LocalStack wants 'endpoint_url', while prod doesnt :(
create_queue=False, if ApplicationConfigs.local_dev_env:
region_name=ApplicationConfigs.region_name, listener = ServiceListener(
aws_access_key=ApplicationConfigs.aws_access_key_id, None,
aws_secret_key=ApplicationConfigs.aws_secret_key, ApplicationConfigs.sqs_queue,
endpoint_url=ApplicationConfigs.endpoint_url) 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() listener.listen()

View File

@ -14,7 +14,6 @@ from models.target import Target
from services.base import Base from services.base import Base
class LoftService(Base): class LoftService(Base):
def process(self): def process(self):