summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkanad-progress <kanad.kumar@progress.com>2022-07-15 18:03:39 +0530
committerkanad-progress <kanad.kumar@progress.com>2022-07-15 18:31:24 +0530
commitd441d52018b14c0af3e2b72a7cd272f64a8ea8ea (patch)
tree53f1889619c327c735bcbb0e4b55f6cbae231d8f
parent4f2cbf1232a7b680cf6dcc5b6ac3061520673741 (diff)
downloadchef-INFC-104-inspec_issues.tar.gz
Changes for inspec versionINFC-104-inspec_issues
Signed-off-by: kanad-progress <kanad.kumar@progress.com>
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock16
-rw-r--r--chef.gemspec4
-rw-r--r--omnibus/Gemfile.lock30
-rw-r--r--spec/unit/provider/package/rubygems_spec.rb10
5 files changed, 31 insertions, 31 deletions
diff --git a/Gemfile b/Gemfile
index e3d01365be..7ec9def0b5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,7 +20,7 @@ gem "cheffish", ">= 17"
group(:omnibus_package) do
gem "appbundler"
gem "rb-readline"
- gem "inspec-core-bin"#, "~> 5.17" # need to provide the binaries for inspec
+ gem "inspec-core-bin", "~> 5.18" # need to provide the binaries for inspec
gem "chef-vault"
end
diff --git a/Gemfile.lock b/Gemfile.lock
index 8056bf3ca5..d66037d2a3 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.18)
license-acceptance (>= 1.0.5, < 3)
mixlib-archive (>= 0.4, < 2.0)
mixlib-authentication (>= 2.1, < 4)
@@ -70,7 +70,7 @@ PATH
plist (~> 3.2)
proxifier (~> 1.0)
syslog-logger (~> 1.6)
- train-core (~> 3.2, >= 3.2.28)
+ train-core (~> 3.10, >= 3.10.1)
train-rest (>= 0.4.1)
train-winrm (>= 0.2.5)
unf_ext (< 0.0.8.1)
@@ -110,7 +110,7 @@ GEM
mixlib-shellout (>= 2.0, < 4.0)
ast (2.4.2)
aws-eventstream (1.2.0)
- aws-partitions (1.605.0)
+ aws-partitions (1.606.0)
aws-sdk-core (3.131.2)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0)
@@ -196,7 +196,7 @@ GEM
domain_name (~> 0.5)
httpclient (2.8.3)
iniparse (1.5.0)
- inspec-core (4.56.20)
+ inspec-core (5.18.14)
addressable (~> 2.4)
chef-telemetry (~> 1.0, >= 1.0.8)
faraday (>= 0.9.0, < 1.5)
@@ -216,11 +216,11 @@ GEM
sslshake (~> 1.2)
thor (>= 0.20, < 2.0)
tomlrb (>= 1.2, < 2.1)
- train-core (~> 3.0)
+ train-core (~> 3.10)
tty-prompt (~> 0.17)
tty-table (~> 0.10)
- inspec-core-bin (4.56.20)
- inspec-core (= 4.56.20)
+ inspec-core-bin (5.18.14)
+ inspec-core (= 5.18.14)
ipaddress (0.8.3)
jmespath (1.6.1)
json (2.6.2)
@@ -413,7 +413,7 @@ DEPENDENCIES
chefstyle!
ed25519 (~> 1.2)
fauxhai-ng
- inspec-core-bin
+ inspec-core-bin (~> 5.18)
ohai!
proxifier!
pry (= 0.13.0)
diff --git a/chef.gemspec b/chef.gemspec
index e6ccf91744..e63b13d696 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
s.add_dependency "chef-config", "= #{Chef::VERSION}"
s.add_dependency "chef-utils", "= #{Chef::VERSION}"
- s.add_dependency "train-core", "~> 3.2", ">= 3.2.28" # 3.2.28 fixes sudo prompts. See https://github.com/chef/chef/pull/9635
+ s.add_dependency "train-core", "~> 3.10", ">= 3.10.1"
s.add_dependency "train-winrm", ">= 0.2.5"
s.add_dependency "train-rest", ">= 0.4.1" # target mode with rest APIs
@@ -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.18"
s.add_dependency "ffi", ">= 1.5.0"
s.add_dependency "ffi-yajl", "~> 2.2"
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 24f630f3fb..878dbbb17d 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/chef/omnibus-software.git
- revision: 12610bcfffd5d57d76a8aab4bd977bf4f07fb8f9
+ revision: 6da95e87e472bd97c6525551a1c52e85320c89f3
branch: main
specs:
omnibus-software (4.0.0)
@@ -17,7 +17,7 @@ GIT
chef-utils (>= 15.4)
contracts (>= 0.16.0, < 0.17.0)
ffi-yajl (~> 2.2)
- license_scout (~> 1.3)
+ license_scout (~> 1.0)
mixlib-shellout (>= 2.0, < 4.0)
mixlib-versioning
ohai (>= 15, < 18)
@@ -34,8 +34,8 @@ GEM
artifactory (3.0.15)
awesome_print (1.9.2)
aws-eventstream (1.2.0)
- aws-partitions (1.597.0)
- aws-sdk-core (3.131.1)
+ aws-partitions (1.606.0)
+ aws-sdk-core (3.131.2)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0)
aws-sigv4 (~> 1.1)
@@ -47,7 +47,7 @@ GEM
aws-sdk-core (~> 3, >= 3.127.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4)
- aws-sdk-secretsmanager (1.62.0)
+ aws-sdk-secretsmanager (1.64.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.5.0)
@@ -240,7 +240,7 @@ GEM
iso8601 (0.13.0)
jmespath (1.6.1)
json (2.6.2)
- kitchen-vagrant (1.11.0)
+ kitchen-vagrant (1.12.0)
test-kitchen (>= 1.4, < 4)
libyajl2 (2.1.0)
license-acceptance (2.1.13)
@@ -264,7 +264,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-install (3.12.19)
mixlib-shellout
@@ -286,7 +286,7 @@ GEM
mixlib-versioning (1.2.12)
molinillo (0.8.0)
multi_json (1.15.0)
- multipart-post (2.2.0)
+ multipart-post (2.2.3)
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.24.0)
+ octokit (4.25.1)
faraday (>= 1, < 3)
sawyer (~> 0.9)
ohai (17.9.0)
@@ -327,7 +327,7 @@ GEM
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (4.0.7)
- rack (2.2.3.1)
+ rack (2.2.4)
rainbow (3.1.1)
retryable (3.0.5)
rexml (3.2.5)
@@ -366,7 +366,7 @@ GEM
strings-ansi (0.2.0)
structured_warnings (0.4.0)
syslog-logger (1.6.8)
- test-kitchen (3.2.2)
+ test-kitchen (3.3.1)
bcrypt_pbkdf (~> 1.0)
chef-utils (>= 16.4.35)
ed25519 (~> 1.2)
@@ -381,10 +381,10 @@ GEM
winrm-elevated (~> 1.0)
winrm-fs (~> 1.1)
thor (1.2.1)
- toml-rb (2.1.2)
+ toml-rb (2.2.0)
citrus (~> 3.0, > 3.0)
tomlrb (1.3.0)
- train-core (3.9.2)
+ train-core (3.10.1)
addressable (~> 2.5)
ffi (!= 1.13.0)
json (>= 1.8, < 3.0)
@@ -413,7 +413,7 @@ GEM
pastel (~> 0.8)
strings (~> 0.2.0)
tty-screen (~> 0.8)
- unicode-display_width (2.1.0)
+ unicode-display_width (2.2.0)
unicode_utils (1.4.0)
uuidtools (2.2.0)
vault (0.17.0)
@@ -465,8 +465,8 @@ GEM
PLATFORMS
ruby
- x64-mingw
x64-mingw32
+ x64-unknown
x86-mingw32
DEPENDENCIES
diff --git a/spec/unit/provider/package/rubygems_spec.rb b/spec/unit/provider/package/rubygems_spec.rb
index 426504a913..f8203c9589 100644
--- a/spec/unit/provider/package/rubygems_spec.rb
+++ b/spec/unit/provider/package/rubygems_spec.rb
@@ -137,15 +137,15 @@ describe Chef::Provider::Package::Rubygems::CurrentGemEnvironment do
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/")
+ stub_request(:head, "https://rubygems.org/")
.to_return(status: 200, body: "", headers: {})
- stub_request(:get, "https://rubygems2.org/info/sexp_processor")
+ stub_request(:get, "https://rubygems.org/info/sexp_processor")
.to_return(status: 200, body: File.binread(File.join(CHEF_SPEC_DATA, "rubygems.org", "sexp_processor-info")))
- stub_request(:get, "https://rubygems2.org/quick/Marshal.4.8/sexp_processor-4.15.1.gemspec.rz")
+ stub_request(:get, "https://rubygems.org/quick/Marshal.4.8/sexp_processor-4.15.1.gemspec.rz")
.to_return(status: 200, body: File.binread(File.join(CHEF_SPEC_DATA, "rubygems.org", "sexp_processor-4.15.1.gemspec.rz")))
dep = Gem::Dependency.new("sexp_processor", ">= 0")
- expect(@gem_env.candidate_version_from_remote(dep, "https://rubygems2.org")).to be_kind_of(Gem::Version)
+ expect(@gem_env.candidate_version_from_remote(dep, "https://rubygems.org")).to be_kind_of(Gem::Version)
end
end
@@ -175,7 +175,7 @@ describe Chef::Provider::Package::Rubygems::CurrentGemEnvironment do
.to_return(status: 200, body: File.binread(File.join(CHEF_SPEC_DATA, "rubygems.org", "sexp_processor-4.15.1.gemspec.rz")))
dep = Gem::Dependency.new("sexp_processor", ">= 0")
- expect(@gem_env.candidate_version_from_remote(dep, "http://rubygems2.org")).to be_kind_of(Gem::Version)
+ expect(@gem_env.candidate_version_from_remote(dep, "http://rubygems.org")).to be_kind_of(Gem::Version)
end
end