swarming: fix support for raw command + isolated file

appengine/swarming/server/task_request.py

 # coding: utf-8
 # 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.
 
 """Tasks definition.
 
 Each user request creates a new TaskRequest. The TaskRequest instance saves the
 metadata of the request, e.g. who requested it, when why, etc. It links to the
 actual data of the request in a TaskProperties. The TaskProperties represents
@@ skipping 274 matching lines @@
 
   # The hash of an isolated archive.
   isolated = ndb.StringProperty(validator=_validate_isolated, indexed=False)
   # The hostname of the isolated server to use.
   isolatedserver = ndb.StringProperty(
       validator=_validate_url, indexed=False)
   # Namespace on the isolate server.
   namespace = ndb.StringProperty(validator=_validate_namespace, indexed=False)
 
   def _pre_put_hook(self):
+    # TODO(maruel): Get default value from config
+    # IsolateSettings.default_server.
     super(FilesRef, self)._pre_put_hook()
     if not self.isolatedserver or not self.namespace:
       raise datastore_errors.BadValueError(
           'isolate server and namespace are required')
 
 
 class SecretBytes(ndb.Model):
   """Defines an optional secret byte string logically defined with the
   TaskProperties.
 
@@ skipping 199 matching lines @@
   def _pre_put_hook(self):
     super(TaskProperties, self)._pre_put_hook()
     if self.commands:
         raise datastore_errors.BadValueError(
             'commands is not supported anymore')
     if not self.is_terminate:
       isolated_input = self.inputs_ref and self.inputs_ref.isolated
       if not self.command and not isolated_input:
         raise datastore_errors.BadValueError(
             'use at least one of command or inputs_ref.isolated')
+      if self.command and self.extra_args:
+        raise datastore_errors.BadValueError(
+            'can\'t use both command and extra_args')
       if self.extra_args and not isolated_input:
         raise datastore_errors.BadValueError(
             'extra_args require inputs_ref.isolated')
       if self.inputs_ref:
         self.inputs_ref._pre_put_hook()
 
       # Validate caches.
       cache_names = set()
       cache_paths = set()
       for c in self.caches:
@@ skipping 418 matching lines @@
   init_new_request(request, allow_high_priority, original_secret_bytes)
   return request
 
 
 def validate_priority(priority):
   """Throws ValueError if priority is not a valid value."""
   if 0 > priority or MAXIMUM_PRIORITY < priority:
     raise datastore_errors.BadValueError(
         'priority (%d) must be between 0 and %d (inclusive)' %
         (priority, MAXIMUM_PRIORITY))