Add CIPD pin reporting to swarming.

appengine/swarming/templates/user_task.html

 {% extends "swarming/base.html" %}
 
 
 {% block headers %}
 <style>
   h1 {
     margin-top: 10px;
     margin-bottom: 10px;
   }
 
@@ skipping 55 matching lines @@
   }
 
   .spaced {
     margin-top: 10px;
     margin-bottom: 5px;
   }
 
   .package-list {
     margin-left: 1em;
   }
+
+  .package-pin-name {
+    font-weight: bold;
+  }
+
+  .package-pin-version {
+    color: blue;
+  }
 </style>
 {% endblock %}
 
 
 {% block body %}
 {% import 'swarming/bot_view.html' as bot_view %}
 
 
 {% macro summarize_array(values) %}
   {% if not values %}
@@ skipping 130 matching lines @@
           <td>{{request.properties.io_timeout_secs}}</td>
         </tr>
         <tr title="Additional environment variables to the one provided by the bot.">
           <td>Env vars</td>
           <td>{{bot_view.render_dict(request.properties.env)}}</td>
         </tr>
         <tr title="If True, successful task results may be reused for subsequent requests, so the task can be deduped.">
           <td>Idempotent</td>
           <td>{{request.properties.idempotent}}</td>
         </tr>
-        {% if request.properties.cipd_input %}
+        {% if cipd %}
           <tr title="CIPD server">
             <td>CIPD server</td>
-            <td>{{request.properties.cipd_input.server}}</td>
+            <td>{{cipd.server}}</td>
           </tr>
           <tr title="CIPD client">
             <td>CIPD client</td>
-            <td>{{request.properties.cipd_input.client_package}}</td>
+            <td>{{cipd.client_package.pkg}}</td>
           </tr>
-          <tr title="CIPD pacakges">
-            <td>CIPD packages</td>
-            <td>
-              {% for path, packages in request.properties.cipd_input.packages_grouped_by_path() %}
-                <div>{{ path or '.'}}/</div>
-                <div class="package-list">
-                  {{packages|join('<br>'|safe)}}
-                </div>
-              {% endfor %}
-            </td>
-          </tr>
+          {% if cipd.packages %}
+            <tr title="CIPD pacakges">
+              <td>CIPD packages</td>
+              <td>
+                {% for path, pins in cipd.packages %}
+                  <div>{{ path or '.'}}/</div>
+                  <div class="package-list">
+                    {% for pin in pins %}
+                      {{pin.pkg}}{% if not loop.last %}<br>{% endif %}
+                    {% endfor %}
+                  </div>
+                {% endfor %}
+              </td>
+            </tr>
+          {% endif %}
         {% endif %}
         {% if request.properties.inputs_ref and request.properties.inputs_ref.isolated %}
           <tr title="Inputs files">
             <td>Isolated inputs</td>
             <td>
               <a
                 href="{{request.properties.inputs_ref.isolatedserver}}/browse?namespace={{request.properties.inputs_ref.namespace}}&hash={{request.properties.inputs_ref.isolated}}">
                 {{request.properties.inputs_ref.isolated}}
               </a>
             </td>
@@ skipping 155 matching lines @@
       <tr title="Current bot dimensions.">
         <td>Bot dimensions</td>
         <td>
           {% if task.bot_dimensions %}
             {{bot_view.render_dict(task.bot_dimensions)}}
           {% else %}
             {{bot_view.bot_dimensions(bot)}}
           {% endif %}
         </td>
       </tr>
+      {% if cipd_pinned %}
+        <tr title="CIPD client">
+          <td>CIPD client</td>
+          <td>{{cipd.client_package.pin}}</td>
+        </tr>
+        {% if cipd.packages %}
+          <tr title="CIPD pacakges">
+            <td>CIPD packages</td>
+            <td>
+              {% for path, pins in cipd.packages %}
+                <div>{{ path or '.'}}/</div>
+                <div class="package-list">
+                  {% for pin in pins %}
+                    {{pin.pin}}{% if not loop.last %}<br>{% endif %}
+                  {% endfor %}
+                </div>
+              {% endfor %}
+            </td>
+          </tr>
+        {% endif %}
+      {% endif %}
       <tr title="Current bot version. TODO(maruel): List bot version at time of task reaping.">
         <td>Bot version</td>
         <td>{{task.bot_version}}</td>
       </tr>
       <tr title="List of server versions that touched this task.">
         <td>Server version</td>
         <td>
           {% for v in task.server_versions %}
             {% if is_gae_admin %}
               <a href="https://appengine.google.com/logs?&app_id={{full_appid}}&version_id={{v}}">
@@ skipping 108 matching lines @@
 
 {% set output = task.get_output() %}
 {% if output is not none %}
 <h3>Output:</h3>
 <pre>
 {{task.get_output().decode('utf-8', 'replace')}}{% if is_running %}<p class="console"><span class="blink">|</span>{% endif %}
 </pre>
 {% endif %}
 
 {% endblock %}