swarmbucket: non-string properties

appengine/cr-buildbucket/swarming/swarming.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """This module integrates buildbucket with swarming.
 
 A bucket config may have "swarming" field that specifies how a builder
 is mapped to a recipe. If build is scheduled for a bucket/builder
 with swarming configuration, the integration overrides the default behavior.
 
@@ skipping 132 matching lines @@
       author = c.get('author')
       if not isinstance(author, dict):
         bad('change author must be an object')
       email = author.get('email')
       if not isinstance(email, basestring):
         bad('change author email must be a string')
       if not email:
         bad('change author email not specified')
 
 
+def read_properties(recipe):
+  """Parses build properties from the recipe message."""
+  result = dict(p.split(':', 1) for p in recipe.properties)
+  for p in recipe.properties_j:
+    k, v = p.split(':', 1)
+    result[k] = json.loads(v)
+  return result
+
+
 def merge_recipe(r1, r2):
   """Merges two Recipe messages. Values in r2 overwrite values in r1."""
   if not r1:  # pragma: no branch
     return r2  # pragma: no cover
-  r1_props = dict(p.split(':', 1) for p in r1.properties)
-  r2_props = dict(p.split(':', 1) for p in r2.properties)
-  r1_props.update(r2_props)
-  return project_config_pb2.Swarming.Recipe(
+  props = read_properties(r1)
+  props.update(read_properties(r2))
+  recipe = project_config_pb2.Swarming.Recipe(
     repository=r2.repository or r1.repository,
     name=r2.name or r1.name,
-    properties=['%s:%s' % item for item in sorted(r1_props.iteritems())],
   )
+  return recipe, props
 
 
 @ndb.tasklet
 def create_task_def_async(swarming_cfg, builder_cfg, build):
   """Creates a swarming task definition for the |build|.
 
   Supports build properties that are supported by Buildbot-Buildbucket
   integration. See
   https://chromium.googlesource.com/chromium/tools/build/+/eff4ceb/scripts/master/buildbucket/README.md#Build-parameters
 
   Raises:
     errors.InvalidInputError if build.parameters are invalid.
   """
   params = build.parameters or {}
   validate_build_parameters(builder_cfg.name, params)
   swarming_param = params.get(PARAM_SWARMING) or {}
 
   # Render task template.
   task_template = yield get_task_template_async()
   task_template_params = {
     'bucket': build.bucket,
     'builder': builder_cfg.name,
   }
 
   is_recipe = (
       builder_cfg.HasField('recipe') or swarming_cfg.HasField('common_recipe'))
   if is_recipe:  # pragma: no branch
-    recipe = merge_recipe(swarming_cfg.common_recipe, builder_cfg.recipe)
+    recipe, build_properties = merge_recipe(
+        swarming_cfg.common_recipe, builder_cfg.recipe)
     revision = swarming_param.get('recipe', {}).get('revision') or ''
 
-    build_properties = dict(
-      p.split(':', 1) for p in recipe.properties or [])
     build_properties['buildername'] = builder_cfg.name
 
     changes = params.get(PARAM_CHANGES)
     if changes:  # pragma: no branch
       # Buildbucket-Buildbot integration passes repo_url of the first change in
       # build parameter "changes" as "repository" attribute of SourceStamp.
       # https://chromium.googlesource.com/chromium/tools/build/+/2c6023d/scripts/master/buildbucket/changestore.py#140
       # Buildbot passes repository of the build source stamp as "repository"
       # build property. Recipes, in partiular bot_update recipe module, rely on
       # "repository" property and it is an almost sane property to support in
@@ skipping 460 matching lines @@
 def _extend_unique(target, items):
   for x in items:
     if x not in target:  # pragma: no branch
       target.append(x)
 
 
 class TaskToken(tokens.TokenKind):
   expiration_sec = 60 * 60 * 24  # 24 hours.
   secret_key = auth.SecretKey('swarming_task_token', scope='local')
   version = 1