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

Update lib/vmpooler/providers/base.rb

Browse source 
Co-authored-by: Gene Liverman <gene.liverman+06301990@puppet.com>
This commit is contained in:
Samuel 2021-12-08 12:56:22 -06:00 • committed by Samuel Beaulieu
parent b85455e4e8
commit ea86c2645a
No known key found for this signature in database
GPG key ID: 12030F74136D0F34
3 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/vmpooler.rb
View file

@ -81,16 +81,13 @@ module Vmpooler
parsed_config[:config]['retry_factor'] = string_to_int(ENV['RETRY_FACTOR']) if ENV['RETRY_FACTOR'] parsed_config[:config]['retry_factor'] = string_to_int(ENV['RETRY_FACTOR']) if ENV['RETRY_FACTOR']
parsed_config[:config]['create_folders'] = true?(ENV['CREATE_FOLDERS']) if ENV['CREATE_FOLDERS'] parsed_config[:config]['create_folders'] = true?(ENV['CREATE_FOLDERS']) if ENV['CREATE_FOLDERS']
parsed_config[:config]['experimental_features'] = ENV['EXPERIMENTAL_FEATURES'] if ENV['EXPERIMENTAL_FEATURES'] parsed_config[:config]['experimental_features'] = ENV['EXPERIMENTAL_FEATURES'] if ENV['EXPERIMENTAL_FEATURES']
parsed_config[:config]['purge_unconfigured_resources'] = ENV['PURGE_UNCONFIGURED_RESOURCES'] if ENV['PURGE_UNCONFIGURED_RESOURCES']
# ENV PURGE_UNCONFIGURED_FOLDERS deprecated, will be removed in version 3
if ENV['PURGE_UNCONFIGURED_FOLDERS']
puts '[!] [deprecation] rename ENV var \'PURGE_UNCONFIGURED_FOLDERS\' to \'PURGE_UNCONFIGURED_RESOURCES\''
# backwards compatibility
parsed_config[:config]['purge_unconfigured_resources'] = ENV['PURGE_UNCONFIGURED_FOLDERS']
end
parsed_config[:config]['usage_stats'] = ENV['USAGE_STATS'] if ENV['USAGE_STATS'] parsed_config[:config]['usage_stats'] = ENV['USAGE_STATS'] if ENV['USAGE_STATS']
parsed_config[:config]['request_logger'] = ENV['REQUEST_LOGGER'] if ENV['REQUEST_LOGGER'] parsed_config[:config]['request_logger'] = ENV['REQUEST_LOGGER'] if ENV['REQUEST_LOGGER']
parsed_config[:config]['create_template_delta_disks'] = ENV['CREATE_TEMPLATE_DELTA_DISKS'] if ENV['CREATE_TEMPLATE_DELTA_DISKS'] parsed_config[:config]['create_template_delta_disks'] = ENV['CREATE_TEMPLATE_DELTA_DISKS'] if ENV['CREATE_TEMPLATE_DELTA_DISKS']
parsed_config[:config]['purge_unconfigured_resources'] = ENV['PURGE_UNCONFIGURED_RESOURCES'] if ENV['PURGE_UNCONFIGURED_RESOURCES']
parsed_config[:config]['purge_unconfigured_resources'] = ENV['PURGE_UNCONFIGURED_FOLDERS'] if ENV['PURGE_UNCONFIGURED_FOLDERS']
# ENV PURGE_UNCONFIGURED_FOLDERS deprecated, will be removed in version 3
puts '[!] [deprecation] rename ENV var \'PURGE_UNCONFIGURED_FOLDERS\' to \'PURGE_UNCONFIGURED_RESOURCES\'' if ENV['PURGE_UNCONFIGURED_FOLDERS']
set_linked_clone(parsed_config) set_linked_clone(parsed_config)
parsed_config[:redis] = parsed_config[:redis] || {} parsed_config[:redis] = parsed_config[:redis] || {}

4
lib/vmpooler/providers/base.rb
View file

@ -243,9 +243,9 @@ module Vmpooler
# DEPRECATED if a provider does not implement the new method, it will hit this base class method # DEPRECATED if a provider does not implement the new method, it will hit this base class method
# and return a deprecation message # and return a deprecation message
def purge_unconfigured_folders(_deprecated, _deprecated2, whitelist) def purge_unconfigured_folders(_deprecated, _deprecated2, allowlist)
logger.log('s', '[!] purge_unconfigured_folders was renamed to purge_unconfigured_resources, please update your provider implementation') logger.log('s', '[!] purge_unconfigured_folders was renamed to purge_unconfigured_resources, please update your provider implementation')
purge_unconfigured_resources(whitelist) purge_unconfigured_resources(allowlist)
end end
end end
end end

4
spec/unit/pool_manager_spec.rb
View file

@ -1144,14 +1144,14 @@ EOT
it 'should run purge_unconfigured_resources' do it 'should run purge_unconfigured_resources' do
expect(provider).to receive(:purge_unconfigured_resources).with(allowlist) expect(provider).to receive(:purge_unconfigured_resources).with(allowlist)
expect(provider).to receive(:provider_config).and_return({}) expect(provider).to receive(:provider_config).and_return({}).twice
subject.purge_vms_and_resources(provider_name) subject.purge_vms_and_resources(provider_name)
end end
it 'should raise any errors' do it 'should raise any errors' do
expect(provider).to receive(:purge_unconfigured_resources).with(allowlist).and_raise('mockerror') expect(provider).to receive(:purge_unconfigured_resources).with(allowlist).and_raise('mockerror')
expect(provider).to receive(:provider_config).and_return({}) expect(provider).to receive(:provider_config).and_return({}).twice
expect{ subject.purge_vms_and_resources(provider_name) }.to raise_error(RuntimeError, 'mockerror') expect{ subject.purge_vms_and_resources(provider_name) }.to raise_error(RuntimeError, 'mockerror')
end end