jshbrmn/irt-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use bucket name from payload instead of env var

Browse Source
This commit is contained in:
Josh Burman 2021-11-03 17:58:48 +00:00
parent 1c7fb41ca5
commit a42ae76e72
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/helpers/aws_helper.py
View File

@ -13,6 +13,9 @@ sqs = session.client('sqs', region_name=os.environ['AWS_REGION'])
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']
def get_bucket_from_message(body):
return body['Records'][0]['s3']['bucket']['name']
def get_object(key, bucket): def get_object(key, bucket):
return s3.Object( return s3.Object(
bucket_name=bucket, bucket_name=bucket,

2
app/main.py
View File

@ -19,7 +19,7 @@ class ServiceListener(SqsListener):
logging.info('Process complete for %s', service.file_name) logging.info('Process complete for %s', service.file_name)
def main(): def main():
logging.info('Starting Solver Service (v0.4.1)...') logging.info('Starting Solver Service (v0.4.2)...')
listener = ServiceListener( listener = ServiceListener(
'measure-development-solver-ingest', 'measure-development-solver-ingest',
region_name=os.environ['AWS_REGION'], region_name=os.environ['AWS_REGION'],

2
app/services/loft_service.py
View File

@ -18,7 +18,7 @@ class LoftService(Base):
logging.info('Retrieving attributes from message...') logging.info('Retrieving attributes from message...')
# get s3 object # get s3 object
self.key = aws_helper.get_key_from_message(self.source) 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 # convert to tar
self.tar = tar_helper.raw_to_tar(s3_object) self.tar = tar_helper.raw_to_tar(s3_object)