swarming: refactor cipd input

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 59 matching lines @@
     raise endpoints.NotFoundException('%s not found.' % key.id())
   return result
 
 
 def get_result_entity(task_id):
   """Returns the entity (TaskResultSummary or TaskRunResult) for a given ID."""
   key, _ = get_result_key(task_id)
   return get_or_raise(key)
 
 
+def apply_property_defaults(properties):
+  """Fills ndb task properties with default values read from server settings."""
+  cfg = config.settings()
+  if not cfg:
+    return
+
+  if cfg.isolate.default_server and cfg.isolate.default_namespace:
+    properties.inputs_ref = properties.inputs_ref or task_request.FilesRef()
+    properties.inputs_ref.isolatedserver = (
+        properties.inputs_ref.isolatedserver or cfg.isolate.default_server)
+    properties.inputs_ref.namespace = (
+        properties.inputs_ref.namespace or cfg.isolate.default_namespace)
+
+  if cfg.HasField('cipd') and properties.cipd_input:
+    properties.cipd_input.server = (
+        properties.cipd_input.server or cfg.cipd.default_server)
+    properties.cipd_input.client_package = (
+        properties.cipd_input.client_package or task_request.CipdPackage())
+    properties.cipd_input.client_package.package_name = (
+        properties.cipd_input.client_package.package_name or
+        cfg.cipd.default_client_package.package_name)
+    properties.cipd_input.client_package.version = (
+        properties.cipd_input.client_package.version or
+        cfg.cipd.default_client_package.version)
+
+
 ### API
 
 
 swarming_api = auth.endpoints_api(
     name='swarming',
     version='v1',
     description=
         'API to interact with the Swarming service. Permits to create, '
         'view and cancel tasks, query tasks and bots')
 
@@ skipping 171 matching lines @@
   @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)
 
-    if request.properties is None:
-      raise endpoints.BadRequestException('properties are required')
-
-    # Apply isolate defaults.
-    cfg = config.settings()
-    if cfg.isolate.default_server and cfg.isolate.default_namespace:
-      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)
-
     try:
       request = message_conversion.new_task_request_from_rpc(
           request, utils.utcnow())
+      apply_property_defaults(request.properties)
       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
     if result_summary.deduped_from:
       previous_result = message_conversion.task_result_to_rpc(
           result_summary, False)
@@ skipping 315 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)