diff options
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rw-r--r-- | Gemfile | 9 | ||||
| -rw-r--r-- | Gemfile.lock | 180 | ||||
| -rw-r--r-- | HISTORY.md | 35 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | acceptance/Gemfile.lock | 28 | ||||
| -rw-r--r-- | chef-config/lib/chef-config/version.rb | 2 | ||||
| -rw-r--r-- | chef.gemspec | 2 | ||||
| -rw-r--r-- | kitchen-tests/.kitchen.travis.yml | 1 | ||||
| -rw-r--r-- | kitchen-tests/.kitchen.yml | 1 | ||||
| -rw-r--r-- | kitchen-tests/Berksfile.lock | 14 | ||||
| -rw-r--r-- | kitchen-tests/Gemfile.lock | 28 | ||||
| -rw-r--r-- | lib/chef/version.rb | 2 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 28 | ||||
| -rw-r--r-- | spec/support/platform_helpers.rb | 7 |
15 files changed, 202 insertions, 145 deletions
diff --git a/.travis.yml b/.travis.yml index 279dcd0929..ebd25b7dae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -99,10 +99,10 @@ matrix: TEST_GEM: halite script: tasks/bin/run_external_test $TEST_GEM rake spec rvm: 2.3.3 - - env: - TEST_GEM: knife-windows - script: tasks/bin/run_external_test $TEST_GEM rake unit_spec - rvm: 2.3.3 + #- env: + # TEST_GEM: knife-windows + #script: tasks/bin/run_external_test $TEST_GEM rake unit_spec + #rvm: 2.3.3 - env: TEST_GEM: poise script: tasks/bin/run_external_test $TEST_GEM rake spec @@ -11,6 +11,9 @@ source "https://rubygems.org" # of bundler versions prior to 1.12.0 (https://github.com/bundler/bundler/commit/193a14fe5e0d56294c7b370a0e59f93b2c216eed) gem "chef", path: "." +# tracking master of ohai for chef-13.0 development, this should be able to be deleted after release +gem "ohai", git: "https://github.com/chef/ohai.git" + gem "chef-config", path: File.expand_path("../chef-config", __FILE__) if File.exist?(File.expand_path("../chef-config", __FILE__)) gem "rake" gem "bundler" @@ -34,9 +37,9 @@ group(:integration) do gem "chef-provisioning" gem "chef-sugar" gem "chefspec" - gem "halite" - gem "poise" - gem "poise-boiler" + gem "halite", git: "https://github.com/poise/halite.git" + gem "poise", git: "https://github.com/poise/poise.git" + gem "poise-boiler", git: "https://github.com/poise/poise-boiler.git" gem "knife-windows" gem "foodcritic" diff --git a/Gemfile.lock b/Gemfile.lock index e712ef3f51..1670340348 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/chef/chef-server - revision: 53b28425d56005a92b0e3bb153f95b505168354a + revision: b2d48c1ebcb8330b01ca13ba7e07b2674df77367 specs: oc-chef-pedant (2.2.0) activesupport (>= 4.2.7.1, < 6.0) @@ -16,7 +16,7 @@ GIT GIT remote: https://github.com/chef/chefstyle.git - revision: 7e47afd6141d3c44a11322916e3fc85c89aa9b59 + revision: b2bf89dd11270e169fd2315495c98095d4a19090 branch: master specs: chefstyle (0.5.0) @@ -36,6 +36,73 @@ GIT retriable (>= 1.4) GIT + remote: https://github.com/chef/ohai.git + revision: 512597d0eaf5a2b83e0997d8074ec1c3a5fab118 + specs: + ohai (13.0.0) + chef-config (>= 12.5.0.alpha.1, < 14) + ffi (~> 1.9) + ffi-yajl (~> 2.2) + ipaddress + mixlib-cli + mixlib-config (~> 2.0) + mixlib-log (>= 1.7.1, < 2.0) + mixlib-shellout (~> 2.0) + plist (~> 3.1) + systemu (~> 2.6.4) + wmi-lite (~> 1.0) + +GIT + remote: https://github.com/poise/halite.git + revision: b414e0995d12f8b563f6e881e2a9e25c4563c22e + specs: + halite (1.4.1.pre) + bundler + chef (>= 12.0, < 14.0) + stove (~> 4.0) + thor + +GIT + remote: https://github.com/poise/poise-boiler.git + revision: 25dc08432ac88a3f017467f4ca3918503f761c0d + specs: + poise-boiler (1.13.3.pre) + bundler + chefspec (~> 5.0) + codeclimate-test-reporter (~> 0.4) + codecov (~> 0.0, >= 0.0.2) + foodcritic (>= 7, < 9) + fuubar (~> 2.0) + git (~> 1.2) + halite (~> 1.2) + kitchen-docker (>= 2.6.0.rc.0) + kitchen-ec2 (~> 1.0) + kitchen-sync (~> 2.1) + kitchen-vagrant + mixlib-shellout (>= 1.4, < 3.0) + poise-profiler (~> 1.0) + pry + pry-byebug + rake (>= 10.4, < 12.0) + rspec (~> 3.2) + rspec-its (~> 1.2) + simplecov (~> 0.9) + test-kitchen (~> 1.7, >= 1.7.1) + travis (~> 1.8, >= 1.8.1) + vagrant-wrapper + winrm (>= 1.6, < 3) + winrm-fs (>= 0.4, < 2) + yard (~> 0.8) + yard-classmethods (~> 1.0) + +GIT + remote: https://github.com/poise/poise.git + revision: 3da48ce71b4f7c70013fe455c3bf3643e8f94ead + specs: + poise (2.7.3.pre) + halite (~> 1.0) + +GIT remote: https://github.com/rubysec/bundler-audit.git revision: 6eb5a81e9b184fbb8db03f3e57dc758c65dd7383 specs: @@ -46,10 +113,10 @@ GIT PATH remote: . specs: - chef (12.19.39) + chef (13.0.0) addressable bundler (>= 1.10) - chef-config (= 12.19.39) + chef-config (= 13.0.0) chef-zero (>= 4.8) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -64,7 +131,7 @@ PATH net-sftp (~> 2.1, >= 2.1.2) net-ssh (>= 2.9, < 5.0) net-ssh-multi (~> 1.2, >= 1.2.1) - ohai (>= 8.6.0.alpha.1, < 13) + ohai (~> 13.0) plist (~> 3.2) proxifier (~> 1.0) rspec-core (~> 3.5) @@ -75,10 +142,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (12.19.39-universal-mingw32) + chef (13.0.0-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 12.19.39) + chef-config (= 13.0.0) chef-zero (>= 4.8) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -94,7 +161,7 @@ PATH net-sftp (~> 2.1, >= 2.1.2) net-ssh (>= 2.9, < 5.0) net-ssh-multi (~> 1.2, >= 1.2.1) - ohai (>= 8.6.0.alpha.1, < 13) + ohai (~> 13.0) plist (~> 3.2) proxifier (~> 1.0) rspec-core (~> 3.5) @@ -119,7 +186,7 @@ PATH PATH remote: chef-config specs: - chef-config (12.19.39) + chef-config (13.0.0) addressable fuzzyurl mixlib-config (~> 2.0) @@ -136,15 +203,15 @@ GEM addressable (2.4.0) appbundler (0.10.0) mixlib-cli (~> 1.4) - artifactory (2.6.0) + artifactory (2.7.0) ast (2.3.0) - aws-sdk (2.7.7) - aws-sdk-resources (= 2.7.7) - aws-sdk-core (2.7.7) + aws-sdk (2.7.13) + aws-sdk-resources (= 2.7.13) + aws-sdk-core (2.7.13) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.7.7) - aws-sdk-core (= 2.7.7) + aws-sdk-resources (2.7.13) + aws-sdk-core (= 2.7.13) aws-sigv4 (1.0.0) backports (3.6.8) binding_of_caller (0.7.2) @@ -154,13 +221,14 @@ GEM chef-api (0.7.0) logify (~> 0.1) mime-types - chef-provisioning (2.1.0) + chef-provisioning (2.1.1) cheffish (~> 4.0) inifile (>= 2.0.2) mixlib-install (>= 1.0, < 3.0) net-scp (~> 1.0) net-ssh (>= 2.9, < 5.0) net-ssh-gateway (~> 1.2) + winrm (~> 2.0) winrm-fs (~> 1.0) chef-sugar (3.4.0) chef-zero (5.3.0) @@ -178,7 +246,7 @@ GEM rspec (~> 3.0) codeclimate-test-reporter (0.6.0) simplecov (>= 0.7.1, < 1.0.0) - codecov (0.1.9) + codecov (0.1.10) json simplecov url @@ -198,7 +266,7 @@ GEM debug_inspector (0.0.2) diff-lcs (1.3) docile (1.1.5) - domain_name (0.5.20161129) + domain_name (0.5.20170223) unf (>= 0.0.5, < 1.0.0) erubis (2.7.0) ethon (0.10.1) @@ -243,17 +311,12 @@ GEM ffi (>= 1.0.1) gyoku (1.3.1) builder (>= 2.1.2) - halite (1.4.0) - bundler - chef (~> 12.0) - stove (~> 4.0) - thor - hashie (3.5.3) + hashie (3.5.4) highline (1.7.8) http-cookie (1.0.3) domain_name (~> 0.5) httpclient (2.8.3) - i18n (0.8.0) + i18n (0.8.1) inifile (3.0.0) iniparse (1.4.2) ipaddress (0.8.3) @@ -261,7 +324,7 @@ GEM json (2.0.3) kitchen-docker (2.6.0) test-kitchen (>= 1.0.0) - kitchen-ec2 (1.3.0) + kitchen-ec2 (1.3.1) aws-sdk (~> 2) excon multi_json @@ -270,7 +333,7 @@ GEM kitchen-sync (2.1.2) net-sftp test-kitchen (>= 1.0.0) - kitchen-vagrant (1.0.1) + kitchen-vagrant (1.0.2) test-kitchen (~> 1.4) knife-windows (1.9.0) winrm (~> 2.1) @@ -316,7 +379,7 @@ GEM net-ssh (>= 2.6.5) net-sftp (2.1.2) net-ssh (>= 2.6.5) - net-ssh (4.0.1) + net-ssh (4.1.0) net-ssh-gateway (1.3.0) net-ssh (>= 2.6.5) net-ssh-multi (1.2.1) @@ -331,51 +394,9 @@ GEM nori (2.6.0) octokit (4.6.2) sawyer (~> 0.8.0, >= 0.5.3) - ohai (8.23.0) - chef-config (>= 12.5.0.alpha.1, < 13) - ffi (~> 1.9) - ffi-yajl (~> 2.2) - ipaddress - mixlib-cli - mixlib-config (~> 2.0) - mixlib-log (>= 1.7.1, < 2.0) - mixlib-shellout (~> 2.0) - plist (~> 3.1) - systemu (~> 2.6.4) - wmi-lite (~> 1.0) parser (2.4.0.0) ast (~> 2.2) plist (3.2.0) - poise (2.7.2) - halite (~> 1.0) - poise-boiler (1.13.2) - bundler - chefspec (~> 5.0) - codeclimate-test-reporter (~> 0.4) - codecov (~> 0.0, >= 0.0.2) - foodcritic (>= 7, < 9) - fuubar (~> 2.0) - git (~> 1.2) - halite (~> 1.2) - kitchen-docker (>= 2.6.0.rc.0) - kitchen-ec2 (~> 1.0) - kitchen-sync (~> 2.1) - kitchen-vagrant - mixlib-shellout (>= 1.4, < 3.0) - poise-profiler (~> 1.0) - pry - pry-byebug - rake (>= 10.4, < 12.0) - rspec (~> 3.2) - rspec-its (~> 1.2) - simplecov (~> 0.9) - test-kitchen (~> 1.7, >= 1.7.1) - travis (~> 1.8, >= 1.8.1) - vagrant-wrapper - winrm (>= 1.6, < 3) - winrm-fs (>= 0.4, < 2) - yard (~> 0.8) - yard-classmethods (~> 1.0) poise-profiler (1.0.1) halite (~> 1.0) polyglot (0.3.5) @@ -401,16 +422,16 @@ GEM rainbow (2.2.1) rake (11.3.0) rb-readline (0.5.4) - rest-client (2.0.0) + rest-client (2.0.1) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rest-client (2.0.0-x86-mingw32) + rest-client (2.0.1-x86-mingw32) ffi (~> 1.9) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - retriable (3.0.0) + retriable (3.0.1) retryable (2.0.4) rspec (3.5.0) rspec-core (~> 3.5.0) @@ -461,7 +482,7 @@ GEM simplecov-html (~> 0.10.0) simplecov-html (0.10.0) slop (3.6.0) - specinfra (2.66.9) + specinfra (2.67.1) net-scp net-ssh (>= 2.7, < 5.0) net-telnet @@ -480,7 +501,7 @@ GEM safe_yaml (~> 1.0) thor (~> 0.18) thor (0.19.4) - thread_safe (0.3.5) + thread_safe (0.3.6) tomlrb (1.2.3) travis (1.8.6) backports @@ -567,15 +588,16 @@ DEPENDENCIES cucumber (>= 2.4.0) foodcritic github_changelog_generator! - halite + halite! knife-windows mixlib-install netrc nokogiri oc-chef-pedant! octokit - poise - poise-boiler + ohai! + poise! + poise-boiler! pry pry-byebug pry-remote @@ -590,4 +612,4 @@ DEPENDENCIES yard BUNDLED WITH - 1.12.5 + 1.13.7 diff --git a/HISTORY.md b/HISTORY.md index acce953a47..9c3fdb8771 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,3 +1,35 @@ +## [v12.19.33](https://github.com/chef/chef/tree/v12.19.33) (2017-02-16) +[Full Changelog](https://github.com/chef/chef/compare/v12.18.31...v12.19.33) + +**Closed issues:** + +- Package resource fails chefspec on RHEL starting with Chef 12.18. [\#5769](https://github.com/chef/chef/issues/5769) + +**Merged pull requests:** + +- coerce immutable arrays to normal arrays in the yum\_package resource [\#5816](https://github.com/chef/chef/pull/5816) ([lamont-granquist](https://github.com/lamont-granquist)) +- Suppress sensitive properties from resource log and reporting output [\#5803](https://github.com/chef/chef/pull/5803) ([tduffield](https://github.com/tduffield)) +- Sanitize UTF-8 data sent to Data Collector [\#5793](https://github.com/chef/chef/pull/5793) ([lamont-granquist](https://github.com/lamont-granquist)) +- Add multipackage\_api support to yum\_package provider [\#5791](https://github.com/chef/chef/pull/5791) ([tduffield](https://github.com/tduffield)) +- rhel7 / dnf 2.0 fixes / improved errors [\#5782](https://github.com/chef/chef/pull/5782) ([lamont-granquist](https://github.com/lamont-granquist)) +- Grant Administrators group permissions to nodes directory under chef-solo [\#5781](https://github.com/chef/chef/pull/5781) ([tduffield](https://github.com/tduffield)) +- Fix --no-fips on chef-client [\#5778](https://github.com/chef/chef/pull/5778) ([btm](https://github.com/btm)) +- Raise error if ips\_package install returns non-zero [\#5773](https://github.com/chef/chef/pull/5773) ([tduffield](https://github.com/tduffield)) +- Use CIDR notation rather than netmask in route-eth0 file [\#5772](https://github.com/chef/chef/pull/5772) ([tduffield](https://github.com/tduffield)) +- Verify systemd\_unit file with custom verifier [\#5765](https://github.com/chef/chef/pull/5765) ([mal](https://github.com/mal)) +- Windows alternate user support for execute resources [\#5764](https://github.com/chef/chef/pull/5764) ([NimishaS](https://github.com/NimishaS)) +- favor metadata.json over metadata.rb [\#5750](https://github.com/chef/chef/pull/5750) ([lamont-granquist](https://github.com/lamont-granquist)) +- Ensure ssh search paginates correctly [\#5744](https://github.com/chef/chef/pull/5744) ([thommay](https://github.com/thommay)) +- Do not modify File's new\_resource during why-run [\#5742](https://github.com/chef/chef/pull/5742) ([scottopherson](https://github.com/scottopherson)) +- Add gems for ECC algorithm support to omnibus. [\#5736](https://github.com/chef/chef/pull/5736) ([rhass](https://github.com/rhass)) +- dh/url support cab [\#5732](https://github.com/chef/chef/pull/5732) ([dheerajd-msys](https://github.com/dheerajd-msys)) +- use git archive to speed up putting source in place [\#5730](https://github.com/chef/chef/pull/5730) ([robbkidd](https://github.com/robbkidd)) +- use pkg.path variable to reference path to self [\#5729](https://github.com/chef/chef/pull/5729) ([robbkidd](https://github.com/robbkidd)) +- Raise NamedSecurityInfo related exception using HR result. [\#5727](https://github.com/chef/chef/pull/5727) ([Aliasgar16](https://github.com/Aliasgar16)) +- Core: Ensure paths are correctly escaped when syntax checking [\#5704](https://github.com/chef/chef/pull/5704) ([ceneo](https://github.com/ceneo)) +- Added module\_version attribute for dsc\_resource for SxS support [\#5701](https://github.com/chef/chef/pull/5701) ([Aliasgar16](https://github.com/Aliasgar16)) +- Bump net-ssh to v4, add dependencies for ed25519 support [\#5687](https://github.com/chef/chef/pull/5687) ([onlyhavecans](https://github.com/onlyhavecans)) + ## [v12.18.31](https://github.com/chef/chef/tree/v12.18.31) (2017-01-11) [Full Changelog](https://github.com/chef/chef/compare/v12.17.44...v12.18.31) @@ -1327,5 +1359,4 @@ of partial templates. * Fixed a bug where nested resources that inherited from Resource::LWRPBase would not share the same actions/default_action as their parent * Raise error if a guard_interpreter is specified and a block is passed to a guard (conditional) -* Allow specifying a guard_interpreter after a conditional on a resource (Fixes #1943) -* Windows package type should be a symbol (Fixes #1997)
\ No newline at end of file +* Allow specifying a guard_interpreter after a conditional on a resource (Fixes #1943)
\ No newline at end of file @@ -1 +1 @@ -12.19.39
\ No newline at end of file +13.0.0
\ No newline at end of file diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock index 8dfb2ec217..e025c3c35a 100644 --- a/acceptance/Gemfile.lock +++ b/acceptance/Gemfile.lock @@ -1,5 +1,5 @@ GIT - remote: git://github.com/chef/chef-acceptance.git + remote: https://github.com/chef/chef-acceptance.git revision: e92ddae46d2126864698b9c8e4fc4ec2dcc46c55 specs: chef-acceptance (0.2.0) @@ -11,16 +11,16 @@ GEM specs: addressable (2.5.0) public_suffix (~> 2.0, >= 2.0.2) - artifactory (2.6.0) - aws-sdk (2.7.5) - aws-sdk-resources (= 2.7.5) - aws-sdk-core (2.7.5) + artifactory (2.7.0) + aws-sdk (2.7.13) + aws-sdk-resources (= 2.7.13) + aws-sdk-core (2.7.13) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.7.5) - aws-sdk-core (= 2.7.5) + aws-sdk-resources (2.7.13) + aws-sdk-core (= 2.7.13) aws-sigv4 (1.0.0) - berkshelf (5.6.2) + berkshelf (5.6.3) addressable (~> 2.3, >= 2.3.4) berkshelf-api-client (>= 2.0.2, < 4.0) buff-config (~> 2.0) @@ -54,7 +54,7 @@ GEM celluloid-io (0.16.2) celluloid (>= 0.16.0) nio4r (>= 1.1.0) - chef-config (12.18.31) + chef-config (13.0.0) addressable fuzzyurl mixlib-config (~> 2.0) @@ -75,7 +75,7 @@ GEM ffi (>= 1.0.1) gyoku (1.3.1) builder (>= 2.1.2) - hashie (3.5.1) + hashie (3.5.4) hitimes (1.2.4) httpclient (2.8.3) inspec (1.14.1) @@ -96,7 +96,7 @@ GEM train (>= 0.22.0, < 1.0) jmespath (1.3.1) json (2.0.3) - kitchen-ec2 (1.2.0) + kitchen-ec2 (1.3.1) aws-sdk (~> 2) excon multi_json @@ -106,7 +106,7 @@ GEM hashie (~> 3.4) inspec (>= 0.34.0, < 2.0.0) test-kitchen (~> 1.6) - kitchen-vagrant (1.0.0) + kitchen-vagrant (1.0.2) test-kitchen (~> 1.4) little-plugger (1.1.4) logging (2.1.0) @@ -131,7 +131,7 @@ GEM multipart-post (2.0.0) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (4.0.1) + net-ssh (4.1.0) net-ssh-gateway (1.3.0) net-ssh (>= 2.6.5) nio4r (2.0.0) @@ -255,4 +255,4 @@ DEPENDENCIES winrm-elevated BUNDLED WITH - 1.12.5 + 1.13.7 diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index c84ff4304e..2be1bfc1a7 100644 --- a/chef-config/lib/chef-config/version.rb +++ b/chef-config/lib/chef-config/version.rb @@ -21,7 +21,7 @@ module ChefConfig CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__) - VERSION = "12.19.39" + VERSION = "13.0.0" end # diff --git a/chef.gemspec b/chef.gemspec index 2b80d817b8..36387f91b0 100644 --- a/chef.gemspec +++ b/chef.gemspec @@ -22,7 +22,7 @@ Gem::Specification.new do |s| s.add_dependency "mixlib-authentication", "~> 1.4" s.add_dependency "mixlib-shellout", "~> 2.0" s.add_dependency "mixlib-archive", "~> 0.4" - s.add_dependency "ohai", ">= 8.6.0.alpha.1", "< 13" + s.add_dependency "ohai", "~> 13.0" s.add_dependency "ffi-yajl", "~> 2.2" s.add_dependency "net-ssh", ">= 2.9", "< 5.0" diff --git a/kitchen-tests/.kitchen.travis.yml b/kitchen-tests/.kitchen.travis.yml index aae5202457..6a66daffe6 100644 --- a/kitchen-tests/.kitchen.travis.yml +++ b/kitchen-tests/.kitchen.travis.yml @@ -14,6 +14,7 @@ provisioner: github_owner: "chef" github_repo: "chef" refname: <%= ENV['TRAVIS_COMMIT'] %> + ohai_refname: "master" github_access_token: <%= ENV['KITCHEN_GITHUB_TOKEN'] %> data_path: test/fixtures # disable file provider diffs so we don't overflow travis' line limit diff --git a/kitchen-tests/.kitchen.yml b/kitchen-tests/.kitchen.yml index d6df77932a..33841b0b94 100644 --- a/kitchen-tests/.kitchen.yml +++ b/kitchen-tests/.kitchen.yml @@ -15,6 +15,7 @@ provisioner: chef_omnibus_install_options: "-c current" github_owner: "chef" github_repo: "chef" + ohai_refname: "master" refname: <%= %x(git rev-parse HEAD) %> data_path: test/fixtures client_rb: diff --git a/kitchen-tests/Berksfile.lock b/kitchen-tests/Berksfile.lock index 6d8f40436a..4643665745 100644 --- a/kitchen-tests/Berksfile.lock +++ b/kitchen-tests/Berksfile.lock @@ -52,8 +52,7 @@ GRAPH sudo (>= 0.0.0) ubuntu (>= 0.0.0) users (>= 0.0.0) - build-essential (7.0.3) - compat_resource (>= 12.16.3) + build-essential (8.0.0) mingw (>= 1.1) seven_zip (>= 0.0.0) chef-client (7.1.0) @@ -67,10 +66,10 @@ GRAPH cron (3.0.0) database (6.1.1) postgresql (>= 1.0.0) - firewall (2.5.3) + firewall (2.5.4) chef-sugar (>= 0.0.0) - httpd (0.4.4) - compat_resource (>= 12.14.6) + httpd (0.4.5) + compat_resource (>= 12.16.3) iis (5.0.5) windows (>= 1.34.6) iptables (3.1.0) @@ -96,8 +95,7 @@ GRAPH nscd (4.1.0) compat_resource (>= 0.0.0) ntp (3.3.1) - ohai (4.2.3) - compat_resource (>= 12.14.7) + ohai (5.0.0) openssh (2.1.1) iptables (>= 1.0) openssl (6.1.1) @@ -127,7 +125,7 @@ GRAPH ohai (>= 4.0.0) xml (3.1.1) build-essential (>= 0.0.0) - yum (4.1.0) + yum (5.0.0) yum-epel (2.1.1) compat_resource (>= 12.16.3) yum-mysql-community (2.0.3) diff --git a/kitchen-tests/Gemfile.lock b/kitchen-tests/Gemfile.lock index b9d14397f1..81ab901afa 100644 --- a/kitchen-tests/Gemfile.lock +++ b/kitchen-tests/Gemfile.lock @@ -3,16 +3,16 @@ GEM specs: addressable (2.5.0) public_suffix (~> 2.0, >= 2.0.2) - artifactory (2.6.0) - aws-sdk (2.7.5) - aws-sdk-resources (= 2.7.5) - aws-sdk-core (2.7.5) + artifactory (2.7.0) + aws-sdk (2.7.15) + aws-sdk-resources (= 2.7.15) + aws-sdk-core (2.7.15) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.7.5) - aws-sdk-core (= 2.7.5) + aws-sdk-resources (2.7.15) + aws-sdk-core (= 2.7.15) aws-sigv4 (1.0.0) - berkshelf (5.6.2) + berkshelf (5.6.3) addressable (~> 2.3, >= 2.3.4) berkshelf-api-client (>= 2.0.2, < 4.0) buff-config (~> 2.0) @@ -46,7 +46,7 @@ GEM celluloid-io (0.16.2) celluloid (>= 0.16.0) nio4r (>= 1.1.0) - chef-config (12.18.31) + chef-config (12.19.36) addressable fuzzyurl mixlib-config (~> 2.0) @@ -68,7 +68,7 @@ GEM ffi (>= 1.0.1) gyoku (1.3.1) builder (>= 2.1.2) - hashie (3.5.1) + hashie (3.5.5) hitimes (1.2.4) hitimes (1.2.4-x86-mingw32) httpclient (2.8.3) @@ -90,11 +90,11 @@ GEM train (>= 0.22.0, < 1.0) jmespath (1.3.1) json (2.0.3) - kitchen-appbundle-updater (0.1.2) + kitchen-appbundle-updater (0.2.0) kitchen-dokken (1.1.0) docker-api (~> 1.33) test-kitchen (~> 1.13) - kitchen-ec2 (1.2.0) + kitchen-ec2 (1.3.2) aws-sdk (~> 2) excon multi_json @@ -104,7 +104,7 @@ GEM hashie (~> 3.4) inspec (>= 0.34.0, < 2.0.0) test-kitchen (~> 1.6) - kitchen-vagrant (1.0.0) + kitchen-vagrant (1.0.2) test-kitchen (~> 1.4) little-plugger (1.1.4) logging (2.1.0) @@ -133,7 +133,7 @@ GEM multipart-post (2.0.0) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (4.0.1) + net-ssh (4.1.0) net-ssh-gateway (1.3.0) net-ssh (>= 2.6.5) nio4r (2.0.0) @@ -256,4 +256,4 @@ DEPENDENCIES vagrant-wrapper BUNDLED WITH - 1.12.5 + 1.13.7 diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 82afd17006..70a127e637 100644 --- a/lib/chef/version.rb +++ b/lib/chef/version.rb @@ -21,7 +21,7 @@ class Chef CHEF_ROOT = File.expand_path("../..", __FILE__) - VERSION = "12.19.39" + VERSION = "13.0.0" end # diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index ceb322bf20..85995a5b47 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,13 +1,13 @@ GIT - remote: git://github.com/chef/license_scout.git - revision: f90293a9753652fb64994a14de4108e503c06632 + remote: https://github.com/chef/license_scout.git + revision: 425b6f098224ddd9187d6a5bea73ebe6dffcb22a specs: license_scout (0.1.2) ffi-yajl (~> 2.2) mixlib-shellout (~> 2.2) GIT - remote: git://github.com/chef/omnibus-software.git + remote: https://github.com/chef/omnibus-software.git revision: 086710002ec0054b3d240d14ca04d11163f528aa branch: shain/ruby_windows_monster specs: @@ -16,7 +16,7 @@ GIT omnibus (>= 5.5.0) GIT - remote: git://github.com/chef/omnibus.git + remote: https://github.com/chef/omnibus.git revision: dce5283a85a44484a66a8a84991beba92e46fd12 branch: rhass/COOL-502_with_gcc_investigate specs: @@ -37,15 +37,15 @@ GEM specs: addressable (2.5.0) public_suffix (~> 2.0, >= 2.0.2) - artifactory (2.6.0) + artifactory (2.7.0) awesome_print (1.7.0) - aws-sdk (2.7.5) - aws-sdk-resources (= 2.7.5) - aws-sdk-core (2.7.5) + aws-sdk (2.7.13) + aws-sdk-resources (= 2.7.13) + aws-sdk-core (2.7.13) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.7.5) - aws-sdk-core (= 2.7.5) + aws-sdk-resources (2.7.13) + aws-sdk-core (= 2.7.13) aws-sigv4 (1.0.0) berkshelf (4.3.5) addressable (~> 2.3, >= 2.3.4) @@ -86,7 +86,7 @@ GEM celluloid-io (0.16.2) celluloid (>= 0.16.0) nio4r (>= 1.1.0) - chef-config (12.18.31) + chef-config (12.19.33) addressable fuzzyurl mixlib-config (~> 2.0) @@ -107,7 +107,7 @@ GEM ffi (>= 1.0.1) gyoku (1.3.1) builder (>= 2.1.2) - hashie (3.5.1) + hashie (3.5.4) hitimes (1.2.4) hitimes (1.2.4-x86-mingw32) httpclient (2.7.2) @@ -146,7 +146,7 @@ GEM multipart-post (2.0.0) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (4.0.1) + net-ssh (4.1.0) net-ssh-gateway (1.3.0) net-ssh (>= 2.6.5) nio4r (2.0.0) @@ -267,4 +267,4 @@ DEPENDENCIES winrm-fs (~> 1.0) BUNDLED WITH - 1.12.5 + 1.13.7 diff --git a/spec/support/platform_helpers.rb b/spec/support/platform_helpers.rb index fb50ee2298..120e73740d 100644 --- a/spec/support/platform_helpers.rb +++ b/spec/support/platform_helpers.rb @@ -1,5 +1,6 @@ require "fcntl" require "chef/mixin/shell_out" +require "ohai/mixin/http_helper" require "ohai/mixin/gce_metadata" class ShellHelpers @@ -221,12 +222,12 @@ def fips? ENV["CHEF_FIPS"] == "1" end -class GCEDetector - extend Ohai::Mixin::GCEMetadata +class HttpHelper + extend Ohai::Mixin::HttpHelper end def gce? - GCEDetector.can_metadata_connect?(Ohai::Mixin::GCEMetadata::GCE_METADATA_ADDR, 80) + HttpHelper.can_socket_connect?(Ohai::Mixin::GCEMetadata::GCE_METADATA_ADDR, 80) rescue SocketError false end |