profile-retrieval is still a little slow, so speed up json parsing

Jira: IAM-1668

Author: bheesham

python-modules/cis_profile_retrieval_service/cis_profile_retrieval_service/advanced.py

@@ -1,5 +1,5 @@
 """Support advanced search queries for inclusion in routes via DynamoDb."""
-import json
+import orjson
 import logging
 from flask_restful import Resource
 from flask_restful import reqparse
@@ -55,7 +55,7 @@ def filter_full_profiles(scopes, filter_display, vault_profiles):
     v2_profiles = []
     for profile in vault_profiles:
         if isinstance(profile.get("profile"), str):
-            vault_profile = json.loads(profile.get("profile"))
+            vault_profile = orjson.loads(profile.get("profile"))
         else:
             vault_profile = profile.get("profile")
 

python-modules/cis_profile_retrieval_service/cis_profile_retrieval_service/common.py

@@ -1,14 +1,13 @@
 import boto3
 import botocore
-import json
+import orjson
 import logging
 import os
 import re
 from botocore.stub import Stubber
 from everett.ext.inifile import ConfigIniEnv
 from everett.manager import ConfigManager
 from everett.manager import ConfigOSEnv
-from json import dumps
 from cis_profile.fake_profile import batch_create_fake_profiles
 from cis_identity_vault.models import user
 from cis_identity_vault.vault import IdentityVault
@@ -96,7 +95,7 @@ def seed(number_of_fake_users=100):
                     "user_uuid": identity.get("uuid").get("value"),
                     "primary_username": identity.get("primary_username").get("value"),
                     "sequence_number": "1234567890",
-                    "profile": dumps(identity),
+                    "profile": orjson.dumps(identity),
                 }
 
                 user_profile.create(identity_vault_data_structure)
@@ -112,7 +111,7 @@ def seed(number_of_fake_users=100):
                     "user_uuid": identity.get("uuid").get("value"),
                     "primary_username": identity.get("primary_username").get("value"),
                     "sequence_number": "1234567890",
-                    "profile": dumps(identity),
+                    "profile": orjson.dumps(identity),
                 }
                 user_profile.create(identity_vault_data_structure)
             logger.info("Count: {} seed users created.".format(number_of_fake_users))
@@ -126,7 +125,7 @@ def load_dirty_json(dirty_json):
     ]
     for r, s in regex_replace:
         dirty_json = re.sub(r, s, dirty_json)
-    clean_json = json.loads(dirty_json)
+    clean_json = orjson.loads(dirty_json)
     return clean_json
 
 

python-modules/cis_profile_retrieval_service/cis_profile_retrieval_service/v2_api.py

@@ -1,4 +1,4 @@
-import json
+import orjson
 
 from aws_xray_sdk.ext.flask.middleware import XRayMiddleware
 from aws_xray_sdk.core import xray_recorder
@@ -98,7 +98,7 @@ def get(self, primary_email):
         if len(result["Items"]) > 0:
             vault_profile = result["Items"][0]["profile"]
             exists_in_cis = True
-            exists_in_ldap = User(user_structure_json=json.loads(vault_profile)) \
+            exists_in_ldap = User(user_structure_json=orjson.loads(vault_profile)) \
                 .as_dict()["access_information"]["ldap"]["values"] is not None
 
         return jsonify({
@@ -236,7 +236,7 @@ def getUser(id, find_by):
 
     if len(result["Items"]) > 0:
         vault_profile = result["Items"][0]["profile"]
-        v2_profile = User(user_structure_json=json.loads(vault_profile))
+        v2_profile = User(user_structure_json=orjson.loads(vault_profile))
 
         if v2_profile.active.value == active or active is None:
             if "read:fullprofile" in scopes:
@@ -318,7 +318,7 @@ def get(self):
             active = True  # Support returning only active users by default.
 
         for profile in result.get("Items"):
-            vault_profile = json.loads(profile.get("profile"))
+            vault_profile = orjson.loads(profile.get("profile"))
             v2_profile = User(user_structure_json=vault_profile)
 
             # This must be a pre filtering check because mutation is real.

requirements/core.txt

@@ -30,6 +30,7 @@ importlib_metadata==2.0.0
 itsdangerous==1.1.0
 Jinja2==2.11.2
 jmespath==0.10.0
+orjson==3.11.0
 jsonpickle==1.4.1
 jsonschema==3.2.0
 MarkupSafe==1.1.1