Use config.json to enable Isolated gRPC proxy

client/isolateserver.py

 #!/usr/bin/env python
 # Copyright 2013 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.
 
 """Archives a set of files or directories to an Isolate Server."""
 
 __version__ = '0.8.0'
 
 import errno
@@ skipping 1931 matching lines @@
 
 def add_isolate_server_options(parser):
   """Adds --isolate-server and --namespace options to parser."""
   parser.add_option(
       '-I', '--isolate-server',
       metavar='URL', default=os.environ.get('ISOLATE_SERVER', ''),
       help='URL of the Isolate Server to use. Defaults to the environment '
            'variable ISOLATE_SERVER if set. No need to specify https://, this '
            'is assumed.')
   parser.add_option(
-      '--is-grpc', action='store_true', help='Communicate to Isolate via gRPC')
+      '--grpc-proxy', help='gRPC proxy by which to communicate to Isolate')
   parser.add_option(
       '--namespace', default='default-gzip',
       help='The namespace to use on the Isolate Server, default: %default')
 
 
 def process_isolate_server_options(
     parser, options, set_exception_handler, required):
   """Processes the --isolate-server option.
 
   Returns the identity as determined by the server.
   """
   if not options.isolate_server:
     if required:
       parser.error('--isolate-server is required.')
     return
 
-  if 'ISOLATED_GRPC_PROXY' in os.environ:
-    options.is_grpc = True
-
-  if options.is_grpc:
-    isolate_storage.set_storage_api_class(isolate_storage.IsolateServerGrpc)
+  if options.grpc_proxy:
+    isolate_storage.set_grpc_proxy(options.grpc_proxy)
   else:
     try:
       options.isolate_server = net.fix_url(options.isolate_server)
     except ValueError as e:
       parser.error('--isolate-server %s' % e)
   if set_exception_handler:
     on_error.report_on_exception_exit(options.isolate_server)
   try:
     return auth.ensure_logged_in(options.isolate_server)
   except ValueError as e:
@@ skipping 65 matching lines @@
   return dispatcher.execute(OptionParserIsolateServer(), args)
 
 
 if __name__ == '__main__':
   subprocess42.inhibit_os_error_reporting()
   fix_encoding.fix_encoding()
   tools.disable_buffering()
   colorama.init()
   file_path.enable_symlink()
   sys.exit(main(sys.argv[1:]))