chef 15.3.14 → 15.4.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 772f0452477ac76959f28ac0daa680847762bf0bf0e26e1277d76d9b40f143fd
-  data.tar.gz: 53a57e2a7d1988e49e1a60ab13be59cb5f3c4cabeb4a5e55126a117f84d60112
+  metadata.gz: '09023fe03c2a36ec34f9b087b7671cd38d066cde37ad6027051f333046950701'
+  data.tar.gz: cdd9bd027741716d597f2cc5c9faa1bfaac2f14f7c28b98995b0f71bc8afb295
 SHA512:
-  metadata.gz: 798400e33a9696516462fa405a1297b2284b21773cb9898ddf0245dc05a35a01dee33152a2b78dc7f36c4b0dd40a3c5102766675bce2eca03c50c6f3d7a3083a
-  data.tar.gz: 383c4ad9b5c05cbd43e58c249eaecf53b442cc2ce1b05cb1d8abfe6aaf624b20f9c707b21f18c3af00b6b8efba05ad8d9119ce01b724b2497b0a2897a65871f3
+  metadata.gz: 52c05b3792352bf46d3124412c92bb1e4a2d2b693de090bb7e793a923547a68955ab1f1faf3bd2c122d1850dd8f9b2c12e0f4ac639a60bdb9ad6cb1b2e607f52
+  data.tar.gz: b9fb6e927fb5d5277979db1e798526b5294e55326a7c0fbc5527d0b736134fc78cec96f9e6584c3bab768a91f2328b66218ed7814735c610a5102af635a28422

data/chef.gemspec

@@ -16,8 +16,8 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= 2.5.0"
 
   s.add_dependency "chef-config", "= #{Chef::VERSION}"
-  s.add_dependency "train-core", "~> 3.0"
-  s.add_dependency "train-winrm"
+  s.add_dependency "train-core", "~> 3.1"
+  s.add_dependency "train-winrm", ">= 0.2.5"
 
   s.add_dependency "license-acceptance", "~> 1.0", ">= 1.0.5"
   s.add_dependency "mixlib-cli", ">= 2.1.1", "< 3.0"

data/lib/chef/application/solo.rb

@@ -52,13 +52,13 @@ class Chef::Application::Solo < Chef::Application::Base
   # Get this party started
   def run(enforce_license: false)
     setup_signal_handlers
-    setup_application
     reconfigure
     check_license_acceptance if enforce_license
     for_ezra if Chef::Config[:ez]
     if !Chef::Config[:solo_legacy_mode]
       Chef::Application::Client.new.run
     else
+      setup_application
       run_application
     end
   end

data/lib/chef/event_dispatch/dispatcher.rb

@@ -10,11 +10,18 @@ class Chef
     class Dispatcher < Base
 
       attr_reader :subscribers
-      attr_reader :event_list
 
       def initialize(*subscribers)
         @subscribers = subscribers
-        @event_list = []
+      end
+
+      # Since the cookbook synchronizer will call this object from threads, we
+      # have to deal with concurrent access to this object.  Since we don't want
+      # threads to handle events from other threads, we just use thread local
+      # storage.
+      #
+      def event_list
+        Thread.current[:chef_client_event_list] ||= []
       end
 
       # Add a new subscriber to the list of registered subscribers

data/lib/chef/formatters/doc.rb

@@ -236,11 +236,11 @@ class Chef
       end
 
       def resource_update_progress(resource, current, total, interval)
-        @progress[resource] ||= 0
+        @progress[resource] ||= -1
 
-        percent_complete = (current.to_f / total.to_f * 100).to_i
+        percent_complete = (current.to_f / total.to_f * 100).to_i unless total.to_f == 0.0
 
-        if percent_complete > @progress[resource]
+        if percent_complete && percent_complete > @progress[resource]
 
           @progress[resource] = percent_complete
 

data/lib/chef/knife.rb

@@ -64,6 +64,12 @@ class Chef
     attr_accessor :name_args
     attr_accessor :ui
 
+    # knife acl subcommands are grouped in this category using this constant to verify.
+    OPSCODE_HOSTED_CHEF_ACCESS_CONTROL = %w{acl group user}.freeze
+
+    # knife opc subcommands are grouped in this category using this constant to verify.
+    CHEF_ORGANIZATION_MANAGEMENT = %w{opc}.freeze
+
     # Configure mixlib-cli to always separate defaults from user-supplied CLI options
     def self.use_separate_defaults?
       true
@@ -234,7 +240,7 @@ class Chef
       dependency_loaders.each(&:call)
     end
 
-    OFFICIAL_PLUGINS = %w{ec2 rackspace windows openstack azure google linode push vcenter lpar}.freeze
+    OFFICIAL_PLUGINS = %w{lpar openstack push rackspace vcenter}.freeze
 
     class << self
       def list_commands(preferred_category = nil)
@@ -270,10 +276,14 @@ class Chef
           ui.info("If this is a recently installed plugin, please run 'knife rehash' to update the subcommands cache.")
         end
 
-        if category_commands = guess_category(args)
+        if CHEF_ORGANIZATION_MANAGEMENT.include?(args[0])
+          list_commands("CHEF ORGANIZATION MANAGEMENT")
+        elsif OPSCODE_HOSTED_CHEF_ACCESS_CONTROL.include?(args[0])
+          list_commands("OPSCODE HOSTED CHEF ACCESS CONTROL")
+        elsif category_commands = guess_category(args)
           list_commands(category_commands)
         elsif OFFICIAL_PLUGINS.include?(args[0]) # command was an uninstalled official chef knife plugin
-          ui.info("Use `#{Chef::Dist::EXEC} gem install knife-#{args[0]}` to install the plugin into ChefDK")
+          ui.info("Use `#{Chef::Dist::EXEC} gem install knife-#{args[0]}` to install the plugin into ChefDK / Chef Workstation")
         else
           list_commands
         end

data/lib/chef/knife/bootstrap.rb

@@ -616,7 +616,7 @@ class Chef
 
       def connect!
         ui.info("Connecting to #{ui.color(server_name, :bold)}")
-        opts = connection_opts.dup
+        opts ||= connection_opts.dup
         do_connect(opts)
       rescue Train::Error => e
         # We handle these by message text only because train only loads the
@@ -638,8 +638,10 @@ class Chef
           EOM
           # FIXME: this should save the key to known_hosts but doesn't appear to be
           config[:ssh_verify_host_key] = :accept_new
-          do_connect(connection_opts(reset: true))
-        elsif ssh? && e.cause && e.cause.class == Net::SSH::AuthenticationFailed
+          conn_opts = connection_opts(reset: true)
+          opts.merge! conn_opts
+          retry
+        elsif (ssh? && e.cause && e.cause.class == Net::SSH::AuthenticationFailed) || (ssh? && e.class == Train::ClientError && e.reason == :no_ssh_password_or_key_available)
           if connection.password_auth?
             raise
           else
@@ -650,7 +652,23 @@ class Chef
           end
 
           opts.merge! force_ssh_password_opts(password)
-          do_connect(opts)
+          retry
+        else
+          raise
+        end
+      rescue RuntimeError => e
+        if winrm? && e.message == "password is a required option"
+          if connection.password_auth?
+            raise
+          else
+            ui.warn("Failed to authenticate #{opts[:user]} to #{server_name} - trying password auth")
+            password = ui.ask("Enter password for #{opts[:user]}@#{server_name}.") do |q|
+              q.echo = false
+            end
+          end
+
+          opts.merge! force_winrm_password_opts(password)
+          retry
         else
           raise
         end
@@ -1023,6 +1041,12 @@ class Chef
         }
       end
 
+      def force_winrm_password_opts(password)
+        {
+          password: password,
+        }
+      end
+
       # Looks up configuration entries, first in the class member
       # `config` which contains options populated from CLI flags.
       # If the entry is not found there, Chef::Config[:knife][KEY]

data/lib/chef/knife/bootstrap/templates/chef-full.erb

@@ -1,4 +1,3 @@
-sh -c '
 <%= "https_proxy=\"#{knife_config[:bootstrap_proxy]}\" export https_proxy" if knife_config[:bootstrap_proxy] %>
 <%= "no_proxy=\"#{knife_config[:bootstrap_no_proxy]}\" export no_proxy" if knife_config[:bootstrap_no_proxy] %>
 
@@ -189,24 +188,24 @@ fi
 mkdir -p <%= Chef::Dist::CONF_DIR %>
 
 <% if client_pem -%>
-cat > <%= Chef::Dist::CONF_DIR %>/client.pem <<'EOP'
+(umask 077 && (cat > <%= Chef::Dist::CONF_DIR %>/client.pem <<'EOP'
 <%= ::File.read(::File.expand_path(client_pem)) %>
 EOP
-chmod 0600 <%= Chef::Dist::CONF_DIR %>/client.pem
+)) || exit 1
 <% end -%>
 
 <% if validation_key -%>
-cat > <%= Chef::Dist::CONF_DIR %>/validation.pem <<'EOP'
+(umask 077 && (cat > <%= Chef::Dist::CONF_DIR %>/validation.pem <<'EOP'
 <%= validation_key %>
 EOP
-chmod 0600 <%= Chef::Dist::CONF_DIR %>/validation.pem
+)) || exit 1
 <% end -%>
 
 <% if encrypted_data_bag_secret -%>
-cat > <%= Chef::Dist::CONF_DIR %>/encrypted_data_bag_secret <<'EOP'
+(umask 077 && (cat > <%= Chef::Dist::CONF_DIR %>/encrypted_data_bag_secret <<'EOP'
 <%= encrypted_data_bag_secret %>
 EOP
-chmod 0600 <%= Chef::Dist::CONF_DIR %>/encrypted_data_bag_secret
+)) || exit 1
 <% end -%>
 
 <% unless trusted_certs.empty? -%>
@@ -240,4 +239,4 @@ mkdir -p <%= Chef::Dist::CONF_DIR %>/client.d
 
 echo "Starting the first <%= Chef::Dist::PRODUCT %> Client run..."
 
-<%= start_chef %>'
+<%= start_chef %>

data/lib/chef/knife/data_bag_secret_options.rb

@@ -36,7 +36,7 @@ class Chef
       def self.included(base)
         base.option :secret,
           short: "-s SECRET",
-          long: "--secret ",
+          long: "--secret SECRET",
           description: "The secret key to use to encrypt data bag item values. Can also be defaulted in your config with the key 'secret'.",
           # Need to store value from command line in separate variable - knife#merge_configs populates same keys
           # on config object from
@@ -80,9 +80,16 @@ class Chef
       end
 
       def validate_secrets
-        if has_cl_secret? && has_cl_secret_file?
-          ui.fatal("Please specify only one of --secret, --secret-file")
-          exit(1)
+        if has_cl_secret?
+          if opt_parser.default_argv.include?("-s")
+            ui.warn("Secret short option -s is deprecated and will remove in the future. Please use --secret instead.
+")
+          end
+
+          if has_cl_secret_file?
+            ui.fatal("Please specify only one of --secret, --secret-file")
+            exit(1)
+          end
         end
 
         if knife_config[:secret] && knife_config[:secret_file]

data/lib/chef/knife/download.rb

@@ -43,7 +43,7 @@ class Chef
         long: "--[no-]force",
         boolean: true,
         default: false,
-        description: "Force upload of files even if they match (quicker and harmless, but doesn't print out what it changed)."
+        description: "Force download of files even if they match (quicker and harmless, but doesn't print out what it changed)."
 
       option :dry_run,
         long: "--dry-run",
@@ -56,7 +56,7 @@ class Chef
         long: "--[no-]diff",
         boolean: true,
         default: true,
-        description: "Turn off to avoid uploading existing files; only new (and possibly deleted) files with --no-diff."
+        description: "Turn off to avoid downloading existing files; only new (and possibly deleted) files with --no-diff."
 
       option :cookbook_version,
         long: "--cookbook-version VERSION",

data/lib/chef/knife/exec.rb

@@ -40,7 +40,7 @@ class Chef::Knife::Exec < Chef::Knife
   end
 
   def run
-    config[:script_path] ||= Array(Chef::Config[:script_path])
+    config[:script_path] = Array(config[:script_path] || Chef::Config[:script_path])
 
     # Default script paths are chef-repo/.chef/scripts and ~/.chef/scripts
     config[:script_path] << File.join(Chef::Knife.chef_config_dir, "scripts") if Chef::Knife.chef_config_dir
@@ -57,6 +57,14 @@ class Chef::Knife::Exec < Chef::Knife
         context.instance_eval(IO.read(file), file, 0)
       end
     else
+      puts "An interactive shell is opened"
+      puts
+      puts "Type your script and do:"
+      puts
+      puts "1. To run the script, use 'Ctrl D'"
+      puts "2. To exit, use 'Ctrl/Shift C'"
+      puts
+      puts "Type here a script..."
       script = STDIN.read
       context.instance_eval(script, "STDIN", 0)
     end

data/lib/chef/knife/ssh.rb

@@ -623,7 +623,7 @@ class Chef
           end
 
         session.close
-        if exit_status != 0
+        if exit_status && exit_status != 0
           exit exit_status
         else
           exit_status

data/lib/chef/knife/ssl_check.rb

@@ -190,7 +190,7 @@ class Chef
           #{ui.color("TO FIX THIS ERROR:", :bold)}
 
           If the server you are connecting to uses a self-signed certificate, you must
-          configure chef to trust that server's certificate.
+          configure #{Chef::Dist::PRODUCT} to trust that server's certificate.
 
           By default, the certificate is stored in the following location on the host
           where your chef-server runs:

data/lib/chef/knife/supermarket_list.rb

@@ -37,23 +37,35 @@ class Chef
         default: "https://supermarket.chef.io",
         proc: Proc.new { |supermarket| Chef::Config[:knife][:supermarket_site] = supermarket }
 
+      option :sort_by,
+        long: "--sort-by SORT",
+        description: "Use to sort the records",
+        in: %w{recently_updated recently_added most_downloaded most_followed}
+
+      option :owned_by,
+        short: "-o USER",
+        long: "--owned-by USER",
+        description: "Show cookbooks that are owned by the USER"
+
       def run
         if config[:with_uri]
-          cookbooks = {}
-          get_cookbook_list.each { |k, v| cookbooks[k] = v["cookbook"] }
-          ui.output(format_for_display(cookbooks))
+          ui.output(format_for_display(get_cookbook_list))
         else
-          ui.msg(ui.list(get_cookbook_list.keys.sort, :columns_down))
+          ui.msg(ui.list(get_cookbook_list.keys, :columns_down))
         end
       end
 
-      def get_cookbook_list(items = 10, start = 0, cookbook_collection = {})
+      # In order to avoid pagination items limit set to 9999999
+      def get_cookbook_list(items = 9999999, start = 0, cookbook_collection = {})
         cookbooks_url = "#{config[:supermarket_site]}/api/v1/cookbooks?items=#{items}&start=#{start}"
+        cookbooks_url << "&order=#{config[:sort_by]}" if config[:sort_by]
+        cookbooks_url << "&user=#{config[:owned_by]}" if config[:owned_by]
         cr = noauth_rest.get(cookbooks_url)
+
         cr["items"].each do |cookbook|
-          cookbook_collection[cookbook["cookbook_name"]] = cookbook
+          cookbook_collection[cookbook["cookbook_name"]] = cookbook["cookbook"]
         end
-        new_start = start + cr["items"].length
+        new_start = start + items
         if new_start < cr["total"]
           get_cookbook_list(items, new_start, cookbook_collection)
         else

data/lib/chef/knife/supermarket_search.rb

@@ -35,13 +35,14 @@ class Chef
         output(search_cookbook(name_args[0]))
       end
 
-      def search_cookbook(query, items = 10, start = 0, cookbook_collection = {})
+      # In order to avoid pagination items limit set to 9999999
+      def search_cookbook(query, items = 9999999, start = 0, cookbook_collection = {})
         cookbooks_url = "#{config[:supermarket_site]}/api/v1/search?q=#{query}&items=#{items}&start=#{start}"
         cr = noauth_rest.get(cookbooks_url)
         cr["items"].each do |cookbook|
           cookbook_collection[cookbook["cookbook_name"]] = cookbook
         end
-        new_start = start + cr["items"].length
+        new_start = start + items
         if new_start < cr["total"]
           search_cookbook(query, items, new_start, cookbook_collection)
         else

data/lib/chef/node/attribute.rb

@@ -148,7 +148,9 @@ class Chef
         to_a
         to_h
         to_hash
+        to_json
         to_set
+        to_yaml
         value?
         values
         values_at

data/lib/chef/node/attribute_collections.rb

@@ -65,6 +65,10 @@ class Chef
         Array.new(map { |e| safe_dup(e) })
       end
 
+      def to_yaml(*opts)
+        to_a.to_yaml(*opts)
+      end
+
       private
 
       def convert_value(value)
@@ -172,6 +176,10 @@ class Chef
         Mash.new(self)
       end
 
+      def to_yaml(*opts)
+        to_h.to_yaml(*opts)
+      end
+
       prepend Chef::Node::Mixin::StateTracking
     end
   end

data/lib/chef/node/immutable_collections.rb

@@ -96,6 +96,12 @@ class Chef
 
       alias_method :to_array, :to_a
 
+      # As Psych module, not respecting ImmutableArray object
+      # So first convert it to Hash/Array then parse it to `.to_yaml`
+      def to_yaml(*opts)
+        to_a.to_yaml(*opts)
+      end
+
       private
 
       # needed for __path__
@@ -168,6 +174,12 @@ class Chef
 
       alias_method :to_hash, :to_h
 
+      # As Psych module, not respecting ImmutableMash object
+      # So first convert it to Hash/Array then parse it to `.to_yaml`
+      def to_yaml(*opts)
+        to_h.to_yaml(*opts)
+      end
+
       # For elements like Fixnums, true, nil...
       def safe_dup(e)
         e.dup

data/lib/chef/node/mixin/immutablize_array.rb

@@ -119,6 +119,7 @@ class Chef
           to_h
           to_plist
           to_set
+          to_yaml
           transpose
           union
           uniq

data/lib/chef/node/mixin/immutablize_hash.rb

@@ -116,6 +116,7 @@ class Chef
           to_proc
           to_set
           to_xml_attributes
+          to_yaml
           transform_keys
           transform_values
           uniq

data/lib/chef/provider.rb

@@ -272,11 +272,17 @@ class Chef
         raise ArgumentError, "converge_if_changed must be passed a block!"
       end
 
-      properties = new_resource.class.state_properties.map(&:name) if properties.empty?
-      properties = properties.map(&:to_sym)
+      properties =
+        if properties.empty?
+          new_resource.class.state_properties
+        else
+          properties.map { |property| new_resource.class.properties[property] }
+        end
+
       if current_resource
         # Collect the list of modified properties
-        specified_properties = properties.select { |property| new_resource.property_is_set?(property) }
+        specified_properties = properties.select { |property| property.is_set?(new_resource) || property.has_default? }
+        specified_properties = specified_properties.map(&:name).map(&:to_sym)
         modified = specified_properties.select { |p| new_resource.send(p) != current_resource.send(p) }
         if modified.empty?
           properties_str = if new_resource.sensitive
@@ -309,15 +315,15 @@ class Chef
       else
         # The resource doesn't exist. Mark that we are *creating* this, and
         # write down any properties we are setting.
-        property_size = properties.map(&:size).max
+        property_size = properties.map(&:name).map(&:to_sym).map(&:size).max
         created = properties.map do |property|
-          default = " (default value)" unless new_resource.property_is_set?(property)
-          properties_str = if new_resource.sensitive || new_resource.class.properties[property].sensitive?
+          default = " (default value)" unless property.is_set?(new_resource)
+          properties_str = if new_resource.sensitive || property.sensitive?
                              "(suppressed sensitive property)"
                            else
-                             new_resource.send(property).inspect
+                             new_resource.send(property.name.to_sym).inspect
                            end
-          "  set #{property.to_s.ljust(property_size)} to #{properties_str}#{default}"
+          "  set #{property.name.to_sym.to_s.ljust(property_size)} to #{properties_str}#{default}"
         end
 
         converge_by([ "create #{new_resource.identity}" ] + created, &converge_block)