From b27b7835d951eea23d0765a63ffbdf8c7e2e541a Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Mon, 14 Sep 2020 07:55:01 -0700 Subject: [PATCH] Update InSpec / kitchen-dokken / remove custom docker-api Signed-off-by: Tim Smith --- components/gems/Gemfile | 7 +---- components/gems/Gemfile.lock | 40 +++++++++++++-------------- omnibus/config/software/docker-api.rb | 38 ------------------------- omnibus/config/software/gems.rb | 6 ---- 4 files changed, 21 insertions(+), 70 deletions(-) delete mode 100644 omnibus/config/software/docker-api.rb diff --git a/components/gems/Gemfile b/components/gems/Gemfile index fbd3c36b9..bbb5d5486 100644 --- a/components/gems/Gemfile +++ b/components/gems/Gemfile @@ -67,12 +67,7 @@ group(:omnibus_package) do gem "kitchen-ec2", ">= 3.6" gem "kitchen-digitalocean", ">= 0.11" gem "kitchen-dokken", ">= 2.9" - # docker-api appears to be unmaintained, and has a noisy deprecation - # warning under ruby 2.7. Using a fork via an omnibus software def. - # Must use the software def because the ruby cleanup deletes the - # bundled gem. Chef Infra Client does not have this issue with Ohai - # and I do not understand why. - gem "docker-api" # , git: "https://github.com/chef/docker-api.git", branch: "master" + gem "docker-api", ">= 2.0" # make sure we get the Ruby 2.7 compatible release gem "kitchen-google", ">= 2.0.0" gem "kitchen-hyperv", ">= 0.5.1" gem "kitchen-inspec", ">= 2.0" diff --git a/components/gems/Gemfile.lock b/components/gems/Gemfile.lock index bc421e2dc..e0f82068c 100644 --- a/components/gems/Gemfile.lock +++ b/components/gems/Gemfile.lock @@ -364,7 +364,7 @@ GEM descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) diff-lcs (1.3) - docker-api (1.34.2) + docker-api (2.0.0) excon (>= 0.47.0) multi_json domain_name (0.5.20190701) @@ -428,7 +428,7 @@ GEM fuzzyurl (0.9.0) gcewinpass (1.1.0) google-api-client (~> 0.13) - google-api-client (0.34.1) + google-api-client (0.35.0) addressable (~> 2.5, >= 2.5.1) googleauth (~> 0.9) httpclient (>= 2.8.1, < 3.0) @@ -436,13 +436,13 @@ GEM representable (~> 3.0) retriable (>= 2.0, < 4.0) signet (~> 0.12) - googleauth (0.10.0) - faraday (~> 0.12) + googleauth (0.13.0) + faraday (>= 0.17.3, < 2.0) jwt (>= 1.4, < 3.0) memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) - signet (~> 0.12) + signet (~> 0.14) gssapi (1.3.0) ffi (>= 1.0.1) guard (2.16.2) @@ -467,22 +467,22 @@ GEM ice_nine (0.11.2) inifile (3.0.0) iniparse (1.5.0) - inspec (4.22.22) + inspec (4.23.4) faraday_middleware (~> 0.12.2) - inspec-core (= 4.22.22) + inspec-core (= 4.23.4) train (~> 3.0) train-aws (~> 0.1) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-bin (4.22.22) - inspec (= 4.22.22) - inspec-core (4.22.22) + inspec-bin (4.23.4) + inspec (= 4.23.4) + inspec-core (4.23.4) addressable (~> 2.4) chef-telemetry (~> 1.0) faraday (>= 0.9.0) hashie (~> 3.4) json_schemer (>= 0.2.1, < 0.2.12) - license-acceptance (>= 0.2.13, < 2.0) + license-acceptance (>= 0.2.13, < 3.0) method_source (>= 0.8, < 2.0) mixlib-log (~> 3.0) multipart-post (~> 2.0) @@ -519,8 +519,8 @@ GEM kitchen-digitalocean (0.11.1) droplet_kit (>= 3.7, < 4.0) test-kitchen (>= 1.17, < 3) - kitchen-dokken (2.10.0) - docker-api (~> 1.33) + kitchen-dokken (2.11.0) + docker-api (>= 1.33, < 3) lockfile (~> 2.1) test-kitchen (>= 1.15, < 3) kitchen-ec2 (3.7.1) @@ -830,18 +830,18 @@ GEM toml-rb (2.0.1) citrus (~> 3.0, > 3.0) tomlrb (1.2.9) - train (3.3.16) + train (3.3.21) activesupport (>= 5.2.4.3, < 6.0.0) azure_graph_rbac (~> 0.16) azure_mgmt_key_vault (~> 0.17) azure_mgmt_resources (~> 0.15) azure_mgmt_security (~> 0.18) azure_mgmt_storage (~> 0.18) - docker-api (~> 1.26) - google-api-client (>= 0.23.9, < 0.35.0) - googleauth (>= 0.6.6, < 0.11.0) + docker-api (>= 1.26, < 3.0) + google-api-client (>= 0.23.9, < 0.44.1) + googleauth (>= 0.6.6, < 0.13.1) inifile (~> 3.0) - train-core (= 3.3.16) + train-core (= 3.3.21) train-winrm (~> 0.2) train-aws (0.1.17) aws-sdk-apigateway (~> 1.0) @@ -892,7 +892,7 @@ GEM aws-sdk-sns (~> 1.9) aws-sdk-sqs (~> 1.10) aws-sdk-ssm (~> 1.0) - train-core (3.3.16) + train-core (3.3.21) addressable (~> 2.5) ffi (!= 1.13.0) json (>= 1.8, < 3.0) @@ -1039,7 +1039,7 @@ DEPENDENCIES cookstyle (~> 6.8) dep-selector-libgecode dep_selector - docker-api + docker-api (>= 2.0) ed25519 fauxhai-ng (~> 8) ffi-libarchive diff --git a/omnibus/config/software/docker-api.rb b/omnibus/config/software/docker-api.rb deleted file mode 100644 index e62e39127..000000000 --- a/omnibus/config/software/docker-api.rb +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright 2012-2020 Chef Software, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -name "docker-api" -default_version "master" - -source git: "https://github.com/chef/docker-api.git" - -license "MIT" -license_file "https://raw.githubusercontent.com/chef/docker-api/master/LICENSE" - -dependency "ruby" - -build do - env = with_standard_compiler_flags(with_embedded_path) - - # docker-api does not have any unique dependencies not already - # included in Chef Workstation. We let the master gem bundle - # install those gems. If we ever add custom dependencies into - # our fork we need to re-add bundle install here for make the - # gemfile pull from the fork and don't build here. - # bundle "install", env: env - gem "build docker-api.gemspec", env: env - gem "install docker-api-*.gem --no-document --ignore-dependencies", env: env -end diff --git a/omnibus/config/software/gems.rb b/omnibus/config/software/gems.rb index 49fb8bda2..9ff559b86 100644 --- a/omnibus/config/software/gems.rb +++ b/omnibus/config/software/gems.rb @@ -49,12 +49,6 @@ # @todo Contact gem mainter about getting new release. dependency "rb-fsevent-gem" if mac_os_x? -# The docker-api gem has not been maintained so we are building and installing -# a fork of it. If the maintainer releases a fix with our change we can switch -# back to just installing it. The docker-api gem is required by kitchen-dokken -# in its gemspec. -dependency "docker-api" - build do env = with_standard_compiler_flags(with_embedded_path)