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

recipe_modules/bot_update/resources/bot_update.py

 #!/usr/bin/env python
 # 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.
 
 # TODO(hinoka): Use logging.
 
 import cStringIO
 import codecs
 import copy
@@ skipping 537 matching lines @@
   """Fetch url and return content, with retries for flake."""
   for attempt in xrange(ATTEMPTS):
     try:
       return urllib2.urlopen(url).read()
     except Exception:
       if attempt == ATTEMPTS - 1:
         raise
 
 
 def apply_rietveld_issue(issue, patchset, root, server, _rev_map, _revision,
-                         email_file, key_file, oauth2_file,
-                         whitelist=None, blacklist=None):
+                         email_file, key_file, whitelist=None, blacklist=None):
   apply_issue_bin = ('apply_issue.bat' if sys.platform.startswith('win')
                      else 'apply_issue')
   cmd = [apply_issue_bin,
          # The patch will be applied on top of this directory.
          '--root_dir', root,
          # Tell apply_issue how to fetch the patch.
          '--issue', issue,
          '--server', server,
          # Always run apply_issue.py, otherwise it would see update.flag
          # and then bail out.
          '--force',
          # Don't run gclient sync when it sees a DEPS change.
          '--ignore_deps',
   ]
-  # Use an oauth key or json file if specified.
-  if oauth2_file:
-    cmd.extend(['--auth-refresh-token-json', oauth2_file])
-  elif email_file and key_file:
+  # Use an oauth key file if specified.
+  if email_file and key_file:
     cmd.extend(['--email-file', email_file, '--private-key-file', key_file])
   else:
     cmd.append('--no-auth')
 
   if patchset:
     cmd.extend(['--patchset', patchset])
   if whitelist:
     for item in whitelist:
       cmd.extend(['--whitelist', item])
   elif blacklist:
@@ skipping 122 matching lines @@
                                    revisions)
     if not revision:
       continue
     git('fetch', 'origin', cwd=deps_name)
     force_revision(deps_name, revision)
 
 
 def ensure_checkout(solutions, revisions, first_sln, target_os, target_os_only,
                     patch_root, issue, patchset, rietveld_server, gerrit_repo,
                     gerrit_ref, gerrit_rebase_patch_ref, revision_mapping,
-                    apply_issue_email_file, apply_issue_key_file,
-                    apply_issue_oauth2_file, shallow, refs, git_cache_dir,
-                    gerrit_reset):
+                    apply_issue_email_file, apply_issue_key_file, shallow, refs,
+                    git_cache_dir, gerrit_reset):
   # Get a checkout of each solution, without DEPS or hooks.
   # Calling git directly because there is no way to run Gclient without
   # invoking DEPS.
   print 'Fetching Git checkout'
 
   git_ref = git_checkout(solutions, revisions, shallow, refs, git_cache_dir)
 
   print '===Processing patch solutions==='
   already_patched = []
   patch_root = patch_root or ''
   applied_gerrit_patch = False
   print 'Patch root is %r' % patch_root
   for solution in solutions:
     print 'Processing solution %r' % solution['name']
     if (patch_root == solution['name'] or
         solution['name'].startswith(patch_root + '/')):
       relative_root = solution['name'][len(patch_root) + 1:]
       target = '/'.join([relative_root, 'DEPS']).lstrip('/')
       print '  relative root is %r, target is %r' % (relative_root, target)
       if issue:
         apply_rietveld_issue(issue, patchset, patch_root, rietveld_server,
                              revision_mapping, git_ref, apply_issue_email_file,
-                             apply_issue_key_file, apply_issue_oauth2_file,
-                             whitelist=[target])
+                             apply_issue_key_file, whitelist=[target])
         already_patched.append(target)
       elif gerrit_ref:
         apply_gerrit_ref(gerrit_repo, gerrit_ref, patch_root, gerrit_reset,
                          gerrit_rebase_patch_ref)
         applied_gerrit_patch = True
 
   # Ensure our build/ directory is set up with the correct .gclient file.
   gclient_configure(solutions, target_os, target_os_only, git_cache_dir)
 
   # Let gclient do the DEPS syncing.
   # The branch-head refspec is a special case because its possible Chrome
   # src, which contains the branch-head refspecs, is DEPSed in.
   gclient_output = gclient_sync(BRANCH_HEADS_REFSPEC in refs, shallow)
 
   # Now that gclient_sync has finished, we should revert any .DEPS.git so that
   # presubmit doesn't complain about it being modified.
   if git('ls-files', '.DEPS.git', cwd=first_sln).strip():
     git('checkout', 'HEAD', '--', '.DEPS.git', cwd=first_sln)
 
   # Finally, ensure that all DEPS are pinned to the correct revision.
   dir_names = [sln['name'] for sln in solutions]
   ensure_deps_revisions(gclient_output.get('solutions', {}),
                         dir_names, revisions)
   # Apply the rest of the patch here (sans DEPS)
   if issue:
     apply_rietveld_issue(issue, patchset, patch_root, rietveld_server,
-                         revision_mapping, apply_issue_oauth2_file, git_ref,
-                         apply_issue_email_file, apply_issue_key_file,
-                         blacklist=already_patched)
+                         revision_mapping, git_ref, apply_issue_email_file,
+                         apply_issue_key_file, blacklist=already_patched)
   elif gerrit_ref and not applied_gerrit_patch:
     # If gerrit_ref was for solution's main repository, it has already been
     # applied above. This chunk is executed only for patches to DEPS-ed in
     # git repositories.
     apply_gerrit_ref(gerrit_repo, gerrit_ref, patch_root, gerrit_reset,
                      gerrit_rebase_patch_ref)
 
   # Reset the deps_file point in the solutions so that hooks get run properly.
   for sln in solutions:
     sln['deps_file'] = sln.get('deps_file', 'DEPS').replace('.DEPS.git', 'DEPS')
@@ skipping 48 matching lines @@
   parse = optparse.OptionParser()
 
   parse.add_option('--issue', help='Issue number to patch from.')
   parse.add_option('--patchset',
                    help='Patchset from issue to patch from, if applicable.')
   parse.add_option('--apply_issue_email_file',
                    help='--email-file option passthrough for apply_patch.py.')
   parse.add_option('--apply_issue_key_file',
                    help='--private-key-file option passthrough for '
                         'apply_patch.py.')
-  parse.add_option('--apply_issue_oauth2_file',
-                   help='--auth-refresh-token-json option passthrough for '
-                        'apply_patch.py.')
   parse.add_option('--root', dest='patch_root',
                    help='DEPRECATED: Use --patch_root.')
   parse.add_option('--patch_root', help='Directory to patch on top of.')
   parse.add_option('--rietveld_server',
                    default='codereview.chromium.org',
                    help='Rietveld server.')
   parse.add_option('--gerrit_repo',
                    help='Gerrit repository to pull the ref from.')
   parse.add_option('--gerrit_ref', help='Gerrit ref to apply.')
   parse.add_option('--gerrit_no_rebase_patch_ref', action='store_true',
@@ skipping 117 matching lines @@
           patch_root=options.patch_root,
           issue=options.issue,
           patchset=options.patchset,
           rietveld_server=options.rietveld_server,
           gerrit_repo=options.gerrit_repo,
           gerrit_ref=options.gerrit_ref,
           gerrit_rebase_patch_ref=not options.gerrit_no_rebase_patch_ref,
           revision_mapping=options.revision_mapping,
           apply_issue_email_file=options.apply_issue_email_file,
           apply_issue_key_file=options.apply_issue_key_file,
-          apply_issue_oauth2_file=options.apply_issue_oauth2_file,
 
           # Finally, extra configurations such as shallowness of the clone.
           shallow=shallow,
           refs=options.refs,
           git_cache_dir=options.git_cache_dir,
           gerrit_reset=not options.gerrit_no_reset)
       gclient_output = ensure_checkout(**checkout_parameters)
     except GclientSyncFailed:
       print 'We failed gclient sync, lets delete the checkout and retry.'
       ensure_no_checkout(dir_names)
@@ skipping 95 matching lines @@
     # download patch failure is still an infra problem.
     if e.code == 3:
       # Patch download problem.
       return 87
     # Genuine patch problem.
     return 88
 
 
 if __name__ == '__main__':
   sys.exit(main())