Skip to content

fix codeclimet #6

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.

Sign up for GitHub

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
Aug 10, 2017
Merged

fix codeclimet #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 17 additions & 17 deletions lib/prometheus/api_client/client.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,37 +119,37 @@ def faraday_ssl(options)
return options[:ssl] if options[:ssl]

ssl = options[:options]
if ssl[:verify_ssl] || ssl[:ssl_cert_store]
{
verify: ssl[:verify_ssl] != OpenSSL::SSL::VERIFY_NONE,
cert_store: ssl[:ssl_cert_store],
}
end
return unless ssl[:verify_ssl] || ssl[:ssl_cert_store]

{
verify: ssl[:verify_ssl] != OpenSSL::SSL::VERIFY_NONE,
cert_store: ssl[:ssl_cert_store],
}
end

# Helper function to evalueate the low level headers option
def faraday_headers(options)
return options[:headers] if options[:headers]

headers = options[:credentials]
if headers[:token]
{
Authorization: 'Bearer ' + headers[:token].to_s,
}
end
return unless headers && headers[:token]

{
Authorization: 'Bearer ' + headers[:token].to_s,
}
end

# Helper function to evalueate the low level headers option
def faraday_request(options)
return options[:request] if options[:request]

request = options[:options]
if request[:open_timeout] || request[:timeout]
{
open_timeout: request[:open_timeout],
timeout: request[:timeout],
}
end
return unless request[:open_timeout] || request[:timeout]

{
open_timeout: request[:open_timeout],
timeout: request[:timeout],
}
end

# Helper function to create the args for the low level client
Expand Down