chef 16.4.35-universal-mingw32 → 16.6.14-universal-mingw32

data/distro/templates/powershell/chef/chef.psm1.erb

@@ -412,40 +412,40 @@ function Run-RubyCommand($command, $argList) {
 }
 
 
-function <%= Chef::Dist::APPLY %> {
-  Run-RubyCommand '<%= Chef::Dist::APPLY %>' $args
+function <%= ChefUtils::Dist::Apply::EXEC %> {
+  Run-RubyCommand '<%= ChefUtils::Dist::Apply::EXEC %>' $args
 }
 
-function <%= Chef::Dist::CLIENT %> {
-  Run-RubyCommand '<%= Chef::Dist::CLIENT %>' $args
+function <%= ChefUtils::Dist::Infra::CLIENT %> {
+  Run-RubyCommand '<%= ChefUtils::Dist::Infra::CLIENT %>' $args
 }
 
-function <%= Chef::Dist::EXEC %>-service-manager {
-  Run-RubyCommand '<%= Chef::Dist::EXEC %>-service-manager' $args
+function <%= ChefUtils::Dist::Infra::EXEC %>-service-manager {
+  Run-RubyCommand '<%= ChefUtils::Dist::Infra::EXEC %>-service-manager' $args
 }
 
-function <%= Chef::Dist::SHELL %> {
-  Run-RubyCommand '<%= Chef::Dist::SHELL %>' $args
+function <%= ChefUtils::Dist::Infra::SHELL %> {
+  Run-RubyCommand '<%= ChefUtils::Dist::Infra::SHELL %>' $args
 }
 
-function <%= Chef::Dist::SOLOEXEC %> {
-  Run-RubyCommand '<%= Chef::Dist::SOLOEXEC %>' $args
+function <%= ChefUtils::Dist::Solo::EXEC %> {
+  Run-RubyCommand '<%= ChefUtils::Dist::Solo::EXEC %>' $args
 }
 
-function <%= Chef::Dist::EXEC %>-windows-service {
-  Run-RubyCommand '<%= Chef::Dist::EXEC %>-windows-service' $args
+function <%= ChefUtils::Dist::Infra::EXEC %>-windows-service {
+  Run-RubyCommand '<%= ChefUtils::Dist::Infra::EXEC %>-windows-service' $args
 }
 
 function knife {
   Run-RubyCommand 'knife' $args
 }
 
-Export-ModuleMember -function <%= Chef::Dist::APPLY %>
-Export-ModuleMember -function <%= Chef::Dist::CLIENT %>
-Export-ModuleMember -function <%= Chef::Dist::EXEC %>-service-manager
-Export-ModuleMember -function <%= Chef::Dist::SHELL %>
-Export-ModuleMember -function <%= Chef::Dist::SOLOEXEC %>
-Export-ModuleMember -function <%= Chef::Dist::EXEC %>-windows-service
+Export-ModuleMember -function <%= ChefUtils::Dist::Apply::EXEC %>
+Export-ModuleMember -function <%= ChefUtils::Dist::Infra::CLIENT %>
+Export-ModuleMember -function <%= ChefUtils::Dist::Infra::EXEC %>-service-manager
+Export-ModuleMember -function <%= ChefUtils::Dist::Infra::SHELL %>
+Export-ModuleMember -function <%= ChefUtils::Dist::Solo::EXEC %>
+Export-ModuleMember -function <%= ChefUtils::Dist::Infra::EXEC %>-windows-service
 Export-ModuleMember -function knife
 
 # To debug this module, uncomment the line below

data/ext/win32-eventlog/Rakefile

@@ -2,7 +2,7 @@ require "rubygems"
 require "rake"
 require "mkmf"
 require "erb"
-require_relative "../../lib/chef/dist"
+require "chef-utils/dist"
 
 desc "Building event log dll"
 
@@ -51,7 +51,7 @@ task register: EVT_SHARED_OBJECT do
   begin
     Win32::EventLog.add_event_source(
       source: "Application",
-      key_name: Chef::Dist::SHORT,
+      key_name: ChefUtils::Dist::Infra::SHORT,
       event_message_file: dll_file,
       category_message_file: dll_file
     )

data/ext/win32-eventlog/chef-log.man.erb

@@ -1,25 +1,25 @@
 MessageId=10000
 SymbolicName=RUN_START
 Language=English
-Starting <%= Chef::Dist::PRODUCT %> run v%1
+Starting <%= ChefUtils::Dist::Infra::PRODUCT %> run v%1
 .
 
 MessageId=10001
 SymbolicName=RUN_STARTED
 Language=English
-Started <%= Chef::Dist::PRODUCT %> run %1
+Started <%= ChefUtils::Dist::Infra::PRODUCT %> run %1
 .
 
 MessageId=10002
 SymbolicName=RUN_COMPLETED
 Language=English
-Completed <%= Chef::Dist::PRODUCT %> run %1 in %2 seconds
+Completed <%= ChefUtils::Dist::Infra::PRODUCT %> run %1 in %2 seconds
 .
 
 MessageId=10003
 SymbolicName=RUN_FAILED
 Language=English
-Failed <%= Chef::Dist::PRODUCT %> run %1 in %2 seconds.%n
+Failed <%= ChefUtils::Dist::Infra::PRODUCT %> run %1 in %2 seconds.%n
 Exception type: %3%n
 Exception message: %4%n
 Exception backtrace: %5%n

data/lib/chef/application.rb

@@ -27,8 +27,10 @@ require "mixlib/cli" unless defined?(Mixlib::CLI)
 require "tmpdir" unless defined?(Dir.mktmpdir)
 require "rbconfig" unless defined?(RbConfig)
 require_relative "application/exit_code"
-require_relative "dist"
-require "license_acceptance/acceptor"
+require "chef-utils" unless defined?(ChefUtils::CANARY)
+module LicenseAcceptance
+  autoload :Acceptor, "license_acceptance/acceptor"
+end
 
 class Chef
   class Application
@@ -39,9 +41,6 @@ class Chef
 
       @chef_client = nil
       @chef_client_json = nil
-
-      # Always switch to a readable directory. Keeps subsequent Dir.chdir() {}
-      # from failing due to permissions when launched as a less privileged user.
     end
 
     # Configure mixlib-cli to always separate defaults from user-supplied CLI options
@@ -96,7 +95,11 @@ class Chef
     # Parse configuration (options and config file)
     def configure_chef
       parse_options
-      load_config_file
+      begin
+        load_config_file
+      rescue Exception => e
+        Chef::Application.fatal!(e.message, Chef::Exceptions::ConfigurationError.new)
+      end
       chef_config.export_proxies
       chef_config.init_openssl
       File.umask chef_config[:umask]
@@ -151,8 +154,6 @@ class Chef
 
     def apply_extra_config_options(extra_config_options)
       chef_config.apply_extra_config_options(extra_config_options)
-    rescue ChefConfig::UnparsableConfigOption => e
-      Chef::Application.fatal!(e.message)
     end
 
     # Set the specific recipes to Chef::Config if the recipes are valid
@@ -171,7 +172,7 @@ class Chef
     def configure_logging
       configure_log_location
       logger.init(MonoLogger.new(chef_config[:log_location][0]))
-      chef_config[:log_location][1..-1].each do |log_location|
+      chef_config[:log_location][1..].each do |log_location|
         logger.loggers << MonoLogger.new(log_location)
       end
       logger.level = resolve_log_level
@@ -306,7 +307,7 @@ class Chef
     end
 
     def fork_chef_client
-      logger.info "Forking #{Chef::Dist::PRODUCT} instance to converge..."
+      logger.info "Forking #{ChefUtils::Dist::Infra::PRODUCT} instance to converge..."
       pid = fork do
         # Want to allow forked processes to finish converging when
         # TERM singal is received (exit gracefully)
@@ -315,7 +316,7 @@ class Chef
             " finishing converge to exit normally (send SIGINT to terminate immediately)")
         end
 
-        client_solo = chef_config[:solo] ? "#{Chef::Dist::SOLOEXEC}" : "#{Chef::Dist::CLIENT}"
+        client_solo = chef_config[:solo] ? ChefUtils::Dist::Solo::EXEC : ChefUtils::Dist::Infra::CLIENT
         $0 = "#{client_solo} worker: ppid=#{Process.ppid};start=#{Time.new.strftime("%R:%S")};"
         begin
           logger.trace "Forked instance now converging"
@@ -327,7 +328,7 @@ class Chef
           exit 0
         end
       end
-      logger.trace "Fork successful. Waiting for new #{Chef::Dist::CLIENT} pid: #{pid}"
+      logger.trace "Fork successful. Waiting for new #{ChefUtils::Dist::Infra::CLIENT} pid: #{pid}"
       result = Process.waitpid2(pid)
       handle_child_exit(result)
       logger.trace "Forked instance successfully reaped (pid: #{pid})"
@@ -339,9 +340,9 @@ class Chef
       return true if status.success?
 
       message = if status.signaled?
-                  "#{Chef::Dist::PRODUCT} run process terminated by signal #{status.termsig} (#{Signal.list.invert[status.termsig]})"
+                  "#{ChefUtils::Dist::Infra::PRODUCT} run process terminated by signal #{status.termsig} (#{Signal.list.invert[status.termsig]})"
                 else
-                  "#{Chef::Dist::PRODUCT} run process exited unsuccessfully (exit code #{status.exitstatus})"
+                  "#{ChefUtils::Dist::Infra::PRODUCT} run process exited unsuccessfully (exit code #{status.exitstatus})"
                 end
       raise Exceptions::ChildConvergeError, message
     end
@@ -352,7 +353,8 @@ class Chef
       logger.fatal("Configuration error #{error.class}: #{error.message}")
       filtered_trace = error.backtrace.grep(/#{Regexp.escape(config_file_path)}/)
       filtered_trace.each { |line| logger.fatal("  " + line ) }
-      Chef::Application.fatal!("Aborting due to error in '#{config_file_path}'", error)
+      raise Chef::Exceptions::ConfigurationError.new("Aborting due to error in '#{config_file_path}': #{error}")
+      # Chef::Application.fatal!("Aborting due to error in '#{config_file_path}'", Chef::Exceptions::ConfigurationError.new(error))
     end
 
     # This is a hook for testing
@@ -373,8 +375,8 @@ class Chef
         chef_stacktrace_out = "Generated at #{Time.now}\n"
         chef_stacktrace_out += message
 
-        Chef::FileCache.store("#{Chef::Dist::SHORT}-stacktrace.out", chef_stacktrace_out)
-        logger.fatal("Stacktrace dumped to #{Chef::FileCache.load("#{Chef::Dist::SHORT}-stacktrace.out", false)}")
+        Chef::FileCache.store("#{ChefUtils::Dist::Infra::SHORT}-stacktrace.out", chef_stacktrace_out)
+        logger.fatal("Stacktrace dumped to #{Chef::FileCache.load("#{ChefUtils::Dist::Infra::SHORT}-stacktrace.out", false)}")
         logger.fatal("Please provide the contents of the stacktrace.out file if you file a bug report")
         if Chef::Config[:always_dump_stacktrace]
           logger.fatal(message)

data/lib/chef/application/apply.rb

@@ -27,13 +27,13 @@ require "fileutils" unless defined?(FileUtils)
 require "tempfile" unless defined?(Tempfile)
 require_relative "../providers"
 require_relative "../resources"
-require_relative "../dist"
+require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 require "license_acceptance/cli_flags/mixlib_cli"
 
 class Chef::Application::Apply < Chef::Application
   include LicenseAcceptance::CLIFlags::MixlibCLI
 
-  banner "Usage: #{Chef::Dist::APPLY} [RECIPE_FILE | -e RECIPE_TEXT | -s] [OPTIONS]"
+  banner "Usage: #{ChefUtils::Dist::Apply::EXEC} [RECIPE_FILE | -e RECIPE_TEXT | -s] [OPTIONS]"
 
   option :execute,
     short: "-e RECIPE_TEXT",
@@ -77,6 +77,11 @@ class Chef::Application::Apply < Chef::Application
     description: "Set the log level (trace, debug, info, warn, error, fatal).",
     proc: lambda { |l| l.to_sym }
 
+  option :log_location_cli,
+    short: "-L LOGLOCATION",
+    long: "--logfile LOGLOCATION",
+    description: "Set the log file location, defaults to STDOUT - recommended for daemonizing."
+
   option :always_dump_stacktrace,
     long: "--[no-]always-dump-stacktrace",
     boolean: true,
@@ -95,9 +100,9 @@ class Chef::Application::Apply < Chef::Application
   option :version,
     short: "-v",
     long: "--version",
-    description: "Show #{Chef::Dist::PRODUCT} version.",
+    description: "Show #{ChefUtils::Dist::Infra::PRODUCT} version.",
     boolean: true,
-    proc: lambda { |v| puts "#{Chef::Dist::PRODUCT}: #{::Chef::VERSION}" },
+    proc: lambda { |v| puts "#{ChefUtils::Dist::Infra::PRODUCT}: #{::Chef::VERSION}" },
     exit: 0
 
   option :why_run,
@@ -114,7 +119,7 @@ class Chef::Application::Apply < Chef::Application
 
   option :profile_ruby,
     long: "--[no-]profile-ruby",
-    description: "Dump complete Ruby call graph stack of entire #{Chef::Dist::PRODUCT} run (expert only).",
+    description: "Dump complete Ruby call graph stack of entire #{ChefUtils::Dist::Infra::PRODUCT} run (expert only).",
     boolean: true,
     default: false
 
@@ -126,7 +131,7 @@ class Chef::Application::Apply < Chef::Application
 
   option :minimal_ohai,
     long: "--minimal-ohai",
-    description: "Only run the bare minimum Ohai plugins #{Chef::Dist::PRODUCT} needs to function.",
+    description: "Only run the bare minimum Ohai plugins #{ChefUtils::Dist::Infra::PRODUCT} needs to function.",
     boolean: true
 
   attr_reader :json_attribs
@@ -176,7 +181,7 @@ class Chef::Application::Apply < Chef::Application
                   else
                     Chef::RunContext.new(@chef_client.node, {}, @chef_client.events)
                   end
-    recipe = Chef::Recipe.new("(#{Chef::Dist::APPLY} cookbook)", "(#{Chef::Dist::APPLY} recipe)", run_context)
+    recipe = Chef::Recipe.new("(#{ChefUtils::Dist::Apply::EXEC} cookbook)", "(#{ChefUtils::Dist::Apply::EXEC} recipe)", run_context)
     [recipe, run_context]
   end
 

data/lib/chef/application/base.rb

@@ -20,11 +20,13 @@ require_relative "../log"
 require_relative "../config"
 require_relative "../mixin/shell_out"
 require_relative "../config_fetcher"
-require_relative "../dist"
+require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 require_relative "../daemon"
 require "chef-config/mixin/dot_d"
 require "license_acceptance/cli_flags/mixlib_cli"
-require "mixlib/archive" unless defined?(Mixlib::Archive)
+module Mixlib
+  autoload :Archive, "mixlib/archive"
+end
 
 # This is a temporary class being used as a part of an effort to reduce duplication
 # between Chef::Application::Client and Chef::Application::Solo.
@@ -55,7 +57,7 @@ class Chef::Application::Base < Chef::Application
 
   option :once,
     long: "--once",
-    description: "Cancel any interval or splay options, run #{Chef::Dist::PRODUCT} once and exit.",
+    description: "Cancel any interval or splay options, run #{ChefUtils::Dist::Infra::PRODUCT} once and exit.",
     boolean: true
 
   option :formatter,
@@ -78,7 +80,7 @@ class Chef::Application::Base < Chef::Application
 
   option :profile_ruby,
     long: "--[no-]profile-ruby",
-    description: "Dump complete Ruby call graph stack of entire #{Chef::Dist::PRODUCT} run (expert only).",
+    description: "Dump complete Ruby call graph stack of entire #{ChefUtils::Dist::Infra::PRODUCT} run (expert only).",
     boolean: true,
     default: false
 
@@ -134,7 +136,7 @@ class Chef::Application::Base < Chef::Application
   option :interval,
     short: "-i SECONDS",
     long: "--interval SECONDS",
-    description: "Run #{Chef::Dist::PRODUCT} periodically, in seconds.",
+    description: "Run #{ChefUtils::Dist::Infra::PRODUCT} periodically, in seconds.",
     proc: lambda { |s| s.to_i }
 
   option :json_attribs,
@@ -158,12 +160,12 @@ class Chef::Application::Base < Chef::Application
   option :environment,
     short: "-E ENVIRONMENT",
     long: "--environment ENVIRONMENT",
-    description: "Set the #{Chef::Dist::PRODUCT} environment on the node."
+    description: "Set the #{ChefUtils::Dist::Infra::PRODUCT} environment on the node."
 
   option :client_fork,
     short: "-f",
     long: "--[no-]fork",
-    description: "Fork #{Chef::Dist::PRODUCT} process."
+    description: "Fork #{ChefUtils::Dist::Infra::PRODUCT} process."
 
   option :why_run,
     short: "-W",
@@ -190,14 +192,14 @@ class Chef::Application::Base < Chef::Application
   option :version,
     short: "-v",
     long: "--version",
-    description: "Show #{Chef::Dist::PRODUCT} version.",
+    description: "Show #{ChefUtils::Dist::Infra::PRODUCT} version.",
     boolean: true,
-    proc: lambda { |v| puts "#{Chef::Dist::PRODUCT}: #{::Chef::VERSION}" },
+    proc: lambda { |v| puts "#{ChefUtils::Dist::Infra::PRODUCT}: #{::Chef::VERSION}" },
     exit: 0
 
   option :minimal_ohai,
     long: "--minimal-ohai",
-    description: "Only run the bare minimum Ohai plugins #{Chef::Dist::PRODUCT} needs to function.",
+    description: "Only run the bare minimum Ohai plugins #{ChefUtils::Dist::Infra::PRODUCT} needs to function.",
     boolean: true
 
   option :delete_entire_chef_repo,
@@ -213,7 +215,7 @@ class Chef::Application::Base < Chef::Application
   option :target,
     short: "-t TARGET",
     long: "--target TARGET",
-    description: "Target #{Chef::Dist::PRODUCT} against a remote system or device",
+    description: "Target #{ChefUtils::Dist::Infra::PRODUCT} against a remote system or device",
     proc: lambda { |target|
       Chef::Log.warn "-- EXPERIMENTAL -- Target mode activated, resources and dsl may change without warning -- EXPERIMENTAL --"
       target
@@ -228,7 +230,7 @@ class Chef::Application::Base < Chef::Application
     option :fatal_windows_admin_check,
       short: "-A",
       long: "--fatal-windows-admin-check",
-      description: "Fail the run when #{Chef::Dist::CLIENT} doesn't have administrator privileges on Windows.",
+      description: "Fail the run when #{ChefUtils::Dist::Infra::CLIENT} doesn't have administrator privileges on Windows.",
       boolean: true
   end
 
@@ -245,7 +247,7 @@ class Chef::Application::Base < Chef::Application
   option :chef_server_url,
     short: "-S CHEFSERVERURL",
     long: "--server CHEFSERVERURL",
-    description: "The #{Chef::Dist::SERVER_PRODUCT} URL.",
+    description: "The #{ChefUtils::Dist::Server::PRODUCT} URL.",
     proc: nil
 
   option :validation_key,
@@ -263,7 +265,7 @@ class Chef::Application::Base < Chef::Application
   option :enable_reporting,
     short: "-R",
     long: "--enable-reporting",
-    description: "(#{Chef::Dist::CLIENT} only) reporting data collection for runs.",
+    description: "(#{ChefUtils::Dist::Infra::CLIENT} only) reporting data collection for runs.",
     boolean: true
 
   option :local_mode,
@@ -274,11 +276,11 @@ class Chef::Application::Base < Chef::Application
 
   option :chef_zero_host,
     long: "--chef-zero-host HOST",
-    description: "Host to start #{Chef::Dist::ZERO} on."
+    description: "Host to start #{ChefUtils::Dist::Zero::PRODUCT} on."
 
   option :chef_zero_port,
     long: "--chef-zero-port PORT",
-    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."
+    description: "Port (or port range) to start #{ChefUtils::Dist::Zero::PRODUCT} on. Port ranges like 1000,1010 or 8889-9999 will try all given ports until one works."
 
   option :listen,
     long: "--[no-]listen",
@@ -287,7 +289,7 @@ class Chef::Application::Base < Chef::Application
 
   option :skip_cookbook_sync,
     long: "--[no-]skip-cookbook-sync",
-    description: "(#{Chef::Dist::CLIENT} only) Use cached cookbooks without overwriting local differences from the #{Chef::Dist::SERVER_PRODUCT}.",
+    description: "(#{ChefUtils::Dist::Infra::CLIENT} only) Use cached cookbooks without overwriting local differences from the #{ChefUtils::Dist::Server::PRODUCT}.",
     boolean: false
 
   option :named_run_list,
@@ -326,7 +328,7 @@ class Chef::Application::Base < Chef::Application
   # Run the chef client, optionally daemonizing or looping at intervals.
   def run_application
     if Chef::Config[:version]
-      puts "#{Chef::Dist::PRODUCT} version: #{::Chef::VERSION}"
+      puts "#{ChefUtils::Dist::Infra::PRODUCT} version: #{::Chef::VERSION}"
     end
 
     if !Chef::Config[:client_fork] || Chef::Config[:once]
@@ -346,20 +348,21 @@ class Chef::Application::Base < Chef::Application
   private
 
   def windows_interval_error_message
-    "Windows #{Chef::Dist::PRODUCT} interval runs are not supported in #{Chef::Dist::PRODUCT} 15 and later." +
+    "Windows #{ChefUtils::Dist::Infra::PRODUCT} interval runs are not supported in #{ChefUtils::Dist::Infra::PRODUCT} 15 and later." +
       "\nConfiguration settings:" +
       ("\n  interval  = #{Chef::Config[:interval]} seconds" if Chef::Config[:interval]).to_s +
-      "\nPlease manage #{Chef::Dist::PRODUCT} as a scheduled task instead."
+      "\nPlease manage #{ChefUtils::Dist::Infra::PRODUCT} as a scheduled task instead."
   end
 
   def unforked_interval_error_message
-    "Unforked #{Chef::Dist::PRODUCT} interval runs are disabled by default." +
+    "Unforked #{ChefUtils::Dist::Infra::PRODUCT} interval runs are disabled by default." +
       "\nConfiguration settings:" +
       ("\n  interval  = #{Chef::Config[:interval]} seconds" if Chef::Config[:interval]).to_s +
-      "\nEnable #{Chef::Dist::PRODUCT} interval runs by setting `:client_fork = true` in your config file or adding `--fork` to your command line options."
+      "\nEnable #{ChefUtils::Dist::Infra::PRODUCT} interval runs by setting `:client_fork = true` in your config file or adding `--fork` to your command line options."
   end
 
   def fetch_recipe_tarball(url, path)
+    require "open-uri" unless defined?(OpenURI)
     Chef::Log.trace("Download recipes tarball from #{url} to #{path}")
     if File.exist?(url)
       FileUtils.cp(url, path)
@@ -377,7 +380,7 @@ class Chef::Application::Base < Chef::Application
 
   def interval_run_chef_client
     if Chef::Config[:daemonize]
-      Chef::Daemon.daemonize(Chef::Dist::PRODUCT)
+      Chef::Daemon.daemonize(ChefUtils::Dist::Infra::PRODUCT)
 
       # Start first daemonized run after configured number of seconds
       if Chef::Config[:daemonize].is_a?(Integer)