Added POST capability to oauth Rietveld

presubmit_support.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Enables directory-specific presubmit checks to run at upload and/or commit.
 """
 
 __version__ = '1.8.0'
 
@@ skipping 815 matching lines @@
     lines are stripped out of the description this function returns.
     """
     return self._description_without_tags
 
   def FullDescriptionText(self):
     """Returns the complete changelist description including tags."""
     return self._full_description
 
   def SetDescriptionText(self, description):
     """Sets the full description text (including tags) to |description|.
-    
+
     Also updates the list of tags."""
     self._full_description = description
 
     # From the description text, build up a dictionary of key/value pairs
     # plus the description minus all key/value or "tag" lines.
     description_without_tags = []
     self.tags = {}
     for line in self._full_description.splitlines():
       m = self.TAG_LINE_RE.match(line)
       if m:
@@ skipping 164 matching lines @@
       results.append(p)
 
   logging.debug('Presubmit files: %s' % ','.join(results))
   return results
 
 
 class GetTrySlavesExecuter(object):
   @staticmethod
   def ExecPresubmitScript(script_text, presubmit_path, project, change):
     """Executes GetPreferredTrySlaves() from a single presubmit script.
-    
+
     This will soon be deprecated and replaced by GetPreferredTryMasters().
 
     Args:
       script_text: The text of the presubmit script.
       presubmit_path: Project script to run.
       project: Project name to pass to presubmit script for bot selection.
 
     Return:
       A list of try slaves.
     """
@@ skipping 502 matching lines @@
   parser.add_option("--may_prompt", action='store_true', default=False)
   parser.add_option("--skip_canned", action='append', default=[],
                     help="A list of checks to skip which appear in "
                     "presubmit_canned_checks. Can be provided multiple times "
                     "to skip multiple canned checks.")
   parser.add_option("--rietveld_url", help=optparse.SUPPRESS_HELP)
   parser.add_option("--rietveld_email", help=optparse.SUPPRESS_HELP)
   parser.add_option("--rietveld_password", help=optparse.SUPPRESS_HELP)
   parser.add_option("--rietveld_fetch", action='store_true', default=False,
                     help=optparse.SUPPRESS_HELP)
+  # These are for OAuth2 authentication for bots. See also apply_issue.py

[M-A Ruel, 2014/04/14 23:29:10]

Then make it an option group?

[pgervais, 2014/04/14 23:59:25]

I don't really see the point here since there is no help displayed. However,
grouping all the above --rietveld options together could be useful.

+  parser.add_option("--rietveld_email_file", help=optparse.SUPPRESS_HELP)
+  parser.add_option("--rietveld_private_key_file", help=optparse.SUPPRESS_HELP)
+
   parser.add_option("--trybot-json",
                     help="Output trybot information to the file specified.")
   options, args = parser.parse_args(argv)
+
   if options.verbose >= 2:
     logging.basicConfig(level=logging.DEBUG)
   elif options.verbose:
     logging.basicConfig(level=logging.INFO)
   else:
     logging.basicConfig(level=logging.ERROR)
+
+  if options.rietveld_email and options.rietveld_email_file:
+    parser.error("Only one of --rietveld_email or --rietveld_email_file "
+                 "can be passed to this program.")
+  if options.rietveld_private_key_file and options.rietveld_password:
+    parser.error("Only one of --rietveld_private_key_file or "
+                 "--rietveld_password can be passed to this program.")
+  if options.rietveld_email_file:
+    with open(options.rietveld_email_file, "rb") as f:
+      options.rietveld_email = f.read().strip()
+
   change_class, files = load_files(options, args)
   if not change_class:
     parser.error('For unversioned directory, <files> is not optional.')
   logging.info('Found %d file(s).' % len(files))
+
   rietveld_obj = None
   if options.rietveld_url:
-    rietveld_obj = rietveld.CachingRietveld(
+    # The empty password is permitted: '' is not None.
+    if options.rietveld_password is not None:
+      rietveld_obj = rietveld.CachingRietveld(
         options.rietveld_url,
         options.rietveld_email,
         options.rietveld_password)
+    elif options.rietveld_private_key_file:
+      rietveld_obj = rietveld.JwtOAuth2Rietveld(
+        options.rietveld_url,
+        options.rietveld_email,
+        options.rietveld_private_key_file)
+    else:
+      raise ValueError("No password or secret key has been provided for "

[M-A Ruel, 2014/04/14 23:29:10]

parser.error()

[pgervais, 2014/04/14 23:59:25]

Done.

+                       "Rietveld. Unable to connect.")
     if options.rietveld_fetch:
       assert options.issue
       props = rietveld_obj.get_issue_properties(options.issue, False)
       options.author = props['owner_email']
       options.description = props['description']
       logging.info('Got author: "%s"', options.author)
       logging.info('Got description: """\n%s\n"""', options.description)
   if options.trybot_json:
     with open(options.trybot_json, 'w') as f:
       # Python's sets aren't JSON-encodable, so we convert them to lists here.
@@ skipping 44 matching lines @@
   except PresubmitFailure, e:
     print >> sys.stderr, e
     print >> sys.stderr, 'Maybe your depot_tools is out of date?'
     print >> sys.stderr, 'If all fails, contact maruel@'
     return 2
 
 
 if __name__ == '__main__':
   fix_encoding.fix_encoding()
   sys.exit(Main(None))