Add CIPD pin reporting to swarming.

appengine/swarming/message_conversion.py

 # Copyright 2015 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.
 
 """This module facilitates conversion from dictionaries to ProtoRPC messages.
 
 Given a dictionary whose keys' names and values' types comport with the
 fields defined for a protorpc.messages.Message subclass, this module tries to
 generate a Message instance that corresponds to the provided dictionary. The
 "normal" use case is for ndb.Models which need to be represented as a
@@ skipping 182 matching lines @@
       properties=properties)
 
 
 def task_result_to_rpc(entity, send_stats):
   """"Returns a swarming_rpcs.TaskResult from a task_result.TaskResultSummary or
   task_result.TaskRunResult.
   """
   outputs_ref = (
       _ndb_to_rpc(swarming_rpcs.FilesRef, entity.outputs_ref)
       if entity.outputs_ref else None)
+  cipd_pins = None
+  if entity.cipd_pins:
+    cipd_pins = swarming_rpcs.CipdPins(
+      client_package=(
+        _ndb_to_rpc(swarming_rpcs.CipdPackage,
+                    entity.cipd_pins.client_package)
+        if entity.cipd_pins.client_package else None
+      ),
+      packages=[
+        _ndb_to_rpc(swarming_rpcs.CipdPackage, pkg)
+        for pkg in entity.cipd_pins.packages

[M-A Ruel, 2016/08/26 23:19:51]

for pkg in entity.cipd_pins.packages or ()

would remove the need of the condition

+      ] if entity.cipd_pins.packages else None
+    )
   performance_stats = None
   if send_stats and entity.performance_stats.is_valid:
       def op(entity):
         if entity:
           return _ndb_to_rpc(swarming_rpcs.OperationStats, entity)
 
       performance_stats = _ndb_to_rpc(
           swarming_rpcs.PerformanceStats,
           entity.performance_stats,
           isolated_download=op(entity.performance_stats.isolated_download),
           isolated_upload=op(entity.performance_stats.isolated_upload))
   kwargs = {
     'bot_dimensions': _string_list_pairs_from_dict(entity.bot_dimensions or {}),
+    'cipd_pins': cipd_pins,
+    'outputs_ref': outputs_ref,
     'performance_stats': performance_stats,
-    'outputs_ref': outputs_ref,
     'state': swarming_rpcs.StateField(entity.state),
   }
   if entity.__class__ is task_result.TaskRunResult:
     kwargs['costs_usd'] = []
     if entity.cost_usd is not None:
       kwargs['costs_usd'].append(entity.cost_usd)
     kwargs['properties_hash'] = None
     kwargs['tags'] = []
     kwargs['user'] = None
   else:
     assert entity.__class__ is task_result.TaskResultSummary, entity
     kwargs['properties_hash'] = (
         entity.properties_hash.encode('hex')
         if entity.properties_hash else None)
   return _ndb_to_rpc(swarming_rpcs.TaskResult, entity, **kwargs)