Review feedback

Author: ConsoleCatzirl

mip_api/__init__.py

@@ -9,7 +9,15 @@
 
 
 def lambda_handler(event, context):
-    """Sample pure Lambda function
+    """Entry Point for Lambda
+
+    Collect configuration from environment variables and query-string parameters,
+    determine data requested based on the API endpoint called, and finally
+    present the requested data in the desired format.
+
+    Note: The Python process will continue to run for the entire lifecycle of
+    the Lambda execution environment (15 minutes). Subsequent Lambda
+    runs will re-enter this function.
 
     Parameters
     ----------

mip_api/chart.py

@@ -105,33 +105,20 @@ def process_chart(params, chart_dict, omit_list, other, no_program):
 
             if priority_codes is not None:
                 if short in priority_codes:
-                    # Since Python 3.7, python dictionaries preserve insertion
-                    # order, so to prepend an item to the top of the dictionary,
-                    # we create a new dictionary inserting the target code first,
-                    # then add the previous output, and finally save the new
-                    # dictionary as our output dictionary.
-                    new_chart = {short: name}
-                    new_chart.update(out_chart)
-                    out_chart = new_chart
-                    found_codes.append(short)
+                    out_chart = util.dict_prepend(out_chart, short, name)
                 else:
                     out_chart[short] = name
-                    found_codes.append(short)
             else:
                 out_chart[short] = name
-                found_codes.append(short)
+            found_codes.append(short)
 
     # inject "other" code
     if util.param_other_bool(params):
-        new_chart = {other: "Other"}
-        new_chart.update(out_chart)
-        out_chart = new_chart
+        out_chart = util.dict_prepend(out_chart, other, "Other")
 
     # inject "no program" code
     if util.param_no_program_bool(params):
-        new_chart = {no_program: "No Program"}
-        new_chart.update(out_chart)
-        out_chart = new_chart
+        out_chart = util.dict_prepend(out_chart, no_program, "No Program")
 
     return out_chart
 

mip_api/ssm.py

@@ -38,11 +38,14 @@ def get_secrets(ssm_path):
             ssm_secrets[name] = p["Value"]
             LOG.info(f"Loaded secret: {name}")
     else:
-        LOG.error(f"Invalid response from SSM client")
-        raise Exception
+        msg = "Invalid response from SSM client"
+        LOG.error(msg)
+        raise Exception(msg)
 
     for reqkey in ["user", "pass"]:
         if reqkey not in ssm_secrets:
-            raise Exception(f"Missing required secure parameter: {reqkey}")
+            msg = f"Missing required secure parameter: {reqkey}"
+            LOG.error(msg)
+            raise Exception(msg)
 
     return ssm_secrets

mip_api/util.py

@@ -1,6 +1,16 @@
 import os
 
 
+def dict_prepend(original, key, value):
+    # Since Python 3.7, python dictionaries preserve insertion
+    # order, so to prepend an item to the top of the dictionary,
+    # we create a new dictionary inserting the new key first,
+    # then add the previous output
+    new_dict = {key: value}
+    new_dict.update(original)
+    return new_dict
+
+
 def get_os_var(varnam):
     try:
         return os.environ[varnam]
@@ -22,6 +32,17 @@ def _param_bool(params, param):
     return False
 
 
+def _param_int(params, param):
+    number = 0
+    if params and param in params:
+        try:
+            number = int(params[param])
+        except ValueError as exc:
+            msg = f"The parameter '{param}' must be an integer"
+            raise ValueError(msg) from exc
+    return number
+
+
 def param_inactive_bool(params):
     return not _param_bool(params, "show_inactive_codes")
 
@@ -35,13 +56,10 @@ def param_no_program_bool(params):
 
 
 def param_limit_int(params):
-    if params and "limit" in params:
-        try:
-            return int(params["limit"])
-        except ValueError as exc:
-            err_str = "QueryStringParameter 'limit' must be an Integer"
-            raise ValueError(err_str) from exc
-    return 0
+    limit = _param_int(params, "limit")
+    if limit < 0:
+        raise ValueError("The parameter 'limit' must be a positive Integer")
+    return limit
 
 
 def param_priority_list(params):

template.yaml

@@ -67,6 +67,9 @@ Resources:
             Transitions:
               - TransitionInDays: 3
                 StorageClass: INTELLIGENT_TIERING
+          - Id: ExpireOldObjectVersions
+            Status: Enabled
+            NoncurrentVersionExpirationInDays: 365
 
   CacheBucketPolicy:
     Type: AWS::S3::BucketPolicy