swarming: custom cipd package paths

appengine/swarming/swarming_rpcs.py

 # Copyright 2015 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.
 
 """This module defines ProtoRPC types for the Swarming Server handlers."""
 
 from protorpc import message_types
 from protorpc import messages
 
 
@@ skipping 72 matching lines @@
 
 
 class CipdPackage(messages.Message):
   """A CIPD package to install in $CIPD_PATH and $PATH before task execution."""
   # A template of a full CIPD package name, e.g.
   # "infra/tools/authutil/${platform}"
   # See also cipd.ALL_PARAMS.
   package_name = messages.StringField(1)
   # Valid package version for all packages matched by package name.
   version = messages.StringField(2)
+  # Path to dir, relative to the root dir, where to install the package.
+  # If empty, the package will be installed a the root of the mapped directory.
+  # If file names in the package and in the isolate clash, it will cause a
+  # failure.
+  path = messages.StringField(3)
 
 
 class CipdInput(messages.Message):
   """Defines CIPD packages to install in $CIPD_PATH.
 
   A command may use $CIPD_PATH in its arguments. It will be expanded to the path
   of the CIPD site root.
   """
   # URL of the CIPD server. Must start with "https://" or "http://".
   # This field or its subfields are optional if default cipd client is defined
   # in the server config.
   server = messages.StringField(1)
 
   # CIPD package of CIPD client to use.
   # client_package.version is required.
   # This field is optional is default value is defined in the server config.
+  # client_package.path must be empty.
   client_package = messages.MessageField(CipdPackage, 2)
 
   # List of CIPD packages to install in $CIPD_PATH prior task execution.
   packages = messages.MessageField(CipdPackage, 3, repeated=True)
 
 
 class TaskProperties(messages.Message):
   """Important metadata about a particular task."""
   cipd_input = messages.MessageField(CipdInput, 10)
   command = messages.StringField(1, repeated=True)
@@ skipping 282 matching lines @@
 
 
 class DeletedResponse(messages.Message):
   """Indicates whether a bot was deleted."""
   deleted = messages.BooleanField(1)
 
 
 class TerminateResponse(messages.Message):
   """Returns the pseudo taskid to wait for the bot to shut down."""
   task_id = messages.StringField(1)