Add a default Isolate gRPC proxy in config

appengine/swarming/server/bot_archive.py

 # Copyright 2014 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.
 
 """Generates the swarming_bot.zip archive for the bot.
 
 Unlike the other source files, this file can be run from ../tools/bot_archive.py
 stand-alone to generate a swarming_bot.zip for local testing so it doesn't
 import anything from the AppEngine SDK.
 
@@ skipping 359 matching lines @@
     partial = os.path.sep.join(parts[:i])
     if os.path.isfile(partial):
       with open(partial) as f:
         link = f.read()
       assert '\n' not in link and link, link
       parts[i-1] = link
   return os.path.normpath(os.path.sep.join(parts))
 
 
 def yield_swarming_bot_files(
-    root_dir, host, host_version, additionals, enable_ts_monitoring):
+    root_dir, host, host_version, additionals, settings):
   """Yields all the files to map as tuple(filename, content).
 
   config.json is injected with json data about the server.
 
   This function guarantees that the output is sorted by filename.
   """
-  grpc_prefix = 'grpc://'
-  is_grpc = host.startswith(grpc_prefix)
-  if is_grpc:
-    host = host[len(grpc_prefix):]
-
   items = {i: None for i in FILES}
   items.update(additionals)
   config = {
-    'enable_ts_monitoring': enable_ts_monitoring,
-    'is_grpc': is_grpc,
     'server': host.rstrip('/'),
     'server_version': host_version,
   }
+
+  if settings:
+    config['enable_ts_monitoring'] = settings.enable_ts_monitoring
+    config['isolate_grpc_proxy'] = settings.bot_isolate_grpc_proxy
+
   items['config/config.json'] = json.dumps(config)
+  logging.debug('Bot config.json: %s', items['config/config.json'])
   for item, content in sorted(items.iteritems()):
     if content is not None:
       yield item, content
     else:
       with open(resolve_symlink(os.path.join(root_dir, item)), 'rb') as f:
         yield item, f.read()
 
 
 def get_swarming_bot_zip(
-    root_dir, host, host_version, additionals, enable_ts_monitoring):
+    root_dir, host, host_version, additionals, settings):
   """Returns a zipped file of all the files a bot needs to run.
 
   Arguments:
     root_dir: directory swarming_bot.
     additionals: dict(filepath: content) of additional items to put into the zip
         file, in addition to FILES and MAPPED. In practice, it's going to be a
         custom bot_config.py.
     enable_ts_monitoring: bool if ts_mon should be enabled on the bot.
 
   Returns:
     Tuple(str being the zipped file's content, bot version (SHA256) it
     represents).
   """
   zip_memory_file = StringIO.StringIO()
   h = hashlib.sha256()
   with zipfile.ZipFile(zip_memory_file, 'w', zipfile.ZIP_DEFLATED) as zip_file:
     for name, content in yield_swarming_bot_files(
-        root_dir, host, host_version, additionals, enable_ts_monitoring):
+        root_dir, host, host_version, additionals, settings):
       zip_file.writestr(name, content)
       h.update(str(len(name)))
       h.update(name)
       h.update(str(len(content)))
       h.update(content)
 
   data = zip_memory_file.getvalue()
   bot_version = h.hexdigest()
   logging.info(
       'get_swarming_bot_zip(%s) is %d bytes; %s',
       additionals.keys(), len(data), bot_version)
   return data, bot_version
 
 
 def get_swarming_bot_version(
-    root_dir, host, host_version, additionals, enable_ts_monitoring):
+    root_dir, host, host_version, additionals, settings):
   """Returns the SHA256 hash of the bot code, representing the version.
 
   Arguments:
     root_dir: directory swarming_bot.
     additionals: See get_swarming_bot_zip's doc.
     enable_ts_monitoring: bool if ts_mon should be enabled on the bot.
 
   Returns:
     The SHA256 hash of the bot code.
   """
   h = hashlib.sha256()
   try:
     # TODO(maruel): Deduplicate from zip_package.genereate_version().
     for name, content in yield_swarming_bot_files(
-        root_dir, host, host_version, additionals, enable_ts_monitoring):
+        root_dir, host, host_version, additionals, settings):
       h.update(str(len(name)))
       h.update(name)
       h.update(str(len(content)))
       h.update(content)
   except IOError:
     logging.warning('Missing expected file. Hash will be invalid.')
   bot_version = h.hexdigest()
   logging.info(
       'get_swarming_bot_version(%s) = %s', sorted(additionals), bot_version)
   return bot_version