vmpooler-provider-vsphere 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8065ff117266c13945c80a47fd98b0b7a8a4fe3ec8018b4ea2edd384cc733de
-  data.tar.gz: 7f6ef47c263526a44208b36dbbaed4fca5b9c6985d68ab968d9bf258a133c96e
+  metadata.gz: cb6b64b4cddee3d3d15f032ad1d101a5d56258fa63c233a03315da1cb57fdf89
+  data.tar.gz: 375e0a6c2674eaa73aafda714c4c54c8b0d11d0811c3d25282b91ea0cd0c0641
 SHA512:
-  metadata.gz: 4c774b0ffd019c106b1d69cb11aafd0c8acddb566e339b195d8a3bad373844855c9943823268b6ac34b5ea312d39b237093c707aaa46b72d22208fa25005ecb7
-  data.tar.gz: aaaa1c54f356a1039a13c6c2b59b509f7a070349eeb02fe900acf527ae2b9bbd13f7819ec9a9283d53429137ec279c3f2dbcb24719fcbce058d3a71894283372
+  metadata.gz: 6461719858338514dbed59feacf869daf9ad6bc45c1fcd87308f8faf445ca2fd378d57aaa97fa53cf51257cbe2fd0189ad7efd081e27c7b0a3719d47a3a5357b
+  data.tar.gz: 45333798cbf46841c28f07abea7c10deedd9424a3f036c85d1b81b4e69c2b99532daa4be69c373ecbb9d33579342a7d9663a13d8431589e4073fad08a1499ef6

data/lib/vmpooler/providers/vsphere.rb

@@ -51,8 +51,8 @@ module Vmpooler
           'vsphere'
         end
 
-        def folder_configured?(folder_title, base_folder, configured_folders, whitelist)
-          return true if whitelist&.include?(folder_title)
+        def folder_configured?(folder_title, base_folder, configured_folders, allowlist)
+          return true if allowlist&.include?(folder_title)
           return false unless configured_folders.keys.include?(folder_title)
           return false unless configured_folders[folder_title] == base_folder
 
@@ -119,7 +119,30 @@ module Vmpooler
           try >= max_tries ? raise : retry
         end
 
-        def purge_unconfigured_folders(base_folders, configured_folders, whitelist)
+        # Return a list of pool folders
+        def pool_folders(provider_name)
+          folders = {}
+          $config[:pools].each do |pool|
+            next unless pool['provider'] == provider_name.to_s
+
+            folder_parts = pool['folder'].split('/')
+            datacenter = get_target_datacenter_from_config(pool['name'])
+            folders[folder_parts.pop] = "#{datacenter}/vm/#{folder_parts.join('/')}"
+          end
+          folders
+        end
+
+        def get_base_folders(folders)
+          base = []
+          folders.each do |_key, value|
+            base << value
+          end
+          base.uniq
+        end
+
+        def purge_unconfigured_resources(allowlist)
+          configured_folders = pool_folders(name)
+          base_folders = get_base_folders(configured_folders)
           @connection_pool.with_metrics do |pool_object|
             connection = ensured_vsphere_connection(pool_object)
 
@@ -129,7 +152,7 @@ module Vmpooler
 
               folder_children.each do |folder_hash|
                 folder_hash.each do |folder_title, folder_object|
-                  destroy_folder_and_children(folder_object) unless folder_configured?(folder_title, base_folder, configured_folders, whitelist)
+                  destroy_folder_and_children(folder_object) unless folder_configured?(folder_title, base_folder, configured_folders, allowlist)
                 end
               end
             end

data/lib/vmpooler-provider-vsphere/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module VmpoolerProviderVsphere
-  VERSION = '1.4.0'
+  VERSION = '1.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmpooler-provider-vsphere
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-08 00:00:00.000000000 Z
+date: 2021-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbvmomi
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: climate_control
   requirement: !ruby/object:Gem::Requirement