chef 14.4.56 → 14.5.27

data/lib/chef/resource/zypper_package.rb

@@ -25,11 +25,15 @@ class Chef
       resource_name :zypper_package
       provides :package, platform_family: "suse"
 
-      description "Use the zypper_package resource to install, upgrade, and remove"\
-                  " packages with Zypper for the SUSE Enterprise and OpenSUSE platforms."
+      description "Use the zypper_package resource to install, upgrade, and remove packages with Zypper for the SUSE Enterprise and OpenSUSE platforms."
 
-      property :gpg_check, [ TrueClass, FalseClass ], default: lazy { Chef::Config[:zypper_check_gpg] }
-      property :allow_downgrade, [ TrueClass, FalseClass ], default: false
+      property :gpg_check, [ TrueClass, FalseClass ],
+               description: "Verify the package's GPG signature. Can also be controlled site-wide using the ``zypper_check_gpg`` config option.",
+               default: lazy { Chef::Config[:zypper_check_gpg] }
+
+      property :allow_downgrade, [ TrueClass, FalseClass ],
+               description: "Allow downgrading a package to satisfy requested version requirements.",
+               default: false, introduced: "13.6"
     end
   end
 end

data/lib/chef/resource/zypper_repository.rb

@@ -25,33 +25,71 @@ class Chef
       provides(:zypper_repository) { true }
       provides(:zypper_repo) { 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."
+      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: [/^[^\/]+$/],
+               description: "Specifies the repository name, if it differs from the resource name.",
                validation_message: "repo_name property cannot contain a forward slash '/'",
                name_property: true
 
-      property :description, String
-      property :type, String, default: "NONE"
-      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, [TrueClass, FalseClass], default: false
-      property :mode, default: "0644"
-      property :refresh_cache, [TrueClass, FalseClass], default: true
-      property :source, String
-      property :cookbook, String
-      property :gpgautoimportkeys, [TrueClass, FalseClass], default: true
+      property :description, String,
+               description: "The description of the repository that will be shown by the 'zypper repos' command."
+
+      property :type, String,
+               description: "Specifies the repository type.",
+               default: "NONE"
+
+      property :enabled, [TrueClass, FalseClass],
+               description: "Determines whether or not the repository should be enabled.",
+               default: true
+
+      property :autorefresh, [TrueClass, FalseClass],
+               description: "Determines whether or not the repository should be refreshed automatically.",
+               default: true
+
+      property :gpgcheck, [TrueClass, FalseClass],
+               description: "Determines whether or not to perform a GPG signature check on the repository.",
+               default: true
+
+      property :gpgkey, String,
+               description: "The location of the repository key to be imported."
+
+      property :baseurl, String,
+               description: "The base URL for the Zypper repository, such as 'http://download.opensuse.org'."
+
+      property :mirrorlist, String,
+               description: "The URL of the mirror list that will be used."
+
+      property :path, String,
+               description: "The relative path from the repository's base URL."
+
+      property :priority, Integer,
+               description: "Determines the priority of the Zypper repository. ",
+               default: 99
+
+      property :keeppackages, [TrueClass, FalseClass],
+               description: "Determines whether or not packages should be saved.",
+               default: false
+
+      property :mode, [String, Integer],
+               description: "The file mode of the repository file.",
+               default: "0644"
+
+      property :refresh_cache, [TrueClass, FalseClass],
+               description: "Determines whether or not the package cache should be refreshed.",
+               default: true
+
+      property :source, String,
+               description: "The name of the template for the repository file. Only necessary if you're not using the built in template."
+
+      property :cookbook, String,
+               description: "The cookbook to source the repository template file from. Only necessary if you're not using the built in template."
+
+      property :gpgautoimportkeys, [TrueClass, FalseClass],
+               description: "Automatically import the specified key when setting up the repository.",
+               default: true
 
       default_action :create
       allowed_actions :create, :remove, :add, :refresh

data/lib/chef/resource_inspector.rb

@@ -56,6 +56,7 @@ module ResourceInspector
       acc << { name: n, description: opts[:description],
                introduced: opts[:introduced], is: opts[:is],
                deprecated: opts[:deprecated] || false,
+               required: opts[:required] || false,
                default: get_default(opts[:default]),
                name_property: opts[:name_property] || false }
     end
@@ -81,7 +82,8 @@ module ResourceInspector
   # 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
+  # @param complete [TrueClass, FalseClass] Whether to show properties defined in the base Resource class
+  # @return [String] JSON formatting of all resources
   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) }
@@ -96,11 +98,11 @@ module ResourceInspector
                end
              end
 
-    puts Chef::JSONCompat.to_json_pretty(output)
+    Chef::JSONCompat.to_json_pretty(output)
   end
 
   def self.start
-    inspect(ARGV, complete: true)
+    puts inspect(ARGV, complete: true)
   end
 
 end

data/lib/chef/resources.rb

@@ -57,6 +57,7 @@ require "chef/resource/kernel_module"
 require "chef/resource/ksh"
 require "chef/resource/launchd"
 require "chef/resource/link"
+require "chef/resource/locale"
 require "chef/resource/log"
 require "chef/resource/macports_package"
 require "chef/resource/macos_userdefaults"
@@ -139,3 +140,4 @@ require "chef/resource/windows_printer"
 require "chef/resource/windows_printer_port"
 require "chef/resource/windows_shortcut"
 require "chef/resource/windows_task"
+require "chef/resource/windows_workgroup"

data/lib/chef/util/powershell/cmdlet.rb

@@ -90,7 +90,7 @@ class Chef
           result = run(switches, execution_options, arguments)
 
           if ! result.succeeded?
-            raise Chef::Exceptions::PowershellCmdletException, "Powershell Cmdlet failed: #{result.stderr}"
+            raise Chef::Exceptions::PowershellCmdletException, "PowerShell Cmdlet failed: #{result.stderr}"
           end
 
           result

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.4.56")
+  VERSION = Chef::VersionString.new("14.5.27")
 end
 
 #

data/spec/functional/resource/dsc_resource_spec.rb

@@ -33,11 +33,11 @@ describe Chef::Resource::DscResource, :windows_powershell_dsc_only do
     Chef::Resource::DscResource.new("dsc_resource_test", run_context)
   end
 
-  context "when Powershell does not support Invoke-DscResource"
-  context "when Powershell supports Invoke-DscResource" do
+  context "when PowerShell does not support Invoke-DscResource"
+  context "when PowerShell supports Invoke-DscResource" do
     before do
       if !Chef::Platform.supports_dsc_invoke_resource?(node)
-        skip "Requires Powershell >= 5.0.10018.0"
+        skip "Requires PowerShell >= 5.0.10018.0"
       elsif !Chef::Platform.supports_refresh_mode_enabled?(node) && !Chef::Platform.dsc_refresh_mode_disabled?(node)
         skip "Requires LCM RefreshMode is Disabled"
       end

data/spec/functional/resource/powershell_script_spec.rb

@@ -42,7 +42,7 @@ describe Chef::Resource::WindowsScript::PowershellScript, :windows_only do
   let(:valid_powershell_interpreter_flag) { "-Sta" }
 
   let!(:resource) do
-    r = Chef::Resource::WindowsScript::PowershellScript.new("Powershell resource functional test", @run_context)
+    r = Chef::Resource::WindowsScript::PowershellScript.new("PowerShell resource functional test", @run_context)
     r.code(successful_executable_script_content)
     r
   end
@@ -154,7 +154,7 @@ describe Chef::Resource::WindowsScript::PowershellScript, :windows_only do
     # This somewhat ambiguous case, two failures of different types,
     # seems to violate the principle of returning the status of the
     # last line executed -- in this case, we return the status of the
-    # second to last line. This happens because Powershell gives no
+    # second to last line. This happens because PowerShell gives no
     # way for us to determine whether the last operation was a cmdlet
     # or Windows process. Because the latter gives more specific
     # errors than 0 or 1, we return that instead, which is acceptable

data/spec/functional/win32/crypto_spec.rb

@@ -36,7 +36,7 @@ describe "Chef::ReservedNames::Win32::Crypto", :windows_only do
 
     it "can be decrypted by powershell" do
       encrypted = Chef::ReservedNames::Win32::Crypto.encrypt(plaintext)
-      resource = Chef::Resource::WindowsScript::PowershellScript.new("Powershell resource functional test", @run_context)
+      resource = Chef::Resource::WindowsScript::PowershellScript.new("PowerShell resource functional test", @run_context)
       resource.code <<~EOF
         $encrypted = '#{encrypted}' | ConvertTo-SecureString
         $BSTR = [System.Runtime.InteropServices.Marshal]::SecureStringToBSTR($encrypted)

data/spec/unit/cookbook_version_file_specificity_spec.rb

@@ -93,6 +93,13 @@ describe Chef::CookbookVersion, "file specificity" do
        },
 
        # directory adirectory
+       {
+         name: "files/anotherfile1.rb",
+         path: "files/root_directory/anotherfile1.rb.root",
+         checksum: "csum-root-directory",
+         specificity: "root_directory",
+       },
+
        {
          name: "files/anotherfile1.rb",
          path: "files/host-examplehost.example.org/adirectory/anotherfile1.rb.host",
@@ -483,6 +490,19 @@ describe Chef::CookbookVersion, "file specificity" do
   ## Globbing the relative paths out of the manifest records ##
 
   describe "when globbing for relative file paths based on filespecificity" do
+    it "should return a list of relative paths based on priority preference: root directory" do
+      node = Chef::Node.new
+      node.automatic_attrs[:platform] = "ubuntu"
+      node.automatic_attrs[:platform_version] = "9.10"
+      node.automatic_attrs[:fqdn] = "examplehost.example.org"
+
+      filenames = @cookbook.relative_filenames_in_preferred_directory(node, :files, "root_directory")
+      expect(filenames).not_to be_nil
+      expect(filenames.size).to eq(1)
+
+      expect(filenames.sort).to eq(["anotherfile1.rb.root"])
+    end
+
     it "should return a list of relative paths based on priority preference: host" do
       node = Chef::Node.new
       node.automatic_attrs[:platform] = "ubuntu"

data/spec/unit/node_map_spec.rb

@@ -223,7 +223,7 @@ describe Chef::NodeMap do
     context "while locked" do
       # Uncomment the commented `expect`s in 15.0.
       it "rejects setting the same key twice" do
-        expect(Chef).to receive(:deprecated).with(:map_collision, /resource foo/)
+        expect(Chef).to receive(:deprecated).with(:map_collision, /Resource foo/)
         node_map.set(:foo, FooResource)
         node_map.lock!
         node_map.set(:foo, BarResource)
@@ -247,7 +247,7 @@ describe Chef::NodeMap do
       end
 
       it "rejects setting the same key twice when the first has allow_cookbook_override with a past version" do
-        expect(Chef).to receive(:deprecated).with(:map_collision, /resource foo/)
+        expect(Chef).to receive(:deprecated).with(:map_collision, /Resource foo/)
         node_map.set(:foo, FooResource, allow_cookbook_override: "< 1")
         node_map.lock!
         node_map.set(:foo, BarResource)
@@ -263,7 +263,7 @@ describe Chef::NodeMap do
       end
 
       it "rejects setting the same key twice for a provider" do
-        expect(Chef).to receive(:deprecated).with(:map_collision, /provider foo/)
+        expect(Chef).to receive(:deprecated).with(:map_collision, /Provider foo/)
         node_map.set(:foo, FooProvider)
         node_map.lock!
         node_map.set(:foo, BarProvider)

data/spec/unit/platform/query_helpers_spec.rb

@@ -139,13 +139,13 @@ describe "Chef::Platform#supports_msi?" do
 end
 
 describe "Chef::Platform#supports_dsc?" do
-  it "returns false if powershell is not present" do
+  it "returns false if PowerShell is not present" do
     node = Chef::Node.new
     expect(Chef::Platform.supports_dsc?(node)).to be_falsey
   end
 
   ["1.0", "2.0", "3.0"].each do |version|
-    it "returns false for Powershell #{version}" do
+    it "returns false for PowerShell #{version}" do
       node = Chef::Node.new
       node.automatic[:languages][:powershell][:version] = version
       expect(Chef::Platform.supports_dsc?(node)).to be_falsey
@@ -153,7 +153,7 @@ describe "Chef::Platform#supports_dsc?" do
   end
 
   ["4.0", "5.0"].each do |version|
-    it "returns true for Powershell #{version}" do
+    it "returns true for PowerShell #{version}" do
       node = Chef::Node.new
       node.automatic[:languages][:powershell][:version] = version
       expect(Chef::Platform.supports_dsc?(node)).to be_truthy
@@ -168,7 +168,7 @@ describe "Chef::Platform#supports_dsc_invoke_resource?" do
   end
 
   ["1.0", "2.0", "3.0", "4.0", "5.0.10017.9"].each do |version|
-    it "returns false for Powershell #{version}" do
+    it "returns false for PowerShell #{version}" do
       node = Chef::Node.new
       node.automatic[:languages][:powershell][:version] = version
       expect(Chef::Platform.supports_dsc_invoke_resource?(node)).to be_falsey

data/spec/unit/provider/dsc_resource_spec.rb

@@ -27,7 +27,7 @@ describe Chef::Provider::DscResource do
     Chef::Provider::DscResource.new(resource, run_context)
   end
 
-  context "when Powershell does not support Invoke-DscResource" do
+  context "when PowerShell does not support Invoke-DscResource" do
     let (:node) do
       node = Chef::Node.new
       node.automatic[:languages][:powershell][:version] = "4.0"
@@ -40,7 +40,7 @@ describe Chef::Provider::DscResource do
     end
   end
 
-  context "when Powershell supports Invoke-DscResource" do
+  context "when PowerShell supports Invoke-DscResource" do
 
     context "when RefreshMode is not set to Disabled" do
       context "and the WMF 5 is a preview release" do

data/spec/unit/provider/dsc_script_spec.rb

@@ -162,7 +162,7 @@ describe Chef::Provider::DscScript do
         end
       end
 
-      it "raises an exception if Powershell is not present" do
+      it "raises an exception if PowerShell is not present" do
         expect do
           provider.run_action(:run)
         end.to raise_error(Chef::Exceptions::ProviderNotFound)

data/spec/unit/resource/dsc_resource_spec.rb

@@ -93,7 +93,7 @@ describe Chef::Resource::DscResource do
       end
     end
 
-    context "Powershell DSL methods" do
+    context "PowerShell DSL methods" do
       it "responds to :ps_credential" do
         expect(dsc_test_resource.respond_to?(:ps_credential)).to be true
       end

data/spec/unit/resource/locale_spec.rb

@@ -0,0 +1,60 @@
+#
+# Author:: Vincent AUBERT (<vincentaubert88@gmail.com>)
+# Copyright:: Copyright 2008-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"
+
+describe Chef::Resource::Locale do
+
+  let(:resource) { Chef::Resource::Locale.new("fakey_fakerton") }
+
+  it "has a name of locale" do
+    expect(resource.resource_name).to eq(:locale)
+  end
+
+  it "the lang property is equal to en_US.utf8" do
+    expect(resource.lang).to eql("en_US.utf8")
+  end
+
+  it "the lc_all property is equal to en_US.utf8" do
+    expect(resource.lc_all).to eql("en_US.utf8")
+  end
+
+  it "sets the default action as :update" do
+    expect(resource.action).to eql([:update])
+  end
+
+  it "supports :update action" do
+    expect { resource.action :update }.not_to raise_error
+  end
+
+  describe "when the language is not the default one" do
+    let(:resource) { Chef::Resource::Locale.new("fakey_fakerton") }
+    before do
+      resource.lang("fr_FR.utf8")
+      resource.lc_all("fr_FR.utf8")
+    end
+
+    it "the lang property is equal to fr_FR.utf8" do
+      expect(resource.lang).to eql("fr_FR.utf8")
+    end
+
+    it "the lc_all property is equal to fr_FR.utf8" do
+      expect(resource.lc_all).to eql("fr_FR.utf8")
+    end
+  end
+end

data/spec/unit/resource/scm_spec.rb

@@ -78,16 +78,6 @@ describe Chef::Resource::Scm do
     expect(resource.group).to eq(23)
   end
 
-  it "has a svn_username String property" do
-    resource.svn_username "moartestsplz"
-    expect(resource.svn_username).to eql("moartestsplz")
-  end
-
-  it "has a svn_password String property" do
-    resource.svn_password "taftplz"
-    expect(resource.svn_password).to eql("taftplz")
-  end
-
   it "takes the depth as an integer for shallow clones" do
     resource.depth 5
     expect(resource.depth).to eq(5)

data/spec/unit/resource/windows_workgroup_spec.rb

@@ -0,0 +1,47 @@
+#
+# 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 "spec_helper"
+
+describe Chef::Resource::WindowsWorkgroup do
+  let(:resource) { Chef::Resource::WindowsWorkgroup.new("example") }
+
+  it "sets resource name as :windows_workgroup" do
+    expect(resource.resource_name).to eql(:windows_workgroup)
+  end
+
+  it "the workgroup_name property is the name_property" do
+    expect(resource.workgroup_name).to eql("example")
+  end
+
+  it "sets the default action as :join" do
+    expect(resource.action).to eql([:join])
+  end
+
+  it "supports :join action" do
+    expect { resource.action :join }.not_to raise_error
+  end
+
+  it "accepts :immediate, :reboot_now, :request_reboot, :delayed, or :never values for 'reboot' property" do
+    expect { resource.reboot :immediate }.not_to raise_error
+    expect { resource.reboot :delayed }.not_to raise_error
+    expect { resource.reboot :reboot_now }.not_to raise_error
+    expect { resource.reboot :request_reboot }.not_to raise_error
+    expect { resource.reboot :never }.not_to raise_error
+    expect { resource.reboot :nopenope }.to raise_error(ArgumentError)
+  end
+end