add additional error handling and only fetch github info once

Author: TimidRobot

normalize_repos/normalize_repos.py

@@ -8,6 +8,8 @@
 
 # Standard library
 import logging
+import sys
+import traceback
 
 # Third-party
 from github import UnknownObjectException
@@ -26,11 +28,24 @@
 log.reset_handler()
 
 
+class ScriptError(Exception):
+    def __init__(self, message, code=None):
+        self.code = code if code else 1
+        message = "({}) {}".format(self.code, message)
+        super(ScriptError, self).__init__(message)
+
+
 def get_cc_repos(github):
     cc = get_cc_organization(github)
     return cc.get_repos()
 
 
+def set_repo_labels(repos):
+    logger.log(logging.INFO, "Syncing labels...")
+    set_labels(repos, *get_labels())
+    logger.log(log.SUCCESS, "done.")
+
+
 def is_engineering_project(repo):
     try:
         contents = repo.get_contents(".cc-metadata.yml")
@@ -65,15 +80,34 @@ def update_branch_protection(repo):
         print(f'Skipping branch protection for exempt repo: "{repo.name}"')
 
 
-if __name__ == "__main__":
-    logger.log(logging.INFO, "Starting normalization")
-    logger.log(logging.INFO, "Syncing labels...")
-    set_labels(*get_labels())
-    logger.log(log.SUCCESS, "done.")
+def update_branches(repos):
+    for repo in repos:
+        # TODO: Set up automatic deletion of merged branches
+        update_branch_protection(repo)
+
 
+def main():
+    logger.log(logging.INFO, "Starting normalization")
     github = set_up_github_client()
     repos = get_cc_repos(github)
+    set_repo_labels(repos)
+    update_branches(repos)
 
-    for repo in repos:
-        # TODO: Set up automatic deletion of merged branches
-        update_branch_protection(repo)
+
+if __name__ == "__main__":
+    try:
+        main()
+    except SystemExit as e:
+        sys.exit(e.code)
+    except KeyboardInterrupt:
+        logger.log(logging.INFO, "Halted via KeyboardInterrupt.")
+        sys.exit(130)
+    except ScriptError:
+        error_type, error_value, error_traceback = sys.exc_info()
+        logger.log(logging.CRITICAL, f"{error_value}")
+        sys.exit(error_value.code)
+    except Exception:
+        logger.log(
+            logging.ERROR, "Unhandled exception: {traceback.print_exc()}"
+        )
+        sys.exit(1)

normalize_repos/set_labels.py

@@ -2,7 +2,6 @@
 import logging
 
 # Local/library specific
-from utils import set_up_github_client, get_cc_organization
 import log
 
 
@@ -69,22 +68,13 @@ def map_repo_to_labels(repo, final_labels, non_destructive=True):
     logger.log(log.SUCCESS, "done.")
 
 
-def set_labels(standard_labels, repo_specific_labels):
+def set_labels(repos, standard_labels, repo_specific_labels):
     """
     Set labels on all repos for the organisation. This is the main entrypoint of
     the module.
     """
 
-    logger.log(logging.INFO, "Setting up...")
-    client = set_up_github_client()
-    organization = get_cc_organization(client)
-    logger.log(log.SUCCESS, "done.")
-
-    logger.log(logging.INFO, "Fetching repos...")
-    repos = list(organization.get_repos())
-    logger.log(log.SUCCESS, f"done. Found {len(repos)} repos.")
-
-    for repo in repos:
+    for repo in list(repos):
         logger.log(logging.INFO, f"Getting labels for repo '{repo.name}'...")
         labels = standard_labels + repo_specific_labels.get(repo.name, [])
         logger.log(log.SUCCESS, f"done. Found {len(labels)} labels.")