cartography 0.102.0rc2__py3-none-any.whl → 0.103.0rc1__py3-none-any.whl

cartography/intel/github/util.py

@@ -13,7 +13,6 @@ from typing import Tuple
 
 import requests
 
-
 logger = logging.getLogger(__name__)
 # Connect and read timeouts of 60 seconds each; see https://requests.readthedocs.io/en/master/user/advanced/#timeouts
 _TIMEOUT = (60, 60)
@@ -26,25 +25,28 @@ class PaginatedGraphqlData(NamedTuple):
 
 
 def handle_rate_limit_sleep(token: str) -> None:
-    '''
+    """
     Check the remaining rate limit and sleep if remaining is below threshold
     :param token: The Github API token as string.
-    '''
-    response = requests.get('https://api.github.com/rate_limit', headers={'Authorization': f"token {token}"})
+    """
+    response = requests.get(
+        "https://api.github.com/rate_limit",
+        headers={"Authorization": f"token {token}"},
+    )
     response.raise_for_status()
     response_json = response.json()
-    rate_limit_obj = response_json['resources']['graphql']
-    remaining = rate_limit_obj['remaining']
+    rate_limit_obj = response_json["resources"]["graphql"]
+    remaining = rate_limit_obj["remaining"]
     threshold = _GRAPHQL_RATE_LIMIT_REMAINING_THRESHOLD
     if remaining > threshold:
         return
-    reset_at = datetime.fromtimestamp(rate_limit_obj['reset'], tz=tz.utc)
+    reset_at = datetime.fromtimestamp(rate_limit_obj["reset"], tz=tz.utc)
     now = datetime.now(tz.utc)
     # add an extra minute for safety
     sleep_duration = reset_at - now + timedelta(minutes=1)
     logger.warning(
-        f'Github graphql ratelimit has {remaining} remaining and is under threshold {threshold},'
-        f' sleeping until reset at {reset_at} for {sleep_duration}',
+        f"Github graphql ratelimit has {remaining} remaining and is under threshold {threshold},"
+        f" sleeping until reset at {reset_at} for {sleep_duration}",
     )
     time.sleep(sleep_duration.seconds)
 
@@ -58,11 +60,11 @@ def call_github_api(query: str, variables: str, token: str, api_url: str) -> Dic
     :param api_url: the URL to call for the API
     :return: query results json
     """
-    headers = {'Authorization': f"token {token}"}
+    headers = {"Authorization": f"token {token}"}
     try:
         response = requests.post(
             api_url,
-            json={'query': query, 'variables': variables},
+            json={"query": query, "variables": variables},
             headers=headers,
             timeout=_TIMEOUT,
         )
@@ -75,7 +77,7 @@ def call_github_api(query: str, variables: str, token: str, api_url: str) -> Dic
     if "errors" in response_json:
         logger.warning(
             f'call_github_api() response has errors, please investigate. Raw response: {response_json["errors"]}; '
-            f'continuing sync.',
+            f"continuing sync.",
         )
     return response_json  # type: ignore
 
@@ -101,8 +103,8 @@ def fetch_page(
     """
     gql_vars = {
         **kwargs,
-        'login': organization,
-        'cursor': cursor,
+        "login": organization,
+        "cursor": cursor,
     }
     gql_vars_json = json.dumps(gql_vars)
     response = call_github_api(query, gql_vars_json, token, api_url)
@@ -110,14 +112,14 @@ def fetch_page(
 
 
 def fetch_all(
-        token: str,
-        api_url: str,
-        organization: str,
-        query: str,
-        resource_type: str,
-        retries: int = 5,
-        resource_inner_type: Optional[str] = None,
-        **kwargs: Any,
+    token: str,
+    api_url: str,
+    organization: str,
+    query: str,
+    resource_type: str,
+    retries: int = 5,
+    resource_inner_type: Optional[str] = None,
+    **kwargs: Any,
 ) -> Tuple[PaginatedGraphqlData, Dict[str, Any]]:
     """
     Fetch and return all data items of the given `resource_type` and `field_name` from Github's paginated GraphQL API as
@@ -169,32 +171,32 @@ def fetch_all(
             )
             raise exc
         elif retry > 0:
-            time.sleep(2 ** retry)
+            time.sleep(2**retry)
             continue
 
-        if 'data' not in resp:
+        if "data" not in resp:
             logger.warning(
                 f'Got no "data" attribute in response: {resp}. '
-                f'Stopping requests for organization: {organization} and '
-                f'resource_type: {resource_type}',
+                f"Stopping requests for organization: {organization} and "
+                f"resource_type: {resource_type}",
             )
             has_next_page = False
             continue
 
-        resource = resp['data']['organization'][resource_type]
+        resource = resp["data"]["organization"][resource_type]
         if resource_inner_type:
-            resource = resp['data']['organization'][resource_type][resource_inner_type]
+            resource = resp["data"]["organization"][resource_type][resource_inner_type]
 
         # Allow for paginating both nodes and edges fields of the GitHub GQL structure.
-        data.nodes.extend(resource.get('nodes', []))
-        data.edges.extend(resource.get('edges', []))
+        data.nodes.extend(resource.get("nodes", []))
+        data.edges.extend(resource.get("edges", []))
 
-        cursor = resource['pageInfo']['endCursor']
-        has_next_page = resource['pageInfo']['hasNextPage']
+        cursor = resource["pageInfo"]["endCursor"]
+        has_next_page = resource["pageInfo"]["hasNextPage"]
         if not org_data:
             org_data = {
-                'url': resp['data']['organization']['url'],
-                'login': resp['data']['organization']['login'],
+                "url": resp["data"]["organization"]["url"],
+                "login": resp["data"]["organization"]["login"],
             }
 
     if not org_data:

cartography/intel/gsuite/__init__.py

@@ -20,17 +20,19 @@ from cartography.intel.gsuite import api
 from cartography.util import timeit
 
 OAUTH_SCOPES = [
-    'https://www.googleapis.com/auth/admin.directory.user.readonly',
-    'https://www.googleapis.com/auth/admin.directory.group.readonly',
-    'https://www.googleapis.com/auth/admin.directory.group.member',
+    "https://www.googleapis.com/auth/admin.directory.user.readonly",
+    "https://www.googleapis.com/auth/admin.directory.group.readonly",
+    "https://www.googleapis.com/auth/admin.directory.group.member",
 ]
 
 logger = logging.getLogger(__name__)
 
-Resources = namedtuple('Resources', 'admin')
+Resources = namedtuple("Resources", "admin")
 
 
-def _get_admin_resource(credentials: OAuth2Credentials | ServiceAccountCredentials) -> Resource:
+def _get_admin_resource(
+    credentials: OAuth2Credentials | ServiceAccountCredentials,
+) -> Resource:
     """
     Instantiates a Google API resource object to call the Google API.
     Used to pull users and groups.  See https://developers.google.com/admin-sdk/directory/v1/guides/manage-users
@@ -38,10 +40,17 @@ def _get_admin_resource(credentials: OAuth2Credentials | ServiceAccountCredentia
     :param credentials: The credentials object
     :return: An admin api resource object
     """
-    return googleapiclient.discovery.build('admin', 'directory_v1', credentials=credentials, cache_discovery=False)
+    return googleapiclient.discovery.build(
+        "admin",
+        "directory_v1",
+        credentials=credentials,
+        cache_discovery=False,
+    )
 
 
-def _initialize_resources(credentials: OAuth2Credentials | ServiceAccountCredentials) -> Resources:
+def _initialize_resources(
+    credentials: OAuth2Credentials | ServiceAccountCredentials,
+) -> Resources:
     """
     Create namedtuple of all resource objects necessary for Google API data gathering.
     :param credentials: The credentials object
@@ -66,7 +75,7 @@ def start_gsuite_ingestion(neo4j_session: neo4j.Session, config: Config) -> None
     }
 
     creds: OAuth2Credentials | ServiceAccountCredentials
-    if config.gsuite_auth_method == 'delegated':  # Legacy delegated method
+    if config.gsuite_auth_method == "delegated":  # Legacy delegated method
         if config.gsuite_config is None or not os.path.isfile(config.gsuite_config):
             logger.warning(
                 (
@@ -75,36 +84,38 @@ def start_gsuite_ingestion(neo4j_session: neo4j.Session, config: Config) -> None
                 ),
             )
             return
-        logger.info('Attempting to authenticate to GSuite using legacy delegated method')
+        logger.info(
+            "Attempting to authenticate to GSuite using legacy delegated method"
+        )
         try:
             creds = service_account.Credentials.from_service_account_file(
                 config.gsuite_config,
                 scopes=OAUTH_SCOPES,
             )
-            creds = creds.with_subject(os.environ.get('GSUITE_DELEGATED_ADMIN'))
+            creds = creds.with_subject(os.environ.get("GSUITE_DELEGATED_ADMIN"))
 
         except DefaultCredentialsError as e:
             logger.error(
                 (
                     "Unable to initialize GSuite creds. If you don't have GSuite data or don't want to load "
-                    'Gsuite data then you can ignore this message. Otherwise, the error code is: %s '
-                    'Make sure your GSuite credentials file (if any) is valid. '
-                    'For more details see README'
+                    "Gsuite data then you can ignore this message. Otherwise, the error code is: %s "
+                    "Make sure your GSuite credentials file (if any) is valid. "
+                    "For more details see README"
                 ),
                 e,
             )
             return
-    elif config.gsuite_auth_method == 'oauth':
+    elif config.gsuite_auth_method == "oauth":
         auth_tokens = json.loads(str(base64.b64decode(config.gsuite_config).decode()))
-        logger.info('Attempting to authenticate to GSuite using OAuth')
+        logger.info("Attempting to authenticate to GSuite using OAuth")
         try:
             creds = credentials.Credentials(
                 token=None,
-                client_id=auth_tokens['client_id'],
-                client_secret=auth_tokens['client_secret'],
-                refresh_token=auth_tokens['refresh_token'],
+                client_id=auth_tokens["client_id"],
+                client_secret=auth_tokens["client_secret"],
+                refresh_token=auth_tokens["refresh_token"],
                 expiry=None,
-                token_uri=auth_tokens['token_uri'],
+                token_uri=auth_tokens["token_uri"],
                 scopes=OAUTH_SCOPES,
             )
             creds.refresh(Request())
@@ -113,15 +124,15 @@ def start_gsuite_ingestion(neo4j_session: neo4j.Session, config: Config) -> None
             logger.error(
                 (
                     "Unable to initialize GSuite creds. If you don't have GSuite data or don't want to load "
-                    'Gsuite data then you can ignore this message. Otherwise, the error code is: %s '
-                    'Make sure your GSuite credentials are configured correctly, your credentials are valid. '
-                    'For more details see README'
+                    "Gsuite data then you can ignore this message. Otherwise, the error code is: %s "
+                    "Make sure your GSuite credentials are configured correctly, your credentials are valid. "
+                    "For more details see README"
                 ),
                 e,
             )
             return
-    elif config.gsuite_auth_method == 'default':
-        logger.info('Attempting to authenticate to GSuite using default credentials')
+    elif config.gsuite_auth_method == "default":
+        logger.info("Attempting to authenticate to GSuite using default credentials")
         try:
             creds, _ = default(scopes=OAUTH_SCOPES)
         except DefaultCredentialsError as e:
@@ -137,5 +148,15 @@ def start_gsuite_ingestion(neo4j_session: neo4j.Session, config: Config) -> None
             return
 
     resources = _initialize_resources(creds)
-    api.sync_gsuite_users(neo4j_session, resources.admin, config.update_tag, common_job_parameters)
-    api.sync_gsuite_groups(neo4j_session, resources.admin, config.update_tag, common_job_parameters)
+    api.sync_gsuite_users(
+        neo4j_session,
+        resources.admin,
+        config.update_tag,
+        common_job_parameters,
+    )
+    api.sync_gsuite_groups(
+        neo4j_session,
+        resources.admin,
+        config.update_tag,
+        common_job_parameters,
+    )

cartography/intel/gsuite/api.py

@@ -9,7 +9,6 @@ from googleapiclient.errors import HttpError
 from cartography.util import run_cleanup_job
 from cartography.util import timeit
 
-
 logger = logging.getLogger(__name__)
 
 
@@ -28,7 +27,11 @@ def get_all_groups(admin: Resource) -> List[Dict]:
     See https://googleapis.github.io/google-api-python-client/docs/epy/googleapiclient.discovery-module.html#build.
     :return: List of Google groups in domain
     """
-    request = admin.groups().list(customer='my_customer', maxResults=20, orderBy='email')
+    request = admin.groups().list(
+        customer="my_customer",
+        maxResults=20,
+        orderBy="email",
+    )
     response_objects = []
     while request is not None:
         try:
@@ -36,13 +39,16 @@ def get_all_groups(admin: Resource) -> List[Dict]:
             response_objects.append(resp)
             request = admin.groups().list_next(request, resp)
         except HttpError as e:
-            if e.resp.status == 403 and "Request had insufficient authentication scopes" in str(e):
+            if (
+                e.resp.status == 403
+                and "Request had insufficient authentication scopes" in str(e)
+            ):
                 logger.error(
                     "Missing required GSuite scopes. If using the gcloud CLI, ",
                     "run: gcloud auth application-default login --scopes="
                     '"https://www.googleapis.com/auth/admin.directory.user.readonly,'
-                    'https://www.googleapis.com/auth/admin.directory.group.readonly,'
-                    'https://www.googleapis.com/auth/admin.directory.group.member.readonly,'
+                    "https://www.googleapis.com/auth/admin.directory.group.readonly,"
+                    "https://www.googleapis.com/auth/admin.directory.group.member.readonly,"
                     'https://www.googleapis.com/auth/cloud-platform"',
                 )
             raise
@@ -51,34 +57,34 @@ def get_all_groups(admin: Resource) -> List[Dict]:
 
 @timeit
 def transform_groups(response_objects: List[Dict]) -> List[Dict]:
-    """  Strips list of API response objects to return list of group objects only
+    """Strips list of API response objects to return list of group objects only
 
     :param response_objects:
     :return: list of dictionary objects as defined in /docs/root/modules/gsuite/schema.md
     """
     groups: List[Dict] = []
     for response_object in response_objects:
-        for group in response_object['groups']:
+        for group in response_object["groups"]:
             groups.append(group)
     return groups
 
 
 @timeit
 def transform_users(response_objects: List[Dict]) -> List[Dict]:
-    """  Strips list of API response objects to return list of group objects only
+    """Strips list of API response objects to return list of group objects only
     :param response_objects:
     :return: list of dictionary objects as defined in /docs/root/modules/gsuite/schema.md
     """
     users: List[Dict] = []
     for response_object in response_objects:
-        for user in response_object['users']:
+        for user in response_object["users"]:
             users.append(user)
     return users
 
 
 @timeit
 def get_all_groups_for_email(admin: Resource, email: str) -> List[Dict]:
-    """ Fetch all groups of which the given group is a member
+    """Fetch all groups of which the given group is a member
 
     Arguments:
         email: A string representing the email address for the group
@@ -90,14 +96,14 @@ def get_all_groups_for_email(admin: Resource, email: str) -> List[Dict]:
     groups: List[Dict] = []
     while request is not None:
         resp = request.execute(num_retries=GOOGLE_API_NUM_RETRIES)
-        groups = groups + resp.get('groups', [])
+        groups = groups + resp.get("groups", [])
         request = admin.groups().list_next(request, resp)
     return groups
 
 
 @timeit
 def get_members_for_group(admin: Resource, group_email: str) -> List[Dict]:
-    """ Get all members for a google group
+    """Get all members for a google group
 
     :param group_email: A string representing the email address for the group
 
@@ -110,7 +116,7 @@ def get_members_for_group(admin: Resource, group_email: str) -> List[Dict]:
     members: List[Dict] = []
     while request is not None:
         resp = request.execute(num_retries=GOOGLE_API_NUM_RETRIES)
-        members = members + resp.get('members', [])
+        members = members + resp.get("members", [])
         request = admin.members().list_next(request, resp)
 
     return members
@@ -128,7 +134,11 @@ def get_all_users(admin: Resource) -> List[Dict]:
     :return: List of Google users in domain
     see https://developers.google.com/admin-sdk/directory/v1/guides/manage-users#get_all_domain_users
     """
-    request = admin.users().list(customer='my_customer', maxResults=500, orderBy='email')
+    request = admin.users().list(
+        customer="my_customer",
+        maxResults=500,
+        orderBy="email",
+    )
     response_objects = []
     while request is not None:
         resp = request.execute(num_retries=GOOGLE_API_NUM_RETRIES)
@@ -138,7 +148,11 @@ def get_all_users(admin: Resource) -> List[Dict]:
 
 
 @timeit
-def load_gsuite_groups(neo4j_session: neo4j.Session, groups: List[Dict], gsuite_update_tag: int) -> None:
+def load_gsuite_groups(
+    neo4j_session: neo4j.Session,
+    groups: List[Dict],
+    gsuite_update_tag: int,
+) -> None:
     ingestion_qry = """
         UNWIND $GroupData as group
         MERGE (g:GSuiteGroup{id: group.id})
@@ -156,12 +170,16 @@ def load_gsuite_groups(neo4j_session: neo4j.Session, groups: List[Dict], gsuite_
         g:GCPPrincipal,
         g.lastupdated = $UpdateTag
     """
-    logger.info(f'Ingesting {len(groups)} gsuite groups')
+    logger.info(f"Ingesting {len(groups)} gsuite groups")
     neo4j_session.run(ingestion_qry, GroupData=groups, UpdateTag=gsuite_update_tag)
 
 
 @timeit
-def load_gsuite_users(neo4j_session: neo4j.Session, users: List[Dict], gsuite_update_tag: int) -> None:
+def load_gsuite_users(
+    neo4j_session: neo4j.Session,
+    users: List[Dict],
+    gsuite_update_tag: int,
+) -> None:
     ingestion_qry = """
         UNWIND $UserData as user
         MERGE (u:GSuiteUser{id: user.id})
@@ -196,12 +214,17 @@ def load_gsuite_users(neo4j_session: neo4j.Session, users: List[Dict], gsuite_up
         u:GCPPrincipal,
         u.lastupdated = $UpdateTag
     """
-    logger.info(f'Ingesting {len(users)} gsuite users')
+    logger.info(f"Ingesting {len(users)} gsuite users")
     neo4j_session.run(ingestion_qry, UserData=users, UpdateTag=gsuite_update_tag)
 
 
 @timeit
-def load_gsuite_members(neo4j_session: neo4j.Session, group: Dict, members: List[Dict], gsuite_update_tag: int) -> None:
+def load_gsuite_members(
+    neo4j_session: neo4j.Session,
+    group: Dict,
+    members: List[Dict],
+    gsuite_update_tag: int,
+) -> None:
     ingestion_qry = """
         UNWIND $MemberData as member
         MATCH (user:GSuiteUser {id: member.id}),(group:GSuiteGroup {id: $GroupID })
@@ -226,22 +249,33 @@ def load_gsuite_members(neo4j_session: neo4j.Session, group: Dict, members: List
         SET
         r.lastupdated = $UpdateTag
     """
-    neo4j_session.run(membership_qry, MemberData=members, GroupID=group.get("id"), UpdateTag=gsuite_update_tag)
+    neo4j_session.run(
+        membership_qry,
+        MemberData=members,
+        GroupID=group.get("id"),
+        UpdateTag=gsuite_update_tag,
+    )
 
 
 @timeit
-def cleanup_gsuite_users(neo4j_session: neo4j.Session, common_job_parameters: Dict) -> None:
+def cleanup_gsuite_users(
+    neo4j_session: neo4j.Session,
+    common_job_parameters: Dict,
+) -> None:
     run_cleanup_job(
-        'gsuite_ingest_users_cleanup.json',
+        "gsuite_ingest_users_cleanup.json",
         neo4j_session,
         common_job_parameters,
     )
 
 
 @timeit
-def cleanup_gsuite_groups(neo4j_session: neo4j.Session, common_job_parameters: Dict) -> None:
+def cleanup_gsuite_groups(
+    neo4j_session: neo4j.Session,
+    common_job_parameters: Dict,
+) -> None:
     run_cleanup_job(
-        'gsuite_ingest_groups_cleanup.json',
+        "gsuite_ingest_groups_cleanup.json",
         neo4j_session,
         common_job_parameters,
     )
@@ -249,7 +283,10 @@ def cleanup_gsuite_groups(neo4j_session: neo4j.Session, common_job_parameters: D
 
 @timeit
 def sync_gsuite_users(
-    neo4j_session: neo4j.Session, admin: Resource, gsuite_update_tag: int, common_job_parameters: Dict,
+    neo4j_session: neo4j.Session,
+    admin: Resource,
+    gsuite_update_tag: int,
+    common_job_parameters: Dict,
 ) -> None:
     """
     GET GSuite user objects using the google admin api resource, load the data into Neo4j and clean up stale nodes.
@@ -261,7 +298,7 @@ def sync_gsuite_users(
     :param common_job_parameters: Parameters to carry to the Neo4j jobs
     :return: Nothing
     """
-    logger.debug('Syncing GSuite Users')
+    logger.debug("Syncing GSuite Users")
     resp_objs = get_all_users(admin)
     users = transform_users(resp_objs)
     load_gsuite_users(neo4j_session, users, gsuite_update_tag)
@@ -270,7 +307,10 @@ def sync_gsuite_users(
 
 @timeit
 def sync_gsuite_groups(
-    neo4j_session: neo4j.Session, admin: Resource, gsuite_update_tag: int, common_job_parameters: Dict,
+    neo4j_session: neo4j.Session,
+    admin: Resource,
+    gsuite_update_tag: int,
+    common_job_parameters: Dict,
 ) -> None:
     """
     GET GSuite group objects using the google admin api resource, load the data into Neo4j and clean up stale nodes.
@@ -282,7 +322,7 @@ def sync_gsuite_groups(
     :param common_job_parameters: Parameters to carry to the Neo4j jobs
     :return: Nothing
     """
-    logger.debug('Syncing GSuite Groups')
+    logger.debug("Syncing GSuite Groups")
     resp_objs = get_all_groups(admin)
     groups = transform_groups(resp_objs)
     load_gsuite_groups(neo4j_session, groups, gsuite_update_tag)
@@ -292,8 +332,11 @@ def sync_gsuite_groups(
 
 @timeit
 def sync_gsuite_members(
-    groups: List[Dict], neo4j_session: neo4j.Session, admin: Resource, gsuite_update_tag: int,
+    groups: List[Dict],
+    neo4j_session: neo4j.Session,
+    admin: Resource,
+    gsuite_update_tag: int,
 ) -> None:
     for group in groups:
-        members = get_members_for_group(admin, group['email'])
+        members = get_members_for_group(admin, group["email"])
         load_gsuite_members(neo4j_session, group, members, gsuite_update_tag)

cartography/intel/jamf/__init__.py

@@ -1,13 +1,31 @@
+import logging
+
 import neo4j
 
 from cartography.config import Config
 from cartography.intel.jamf import computers
 from cartography.util import timeit
 
+logger = logging.getLogger(__name__)
+
 
 @timeit
 def start_jamf_ingestion(neo4j_session: neo4j.Session, config: Config) -> None:
+
+    if not config.jamf_base_uri or not config.jamf_user or not config.jamf_password:
+        # If the config is not set, we don't want to run this module
+        logger.info(
+            "Jamf import is not configured - skipping this module. See docs to configure."
+        )
+        return
+
     common_job_parameters = {
         "UPDATE_TAG": config.update_tag,
     }
-    computers.sync(neo4j_session, config.jamf_base_uri, config.jamf_user, config.jamf_password, common_job_parameters)
+    computers.sync(
+        neo4j_session,
+        config.jamf_base_uri,
+        config.jamf_user,
+        config.jamf_password,
+        common_job_parameters,
+    )

cartography/intel/jamf/computers.py

@@ -8,17 +8,24 @@ from cartography.intel.jamf.util import call_jamf_api
 from cartography.util import run_cleanup_job
 from cartography.util import timeit
 
-
 logger = logging.getLogger(__name__)
 
 
 @timeit
-def get_computer_groups(jamf_base_uri: str, jamf_user: str, jamf_password: str) -> List[Dict]:
+def get_computer_groups(
+    jamf_base_uri: str,
+    jamf_user: str,
+    jamf_password: str,
+) -> List[Dict]:
     return call_jamf_api("/computergroups", jamf_base_uri, jamf_user, jamf_password)
 
 
 @timeit
-def load_computer_groups(data: Dict, neo4j_session: neo4j.Session, update_tag: int) -> None:
+def load_computer_groups(
+    data: Dict,
+    neo4j_session: neo4j.Session,
+    update_tag: int,
+) -> None:
     ingest_groups = """
     UNWIND $JsonData as group
     MERGE (g:JamfComputerGroup{id: group.id})
@@ -33,12 +40,19 @@ def load_computer_groups(data: Dict, neo4j_session: neo4j.Session, update_tag: i
 
 @timeit
 def cleanup(neo4j_session: neo4j.Session, common_job_parameters: Dict) -> None:
-    run_cleanup_job('jamf_import_computers_cleanup.json', neo4j_session, common_job_parameters)
+    run_cleanup_job(
+        "jamf_import_computers_cleanup.json",
+        neo4j_session,
+        common_job_parameters,
+    )
 
 
 @timeit
 def sync_computer_groups(
-    neo4j_session: neo4j.Session, update_tag: int, jamf_base_uri: str, jamf_user: str,
+    neo4j_session: neo4j.Session,
+    update_tag: int,
+    jamf_base_uri: str,
+    jamf_user: str,
     jamf_password: str,
 ) -> None:
     groups = get_computer_groups(jamf_base_uri, jamf_user, jamf_password)
@@ -47,7 +61,16 @@ def sync_computer_groups(
 
 @timeit
 def sync(
-    neo4j_session: neo4j.Session, jamf_base_uri: str, jamf_user: str, jamf_password: str,
+    neo4j_session: neo4j.Session,
+    jamf_base_uri: str,
+    jamf_user: str,
+    jamf_password: str,
     common_job_parameters: Dict,
 ) -> None:
-    sync_computer_groups(neo4j_session, common_job_parameters['UPDATE_TAG'], jamf_base_uri, jamf_user, jamf_password)
+    sync_computer_groups(
+        neo4j_session,
+        common_job_parameters["UPDATE_TAG"],
+        jamf_base_uri,
+        jamf_user,
+        jamf_password,
+    )