Skip to content
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

utils/github: add ValidationFailedError. #5114

Merged
merged 2 commits into from
Oct 16, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions Library/Homebrew/test/utils/github_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,12 @@

describe "::search_issues", :needs_network do
it "queries GitHub issues with the passed parameters" do
results = subject.search_issues("brew search", repo: "Homebrew/brew", author: "avetamine", is: "closed")
results = subject.search_issues("brew search",
repo: "Homebrew/legacy-homebrew",
author: "MikeMcQuaid",
is: "closed")
expect(results).not_to be_empty
MikeMcQuaid marked this conversation as resolved.
Show resolved Hide resolved
expect(results.last["title"]).to eq("brew search : 422 Unprocessable Entity")
MikeMcQuaid marked this conversation as resolved.
Show resolved Hide resolved
expect(results.first["title"]).to eq("Shall we run `brew update` automatically?")
end
end
end
17 changes: 16 additions & 1 deletion Library/Homebrew/utils/github.rb
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def pretty_ratelimit_reset(reset)
class AuthenticationFailedError < Error
def initialize(github_message)
@github_message = github_message
message = "GitHub #{github_message}\n"
message = "GitHub #{github_message}:"
if ENV["HOMEBREW_GITHUB_API_TOKEN"]
message << <<~EOS
HOMEBREW_GITHUB_API_TOKEN may be invalid or expired; check:
Expand All @@ -65,6 +65,18 @@ def initialize(github_message)
end
end

class ValidationFailedError < Error
def initialize(github_message, errors)
@github_message = if errors.empty?
github_message
else
"#{github_message}: #{errors}"
end

super(@github_message)
end
end

def api_credentials
@api_credentials ||= begin
if ENV["HOMEBREW_GITHUB_API_TOKEN"]
Expand Down Expand Up @@ -231,6 +243,9 @@ def raise_api_error(output, errors, http_code, headers, scopes)
raise AuthenticationFailedError, message
when "404"
raise HTTPNotFoundError, message
when "422"
errors = json&.[]("errors") || []
raise ValidationFailedError.new(message, errors)
else
raise Error, message
end
Expand Down