[client] Add support to run_isolated/cipd for cipd 1.5.

client/cipd.py

 # Copyright 2016 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.
 
 """Fetches CIPD client and installs packages."""
 
 import contextlib
 import hashlib
 import json
 import logging
@@ skipping 184 matching lines @@
         else:
           logging.info('cipd client: %s', line)
 
       exit_code = process.wait(timeout=timeoutfn())
       if exit_code != 0:
         raise Error(
             'Could not install packages; exit code %d\noutput:%s' % (
             exit_code, '\n'.join(output)))
       with open(json_file_path) as jfile:
         result_json = json.load(jfile)
-      return [(x['package'], x['instance_id']) for x in result_json['result']]
+      # TEMPORARY(iannucci): this code handles cipd <1.4 and cipd >=1.5
+      # formatted ensure result formats. Cipd 1.5 added support for subdirs, and
+      # as part of the transition, the result of the ensure command needed to
+      # change. To ease the transition, we always return data as-if we're using
+      # the new format. Once cipd 1.5+ is deployed everywhere, this type switch
+      # can be removed.
+      if isinstance(result_json['result'], dict):
+        # cipd 1.5
+        return {
+          subdir: [(x['package'], x['instance_id']) for x in pins]
+          for subdir, pins in result_json['result'].iteritems()
+        }
+      else:
+        # cipd 1.4
+        return {
+          "": [(x['package'], x['instance_id']) for x in result_json['result']],
+        }
     finally:
       fs.remove(list_file_path)
       fs.remove(json_file_path)
 
 
 def get_platform():
   """Returns ${platform} parameter value.
 
   Borrowed from
   https://chromium.googlesource.com/infra/infra/+/aaf9586/build/build.py#204
@@ skipping 232 matching lines @@
   """
   result = []
   for pkg in packages:
     path, name, version = pkg.split(':', 2)
     if not name:
       raise Error('Invalid package "%s": package name is not specified' % pkg)
     if not version:
       raise Error('Invalid package "%s": version is not specified' % pkg)
     result.append((path, name, version))
   return result