ndahlquist / whaler Goto Github PK

View Code? Open in Web Editor NEW

8.0 8.0 5.0 255 KB

Squash merges from the GitHub merge button

License: Apache License 2.0

Python 65.24% JavaScript 32.96% CSS 1.80%

whaler's People

Contributors

Stargazers

Watchers

Forkers

peterbrook abartow pantuza linearregression

whaler's Issues

Use ndb for appengine database

Because it includes a memcache caching layer.

Use commit messages from the github UI

Add a /supports_whaler endpoint

To check whether a repo has given access to cicitheandroidtester.

Fails when author has no email

422 {u'documentation_url': u'https://developer.github.com/v3/git/commits/#create-a-commit', u'message': u'Validation Failed', u'errors': [{u'field': u'email', u'code': u'missing_field', u'resource': u'author'}]}
Traceback (most recent call last):
  File "/base/data/home/runtimes/python27/python27_lib/versions/third_party/webapp2-2.5.2/webapp2.py", line 1535, in __call__
    rv = self.handle_exception(request, response, e)
  File "/base/data/home/runtimes/python27/python27_lib/versions/third_party/webapp2-2.5.2/webapp2.py", line 1529, in __call__
    rv = self.router.dispatch(request, response)
  File "/base/data/home/runtimes/python27/python27_lib/versions/third_party/webapp2-2.5.2/webapp2.py", line 1278, in default_dispatcher
    return route.handler_adapter(request, response)
  File "/base/data/home/runtimes/python27/python27_lib/versions/third_party/webapp2-2.5.2/webapp2.py", line 1102, in __call__
    return handler.dispatch()
  File "/base/data/home/runtimes/python27/python27_lib/versions/third_party/webapp2-2.5.2/webapp2.py", line 572, in dispatch
    return self.handle_exception(e, self.app.debug)
  File "/base/data/home/runtimes/python27/python27_lib/versions/third_party/webapp2-2.5.2/webapp2.py", line 570, in dispatch
    return method(*args, **kwargs)
  File "/base/data/home/apps/s~whaler-on-fleek/master.381158370045424596/MergeEndpoint.py", line 60, in post
    new_commit = repo.repo.create_git_commit(squash_commit_message, tree, parents, author, committer)
  File "/base/data/home/apps/s~whaler-on-fleek/master.381158370045424596/lib/github/Repository.py", line 722, in create_git_commit
    input=post_parameters
  File "/base/data/home/apps/s~whaler-on-fleek/master.381158370045424596/lib/github/Requester.py", line 169, in requestJsonAndCheck
    return self.__check(*self.requestJson(verb, url, parameters, headers, input, cnx))
  File "/base/data/home/apps/s~whaler-on-fleek/master.381158370045424596/lib/github/Requester.py", line 177, in __check
    raise self.__createException(status, responseHeaders, output)
GithubException: 422 {u'documentation_url': u'https://developer.github.com/v3/git/commits/#create-a-commit', u'message': u'Validation Failed', u'errors': [{u'field': u'email', u'code': u'missing_field', u'resource': u'author'}]}

Link squash commit to PR and PR to commit

They should have links to each other.

Require LGTM or something from another user before submission

CSP Race Condition

Saw this error:

Refused to connect to 'https://dev-dot-whaler-on-fleek.appspot.com/merge' because it violates the following Content Security Policy directive: "connect-src 'self' ghconduit.com:25035 live.github.com wss://live.github.com uploads.github.com www.google-analytics.com s3.amazonaws.com".

Seems like there is a possibility that the content security policy is not being set fast enough.

Deal with the case that an Oauth token expires / is revoked

We should delete the OauthEntry from the database.

ff merge fails after backwards merge

422 {u'documentation_url': u'https://developer.github.com/v3/git/refs/#update-a-reference', u'message': u'Update is not a fast forward'}
Traceback (most recent call last):
  File "/base/data/home/runtimes/python27/python27_lib/versions/third_party/webapp2-2.5.2/webapp2.py", line 1535, in __call__
    rv = self.handle_exception(request, response, e)
  File "/base/data/home/runtimes/python27/python27_lib/versions/third_party/webapp2-2.5.2/webapp2.py", line 1529, in __call__
    rv = self.router.dispatch(request, response)
  File "/base/data/home/runtimes/python27/python27_lib/versions/third_party/webapp2-2.5.2/webapp2.py", line 1278, in default_dispatcher
    return route.handler_adapter(request, response)
  File "/base/data/home/runtimes/python27/python27_lib/versions/third_party/webapp2-2.5.2/webapp2.py", line 1102, in __call__
    return handler.dispatch()
  File "/base/data/home/runtimes/python27/python27_lib/versions/third_party/webapp2-2.5.2/webapp2.py", line 572, in dispatch
    return self.handle_exception(e, self.app.debug)
  File "/base/data/home/runtimes/python27/python27_lib/versions/third_party/webapp2-2.5.2/webapp2.py", line 570, in dispatch
    return method(*args, **kwargs)
  File "/base/data/home/apps/s~whaler-on-fleek/master.381084231506798240/QueueMergeEndpoint.py", line 56, in post
    branch_base.edit(new_commit.sha)
  File "/base/data/home/apps/s~whaler-on-fleek/master.381084231506798240/lib/github/GitRef.py", line 88, in edit
    input=post_parameters
  File "/base/data/home/apps/s~whaler-on-fleek/master.381084231506798240/lib/github/Requester.py", line 169, in requestJsonAndCheck
    return self.__check(*self.requestJson(verb, url, parameters, headers, input, cnx))
  File "/base/data/home/apps/s~whaler-on-fleek/master.381084231506798240/lib/github/Requester.py", line 177, in __check
    raise self.__createException(status, responseHeaders, output)
GithubException: 422 {u'documentation_url': u'https://developer.github.com/v3/git/refs/#update-a-reference', u'message': u'Update is not a fast forward'}

Make GitHub modification faster

We currently wait for window.onload, which can take a long time. This is also unreliable, because the merge button may not yet be active when the window loads.

Use Cross-Origin XMLHttpRequest

Instead of modifying GitHub's content security policy.

https://developer.chrome.com/extensions/xhr

Improve /queue_merge performance

Right now, this endpoint makes many serial requests, taking about 2 seconds to complete. I don't think we can do this work completely asynchronously, since we want to return a response depending on the result, but we might be able to do certain requests in parallel (or add to a task queue).

Add user:email permission

Currently, when someone presses the merge button, we use that user's public email address, if available, and fallback to their private @noreply.github.com email if not. (https://github.com/ndahlquist/whaler/blob/dev/appengine/MergeEndpoint.py#L101)

Ideally, we would always use the user's canonical email address. This could be accomplished by using the user:email application permission (see https://developer.github.com/v3/oauth/#scopes).

Merge button is not modified in the case that it is not in the correct state at page load.

If GitHub is doing its "checking if we can merge," for example, we will fail to update the HTML correctly.

assert isinstance(email, (str, unicode)), email

None
Traceback (most recent call last):
  File "/base/data/home/runtimes/python27/python27_lib/versions/third_party/webapp2-2.5.2/webapp2.py", line 1535, in __call__
    rv = self.handle_exception(request, response, e)
  File "/base/data/home/runtimes/python27/python27_lib/versions/third_party/webapp2-2.5.2/webapp2.py", line 1529, in __call__
    rv = self.router.dispatch(request, response)
  File "/base/data/home/runtimes/python27/python27_lib/versions/third_party/webapp2-2.5.2/webapp2.py", line 1278, in default_dispatcher
    return route.handler_adapter(request, response)
  File "/base/data/home/runtimes/python27/python27_lib/versions/third_party/webapp2-2.5.2/webapp2.py", line 1102, in __call__
    return handler.dispatch()
  File "/base/data/home/runtimes/python27/python27_lib/versions/third_party/webapp2-2.5.2/webapp2.py", line 572, in dispatch
    return self.handle_exception(e, self.app.debug)
  File "/base/data/home/runtimes/python27/python27_lib/versions/third_party/webapp2-2.5.2/webapp2.py", line 570, in dispatch
    return method(*args, **kwargs)
  File "/base/data/home/apps/s~whaler-on-fleek/master.381158370045424596/MergeEndpoint.py", line 58, in post
    author = self.get_git_author(pull)
  File "/base/data/home/apps/s~whaler-on-fleek/master.381158370045424596/MergeEndpoint.py", line 77, in get_git_author
    return github.InputGitAuthor(user.name, user.email)
  File "/base/data/home/apps/s~whaler-on-fleek/master.381158370045424596/lib/github/InputGitAuthor.py", line 41, in __init__
    assert isinstance(email, (str, unicode)), email
AssertionError: None