Add CIPD pin reporting to swarming.

appengine/swarming/templates/user_task.html

Index: appengine/swarming/templates/user_task.html
diff --git a/appengine/swarming/templates/user_task.html b/appengine/swarming/templates/user_task.html
index 8f7ecc5aa6b428c6166eb058ddac6932abb96ff7..d68672bf8d5313137423185d7de606d37a1c2e9c 100644
--- a/appengine/swarming/templates/user_task.html
+++ b/appengine/swarming/templates/user_task.html
@@ -73,6 +73,14 @@
   .package-list {
     margin-left: 1em;
   }
+
+  .package-pin-name {
+    font-weight: bold;
+  }
+
+  .package-pin-version {
+    color: blue;
+  }
 </style>
 {% endblock %}
 
@@ -223,26 +231,30 @@
           <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>
-          </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>
+            <td>{{cipd.client_package.pkg}}</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">
@@ -418,6 +430,27 @@
           {% 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>