add tests for product provider

Author: rpcme

src/bulk_importer/main.py

@@ -24,15 +24,6 @@
 logger = logging.getLogger()
 logger.setLevel("INFO")
 
-#from cryptography.hazmat.primitives.asymmetric import ec
-
-#from aws_lambda_powertools.utilities.data_classes import S3Event
-#from aws_lambda_powertools.utilities.typing import LambdaContext
-#from aws_lambda_powertools.utilities.validation import validator
-
-
-#config = None
-
 def get_certificate(certificate_id):
     """Verify that the certificate is in IoT Core"""
     iot_client = boto3client('iot')

src/product_provider/main.py

@@ -7,39 +7,45 @@
 import os
 import json
 import boto3
+from aws_lambda_powertools.utilities.typing import LambdaContext
+from aws_lambda_powertools.utilities.data_classes import SQSEvent
 
 def process(payload):
-
+    """Annotate payload with environment-passed variants, later this function
+       will evolve to allow importing types, groups, and policies"""
     # queue url is 
-    queueUrl = os.environ.get('QUEUE_TARGET')
+    queue_url = os.environ.get('QUEUE_TARGET')
 
     # Policy is required.
     payload['policy_name'] = os.environ.get('POLICY_NAME')
 
     # Thing group is desired, but optional.
-    # The reason why 'None' has to be set is an environment variable 
+    # The reason why 'None' has to be set is an environment variable
     # on a Lambda function cannot be set to empty
-    
-    if (os.environ.get('THING_GROUP_NAME') == "None"):
-        payload['thing_group_name'] = ""
+    if os.environ.get('THING_GROUP_NAME') == "None":
+        payload['thing_group_name'] = None
     else:
         payload['thing_group_name'] = os.environ.get('THING_GROUP_NAME')
 
     # Thing group is desired, but optional.
-    if (os.environ.get('THING_TYPE_NAME') == "None"):
-        payload['thing_type_name'] = ""
+    if os.environ.get('THING_TYPE_NAME') == "None":
+        payload['thing_type_name'] = None
     else:
         payload['thing_type_name'] = os.environ.get('THING_TYPE_NAME')
 
     # Pass on to the queue for target processing.
     print(json.dumps(payload))
 
     client = boto3.client("sqs")
-    client.send_message( QueueUrl=queueUrl,
+    client.send_message( QueueUrl=queue_url,
                          MessageBody=json.dumps(payload))
+    return payload
 
-def lambda_handler(event, context):
-
+def lambda_handler(event: SQSEvent, context: LambdaContext) -> dict:
+    """Lambda function main entry point"""
     # Get the payload coming in and process it.  There might be more than one.
+    result = []
     for record in event['Records']:
-        process(json.loads(record["body"]))
+        r = process(json.loads(record["body"]))
+        result.append(r)
+    return result

test/unit/src/test_bulk_importer.py

@@ -4,23 +4,19 @@
 
 Unit tests for bulk_importer
 """
-import os
 import base64
 from unittest import TestCase
 from moto import mock_aws
 from cryptography import x509
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives import serialization
-
-
 from boto3 import resource, client
-from src.bulk_importer.testable import LambdaSQSClass
 from src.bulk_importer.main import get_certificate_fingerprint, requeue, process_certificate
 #    from src.bulk_importer.main import lambda_handler, get_certificate, get_thing, get_policy
 #    from src.bulk_importer.main import get_certificate_arn, get_thing_group, get_thing_type
 #    from src.bulk_importer.main import process_policy, process_thing
 #    from src.bulk_importer.main import process_thing_group, get_name_from_certificate, process_sqs
-
+from .model_bulk_importer import LambdaSQSClass
 
 @mock_aws(config={
     "core": {