chef 13.12.14-universal-mingw32 → 14.0.190-universal-mingw32

data/lib/chef/resource/zypper_repository.rb

@@ -20,32 +20,37 @@ require "chef/resource"
 
 class Chef
   class Resource
-    # The zypper_repository resource allows for the creation of Zypper package repositories on SUSE Enterprise Linux and
-    # openSUSE systems. This resource maintains full compatibility with the zypper_repository resource in the existing
-    # zypper cookbook.
-    #
-    # @since 13.3
     class ZypperRepository < Chef::Resource
       resource_name :zypper_repository
       provides :zypper_repo
 
-      property :repo_name, String, name_property: true
+      description "Use the zypper_repository resource to create Zypper package repositories"\
+                  " on SUSE Enterprise Linux and openSUSE systems. This resource maintains"\
+                  " full compatibility with the zypper_repository resource in the existing"\
+                  " zypper cookbook."
+      introduced "13.3"
+
+      property :repo_name, String,
+               regex: [/^[^\/]+$/],
+               validation_message: "repo_name property cannot contain a forward slash '/'",
+               name_property: true
+
       property :description, String
       property :type, String, default: "NONE"
-      property :enabled, [true, false], default: true
-      property :autorefresh, [true, false], default: true
-      property :gpgcheck, [true, false], default: true
+      property :enabled, [TrueClass, FalseClass], default: true
+      property :autorefresh, [TrueClass, FalseClass], default: true
+      property :gpgcheck, [TrueClass, FalseClass], default: true
       property :gpgkey, String
       property :baseurl, String
       property :mirrorlist, String
       property :path, String
       property :priority, Integer, default: 99
-      property :keeppackages, [true, false], default: false
+      property :keeppackages, [TrueClass, FalseClass], default: false
       property :mode, default: "0644"
-      property :refresh_cache, [true, false], default: true
+      property :refresh_cache, [TrueClass, FalseClass], default: true
       property :source, String
       property :cookbook, String
-      property :gpgautoimportkeys, [true, false], default: true
+      property :gpgautoimportkeys, [TrueClass, FalseClass], default: true
 
       default_action :create
       allowed_actions :create, :remove, :add, :refresh

data/lib/chef/resource_inspector.rb

@@ -0,0 +1,89 @@
+# Copyright:: Copyright 2018, Chef Software, Inc
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "chef/cookbook_loader"
+require "chef/cookbook/file_vendor"
+require "chef/cookbook/file_system_file_vendor"
+require "chef/resource/lwrp_base"
+require "chef/run_context"
+require "chef/node"
+require "chef/resources"
+require "chef/json_compat"
+
+module ResourceInspector
+  def self.extract_resource(resource, complete = false)
+    data = {}
+    data[:description] = resource.description
+    # data[:deprecated] = resource.deprecated || false
+    data[:actions] = resource.allowed_actions
+    data[:examples] = resource.examples
+    data[:introduced] = resource.introduced
+
+    properties = unless complete
+                   resource.properties.reject { |_, k| k.options[:declared_in] == Chef::Resource }
+                 else
+                   resource.properties
+                 end
+
+    data[:properties] = properties.each_with_object([]) do |(n, k), acc|
+      opts = k.options
+      acc << { name: n, description: opts[:description], introduced: opts[:introduced], is: opts[:is], deprecated: opts[:deprecated] || false }
+    end
+    data
+  end
+
+  def self.extract_cookbook(path, complete)
+    path = File.expand_path(path)
+    dir, name = File.split(path)
+    Chef::Cookbook::FileVendor.fetch_from_disk(path)
+    loader = Chef::CookbookLoader.new(dir)
+    cookbooks = loader.load_cookbooks
+    resources = cookbooks[name].files_for(:resources)
+
+    resources.each_with_object({}) do |r, res|
+      pth = r["full_path"]
+      cur = Chef::Resource::LWRPBase.build_from_file(name, pth, Chef::RunContext.new(Chef::Node.new, nil, nil))
+      res[cur.resource_name] = extract_resource(cur, complete)
+    end
+  end
+
+  # If we're given no resources, dump all of Chef's built ins
+  # otherwise, if we have a path then extract all the resources from the cookbook
+  # or else do a list of built in resources
+  #
+  #  @param complete [TrueClass, FalseClass] Whether to show properties defined in the base Resource class
+  def self.inspect(arguments = [], complete: false)
+    output = if arguments.empty?
+               ObjectSpace.each_object(Class).select { |k| k < Chef::Resource }.each_with_object({}) { |klass, acc| acc[klass.resource_name] = extract_resource(klass) }
+             else
+               arguments.each_with_object({}) do |arg, acc|
+                 if File.directory?(arg)
+                   extract_cookbook(arg, complete).each { |k, v| acc[k] = v }
+                 else
+                   r = Chef::ResourceResolver.resolve(arg.to_sym, canonical: nil)
+                   acc[r.resource_name] = extract_resource(r, complete)
+                 end
+               end
+             end
+
+    puts Chef::JSONCompat.to_json_pretty(output)
+  end
+
+  def self.start
+    inspect(ARGV, complete: true)
+  end
+
+end

data/lib/chef/resource_reporter.rb

@@ -3,7 +3,7 @@
 # Author:: Prajakta Purohit (prajakta@chef.io>)
 # Auther:: Tyler Cloke (<tyler@opscode.com>)
 #
-# Copyright:: Copyright 2012-2016, Chef Software Inc.
+# Copyright:: Copyright 2012-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -94,7 +94,6 @@ class Chef
     attr_reader :updated_resources
     attr_reader :status
     attr_reader :exception
-    attr_reader :run_id
     attr_reader :error_descriptions
 
     PROTOCOL_VERSION = "0.1.0"
@@ -154,7 +153,7 @@ class Chef
           Chef::Log.info(message + reason + reporting_status)
         else
           reporting_status = "Disabling reporting for run."
-          Chef::Log.debug(message + reason + reporting_status)
+          Chef::Log.trace(message + reason + reporting_status)
         end
       end
 
@@ -238,9 +237,9 @@ class Chef
         run_data = prepare_run_data
         resource_history_url = "reports/nodes/#{node_name}/runs/#{run_id}"
         Chef::Log.info("Sending resource update report (run-id: #{run_id})")
-        Chef::Log.debug run_data.inspect
+        Chef::Log.trace run_data.inspect
         compressed_data = encode_gzip(Chef::JSONCompat.to_json(run_data))
-        Chef::Log.debug("Sending compressed run data...")
+        Chef::Log.trace("Sending compressed run data...")
         # Since we're posting compressed data we can not directly call post which expects JSON
         begin
           @rest_client.raw_request(:POST, resource_history_url, headers({ "Content-Encoding" => "gzip" }), compressed_data)
@@ -253,7 +252,7 @@ class Chef
           end
         end
       else
-        Chef::Log.debug("Server doesn't support resource history, skipping resource report.")
+        Chef::Log.trace("Server doesn't support resource history, skipping resource report.")
       end
     end
 

data/lib/chef/resource_resolver.rb

@@ -77,14 +77,14 @@ class Chef
     # @api private use Chef::ResourceResolver.resolve instead.
     def resolve
       # log this so we know what resources will work for the generic resource on the node (early cut)
-      Chef::Log.debug "Resources for generic #{resource_name} resource enabled on node include: #{prioritized_handlers}"
+      Chef::Log.trace "Resources for generic #{resource_name} resource enabled on node include: #{prioritized_handlers}"
 
       handler = prioritized_handlers.first
 
       if handler
-        Chef::Log.debug "Resource for #{resource_name} is #{handler}"
+        Chef::Log.trace "Resource for #{resource_name} is #{handler}"
       else
-        Chef::Log.debug "Dynamic resource resolver FAILED to resolve a resource for #{resource_name}"
+        Chef::Log.trace "Dynamic resource resolver FAILED to resolve a resource for #{resource_name}"
       end
 
       handler
@@ -92,7 +92,7 @@ class Chef
 
     # @api private
     def list
-      Chef::Log.debug "Resources for generic #{resource_name} resource enabled on node include: #{prioritized_handlers}"
+      Chef::Log.trace "Resources for generic #{resource_name} resource enabled on node include: #{prioritized_handlers}"
       prioritized_handlers
     end
 

data/lib/chef/resources.rb

@@ -23,20 +23,19 @@ require "chef/resource/apt_update"
 require "chef/resource/bash"
 require "chef/resource/batch"
 require "chef/resource/breakpoint"
+require "chef/resource/build_essential"
 require "chef/resource/cookbook_file"
 require "chef/resource/chef_gem"
+require "chef/resource/chef_handler"
 require "chef/resource/chocolatey_package"
 require "chef/resource/cron"
 require "chef/resource/csh"
-require "chef/resource/deploy"
-require "chef/resource/deploy_revision"
 require "chef/resource/directory"
+require "chef/resource/dmg_package"
 require "chef/resource/dpkg_package"
 require "chef/resource/dnf_package"
 require "chef/resource/dsc_script"
 require "chef/resource/dsc_resource"
-require "chef/resource/env"
-require "chef/resource/erl_call"
 require "chef/resource/execute"
 require "chef/resource/file"
 require "chef/resource/freebsd_package"
@@ -45,17 +44,25 @@ require "chef/resource/gem_package"
 require "chef/resource/git"
 require "chef/resource/group"
 require "chef/resource/http_request"
+require "chef/resource/hostname"
+require "chef/resource/homebrew_cask"
 require "chef/resource/homebrew_package"
+require "chef/resource/homebrew_tap"
 require "chef/resource/ifconfig"
 require "chef/resource/ksh"
 require "chef/resource/launchd"
 require "chef/resource/link"
 require "chef/resource/log"
 require "chef/resource/macports_package"
+require "chef/resource/macos_userdefaults"
 require "chef/resource/mdadm"
 require "chef/resource/mount"
 require "chef/resource/ohai"
+require "chef/resource/ohai_hint"
 require "chef/resource/openbsd_package"
+require "chef/resource/openssl_dhparam"
+require "chef/resource/openssl_rsa_private_key"
+require "chef/resource/openssl_rsa_public_key"
 require "chef/resource/package"
 require "chef/resource/pacman_package"
 require "chef/resource/paludis_package"
@@ -68,6 +75,11 @@ require "chef/resource/reboot"
 require "chef/resource/registry_key"
 require "chef/resource/remote_directory"
 require "chef/resource/remote_file"
+require "chef/resource/rhsm_errata_level"
+require "chef/resource/rhsm_errata"
+require "chef/resource/rhsm_register"
+require "chef/resource/rhsm_repo"
+require "chef/resource/rhsm_subscription"
 require "chef/resource/rpm_package"
 require "chef/resource/solaris_package"
 require "chef/resource/route"
@@ -76,12 +88,14 @@ require "chef/resource/ruby_block"
 require "chef/resource/scm"
 require "chef/resource/script"
 require "chef/resource/service"
+require "chef/resource/sudo"
+require "chef/resource/sysctl"
+require "chef/resource/swap_file"
 require "chef/resource/systemd_unit"
 require "chef/resource/windows_service"
 require "chef/resource/subversion"
 require "chef/resource/smartos_package"
 require "chef/resource/template"
-require "chef/resource/timestamped_deploy"
 require "chef/resource/user"
 require "chef/resource/user/aix_user"
 require "chef/resource/user/dscl_user"
@@ -90,6 +104,7 @@ require "chef/resource/user/pw_user"
 require "chef/resource/user/solaris_user"
 require "chef/resource/user/windows_user"
 require "chef/resource/whyrun_safe_ruby_block"
+require "chef/resource/windows_env"
 require "chef/resource/windows_package"
 require "chef/resource/yum_package"
 require "chef/resource/yum_repository"
@@ -100,5 +115,15 @@ require "chef/resource/zypper_repository"
 require "chef/resource/cab_package"
 require "chef/resource/powershell_package"
 require "chef/resource/msu_package"
-require "chef/resource/windows_task"
+require "chef/resource/windows_ad_join"
+require "chef/resource/windows_auto_run"
+require "chef/resource/windows_feature"
+require "chef/resource/windows_feature_dism"
+require "chef/resource/windows_feature_powershell"
+require "chef/resource/windows_font"
+require "chef/resource/windows_pagefile"
 require "chef/resource/windows_path"
+require "chef/resource/windows_printer"
+require "chef/resource/windows_printer_port"
+require "chef/resource/windows_shortcut"
+require "chef/resource/windows_task"

data/lib/chef/role.rb

@@ -2,7 +2,7 @@
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Nuo Yan (<nuo@chef.io>)
 # Author:: Christopher Brown (<cb@chef.io>)
-# Copyright:: Copyright 2008-2016, Chef Software Inc.
+# Copyright:: Copyright 2008-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -33,8 +33,6 @@ class Chef
     include Chef::Mixin::FromFile
     include Chef::Mixin::ParamsValidate
 
-    attr_accessor :chef_server_rest
-
     # Create a new Chef::Role object.
     def initialize(chef_server_rest: nil)
       @name = ""

data/lib/chef/run_context.rb

@@ -153,6 +153,13 @@ class Chef
     #
     attr_reader :delayed_actions
 
+    #
+    # A child of the root Chef::Log logging object.
+    #
+    # @return Mixlib::Log::Child A child logger
+    #
+    attr_reader :logger
+
     # Creates a new Chef::RunContext object and populates its fields. This object gets
     # used by the Chef Server to generate a fully compiled recipe list for a node.
     #
@@ -162,10 +169,11 @@ class Chef
     # @param events [EventDispatch::Dispatcher] The event dispatcher for this
     #   run.
     #
-    def initialize(node, cookbook_collection, events)
+    def initialize(node, cookbook_collection, events, logger = nil)
       @node = node
       @cookbook_collection = cookbook_collection
       @events = events
+      @logger = logger || Chef::Log.with_child
 
       node.run_context = self
       node.set_cookbook_attribute
@@ -206,7 +214,7 @@ class Chef
     #
     # Adds an before notification to the +before_notification_collection+.
     #
-    # @param [Chef::Resource::Notification] The notification to add.
+    # @param [Chef::Resource::Notification] notification The notification to add.
     #
     def notifies_before(notification)
       # Note for the future, notification.notifying_resource may be an instance
@@ -218,7 +226,7 @@ class Chef
     #
     # Adds an immediate notification to the +immediate_notification_collection+.
     #
-    # @param [Chef::Resource::Notification] The notification to add.
+    # @param [Chef::Resource::Notification] notification The notification to add.
     #
     def notifies_immediately(notification)
       # Note for the future, notification.notifying_resource may be an instance
@@ -230,7 +238,7 @@ class Chef
     #
     # Adds a delayed notification to the +delayed_notification_collection+.
     #
-    # @param [Chef::Resource::Notification] The notification to add.
+    # @param [Chef::Resource::Notification] notification The notification to add.
     #
     def notifies_delayed(notification)
       # Note for the future, notification.notifying_resource may be an instance
@@ -244,7 +252,7 @@ class Chef
     #
     def add_delayed_action(notification)
       if delayed_actions.any? { |existing_notification| existing_notification.duplicates?(notification) }
-        Chef::Log.info( "#{notification.notifying_resource} not queuing delayed action #{notification.action} on #{notification.resource}"\
+        logger.info( "#{notification.notifying_resource} not queuing delayed action #{notification.action} on #{notification.resource}"\
                        " (delayed), as it's already been queued")
       else
         delayed_actions << notification
@@ -309,7 +317,7 @@ class Chef
     #      I don't see anything different beyond accepting and returning an
     #      array of recipes.
     #
-    # @param recipe_names [Array[String]] The recipe name (e.g 'my_cookbook' or
+    # @param recipe_name [Array[String]] The recipe name (e.g 'my_cookbook' or
     #   'my_cookbook::my_resource').
     # @param current_cookbook [String] The cookbook we are currently running in.
     #
@@ -318,12 +326,12 @@ class Chef
     # @see DSL::IncludeRecipe#load_recipe
     #
     def load_recipe(recipe_name, current_cookbook: nil)
-      Chef::Log.debug("Loading recipe #{recipe_name} via include_recipe")
+      logger.trace("Loading recipe #{recipe_name} via include_recipe")
 
       cookbook_name, recipe_short_name = Chef::Recipe.parse_recipe_name(recipe_name, current_cookbook: current_cookbook)
 
       if unreachable_cookbook?(cookbook_name) # CHEF-4367
-        Chef::Log.warn(<<-ERROR_MESSAGE)
+        logger.warn(<<-ERROR_MESSAGE)
 MissingCookbookDependency:
 Recipe `#{recipe_name}` is not in the run_list, and cookbook '#{cookbook_name}'
 is not a dependency of any cookbook in the run_list.  To load this recipe,
@@ -333,7 +341,7 @@ ERROR_MESSAGE
       end
 
       if loaded_fully_qualified_recipe?(cookbook_name, recipe_short_name)
-        Chef::Log.debug("I am not loading #{recipe_name}, because I have already seen it.")
+        logger.trace("I am not loading #{recipe_name}, because I have already seen it.")
         false
       else
         loaded_recipe(cookbook_name, recipe_short_name)
@@ -357,7 +365,7 @@ ERROR_MESSAGE
         raise Chef::Exceptions::RecipeNotFound, "could not find recipe file #{recipe_file}"
       end
 
-      Chef::Log.debug("Loading recipe file #{recipe_file}")
+      logger.trace("Loading recipe file #{recipe_file}")
       recipe = Chef::Recipe.new("@recipe_files", recipe_file, self)
       recipe.from_file(recipe_file)
       recipe
@@ -551,7 +559,7 @@ ERROR_MESSAGE
     # 5. raise an exception on any second call.
     # 6. ?
     def request_reboot(reboot_info)
-      Chef::Log.info "Changing reboot status from #{self.reboot_info.inspect} to #{reboot_info.inspect}"
+      logger.info "Changing reboot status from #{self.reboot_info.inspect} to #{reboot_info.inspect}"
       @reboot_info = reboot_info
     end
 
@@ -559,7 +567,7 @@ ERROR_MESSAGE
     # Cancels a pending reboot
     #
     def cancel_reboot
-      Chef::Log.info "Changing reboot status from #{reboot_info.inspect} to {}"
+      logger.info "Changing reboot status from #{reboot_info.inspect} to {}"
       @reboot_info = {}
     end
 
@@ -613,6 +621,7 @@ ERROR_MESSAGE
         loaded_recipe?
         loaded_recipes
         loaded_recipes_hash
+        logger
         node
         open_stream
         reboot_info