From 89b1ce67b86f88d1db675a6b57c9f165b0b76e30 Mon Sep 17 00:00:00 2001 From: Jake Spain Date: Fri, 27 Jan 2023 16:46:33 -0500 Subject: [PATCH] Update gemfile.lock --- Gemfile.lock | 91 +++++++++++++++++++++++---------------------- README.md | 7 ++++ update-gemfile-lock | 7 ++++ 3 files changed, 60 insertions(+), 45 deletions(-) create mode 100755 update-gemfile-lock diff --git a/Gemfile.lock b/Gemfile.lock index 4976307..5b7bfc3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,39 +2,40 @@ PATH remote: . specs: vmpooler-provider-vsphere (1.6.0) - rbvmomi (>= 2.1, < 4.0) + rbvmomi2 (>= 3.1, < 4.0) + vmpooler (~> 2.4) GEM remote: https://rubygems.org/ specs: ast (2.4.2) - bindata (2.4.10) + bindata (2.4.14) builder (3.2.4) climate_control (1.2.0) coderay (1.1.3) - concurrent-ruby (1.1.10) - connection_pool (2.2.5) + concurrent-ruby (1.2.0) + connection_pool (2.3.0) deep_merge (1.2.2) diff-lcs (1.5.0) docile (1.4.0) - faraday (2.3.0) - faraday-net_http (~> 2.0) + faraday (2.7.4) + faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) - faraday-net_http (2.0.3) + faraday-net_http (3.0.2) ffi (1.15.5-java) google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) - json (2.6.2-java) + json (2.6.3-java) method_source (1.0.0) - mock_redis (0.32.0) + mock_redis (0.36.0) ruby2_keywords mustermann (2.0.2) ruby2_keywords (~> 0.0.1) net-ldap (0.17.1) nio4r (2.5.8-java) - nokogiri (1.13.8-java) + nokogiri (1.13.10-java) racc (~> 1.4) - opentelemetry-api (1.0.2) + opentelemetry-api (1.1.0) opentelemetry-common (0.19.6) opentelemetry-api (~> 1.0) opentelemetry-exporter-jaeger (0.20.1) @@ -59,59 +60,59 @@ GEM opentelemetry-api (~> 1.0) opentelemetry-common (~> 0.19.3) opentelemetry-instrumentation-base (~> 0.19.0) - opentelemetry-registry (0.1.0) - opentelemetry-api (~> 1.0.1) + opentelemetry-registry (0.2.0) + opentelemetry-api (~> 1.1) opentelemetry-resource_detectors (0.19.1) google-cloud-env opentelemetry-sdk - opentelemetry-sdk (1.1.0) - opentelemetry-api (~> 1.0) + opentelemetry-sdk (1.2.0) + opentelemetry-api (~> 1.1) opentelemetry-common (~> 0.19.3) - opentelemetry-registry (~> 0.1) + opentelemetry-registry (~> 0.2) opentelemetry-semantic_conventions opentelemetry-semantic_conventions (1.8.0) opentelemetry-api (~> 1.0) optimist (3.0.1) parallel (1.22.1) - parser (3.1.2.0) + parser (3.2.0.0) ast (~> 2.4.1) pickup (0.0.11) prometheus-client (2.1.0) - pry (0.14.1-java) + pry (0.14.2-java) coderay (~> 1.1) method_source (~> 1.0) spoon (~> 0.0) - puma (5.6.4-java) + puma (5.6.5-java) nio4r (~> 2.0) - racc (1.6.0-java) - rack (2.2.4) - rack-protection (2.2.2) + racc (1.6.2-java) + rack (2.2.6.2) + rack-protection (2.2.4) rack rack-test (2.0.2) rack (>= 1.3) rainbow (3.1.1) rake (13.0.6) - rbvmomi (3.0.0) + rbvmomi2 (3.6.0) builder (~> 3.2) json (~> 2.3) - nokogiri (~> 1.10) + nokogiri (~> 1.12, >= 1.12.5) optimist (~> 3.0) - redis (4.7.1) - regexp_parser (2.5.0) + redis (4.8.0) + regexp_parser (2.6.2) rexml (3.2.5) - rspec (3.11.0) - rspec-core (~> 3.11.0) - rspec-expectations (~> 3.11.0) - rspec-mocks (~> 3.11.0) - rspec-core (3.11.0) - rspec-support (~> 3.11.0) - rspec-expectations (3.11.0) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.0) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-mocks (3.11.1) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-support (3.11.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.0) rubocop (1.28.2) parallel (~> 1.10) parser (>= 3.1.0.0) @@ -121,30 +122,30 @@ GEM rubocop-ast (>= 1.17.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.19.1) + rubocop-ast (1.24.1) parser (>= 3.1.1.0) ruby-progressbar (1.11.0) ruby2_keywords (0.0.5) - simplecov (0.21.2) + simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - sinatra (2.2.2) + sinatra (2.2.4) mustermann (~> 2.0) rack (~> 2.2) - rack-protection (= 2.2.2) + rack-protection (= 2.2.4) tilt (~> 2.0) - spicy-proton (2.1.14) + spicy-proton (2.1.15) bindata (~> 2.3) spoon (0.0.6) ffi statsd-ruby (1.5.0) thor (1.2.1) - thrift (0.16.0) + thrift (0.17.0) tilt (2.0.11) - unicode-display_width (2.1.0) + unicode-display_width (2.4.2) vmpooler (2.4.0) concurrent-ruby (~> 1.1) connection_pool (~> 2.2) @@ -171,6 +172,7 @@ GEM rspec (~> 3) PLATFORMS + universal-java-1.8 universal-java-11 DEPENDENCIES @@ -182,7 +184,6 @@ DEPENDENCIES rubocop (~> 1.28.2) simplecov (>= 0.11.2) thor (~> 1.0, >= 1.0.1) - vmpooler (~> 2.4) vmpooler-provider-vsphere! yarjuf (>= 2.0) diff --git a/README.md b/README.md index f5af6ce..47e5b88 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ - [vmpooler-provider-vsphere](#vmpooler-provider-vsphere) - [Usage](#usage) - [Custom VM Config Attribute](#custom-vm-config-attribute) + - [Update the Gemfile Lock](#update-the-gemfile-lock) - [Releasing](#releasing) - [License](#license) @@ -23,6 +24,12 @@ Linux or Windows Guest: `vmtoolsd --cmd "info-get guestinfo.hostname"` See the [VMware Tools Administration docs](https://docs.vmware.com/en/VMware-Tools/12.1.0/com.vmware.vsphere.vmwaretools.doc/GUID-D026777B-606D-4442-957A-B953C2049659.html) for more information about querying information from the GuestInfo variable. +## Update the Gemfile Lock + +To update the `Gemfile.lock` run `./update-gemfile-lock`. + +Verify, and update if needed, that the docker tag in the script and GitHub action workflows matches what is used in the [vmpooler-deployment Dockerfile](https://github.com/puppetlabs/vmpooler-deployment/blob/main/docker/Dockerfile). + ## Releasing Follow these steps to publish a new GitHub release, and build and push the gem to . diff --git a/update-gemfile-lock b/update-gemfile-lock new file mode 100755 index 0000000..74e9c78 --- /dev/null +++ b/update-gemfile-lock @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +# The container tag should closely match what is used in `docker/Dockerfile` in vmpooler-deployment +docker run -it --rm \ + -v $(pwd):/app \ + jruby:9.3.6-jdk \ + /bin/bash -c 'apt-get update -qq && apt-get install -y --no-install-recommends make git && cd /app && gem install bundler && bundle install --jobs 3 && bundle update; echo "LOCK_FILE_UPDATE_EXIT_CODE=$?"'