Merge branch 'master' into ackbar

util/migrateslackwebhook.py

@@ -0,0 +1,52 @@
+import logging
+import json
+
+from app import app
+from data.database import configure, RepositoryNotification, ExternalNotificationMethod
+
+configure(app.config)
+
+logger = logging.getLogger(__name__)
+
+def run_slackwebhook_migration():
+  slack_method = ExternalNotificationMethod.get(ExternalNotificationMethod.name == "slack")
+
+  encountered = set()
+  while True:
+    found = list(RepositoryNotification.select().where(
+                      RepositoryNotification.method == slack_method,
+                      RepositoryNotification.config_json ** "%subdomain%",
+                      ~(RepositoryNotification.config_json ** "%url%")))
+
+    found = [f for f in found if not f.uuid in encountered]
+
+    if not found:
+      logger.debug('No additional records found')
+      return
+
+    logger.debug('Found %s records to be changed', len(found))
+    for notification in found:
+      encountered.add(notification.uuid)
+
+      try:
+        config = json.loads(notification.config_json)
+      except:
+        logging.error("Cannot parse config for noticification %s", notification.uuid)
+        continue
+
+      logger.debug("Checking notification %s", notification.uuid)
+      if 'subdomain' in config and 'token' in config:
+        subdomain = config['subdomain']
+        token = config['token']
+        new_url = 'https://%s.slack.com/services/hooks/incoming-webhook?token=%s' % (subdomain, token)
+        config['url'] = new_url
+
+        logger.debug("Updating notification %s to URL: %s", notification.uuid, new_url)
+        notification.config_json = json.dumps(config)
+        notification.save()
+
+if __name__ == "__main__":
+  logging.basicConfig(level=logging.DEBUG)
+  logging.getLogger('boto').setLevel(logging.CRITICAL)
+
+  run_slackwebhook_migration()

util/names.py

@@ -4,16 +4,25 @@ from functools import wraps
 from uuid import uuid4
 
 
-def parse_namespace_repository(repository):
+def parse_namespace_repository(repository, include_tag=False):
   parts = repository.rstrip('/').split('/', 1)
   if len(parts) < 2:
     namespace = 'library'
     repository = parts[0]
   else:
     (namespace, repository) = parts
-  repository = urllib.quote_plus(repository)
-  return (namespace, repository)
 
+  if include_tag:
+    parts = repository.split(':', 1)
+    if len(parts) < 2:
+      tag = 'latest'
+    else:
+      (repository, tag) = parts
+
+  repository = urllib.quote_plus(repository)
+  if include_tag:
+    return (namespace, repository, tag)
+  return (namespace, repository)
 
 def parse_repository_name(f):
   @wraps(f)
@@ -22,6 +31,13 @@ def parse_repository_name(f):
     return f(namespace, repository, *args, **kwargs)
   return wrapper
 
+def parse_repository_name_and_tag(f):
+  @wraps(f)
+  def wrapper(repository, *args, **kwargs):
+    namespace, repository, tag = parse_namespace_repository(repository, include_tag=True)
+    return f(namespace, repository, tag, *args, **kwargs)
+  return wrapper
+
 
 def format_robot_username(parent_username, robot_shortname):
   return '%s+%s' % (parent_username, robot_shortname)