Small fixups

tmclaugh · tmclaugh · commit ca05f9b0684a · 2021-11-22T10:58:50.000-05:00
diff --git a/tests/integration/src/handlers/CreateJpegFromRaw/__init__.py b/tests/integration/src/handlers/CreateJpegFromRaw/__init__.py
diff --git a/tests/integration/src/handlers/CreateJpegFromRaw/test_function.py b/tests/integration/src/handlers/CreateJpegFromRaw/test_function.py
@@ -0,0 +1,64 @@
+'''Test CreateJpgFromRaw'''
+
+import json
+import os
+
+import boto3
+
+import pytest
+from aws_lambda_powertools.utilities.data_classes import S3Event
+from mypy_boto3_cloudformation import CloudFormationClient
+from mypy_boto3_lambda import LambdaClient
+from mypy_boto3_events import EventsClient
+
+STACK_NAME = os.environ.get('STACK_NAME')
+FUNCTION_LOGICAL_ID = 'CreateJpegFromRaw'
+EVENT_BUS_LOGICAL_ID = 'EventBus'
+IMAGE_BUCKET_PATH = os.environ.get('TEST_PHOTO_IMAGE_BUCKET_PATH', 'DUMMY_BUCKET').strip('/').split('/', 1)
+BUCKET_NAME = IMAGE_BUCKET_PATH[0]
+BUCKET_PATH = IMAGE_BUCKET_PATH[1].strip('/') if len(IMAGE_BUCKET_PATH) > 1 else ''
+
+DATA_DIR = './data'
+EVENT_DIR = os.path.join(DATA_DIR, 'events')
+
+## AWS
+@pytest.fixture()
+def session():
+    '''Return a boto3 session'''
+    return boto3.Session()
+
+@pytest.fixture()
+def cfn_client(session) -> CloudFormationClient:
+    '''Return a CFN client'''
+    return session.client('cloudformation')
+
+@pytest.fixture()
+def lambda_client(session) -> LambdaClient:
+    '''Return a Lambda client'''
+    return session.client('lambda')
+
+@pytest.fixture()
+def lambda_function_name(cfn_client) -> str:
+    '''Return the Lambda function name'''
+    function_info = cfn_client.describe_stack_resource(
+        StackName=STACK_NAME,
+        LogicalResourceId=FUNCTION_LOGICAL_ID
+    )
+    return function_info['StackResourceDetail']['PhysicalResourceId']
+
+@pytest.fixture()
+def events_client(session) -> EventsClient:
+    '''Return an SNS client'''
+    return session.client('sns')
+
+@pytest.fixture()
+def eventbus_name(cfn_client) -> str:
+    '''Return the EventBus name'''
+    eventbus_name = cfn_client.describe_stack_resource(
+        StackName=STACK_NAME,
+        LogicalResourceId=EVENT_BUS_LOGICAL_ID
+    )
+    return eventbus_name['StackResourceDetail']['PhysicalResourceId']
+
+
+### Events
diff --git a/tests/integration/src/handlers/IngestS3Event/test_function.py b/tests/integration/src/handlers/IngestS3Event/test_function.py
@@ -20,8 +20,6 @@
 
 DATA_DIR = './data'
 EVENT_DIR = os.path.join(DATA_DIR, 'events')
-IMAGE_DIR = os.path.join(DATA_DIR, 'images')
-MODEL_DIR = os.path.join(DATA_DIR, 'models')
 
 ## AWS
 @pytest.fixture()
@@ -107,6 +105,7 @@ def s3_put_event(generic_s3_put_notification, sns_topic_arn, request) -> S3Event
     return s3_notification_event
 
 
+### Tests
 def test_invoke_handler_s3_put(generic_sns_s3_put_event, generic_s3_put_notification, lambda_client, lambda_function_name):
     '''Test invoking handler with a PUT event'''
     resp = lambda_client.invoke(
