From b9b1d9bbde9a437434315ec3c26a5b1ca9ae5885 Mon Sep 17 00:00:00 2001 From: Jake Spain Date: Thu, 14 Dec 2023 08:27:44 -0500 Subject: [PATCH] Bump vmpooler and vmpooler-provider-vsphere gems --- docker/Gemfile | 8 ++-- docker/Gemfile.lock | 112 ++++++++++++++++++++++++-------------------- 2 files changed, 66 insertions(+), 54 deletions(-) diff --git a/docker/Gemfile b/docker/Gemfile index cd67ec9..94f58f7 100644 --- a/docker/Gemfile +++ b/docker/Gemfile @@ -1,15 +1,15 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org' -gem 'vmpooler', '~> 3.0' +# gem 'vmpooler', '~> 3.0' gem 'vmpooler-dns-gcp', '~> 1.0' # Remove temporarily until a stable minor release is published # gem 'vmpooler-provider-ec2', '~> 0.0.1' gem 'vmpooler-provider-gce', '~> 1.0' -gem 'vmpooler-provider-vsphere', '~> 3.0' +# gem 'vmpooler-provider-vsphere', '~> 3.0' # For development install via a git branch use something like: -# gem 'vmpooler', git: 'https://github.com/puppetlabs/vmpooler.git', branch: 'my-feature' +gem 'vmpooler', git: 'https://github.com/puppetlabs/vmpooler.git', branch: 'add_vsphere_event_trace' # gem 'vmpooler-dns-gcp', git: 'https://github.com/puppetlabs/vmpooler-dns-gcp.git', branch: 'my-feature' # gem 'vmpooler-provider-ec2', git: 'https://github.com/puppetlabs/vmpooler-provider-ec2.git', branch: 'my-feature' # gem 'vmpooler-provider-gce', git: 'https://github.com/puppetlabs/vmpooler-provider-gce.git', branch: 'my-feature' -# gem 'vmpooler-provider-vsphere', git: 'https://github.com/puppetlabs/vmpooler-provider-vsphere.git', branch: 'my-feature' +gem 'vmpooler-provider-vsphere', git: 'https://github.com/puppetlabs/vmpooler-provider-vsphere.git', branch: 'add_vsphere_event_trace' diff --git a/docker/Gemfile.lock b/docker/Gemfile.lock index e71ae46..ae5f50d 100644 --- a/docker/Gemfile.lock +++ b/docker/Gemfile.lock @@ -1,23 +1,59 @@ +GIT + remote: https://github.com/puppetlabs/vmpooler-provider-vsphere.git + revision: d6dd025d6fc5c1b28316317c3aae9209dc511c67 + branch: add_vsphere_event_trace + specs: + vmpooler-provider-vsphere (3.3.4) + rbvmomi2 (>= 3.1, < 4.0) + vmpooler (~> 3.0) + +GIT + remote: https://github.com/puppetlabs/vmpooler.git + revision: 45461bdd449338498fe2bca0415b3a7b9663ebfc + branch: add_vsphere_event_trace + specs: + vmpooler (3.5.1) + concurrent-ruby (~> 1.1) + connection_pool (~> 2.4) + deep_merge (~> 1.2) + net-ldap (~> 0.16) + opentelemetry-exporter-jaeger (= 0.23.0) + opentelemetry-instrumentation-concurrent_ruby (= 0.21.1) + opentelemetry-instrumentation-http_client (= 0.22.2) + opentelemetry-instrumentation-redis (= 0.25.3) + opentelemetry-instrumentation-sinatra (= 0.23.2) + opentelemetry-resource_detectors (= 0.24.2) + opentelemetry-sdk (~> 1.3, >= 1.3.0) + pickup (~> 0.0.11) + prometheus-client (>= 2, < 5) + puma (>= 5.0.4, < 7) + rack (>= 2.2, < 4.0) + rake (~> 13.0) + redis (~> 5.0) + sinatra (>= 2, < 4) + spicy-proton (~> 2.1) + statsd-ruby (~> 1.4) + GEM remote: https://rubygems.org/ specs: - addressable (2.8.5) + addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) - base64 (0.1.1) + base64 (0.2.0) bindata (2.4.15) builder (3.2.4) concurrent-ruby (1.2.2) connection_pool (2.4.1) declarative (0.0.20) deep_merge (1.2.2) - faraday (2.7.11) + faraday (2.7.12) base64 faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) faraday-net_http (3.0.2) - google-apis-compute_v1 (0.80.0) + google-apis-compute_v1 (0.85.0) google-apis-core (>= 0.11.0, < 2.a) - google-apis-core (0.11.1) + google-apis-core (0.11.2) addressable (~> 2.5, >= 2.5.1) googleauth (>= 0.16.2, < 2.a) httpclient (>= 2.8.1, < 3.a) @@ -26,18 +62,18 @@ GEM retriable (>= 2.0, < 4.a) rexml webrick - google-apis-dns_v1 (0.34.0) + google-apis-dns_v1 (0.35.0) google-apis-core (>= 0.11.0, < 2.a) - google-cloud-core (1.6.0) - google-cloud-env (~> 1.0) + google-cloud-core (1.6.1) + google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) google-cloud-dns (0.35.1) google-apis-dns_v1 (~> 0.1) google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) zonefile (~> 1.04) - google-cloud-env (1.6.0) - faraday (>= 0.17.3, < 3.0) + google-cloud-env (2.1.0) + faraday (>= 1.0, < 3.a) google-cloud-errors (1.3.1) googleauth (1.2.0) faraday (>= 0.17.3, < 3.a) @@ -47,7 +83,7 @@ GEM os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) httpclient (2.8.3) - json (2.6.3-java) + json (2.7.1-java) jwt (2.7.1) memoist (0.16.2) mini_mime (1.1.5) @@ -55,8 +91,8 @@ GEM mustermann (3.0.0) ruby2_keywords (~> 0.0.1) net-ldap (0.18.0) - nio4r (2.5.9-java) - nokogiri (1.15.4-java) + nio4r (2.7.0-java) + nokogiri (1.15.5-java) racc (~> 1.4) opentelemetry-api (1.2.3) opentelemetry-common (0.20.0) @@ -67,7 +103,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) @@ -77,7 +113,7 @@ GEM opentelemetry-api (~> 1.0) opentelemetry-common (~> 0.20.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-rack (0.23.4) + opentelemetry-instrumentation-rack (0.23.5) opentelemetry-api (~> 1.0) opentelemetry-common (~> 0.20.0) opentelemetry-instrumentation-base (~> 0.22.1) @@ -95,7 +131,7 @@ GEM opentelemetry-resource_detectors (0.24.2) google-cloud-env opentelemetry-sdk (~> 1.0) - opentelemetry-sdk (1.3.0) + opentelemetry-sdk (1.3.1) opentelemetry-api (~> 1.1) opentelemetry-common (~> 0.20) opentelemetry-registry (~> 0.2) @@ -105,23 +141,23 @@ GEM optimist (3.1.0) os (1.1.4) pickup (0.0.11) - prometheus-client (4.2.1) - public_suffix (5.0.3) + prometheus-client (4.2.2) + public_suffix (5.0.4) puma (6.4.0-java) nio4r (~> 2.0) - racc (1.7.1-java) + racc (1.7.3-java) rack (2.2.8) rack-protection (3.1.0) rack (~> 2.2, >= 2.2.4) - rake (13.0.6) + rake (13.1.0) rbvmomi2 (3.7.0) 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.17.0) + redis (5.0.8) + redis-client (>= 0.17.0) + redis-client (0.19.0) connection_pool representable (3.2.0) declarative (< 0.1.0) @@ -147,27 +183,6 @@ GEM tilt (2.3.0) trailblazer-option (0.1.2) uber (0.1.0) - vmpooler (3.6.0) - concurrent-ruby (~> 1.1) - connection_pool (~> 2.4) - deep_merge (~> 1.2) - net-ldap (~> 0.16) - opentelemetry-exporter-jaeger (= 0.23.0) - opentelemetry-instrumentation-concurrent_ruby (= 0.21.1) - opentelemetry-instrumentation-http_client (= 0.22.2) - opentelemetry-instrumentation-redis (= 0.25.3) - opentelemetry-instrumentation-sinatra (= 0.23.2) - opentelemetry-resource_detectors (= 0.24.2) - opentelemetry-sdk (~> 1.3, >= 1.3.0) - pickup (~> 0.0.11) - prometheus-client (>= 2, < 5) - puma (>= 5.0.4, < 7) - rack (>= 2.2, < 4.0) - rake (~> 13.0) - redis (~> 5.0) - sinatra (>= 2, < 4) - spicy-proton (~> 2.1) - statsd-ruby (~> 1.4) vmpooler-dns-gcp (1.2.0) google-cloud-dns (~> 0.35.1) googleauth (>= 0.16.2, < 1.3.0) @@ -176,9 +191,6 @@ GEM google-apis-compute_v1 (~> 0.14) googleauth (>= 0.16.2, < 1.4.0) vmpooler (~> 3.0) - vmpooler-provider-vsphere (3.3.4) - rbvmomi2 (>= 3.1, < 4.0) - vmpooler (~> 3.0) webrick (1.8.1) zonefile (1.06) @@ -186,10 +198,10 @@ PLATFORMS universal-java-11 DEPENDENCIES - vmpooler (~> 3.0) + vmpooler! vmpooler-dns-gcp (~> 1.0) vmpooler-provider-gce (~> 1.0) - vmpooler-provider-vsphere (~> 3.0) + vmpooler-provider-vsphere! BUNDLED WITH - 2.4.12 + 2.4.22