swarming: refactor cipd input

appengine/swarming/handlers_bot.py

Index: appengine/swarming/handlers_bot.py
diff --git a/appengine/swarming/handlers_bot.py b/appengine/swarming/handlers_bot.py
index c44cf760df2af67907bafabede38a3c772880a32..b1d4759958cc138e9de47bd90f34ab9fc9292b63 100644
--- a/appengine/swarming/handlers_bot.py
+++ b/appengine/swarming/handlers_bot.py
@@ -22,6 +22,7 @@ from google.appengine.ext import ndb
 from components import auth
 from components import ereporter2
 from components import utils
+from proto import config_pb2
 from server import acl
 from server import bot_code
 from server import bot_management
@@ -379,10 +380,30 @@ class BotPollHandler(_BotBaseHandler):
       cmd = request.properties.commands[0]
     elif request.properties.command:
       cmd = request.properties.command
+
+    cipd_settings = None
+    if request.properties.cipd_input:
+      cipd_settings = config_pb2.CipdSettings()
+      cipd_settings.MergeFromString(request.properties.cipd_input.settings)
+
     out = {
       'cmd': 'run',
       'manifest': {
         'bot_id': bot_id,
+        'cipd_input': {
+          'packages': [
+            {
+              'package_name': p.package_name,
+              'version': p.version,
+            }
+            for p in request.properties.cipd_input.packages
+          ],
+          'settings': {
+            'server_host': cipd_settings.server_host,
+            'client_package_name': cipd_settings.client_package_name,
+            'client_package_version': cipd_settings.client_package_version,
+          },
+        } if request.properties.cipd_input else None,
         'command': cmd,
         'dimensions': request.properties.dimensions,
         'env': request.properties.env,
@@ -393,16 +414,9 @@ class BotPollHandler(_BotBaseHandler):
         'io_timeout': request.properties.io_timeout_secs,
         'isolated': {
           'input': request.properties.inputs_ref.isolated,
-          'server': request.properties.inputs_ref.isolatedserver,
           'namespace': request.properties.inputs_ref.namespace,
+          'server': request.properties.inputs_ref.isolatedserver,
         } if request.properties.inputs_ref else None,
-        'packages': [
-          {
-            'package_name': p.package_name,
-            'version': p.version,
-          }
-          for p in request.properties.packages
-        ],
         'task_id': task_pack.pack_run_result_key(run_result_key),
       },
     }