Skip to content

Make sure the bot responds to re-check instruction #2683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 5, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 28 additions & 10 deletions bot/src/dotty/tools/bot/PullRequestService.scala
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,10 @@ trait PullRequestService {
final case class InvalidPrevious(users: List[String], commit: Commit) extends CommitStatus { def isValid = false }

/** Partitions invalid and valid commits */
def checkCLA(xs: List[Commit], httpClient: Client): Task[List[CommitStatus]] = {
def checkCLA(xs: List[Commit])(implicit client: Client): Task[List[CommitStatus]] = {
def checkUser(user: String): Task[Commit => CommitStatus] = {
val claStatus = for {
claRes <- httpClient.expect(get(claUrl(user)))(jsonOf[CLASignature])
claRes <- client.expect(get(claUrl(user)))(jsonOf[CLASignature])
} yield { (commit: Commit) =>
if (claRes.signed) Valid(Some(user), commit)
else Invalid(user, commit)
Expand Down Expand Up @@ -303,7 +303,7 @@ trait PullRequestService {

for {
commits <- getCommits(issue.number)
statuses <- checkCLA(commits, httpClient)
statuses <- checkCLA(commits)

(validStatuses, invalidStatuses) = statuses.partition(_.isValid)
invalidUsers = usersFromInvalid(invalidStatuses)
Expand Down Expand Up @@ -372,23 +372,41 @@ trait PullRequestService {
.map(_.forall(identity))

def checkSynchronize(issue: Issue): Task[Response] = {
implicit val httpClient = PooledHttp1Client()
implicit val client = PooledHttp1Client()

def extractFailures(c: List[CommitStatus]): List[String] = c.collect {
case Invalid(user, _) =>
s"@$user hasn't signed the CLA"
case MissingUser(commit) =>
s"missing user for commit: ${commit.sha} - correct email associated with GitHub account?"
case CLAServiceDown(user, _) =>
s"couldn't fetch status for: $user"
}

for {
commits <- getCommits(issue.number)
statuses <- checkCLA(commits, httpClient)
statuses <- checkCLA(commits)
invalid = statuses.filterNot(_.isValid)
_ <- sendStatuses(invalid, httpClient)
_ <- cancelBuilds(commits.dropRight(1))(httpClient)
_ <- sendStatuses(invalid, client)
_ <- cancelBuilds(commits.dropRight(1))

// Set final commit status based on `invalid`:
_ <- {
if (invalid.nonEmpty)
setStatus(InvalidPrevious(usersFromInvalid(invalid), commits.last), httpClient)
setStatus(InvalidPrevious(usersFromInvalid(invalid), commits.last), client)
else
setStatus(statuses.last, httpClient)
setStatus(statuses.last, client)
}
_ <- httpClient.shutdown

// Send comment regarding recheck:
comment =
if (invalid.isEmpty) "All users have signed the CLA as far as I can tell! :tada:"
else s"There are still some issues:\n\n- ${extractFailures(invalid).mkString("\n- ")}"

req <- post(issueCommentsUrl(issue.number)).withAuth(githubUser, githubToken)
_ <- client.fetch(req.withBody(comment.asJson))(Task.now)

_ <- client.shutdown
resp <- Ok("Updated PR checked")
} yield resp
}
Expand Down