From e3a5dc772caec60390863c978b3300a92be8e7f7 Mon Sep 17 00:00:00 2001 From: isaac-hammes Date: Wed, 21 May 2025 05:35:09 -0700 Subject: [PATCH] Test vmpooler update --- docker/Gemfile | 4 +- docker/Gemfile.lock | 322 +++++++++++++++++++++++--------------------- 2 files changed, 170 insertions(+), 156 deletions(-) diff --git a/docker/Gemfile b/docker/Gemfile index cd67ec9..ab4fed6 100644 --- a/docker/Gemfile +++ b/docker/Gemfile @@ -1,6 +1,6 @@ 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' @@ -8,7 +8,7 @@ gem 'vmpooler-provider-gce', '~> 1.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', ref: '891a7da22db8e95f56e38ec011558f16a08f9c5a' # 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' diff --git a/docker/Gemfile.lock b/docker/Gemfile.lock index e71ae46..f10370e 100644 --- a/docker/Gemfile.lock +++ b/docker/Gemfile.lock @@ -1,160 +1,16 @@ -GEM - remote: https://rubygems.org/ +GIT + remote: https://github.com/puppetlabs/vmpooler.git + revision: 891a7da22db8e95f56e38ec011558f16a08f9c5a + ref: 891a7da22db8e95f56e38ec011558f16a08f9c5a specs: - addressable (2.8.5) - public_suffix (>= 2.0.2, < 6.0) - base64 (0.1.1) - 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) - 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-core (>= 0.11.0, < 2.a) - google-apis-core (0.11.1) - addressable (~> 2.5, >= 2.5.1) - googleauth (>= 0.16.2, < 2.a) - httpclient (>= 2.8.1, < 3.a) - mini_mime (~> 1.0) - representable (~> 3.0) - retriable (>= 2.0, < 4.a) - rexml - webrick - google-apis-dns_v1 (0.34.0) - google-apis-core (>= 0.11.0, < 2.a) - google-cloud-core (1.6.0) - google-cloud-env (~> 1.0) - 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-errors (1.3.1) - googleauth (1.2.0) - faraday (>= 0.17.3, < 3.a) - jwt (>= 1.4, < 3.0) - memoist (~> 0.16) - multi_json (~> 1.11) - os (>= 0.9, < 2.0) - signet (>= 0.16, < 2.a) - httpclient (2.8.3) - json (2.6.3-java) - jwt (2.7.1) - memoist (0.16.2) - mini_mime (1.1.5) - multi_json (1.15.0) - mustermann (3.0.0) - ruby2_keywords (~> 0.0.1) - net-ldap (0.18.0) - nio4r (2.5.9-java) - nokogiri (1.15.4-java) - racc (~> 1.4) - opentelemetry-api (1.2.3) - opentelemetry-common (0.20.0) - opentelemetry-api (~> 1.0) - opentelemetry-exporter-jaeger (0.23.0) - opentelemetry-api (~> 1.1) - opentelemetry-common (~> 0.20) - opentelemetry-sdk (~> 1.2) - opentelemetry-semantic_conventions - thrift - opentelemetry-instrumentation-base (0.22.2) - opentelemetry-api (~> 1.0) - opentelemetry-registry (~> 0.1) - opentelemetry-instrumentation-concurrent_ruby (0.21.1) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-http_client (0.22.2) - opentelemetry-api (~> 1.0) - opentelemetry-common (~> 0.20.0) - opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-rack (0.23.4) - opentelemetry-api (~> 1.0) - opentelemetry-common (~> 0.20.0) - opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-redis (0.25.3) - opentelemetry-api (~> 1.0) - opentelemetry-common (~> 0.20.0) - opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-sinatra (0.23.2) - opentelemetry-api (~> 1.0) - opentelemetry-common (~> 0.20.0) - opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-rack (~> 0.21) - opentelemetry-registry (0.3.0) - opentelemetry-api (~> 1.1) - opentelemetry-resource_detectors (0.24.2) - google-cloud-env - opentelemetry-sdk (~> 1.0) - opentelemetry-sdk (1.3.0) - opentelemetry-api (~> 1.1) - opentelemetry-common (~> 0.20) - opentelemetry-registry (~> 0.2) - opentelemetry-semantic_conventions - opentelemetry-semantic_conventions (1.10.0) - opentelemetry-api (~> 1.0) - optimist (3.1.0) - os (1.1.4) - pickup (0.0.11) - prometheus-client (4.2.1) - public_suffix (5.0.3) - puma (6.4.0-java) - nio4r (~> 2.0) - racc (1.7.1-java) - rack (2.2.8) - rack-protection (3.1.0) - rack (~> 2.2, >= 2.2.4) - rake (13.0.6) - 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) - connection_pool - representable (3.2.0) - declarative (< 0.1.0) - trailblazer-option (>= 0.1.1, < 0.2.0) - uber (< 0.2.0) - retriable (3.1.2) - rexml (3.2.6) - ruby2_keywords (0.0.5) - signet (0.18.0) - addressable (~> 2.8) - faraday (>= 0.17.5, < 3.a) - jwt (>= 1.5, < 3.0) - multi_json (~> 1.10) - sinatra (3.1.0) - mustermann (~> 3.0) - rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.1.0) - tilt (~> 2.0) - spicy-proton (2.1.15) - bindata (~> 2.3) - statsd-ruby (1.5.0) - thrift (0.19.0) - tilt (2.3.0) - trailblazer-option (0.1.2) - uber (0.1.0) - vmpooler (3.6.0) + vmpooler (3.7.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-concurrent_ruby (= 0.21.2) + opentelemetry-instrumentation-http_client (= 0.22.3) opentelemetry-instrumentation-redis (= 0.25.3) opentelemetry-instrumentation-sinatra (= 0.23.2) opentelemetry-resource_detectors (= 0.24.2) @@ -168,6 +24,165 @@ GEM sinatra (>= 2, < 4) spicy-proton (~> 2.1) statsd-ruby (~> 1.4) + +GEM + remote: https://rubygems.org/ + specs: + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + base64 (0.2.0) + bindata (2.5.1) + builder (3.3.0) + concurrent-ruby (1.3.5) + connection_pool (2.5.3) + declarative (0.0.20) + deep_merge (1.2.2) + faraday (2.13.1) + faraday-net_http (>= 2.0, < 3.5) + json + logger + faraday-net_http (3.4.0) + net-http (>= 0.5.0) + google-apis-compute_v1 (0.86.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-core (0.11.3) + addressable (~> 2.5, >= 2.5.1) + googleauth (>= 0.16.2, < 2.a) + httpclient (>= 2.8.1, < 3.a) + mini_mime (~> 1.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.a) + rexml + google-apis-dns_v1 (0.36.0) + google-apis-core (>= 0.11.0, < 2.a) + google-cloud-core (1.8.0) + 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 (2.3.0) + base64 (~> 0.2) + faraday (>= 1.0, < 3.a) + google-cloud-errors (1.5.0) + googleauth (1.2.0) + faraday (>= 0.17.3, < 3.a) + jwt (>= 1.4, < 3.0) + memoist (~> 0.16) + multi_json (~> 1.11) + os (>= 0.9, < 2.0) + signet (>= 0.16, < 2.a) + httpclient (2.9.0) + mutex_m + json (2.12.0-java) + jwt (2.10.1) + base64 + logger (1.7.0) + memoist (0.16.2) + mini_mime (1.1.5) + multi_json (1.15.0) + mustermann (3.0.3) + ruby2_keywords (~> 0.0.1) + mutex_m (0.3.0) + net-http (0.6.0) + uri + net-ldap (0.19.0) + nio4r (2.7.4-java) + nokogiri (1.18.8-java) + racc (~> 1.4) + opentelemetry-api (1.5.0) + opentelemetry-common (0.20.1) + opentelemetry-api (~> 1.0) + opentelemetry-exporter-jaeger (0.23.0) + opentelemetry-api (~> 1.1) + opentelemetry-common (~> 0.20) + opentelemetry-sdk (~> 1.2) + opentelemetry-semantic_conventions + thrift + opentelemetry-instrumentation-base (0.22.3) + opentelemetry-api (~> 1.0) + opentelemetry-registry (~> 0.1) + opentelemetry-instrumentation-concurrent_ruby (0.21.2) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-http_client (0.22.3) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.20.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-rack (0.25.0) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-redis (0.25.3) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.20.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-sinatra (0.23.2) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.20.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-rack (~> 0.21) + opentelemetry-registry (0.4.0) + opentelemetry-api (~> 1.1) + opentelemetry-resource_detectors (0.24.2) + google-cloud-env + opentelemetry-sdk (~> 1.0) + opentelemetry-sdk (1.8.0) + opentelemetry-api (~> 1.1) + opentelemetry-common (~> 0.20) + opentelemetry-registry (~> 0.2) + opentelemetry-semantic_conventions + opentelemetry-semantic_conventions (1.11.0) + opentelemetry-api (~> 1.0) + optimist (3.2.1) + os (1.1.4) + pickup (0.0.11) + prometheus-client (4.2.4) + base64 + public_suffix (6.0.2) + puma (6.6.0-java) + nio4r (~> 2.0) + racc (1.8.1-java) + rack (2.2.15) + rack-protection (3.2.0) + base64 (>= 0.1.0) + rack (~> 2.2, >= 2.2.4) + rake (13.2.1) + rbvmomi2 (3.8.0) + builder (~> 3.2) + json (~> 2.3) + nokogiri (~> 1.12, >= 1.12.5) + optimist (~> 3.0) + redis (5.4.0) + redis-client (>= 0.22.0) + redis-client (0.24.0) + connection_pool + representable (3.2.0) + declarative (< 0.1.0) + trailblazer-option (>= 0.1.1, < 0.2.0) + uber (< 0.2.0) + retriable (3.1.2) + rexml (3.4.1) + ruby2_keywords (0.0.5) + signet (0.20.0) + addressable (~> 2.8) + faraday (>= 0.17.5, < 3.a) + jwt (>= 1.5, < 3.0) + multi_json (~> 1.10) + sinatra (3.2.0) + mustermann (~> 3.0) + rack (~> 2.2, >= 2.2.4) + rack-protection (= 3.2.0) + tilt (~> 2.0) + spicy-proton (2.1.15) + bindata (~> 2.3) + statsd-ruby (1.5.0) + thrift (0.21.0) + tilt (2.6.0) + trailblazer-option (0.1.2) + uber (0.1.0) + uri (1.0.3) vmpooler-dns-gcp (1.2.0) google-cloud-dns (~> 0.35.1) googleauth (>= 0.16.2, < 1.3.0) @@ -179,17 +194,16 @@ GEM vmpooler-provider-vsphere (3.3.4) rbvmomi2 (>= 3.1, < 4.0) vmpooler (~> 3.0) - webrick (1.8.1) zonefile (1.06) PLATFORMS universal-java-11 DEPENDENCIES - vmpooler (~> 3.0) + vmpooler! vmpooler-dns-gcp (~> 1.0) vmpooler-provider-gce (~> 1.0) vmpooler-provider-vsphere (~> 3.0) BUNDLED WITH - 2.4.12 + 2.6.9