diff --git a/app/helpers/aws_helper.py b/app/helpers/aws_helper.py index 596f860..a7869af 100644 --- a/app/helpers/aws_helper.py +++ b/app/helpers/aws_helper.py @@ -13,6 +13,9 @@ sqs = session.client('sqs', region_name=os.environ['AWS_REGION']) def get_key_from_message(body): return body['Records'][0]['s3']['object']['key'] +def get_bucket_from_message(body): + return body['Records'][0]['s3']['bucket']['name'] + def get_object(key, bucket): return s3.Object( bucket_name=bucket, diff --git a/app/main.py b/app/main.py index d2183d1..d6ff386 100644 --- a/app/main.py +++ b/app/main.py @@ -19,7 +19,7 @@ class ServiceListener(SqsListener): logging.info('Process complete for %s', service.file_name) def main(): - logging.info('Starting Solver Service (v0.4.1)...') + logging.info('Starting Solver Service (v0.4.2)...') listener = ServiceListener( 'measure-development-solver-ingest', region_name=os.environ['AWS_REGION'], diff --git a/app/services/loft_service.py b/app/services/loft_service.py index c4f3f66..76ce231 100644 --- a/app/services/loft_service.py +++ b/app/services/loft_service.py @@ -18,7 +18,7 @@ class LoftService(Base): logging.info('Retrieving attributes from message...') # get s3 object self.key = aws_helper.get_key_from_message(self.source) - s3_object = aws_helper.get_object(self.key, os.environ['INGEST_BUCKET']) + s3_object = aws_helper.get_object(self.key, aws_helper.get_bucket_from_message(self.source)) # convert to tar self.tar = tar_helper.raw_to_tar(s3_object)