Move notification helper code into the root module

endpoints/api/repositorynotification.py

@@ -7,10 +7,10 @@ from endpoints.api import (RepositoryParamResource, nickname, resource, require_
                            log_action, validate_json_request, request_error,
                            path_param, disallow_for_app_repositories)
 from endpoints.exception import NotFound
+from notifications import build_notification_data
 from notifications.notificationevent import NotificationEvent
 from notifications.notificationmethod import (NotificationMethod,
                                               CannotValidateNotificationMethodException)
-from notifications.notificationhelper import build_notification_data
 from workers.notificationworker.models_pre_oci import notification
 from endpoints.api.repositorynotification_models_pre_oci import pre_oci_model as model
 

endpoints/building.py

@@ -9,7 +9,7 @@ from app import app, dockerfile_build_queue, metric_queue
 from data import model
 from data.database import db
 from auth.auth_context import get_authenticated_user
-from notifications.notificationhelper import spawn_notification
+from notifications import spawn_notification
 from util.names import escape_tag
 from util.morecollections import AttrDict
 

endpoints/v1/index.py

@@ -17,7 +17,7 @@ from endpoints.decorators import anon_protect, anon_allowed, parse_repository_na
 from endpoints.notificationhelper import spawn_notification
 from endpoints.v1 import v1_bp
 from endpoints.v1.models_pre_oci import pre_oci_model as model
-from notifications.notificationhelper import spawn_notification
+from notifications import spawn_notification
 from util.audit import track_and_log
 from util.http import abort
 from util.names import REPOSITORY_NAME_REGEX

endpoints/v2/manifest.py

@@ -20,7 +20,7 @@ from endpoints.v2.labelhandlers import handle_label
 from image.docker import ManifestException
 from image.docker.schema1 import DockerSchema1Manifest, DockerSchema1ManifestBuilder
 from image.docker.schema2 import DOCKER_SCHEMA2_CONTENT_TYPES
-from notifications.notificationhelper import spawn_notification
+from notifications import spawn_notification
 from util.audit import track_and_log
 from util.names import VALID_TAG_PATTERN
 from util.registry.replication import queue_replication_batch