chef 15.0.300-universal-mingw32 → 15.1.36-universal-mingw32

data/tasks/announce.rb

@@ -1,51 +1,51 @@
-#
-# Copyright:: Copyright 2016-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 "date"
-require "erb"
-
-class ReleaseAnnouncement
-  include ERB::Util
-  attr_accessor :type, :version, :maj_minor, :date, :release_notes
-
-  def initialize(version, date, type)
-    @version = version
-    @maj_minor = version.split(".")[0..1].join(".")
-    @date = Date.parse(date) unless date.nil?
-    @release_notes = release_notes_from_file
-    @type = type
-  end
-
-  def render
-    puts "-" * 30
-    puts ERB.new(template_for(@type)).result(binding)
-    puts "-" * 30
-  end
-
-  def template_for(type)
-    File.read("tasks/templates/#{type}.md.erb")
-  end
-
-  def release_notes_from_file
-    File.read("RELEASE_NOTES.md").match(/^# Chef Infra Client Release Notes #{@maj_minor}:\n\n(.*)/m)[1]
-  end
-end
-
-desc "Generate the Release Announcement (version: X.Y.Z)"
-task :announce_release, :version do |t, args|
-  ReleaseAnnouncement.new(args[:version], nil, "release").render
-end
+#
+# Copyright:: Copyright 2016-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 "date"
+require "erb"
+
+class ReleaseAnnouncement
+  include ERB::Util
+  attr_accessor :type, :version, :maj_minor, :date, :release_notes
+
+  def initialize(version, date, type)
+    @version = version
+    @maj_minor = version.split(".")[0..1].join(".")
+    @date = Date.parse(date) unless date.nil?
+    @release_notes = release_notes_from_file
+    @type = type
+  end
+
+  def render
+    puts "-" * 30
+    puts ERB.new(template_for(@type)).result(binding)
+    puts "-" * 30
+  end
+
+  def template_for(type)
+    File.read("tasks/templates/#{type}.md.erb")
+  end
+
+  def release_notes_from_file
+    File.read("RELEASE_NOTES.md").match(/^# Chef Infra Client Release Notes #{@maj_minor}:\n\n(.*)/m)[1]
+  end
+end
+
+desc "Generate the Release Announcement (version: X.Y.Z)"
+task :announce_release, :version do |t, args|
+  ReleaseAnnouncement.new(args[:version], nil, "release").render
+end

data/tasks/bin/run_external_test

@@ -1,33 +1,39 @@
-#!/usr/bin/env ruby
-
-$:.unshift(File.expand_path("../../lib", File.dirname(__FILE__)))
-
-require "tmpdir"
-require "bundler"
-require "chef/mixin/shell_out"
-
-include Chef::Mixin::ShellOut
-
-github_repo = ARGV.shift
-git_thing = ARGV.shift
-
-build_dir = File.expand_path(ENV["TRAVIS_BUILD_DIR"] || Dir.pwd)
-
-env = {
-  "GEMFILE_MOD" => "gem 'chef', path: '#{build_dir}'; " \
-    "gem 'ohai', git: 'https://github.com/chef/ohai.git'",
-  "CHEF_LICENSE" => "accept-no-persist",
-}
-
-Dir.mktmpdir("chef-external-test") do |dir|
-  git_url = "https://github.com/#{github_repo}"
-  Dir.rmdir dir
-  shell_out!("git clone #{git_url} #{dir}", live_stream: STDOUT)
-  Dir.chdir(dir) do
-    shell_out!("git checkout #{git_thing}", live_stream: STDOUT)
-    Bundler.with_clean_env do
-      shell_out!("bundle install", live_stream: STDOUT, env: env)
-      shell_out!("bundle exec #{ARGV.join(" ")}", live_stream: STDOUT, env: env)
-    end
-  end
-end
+#!/usr/bin/env ruby
+
+# This script helps to test external gems in the content of the current
+# Chef install. We want to make sure that the external gems will still function
+# once we release Chef so we run *their* specs against the current contents
+# of the chef / ohai repos. It let's us know if we need to update downstream
+# gems or fix regressions in chef *before* we release.
+
+$:.unshift(File.expand_path("../../lib", File.dirname(__FILE__)))
+
+require "tmpdir"
+require "bundler"
+require "chef/mixin/shell_out"
+
+include Chef::Mixin::ShellOut
+
+github_repo = ARGV.shift
+git_thing = ARGV.shift
+
+build_dir = File.expand_path(ENV["TRAVIS_BUILD_DIR"] || Dir.pwd)
+
+env = {
+  "GEMFILE_MOD" => "gem 'chef', path: '#{build_dir}'; " \
+    "gem 'ohai', git: 'https://github.com/chef/ohai.git'",
+  "CHEF_LICENSE" => "accept-no-persist",
+}
+
+Dir.mktmpdir("chef-external-test") do |dir|
+  git_url = "https://github.com/#{github_repo}"
+  Dir.rmdir dir
+  shell_out!("git clone #{git_url} #{dir}", live_stream: STDOUT)
+  Dir.chdir(dir) do
+    shell_out!("git checkout #{git_thing}", live_stream: STDOUT)
+    Bundler.with_clean_env do
+      shell_out!("bundle install", live_stream: STDOUT, env: env)
+      shell_out!("bundle exec #{ARGV.join(" ")}", live_stream: STDOUT, env: env)
+    end
+  end
+end

data/tasks/dependencies.rb

@@ -1,58 +1,58 @@
-#
-# Copyright:: Copyright (c) 2016-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 "bundler"
-
-desc "Tasks to update and check dependencies"
-namespace :dependencies do
-
-  # Update all dependencies to the latest constraint-matching version
-  desc "Update all dependencies."
-  task update: %w{
-                    dependencies:update_gemfile_lock
-                    dependencies:update_omnibus_gemfile_lock
-                  }
-
-  def bundle_update_locked_multiplatform_task(task_name, dir)
-    desc "Update #{dir}/Gemfile.lock."
-    task task_name do
-      Dir.chdir(dir) do
-        Bundler.with_clean_env do
-          rm_f "#{dir}/Gemfile.lock"
-          sh "bundle lock --update --add-platform ruby"
-          sh "bundle lock --update --add-platform x64-mingw32"
-          sh "bundle lock --update --add-platform x86-mingw32"
-        end
-      end
-    end
-  end
-
-  def bundle_update_task(task_name, dir)
-    desc "Update #{dir}/Gemfile.lock."
-    task task_name do
-      Dir.chdir(dir) do
-        Bundler.with_clean_env do
-          sh "bundle update"
-        end
-      end
-    end
-  end
-
-  bundle_update_locked_multiplatform_task :update_gemfile_lock, "."
-  bundle_update_locked_multiplatform_task :update_omnibus_gemfile_lock, "omnibus"
-
-end
+#
+# Copyright:: Copyright (c) 2016-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 "bundler"
+
+desc "Tasks to update and check dependencies"
+namespace :dependencies do
+
+  # Update all dependencies to the latest constraint-matching version
+  desc "Update all dependencies."
+  task update: %w{
+                    dependencies:update_gemfile_lock
+                    dependencies:update_omnibus_gemfile_lock
+                  }
+
+  def bundle_update_locked_multiplatform_task(task_name, dir)
+    desc "Update #{dir}/Gemfile.lock."
+    task task_name do
+      Dir.chdir(dir) do
+        Bundler.with_clean_env do
+          rm_f "#{dir}/Gemfile.lock"
+          sh "bundle lock --update --add-platform ruby"
+          sh "bundle lock --update --add-platform x64-mingw32"
+          sh "bundle lock --update --add-platform x86-mingw32"
+        end
+      end
+    end
+  end
+
+  def bundle_update_task(task_name, dir)
+    desc "Update #{dir}/Gemfile.lock."
+    task task_name do
+      Dir.chdir(dir) do
+        Bundler.with_clean_env do
+          sh "bundle update"
+        end
+      end
+    end
+  end
+
+  bundle_update_locked_multiplatform_task :update_gemfile_lock, "."
+  bundle_update_locked_multiplatform_task :update_omnibus_gemfile_lock, "omnibus"
+
+end

data/tasks/docs.rb

@@ -0,0 +1,337 @@
+namespace :docs_site do
+
+  desc "Generate resource documentation .rst pages in a docs_site directory"
+
+  task :resources do
+    Encoding.default_external = Encoding::UTF_8
+
+    $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "lib")))
+
+    require "chef/resource_inspector"
+    require "erb"
+    require "fileutils"
+
+    # @return [String, nil] a pretty defaul value string or nil if we want to skip it
+    def pretty_default(default)
+      return nil if default.nil? || default == "" || default == "lazy default"
+      if default.is_a?(String)
+        return default.inspect unless default[0] == ":"
+      end
+      default
+    end
+
+    # generate the top example resource block example text
+    # @param properties Array<Hash>
+    # @return String
+    def generate_resource_block(resource_name, properties)
+      padding_size = largest_property_name(properties) + 6
+
+      # build the resource string with property spacing between property names and comments
+      text = "  #{resource_name} 'name' do\n"
+      properties.each do |p|
+        text << "    #{p['name'].ljust(padding_size)}"
+        text << friendly_types_list(p["is"])
+        text << " # default value: 'name' unless specified" if p["name_property"]
+        text << " # default value: #{pretty_default(p['default'])}" unless pretty_default(p["default"]).nil?
+        text << "\n"
+      end
+      text << "    #{'action'.ljust(padding_size)}Symbol # defaults to :#{@default_action.first} if not specified\n"
+      text << "  end"
+      text
+    end
+
+    # we need to know how much space to leave so columns line up
+    # @return String
+    def largest_property_name(properties)
+      if properties.empty?
+        6 # we'll include "action" even without properties and it's 6 chars long
+      else
+        properties.max_by { |x| x["name"].size }["name"].size
+      end
+    end
+
+    # given an array of properties print out a single comma separated string
+    # handling commas / and properly and plural vs. singular wording depending
+    # on the number of properties
+    # @return String
+    def friendly_properly_list(arr)
+      return nil if arr.empty? # resources w/o properties
+
+      props = arr.map { |x| "``#{x['name']}``" }
+
+      # build the text string containing all properties bolded w/ punctuation
+      if props.size > 1
+        props[-1] = "and #{props[-1]}"
+      end
+      text = props.size == 2 ? props.join(" ") : props.join(", ")
+      text << ( props.size > 1 ? " are the properties" : " is the property" )
+      text << " available to this resource."
+      text
+    end
+
+    # given an array of types print out a single comma separated string
+    # handling a nil value that needs to be printed as "nil" and TrueClass/FalseClass
+    # which needs to be "true" and "false"
+    # @return String
+    def friendly_types_list(arr)
+      fixed_arr = Array(arr).map do |x|
+        case x
+        when "TrueClass"
+          "true"
+        when "FalseClass"
+          "false"
+        else
+          x
+        end
+      end
+      fixed_arr.compact.join(", ")
+    end
+
+    # Makes sure the resource name is bolded within the description
+    # @return String
+    def bolded_description(name, description)
+      return nil if description.nil? # handle resources missing descriptions
+      description.gsub( "#{name} ", "**#{name}** ").split("Note: ").first.strip
+    end
+
+    def note_text(description)
+      return nil if description.nil?
+      note = description.split("Note: ")[1]
+      if note
+        <<-HEREDOC
+
+      .. note::
+
+      #{note}
+        HEREDOC
+      end
+    end
+
+    def boilerplate_content
+      <<~HEREDOC
+        Common Resource Functionality
+        =====================================================
+
+        Chef resources include common properties, notifications, and resource guards.
+
+        Common Properties
+        -----------------------------------------------------
+
+        .. tag resources_common_properties
+
+        The following properties are common to every resource:
+
+        ``ignore_failure``
+          **Ruby Type:** true, false | **Default Value:** ``false``
+
+          Continue running a recipe if a resource fails for any reason.
+
+        ``retries``
+          **Ruby Type:** Integer | **Default Value:** ``0``
+
+          The number of attempts to catch exceptions and retry the resource.
+
+        ``retry_delay``
+          **Ruby Type:** Integer | **Default Value:** ``2``
+
+          The retry delay (in seconds).
+
+        ``sensitive``
+          **Ruby Type:** true, false | **Default Value:** ``false``
+
+          Ensure that sensitive resource data is not logged by the Chef Infra Client.
+
+        .. end_tag
+
+        Notifications
+        -----------------------------------------------------
+        ``notifies``
+          **Ruby Type:** Symbol, 'Chef::Resource[String]'
+
+          .. tag resources_common_notification_notifies
+
+          A resource may notify another resource to take action when its state changes. Specify a ``'resource[name]'``, the ``:action`` that resource should take, and then the ``:timer`` for that action. A resource may notify more than one resource; use a ``notifies`` statement for each resource to be notified.
+
+          .. end_tag
+
+        .. tag resources_common_notification_timers
+
+        A timer specifies the point during the Chef Infra Client run at which a notification is run. The following timers are available:
+
+        ``:before``
+           Specifies that the action on a notified resource should be run before processing the resource block in which the notification is located.
+
+        ``:delayed``
+           Default. Specifies that a notification should be queued up, and then executed at the end of the Chef Infra Client run.
+
+        ``:immediate``, ``:immediately``
+           Specifies that a notification should be run immediately, per resource notified.
+
+        .. end_tag
+
+        .. tag resources_common_notification_notifies_syntax
+
+        The syntax for ``notifies`` is:
+
+        .. code-block:: ruby
+
+          notifies :action, 'resource[name]', :timer
+
+        .. end_tag
+
+        ``subscribes``
+          **Ruby Type:** Symbol, 'Chef::Resource[String]'
+
+        .. tag resources_common_notification_subscribes
+
+        A resource may listen to another resource, and then take action if the state of the resource being listened to changes. Specify a ``'resource[name]'``, the ``:action`` to be taken, and then the ``:timer`` for that action.
+
+        Note that ``subscribes`` does not apply the specified action to the resource that it listens to - for example:
+
+        .. code-block:: ruby
+
+         file '/etc/nginx/ssl/example.crt' do
+           mode '0600'
+           owner 'root'
+         end
+
+         service 'nginx' do
+           subscribes :reload, 'file[/etc/nginx/ssl/example.crt]', :immediately
+         end
+
+        In this case the ``subscribes`` property reloads the ``nginx`` service whenever its certificate file, located under ``/etc/nginx/ssl/example.crt``, is updated. ``subscribes`` does not make any changes to the certificate file itself, it merely listens for a change to the file, and executes the ``:reload`` action for its resource (in this example ``nginx``) when a change is detected.
+
+        .. end_tag
+
+        .. tag resources_common_notification_timers
+
+        A timer specifies the point during the Chef Infra Client run at which a notification is run. The following timers are available:
+
+        ``:before``
+           Specifies that the action on a notified resource should be run before processing the resource block in which the notification is located.
+
+        ``:delayed``
+           Default. Specifies that a notification should be queued up, and then executed at the end of the Chef Infra Client run.
+
+        ``:immediate``, ``:immediately``
+           Specifies that a notification should be run immediately, per resource notified.
+
+        .. end_tag
+
+        .. tag resources_common_notification_subscribes_syntax
+
+        The syntax for ``subscribes`` is:
+
+        .. code-block:: ruby
+
+           subscribes :action, 'resource[name]', :timer
+
+        .. end_tag
+
+        Guards
+        -----------------------------------------------------
+
+        .. tag resources_common_guards
+
+        A guard property can be used to evaluate the state of a node during the execution phase of the Chef Infra Client run. Based on the results of this evaluation, a guard property is then used to tell the Chef Infra Client if it should continue executing a resource. A guard property accepts either a string value or a Ruby block value:
+
+        * A string is executed as a shell command. If the command returns ``0``, the guard is applied. If the command returns any other value, then the guard property is not applied. String guards in a **powershell_script** run Windows PowerShell commands and may return ``true`` in addition to ``0``.
+        * A block is executed as Ruby code that must return either ``true`` or ``false``. If the block returns ``true``, the guard property is applied. If the block returns ``false``, the guard property is not applied.
+
+        A guard property is useful for ensuring that a resource is idempotent by allowing that resource to test for the desired state as it is being executed, and then if the desired state is present, for the Chef Infra Client to do nothing.
+
+        .. end_tag
+        .. tag resources_common_guards_properties
+
+        The following properties can be used to define a guard that is evaluated during the execution phase of the Chef Infra Client run:
+
+        ``not_if``
+          Prevent a resource from executing when the condition returns ``true``.
+
+        ``only_if``
+          Allow a resource to execute only if the condition returns ``true``.
+
+        .. end_tag
+      HEREDOC
+    end
+
+    template = %{=====================================================
+    <%= @name %> resource
+    =====================================================
+    `[edit on GitHub] <https://github.com/chef/chef-web-docs/blob/master/chef_master/source/resource_<%= @name %>.rst>`__
+
+    <%= bolded_description(@name, @description) %>
+    <%= note_text(@description) %>
+    <% unless @introduced.nil? %>
+    **New in Chef Infra Client <%= @introduced %>.**
+    <% end %>
+    Syntax
+    =====================================================
+    The <%= @name %> resource has the following syntax:
+
+    .. code-block:: ruby
+
+    <%= @resource_block %>
+
+    where:
+
+    * ``<%= @name %>`` is the resource.
+    * ``name`` is the name given to the resource block.
+    * ``action`` identifies which steps the Chef Infra Client will take to bring the node into the desired state.
+    <% unless @property_list.nil? %>* <%= @property_list %><% end %>
+
+    Actions
+    =====================================================
+
+    The <%= @name %> resource has the following actions:
+    <% @actions.each do |a| %>
+    ``:<%= a %>``
+       <% if a == @default_action %>Default. <% end %>Description here.
+    <% end %>
+    ``:nothing``
+       .. tag resources_common_actions_nothing
+
+       This resource block does not act unless notified by another resource to take action. Once notified, this resource block either runs immediately or is queued up to run at the end of the Chef Infra Client run.
+
+       .. end_tag
+
+    Properties
+    =====================================================
+
+    The <%= @name %> resource has the following properties:
+    <% @properties.each do |p| %>
+    ``<%= p['name'] %>``
+       **Ruby Type:** <%= friendly_types_list(p['is']) %><% unless pretty_default(p['default']).nil? %> | **Default Value:** ``<%= pretty_default(p['default']) %>``<% end %><% if p['required'] %> | ``REQUIRED``<% end %><% if p['deprecated'] %> | ``DEPRECATED``<% end %><% if p['name_property'] %> | **Default Value:** ``The resource block's name``<% end %>
+
+       <%= p['description'] %>
+    <% unless p['introduced'].nil? %>\n   *New in Chef Infra Client <%= p['introduced'] %>.*<% end %>
+    <% end %>
+    <% if @properties.empty? %>This resource does not have any properties.\n<% end %>
+    <%= boilerplate_content %>
+    Examples
+    ==========================================
+    }
+
+    FileUtils.mkdir_p "docs_site"
+    resources = Chef::JSONCompat.parse(ResourceInspector.inspect)
+    resources.each do |resource, data|
+      next if ["scm", "whyrun_safe_ruby_block", "l_w_r_p_base", "user_resource_abstract_base_class", "linux_user", "pw_user", "aix_user", "dscl_user", "solaris_user", "windows_user", ""].include?(resource)
+      puts "Writing out #{resource}."
+      @name = resource
+      @description = data["description"]
+      @default_action = data["default_action"]
+      @actions = (data["actions"] - ["nothing"]).sort
+      @examples = data["examples"]
+      @introduced = data["introduced"]
+      @preview = data["preview"]
+      @properties = data["properties"].reject { |v| v["name"] == "name" }.sort_by! { |v| v["name"] }
+      @resource_block = generate_resource_block(resource, @properties)
+      @property_list = friendly_properly_list(@properties)
+
+      t = ERB.new(template)
+      File.open("docs_site/resource_#{@name}.rst", "w") do |f|
+        f.write t.result(binding)
+      end
+    end
+  end
+end