swarming: refactor cipd input

appengine/swarming/message_conversion.py

 # Copyright 2015 The LUCI Authors. All rights reserved.
 # Use of this source code is governed by the Apache v2.0 license 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 84 matching lines @@
       swarming_rpcs.BotEvent,
       entity,
       dimensions=_string_list_pairs_from_dict(entity.dimensions),
       state=json.dumps(entity.state, sort_keys=True, separators=(',', ':')),
       task_id=entity.task_id if entity.task_id else None)
 
 
 def task_request_to_rpc(entity):
   """"Returns a swarming_rpcs.TaskRequest from a task_request.TaskRequest."""
   assert entity.__class__ is task_request.TaskRequest
+  cipd_input = None
+  if entity.properties.cipd_input:
+    cipd_input = _ndb_to_rpc(
+        swarming_rpcs.CipdInput,
+        entity.properties.cipd_input,
+        packages=[
+          _ndb_to_rpc(swarming_rpcs.CipdPackage, p)
+          for p in entity.properties.cipd_input.packages
+        ])
+
   inputs_ref = None
   if entity.properties.inputs_ref:
     inputs_ref = _ndb_to_rpc(
         swarming_rpcs.FilesRef, entity.properties.inputs_ref)
+
   props = entity.properties
   cmd = None
   if props.commands:
     cmd = props.commands[0]
   elif props.command:
     cmd = props.command
   properties = _ndb_to_rpc(
       swarming_rpcs.TaskProperties,
       props,
+      cipd_input=cipd_input,
       command=cmd,
       dimensions=_string_pairs_from_dict(props.dimensions),
       env=_string_pairs_from_dict(props.env),
-      inputs_ref=inputs_ref,
-      packages=[
-        _ndb_to_rpc(swarming_rpcs.CipdPackage, p) for p in props.packages
-      ])
+      inputs_ref=inputs_ref)
 
   return _ndb_to_rpc(
       swarming_rpcs.TaskRequest,
       entity,
       authenticated=entity.authenticated.to_bytes(),
       properties=properties)
 
 
 def new_task_request_from_rpc(msg, now):
   """"Returns a task_request.TaskRequest from a swarming_rpcs.NewTaskRequest."""
   assert msg.__class__ is swarming_rpcs.NewTaskRequest
   props = msg.properties
   if not props:
     raise ValueError('properties is required')
+
+  cipd_input = None
+  if props.cipd_input:
+    cipd_input = _rpc_to_ndb(
+        task_request.CipdInput,
+        props.cipd_input,
+        packages=[
+          _rpc_to_ndb(task_request.CipdPackage, p)
+          for p in props.cipd_input.packages
+        ])
+
   inputs_ref = None
   if props.inputs_ref:
     inputs_ref = _rpc_to_ndb(task_request.FilesRef, props.inputs_ref)
+
   properties = _rpc_to_ndb(
       task_request.TaskProperties,
       props,
+      cipd_input=cipd_input,
       # Passing command=None is supported at API level but not at NDB level.
       command=props.command or [],
       # Legacy, ignored.
       commands=None,
       dimensions={i.key: i.value for i in props.dimensions},
       env={i.key: i.value for i in props.env},
-      inputs_ref=inputs_ref,
-      packages=[
-        _rpc_to_ndb(task_request.CipdPackage, p) for p in props.packages
-      ])
+      inputs_ref=inputs_ref)
 
   return _rpc_to_ndb(
       task_request.TaskRequest,
       msg,
       created_ts=now,
       expiration_ts=now+datetime.timedelta(seconds=msg.expiration_secs),
       # It is set in task_request.make_request().
       authenticated=None,
       properties=properties)
 
@@ skipping 28 matching lines @@
       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)