puppetlabs/beaker-vmpooler
2
0
Fork 0
mirror of https://github.com/puppetlabs/beaker-vmpooler.git synced 2026-01-26 02:58:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #18 from nmburgan/maint/master/use_ssl_with_https_uri

Browse source 
(maint) Use SSL when pooler_api URL is HTTPS
This commit is contained in:
Gene Liverman 2021-06-15 14:42:48 -04:00 • committed by GitHub
commit 1da71ab4dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/beaker/hypervisor/vmpooler.rb
View file

@ -114,6 +114,7 @@ module Beaker
uri = URI.parse(@options['pooling_api'] + '/vm/')
http = Net::HTTP.new(uri.host, uri.port)
http.use_ssl = uri.instance_of?(URI::HTTPS)
request = Net::HTTP::Post.new(uri.request_uri)
if @credentials[:vmpooler_token]
@ -185,6 +186,7 @@ module Beaker
uri = URI.parse(@options[:pooling_api] + '/vm/' + h['vmhostname'].split('.')[0])
http = Net::HTTP.new(uri.host, uri.port)
http.use_ssl = uri.instance_of?(URI::HTTPS)
request = Net::HTTP::Put.new(uri.request_uri)
# merge pre-defined tags with host tags
@ -250,6 +252,7 @@ module Beaker
uri = URI.parse(get_template_url(@options['pooling_api'], name))
http = Net::HTTP.new( uri.host, uri.port )
http.use_ssl = uri.instance_of?(URI::HTTPS)
request = Net::HTTP::Delete.new(uri.request_uri)
if @credentials[:vmpooler_token]
@ -277,6 +280,7 @@ module Beaker
uri = URI.parse(@options[:pooling_api] + '/api/v1/vm/' + hostname + '/disk/' + disk_size.to_s)
http = Net::HTTP.new(uri.host, uri.port)
http.use_ssl = uri.instance_of?(URI::HTTPS)
request = Net::HTTP::Post.new(uri.request_uri)
request['X-AUTH-TOKEN'] = @credentials[:vmpooler_token]
@ -309,6 +313,7 @@ module Beaker
uri = URI.parse(@options[:pooling_api] + '/vm/' + hostname)
http = Net::HTTP.new(uri.host, uri.port)
http.use_ssl = uri.instance_of?(URI::HTTPS)
request = Net::HTTP::Get.new(uri.request_uri)
response = http.request(request)

1
spec/beaker/hypervisor/vmpooler_spec.rb
View file

@ -5,6 +5,7 @@ module Beaker
before :each do
stub_const( "Net", MockNet )
allow_any_instance_of(MockNet::HTTP).to receive(:use_ssl=)
allow( JSON ).to receive( :parse ) do |arg|
arg
end