From 989d0a1c122b8b2bf059f344e85a1b20749a6ec0 Mon Sep 17 00:00:00 2001 From: Mahima Singh <105724608+smahima27@users.noreply.github.com> Date: Tue, 17 Mar 2026 11:36:30 +0530 Subject: [PATCH] Update Gemfile.lock to vmpooler 3.9.0 and fix rubocop offenses - bundle update vmpooler to pick up 3.9.0 (circuit breaker + adaptive timeout) - Fix 5 pre-existing rubocop style offenses (all autocorrected) --- Gemfile.lock | 89 ++++++++++++++++++------------- lib/vmpooler/providers/vsphere.rb | 11 ++-- 2 files changed, 58 insertions(+), 42 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6d96901..31c0d06 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,37 +9,47 @@ GEM remote: https://rubygems.org/ specs: ast (2.4.2) - bindata (2.4.15) + base64 (0.3.0) + bindata (2.5.1) builder (3.2.4) climate_control (1.2.0) coderay (1.1.3) - concurrent-ruby (1.2.2) - connection_pool (2.4.1) + concurrent-ruby (1.3.6) + connection_pool (2.5.5) deep_merge (1.2.2) diff-lcs (1.5.0) docile (1.4.0) - faraday (2.7.10) - faraday-net_http (>= 2.0, < 3.1) - ruby2_keywords (>= 0.0.4) - faraday-net_http (3.0.2) + faraday (2.14.1) + faraday-net_http (>= 2.0, < 3.5) + json + logger + faraday-net_http (3.4.2) + net-http (~> 0.5) ffi (1.15.5-java) - google-cloud-env (1.6.0) - faraday (>= 0.17.3, < 3.0) + google-cloud-env (2.3.1) + base64 (~> 0.2) + faraday (>= 1.0, < 3.a) json (2.6.3) json (2.6.3-java) + logger (1.7.0) method_source (1.0.0) mock_redis (0.37.0) - mustermann (3.0.0) + mustermann (3.0.4) ruby2_keywords (~> 0.0.1) - net-ldap (0.18.0) - nio4r (2.5.9) - nio4r (2.5.9-java) + net-http (0.9.1) + uri (>= 0.11.1) + net-ldap (0.20.0) + base64 + ostruct + nio4r (2.7.5) + nio4r (2.7.5-java) nokogiri (1.15.4-java) racc (~> 1.4) nokogiri (1.15.4-x86_64-linux) racc (~> 1.4) - opentelemetry-api (1.2.2) - opentelemetry-common (0.20.0) + opentelemetry-api (1.8.0) + logger + opentelemetry-common (0.20.1) opentelemetry-api (~> 1.0) opentelemetry-exporter-jaeger (0.23.0) opentelemetry-api (~> 1.1) @@ -47,7 +57,7 @@ GEM opentelemetry-sdk (~> 1.2) opentelemetry-semantic_conventions thrift - opentelemetry-instrumentation-base (0.22.2) + opentelemetry-instrumentation-base (0.22.3) opentelemetry-api (~> 1.0) opentelemetry-registry (~> 0.1) opentelemetry-instrumentation-concurrent_ruby (0.21.1) @@ -70,25 +80,27 @@ GEM opentelemetry-common (~> 0.20.0) opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-rack (~> 0.21) - opentelemetry-registry (0.3.0) + opentelemetry-registry (0.4.0) opentelemetry-api (~> 1.1) - opentelemetry-resource_detectors (0.24.1) + opentelemetry-resource_detectors (0.24.2) google-cloud-env opentelemetry-sdk (~> 1.0) - opentelemetry-sdk (1.3.0) + opentelemetry-sdk (1.10.0) opentelemetry-api (~> 1.1) opentelemetry-common (~> 0.20) opentelemetry-registry (~> 0.2) opentelemetry-semantic_conventions - opentelemetry-semantic_conventions (1.10.0) + opentelemetry-semantic_conventions (1.36.0) opentelemetry-api (~> 1.0) optimist (3.1.0) + ostruct (0.6.3) parallel (1.23.0) parser (3.2.2.3) ast (~> 2.4.1) racc pickup (0.0.11) - prometheus-client (4.2.1) + prometheus-client (4.2.5) + base64 pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) @@ -96,27 +108,28 @@ GEM coderay (~> 1.1) method_source (~> 1.0) spoon (~> 0.0) - puma (6.3.1) + puma (6.6.1) nio4r (~> 2.0) - puma (6.3.1-java) + puma (6.6.1-java) nio4r (~> 2.0) racc (1.7.1) racc (1.7.1-java) - rack (2.2.8) - rack-protection (3.1.0) + rack (2.2.22) + rack-protection (3.2.0) + base64 (>= 0.1.0) rack (~> 2.2, >= 2.2.4) rack-test (2.1.0) rack (>= 1.3) rainbow (3.1.1) - rake (13.0.6) + rake (13.3.1) rbvmomi2 (3.6.1) builder (~> 3.2) json (~> 2.3) nokogiri (~> 1.12, >= 1.12.5) optimist (~> 3.0) - redis (5.0.7) - redis-client (>= 0.9.0) - redis-client (0.16.0) + redis (5.4.1) + redis-client (>= 0.22.0) + redis-client (0.27.0) connection_pool regexp_parser (2.8.1) rexml (3.2.6) @@ -152,10 +165,10 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - sinatra (3.1.0) + sinatra (3.2.0) mustermann (~> 3.0) rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.1.0) + rack-protection (= 3.2.0) tilt (~> 2.0) spicy-proton (2.1.15) bindata (~> 2.3) @@ -163,10 +176,11 @@ GEM ffi statsd-ruby (1.5.0) thor (1.2.2) - thrift (0.18.1) - tilt (2.2.0) + thrift (0.22.0) + tilt (2.7.0) unicode-display_width (2.4.2) - vmpooler (3.5.1) + uri (1.1.1) + vmpooler (3.9.0) concurrent-ruby (~> 1.1) connection_pool (~> 2.4) deep_merge (~> 1.2) @@ -174,10 +188,11 @@ GEM opentelemetry-exporter-jaeger (= 0.23.0) opentelemetry-instrumentation-concurrent_ruby (= 0.21.1) opentelemetry-instrumentation-http_client (= 0.22.2) + opentelemetry-instrumentation-rack (= 0.23.4) opentelemetry-instrumentation-redis (= 0.25.3) opentelemetry-instrumentation-sinatra (= 0.23.2) - opentelemetry-resource_detectors (= 0.24.1) - opentelemetry-sdk (~> 1.3, >= 1.3.0) + opentelemetry-resource_detectors (= 0.24.2) + opentelemetry-sdk (~> 1.8) pickup (~> 0.0.11) prometheus-client (>= 2, < 5) puma (>= 5.0.4, < 7) @@ -208,4 +223,4 @@ DEPENDENCIES yarjuf (>= 2.0) BUNDLED WITH - 2.4.10 + 2.6.9 diff --git a/lib/vmpooler/providers/vsphere.rb b/lib/vmpooler/providers/vsphere.rb index e3c67a5..de27fa1 100644 --- a/lib/vmpooler/providers/vsphere.rb +++ b/lib/vmpooler/providers/vsphere.rb @@ -75,7 +75,7 @@ module Vmpooler 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)) + transaction.expire("vmpooler__vm__#{vm_name}", data_ttl * 60 * 60) end end @@ -614,7 +614,7 @@ module Vmpooler pool_configuration = pool_config(pool_name) return nil if pool_configuration.nil? - hostname = vm_object.summary.guest.hostName if vm_object.summary&.guest && vm_object.summary.guest.hostName + hostname = vm_object.summary.guest.hostName if vm_object.summary&.guest&.hostName boottime = vm_object.runtime.bootTime if vm_object.runtime&.bootTime powerstate = vm_object.runtime.powerState if vm_object.runtime&.powerState @@ -732,7 +732,7 @@ module Vmpooler # Reverse the array back to normal and # then convert the array of paths into a '/' seperated string - (full_path.reverse.map { |p| p[1] }).join('/') + full_path.reverse.map { |p| p[1] }.join('/') end def add_disk(vm, size, datastore, connection, datacentername) @@ -1113,7 +1113,7 @@ module Vmpooler vm_object = find_vm(pool_name, vm_name, connection) return nil if vm_object.nil? - parent_host_object = vm_object.summary.runtime.host if vm_object.summary&.runtime && vm_object.summary.runtime.host + parent_host_object = vm_object.summary.runtime.host if vm_object.summary&.runtime&.host raise('Unable to determine which host the VM is running on') if parent_host_object.nil? parent_host = parent_host_object.name @@ -1258,7 +1258,8 @@ module Vmpooler def linked_clone?(pool) return if pool['create_linked_clone'] == false return true if pool['create_linked_clone'] - return true if @config[:config]['create_linked_clones'] + + true if @config[:config]['create_linked_clones'] end end end