From 4f2cbf1232a7b680cf6dcc5b6ac3061520673741 Mon Sep 17 00:00:00 2001 From: kanad-progress Date: Wed, 13 Jul 2022 20:58:13 +0530 Subject: Changes for inspec_versio Signed-off-by: kanad-progress --- Gemfile | 2 +- Gemfile.lock | 130 +++++++---------------------------------------------------- chef.gemspec | 2 +- 3 files changed, 17 insertions(+), 117 deletions(-) diff --git a/Gemfile b/Gemfile index 89818692ea..e3d01365be 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.17" # need to provide the binaries for inspec gem "chef-vault" end diff --git a/Gemfile.lock b/Gemfile.lock index dfb7084d30..8056bf3ca5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,10 +8,10 @@ GIT GIT remote: https://github.com/chef/ohai.git - revision: 88ddc94275c7618cb92a67c277993c89fc9c2109 + revision: 2cd91848d807d7a37342b964c6c5e204570469f9 branch: main specs: - ohai (18.0.14) + ohai (18.0.16) chef-config (>= 14.12, < 19) chef-utils (>= 16.0, < 19) ffi (~> 1.9) @@ -57,7 +57,7 @@ PATH ffi-libarchive (~> 1.0, >= 1.0.3) ffi-yajl (~> 2.2) iniparse (~> 1.4) - inspec-core (~> 5.17) + inspec-core (~> 4.23) license-acceptance (>= 1.0.5, < 3) mixlib-archive (>= 0.4, < 2.0) mixlib-authentication (>= 2.1, < 4) @@ -76,52 +76,6 @@ PATH unf_ext (< 0.0.8.1) uuidtools (>= 2.1.5, < 3.0) vault (~> 0.16) - chef (18.0.130-universal-mingw32) - addressable - aws-sdk-s3 (~> 1.91) - aws-sdk-secretsmanager (~> 1.46) - chef-config (= 18.0.130) - chef-powershell (~> 1.0.12) - chef-utils (= 18.0.130) - chef-vault - chef-zero (>= 14.0.11) - corefoundation (~> 0.3.4) - diff-lcs (>= 1.2.4, < 1.6.0, != 1.4.0) - erubis (~> 2.7) - ffi (>= 1.5.0) - ffi-libarchive (~> 1.0, >= 1.0.3) - ffi-yajl (~> 2.2) - iniparse (~> 1.4) - inspec-core (~> 5.17) - iso8601 (>= 0.12.1, < 0.14) - license-acceptance (>= 1.0.5, < 3) - mixlib-archive (>= 0.4, < 2.0) - mixlib-authentication (>= 2.1, < 4) - mixlib-cli (>= 2.1.1, < 3.0) - mixlib-log (>= 2.0.3, < 4.0) - mixlib-shellout (>= 3.1.1, < 4.0) - net-ftp - net-sftp (>= 2.1.2, < 4.0) - ohai (~> 18.0) - plist (~> 3.2) - proxifier (~> 1.0) - syslog-logger (~> 1.6) - train-core (~> 3.2, >= 3.2.28) - train-rest (>= 0.4.1) - train-winrm (>= 0.2.5) - unf_ext (< 0.0.8.1) - uuidtools (>= 2.1.5, < 3.0) - vault (~> 0.16) - win32-api (~> 1.5.3) - win32-certstore (~> 0.6.10) - win32-event (~> 0.6.1) - win32-eventlog (= 0.6.3) - win32-mmap (~> 0.4.1) - win32-mutex (~> 0.4.2) - win32-process (~> 0.9) - win32-service (>= 2.1.5, < 3.0) - win32-taskscheduler (~> 2.0) - wmi-lite (~> 1.0) PATH remote: chef-bin @@ -156,7 +110,7 @@ GEM mixlib-shellout (>= 2.0, < 4.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.603.0) + aws-partitions (1.605.0) aws-sdk-core (3.131.2) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) @@ -178,9 +132,6 @@ GEM debug_inspector (>= 0.0.1) builder (3.2.4) byebug (11.1.3) - chef-powershell (1.0.13) - ffi (~> 1.15) - ffi-yajl (~> 2.4) chef-telemetry (1.1.1) chef-config concurrent-ruby (~> 1.0) @@ -228,12 +179,8 @@ GEM fauxhai-ng (9.3.0) net-ssh ffi (1.15.5) - ffi (1.15.5-x64-mingw32) - ffi (1.15.5-x86-mingw32) ffi-libarchive (1.1.3) ffi (~> 1.0) - ffi-win32-extensions (1.0.4) - ffi ffi-yajl (2.4.0) libyajl2 (>= 1.2) fuzzyurl (0.9.0) @@ -249,7 +196,7 @@ GEM domain_name (~> 0.5) httpclient (2.8.3) iniparse (1.5.0) - inspec-core (5.17.4) + inspec-core (4.56.20) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -272,10 +219,9 @@ GEM train-core (~> 3.0) tty-prompt (~> 0.17) tty-table (~> 0.10) - inspec-core-bin (5.17.4) - inspec-core (= 5.17.4) + inspec-core-bin (4.56.20) + inspec-core (= 4.56.20) ipaddress (0.8.3) - iso8601 (0.13.0) jmespath (1.6.1) json (2.6.2) libyajl2 (2.1.0) @@ -294,8 +240,6 @@ GEM mime-types-data (3.2022.0105) mixlib-archive (1.1.7) mixlib-log - mixlib-archive (1.1.7-universal-mingw32) - mixlib-log mixlib-authentication (3.0.10) mixlib-cli (2.1.8) mixlib-config (3.0.27) @@ -303,13 +247,8 @@ GEM mixlib-log (3.0.9) mixlib-shellout (3.2.7) chef-utils - mixlib-shellout (3.2.7-universal-mingw32) - chef-utils - ffi-win32-extensions (~> 1.0.3) - win32-process (~> 0.9) - wmi-lite (~> 1.0) multi_json (1.15.0) - multipart-post (2.2.0) + multipart-post (2.2.3) net-ftp (0.1.3) net-protocol time @@ -339,7 +278,7 @@ GEM binding_of_caller (~> 1.0) pry (~> 0.13) public_suffix (4.0.7) - rack (2.2.3.1) + rack (2.2.4) rainbow (3.1.1) rake (13.0.6) rb-readline (0.5.5) @@ -349,18 +288,6 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rest-client (2.1.0-x64-mingw32) - ffi (~> 1.9) - http-accept (>= 1.7.0, < 2.0) - http-cookie (>= 1.0.2, < 2.0) - mime-types (>= 1.16, < 4.0) - netrc (~> 0.8) - rest-client (2.1.0-x86-mingw32) - ffi (~> 1.9) - http-accept (>= 1.7.0, < 2.0) - http-cookie (>= 1.0.2, < 2.0) - mime-types (>= 1.16, < 4.0) - netrc (~> 0.8) rexml (3.2.5) rspec (3.11.0) rspec-core (~> 3.11.0) @@ -387,7 +314,7 @@ GEM rubocop-ast (>= 1.15.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.18.0) + rubocop-ast (1.19.1) parser (>= 3.1.1.0) ruby-progressbar (1.11.0) ruby2_keywords (0.0.5) @@ -400,14 +327,13 @@ GEM unicode-display_width (>= 1.5, < 3.0) unicode_utils (~> 1.4) strings-ansi (0.2.0) - structured_warnings (0.4.0) syslog-logger (1.6.8) thor (1.2.1) time (0.2.0) date timeout (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) @@ -442,9 +368,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.8) - unf_ext (0.0.8-x64-mingw32) - unf_ext (0.0.8-x86-mingw32) - 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) @@ -454,28 +378,6 @@ GEM crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) webrick (1.7.0) - win32-api (1.5.3-universal-mingw32) - win32-certstore (0.6.15) - chef-powershell (>= 1.0.12) - ffi - win32-event (0.6.3) - win32-ipc (>= 0.6.0) - win32-eventlog (0.6.3) - ffi - win32-ipc (0.7.0) - ffi - win32-mmap (0.4.2) - ffi - win32-mutex (0.4.3) - win32-ipc (>= 0.6.0) - win32-process (0.10.0) - ffi (>= 1.0.0) - win32-service (2.3.2) - ffi - ffi-win32-extensions - win32-taskscheduler (2.0.4) - ffi - structured_warnings winrm (2.3.6) builder (>= 2.1.2) erubi (~> 1.8) @@ -498,9 +400,7 @@ GEM wmi-lite (1.0.7) PLATFORMS - ruby - x64-mingw32 - x86-mingw32 + x86_64-darwin-21 DEPENDENCIES appbundler @@ -513,7 +413,7 @@ DEPENDENCIES chefstyle! ed25519 (~> 1.2) fauxhai-ng - inspec-core-bin (~> 5.17) + inspec-core-bin ohai! proxifier! pry (= 0.13.0) @@ -526,4 +426,4 @@ DEPENDENCIES webmock BUNDLED WITH - 2.3.15 + 2.3.17 diff --git a/chef.gemspec b/chef.gemspec index a5542c2456..e6ccf91744 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", "~> 5.17" + s.add_dependency "inspec-core", "~> 4.23" s.add_dependency "ffi", ">= 1.5.0" s.add_dependency "ffi-yajl", "~> 2.2" -- cgit v1.2.1