From f02e0eb19a881a634b5bf8c27c35799039cd69b4 Mon Sep 17 00:00:00 2001
From: Jake Spain <jake.spain+15749776@perforce.com>
Date: Mon, 21 Aug 2023 21:20:36 -0400
Subject: [PATCH 01/16] Fix getting IP by not returning a bad address

---
 lib/vmpooler/providers/vsphere.rb   |  2 ++
 spec/rbvmomi_helper.rb              |  2 +-
 spec/unit/providers/vsphere_spec.rb | 32 ++++++++++++++++++++++++++++-
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/lib/vmpooler/providers/vsphere.rb b/lib/vmpooler/providers/vsphere.rb
index 48eabd3..fe6749e 100644
--- a/lib/vmpooler/providers/vsphere.rb
+++ b/lib/vmpooler/providers/vsphere.rb
@@ -603,9 +603,11 @@ module Vmpooler
           ip_loop_delay = 1
           ip_loop_count = 1
           ip = nil
+          invalid_addresses = /(0|169)\.(0|254)\.\d+\.\d+/
           while ip.nil?
             sleep(ip_loop_delay)
             ip = vm_object.guest_ip
+            ip = nil if !ip.nil? && ip.match?(invalid_addresses)
             unless ip_maxloop == 0
               break if ip_loop_count >= ip_maxloop
 
diff --git a/spec/rbvmomi_helper.rb b/spec/rbvmomi_helper.rb
index ace62b6..c045a3f 100644
--- a/spec/rbvmomi_helper.rb
+++ b/spec/rbvmomi_helper.rb
@@ -818,7 +818,7 @@ end
 def mock_RbVmomi_VIM_VirtualMachine(options = {})
   options[:snapshot_tree] = nil if options[:snapshot_tree].nil?
   options[:name] = 'VM' + rand(65536).to_s if options[:name].nil?
-  options[:ip] = '169.254.255.255' if options[:ip].nil?
+  options[:ip] = '192.168.0.2' if options[:ip].nil?
   options[:path] = [] if options[:path].nil?
 
   mock = MockVirtualMachine.new()
diff --git a/spec/unit/providers/vsphere_spec.rb b/spec/unit/providers/vsphere_spec.rb
index 0dc2092..893b545 100644
--- a/spec/unit/providers/vsphere_spec.rb
+++ b/spec/unit/providers/vsphere_spec.rb
@@ -580,11 +580,41 @@ EOT
       end
     end
 
+    context 'when VM exists but contains a self assigned ip' do
+      let(:vm_object) { mock_RbVmomi_VIM_VirtualMachine({
+          :name => vmname,
+          :ip => '169.254.255.255',
+        })
+      }
+
+      it 'should return nil ip' do
+        allow(subject).to receive(:sleep)
+        result = subject.get_vm(poolname,vmname)
+
+        expect(result['ip']).to eq(nil)
+      end
+    end
+
+    context 'when VM exists but contains an invalid ip' do
+      let(:vm_object) { mock_RbVmomi_VIM_VirtualMachine({
+          :name => vmname,
+          :ip => '0.0.0.0',
+        })
+      }
+
+      it 'should return nil for ip' do
+        allow(subject).to receive(:sleep)
+        result = subject.get_vm(poolname,vmname)
+
+        expect(result['ip']).to eq(nil)
+      end
+    end
+
     context 'when VM exists and contains all information' do
       let(:vm_hostname) { "#{vmname}.demo.local" }
       let(:boot_time) { Time.now }
       let(:power_state) { 'MockPowerState' }
-      let(:ip) { '169.254.255.255' }
+      let(:ip) { '192.168.0.2' }
 
       let(:vm_object) { mock_RbVmomi_VIM_VirtualMachine({
           :name => vmname,

From 7316431f783c2f963cb053872064895faf6664c0 Mon Sep 17 00:00:00 2001
From: Jake Spain <jake.spain+15749776@perforce.com>
Date: Mon, 21 Aug 2023 21:44:31 -0400
Subject: [PATCH 02/16] Increase timeout for getting an IP

---
 lib/vmpooler/providers/vsphere.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/vmpooler/providers/vsphere.rb b/lib/vmpooler/providers/vsphere.rb
index fe6749e..358727f 100644
--- a/lib/vmpooler/providers/vsphere.rb
+++ b/lib/vmpooler/providers/vsphere.rb
@@ -599,7 +599,7 @@ module Vmpooler
           boottime = vm_object.runtime.bootTime if vm_object.runtime&.bootTime
           powerstate = vm_object.runtime.powerState if vm_object.runtime&.powerState
 
-          ip_maxloop = 60
+          ip_maxloop = 120
           ip_loop_delay = 1
           ip_loop_count = 1
           ip = nil

From f0c7d377d18bd70939bc97974ea810a191fdc852 Mon Sep 17 00:00:00 2001
From: Jake Spain <jake.spain+15749776@perforce.com>
Date: Tue, 22 Aug 2023 08:23:04 -0400
Subject: [PATCH 03/16] 3.3.1 release prep

---
 CHANGELOG.md                             | 8 ++++++++
 Gemfile.lock                             | 2 +-
 lib/vmpooler-provider-vsphere/version.rb | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b9794b..6ceb962 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [3.3.1](https://github.com/puppetlabs/vmpooler-provider-vsphere/tree/3.3.1) (2023-08-22)
+
+[Full Changelog](https://github.com/puppetlabs/vmpooler-provider-vsphere/compare/3.3.0...3.3.1)
+
+**Fixed bugs:**
+
+- \(RE-15710\) Fix IP address that is returned and increase timeout [\#44](https://github.com/puppetlabs/vmpooler-provider-vsphere/pull/44) ([yachub](https://github.com/yachub))
+
 ## [3.3.0](https://github.com/puppetlabs/vmpooler-provider-vsphere/tree/3.3.0) (2023-08-18)
 
 [Full Changelog](https://github.com/puppetlabs/vmpooler-provider-vsphere/compare/3.2.0...3.3.0)
diff --git a/Gemfile.lock b/Gemfile.lock
index 2d7e14b..6451e9e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vmpooler-provider-vsphere (3.3.0)
+    vmpooler-provider-vsphere (3.3.1)
       rbvmomi2 (>= 3.1, < 4.0)
       vmpooler (~> 3.0)
 
diff --git a/lib/vmpooler-provider-vsphere/version.rb b/lib/vmpooler-provider-vsphere/version.rb
index e954ce9..b3bbe34 100644
--- a/lib/vmpooler-provider-vsphere/version.rb
+++ b/lib/vmpooler-provider-vsphere/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module VmpoolerProviderVsphere
-  VERSION = '3.3.0'
+  VERSION = '3.3.1'
 end

From 978fc0031ac5998b9e071b94945daa22fd1116fd Mon Sep 17 00:00:00 2001
From: isaac-hammes <isaac.hammes@puppet.com>
Date: Wed, 23 Aug 2023 05:46:49 -0700
Subject: [PATCH 04/16] (maint) Increase timeout for cloned vms to obtain IPs.

---
 lib/vmpooler/providers/vsphere.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/vmpooler/providers/vsphere.rb b/lib/vmpooler/providers/vsphere.rb
index 358727f..c5e3212 100644
--- a/lib/vmpooler/providers/vsphere.rb
+++ b/lib/vmpooler/providers/vsphere.rb
@@ -599,7 +599,7 @@ module Vmpooler
           boottime = vm_object.runtime.bootTime if vm_object.runtime&.bootTime
           powerstate = vm_object.runtime.powerState if vm_object.runtime&.powerState
 
-          ip_maxloop = 120
+          ip_maxloop = 240
           ip_loop_delay = 1
           ip_loop_count = 1
           ip = nil

From 69629e1019a7d310d24e3e94e28387b525a65440 Mon Sep 17 00:00:00 2001
From: isaac-hammes <isaac.hammes@puppet.com>
Date: Wed, 23 Aug 2023 06:03:47 -0700
Subject: [PATCH 05/16] (maint) Release prep for version 3.3.2

---
 CHANGELOG.md                             | 8 ++++++++
 Gemfile.lock                             | 2 +-
 lib/vmpooler-provider-vsphere/version.rb | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ceb962..dcb5fe9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [3.3.2](https://github.com/puppetlabs/vmpooler-provider-vsphere/tree/3.3.2) (2023-08-23)
+
+[Full Changelog](https://github.com/puppetlabs/vmpooler-provider-vsphere/compare/3.3.1...3.3.2)
+
+**Fixed bugs:**
+
+- \(maint\) Increase timeout for cloned vms to obtain IPs. [\#47](https://github.com/puppetlabs/vmpooler-provider-vsphere/pull/47) ([isaac-hammes](https://github.com/isaac-hammes))
+
 ## [3.3.1](https://github.com/puppetlabs/vmpooler-provider-vsphere/tree/3.3.1) (2023-08-22)
 
 [Full Changelog](https://github.com/puppetlabs/vmpooler-provider-vsphere/compare/3.3.0...3.3.1)
diff --git a/Gemfile.lock b/Gemfile.lock
index 6451e9e..44930ce 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vmpooler-provider-vsphere (3.3.1)
+    vmpooler-provider-vsphere (3.3.2)
       rbvmomi2 (>= 3.1, < 4.0)
       vmpooler (~> 3.0)
 
diff --git a/lib/vmpooler-provider-vsphere/version.rb b/lib/vmpooler-provider-vsphere/version.rb
index b3bbe34..5952ba7 100644
--- a/lib/vmpooler-provider-vsphere/version.rb
+++ b/lib/vmpooler-provider-vsphere/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module VmpoolerProviderVsphere
-  VERSION = '3.3.1'
+  VERSION = '3.3.2'
 end

From 81f5192ded0ac5b0498a55bca039b253d127ac98 Mon Sep 17 00:00:00 2001
From: isaac-hammes <isaac.hammes@puppet.com>
Date: Mon, 28 Aug 2023 07:39:11 -0700
Subject: [PATCH 06/16] (maint) Update Gemfile.lock and use block for
 transaction.

---
 Gemfile.lock                      | 21 ++++++++++++---------
 lib/vmpooler/providers/vsphere.rb | 30 +++++++++++++++---------------
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 44930ce..220fd6d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -34,11 +34,11 @@ GEM
     net-ldap (0.18.0)
     nio4r (2.5.9)
     nio4r (2.5.9-java)
-    nokogiri (1.15.3-java)
+    nokogiri (1.15.4-java)
       racc (~> 1.4)
-    nokogiri (1.15.3-x86_64-linux)
+    nokogiri (1.15.4-x86_64-linux)
       racc (~> 1.4)
-    opentelemetry-api (1.2.1)
+    opentelemetry-api (1.2.2)
     opentelemetry-common (0.20.0)
       opentelemetry-api (~> 1.0)
     opentelemetry-exporter-jaeger (0.23.0)
@@ -96,9 +96,9 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
       spoon (~> 0.0)
-    puma (6.3.0)
+    puma (6.3.1)
       nio4r (~> 2.0)
-    puma (6.3.0-java)
+    puma (6.3.1-java)
       nio4r (~> 2.0)
     racc (1.7.1)
     racc (1.7.1-java)
@@ -114,7 +114,10 @@ GEM
       json (~> 2.3)
       nokogiri (~> 1.12, >= 1.12.5)
       optimist (~> 3.0)
-    redis (4.8.1)
+    redis (5.0.7)
+      redis-client (>= 0.9.0)
+    redis-client (0.16.0)
+      connection_pool
     regexp_parser (2.8.1)
     rexml (3.2.6)
     rspec (3.12.0)
@@ -163,9 +166,9 @@ GEM
     thrift (0.18.1)
     tilt (2.2.0)
     unicode-display_width (2.4.2)
-    vmpooler (3.2.0)
+    vmpooler (3.5.1)
       concurrent-ruby (~> 1.1)
-      connection_pool (~> 2.2)
+      connection_pool (~> 2.4)
       deep_merge (~> 1.2)
       net-ldap (~> 0.16)
       opentelemetry-exporter-jaeger (= 0.23.0)
@@ -180,7 +183,7 @@ GEM
       puma (>= 5.0.4, < 7)
       rack (>= 2.2, < 4.0)
       rake (~> 13.0)
-      redis (~> 4.1)
+      redis (~> 5.0)
       sinatra (>= 2, < 4)
       spicy-proton (~> 2.1)
       statsd-ruby (~> 1.4)
diff --git a/lib/vmpooler/providers/vsphere.rb b/lib/vmpooler/providers/vsphere.rb
index c5e3212..a67ca7e 100644
--- a/lib/vmpooler/providers/vsphere.rb
+++ b/lib/vmpooler/providers/vsphere.rb
@@ -68,14 +68,14 @@ module Vmpooler
           try = 0 if try.nil?
           max_tries = 3
           @redis.with_metrics do |redis|
-            redis.multi
-            redis.srem("vmpooler__completed__#{pool}", vm_name)
-            redis.hdel("vmpooler__active__#{pool}", vm_name)
-            redis.hset("vmpooler__vm__#{vm_name}", 'destroy', Time.now)
+            redis.multi do |transaction|
+              transaction.srem("vmpooler__completed__#{pool}", vm_name)
+              transaction.hdel("vmpooler__active__#{pool}", vm_name)
+              transaction.hset("vmpooler__vm__#{vm_name}", 'destroy', Time.now)
 
-            # Auto-expire metadata key
-            redis.expire("vmpooler__vm__#{vm_name}", (data_ttl * 60 * 60))
-            redis.exec
+              # Auto-expire metadata key
+              transaction.expire("vmpooler__vm__#{vm_name}", (data_ttl * 60 * 60))
+            end
           end
 
           start = Time.now
@@ -1137,10 +1137,10 @@ module Vmpooler
           target_host_object = find_host_by_dnsname(connection, target_host_name)
           finish = migrate_vm_and_record_timing(pool_name, vm_name, vm_hash, target_host_object, target_host_name)
           @redis.with_metrics do |redis|
-            redis.multi
-            redis.hset("vmpooler__vm__#{vm_name}", 'host', target_host_name)
-            redis.hset("vmpooler__vm__#{vm_name}", 'migrated', true)
-            redis.exec
+            redis.multi do |transaction|
+              transaction.hset("vmpooler__vm__#{vm_name}", 'host', target_host_name)
+              transaction.hset("vmpooler__vm__#{vm_name}", 'migrated', true)
+            end
           end
           logger.log('s', "[>] [#{pool_name}] '#{vm_name}' migrated from #{vm_hash['host_name']} to #{target_host_name} in #{finish} seconds")
         ensure
@@ -1158,10 +1158,10 @@ module Vmpooler
           metrics.increment("migrate_to.#{dest_host_name}")
           @redis.with_metrics do |redis|
             checkout_to_migration = format('%<time>.2f', time: Time.now - Time.parse(redis.hget("vmpooler__vm__#{vm_name}", 'checkout')))
-            redis.multi
-            redis.hset("vmpooler__vm__#{vm_name}", 'migration_time', finish)
-            redis.hset("vmpooler__vm__#{vm_name}", 'checkout_to_migration', checkout_to_migration)
-            redis.exec
+            redis.multi do |transaction|
+              transaction.hset("vmpooler__vm__#{vm_name}", 'migration_time', finish)
+              transaction.hset("vmpooler__vm__#{vm_name}", 'checkout_to_migration', checkout_to_migration)
+            end
           end
           finish
         end

From 1dc1d8e568806ce60010ffd13061f5f9ce0f0bd7 Mon Sep 17 00:00:00 2001
From: isaac-hammes <isaac.hammes@puppet.com>
Date: Mon, 28 Aug 2023 08:04:27 -0700
Subject: [PATCH 07/16] (maint) Release prep for version 3.3.3

---
 CHANGELOG.md                             | 8 ++++++++
 Gemfile.lock                             | 2 +-
 lib/vmpooler-provider-vsphere/version.rb | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dcb5fe9..967de5e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [3.3.3](https://github.com/puppetlabs/vmpooler-provider-vsphere/tree/3.3.3) (2023-08-28)
+
+[Full Changelog](https://github.com/puppetlabs/vmpooler-provider-vsphere/compare/3.3.2...3.3.3)
+
+**Fixed bugs:**
+
+- \(maint\) Update Gemfile.lock and use block for transaction. [\#49](https://github.com/puppetlabs/vmpooler-provider-vsphere/pull/49) ([isaac-hammes](https://github.com/isaac-hammes))
+
 ## [3.3.2](https://github.com/puppetlabs/vmpooler-provider-vsphere/tree/3.3.2) (2023-08-23)
 
 [Full Changelog](https://github.com/puppetlabs/vmpooler-provider-vsphere/compare/3.3.1...3.3.2)
diff --git a/Gemfile.lock b/Gemfile.lock
index 220fd6d..a7c3f5a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vmpooler-provider-vsphere (3.3.2)
+    vmpooler-provider-vsphere (3.3.3)
       rbvmomi2 (>= 3.1, < 4.0)
       vmpooler (~> 3.0)
 
diff --git a/lib/vmpooler-provider-vsphere/version.rb b/lib/vmpooler-provider-vsphere/version.rb
index 5952ba7..0f4625a 100644
--- a/lib/vmpooler-provider-vsphere/version.rb
+++ b/lib/vmpooler-provider-vsphere/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module VmpoolerProviderVsphere
-  VERSION = '3.3.2'
+  VERSION = '3.3.3'
 end

From 9fa1072a3213ba1da3697d5b1f4ba8f3d2357d1a Mon Sep 17 00:00:00 2001
From: isaac-hammes <isaac.hammes@puppet.com>
Date: Wed, 30 Aug 2023 08:57:07 -0700
Subject: [PATCH 08/16] (maint) Convert booleans and Time objects to strings
 when being added to redis

---
 lib/vmpooler/providers/vsphere.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/vmpooler/providers/vsphere.rb b/lib/vmpooler/providers/vsphere.rb
index a67ca7e..c174448 100644
--- a/lib/vmpooler/providers/vsphere.rb
+++ b/lib/vmpooler/providers/vsphere.rb
@@ -71,7 +71,7 @@ module Vmpooler
             redis.multi do |transaction|
               transaction.srem("vmpooler__completed__#{pool}", vm_name)
               transaction.hdel("vmpooler__active__#{pool}", vm_name)
-              transaction.hset("vmpooler__vm__#{vm_name}", 'destroy', Time.now)
+              transaction.hset("vmpooler__vm__#{vm_name}", 'destroy', Time.now.to_s)
 
               # Auto-expire metadata key
               transaction.expire("vmpooler__vm__#{vm_name}", (data_ttl * 60 * 60))
@@ -1139,7 +1139,7 @@ module Vmpooler
           @redis.with_metrics do |redis|
             redis.multi do |transaction|
               transaction.hset("vmpooler__vm__#{vm_name}", 'host', target_host_name)
-              transaction.hset("vmpooler__vm__#{vm_name}", 'migrated', true)
+              transaction.hset("vmpooler__vm__#{vm_name}", 'migrated', 'true')
             end
           end
           logger.log('s', "[>] [#{pool_name}] '#{vm_name}' migrated from #{vm_hash['host_name']} to #{target_host_name} in #{finish} seconds")

From 7a6685927a476fa407667058b5fcea4b5331fd31 Mon Sep 17 00:00:00 2001
From: isaac-hammes <isaac.hammes@puppet.com>
Date: Wed, 30 Aug 2023 09:32:36 -0700
Subject: [PATCH 09/16] (maint) Release prep for version 3.3.4

---
 CHANGELOG.md                             | 8 ++++++++
 Gemfile.lock                             | 2 +-
 lib/vmpooler-provider-vsphere/version.rb | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 967de5e..8e3ca6b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [3.3.4](https://github.com/puppetlabs/vmpooler-provider-vsphere/tree/3.3.4) (2023-08-30)
+
+[Full Changelog](https://github.com/puppetlabs/vmpooler-provider-vsphere/compare/3.3.3...3.3.4)
+
+**Fixed bugs:**
+
+- \(maint\) Convert booleans and Time objects to strings when being added to redis [\#51](https://github.com/puppetlabs/vmpooler-provider-vsphere/pull/51) ([isaac-hammes](https://github.com/isaac-hammes))
+
 ## [3.3.3](https://github.com/puppetlabs/vmpooler-provider-vsphere/tree/3.3.3) (2023-08-28)
 
 [Full Changelog](https://github.com/puppetlabs/vmpooler-provider-vsphere/compare/3.3.2...3.3.3)
diff --git a/Gemfile.lock b/Gemfile.lock
index a7c3f5a..6d96901 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vmpooler-provider-vsphere (3.3.3)
+    vmpooler-provider-vsphere (3.3.4)
       rbvmomi2 (>= 3.1, < 4.0)
       vmpooler (~> 3.0)
 
diff --git a/lib/vmpooler-provider-vsphere/version.rb b/lib/vmpooler-provider-vsphere/version.rb
index 0f4625a..36c56a7 100644
--- a/lib/vmpooler-provider-vsphere/version.rb
+++ b/lib/vmpooler-provider-vsphere/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module VmpoolerProviderVsphere
-  VERSION = '3.3.3'
+  VERSION = '3.3.4'
 end

From a223bf4d6104aa16aa11f8ff029ef42cc4d99e40 Mon Sep 17 00:00:00 2001
From: isaac-hammes <isaac.hammes@puppet.com>
Date: Thu, 7 Sep 2023 12:47:58 -0700
Subject: [PATCH 10/16] (RE-15750) Handle vm no longer existing when attempting
 to migrate.

---
 lib/vmpooler/providers/vsphere.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/vmpooler/providers/vsphere.rb b/lib/vmpooler/providers/vsphere.rb
index c174448..efd3c9f 100644
--- a/lib/vmpooler/providers/vsphere.rb
+++ b/lib/vmpooler/providers/vsphere.rb
@@ -1103,6 +1103,9 @@ module Vmpooler
             begin
               connection = ensured_vsphere_connection(pool_object)
               vm_hash = get_vm_details(pool_name, vm_name, connection)
+
+              raise StandardError, 'failed to get vm details. vm is unreachable or no longer exists' if vm_hash.nil?
+
               @redis.with_metrics do |redis|
                 redis.hset("vmpooler__vm__#{vm_name}", 'host', vm_hash['host_name'])
                 migration_count = redis.scard('vmpooler__migration')

From f04162f421de831dcc78019a3e29ce24d1cdd442 Mon Sep 17 00:00:00 2001
From: Jake Spain <jake.spain+15749776@perforce.com>
Date: Tue, 5 Dec 2023 17:17:00 -0500
Subject: [PATCH 11/16] syncing files from release-engineering-repo-standards

---
 .github/dependabot.yml                  |  6 ++++++
 .github/workflows/auto_release_prep.yml | 11 +++++++++++
 .github/workflows/dependabot_merge.yml  |  8 ++++++++
 .github/workflows/ensure_label.yml      |  8 ++++++++
 4 files changed, 33 insertions(+)
 create mode 100644 .github/workflows/auto_release_prep.yml
 create mode 100644 .github/workflows/dependabot_merge.yml
 create mode 100644 .github/workflows/ensure_label.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 81e0069..4ae585a 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -5,3 +5,9 @@ updates:
   schedule:
     interval: weekly
   open-pull-requests-limit: 10
+
+- package-ecosystem: github-actions
+  directory: "/"
+  schedule:
+    interval: weekly
+  open-pull-requests-limit: 10
diff --git a/.github/workflows/auto_release_prep.yml b/.github/workflows/auto_release_prep.yml
new file mode 100644
index 0000000..5cf6deb
--- /dev/null
+++ b/.github/workflows/auto_release_prep.yml
@@ -0,0 +1,11 @@
+name: Automated release prep
+
+on:
+  workflow_dispatch:
+
+jobs:
+  auto_release_prep:
+    uses: puppetlabs/release-engineering-repo-standards/.github/workflows/auto_release_prep.yml@v1
+    secrets: inherit
+    with:
+      version-file-path: lib/vmpooler-provider-vsphere/version.rb
diff --git a/.github/workflows/dependabot_merge.yml b/.github/workflows/dependabot_merge.yml
new file mode 100644
index 0000000..75b9cea
--- /dev/null
+++ b/.github/workflows/dependabot_merge.yml
@@ -0,0 +1,8 @@
+name: Dependabot auto-merge
+
+on: pull_request
+
+jobs:
+  dependabot_merge:
+    uses: puppetlabs/release-engineering-repo-standards/.github/workflows/dependabot_merge.yml@v1
+    secrets: inherit
diff --git a/.github/workflows/ensure_label.yml b/.github/workflows/ensure_label.yml
new file mode 100644
index 0000000..50a5fa8
--- /dev/null
+++ b/.github/workflows/ensure_label.yml
@@ -0,0 +1,8 @@
+name: Ensure label
+
+on: pull_request
+
+jobs:
+  ensure_label:
+    uses: puppetlabs/release-engineering-repo-standards/.github/workflows/ensure_label.yml@v1
+    secrets: inherit

From 29d3d29feec4d4598443292a8915782a9ecaa86e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 7 Dec 2023 13:49:00 +0000
Subject: [PATCH 12/16] Bump actions/setup-java from 3 to 4

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3 to 4.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/security.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml
index 666c602..0a6c0dd 100644
--- a/.github/workflows/security.yml
+++ b/.github/workflows/security.yml
@@ -22,7 +22,7 @@ jobs:
     - name: check lock
       run: '[ -f "Gemfile.lock" ] && echo "package lock file exists, skipping" || bundle lock'
     # install java
-    - uses: actions/setup-java@v3
+    - uses: actions/setup-java@v4
       with:
         distribution: 'temurin' # See 'Supported distributions' for available options
         java-version: '17'

From 71bcf16ee80fd374fbde20fae65770ee7f65dd70 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 7 Dec 2023 13:49:05 +0000
Subject: [PATCH 13/16] Bump actions/checkout from 3 to 4

Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/release.yml  | 2 +-
 .github/workflows/security.yml | 2 +-
 .github/workflows/testing.yml  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5d71f9f..241e61c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository == 'puppetlabs/vmpooler-provider-vsphere'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Get Current Version
         uses: actions/github-script@v6
diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml
index 666c602..30e3388 100644
--- a/.github/workflows/security.yml
+++ b/.github/workflows/security.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: checkout repo content
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 1
     - name: setup ruby
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 105fc8e..1f2f421 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -20,7 +20,7 @@ jobs:
         ruby-version:
           - 'jruby-9.4.3.0'
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
@@ -36,7 +36,7 @@ jobs:
         ruby-version:
           - 'jruby-9.4.3.0'
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

From 15cd166f9dea644e28f235338ace176fc7972661 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 7 Dec 2023 13:49:11 +0000
Subject: [PATCH 14/16] Bump actions/github-script from 6 to 7

Bumps [actions/github-script](https://github.com/actions/github-script) from 6 to 7.
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](https://github.com/actions/github-script/compare/v6...v7)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5d71f9f..d520b3e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Get Current Version
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         id: cv
         with:
           script: |

From d6127f92de8d23709345a546cc303bf9599fa3a7 Mon Sep 17 00:00:00 2001
From: Jake Spain <jake.spain+15749776@perforce.com>
Date: Mon, 15 Jan 2024 09:25:02 -0500
Subject: [PATCH 15/16] Fix missing param in auto_release_prep

---
 .github/workflows/auto_release_prep.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/auto_release_prep.yml b/.github/workflows/auto_release_prep.yml
index 5cf6deb..50d172f 100644
--- a/.github/workflows/auto_release_prep.yml
+++ b/.github/workflows/auto_release_prep.yml
@@ -8,4 +8,5 @@ jobs:
     uses: puppetlabs/release-engineering-repo-standards/.github/workflows/auto_release_prep.yml@v1
     secrets: inherit
     with:
+      project-type: ruby
       version-file-path: lib/vmpooler-provider-vsphere/version.rb

From ed03dc54fa464084c5170905c6c6578ff8a457e3 Mon Sep 17 00:00:00 2001
From: Jake Spain <jake.spain+15749776@perforce.com>
Date: Fri, 19 Jan 2024 15:33:34 -0500
Subject: [PATCH 16/16] Remove interactive option from release prep script

---
 release-prep | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/release-prep b/release-prep
index ad040cc..4b022ff 100755
--- a/release-prep
+++ b/release-prep
@@ -3,13 +3,13 @@
 # The container tag should closely match what is used in `docker/Dockerfile` in vmpooler-deployment
 #
 # Update Gemfile.lock
-docker run -it --rm \
+docker run -t --rm \
   -v $(pwd):/app \
   jruby:9.4.3.0-jdk11 \
   /bin/bash -c 'apt-get update -qq && apt-get install -y --no-install-recommends git make netbase && cd /app && gem install bundler && bundle install --jobs 3; echo "LOCK_FILE_UPDATE_EXIT_CODE=$?"'
 
 # Update Changelog
-docker run -it --rm -e CHANGELOG_GITHUB_TOKEN -v $(pwd):/usr/local/src/your-app \
+docker run -t --rm -e CHANGELOG_GITHUB_TOKEN -v $(pwd):/usr/local/src/your-app \
   githubchangeloggenerator/github-changelog-generator:1.16.2 \
   github_changelog_generator --future-release $(grep VERSION lib/vmpooler-provider-vsphere/version.rb |rev |cut -d "'" -f2 |rev)