Support faraday 1.0 and 2.0 #124
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fryguy
reviewed
Mar 29, 2024
Fryguy
reviewed
Mar 29, 2024
| @@ -24,8 +24,14 @@ Gem::Specification.new do |spec| | |||
| spec.require_paths = ["lib"] | |||
|
|
|||
| spec.add_dependency "activesupport", ">= 6.0", "<7.1" | |||
| spec.add_dependency "faraday", "~> 2.9" | |||
| spec.add_dependency "faraday-follow_redirects" | |||
There was a problem hiding this comment.
faraday-follow-redirects is written in a way that supports both v1 and v2, so we can just add the dependency directly.
Fryguy
reviewed
Mar 29, 2024
| @@ -77,10 +77,23 @@ def handle | |||
| faraday.options.timeout = @connection_options[:timeout] if @connection_options[:timeout] | |||
| faraday.response(:logger, client.logger) | |||
| faraday.response(:follow_redirects, :limit => 3, :standards_compliant => true) | |||
| if defined?(FaradayMiddleware::FollowRedirects) | |||
| # faraday 1.0 | |||
| faraday.use(FaradayMiddleware::FollowRedirects, :limit => 3, :standards_compliant => true) | |||
There was a problem hiding this comment.
Is this line needed? Line 79 should take care of it.
Fryguy
reviewed
Mar 29, 2024
lib/manageiq/api/client.rb
Outdated
| rescue LoadError | ||
| # faraday 1.0 | ||
| begin | ||
| require "faraday_middleware" |
There was a problem hiding this comment.
What was previously needed from faraday_middleware? If it was just follow_redirects, I thikn we can just use follow_redirects directly because it supports both v1 and v2
Fryguy
approved these changes
Mar 29, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
support faraday 1.0 and 2.0