chef 15.0.300 → 15.1.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4b36b19afe184d6706720584f6729c6a3b46f2a32e8ed67eeca373415b48690
-  data.tar.gz: e77a1e46552fdbe8b14d679aa492c66214681d61c72af1a4831ab8212ec5bfb4
+  metadata.gz: 71f1764daa8efa380f2587dac37ec1f6a9208493b2951783b9f676b4671ed465
+  data.tar.gz: f771365f6f24b8992893858e9233da36b9bcd14d17567b9dd5410ea55c230fb6
 SHA512:
-  metadata.gz: ea0e6d34fa26f682f679b4a2c5028fb079c06c0ea6c81439ae884101b592699151a8ef78fcf082ebb77143d3a80f7ac26f3092dbe403cfeedb5c92deb55ba961
-  data.tar.gz: c35e472b0853dd9d850fd5aa5b1a3858073d3306f4186913e8914270376cbce52e68830b4e5bdd709e6ff3be22e8aa6ca4b89fce361c2f2a5126848de19c0b17
+  metadata.gz: 2b6fea79aab61b11b53f728ae3c491f0861e4752a5d1e6b342e44ad76f070110a15203abd626c322be0c0f1de8c0674e9b52c49a25ae63f414be663fbd407f77
+  data.tar.gz: 966a21dfcb8ae4d60f3170b6437fd2dc5fe9c79e300ee8a4ba65977c9a9f45bfa20d33e0800f942043a8d4fa2039fa9167097a107056dd3a946f0f86e6968203

data/Gemfile

@@ -26,6 +26,7 @@ group(:omnibus_package) do
   gem "appbundler"
   gem "rb-readline"
   gem "inspec-core", "~> 4.3"
+  gem "inspec-core-bin", "~> 4.3" # need to provide the binaries for inspec
   gem "chef-vault"
   gem "ed25519" # ed25519 ssh key support done here as it's a native gem we can't put in train
   gem "bcrypt_pbkdf" # ed25519 ssh key support done here as it's a native gem we can't put in train
@@ -44,7 +45,7 @@ end
 
 # Everything except AIX
 group(:ruby_prof) do
-  gem "ruby-prof"
+  gem "ruby-prof", "< 0.18" # 0.18 includes a x64-mingw32 gem, which doesn't load correctly. See https://github.com/ruby-prof/ruby-prof/issues/255
 end
 
 # Everything except AIX and Windows

data/README.md

@@ -1,6 +1,6 @@
 # Chef Infra
 [![Code Climate](https://codeclimate.com/github/chef/chef.svg)](https://codeclimate.com/github/chef/chef)
-[![Build Status Master](https://travis-ci.org/chef/chef.svg?branch=master)](https://travis-ci.org/chef/chef)
+[![Build Status](https://badge.buildkite.com/c82093430ceec7d27af05febb9dcafe3aa331fff9d74c0ab9d.svg?branch=master)](https://buildkite.com/chef-oss/chef-chef-master-verify)
 [![Build Status Master](https://ci.appveyor.com/api/projects/status/github/chef/chef?branch=master&svg=true&passingText=master%20-%20Ok&pendingText=master%20-%20Pending&failingText=master%20-%20Failing)](https://ci.appveyor.com/project/Chef/chef/branch/master)
 [![Gem Version](https://badge.fury.io/rb/chef.svg)](https://badge.fury.io/rb/chef)
 [![](https://img.shields.io/badge/Release%20Policy-Cadence%20Release-brightgreen.svg)](https://github.com/chef/chef-rfc/blob/master/rfc086-chef-oss-project-policies.md#cadence-release)

data/Rakefile

@@ -20,6 +20,7 @@
 require_relative "tasks/rspec"
 require_relative "tasks/dependencies"
 require_relative "tasks/announce"
+require_relative "tasks/docs"
 
 ENV["CHEF_LICENSE"] = "accept-no-persist"
 

data/chef.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.add_dependency "train-core", "~> 2.0", ">= 2.0.12"
 
   s.add_dependency "license-acceptance", "~> 1.0", ">= 1.0.5"
-  s.add_dependency "mixlib-cli", ">= 1.7", "< 3.0"
+  s.add_dependency "mixlib-cli", ">= 2.1.1", "< 3.0"
   s.add_dependency "mixlib-log", ">= 2.0.3", "< 4.0"
   s.add_dependency "mixlib-authentication", "~> 2.1"
   s.add_dependency "mixlib-shellout", ">= 2.4", "< 4.0"

data/lib/chef/api_client/registration.rb

@@ -19,7 +19,7 @@
 require_relative "../config"
 require_relative "../server_api"
 require_relative "../exceptions"
-require "fileutils"
+require "fileutils" unless defined?(FileUtils)
 
 class Chef
   class ApiClient

data/lib/chef/application.rb

@@ -16,16 +16,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "pp"
-require "socket"
+require "pp" unless defined?(PP)
+require "socket" unless defined?(Socket)
 require_relative "config"
 require_relative "config_fetcher"
 require_relative "exceptions"
 require_relative "local_mode"
 require_relative "log"
 require_relative "platform"
-require "mixlib/cli"
-require "tmpdir"
+require "mixlib/cli" unless defined?(Mixlib::CLI)
+require "tmpdir" unless defined?(Dir.mktmpdir)
 require "rbconfig"
 require_relative "application/exit_code"
 require_relative "dist"
@@ -155,10 +155,16 @@ class Chef
       Chef::Application.fatal!(e.message)
     end
 
+    # Set the specific recipes to Chef::Config if the recipes are valid
+    # otherwise log a fatal error message and exit the application.
     def set_specific_recipes
-      if cli_arguments.respond_to?(:map)
+      if cli_arguments.is_a?(Array) &&
+          (cli_arguments.empty? || cli_arguments.all? { |file| File.file?(file) } )
         chef_config[:specific_recipes] =
           cli_arguments.map { |file| File.expand_path(file) }
+      else
+        Chef::Application.fatal!("Invalid arguments are not supported by the chef-client: \"" +
+          cli_arguments.select { |file| !File.file?(file) }.join('", "') + '"')
       end
     end
 
@@ -316,7 +322,7 @@ class Chef
     end
 
     def fork_chef_client
-      logger.info "Forking chef instance to converge..."
+      logger.info "Forking #{Chef::Dist::PRODUCT} instance to converge..."
       pid = fork do
         # Want to allow forked processes to finish converging when
         # TERM singal is received (exit gracefully)
@@ -325,7 +331,7 @@ class Chef
             " finishing converge to exit normally (send SIGINT to terminate immediately)")
         end
 
-        client_solo = chef_config[:solo] ? "chef-solo" : "#{Chef::Dist::CLIENT}"
+        client_solo = chef_config[:solo] ? "#{Chef::Dist::SOLOEXEC}" : "#{Chef::Dist::CLIENT}"
         $0 = "#{client_solo} worker: ppid=#{Process.ppid};start=#{Time.new.strftime("%R:%S")};"
         begin
           logger.trace "Forked instance now converging"

data/lib/chef/application/apply.rb

@@ -22,8 +22,8 @@ require_relative "../application"
 require_relative "../client"
 require_relative "../config"
 require_relative "../log"
-require "fileutils"
-require "tempfile"
+require "fileutils" unless defined?(FileUtils)
+require "tempfile" unless defined?(Tempfile)
 require_relative "../providers"
 require_relative "../resources"
 require_relative "../dist"

data/lib/chef/application/client.rb

@@ -27,8 +27,8 @@ require_relative "../handler/error_report"
 require_relative "../workstation_config_loader"
 require_relative "../mixin/shell_out"
 require "chef-config/mixin/dot_d"
-require "mixlib/archive"
-require "uri"
+require "mixlib/archive" unless defined?(Mixlib::Archive)
+require "uri" unless defined?(URI)
 require_relative "../dist"
 require "license_acceptance/cli_flags/mixlib_cli"
 
@@ -252,11 +252,11 @@ class Chef::Application::Client < Chef::Application
 
   option :chef_zero_host,
     long: "--chef-zero-host HOST",
-    description: "Host to start chef-zero on."
+    description: "Host to start #{Chef::Dist::ZERO} on."
 
   option :chef_zero_port,
     long: "--chef-zero-port PORT",
-    description: "Port (or port range) to start chef-zero on. Port ranges like 1000,1010 or 8889-9999 will try all given ports until one works."
+    description: "Port (or port range) to start #{Chef::Dist::ZERO} on. Port ranges like 1000,1010 or 8889-9999 will try all given ports until one works."
 
   option :disable_config,
     long: "--disable-config",
@@ -352,7 +352,7 @@ class Chef::Application::Client < Chef::Application
         tarball_path = File.join(Chef::Config.chef_repo_path, "recipes.tgz")
         fetch_recipe_tarball(Chef::Config[:recipe_url], tarball_path)
         Mixlib::Archive.new(tarball_path).extract(Chef::Config.chef_repo_path, perms: false, ignore: /^\.$/)
-        config_path = File.join(Chef::Config.chef_repo_path, ".chef/config.rb")
+        config_path = File.join(Chef::Config.chef_repo_path, "#{Chef::Dist::USER_CONF_DIR}/config.rb")
         Chef::Config.from_string(IO.read(config_path), config_path) if File.file?(config_path)
       end
     end
@@ -395,7 +395,7 @@ class Chef::Application::Client < Chef::Application
       if config[:local_mode]
         config[:config_file] = Chef::WorkstationConfigLoader.new(nil, Chef::Log).config_location
       else
-        config[:config_file] = Chef::Config.platform_specific_path("/etc/chef/client.rb")
+        config[:config_file] = Chef::Config.platform_specific_path("#{Chef::Dist::CONF_DIR}/client.rb")
       end
     end
 

data/lib/chef/application/exit_code.rb

@@ -145,8 +145,8 @@ class Chef
 
         def non_standard_exit_code_warning(exit_code)
           "#{Chef::Dist::CLIENT} attempted to exit with a non-standard exit code of #{exit_code}." \
-          " The Chef-Client Exit Codes design document (https://github.com/chef/chef-rfc/blob/master/rfc062-exit-status.md)" \
-          " defines the exit codes that should be used with Chef. Chef::Application::ExitCode defines"  \
+          " The #{Chef::Dist::PRODUCT} Exit Codes design document (https://github.com/chef/chef-rfc/blob/master/rfc062-exit-status.md)" \
+          " defines the exit codes that should be used with #{Chef::Dist::CLIENT}. Chef::Application::ExitCode defines"  \
           " valid exit codes Non-standard exit codes are redefined as GENERIC_FAILURE."
         end
 

data/lib/chef/application/knife.rb

@@ -124,11 +124,11 @@ class Chef::Application::Knife < Chef::Application
 
   option :chef_zero_host,
     long: "--chef-zero-host HOST",
-    description: "Host to start chef-zero on."
+    description: "Host to start #{Chef::Dist::ZERO} on."
 
   option :chef_zero_port,
     long: "--chef-zero-port PORT",
-    description: "Port (or port range) to start chef-zero on. Port ranges like 1000,1010 or 8889-9999 will try all given ports until one works."
+    description: "Port (or port range) to start #{Chef::Dist::ZERO} on. Port ranges like 1000,1010 or 8889-9999 will try all given ports until one works."
 
   option :listen,
     long: "--[no-]listen",

data/lib/chef/application/solo.rb

@@ -24,11 +24,11 @@ require_relative "../config"
 require_relative "../daemon"
 require_relative "../log"
 require_relative "../config_fetcher"
-require "fileutils"
+require "fileutils" unless defined?(FileUtils)
 require_relative "../mixin/shell_out"
-require "pathname"
+require "pathname" unless defined?(Pathname)
 require "chef-config/mixin/dot_d"
-require "mixlib/archive"
+require "mixlib/archive" unless defined?(Mixlib::Archive)
 require_relative "../dist"
 require "license_acceptance/cli_flags/mixlib_cli"
 
@@ -40,7 +40,7 @@ class Chef::Application::Solo < Chef::Application
   option :config_file,
     short: "-c CONFIG",
     long: "--config CONFIG",
-    default: Chef::Config.platform_specific_path("/etc/chef/solo.rb"),
+    default: Chef::Config.platform_specific_path("#{Chef::Dist::CONF_DIR}/solo.rb"),
     description: "The configuration file to use."
 
   option :config_option,
@@ -124,7 +124,7 @@ class Chef::Application::Solo < Chef::Application
 
   option :lockfile,
     long: "--lockfile LOCKFILE",
-    description: "Set the lockfile location. Prevents multiple solo processes from converging at the same time.",
+    description: "Set the lockfile location. Prevents multiple #{Chef::Dist::SOLO} processes from converging at the same time.",
     proc: nil
 
   option :interval,
@@ -213,7 +213,7 @@ class Chef::Application::Solo < Chef::Application
 
   option :solo_legacy_mode,
     long: "--legacy-mode",
-    description: "Run chef-solo in legacy mode.",
+    description: "Run #{Chef::Dist::SOLO} in legacy mode.",
     boolean: true
 
   attr_reader :chef_client_json

data/lib/chef/application/windows_service.rb

@@ -24,9 +24,9 @@ require_relative "../config"
 require_relative "../handler/error_report"
 require_relative "../log"
 require_relative "../http"
-require "mixlib/cli"
-require "socket"
-require "uri"
+require "mixlib/cli" unless defined?(Mixlib::CLI)
+require "socket" unless defined?(Socket)
+require "uri" unless defined?(URI)
 require "win32/daemon"
 require_relative "../mixin/shell_out"
 require_relative "../dist"

data/lib/chef/application/windows_service_manager.rb

@@ -20,7 +20,7 @@ if RUBY_PLATFORM =~ /mswin|mingw32|windows/
   require "win32/service"
 end
 require_relative "../config"
-require "mixlib/cli"
+require "mixlib/cli" unless defined?(Mixlib::CLI)
 require_relative "../dist"
 
 class Chef

data/lib/chef/chef_fs/chef_fs_data_store.rb

@@ -24,7 +24,7 @@ require_relative "file_pattern"
 require_relative "file_system"
 require_relative "file_system/exceptions"
 require_relative "file_system/memory/memory_root"
-require "fileutils"
+require "fileutils" unless defined?(FileUtils)
 
 class Chef
   module ChefFS

data/lib/chef/chef_fs/file_system/chef_server/cookbook_file.rb

@@ -18,7 +18,7 @@
 
 require_relative "../base_fs_object"
 require_relative "../../../http/simple"
-require "openssl"
+require "openssl" unless defined?(OpenSSL)
 
 class Chef
   module ChefFS

data/lib/chef/chef_fs/file_system/chef_server/cookbooks_dir.rb

@@ -22,7 +22,7 @@ require_relative "../exceptions"
 require_relative "../repository/chef_repository_file_system_cookbook_dir"
 require_relative "../../../mixin/file_class"
 
-require "tmpdir"
+require "tmpdir" unless defined?(Dir.mktmpdir)
 
 class Chef
   module ChefFS