bot_update: Allow patch_oauth2 to work in kitchen

recipe_modules/bot_update/api.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.
 
 
 """Recipe module to ensure a checkout is consistant on a bot."""
 
 from recipe_engine import recipe_api
 
 
@@ skipping 39 matching lines @@
     return self.m.python(name, bot_update_path, cmd, **kwargs)
 
   @property
   def last_returned_properties(self):
       return self._last_returned_properties
 
   def ensure_checkout(self, gclient_config=None, suffix=None,
                       patch=True, update_presentation=True,
                       force=False, patch_root=None, no_shallow=False,
                       with_branch_heads=False, refs=None,
-                      patch_oauth2=False,
+                      patch_oauth2=False, patch_oauth2_in_puppet=False,
                       output_manifest=True, clobber=False,
                       root_solution_revision=None, rietveld=None, issue=None,
                       patchset=None, gerrit_no_reset=False, **kwargs):
     """
     Args:
+      patch_oauth2_in_puppet: If the oauth2 credentials live in puppet, or in

[Vadim Sh., 2016/06/29 03:58:08]

this is misleading, in both cases they are managed by puppet. 

Perhaps 'use_site_config_creds' or something. Or even

PATCH_CREDS_NONE = 'None'
PATCH_CREDS_SITE_CONFIG = 'site-config'
PATCH_CREDS_DEFAULT = 'default'

And convert path_oauth2 to be a enumeration with PATCH_CREDS_* possible values.

Well, whatever.

[martiniss, 2016/06/29 04:32:08]

went with 'use_site_config_creds'

+        the buildbot site_config. See crbug.com/624212 for more information.
       gclient_config: The gclient configuration to use when running bot_update.
         If omitted, the current gclient configuration is used.
       rietveld: The rietveld server to use. If omitted, will infer from
         the 'rietveld' property.
       issue: The rietveld issue number to use. If omitted, will infer from
         the 'issue' property.
       patchset: The rietveld issue patchset to use. If omitted, will infer from
         the 'patchset' property.
     """
     refs = refs or []
@@ skipping 36 matching lines @@
 
     # The gerrit_ref and gerrit_repo must be together or not at all.  If one is
     # missing, clear both of them.
     if not gerrit_ref or not gerrit_repo:
       gerrit_repo = gerrit_ref = None
     assert (gerrit_ref != None) == (gerrit_repo != None)
 
     # Point to the oauth2 auth files if specified.
     # These paths are where the bots put their credential files.
     if patch_oauth2:
-      email_file = self.m.path['build'].join(
-          'site_config', '.rietveld_client_email')
-      key_file = self.m.path['build'].join(
-          'site_config', '.rietveld_secret_key')
+      # TODO(martiniss): remove this hack :(. crbug.com/624212
+      if patch_oauth2_in_puppet: #pragma: no cover
+        email_file = '/creds/refresh_tokens/rietveld_client_email'

[Vadim Sh., 2016/06/29 03:58:08]

this is going to be 

/creds/rietveld/client_email
/creds/rietveld/secret_key

[martiniss, 2016/06/29 04:32:08]

Done.

+        key_file = '/creds/refresh_tokens/rietveld_secret_key'
+      else:
+        email_file = self.m.path['build'].join(
+            'site_config', '.rietveld_client_email')
+        key_file = self.m.path['build'].join(
+            'site_config', '.rietveld_secret_key')
     else:
       email_file = key_file = None
 
     # Allow patch_project's revision if necessary.
     # This is important for projects which are checked out as DEPS of the
     # gclient solution.
     self.m.gclient.set_patch_project_revision(
         self.m.properties.get('patch_project'), cfg)
 
     rev_map = cfg.got_revision_mapping.as_jsonish()
@@ skipping 138 matching lines @@
 
       # bot_update actually just sets root to be the folder name of the
       # first solution.
       if step_result.json.output['did_run']:
         co_root = step_result.json.output['root']
         cwd = kwargs.get('cwd', self.m.path['slave_build'])
         if 'checkout' not in self.m.path:
           self.m.path['checkout'] = cwd.join(*co_root.split(self.m.path.sep))
 
     return step_result