Add CIPD pin reporting to swarming.

appengine/swarming/handlers_frontend.py

 # Copyright 2013 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 """Main entry point for Swarming service.
 
 This file contains the URL handlers for all the Swarming service URLs,
 implemented using the webapp2 framework.
 """
 
@@ skipping 598 matching lines @@
     if not request or not result:
       self.abort(404, '%s not found.' % key.id())
     if not request.has_access:
       self.abort(403, '%s is not accessible.' % key.id())
     return request, result
 
 
 class TaskHandler(BaseTaskHandler):
   """Show the full text of a task request and its result."""
 
+  @staticmethod
+  def packages_grouped_by_path(flat_packages):
+    """Returns sorted [(path, [PinInfo, ...])].
+
+    Used by user_task.html.
+    """
+    retval = collections.defaultdict(list)
+    for pkg in flat_packages:
+      retval[pkg.path].append(pkg)
+    return sorted(retval.iteritems())
+
   @auth.autologin
   @auth.require(acl.is_user)
   def get(self, task_id):
     request, result = self.get_request_and_result(task_id)
     parent_task_future = None
     if request.parent_task_id:
       parent_key = task_pack.unpack_run_result_key(request.parent_task_id)
       parent_task_future = parent_key.get_async()
     children_tasks_futures = [
       task_pack.unpack_result_summary_key(c).get_async()
@@ skipping 27 matching lines @@
 
     previous_task = None
     if previous_task_future:
       previous_task = previous_task_future.get_result()
 
     parent_task = None
     if parent_task_future:
       parent_task = parent_task_future.get_result()
     children_tasks = [c.get_result() for c in children_tasks_futures]
 
+    cipd = None
+    if request.properties.cipd_input:
+      cipd = {
+        'server': request.properties.cipd_input.server,
+        'client_package': request.properties.cipd_input.client_package,
+        'packages': self.packages_grouped_by_path(
+            request.properties.cipd_input.packages)

[M-A Ruel, 2016/08/30 18:54:12]

keep trailing comma

[iannucci, 2016/08/30 19:09:17]

Done

+      }
+
+    cipd_pins = None
+    if result.cipd_pins:
+      cipd_pins = {
+        'client_package': result.cipd_pins.client_package,
+        'packages': self.packages_grouped_by_path(result.cipd_pins.packages),
+      }
+
     params = {
       'bot': bot_future.get_result() if bot_future else None,
       'children_tasks': children_tasks,
+      'cipd': cipd,
+      'cipd_pins': cipd_pins,
       'is_admin': acl.is_admin(),
       'is_gae_admin': users.is_current_user_admin(),
       'is_privileged_user': acl.is_privileged_user(),
       'following_task': following_task,
       'full_appid': os.environ['APPLICATION_ID'],
       'host_url': self.request.host_url,
       'is_running': result.state == task_result.State.RUNNING,
       'parent_task': parent_task,
       'previous_task': previous_task,
       'request': request,
@@ skipping 137 matching lines @@
 
   # If running on a local dev server, allow bots to connect without prior
   # groups configuration. Useful when running smoke test.
   if utils.is_local_dev_server():
     acl.bootstrap_dev_server_acls()
 
   routes.extend(handlers_backend.get_routes())
   routes.extend(handlers_bot.get_routes())
   routes.extend(handlers_endpoints.get_routes())
   return webapp2.WSGIApplication(routes, debug=debug)