chef 14.5.33-universal-mingw32 → 14.6.47-universal-mingw32

data/lib/chef/resource/zypper_package.rb

@@ -34,6 +34,11 @@ class Chef
       property :allow_downgrade, [ TrueClass, FalseClass ],
                description: "Allow downgrading a package to satisfy requested version requirements.",
                default: false, introduced: "13.6"
+
+      property :global_options, [ String, Array ],
+               description: "One (or more) additional options that are passed to the package resource other than options to the command.",
+               coerce: proc { |x| x.is_a?(String) ? x.shellsplit : x },
+               introduced: "14.6"
     end
   end
 end

data/lib/chef/resource_collection/resource_collection_serialization.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Tyler Ball (<tball@chef.io>)
-# Copyright:: Copyright 2014-2016, Chef Software, Inc.
+# Copyright:: Copyright 2014-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,7 +22,7 @@ class Chef
   class ResourceCollection
     module ResourceCollectionSerialization
       # Serialize this object as a hash
-      def to_hash
+      def to_h
         instance_vars = Hash.new
         instance_variables.each do |iv|
           instance_vars[iv] = instance_variable_get(iv)
@@ -33,6 +33,8 @@ class Chef
         }
       end
 
+      alias_method :to_hash, :to_h
+
       def to_json(*a)
         Chef::JSONCompat.to_json(to_hash, *a)
       end

data/lib/chef/resources.rb

@@ -141,3 +141,4 @@ require "chef/resource/windows_printer_port"
 require "chef/resource/windows_shortcut"
 require "chef/resource/windows_task"
 require "chef/resource/windows_workgroup"
+require "chef/resource/timezone"

data/lib/chef/role.rb

@@ -130,7 +130,7 @@ class Chef
       )
     end
 
-    def to_hash
+    def to_h
       env_run_lists_without_default = @env_run_lists.dup
       env_run_lists_without_default.delete("_default")
       result = {
@@ -152,9 +152,11 @@ class Chef
       result
     end
 
+    alias_method :to_hash, :to_h
+
     # Serialize this object as a hash
     def to_json(*a)
-      Chef::JSONCompat.to_json(to_hash, *a)
+      Chef::JSONCompat.to_json(to_h, *a)
     end
 
     def update_from!(o)

data/lib/chef/run_list/run_list_expansion.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Daniel DeLeo (<dan@chef.io>)
 # Author:: Tim Hinderliter (<tim@chef.io>)
-# Copyright:: Copyright 2010-2016, Chef Software Inc.
+# Copyright:: Copyright 2010-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -144,14 +144,16 @@ class Chef
       end
 
       def to_json(*a)
-        Chef::JSONCompat.to_json(to_hash, *a)
+        Chef::JSONCompat.to_json(to_h, *a)
       end
 
-      def to_hash
+      def to_h
         seen_items = { recipe: {}, role: {} }
         { id: @environment, run_list: convert_run_list_trace("top level", seen_items) }
       end
 
+      alias_method :to_hash, :to_h
+
       private
 
       # these methods modifies internal state based on arguments, so hide it.

data/lib/chef/run_status.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Daniel DeLeo (<dan@chef.io>)
-# Copyright:: Copyright 2010-2016, Chef Software Inc.
+# Copyright:: Copyright 2010-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -102,7 +102,7 @@ class Chef::RunStatus
   # * :updated_resources
   # * :exception
   # * :backtrace
-  def to_hash
+  def to_h
     # use a flat hash here so we can't errors from intermediate values being nil
     { node: node,
       success: success?,
@@ -116,6 +116,8 @@ class Chef::RunStatus
       run_id: run_id }
   end
 
+  alias_method :to_hash, :to_h
+
   # Returns a string of the format "ExceptionClass: message" or +nil+ if no
   # +exception+ is set.
   def formatted_exception

data/lib/chef/user.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Steven Danna (steve@chef.io)
-# 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");
@@ -77,7 +77,7 @@ class Chef
                     arg, kind_of: String)
     end
 
-    def to_hash
+    def to_h
       result = {
         "name" => @name,
         "public_key" => @public_key,
@@ -88,8 +88,10 @@ class Chef
       result
     end
 
+    alias_method :to_hash, :to_h
+
     def to_json(*a)
-      Chef::JSONCompat.to_json(to_hash, *a)
+      Chef::JSONCompat.to_json(to_h, *a)
     end
 
     def destroy
@@ -100,7 +102,7 @@ class Chef
       payload = { name: name, admin: admin, password: password }
       payload[:public_key] = public_key if public_key
       new_user = chef_rest_v0.post("users", payload)
-      Chef::User.from_hash(to_hash.merge(new_user))
+      Chef::User.from_hash(to_h.merge(new_user))
     end
 
     def update(new_key = false)
@@ -108,7 +110,7 @@ class Chef
       payload[:private_key] = new_key if new_key
       payload[:password] = password if password
       updated_user = chef_rest_v0.put("users/#{name}", payload)
-      Chef::User.from_hash(to_hash.merge(updated_user))
+      Chef::User.from_hash(to_h.merge(updated_user))
     end
 
     def save(new_key = false)

data/lib/chef/user_v1.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Steven Danna (steve@chef.io)
-# 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");
@@ -112,7 +112,7 @@ class Chef
                     arg, kind_of: String)
     end
 
-    def to_hash
+    def to_h
       result = {
         "username" => @username,
       }
@@ -128,8 +128,10 @@ class Chef
       result
     end
 
+    alias_method :to_hash, :to_h
+
     def to_json(*a)
-      Chef::JSONCompat.to_json(to_hash, *a)
+      Chef::JSONCompat.to_json(to_h, *a)
     end
 
     def destroy
@@ -180,7 +182,7 @@ class Chef
         new_user = chef_root_rest_v0.post("users", payload)
       end
 
-      Chef::UserV1.from_hash(to_hash.merge(new_user))
+      Chef::UserV1.from_hash(to_h.merge(new_user))
     end
 
     def update(new_key = false)
@@ -213,7 +215,7 @@ class Chef
         end
         updated_user = chef_root_rest_v0.put("users/#{username}", payload)
       end
-      Chef::UserV1.from_hash(to_hash.merge(updated_user))
+      Chef::UserV1.from_hash(to_h.merge(updated_user))
     end
 
     def save(new_key = false)
@@ -229,7 +231,7 @@ class Chef
     # Note: remove after API v0 no longer supported by client (and knife command).
     def reregister
       begin
-        payload = to_hash.merge({ "private_key" => true })
+        payload = to_h.merge({ "private_key" => true })
         reregistered_self = chef_root_rest_v0.put("users/#{username}", payload)
         private_key(reregistered_self["private_key"])
       # only V0 supported for reregister

data/lib/chef/version.rb

@@ -23,7 +23,7 @@ require "chef/version_string"
 
 class Chef
   CHEF_ROOT = File.expand_path("../..", __FILE__)
-  VERSION = Chef::VersionString.new("14.5.33")
+  VERSION = Chef::VersionString.new("14.6.47")
 end
 
 #

data/lib/chef/win32/security/sid.rb

@@ -246,6 +246,45 @@ class Chef
           SID.from_account("#{::ENV['USERDOMAIN']}\\#{::ENV['USERNAME']}")
         end
 
+        SERVICE_ACCOUNT_USERS = [self.LocalSystem,
+                                 self.NtLocal,
+                                 self.NtNetwork].flat_map do |user_type|
+          [user_type.account_simple_name.upcase,
+           user_type.account_name.upcase]
+        end.freeze
+
+        BUILT_IN_GROUPS = [self.BuiltinAdministrators,
+                           self.BuiltinUsers, self.Guests].flat_map do |user_type|
+          [user_type.account_simple_name.upcase,
+           user_type.account_name.upcase]
+        end.freeze
+
+        SYSTEM_USER = SERVICE_ACCOUNT_USERS + BUILT_IN_GROUPS
+
+        # Сheck if the user belongs to service accounts category
+        #
+        # @return [Boolean] True or False
+        #
+        def self.service_account_user?(user)
+          SERVICE_ACCOUNT_USERS.include?(user.to_s.upcase)
+        end
+
+        # Сheck if the user is in builtin system group
+        #
+        # @return [Boolean] True or False
+        #
+        def self.group_user?(user)
+          BUILT_IN_GROUPS.include?(user.to_s.upcase)
+        end
+
+        # Сheck if the user belongs to system users category
+        #
+        # @return [Boolean] True or False
+        #
+        def self.system_user?(user)
+          SYSTEM_USER.include?(user.to_s.upcase)
+        end
+
         # See https://technet.microsoft.com/en-us/library/cc961992.aspx
         # In practice, this is SID.Administrators if the current_user is an admin (even if not
         # running elevated), and is current_user otherwise.

data/spec/functional/http/simple_spec.rb

@@ -32,8 +32,8 @@ describe Chef::HTTP::Simple do
 
   before(:each) do
     Chef::Config[:rest_timeout] = 2
-    Chef::Config[:http_retry_delay] = 0
-    Chef::Config[:http_retry_count] = 0
+    Chef::Config[:http_retry_delay] = 1
+    Chef::Config[:http_retry_count] = 2
   end
 
   after(:all) do

data/spec/functional/resource/remote_file_spec.rb

@@ -29,8 +29,8 @@ describe Chef::Resource::RemoteFile do
     @old_file_cache = Chef::Config[:file_cache_path]
     Chef::Config[:file_cache_path] = file_cache_path
     Chef::Config[:rest_timeout] = 2
-    Chef::Config[:http_retry_delay] = 0
-    Chef::Config[:http_retry_count] = 0
+    Chef::Config[:http_retry_delay] = 1
+    Chef::Config[:http_retry_count] = 2
   end
 
   after(:each) do

data/spec/functional/resource/user/windows_spec.rb

@@ -36,7 +36,7 @@ describe Chef::Provider::User::Windows, :windows_only do
   let(:logger) { double("Mixlib::Log::Child").as_null_object }
   let(:run_context) { Chef::RunContext.new(node, {}, events) }
   let(:new_resource) do
-    Chef::Resource::User.new(username, run_context).tap do |r|
+    Chef::Resource::User::WindowsUser.new(username, run_context).tap do |r|
       r.provider(Chef::Provider::User::Windows)
       r.password(password)
     end

data/spec/functional/resource/windows_task_spec.rb

@@ -1571,7 +1571,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
       it "raises error" do
         subject.user "Administrator"
         subject.frequency :onstart
-        expect { subject.after_created }.to raise_error(%q{Cannot specify a user other than the system users without specifying a password!. Valid passwordless users: 'NT AUTHORITY\SYSTEM', 'SYSTEM', 'NT AUTHORITY\LOCALSERVICE', 'NT AUTHORITY\NETWORKSERVICE', 'BUILTIN\USERS', 'USERS'})
+        expect { subject.after_created }.to raise_error(%q{Cannot specify a user other than the system users without specifying a password!. Valid passwordless users: 'SYSTEM', 'NT AUTHORITY\SYSTEM', 'LOCAL SERVICE', 'NT AUTHORITY\LOCAL SERVICE', 'NETWORK SERVICE', 'NT AUTHORITY\NETWORK SERVICE', 'ADMINISTRATORS', 'BUILTIN\ADMINISTRATORS', 'USERS', 'BUILTIN\USERS', 'GUESTS', 'BUILTIN\GUESTS'})
       end
     end
 

data/spec/functional/resource/zypper_package_spec.rb

@@ -0,0 +1,233 @@
+#
+# Author:: Dheeraj Dubey (<dheeraj.dubey@msystechnologies.com>)
+# 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 "spec_helper"
+require "functional/resource/base"
+require "chef/mixin/shell_out"
+
+describe Chef::Resource::ZypperPackage, :requires_root, :suse_only do
+  include Chef::Mixin::ShellOut
+
+  # NOTE: every single test here needs to explicitly call preinstall.
+
+  def preinstall(*rpms)
+    rpms.each do |rpm|
+      shell_out!("rpm -ivh #{CHEF_SPEC_ASSETS}/zypprepo/#{rpm}")
+    end
+  end
+
+  before(:each) do
+    File.open("/etc/zypp/repos.d/chef-zypp-localtesting.repo", "w+") do |f|
+      f.write <<~EOF
+        [chef-zypp-localtesting]
+        name=Chef zypper spec testing repo
+        baseurl=file://#{CHEF_SPEC_ASSETS}/zypprepo
+        enable=1
+        gpgcheck=0
+      EOF
+    end
+    shell_out!("rpm -qa --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm | xargs -r rpm -e")
+    # next line is useful cleanup if you happen to have been testing zypper func tests on the same box and
+    # have some zypper garbage left around
+    # FileUtils.rm_f "/etc/zypp/repos.d/chef-zypp-localtesting.repo"
+  end
+
+  after(:all) do
+    shell_out!("rpm -qa --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm | xargs -r rpm -e")
+    FileUtils.rm_f "/etc/zypp/repos.d/chef-zypp-localtesting.repo"
+  end
+
+  let(:package_name) { "chef_rpm" }
+  let(:zypper_package) do
+    r = Chef::Resource::ZypperPackage.new(package_name, run_context)
+    r.global_options("--no-gpg-checks")
+    r
+  end
+
+  def pkg_arch
+    ohai[:kernel][:machine]
+  end
+
+  context "installing a package" do
+    after { remove_package }
+    it "installs the latest version" do
+      zypper_package.run_action(:install)
+      expect(zypper_package.updated_by_last_action?).to be true
+      expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$")
+    end
+
+    it "does not install if the package is installed" do
+      preinstall("chef_rpm-1.10-1.#{pkg_arch}.rpm")
+      zypper_package.run_action(:install)
+      expect(zypper_package.updated_by_last_action?).to be false
+      expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$")
+    end
+
+    it "does not install twice" do
+      zypper_package.run_action(:install)
+      expect(zypper_package.updated_by_last_action?).to be true
+      expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$")
+      zypper_package.run_action(:install)
+      expect(zypper_package.updated_by_last_action?).to be false
+      expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$")
+    end
+
+    it "does not install if the prior version package is installed" do
+      preinstall("chef_rpm-1.2-1.#{pkg_arch}.rpm")
+      zypper_package.run_action(:install)
+      expect(zypper_package.updated_by_last_action?).to be false
+      expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$")
+    end
+  end
+
+  context "with versions" do
+    it "works with a version" do
+      zypper_package.package_name("chef_rpm")
+      zypper_package.version("1.10")
+      zypper_package.run_action(:install)
+      expect(zypper_package.updated_by_last_action?).to be true
+      expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$")
+    end
+
+    it "works with an older version" do
+      zypper_package.package_name("chef_rpm")
+      zypper_package.version("1.2")
+      zypper_package.run_action(:install)
+      expect(zypper_package.updated_by_last_action?).to be true
+      expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$")
+    end
+
+    it "works with version and release" do
+      zypper_package.package_name("chef_rpm")
+      zypper_package.version("1.2-1")
+      zypper_package.run_action(:install)
+      expect(zypper_package.updated_by_last_action?).to be true
+      expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$")
+    end
+
+    it "downgrades when the installed version is higher than the package_name version" do
+      preinstall("chef_rpm-1.10-1.#{pkg_arch}.rpm")
+      zypper_package.allow_downgrade true
+      zypper_package.package_name("chef_rpm")
+      zypper_package.version("1.2-1")
+      zypper_package.run_action(:install)
+      expect(zypper_package.updated_by_last_action?).to be true
+      expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$")
+    end
+  end
+
+  describe ":remove" do
+    context "vanilla use case" do
+      let(:package_name) { "chef_rpm" }
+      it "does nothing if the package is not installed" do
+        zypper_package.run_action(:remove)
+        expect(zypper_package.updated_by_last_action?).to be false
+        expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^package chef_rpm is not installed$")
+      end
+
+      it "removes the package if the package is installed" do
+        preinstall("chef_rpm-1.10-1.#{pkg_arch}.rpm")
+        zypper_package.run_action(:remove)
+        expect(zypper_package.updated_by_last_action?).to be true
+        expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^package chef_rpm is not installed$")
+      end
+
+      it "does not remove the package twice" do
+        preinstall("chef_rpm-1.10-1.#{pkg_arch}.rpm")
+        zypper_package.run_action(:remove)
+        expect(zypper_package.updated_by_last_action?).to be true
+        expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^package chef_rpm is not installed$")
+        zypper_package.run_action(:remove)
+        expect(zypper_package.updated_by_last_action?).to be false
+        expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^package chef_rpm is not installed$")
+      end
+
+      it "removes the package if the prior version package is installed" do
+        preinstall("chef_rpm-1.2-1.#{pkg_arch}.rpm")
+        zypper_package.run_action(:remove)
+        expect(zypper_package.updated_by_last_action?).to be true
+        expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^package chef_rpm is not installed$")
+      end
+    end
+
+    context "with no available version" do
+      it "works when a package is installed" do
+        FileUtils.rm_f "/etc/zypp/repos.d/chef-zypp-localtesting.repo"
+        preinstall("chef_rpm-1.2-1.#{pkg_arch}.rpm")
+        zypper_package.run_action(:remove)
+        expect(zypper_package.updated_by_last_action?).to be true
+        expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^package chef_rpm is not installed$")
+      end
+    end
+  end
+
+  describe ":lock and :unlock" do
+    before(:each) do
+      shell_out("zypper removelock chef_rpm") # will exit with error when nothing is locked, we don't care
+    end
+
+    it "locks an rpm" do
+      zypper_package.package_name("chef_rpm")
+      zypper_package.run_action(:lock)
+      expect(zypper_package.updated_by_last_action?).to be true
+      expect(shell_out("zypper locks | grep chef_rpm").stdout.chomp).to match("chef_rpm")
+    end
+
+    it "does not lock if its already locked" do
+      shell_out!("zypper addlock chef_rpm")
+      zypper_package.package_name("chef_rpm")
+      zypper_package.run_action(:lock)
+      expect(zypper_package.updated_by_last_action?).to be false
+      expect(shell_out("zypper locks | grep chef_rpm").stdout.chomp).to match("chef_rpm")
+    end
+
+    it "unlocks an rpm" do
+      shell_out!("zypper addlock chef_rpm")
+      zypper_package.package_name("chef_rpm")
+      zypper_package.run_action(:unlock)
+      expect(zypper_package.updated_by_last_action?).to be true
+      expect(shell_out("zypper locks | grep chef_rpm").stdout.chomp).not_to match("chef_rpm")
+    end
+
+    it "does not unlock an already locked rpm" do
+      zypper_package.package_name("chef_rpm")
+      zypper_package.run_action(:unlock)
+      expect(zypper_package.updated_by_last_action?).to be false
+      expect(shell_out("zypper locks | grep chef_rpm").stdout.chomp).not_to match("chef_rpm")
+    end
+
+    it "check that we can lock based on provides" do
+      zypper_package.package_name("chef_rpm_provides")
+      zypper_package.run_action(:lock)
+      expect(zypper_package.updated_by_last_action?).to be true
+      expect(shell_out("zypper locks | grep chef_rpm_provides").stdout.chomp).to match("chef_rpm_provides")
+    end
+
+    it "check that we can unlock based on provides" do
+      shell_out!("zypper addlock chef_rpm_provides")
+      zypper_package.package_name("chef_rpm_provides")
+      zypper_package.run_action(:unlock)
+      expect(zypper_package.updated_by_last_action?).to be true
+      expect(shell_out("zypper locks | grep chef_rpm_provides").stdout.chomp).not_to match("chef_rpm_provides")
+    end
+  end
+  def remove_package
+    pkg_to_remove = Chef::Resource::ZypperPackage.new(package_name, run_context)
+    pkg_to_remove.run_action(:remove)
+  end
+end