Start on data model changes and API changes for the new repository notification system

data/database.py

@@ -187,12 +187,6 @@ class PermissionPrototype(BaseModel):
     )
 
 
-class Webhook(BaseModel):
-  public_id = CharField(default=random_string_generator(length=64),
-                        unique=True, index=True)
-  repository = ForeignKeyField(Repository)
-  parameters = TextField()
-
 
 class AccessToken(BaseModel):
   friendly_name = CharField(null=True)
@@ -371,9 +365,35 @@ class Notification(BaseModel):
   created = DateTimeField(default=datetime.now, index=True)
 
 
+
+class ExternalNotificationEvent(BaseModel):
+  name = CharField(index=True, unique=True)
+
+
+class ExternalNotificationMethod(BaseModel):
+  name = CharField(index=True, unique=True)
+
+
+class RepositoryNotification(BaseModel):
+  uuid = CharField(default=uuid_generator, index=True)
+  repository = ForeignKeyField(Repository, index=True)
+  event = ForeignKeyField(ExternalNotificationEvent)
+  method = ForeignKeyField(ExternalNotificationMethod)
+  config_json = TextField()
+
+
+# TODO: remove after migration.
+class Webhook(BaseModel):
+  public_id = CharField(default=random_string_generator(length=64),
+                        unique=True, index=True)
+  repository = ForeignKeyField(Repository)
+  parameters = TextField()
+
+
 all_models = [User, Repository, Image, AccessToken, Role, RepositoryPermission, Visibility,
               RepositoryTag, EmailConfirmation, FederatedLogin, LoginService, QueueItem,
-              RepositoryBuild, Team, TeamMember, TeamRole, Webhook, LogEntryKind, LogEntry,
+              RepositoryBuild, Team, TeamMember, TeamRole, LogEntryKind, LogEntry,
               PermissionPrototype, ImageStorage, BuildTriggerService, RepositoryBuildTrigger,
               OAuthApplication, OAuthAuthorizationCode, OAuthAccessToken, NotificationKind,
-              Notification, ImageStorageLocation, ImageStoragePlacement]
+              Notification, ImageStorageLocation, ImageStoragePlacement,
+              ExternalNotificationEvent, ExternalNotificationMethod, RepositoryNotification, Webhook]

data/model/legacy.py

@@ -60,6 +60,10 @@ class InvalidWebhookException(DataModelException):
   pass
 
 
+class InvalidNotificationException(DataModelException):
+  pass
+
+
 class InvalidBuildTriggerException(DataModelException):
   pass
 
@@ -1528,6 +1532,39 @@ def get_pull_credentials(robotname):
   }
 
 
+def create_repo_notification(repo, event_name, method_name, config):
+  event = ExternalNotificationEvent.get(ExternalNotificationEvent.name == event_name)
+  method = ExternalNotificationMethod.get(ExternalNotificationMethod.name == method_name)
+
+  return RepositoryNotification.create(repository=repo, event=event, method=method,
+                                       confing_json=json.dumps(config))
+
+
+def get_repo_notification(namespace_name, repository_name, uuid):
+  joined = RepositoryNotification.select().join(Repository)
+  found = list(joined.where(Repository.namespace == namespace_name,
+                            Repository.name == repository_name,
+                            RepositoryNotification.uuid == uuid))
+
+  if not found:
+    raise InvalidNotificationException('No repository notification found with id: %s' % uuid)
+
+  return found[0]
+
+
+def delete_repo_notification(namespace_name, repository_name, uuid):
+  found = get_repo_notification(namespace_name, repository_name, uuid)
+  found.delete_instance()
+  return found
+
+
+def list_repo_notifications(namespace_name, repository_name):
+  joined = RepositoryNotification.select().join(Repository)
+  return joined.where(Repository.namespace == namespace_name,
+                      Repository.name == repository_name)
+
+
+# TODO: remove webhook methods when no longer used.
 def create_webhook(repo, params_obj):
   return Webhook.create(repository=repo, parameters=json.dumps(params_obj))
 

endpoints/api/__init__.py

@@ -307,6 +307,7 @@ import endpoints.api.organization
 import endpoints.api.permission
 import endpoints.api.prototype
 import endpoints.api.repository
+import endpoints.api.repositorynotification
 import endpoints.api.repotoken
 import endpoints.api.robot
 import endpoints.api.search

endpoints/api/repositorynotification.py

@@ -0,0 +1,107 @@
+import json
+
+from flask import request
+
+from endpoints.api import (RepositoryParamResource, nickname, resource, require_repo_admin,
+                           log_action, validate_json_request, api, NotFound)
+from data import model
+
+
+def notification_view(notification):
+  config = {}
+  try:
+    config = json.loads(notification.config_json)
+  except:
+    config = {}
+
+  return {
+    'uuid': notification.uuid,
+    'kind': notification.kind,
+    'method': notification.method,
+    'config': config
+  }
+
+
+@resource('/v1/repository/<repopath:repository>/notification/')
+class NotificaitonList(RepositoryParamResource):
+  """ Resource for dealing with listing and creating notifications on a repository. """
+  schemas = {
+    'NotificationCreateRequest': {
+      'id': 'NotificationCreateRequest',
+      'type': 'object',
+      'description': 'Information for creating a notification on a repository',
+      'required': [
+        'event',
+        'method',
+        'config'
+      ],
+      'properties': {
+        'event': {
+          'type': 'string',
+          'description': 'The event on which the notification will respond',
+        },
+        'method': {
+          'type': 'string',
+          'description': 'The method of notification (such as email or web callback)',
+        },
+        'config': {
+          'type': 'object',
+          'description': 'JSON config information for the specific method of notification'
+        }
+      }
+    },
+  }
+
+  @require_repo_admin
+  @nickname('createRepoNotification')
+  @validate_json_request('NotificationCreateRequest')
+  def post(self, namespace, repository):
+    """ Create a new notification for the specified repository. """
+    repo = model.get_repository(namespace, repository)
+    json = request.get_json()
+
+    notification = model.create_repo_notification(repo, json['event'], json['method'],
+                                                  json['config'])
+
+    resp = notification_view(notification)
+    log_action('add_repo_notification', namespace, 
+               {'repo': repository, 'notification_id': notification.uuid,
+                'event': json['event'], 'method': json['method']},
+               repo=repo)
+    return resp, 201
+
+  @require_repo_admin
+  @nickname('listRepoNotifications')
+  def get(self, namespace, repository):
+    """ List the notifications for the specified repository. """
+    notifications = model.list_repo_notifications(namespace, repository)
+    return {
+      'notifications': [notification_view(n) for n in notifications]
+    }
+
+
+@resource('/v1/repository/<repopath:repository>/notification/<uuid>')
+class Notification(RepositoryParamResource):
+  """ Resource for dealing with specific notifications. """
+  @require_repo_admin
+  @nickname('getRepoNotification')
+  def get(self, namespace, repository, uuid):
+    """ Get information for the specified notification. """
+    try:
+      notification = model.get_repo_notification(namespace, repository, uuid)
+    except model.InvalidNotificationException:
+      raise NotFound()
+
+    return notification_view(notification)
+
+  @require_repo_admin
+  @nickname('deleteRepoNotification')
+  def delete(self, namespace, repository, uuid):
+    """ Deletes the specified notification. """
+    notification = model.delete_repo_notification(namespace, repository, uuid)
+    log_action('delete_repo_notification', namespace, 
+               {'repo': repository, 'notification_id': uuid,
+                'event': notification.event.name, 'method': notification.method.name},
+               repo=model.get_repository(namespace, repository))
+
+    return 'No Content', 204

initdb.py

@@ -206,8 +206,6 @@ def initialize_database():
   LogEntryKind.create(name='change_repo_visibility')
   LogEntryKind.create(name='add_repo_accesstoken')
   LogEntryKind.create(name='delete_repo_accesstoken')
-  LogEntryKind.create(name='add_repo_webhook')
-  LogEntryKind.create(name='delete_repo_webhook')
   LogEntryKind.create(name='set_repo_description')
 
   LogEntryKind.create(name='build_dockerfile')
@@ -231,6 +229,13 @@ def initialize_database():
   LogEntryKind.create(name='delete_application')
   LogEntryKind.create(name='reset_application_client_secret')
 
+  # TODO: remove these when webhooks are removed.
+  LogEntryKind.create(name='add_repo_webhook')
+  LogEntryKind.create(name='delete_repo_webhook')
+
+  LogEntryKind.create(name='add_repo_notification')
+  LogEntryKind.create(name='delete_repo_notification')
+
   NotificationKind.create(name='password_required')
   NotificationKind.create(name='over_private_usage')
   NotificationKind.create(name='expiring_license')
@@ -241,6 +246,15 @@ def initialize_database():
   ImageStorageLocation.create(name='local_eu')
   ImageStorageLocation.create(name='local_us')
 
+  ExternalNotificationEvent.create(name='repo_push')
+  ExternalNotificationEvent.create(name='build_start')
+  ExternalNotificationEvent.create(name='build_success')
+  ExternalNotificationEvent.create(name='build_failure')
+
+  ExternalNotificationMethod.create(name='quay_notification')
+  ExternalNotificationMethod.create(name='email')
+  ExternalNotificationMethod.create(name='webhook')
+
 
 def wipe_database():
   logger.debug('Wiping all data from the DB.')

test/data/registry/us/sharedimages/08a8ab1f-4aaa-4337-88ab-5b5c71a8d492/diffs.json

@@ -1,7 +1,45 @@
 {
   "removed": [], 
   "added": [
-    "/elasticsearch-0.90.5.tar.gz"
+    "/opt/elasticsearch-0.90.5/LICENSE.txt", 
+    "/opt/elasticsearch-0.90.5/NOTICE.txt", 
+    "/opt/elasticsearch-0.90.5/README.textile", 
+    "/opt/elasticsearch-0.90.5/bin/elasticsearch", 
+    "/opt/elasticsearch-0.90.5/bin/elasticsearch.in.sh", 
+    "/opt/elasticsearch-0.90.5/bin/plugin", 
+    "/opt/elasticsearch-0.90.5/config/elasticsearch.yml", 
+    "/opt/elasticsearch-0.90.5/config/logging.yml", 
+    "/opt/elasticsearch-0.90.5/lib/elasticsearch-0.90.5.jar", 
+    "/opt/elasticsearch-0.90.5/lib/jna-3.3.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/jts-1.12.jar", 
+    "/opt/elasticsearch-0.90.5/lib/log4j-1.2.17.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-analyzers-common-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-codecs-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-core-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-grouping-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-highlighter-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-join-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-memory-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-misc-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-queries-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-queryparser-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-sandbox-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-spatial-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-suggest-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-freebsd-6.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-linux.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-solaris.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-ia64-linux.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc-solaris.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc64-solaris.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal-macosx.dylib", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal64-macosx.dylib", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-5.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-6.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-linux.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-solaris.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/sigar-1.6.4.jar", 
+    "/opt/elasticsearch-0.90.5/lib/spatial4j-0.3.jar"
   ], 
   "changed": []
 }

test/data/registry/us/sharedimages/4259533e-868d-4db3-9a78-fc24ffc03a2b/diffs.json

@@ -1,45 +1,38 @@
 {
   "removed": [], 
   "added": [
-    "/opt/elasticsearch-0.90.5/LICENSE.txt", 
+    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_Release", 
-    "/opt/elasticsearch-0.90.5/NOTICE.txt", 
+    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_Release.gpg", 
-    "/opt/elasticsearch-0.90.5/README.textile", 
+    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_main_binary-amd64_Packages", 
-    "/opt/elasticsearch-0.90.5/bin/elasticsearch", 
+    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_main_i18n_Translation-en", 
-    "/opt/elasticsearch-0.90.5/bin/elasticsearch.in.sh", 
+    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_main_source_Sources", 
-    "/opt/elasticsearch-0.90.5/bin/plugin", 
+    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_multiverse_binary-amd64_Packages", 
-    "/opt/elasticsearch-0.90.5/config/elasticsearch.yml", 
+    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_multiverse_i18n_Translation-en", 
-    "/opt/elasticsearch-0.90.5/config/logging.yml", 
+    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_multiverse_source_Sources", 
-    "/opt/elasticsearch-0.90.5/lib/elasticsearch-0.90.5.jar", 
+    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_restricted_binary-amd64_Packages", 
-    "/opt/elasticsearch-0.90.5/lib/jna-3.3.0.jar", 
+    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_restricted_i18n_Translation-en", 
-    "/opt/elasticsearch-0.90.5/lib/jts-1.12.jar", 
+    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_restricted_source_Sources", 
-    "/opt/elasticsearch-0.90.5/lib/log4j-1.2.17.jar", 
+    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_universe_binary-amd64_Packages", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-analyzers-common-4.4.0.jar", 
+    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_universe_i18n_Translation-en", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-codecs-4.4.0.jar", 
+    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_universe_source_Sources", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-core-4.4.0.jar", 
+    "/var/lib/apt/lists/lock", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-grouping-4.4.0.jar", 
+    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_Release", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-highlighter-4.4.0.jar", 
+    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_Release.gpg", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-join-4.4.0.jar", 
+    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_main_binary-amd64_Packages", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-memory-4.4.0.jar", 
+    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_main_i18n_Translation-en", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-misc-4.4.0.jar", 
+    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_main_source_Sources", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-queries-4.4.0.jar", 
+    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_multiverse_binary-amd64_Packages", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-queryparser-4.4.0.jar", 
+    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_multiverse_i18n_Translation-en", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-sandbox-4.4.0.jar", 
+    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_multiverse_source_Sources", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-spatial-4.4.0.jar", 
+    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_restricted_binary-amd64_Packages", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-suggest-4.4.0.jar", 
+    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_restricted_i18n_Translation-en", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-freebsd-6.so", 
+    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_restricted_source_Sources", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-linux.so", 
+    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_universe_binary-amd64_Packages", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-solaris.so", 
+    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_universe_i18n_Translation-en", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-ia64-linux.so", 
+    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_universe_source_Sources"
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc64-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal-macosx.dylib", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal64-macosx.dylib", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-5.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-6.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/sigar-1.6.4.jar", 
-    "/opt/elasticsearch-0.90.5/lib/spatial4j-0.3.jar"
   ], 
-  "changed": []
+  "changed": [
+    "/var/cache/apt/pkgcache.bin", 
+    "/var/cache/apt/srcpkgcache.bin"
+  ]
 }

test/data/registry/us/sharedimages/4a71f3db-cbb1-4c3b-858f-1be032b3e875/diffs.json

@@ -1,8 +1,45 @@
 {
   "removed": [], 
   "added": [
-    "/root/.bash_history", 
+    "/opt/elasticsearch-0.90.5/LICENSE.txt", 
-    "/usr/sbin/policy-rc.d"
+    "/opt/elasticsearch-0.90.5/NOTICE.txt", 
+    "/opt/elasticsearch-0.90.5/README.textile", 
+    "/opt/elasticsearch-0.90.5/bin/elasticsearch", 
+    "/opt/elasticsearch-0.90.5/bin/elasticsearch.in.sh", 
+    "/opt/elasticsearch-0.90.5/bin/plugin", 
+    "/opt/elasticsearch-0.90.5/config/elasticsearch.yml", 
+    "/opt/elasticsearch-0.90.5/config/logging.yml", 
+    "/opt/elasticsearch-0.90.5/lib/elasticsearch-0.90.5.jar", 
+    "/opt/elasticsearch-0.90.5/lib/jna-3.3.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/jts-1.12.jar", 
+    "/opt/elasticsearch-0.90.5/lib/log4j-1.2.17.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-analyzers-common-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-codecs-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-core-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-grouping-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-highlighter-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-join-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-memory-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-misc-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-queries-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-queryparser-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-sandbox-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-spatial-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/lucene-suggest-4.4.0.jar", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-freebsd-6.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-linux.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-solaris.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-ia64-linux.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc-solaris.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc64-solaris.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal-macosx.dylib", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal64-macosx.dylib", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-5.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-6.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-linux.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-solaris.so", 
+    "/opt/elasticsearch-0.90.5/lib/sigar/sigar-1.6.4.jar", 
+    "/opt/elasticsearch-0.90.5/lib/spatial4j-0.3.jar"
   ], 
   "changed": []
 }

test/data/registry/us/sharedimages/d40d531a-c70c-47f9-bf5b-2a4381db2d60/diffs.json

@@ -1,85 +1,5 @@
 {
-  "removed": [
+  "removed": [], 
-    "/opt/elasticsearch-0.90.5/LICENSE.txt", 
+  "added": [], 
-    "/opt/elasticsearch-0.90.5/NOTICE.txt", 
-    "/opt/elasticsearch-0.90.5/README.textile", 
-    "/opt/elasticsearch-0.90.5/bin/elasticsearch", 
-    "/opt/elasticsearch-0.90.5/bin/elasticsearch.in.sh", 
-    "/opt/elasticsearch-0.90.5/bin/plugin", 
-    "/opt/elasticsearch-0.90.5/config/elasticsearch.yml", 
-    "/opt/elasticsearch-0.90.5/config/logging.yml", 
-    "/opt/elasticsearch-0.90.5/lib/elasticsearch-0.90.5.jar", 
-    "/opt/elasticsearch-0.90.5/lib/jna-3.3.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/jts-1.12.jar", 
-    "/opt/elasticsearch-0.90.5/lib/log4j-1.2.17.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-analyzers-common-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-codecs-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-core-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-grouping-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-highlighter-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-join-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-memory-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-misc-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-queries-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-queryparser-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-sandbox-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-spatial-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/lucene-suggest-4.4.0.jar", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-freebsd-6.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-amd64-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-ia64-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-sparc64-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal-macosx.dylib", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-universal64-macosx.dylib", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-5.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-freebsd-6.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-linux.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/libsigar-x86-solaris.so", 
-    "/opt/elasticsearch-0.90.5/lib/sigar/sigar-1.6.4.jar", 
-    "/opt/elasticsearch-0.90.5/lib/spatial4j-0.3.jar"
-  ], 
-  "added": [
-    "/opt/elasticsearch/LICENSE.txt", 
-    "/opt/elasticsearch/NOTICE.txt", 
-    "/opt/elasticsearch/README.textile", 
-    "/opt/elasticsearch/bin/elasticsearch", 
-    "/opt/elasticsearch/bin/elasticsearch.in.sh", 
-    "/opt/elasticsearch/bin/plugin", 
-    "/opt/elasticsearch/config/elasticsearch.yml", 
-    "/opt/elasticsearch/config/logging.yml", 
-    "/opt/elasticsearch/lib/elasticsearch-0.90.5.jar", 
-    "/opt/elasticsearch/lib/jna-3.3.0.jar", 
-    "/opt/elasticsearch/lib/jts-1.12.jar", 
-    "/opt/elasticsearch/lib/log4j-1.2.17.jar", 
-    "/opt/elasticsearch/lib/lucene-analyzers-common-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-codecs-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-core-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-grouping-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-highlighter-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-join-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-memory-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-misc-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-queries-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-queryparser-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-sandbox-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-spatial-4.4.0.jar", 
-    "/opt/elasticsearch/lib/lucene-suggest-4.4.0.jar", 
-    "/opt/elasticsearch/lib/sigar/libsigar-amd64-freebsd-6.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-amd64-linux.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-amd64-solaris.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-ia64-linux.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-sparc-solaris.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-sparc64-solaris.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-universal-macosx.dylib", 
-    "/opt/elasticsearch/lib/sigar/libsigar-universal64-macosx.dylib", 
-    "/opt/elasticsearch/lib/sigar/libsigar-x86-freebsd-5.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-x86-freebsd-6.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-x86-linux.so", 
-    "/opt/elasticsearch/lib/sigar/libsigar-x86-solaris.so", 
-    "/opt/elasticsearch/lib/sigar/sigar-1.6.4.jar", 
-    "/opt/elasticsearch/lib/spatial4j-0.3.jar"
-  ], 
   "changed": []
 }

test/data/registry/us/sharedimages/e969ff76-e87d-4ea3-8cb3-0db9b5bcb8d9/diffs.json

@@ -1,38 +1,8 @@
 {
   "removed": [], 
   "added": [
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_Release", 
+    "/root/.bash_history", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_Release.gpg", 
+    "/usr/sbin/policy-rc.d"
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_main_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_main_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_main_source_Sources", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_multiverse_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_multiverse_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_multiverse_source_Sources", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_restricted_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_restricted_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_restricted_source_Sources", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_universe_binary-amd64_Packages", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_universe_i18n_Translation-en", 
-    "/var/lib/apt/lists/archive.ubuntu.com_ubuntu_dists_raring_universe_source_Sources", 
-    "/var/lib/apt/lists/lock", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_Release", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_Release.gpg", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_main_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_main_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_main_source_Sources", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_multiverse_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_multiverse_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_multiverse_source_Sources", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_restricted_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_restricted_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_restricted_source_Sources", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_universe_binary-amd64_Packages", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_universe_i18n_Translation-en", 
-    "/var/lib/apt/lists/security.ubuntu.com_ubuntu_dists_raring-security_universe_source_Sources"
   ], 
-  "changed": [
+  "changed": []
-    "/var/cache/apt/pkgcache.bin", 
-    "/var/cache/apt/srcpkgcache.bin"
-  ]
 }