Propagate name of system service account to the bot.

appengine/swarming/handlers_bot.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.
 
 """Internal bot API handlers."""
 
 import base64
 import json
 import logging
 
@@ skipping 660 matching lines @@
       try:
         # This part is tricky since it intentionally runs a transaction after
         # another one.
         if request.properties.is_terminate:
           bot_event('bot_terminate', task_id=run_result.task_id)
           self._cmd_terminate(run_result.task_id)
         else:
           bot_event(
               'request_task', task_id=run_result.task_id,
               task_name=request.name)
-          self._cmd_run(request, secret_bytes, run_result.key, res.bot_id)
+          self._cmd_run(
+              request, secret_bytes, run_result.key,
+              res.bot_id, res.bot_group_cfg)
       except:
         logging.exception('Dang, exception after reaping')
         raise
     except runtime.DeadlineExceededError:
       # If the timeout happened before a task was assigned there is no problems.
       # If the timeout occurred after a task was assigned, that task will
       # timeout (BOT_DIED) since the bot didn't get the details required to
       # run it) and it will automatically get retried (TODO) when the task times
       # out.
       # 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, secret_bytes, run_result_key, bot_id):
+  def _cmd_run(
+      self, request, secret_bytes, run_result_key, bot_id, bot_group_cfg):
     logging.info('Run: %s', request.task_id)
     out = {
       'cmd': 'run',
       'manifest': {
         'bot_id': bot_id,
         'caches': [
           c.to_dict() for c in request.properties.caches
         ],
         'cipd_input': {
           'client_package': (
@@ skipping 12 matching lines @@
         'host': utils.get_versioned_hosturl(),
         'io_timeout': request.properties.io_timeout_secs,
         'secret_bytes': (secret_bytes.secret_bytes.encode('base64')
                          if secret_bytes else None),
         'isolated': {
           'input': request.properties.inputs_ref.isolated,
           'namespace': request.properties.inputs_ref.namespace,
           'server': request.properties.inputs_ref.isolatedserver,
         } if request.properties.inputs_ref else None,
         'outputs': request.properties.outputs,
-        'service_account': request.service_account,
+        'service_accounts': {
+          'system': {
+            # 'none', 'bot' or email. Bot interprets 'none' and 'bot' locally.
+            # When it sees something else, it uses /oauth_token API endpoint to
+            # grab tokens through server.
+            'service_account': bot_group_cfg.system_service_account or 'none',
+          },
+          'task': {
+            # Same here.
+            'service_account': request.service_account,
+          },
+        },
         '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):
     duration = task_scheduler.exponential_backoff(sleep_streak)
     logging.debug(
         'Sleep: streak: %d; duration: %ds; quarantined: %s',
         sleep_streak, duration, quarantined)
@@ skipping 316 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]