swarming: refactor cipd input

appengine/swarming/handlers_bot.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.
 
 """Internal bot API handlers."""
 
 import base64
 import json
 import logging
 import re
 import textwrap
 
 import webob
 import webapp2
 
 from google.appengine.api import app_identity
 from google.appengine.api import datastore_errors
 from google.appengine.datastore import datastore_query
 from google.appengine import runtime
 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
 from server import stats
 from server import task_pack
 from server import task_request
 from server import task_result
 from server import task_scheduler
 from server import task_to_run
 
@@ skipping 337 matching lines @@
       # TODO(maruel): Note the task if possible and hand it out on next poll.
       # https://code.google.com/p/swarming/issues/detail?id=130
       self.abort(500, 'Deadline')
 
   def _cmd_run(self, request, run_result_key, bot_id):
     cmd = None
     if request.properties.commands:
       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,
         'extra_args': request.properties.extra_args,
         'grace_period': request.properties.grace_period_secs,
         'hard_timeout': request.properties.execution_timeout_secs,
         'host': utils.get_versioned_hosturl(),
         'io_timeout': request.properties.io_timeout_secs,
         'isolated': {
           'input': request.properties.inputs_ref.isolated,
+          'namespace': request.properties.inputs_ref.namespace,
           'server': request.properties.inputs_ref.isolatedserver,
-          'namespace': request.properties.inputs_ref.namespace,
         } 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),
       },
     }
     self.send_response(utils.to_json_encodable(out))
 
   def _cmd_sleep(self, sleep_streak, quarantined):
     out = {
       'cmd': 'sleep',
       'duration': task_scheduler.exponential_backoff(sleep_streak),
       'quarantined': quarantined,
@@ skipping 259 matching lines @@
       ('/swarming/api/v1/bot/poll', BotPollHandler),
       ('/swarming/api/v1/bot/server_ping', ServerPingHandler),
       ('/swarming/api/v1/bot/task_update', BotTaskUpdateHandler),
       ('/swarming/api/v1/bot/task_update/<task_id:[a-f0-9]+>',
           BotTaskUpdateHandler),
       ('/swarming/api/v1/bot/task_error', BotTaskErrorHandler),
       ('/swarming/api/v1/bot/task_error/<task_id:[a-f0-9]+>',
           BotTaskErrorHandler),
   ]
   return [webapp2.Route(*i) for i in routes]