Revert of bot_update: add --auth-refresh-token-json passthrough for apply_issue

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 48 matching lines @@
     if gerrit_no_reset:
       cmd.append('--gerrit_no_reset')
     if gerrit_no_rebase_patch_ref:
       cmd.append('--gerrit_no_rebase_patch_ref')
     return self.m.python('apply_gerrit', apply_gerrit_path, cmd, **kwargs)
 
   def ensure_checkout(self, gclient_config=None, suffix=None,
                       patch=True, update_presentation=True,
                       patch_root=None, no_shallow=False,
                       with_branch_heads=False, refs=None,
-                      patch_oauth2=False, oauth2_json=False,
-                      use_site_config_creds=True,
+                      patch_oauth2=False, use_site_config_creds=True,
                       output_manifest=True, clobber=False,
                       root_solution_revision=None, rietveld=None, issue=None,
                       patchset=None, gerrit_no_reset=False,
                       gerrit_no_rebase_patch_ref=False, **kwargs):
     """
     Args:
       use_site_config_creds: If the oauth2 credentials are in 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 []
     # We can re-use the gclient spec from the gclient module, since all the
     # data bot_update needs is already configured into the gclient spec.
     cfg = gclient_config or self.m.gclient.c
     assert cfg is not None, (
         'missing gclient_config or forgot api.gclient.set_config(...) before?')
 
-    # Only one of these should exist.
-    assert not (oauth2_json and patch_oauth2)
-
     # Construct our bot_update command.  This basically be inclusive of
     # everything required for bot_update to know:
     root = patch_root
     if root is None:
       root = self.m.gclient.calculate_patch_root(
           self.m.properties.get('patch_project'), cfg)
 
     if patch:
       issue = issue or self._issue
       patchset = patchset or self._patchset
@@ skipping 12 matching lines @@
       assert issue
 
     # 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.
-    oauth2_json_file = email_file = key_file = None
-    if oauth2_json:
-      if self.m.platform.is_win:
-        oauth2_json_file = 'C:\\creds\\refresh_tokens\\rietveld.json'
-      else:
-        oauth2_json_file = '/creds/refresh_tokens/rietveld.json'
-    elif patch_oauth2:
+    if patch_oauth2:
       # TODO(martiniss): remove this hack :(. crbug.com/624212
       if use_site_config_creds:
         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: #pragma: no cover
         #TODO(martiniss): make this use path.join, so it works on windows
         email_file = '/creds/rietveld/client_email'
         key_file = '/creds/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()
 
     flags = [
         # What do we want to check out (spec/root/rev/rev_map).
         ['--spec', self.m.gclient.config_to_pythonish(cfg)],
         ['--patch_root', root],
         ['--revision_mapping_file', self.m.json.input(rev_map)],
         ['--git-cache-dir', cfg.cache_dir],
 
         # How to find the patch, if any (issue/patchset).
         ['--issue', issue],
         ['--patchset', patchset],
         ['--rietveld_server', rietveld or self._rietveld],
         ['--gerrit_repo', gerrit_repo],
         ['--gerrit_ref', gerrit_ref],
         ['--apply_issue_email_file', email_file],
         ['--apply_issue_key_file', key_file],
-        ['--apply_issue_oauth2_file', oauth2_json_file],
 
         # Hookups to JSON output back into recipes.
         ['--output_json', self.m.json.output()],]
 
 
     # Collect all fixed revisions to simulate them in the json output.
     # Fixed revision are the explicit input revisions of bot_update.py, i.e.
     # every command line parameter "--revision name@value".
     fixed_revisions = {}
 
@@ skipping 110 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