Add a default Isolate gRPC proxy in config

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 74 matching lines @@
 
   Do not warn about unexpected keys.
   """
   actual_keys = frozenset(actual_keys)
   missing = minimum_keys - actual_keys
   if missing:
     msg_missing = (' missing: %s' % sorted(missing)) if missing else ''
     return 'Unexpected %s%s; did you make a typo?' % (name, msg_missing)
 
 
 def get_bot_contact_server(request):

[Vadim Sh., 2017/06/29 21:56:23]

can we remove this function now?

[aludwin, 2017/06/29 23:38:57]

Done.

-  """Gets the server contacted by the bot.
-
-  Usually, this is the URL of the Swarming server itself, but if the bot
-  is communicating to the server by a gRPC intermediary, this will be the
-  IP address of the gRPC endpoint. The Native API will have an http or
-  https protocol, while gRPC endpoints will have a fake "grpc://" protocol.
-  This is to help consumers of this information (mainly the bot code
-  generators) distinguish between native and gRPC bots.
-  """
-  server = request.host_url
-  if 'luci-grpc' in request.headers:
-    server = 'grpc://%s' % request.headers['luci-grpc']
-  return server
+  """Gets the server contacted by the bot."""
+  return request.host_url
 
 
 class _BotApiHandler(auth.ApiHandler):
   """Like ApiHandler, but also implements machine authentication."""
 
   # Bots are passing credentials through special headers (not cookies), no need
   # for XSRF tokens.
   xsrf_token_enforce_on = ()
 
   @classmethod
@@ skipping 950 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]