swarming: change meaning of inputs_ref

client/swarming.py

 #!/usr/bin/env python
 # Copyright 2013 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.
 
 """Client tool to trigger tasks or retrieve results from a Swarming server."""
 
 __version__ = '0.8.5'
 
 import collections
@@ skipping 103 matching lines @@
     else:
       key = options.user
     options.task_name = u'%s/%s/%s' % (
         key,
         '_'.join(
             '%s=%s' % (k, v)
             for k, v in sorted(options.dimensions.iteritems())),
         options.isolated)
 
   inputs_ref = FilesRef(
-    isolated=options.isolated,
-    isolatedserver=options.isolate_server,
-    namespace=options.namespace)
+      isolated=options.isolated,
+      isolatedserver=options.isolate_server,
+      namespace=options.namespace)
   return isolated_cmd_args, inputs_ref
 
 
 ### Triggering.
 
 
 # See ../appengine/swarming/swarming_rpcs.py.
 FilesRef = collections.namedtuple(
     'FilesRef',
     [
@@ skipping 786 matching lines @@
             '%s=%s' % (k, v)
             for k, v in sorted(options.dimensions.iteritems())))
     inputs_ref = None
   else:
     isolateserver.process_isolate_server_options(parser, options, False, True)
     try:
       command, inputs_ref = isolated_handle_options(options, args)
     except ValueError as e:
       parser.error(str(e))
 
-  # If inputs_ref is used, command is actually extra_args. Otherwise it's an
-  # actual command to run.
+  # If inputs_ref.isolated is used, command is actually extra_args.
+  # Otherwise it's an actual command to run.
+  isolated_input = inputs_ref and inputs_ref.isolated
   properties = TaskProperties(
-      command=None if inputs_ref else command,
+      command=None if isolated_input else command,
       dimensions=options.dimensions,
       env=options.env,
       execution_timeout_secs=options.hard_timeout,
-      extra_args=command if inputs_ref else None,
+      extra_args=command if isolated_input else None,
       grace_period_secs=30,
       idempotent=options.idempotent,
       inputs_ref=inputs_ref,
       io_timeout_secs=options.io_timeout)
   if not all(len(t.split(':', 1)) == 2 for t in options.tags):
     parser.error('--tags must be in the format key:value')
   return NewTaskRequest(
       expiration_secs=options.expiration,
       name=options.task_name,
       parent_task_id=os.environ.get('SWARMING_TASK_ID', ''),
@@ skipping 420 matching lines @@
   if properties.get('env'):
     env = os.environ.copy()
     logging.info('env: %r', properties['env'])
     for i in properties['env']:
       key = i['key'].encode('utf-8')
       if not i['value']:
         env.pop(key, None)
       else:
         env[key] = i['value'].encode('utf-8')
 
-  if properties.get('inputs_ref'):
+  if (properties.get('inputs_ref') or {}).get('isolated'):
     # Create the tree.
     with isolateserver.get_storage(
           properties['inputs_ref']['isolatedserver'],
           properties['inputs_ref']['namespace']) as storage:
       bundle = isolateserver.fetch_isolated(
           properties['inputs_ref']['isolated'],
           storage,
           isolateserver.MemoryCache(file_mode_mask=0700),
           workdir)
       command = bundle.command
@@ skipping 132 matching lines @@
 def main(args):
   dispatcher = subcommand.CommandDispatcher(__name__)
   return dispatcher.execute(OptionParserSwarming(version=__version__), args)
 
 
 if __name__ == '__main__':
   fix_encoding.fix_encoding()
   tools.disable_buffering()
   colorama.init()
   sys.exit(main(sys.argv[1:]))