Refactor the util directory to use subpackages.

endpoints/trigger.py

@@ -17,8 +17,8 @@ from jsonschema import validate
 from data import model
 
 from app import app, userfiles as user_files, github_trigger, get_app_url
-from util.tarfileappender import TarfileAppender
-from util.ssh import generate_ssh_keypair
+from util.registry.tarfileappender import TarfileAppender
+from util.security.ssh import generate_ssh_keypair
 
 
 client = app.config['HTTPCLIENT']

endpoints/v1/registry.py

@@ -10,12 +10,12 @@ from app import storage as store, image_diff_queue, app
 from auth.auth import process_auth, extract_namespace_repo_from_session
 from auth.auth_context import get_authenticated_user, get_grant_user_context
 from digest import checksums
-from util import changes
+from util.registry import changes
 from util.http import abort, exact_abort
 from auth.permissions import (ReadRepositoryPermission,
                               ModifyRepositoryPermission)
 from data import model, database
-from util import gzipstream
+from util.registry import gzipstream
 from endpoints.v1 import v1_bp
 from endpoints.decorators import anon_protect
 
@@ -578,8 +578,7 @@ def process_image_changes(namespace, repository, image_id):
     layer_files = changes.files_and_dirs_from_tar(layer_tar_stream,
                                                   removed_files)
 
-    new_metadata = changes.compute_new_diffs_and_fs(parent_trie, layer_files,
-                                                    removed_files)
+    new_metadata = changes.compute_new_diffs_and_fs(parent_trie, layer_files, removed_files)
   (new_trie, added, changed, removed) = new_metadata
 
   # Write out the new trie

endpoints/verbs.py

@@ -12,8 +12,8 @@ from endpoints.trackhelper import track_and_log
 from endpoints.decorators import anon_protect
 from storage import Storage
 
-from util.queuefile import QueueFile
-from util.queueprocess import QueueProcess
+from util.registry.queuefile import QueueFile
+from util.registry.queueprocess import QueueProcess
 from formats.squashed import SquashedDockerImage
 from formats.aci import ACIImage