swarming: isolate defaults

appengine/swarming/handlers_endpoints.py

 # Copyright 2015 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.
 
 """This module defines Swarming Server endpoints handlers."""
 
 import datetime
 import json
 import logging
 
@@ skipping 249 matching lines @@
       swarming_rpcs.NewTaskRequest, swarming_rpcs.TaskRequestMetadata)
   @auth.require(acl.is_bot_or_user)
   def new(self, request):
     """Creates a new task.
 
     The task will be enqueued in the tasks list and will be executed at the
     earliest opportunity by a bot that has at least the dimensions as described
     in the task request.
     """
     logging.info('%s', request)
+
+    # Apply isolate defaults.
+    cfg = config.settings()
+    if cfg.isolate.default_server_host and cfg.isolate.default_namespace:
+      request.properties = request.properties or swarming_rpcs.TaskProperties()

[M-A Ruel, 2016/05/10 15:27:40]

request.properties cannot be None so this is not needed. If it's None, throw
BadRequest right away.

After you can just do:

request.properties.inputs_ref = request.properties.inputs_ref or
swarming_rpcs.FilesRef()
request.properties.inputs_ref.isolatedserver =
request.properties.inputs_ref.isolatedserver or cfg.isolate.default_server
request.properties.inputs_ref.namespace =
request.properties.inputs_ref.namespace or cfg.isolate.default_namespace

[nodir, 2016/05/10 18:49:49]

Done.

+      default_server = 'https://' + cfg.isolate.default_server_host

[M-A Ruel, 2016/05/10 15:27:40]

Do not prepend https:// here, it should be listed with it in the config, this
permits testing with http://localhost for example.

[nodir, 2016/05/10 18:49:49]

Done.

+      inputs_ref = request.properties.inputs_ref
+      if inputs_ref:
+        inputs_ref.isolatedserver = inputs_ref.isolatedserver or default_server
+        inputs_ref.namespace = (
+            inputs_ref.namespace or cfg.isolate.default_namespace)
+      elif not request.properties.outputs_target:

[M-A Ruel, 2016/05/10 15:27:40]

Please remove.

[nodir, 2016/05/10 18:49:49]

Done in patchset 'rebased'

+        request.properties.outputs_target = (
+            swarming_rpcs.IsolatedOutputsTarget(
+                isolatedserver=default_server,
+                namespace=cfg.isolate.default_namespace))
+
     try:
       request = message_conversion.new_task_request_from_rpc(
           request, utils.utcnow())
       posted_request = task_request.make_request(request, acl.is_bot_or_admin())
     except (datastore_errors.BadValueError, TypeError, ValueError) as e:
       raise endpoints.BadRequestException(e.message)
 
     result_summary = task_scheduler.schedule_request(posted_request)
 
     previous_result = None
@@ skipping 318 matching lines @@
       parts = d.split(':', 1)
       if len(parts) != 2 or any(i.strip() != i or not i for i in parts):
         raise endpoints.BadRequestException('Invalid dimensions')
       q = q.filter(bot_management.BotInfo.dimensions_flat == d)
     bots, cursor = datastore_utils.fetch_page(q, request.limit, request.cursor)
     return swarming_rpcs.BotList(
         cursor=cursor,
         death_timeout=config.settings().bot_death_timeout_secs,
         items=[message_conversion.bot_info_to_rpc(bot, now) for bot in bots],
         now=now)