From fc616ce055732f62bf7e5fbcfa1950cb48b88259 Mon Sep 17 00:00:00 2001 From: "kirby@puppetlabs.com" Date: Tue, 7 Apr 2020 11:22:05 -0700 Subject: [PATCH] Fix rubocop offenses --- lib/vmpooler/pool_manager.rb | 2 +- lib/vmpooler/providers/vsphere.rb | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/vmpooler/pool_manager.rb b/lib/vmpooler/pool_manager.rb index 76fbcf2..65847e8 100644 --- a/lib/vmpooler/pool_manager.rb +++ b/lib/vmpooler/pool_manager.rb @@ -446,7 +446,7 @@ module Vmpooler begin purge_vms_and_folders(provider.to_s) rescue StandardError => e - $logger.log('s', "[!] failed while purging provider #{provider.to_s} VMs and folders with an error: #{e}") + $logger.log('s', "[!] failed while purging provider #{provider} VMs and folders with an error: #{e}") end end end diff --git a/lib/vmpooler/providers/vsphere.rb b/lib/vmpooler/providers/vsphere.rb index f8a7d71..24b3b48 100644 --- a/lib/vmpooler/providers/vsphere.rb +++ b/lib/vmpooler/providers/vsphere.rb @@ -122,9 +122,7 @@ module Vmpooler folder_children.each do |folder_hash| folder_hash.each do |folder_title, folder_object| - unless folder_configured?(folder_title, base_folder, configured_folders, whitelist) - destroy_folder_and_children(folder_object) - end + destroy_folder_and_children(folder_object) unless folder_configured?(folder_title, base_folder, configured_folders, whitelist) end end end