Mirrors/inspec
2
0
Fork 0
mirror of https://github.com/inspec/inspec synced 2024-11-10 15:14:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Modify URL fetcher to accept URI (#3633)

Browse source 
Signed-off-by: Jerry Aldrich <jerryaldrichiii@gmail.com>
This commit is contained in:
Jerry Aldrich 2018-12-12 10:05:51 -08:00 committed by Clinton Wolfe
parent 671e315d93
commit 8019b2c487
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/fetchers/url.rb
View file

@ -24,6 +24,8 @@ module Fetchers
resolve_from_string(target[:url], opts, target[:username], target[:password])
elsif target.is_a?(String)
resolve_from_string(target, opts)
elsif target.is_a?(URI)
resolve_from_string(target.to_s, opts)
end
end
@ -94,8 +96,8 @@ module Fetchers
attr_reader :files, :archive_path
def initialize(url, opts)
@target = url
@target_uri = parse_uri(@target)
@target = url.to_s
@target_uri = url.is_a?(URI) ? url : parse_uri(url)
@insecure = opts['insecure']
@token = opts['token']
@config = opts

7
test/unit/fetchers/url_test.rb
View file

@ -34,7 +34,14 @@ describe Fetchers::Url do
res.expects(:open).returns(mock_open)
_(res).must_be_kind_of Fetchers::Url
_(res.resolved_source).must_equal({url: 'https://chef.io/some.tar.gz', sha256: expected_shasum})
end
it 'handles an https URI' do
uri = URI.parse('https://chef.io/some.tar.gz')
res = Fetchers::Url.resolve(uri)
res.expects(:open).returns(mock_open)
_(res).must_be_kind_of Fetchers::Url
_(res.resolved_source).must_equal({url: 'https://chef.io/some.tar.gz', sha256: expected_shasum})
end
it 'doesnt handle other schemas' do