chef 12.13.37 → 12.14.60

data/lib/chef/resource/launchd.rb

@@ -68,7 +68,7 @@ class Chef
       property :hard_resource_limits, Hash
       property :inetd_compatibility, Hash
       property :init_groups, [ TrueClass, FalseClass ]
-      property :keep_alive, [ TrueClass, FalseClass ]
+      property :keep_alive, [ TrueClass, FalseClass, Hash ]
       property :launch_only_once, [ TrueClass, FalseClass ]
       property :ld_group, String
       property :limit_load_from_hosts, Array

data/lib/chef/resource/user.rb

@@ -21,6 +21,7 @@ require "chef/resource"
 class Chef
   class Resource
     class User < Chef::Resource
+      resource_name :user_resource_abstract_base_class # this prevents magickal class name DSL wiring
       identity_attr :username
 
       state_attrs :uid, :gid, :home
@@ -42,8 +43,8 @@ class Chef
         @force = false
         @non_unique = false
         @supports = {
-          :manage_home => false,
-          :non_unique => false,
+          manage_home: false,
+          non_unique: false,
         }
         @iterations = 27855
         @salt = nil
@@ -154,7 +155,6 @@ class Chef
           :kind_of => [ TrueClass, FalseClass ]
         )
       end
-
     end
   end
 end

data/lib/chef/resource/user/aix_user.rb

@@ -0,0 +1,31 @@
+#
+# Copyright:: Copyright 2016, 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/resource/user"
+
+class Chef
+  class Resource
+    class User
+      class AixUser < Chef::Resource::User
+        resource_name :aix_user
+
+        provides :aix_user
+        provides :user, os: "aix"
+      end
+    end
+  end
+end

data/lib/chef/resource/user/dscl_user.rb

@@ -0,0 +1,31 @@
+#
+# Copyright:: Copyright 2016, 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/resource/user"
+
+class Chef
+  class Resource
+    class User
+      class DsclUser < Chef::Resource::User
+        resource_name :dscl_user
+
+        provides :dscl_user
+        provides :user, os: "darwin"
+      end
+    end
+  end
+end

data/lib/chef/resource/user/linux_user.rb

@@ -0,0 +1,51 @@
+#
+# Copyright:: Copyright 2016, 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/resource/user"
+
+class Chef
+  class Resource
+    class User
+      class LinuxUser < Chef::Resource::User
+        resource_name :linux_user
+
+        provides :linux_user
+        provides :user, os: "linux"
+
+        def initialize(name, run_context = nil)
+          super
+          @supports = {
+            manage_home: true,
+            non_unique: true,
+          }
+          @manage_home = false
+        end
+
+        def supports(args = {})
+          Chef.log_deprecation "setting supports on the linux_user resource is deprecated"
+          # setting is deliberately disabled
+          super({})
+        end
+
+        def supports=(args)
+          # setting is deliberately disabled
+          supports({})
+        end
+      end
+    end
+  end
+end

data/lib/chef/resource/user/pw_user.rb

@@ -0,0 +1,31 @@
+#
+# Copyright:: Copyright 2016, 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/resource/user"
+
+class Chef
+  class Resource
+    class User
+      class PwUser < Chef::Resource::User
+        resource_name :pw_user
+
+        provides :pw_user
+        provides :user, os: "freebsd"
+      end
+    end
+  end
+end

data/lib/chef/resource/user/solaris_user.rb

@@ -0,0 +1,31 @@
+#
+# Copyright:: Copyright 2016, 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/resource/user"
+
+class Chef
+  class Resource
+    class User
+      class SolarisUser < Chef::Resource::User
+        resource_name :solaris_user
+
+        provides :solaris_user
+        provides :user, os: %w{omnios solaris2}
+      end
+    end
+  end
+end

data/lib/chef/resource/user/windows_user.rb

@@ -0,0 +1,31 @@
+#
+# Copyright:: Copyright 2016, 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/resource/user"
+
+class Chef
+  class Resource
+    class User
+      class WindowsUser < Chef::Resource::User
+        resource_name :windows_user
+
+        provides :windows_user
+        provides :user, os: "windows"
+      end
+    end
+  end
+end

data/lib/chef/resource/yum_package.rb

@@ -27,18 +27,19 @@ class Chef
 
       # Install a specific arch
       property :arch, [ String, Array ]
-      property :flush_cache, Hash, default: { before: false, after: false }, coerce: proc { |v|
-        # TODO these append rather than set. This is probably wrong behavior, but we're preserving it until we know
-        if v.is_a?(Array)
-          v.each { |arg| flush_cache[arg] = true }
-          flush_cache
-        elsif v.any?
-          v
-        else
-          # TODO calling flush_cache({}) does a get instead of a set. This is probably wrong behavior, but we're preserving it until we know
-          flush_cache
-        end
-      }
+      # the {} on the proc here is because rspec chokes if it's do...end
+      property :flush_cache,
+               Hash,
+               default: { before: false, after: false },
+               coerce: proc { |v|
+                 if v.is_a?(Array)
+                   v.each_with_object({}) { |arg, obj| obj[arg] = true }
+                 elsif v.any?
+                   v
+                 else
+                   { before: v, after: v }
+                 end
+               }
       property :allow_downgrade, [ true, false ], default: false
       property :yum_binary, String
 

data/lib/chef/resource/yum_repository.rb

@@ -0,0 +1,76 @@
+#
+# Author:: Thom May (<thom@chef.io>)
+# Copyright:: Copyright (c) 2016 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/resource"
+
+class Chef
+  class Resource
+    class YumRepository < Chef::Resource
+      resource_name :yum_repository
+      provides :yum_repository
+
+      # http://linux.die.net/man/5/yum.conf
+      property :baseurl, String, regex: /.*/
+      property :cost, String, regex: /^\d+$/
+      property :clean_headers, [TrueClass, FalseClass], default: false # deprecated
+      property :clean_metadata, [TrueClass, FalseClass], default: true
+      property :description, String, regex: /.*/, default: "Ye Ole Rpm Repo"
+      property :enabled, [TrueClass, FalseClass], default: true
+      property :enablegroups, [TrueClass, FalseClass]
+      property :exclude, String, regex: /.*/
+      property :failovermethod, String, equal_to: %w{priority roundrobin}
+      property :fastestmirror_enabled, [TrueClass, FalseClass]
+      property :gpgcheck, [TrueClass, FalseClass]
+      property :gpgkey, [String, Array], regex: /.*/
+      property :http_caching, String, equal_to: %w{packages all none}
+      property :include_config, String, regex: /.*/
+      property :includepkgs, String, regex: /.*/
+      property :keepalive, [TrueClass, FalseClass]
+      property :make_cache, [TrueClass, FalseClass], default: true
+      property :max_retries, [String, Integer]
+      property :metadata_expire, String, regex: [/^\d+$/, /^\d+[mhd]$/, /never/]
+      property :mirrorexpire, String, regex: /.*/
+      property :mirrorlist, String, regex: /.*/
+      property :mirror_expire, String, regex: [/^\d+$/, /^\d+[mhd]$/]
+      property :mirrorlist_expire, String, regex: [/^\d+$/, /^\d+[mhd]$/]
+      property :mode, default: "0644"
+      property :priority, String, regex: /^(\d?[0-9]|[0-9][0-9])$/
+      property :proxy, String, regex: /.*/
+      property :proxy_username, String, regex: /.*/
+      property :proxy_password, String, regex: /.*/
+      property :username, String, regex: /.*/
+      property :password, String, regex: /.*/
+      property :repo_gpgcheck, [TrueClass, FalseClass]
+      property :report_instanceid, [TrueClass, FalseClass]
+      property :repositoryid, String, regex: /.*/, name_attribute: true
+      property :sensitive, [TrueClass, FalseClass], default: false
+      property :skip_if_unavailable, [TrueClass, FalseClass]
+      property :source, String, regex: /.*/
+      property :sslcacert, String, regex: /.*/
+      property :sslclientcert, String, regex: /.*/
+      property :sslclientkey, String, regex: /.*/
+      property :sslverify, [TrueClass, FalseClass]
+      property :timeout, String, regex: /^\d+$/
+
+      property :options, Hash
+
+      default_action :create
+      allowed_actions :create, :remove, :make_cache, :add
+    end
+  end
+end

data/lib/chef/resource_builder.rb

@@ -31,7 +31,7 @@ class Chef
     attr_reader :resource
 
     # FIXME (ruby-2.1 syntax): most of these are mandatory
-    def initialize(type:nil, name:nil, created_at: nil, params: nil, run_context: nil, cookbook_name: nil, recipe_name: nil, enclosing_provider: nil)
+    def initialize(type: nil, name: nil, created_at: nil, params: nil, run_context: nil, cookbook_name: nil, recipe_name: nil, enclosing_provider: nil)
       @type               = type
       @name               = name
       @created_at         = created_at

data/lib/chef/resource_collection/stepable_iterator.rb

@@ -100,9 +100,7 @@ class Chef
       end
 
       def iterate
-        while @position < size && !paused?
-          step
-        end
+        step while @position < size && !paused?
         collection
       end
 

data/lib/chef/resource_reporter.rb

@@ -26,11 +26,11 @@ require "chef/event_dispatch/base"
 class Chef
   class ResourceReporter < EventDispatch::Base
 
-    class ResourceReport < Struct.new(:new_resource,
-                                      :current_resource,
-                                      :action,
-                                      :exception,
-                                      :elapsed_time)
+    ResourceReport = Struct.new(:new_resource,
+                                :current_resource,
+                                :action,
+                                :exception,
+                                :elapsed_time) do
 
       def self.new_with_current_state(new_resource, action, current_resource)
         report = new

data/lib/chef/resources.rb

@@ -82,9 +82,16 @@ 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"
+require "chef/resource/user/linux_user"
+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_package"
 require "chef/resource/yum_package"
+require "chef/resource/yum_repository"
 require "chef/resource/lwrp_base"
 require "chef/resource/bff_package"
 require "chef/resource/zypper_package"

data/lib/chef/run_context.rb

@@ -658,9 +658,11 @@ ERROR_MESSAGE
       }.map { |x| x.to_sym }
 
       # Verify that we didn't miss any methods
-      missing_methods = superclass.instance_methods(false) - instance_methods(false) - CHILD_STATE
-      if !missing_methods.empty?
-        raise "ERROR: not all methods of RunContext accounted for in ChildRunContext! All methods must be marked as child methods with CHILD_STATE or delegated to the parent_run_context. Missing #{missing_methods.join(", ")}."
+      unless @__skip_method_checking # hook specifically for compat_resource
+        missing_methods = superclass.instance_methods(false) - instance_methods(false) - CHILD_STATE
+        if !missing_methods.empty?
+          raise "ERROR: not all methods of RunContext accounted for in ChildRunContext! All methods must be marked as child methods with CHILD_STATE or delegated to the parent_run_context. Missing #{missing_methods.join(", ")}."
+        end
       end
     end
   end

data/lib/chef/run_context/cookbook_compiler.rb

@@ -137,13 +137,14 @@ class Chef
         @events.recipe_load_start(run_list_expansion.recipes.size)
         run_list_expansion.recipes.each do |recipe|
           begin
+            path = resolve_recipe(recipe)
             @run_context.load_recipe(recipe)
+            @events.recipe_file_loaded(path, recipe)
           rescue Chef::Exceptions::RecipeNotFound => e
             @events.recipe_not_found(e)
             raise
           rescue Exception => e
-            path = resolve_recipe(recipe)
-            @events.recipe_file_load_failed(path, e)
+            @events.recipe_file_load_failed(path, e, recipe)
             raise
           end
         end