add checks for PolicyLinks and ServiceIdentities

abaez · abaez · commit aeb8242017b3 · 2019-09-16T13:54:04.000-04:00
diff --git a/consulate/api/acl.py b/consulate/api/acl.py
@@ -3,6 +3,7 @@
 
 """
 import logging
+import json
 
 from consulate.models import acl as model
 from consulate.api import base
@@ -11,6 +12,48 @@
 LOGGER = logging.getLogger(__name__)
 
 
+def __check_policylinks(policies):
+    """ Checks if policies is formatted correctly.
+    :param list policies: A list of PolicyLink.
+    :param rtype: bool
+    :raises: consulate.exceptions.ACLFormatError
+
+    """
+    for policy in policies:
+        if not ('ID' in policy or 'Name' in policy):
+            raise exceptions.ACLPolicyFormatError(str(policy))
+
+    return True
+
+
+def __check_service_identities(service_identities):
+    """ Checks if service_identities is formatted correctly.
+    :param list service_identities: A ServiceIdentity list
+    :param rtype: bool
+    :raises: consulate.exceptions.ACLFormatError
+
+    """
+    for service_identity in service_identities:
+        if 'ServiceName' not in service_identity:
+            raise exceptions.ACLPolicyFormatError(str(service_identity))
+
+    return True
+
+
+def __create_json_format(structures, check):
+    """Creates a json string from a structures provided check passes.
+    :param list structure: a PolicyLinks or ServiceIdentities.
+    :param function check: a function to check structure
+    :param rtype: str
+
+    """
+    formatted = None
+    if structures is not None and check(structures):
+        formatted = json.dumps(structures)
+
+    return formatted
+
+
 class ACL(base.Endpoint):
     """The ACL endpoints are used to create, update, destroy, and query ACL
     tokens.
diff --git a/consulate/exceptions.py b/consulate/exceptions.py
@@ -24,6 +24,13 @@ class ACLDisabled(ConsulateException):
     """Raised when ACL related calls are made while ACLs are disabled"""
 
 
+class ACLFormatError(ConsulateException):
+    """Raised when PolicyLinks is missing 'ID' and 'Name' in a PolicyLink or
+    when ServiceIdentities is missing 'ServiceName' field in a ServiceIdentity.
+
+    """
+
+
 class Forbidden(ConsulateException):
     """Raised when ACLs are enabled and the token does not validate"""
 
