diff --git a/docker/Gemfile b/docker/Gemfile index cd67ec9..7877e07 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', branch: 'retry_logic' # 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 c6eb3c4..a6c94a2 100644 --- a/docker/Gemfile.lock +++ b/docker/Gemfile.lock @@ -1,21 +1,49 @@ +GIT + remote: https://github.com/puppetlabs/vmpooler.git + revision: 8372ea824f501fdbbcc4d04ad151e2831d447540 + branch: retry_logic + specs: + 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-rack (= 0.23.4) + opentelemetry-instrumentation-redis (= 0.25.3) + opentelemetry-instrumentation-sinatra (= 0.23.2) + opentelemetry-resource_detectors (= 0.24.2) + opentelemetry-sdk (~> 1.8) + 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.7) - public_suffix (>= 2.0.2, < 7.0) + addressable (2.8.8) + public_suffix (>= 2.0.2, < 8.0) base64 (0.3.0) bindata (2.5.1) builder (3.3.0) concurrent-ruby (1.3.5) - connection_pool (2.5.3) + connection_pool (2.5.5) declarative (0.0.20) deep_merge (1.2.2) - faraday (2.13.1) + faraday (2.14.0) faraday-net_http (>= 2.0, < 3.5) json logger - faraday-net_http (3.4.0) - net-http (>= 0.5.0) + faraday-net_http (3.4.2) + net-http (~> 0.5) google-apis-compute_v1 (0.86.0) google-apis-core (>= 0.11.0, < 2.a) google-apis-core (0.11.3) @@ -49,23 +77,25 @@ GEM signet (>= 0.16, < 2.a) httpclient (2.9.0) mutex_m - json (2.12.2-java) - jwt (2.10.1) + json (2.17.1-java) + jwt (2.10.2) base64 logger (1.7.0) memoist (0.16.2) mini_mime (1.1.5) - multi_json (1.15.0) - mustermann (3.0.3) + multi_json (1.18.0) + mustermann (3.0.4) 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) + net-http (0.8.0) + uri (>= 0.11.1) + net-ldap (0.20.0) + base64 + ostruct + nio4r (2.7.5-java) + nokogiri (1.18.10-java) racc (~> 1.4) - opentelemetry-api (1.5.0) + opentelemetry-api (1.7.0) opentelemetry-common (0.20.1) opentelemetry-api (~> 1.0) opentelemetry-exporter-jaeger (0.23.0) @@ -102,47 +132,48 @@ GEM opentelemetry-resource_detectors (0.24.2) google-cloud-env opentelemetry-sdk (~> 1.0) - opentelemetry-sdk (1.8.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.11.0) + opentelemetry-semantic_conventions (1.36.0) opentelemetry-api (~> 1.0) optimist (3.2.1) os (1.1.4) + ostruct (0.6.3) pickup (0.0.11) - prometheus-client (4.2.4) + prometheus-client (4.2.5) base64 public_suffix (6.0.2) - puma (6.6.0-java) + puma (6.6.1-java) nio4r (~> 2.0) racc (1.8.1-java) - rack (2.2.17) + rack (2.2.21) rack-protection (3.2.0) base64 (>= 0.1.0) rack (~> 2.2, >= 2.2.4) - rake (13.3.0) + rake (13.3.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 (5.4.1) redis-client (>= 0.22.0) - redis-client (0.24.0) + redis-client (0.26.1) 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) + rexml (3.4.4) ruby2_keywords (0.0.5) - signet (0.20.0) + signet (0.21.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) - jwt (>= 1.5, < 3.0) + jwt (>= 1.5, < 4.0) multi_json (~> 1.10) sinatra (3.2.0) mustermann (~> 3.0) @@ -153,32 +184,10 @@ GEM bindata (~> 2.3) statsd-ruby (1.5.0) thrift (0.22.0) - tilt (2.6.0) + tilt (2.6.1) trailblazer-option (0.1.2) uber (0.1.0) - uri (1.0.3) - 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-rack (= 0.23.4) - opentelemetry-instrumentation-redis (= 0.25.3) - opentelemetry-instrumentation-sinatra (= 0.23.2) - opentelemetry-resource_detectors (= 0.24.2) - opentelemetry-sdk (~> 1.8) - 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) + uri (1.1.1) vmpooler-dns-gcp (1.2.0) google-cloud-dns (~> 0.35.1) googleauth (>= 0.16.2, < 1.3.0) @@ -196,7 +205,7 @@ PLATFORMS universal-java-11 DEPENDENCIES - vmpooler (~> 3.0) + vmpooler! vmpooler-dns-gcp (~> 1.0) vmpooler-provider-gce (~> 1.0) vmpooler-provider-vsphere (~> 3.0)