diff options
author | kanad-progress <kanad.kumar@progress.com> | 2022-07-13 20:52:41 +0530 |
---|---|---|
committer | kanad-progress <kanad.kumar@progress.com> | 2022-07-13 20:52:41 +0530 |
commit | 8cc5a0710313f89502733016c6368df17d61e059 (patch) | |
tree | 14f19023d52ed4fa3bd112d215811c7a1188646b | |
parent | c09121ae39121d946684bfe6681686693243aec8 (diff) | |
parent | 10bc628529c316bc0ab1b213373b538764259f20 (diff) | |
download | chef-8cc5a0710313f89502733016c6368df17d61e059.tar.gz |
Merge branch 'jfm/inspec_version_update' into inspec_version_issues
-rw-r--r-- | Gemfile | 2 | ||||
-rw-r--r-- | Gemfile.lock | 16 | ||||
-rw-r--r-- | chef.gemspec | 2 | ||||
-rw-r--r-- | habitat/plan.ps1 | 9 | ||||
-rw-r--r-- | omnibus/Gemfile.lock | 14 | ||||
-rw-r--r-- | spec/unit/provider/package/rubygems_spec.rb | 2 |
6 files changed, 25 insertions, 20 deletions
@@ -20,7 +20,7 @@ gem "cheffish", ">= 17" group(:omnibus_package) do gem "appbundler" gem "rb-readline" - gem "inspec-core-bin", "~> 4.24" # need to provide the binaries for inspec + gem "inspec-core-bin", "~> 5.17" # need to provide the binaries for inspec gem "chef-vault" end diff --git a/Gemfile.lock b/Gemfile.lock index 7ad59992ac..dfb7084d30 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -57,7 +57,7 @@ PATH ffi-libarchive (~> 1.0, >= 1.0.3) ffi-yajl (~> 2.2) iniparse (~> 1.4) - inspec-core (~> 4.23) + inspec-core (~> 5.17) license-acceptance (>= 1.0.5, < 3) mixlib-archive (>= 0.4, < 2.0) mixlib-authentication (>= 2.1, < 4) @@ -92,7 +92,7 @@ PATH ffi-libarchive (~> 1.0, >= 1.0.3) ffi-yajl (~> 2.2) iniparse (~> 1.4) - inspec-core (~> 4.23) + inspec-core (~> 5.17) iso8601 (>= 0.12.1, < 0.14) license-acceptance (>= 1.0.5, < 3) mixlib-archive (>= 0.4, < 2.0) @@ -249,7 +249,7 @@ GEM domain_name (~> 0.5) httpclient (2.8.3) iniparse (1.5.0) - inspec-core (4.56.20) + inspec-core (5.17.4) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -272,8 +272,8 @@ GEM train-core (~> 3.0) tty-prompt (~> 0.17) tty-table (~> 0.10) - inspec-core-bin (4.56.20) - inspec-core (= 4.56.20) + inspec-core-bin (5.17.4) + inspec-core (= 5.17.4) ipaddress (0.8.3) iso8601 (0.13.0) jmespath (1.6.1) @@ -298,7 +298,7 @@ GEM mixlib-log mixlib-authentication (3.0.10) mixlib-cli (2.1.8) - mixlib-config (3.0.9) + mixlib-config (3.0.27) tomlrb mixlib-log (3.0.9) mixlib-shellout (3.2.7) @@ -513,7 +513,7 @@ DEPENDENCIES chefstyle! ed25519 (~> 1.2) fauxhai-ng - inspec-core-bin (~> 4.24) + inspec-core-bin (~> 5.17) ohai! proxifier! pry (= 0.13.0) @@ -526,4 +526,4 @@ DEPENDENCIES webmock BUNDLED WITH - 2.3.12 + 2.3.15 diff --git a/chef.gemspec b/chef.gemspec index e6ccf91744..a5542c2456 100644 --- a/chef.gemspec +++ b/chef.gemspec @@ -37,7 +37,7 @@ Gem::Specification.new do |s| s.add_dependency "mixlib-shellout", ">= 3.1.1", "< 4.0" s.add_dependency "mixlib-archive", ">= 0.4", "< 2.0" s.add_dependency "ohai", "~> 18.0" - s.add_dependency "inspec-core", "~> 4.23" + s.add_dependency "inspec-core", "~> 5.17" s.add_dependency "ffi", ">= 1.5.0" s.add_dependency "ffi-yajl", "~> 2.2" diff --git a/habitat/plan.ps1 b/habitat/plan.ps1 index 92fedfbc60..0354e23b97 100644 --- a/habitat/plan.ps1 +++ b/habitat/plan.ps1 @@ -1,6 +1,9 @@ $pkg_name="chef-infra-client" $pkg_origin="chef" $pkg_version=(Get-Content $PLAN_CONTEXT/../VERSION) +Write-Output "`n" +Write-Output "The Plan Context is : $PLAN_CONTEXT" +Write-Output "`n" $pkg_description="Chef Infra Client is an agent that runs locally on every node that is under management by Chef Infra. This package is binary-only to provide Chef Infra Client executables. It does not define a service to run." $pkg_maintainer="The Chef Maintainers <maintainers@chef.io>" $pkg_upstream_url="https://github.com/chef/chef" @@ -77,7 +80,7 @@ function Invoke-Build { try { Push-Location "${HAB_CACHE_SRC_PATH}/${pkg_dirname}" - $env:_BUNDER_WINDOWS_DLLS_COPIED = "1" + $env:_BUNDLER_WINDOWS_DLLS_COPIED = "1" Write-BuildLine " ** Using bundler to retrieve the Ruby dependencies" bundle install --jobs=3 --retry=3 @@ -94,10 +97,10 @@ function Invoke-Build { } } Write-BuildLine " ** Running the chef project's 'rake install' to install the path-based gems so they look like any other installed gem." - bundle exec rake install:local # this needs to be 'bundle exec'd because a Rakefile makes reference to Bundler + bundle exec rake install:local --verbose # this needs to be 'bundle exec'd because a Rakefile makes reference to Bundler if (-not $?) { Write-Warning " -- That didn't work. Let's try again." - bundle exec rake install:local # this needs to be 'bundle exec'd because a Rakefile makes reference to Bundler + bundle exec rake install:local --verbose# this needs to be 'bundle exec'd because a Rakefile makes reference to Bundler if (-not $?) { throw "unable to install the gems that live in directories within this repo" } } } finally { diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 784153a17e..24f630f3fb 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/chef/omnibus-software.git - revision: a9b13a09c2f89e4618225dd41b2fd08f2150a1ba + revision: 12610bcfffd5d57d76a8aab4bd977bf4f07fb8f9 branch: main specs: omnibus-software (4.0.0) @@ -34,7 +34,7 @@ GEM artifactory (3.0.15) awesome_print (1.9.2) aws-eventstream (1.2.0) - aws-partitions (1.594.0) + aws-partitions (1.597.0) aws-sdk-core (3.131.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) @@ -55,7 +55,7 @@ GEM bcrypt_pbkdf (1.1.0) bcrypt_pbkdf (1.1.0-x64-mingw32) bcrypt_pbkdf (1.1.0-x86-mingw32) - berkshelf (8.0.1) + berkshelf (8.0.2) chef (>= 15.7.32) chef-config cleanroom (~> 1.0) @@ -266,7 +266,7 @@ GEM mixlib-cli (2.1.8) mixlib-config (3.0.9) tomlrb - mixlib-install (3.12.16) + mixlib-install (3.12.19) mixlib-shellout mixlib-versioning thor @@ -286,7 +286,7 @@ GEM mixlib-versioning (1.2.12) molinillo (0.8.0) multi_json (1.15.0) - multipart-post (2.1.1) + multipart-post (2.2.0) net-scp (3.0.0) net-ssh (>= 2.6.5, < 7.0.0) net-sftp (3.0.0) @@ -295,7 +295,7 @@ GEM net-ssh-gateway (2.0.0) net-ssh (>= 4.0.0) nori (2.6.0) - octokit (4.23.0) + octokit (4.24.0) faraday (>= 1, < 3) sawyer (~> 0.9) ohai (17.9.0) @@ -351,7 +351,7 @@ GEM ruby2_keywords (0.0.5) rubyntlm (0.6.3) rubyzip (2.3.2) - sawyer (0.9.1) + sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) semverse (3.0.2) diff --git a/spec/unit/provider/package/rubygems_spec.rb b/spec/unit/provider/package/rubygems_spec.rb index a4ffc1712e..426504a913 100644 --- a/spec/unit/provider/package/rubygems_spec.rb +++ b/spec/unit/provider/package/rubygems_spec.rb @@ -135,6 +135,8 @@ describe Chef::Provider::Package::Rubygems::CurrentGemEnvironment do end it "finds a matching gem from a specific gemserver when explicit sources are given (to a server that doesn't respond to api requests)" do + # require "pry" + # binding.pry stub_request(:head, "https://rubygems2.org/") .to_return(status: 200, body: "", headers: {}) stub_request(:get, "https://rubygems2.org/info/sexp_processor") |