chef 16.4.41-universal-mingw32 → 16.8.9-universal-mingw32

data/spec/functional/resource/windows_firewall_rule_spec.rb

@@ -0,0 +1,93 @@
+#
+# Author:: Matt Wrock (<matt@mattwrock.com>)
+# Copyright:: Copyright (c) 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 "chef/mixin/powershell_exec"
+
+describe Chef::Resource::WindowsFirewallRule, :windows_only do
+  include Chef::Mixin::PowershellExec
+
+  let(:rule_name) { "fake_rule" }
+  let(:remote_port) { "5555" }
+  let(:enabled) { false }
+
+  let(:run_context) do
+    Chef::RunContext.new(Chef::Node.new, {}, Chef::EventDispatch::Dispatcher.new)
+  end
+
+  subject do
+    new_resource = Chef::Resource::WindowsFirewallRule.new("test firewall rule", run_context)
+    new_resource.rule_name rule_name
+    new_resource.remote_port remote_port
+    new_resource.enabled enabled
+    new_resource
+  end
+
+  let(:provider) do
+    provider = subject.provider_for_action(subject.action)
+    provider
+  end
+
+  context "create a new rule" do
+    after { delete_rule }
+
+    it "creates the rule" do
+      subject.run_action(:create)
+      expect(get_installed_rule_name).to eq(rule_name)
+      expect(get_installed_rule_remote_port).to eq(remote_port)
+    end
+
+    it "does not create rule if it already exists" do
+      subject.run_action(:create)
+      subject.run_action(:create)
+      expect(subject).not_to be_updated_by_last_action
+    end
+
+    it "updates the rule if it changed" do
+      subject.run_action(:create)
+      subject.remote_port = "7777"
+      subject.run_action(:create)
+      expect(get_installed_rule_remote_port).to eq("7777")
+    end
+  end
+
+  context "delete a rule" do
+    it "deletes an existing rule" do
+      subject.run_action(:create)
+      subject.run_action(:delete)
+      expect(get_installed_rule_name).to be_empty
+    end
+
+    it "does not delete rule if it does not exist" do
+      subject.run_action(:delete)
+      expect(subject).not_to be_updated_by_last_action
+    end
+  end
+
+  def get_installed_rule_name
+    powershell_exec!("(Get-NetFirewallRule -Name #{rule_name} -ErrorAction SilentlyContinue).Name").result
+  end
+
+  def get_installed_rule_remote_port
+    powershell_exec!("((Get-NetFirewallRule -Name #{rule_name} -ErrorAction SilentlyContinue) | Get-NetFirewallPortFilter).RemotePort").result
+  end
+
+  def delete_rule
+    rule_to_remove = Chef::Resource::WindowsFirewallRule.new(rule_name, run_context)
+    rule_to_remove.run_action(:delete)
+  end
+end

data/spec/functional/resource/windows_package_spec.rb

@@ -25,6 +25,10 @@ describe Chef::Resource::WindowsPackage, :windows_only, :volatile do
   let(:pkg_version) { nil }
   let(:pkg_type) { nil }
   let(:pkg_options) { nil }
+  let(:remote_file_attributes) { nil }
+  let(:run_context) do
+    Chef::RunContext.new(Chef::Node.new, {}, Chef::EventDispatch::Dispatcher.new)
+  end
 
   subject do
     new_resource = Chef::Resource::WindowsPackage.new(pkg_name, run_context)
@@ -33,13 +37,14 @@ describe Chef::Resource::WindowsPackage, :windows_only, :volatile do
     new_resource.installer_type pkg_type
     new_resource.options pkg_options
     new_resource.checksum pkg_checksum
+    new_resource.remote_file_attributes
     new_resource
   end
 
   describe "install package" do
     let(:pkg_name) { "Microsoft Visual C++ 2005 Redistributable" }
-    let(:pkg_checksum) { "d6832398e3bc9156a660745f427dc1c2392ce4e9a872e04f41f62d0c6bae07a8" }
-    let(:pkg_path) { "https://download.microsoft.com/download/6/B/B/6BB661D6-A8AE-4819-B79F-236472F6070C/vcredist_x86.exe" }
+    let(:pkg_checksum) { "4ee4da0fe62d5fa1b5e80c6e6d88a4a2f8b3b140c35da51053d0d7b72a381d29" }
+    let(:pkg_path) { "https://download.microsoft.com/download/8/B/4/8B42259F-5D70-43F4-AC2E-4B208FD8D66A/vcredist_x86.EXE" }
     let(:pkg_checksum) { nil }
     let(:pkg_type) { :custom }
     let(:pkg_options) { "/Q" }
@@ -55,9 +60,9 @@ describe Chef::Resource::WindowsPackage, :windows_only, :volatile do
     end
 
     context "installing additional version" do
-      let(:pkg_path) { "https://download.microsoft.com/download/e/1/c/e1c773de-73ba-494a-a5ba-f24906ecf088/vcredist_x86.exe" }
-      let(:pkg_checksum) { "eb00f891919d4f894ab725b158459db8834470c382dc60cd3c3ee2c6de6da92c" }
-      let(:pkg_version) { "8.0.56336" }
+      let(:pkg_path) { "https://download.microsoft.com/download/6/B/B/6BB661D6-A8AE-4819-B79F-236472F6070C/vcredist_x86.exe" }
+      let(:pkg_checksum) { "d6832398e3bc9156a660745f427dc1c2392ce4e9a872e04f41f62d0c6bae07a8" }
+      let(:pkg_version) { "8.0.59193" }
 
       it "installs older version" do
         subject.run_action(:install)
@@ -69,14 +74,14 @@ describe Chef::Resource::WindowsPackage, :windows_only, :volatile do
       subject { Chef::Resource::WindowsPackage.new(pkg_name, run_context) }
 
       context "multiple versions and a version given to remove" do
-        before { subject.version("8.0.56336") }
+        before { subject.version("8.0.59193") }
 
         it "removes specified version" do
           subject.run_action(:remove)
           expect(subject).to be_updated_by_last_action
           prov = subject.provider_for_action(:remove)
           prov.load_current_resource
-          expect(prov.current_version_array).to eq([["8.0.59193"]])
+          expect(prov.current_version_array).to eq([["8.0.61001"]])
         end
       end
 
@@ -101,8 +106,8 @@ describe Chef::Resource::WindowsPackage, :windows_only, :volatile do
           install1.run_action(:install)
 
           install2 = Chef::Resource::WindowsPackage.new(pkg_name, run_context)
-          install2.source "https://download.microsoft.com/download/e/1/c/e1c773de-73ba-494a-a5ba-f24906ecf088/vcredist_x86.exe"
-          install2.version "8.0.56336"
+          install2.source "https://download.microsoft.com/download/6/B/B/6BB661D6-A8AE-4819-B79F-236472F6070C/vcredist_x86.exe"
+          install2.version "8.0.59193"
           install2.installer_type pkg_type
           install2.options pkg_options
           install2.run_action(:install)
@@ -135,7 +140,7 @@ describe Chef::Resource::WindowsPackage, :windows_only, :volatile do
 
     context "inno" do
       let(:pkg_name) { "Mercurial 3.6.1 (64-bit)" }
-      let(:pkg_path) { "http://mercurial.selenic.com/release/windows/Mercurial-3.6.1-x64.exe" }
+      let(:pkg_path) { "https://www.mercurial-scm.org/release/windows/Mercurial-3.6.1-x64.exe" }
       let(:pkg_checksum) { "febd29578cb6736163d232708b834a2ddd119aa40abc536b2c313fc5e1b5831d" }
 
       it "finds the correct installer type" do
@@ -164,4 +169,25 @@ describe Chef::Resource::WindowsPackage, :windows_only, :volatile do
       expect(subject).to be_updated_by_last_action
     end
   end
+
+  describe "install package with remote_file_attributes" do
+    let(:pkg_name) { "7zip" }
+    let(:pkg_path) { "http://www.7-zip.org/a/7z938-x64.msi" }
+    let(:remote_file_attributes) {
+      {
+        path: ::File.join(Chef::Config[:file_cache_path], "7zip.msi"),
+        checksum: "7c8e873991c82ad9cfcdbdf45254ea6101e9a645e12977dcd518979e50fdedf3",
+      }
+    }
+
+    it "installs the package" do
+      subject.run_action(:install)
+      expect(subject).to be_updated_by_last_action
+    end
+
+    it "uninstalls the package" do
+      subject.run_action(:remove)
+      expect(subject).to be_updated_by_last_action
+    end
+  end
 end

data/spec/functional/resource/windows_share_spec.rb

@@ -0,0 +1,103 @@
+#
+# Author:: Matt Wrock (<matt@mattwrock.com>)
+# Copyright:: Copyright (c) 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 "chef/mixin/powershell_exec"
+
+describe Chef::Resource::WindowsShare, :windows_only do
+  include Chef::Mixin::PowershellExec
+
+  let(:share_name) { "fake_share" }
+  let(:path) { ENV["temp"] }
+  let(:concurrent_user_limit) { 7 }
+  let(:full_users) { ["#{ENV["USERNAME"]}"] }
+
+  let(:run_context) do
+    node = Chef::Node.new
+    node.default["hostname"] = ENV["COMPUTERNAME"]
+    Chef::RunContext.new(node, {}, Chef::EventDispatch::Dispatcher.new)
+  end
+
+  subject do
+    new_resource = Chef::Resource::WindowsShare.new("test windows share", run_context)
+    new_resource.share_name share_name
+    new_resource.path path
+    new_resource.concurrent_user_limit concurrent_user_limit
+    new_resource.full_users full_users
+    new_resource
+  end
+
+  let(:provider) do
+    provider = subject.provider_for_action(subject.action)
+    provider
+  end
+
+  context "create a new share" do
+    after { delete_share }
+
+    it "creates the share" do
+      subject.run_action(:create)
+      share = get_installed_share
+      expect(share["Name"]).to eq(share_name)
+      expect(share["Path"]).to eq(path)
+      expect(get_installed_share_access["AccountName"]).to eq("#{ENV["COMPUTERNAME"]}\\#{full_users[0]}")
+    end
+
+    it "does not create share if it already exists" do
+      subject.run_action(:create)
+      subject.run_action(:create)
+      expect(subject).not_to be_updated_by_last_action
+    end
+
+    it "updates the share if it changed" do
+      subject.run_action(:create)
+      subject.concurrent_user_limit 8
+      subject.full_users ["BUILTIN\\Administrators"]
+      subject.run_action(:create)
+      share = get_installed_share
+      expect(share["ConcurrentUserLimit"]).to eq(8)
+      expect(get_installed_share_access["AccountName"]).to eq("BUILTIN\\Administrators")
+    end
+
+  end
+
+  context "delete a share" do
+    it "deletes an existing share" do
+      subject.run_action(:create)
+      subject.run_action(:delete)
+      expect(get_installed_share).to be_empty
+    end
+
+    it "does not delete share if it does not exist" do
+      subject.run_action(:delete)
+      expect(subject).not_to be_updated_by_last_action
+    end
+  end
+
+  def get_installed_share
+    powershell_exec!("Get-SmbShare -Name #{share_name} -ErrorAction SilentlyContinue").result
+  end
+
+  def get_installed_share_access
+    powershell_exec!("Get-SmbShareAccess -Name #{share_name} -ErrorAction SilentlyContinue").result
+  end
+
+  def delete_share
+    rule_to_remove = Chef::Resource::WindowsShare.new(share_name, run_context)
+    rule_to_remove.run_action(:delete)
+  end
+end

data/spec/functional/resource/windows_task_spec.rb

@@ -17,15 +17,14 @@
 #
 
 require "spec_helper"
-require "chef/provider/windows_task"
-require "chef/dist"
+require "chef-utils/dist"
 
 describe Chef::Resource::WindowsTask, :windows_only do
   # resource.task.application_name will default to task_name unless resource.command is set
   let(:task_name) { "chef-client-functional-test" }
-  let(:new_resource) { Chef::Resource::WindowsTask.new(task_name) }
+  let(:new_resource) { Chef::Resource::WindowsTask.new(task_name, run_context) }
   let(:windows_task_provider) do
-    Chef::Provider::WindowsTask.new(new_resource, run_context)
+    new_resource.provider_for_action(:create)
   end
 
   let(:run_context) do
@@ -47,37 +46,37 @@ describe Chef::Resource::WindowsTask, :windows_only do
 
       context "With Arguments" do
         it "creates scheduled task and sets command arguments" do
-          subject.command "#{Chef::Dist::CLIENT} -W"
+          subject.command "#{ChefUtils::Dist::Infra::CLIENT} -W"
           call_for_create_action
           # loading current resource again to check new task is creted and it matches task parameters
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
-          expect(current_resource.task.application_name).to eq(Chef::Dist::CLIENT)
+          expect(current_resource.task.application_name).to eq(ChefUtils::Dist::Infra::CLIENT)
           expect(current_resource.task.parameters).to eq("-W")
         end
 
         it "does not converge the resource if it is already converged" do
-          subject.command "#{Chef::Dist::CLIENT} -W"
+          subject.command "#{ChefUtils::Dist::Infra::CLIENT} -W"
           subject.run_action(:create)
-          subject.command "#{Chef::Dist::CLIENT} -W"
+          subject.command "#{ChefUtils::Dist::Infra::CLIENT} -W"
           subject.run_action(:create)
           expect(subject).not_to be_updated_by_last_action
         end
 
         it "creates scheduled task and sets command arguments when arguments inclusive single quotes" do
-          subject.command "#{Chef::Dist::CLIENT} -W -L 'C:\\chef\\chef-ad-join.log'"
+          subject.command "#{ChefUtils::Dist::Infra::CLIENT} -W -L 'C:\\chef\\chef-ad-join.log'"
           call_for_create_action
           # loading current resource again to check new task is creted and it matches task parameters
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
-          expect(current_resource.task.application_name).to eq(Chef::Dist::CLIENT)
+          expect(current_resource.task.application_name).to eq(ChefUtils::Dist::Infra::CLIENT)
           expect(current_resource.task.parameters).to eq("-W -L 'C:\\chef\\chef-ad-join.log'")
         end
 
         it "does not converge the resource if it is already converged" do
-          subject.command "#{Chef::Dist::CLIENT} -W -L 'C:\\chef\\chef-ad-join.log'"
+          subject.command "#{ChefUtils::Dist::Infra::CLIENT} -W -L 'C:\\chef\\chef-ad-join.log'"
           subject.run_action(:create)
-          subject.command "#{Chef::Dist::CLIENT} -W -L 'C:\\chef\\chef-ad-join.log'"
+          subject.command "#{ChefUtils::Dist::Infra::CLIENT} -W -L 'C:\\chef\\chef-ad-join.log'"
           subject.run_action(:create)
           expect(subject).not_to be_updated_by_last_action
         end
@@ -137,19 +136,19 @@ describe Chef::Resource::WindowsTask, :windows_only do
 
       context "Without Arguments" do
         it "creates scheduled task and sets command arguments" do
-          subject.command Chef::Dist::CLIENT
+          subject.command ChefUtils::Dist::Infra::CLIENT
           call_for_create_action
           # loading current resource again to check new task is creted and it matches task parameters
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
-          expect(current_resource.task.application_name).to eq(Chef::Dist::CLIENT)
+          expect(current_resource.task.application_name).to eq(ChefUtils::Dist::Infra::CLIENT)
           expect(current_resource.task.parameters).to be_empty
         end
 
         it "does not converge the resource if it is already converged" do
-          subject.command Chef::Dist::CLIENT
+          subject.command ChefUtils::Dist::Infra::CLIENT
           subject.run_action(:create)
-          subject.command Chef::Dist::CLIENT
+          subject.command ChefUtils::Dist::Infra::CLIENT
           subject.run_action(:create)
           expect(subject).not_to be_updated_by_last_action
         end

data/spec/functional/resource/zypper_package_spec.rb

@@ -96,6 +96,17 @@ describe Chef::Resource::ZypperPackage, :requires_root, :suse_only do
       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
+
+    it "multipackage installs which result in nils from the superclass" do
+      # this looks weird, it tests an internal condition of the allow_nils behavior where the arrays passed to install_package will have
+      # nil values, and ensures that doesn't wind up creating weirdness in the resulting shell_out that causes it to fail
+      preinstall("chef_rpm-1.2-1.#{pkg_arch}.rpm")
+      zypper_package.package_name(%w{chef_rpm chef_rpm})
+      zypper_package.version(["1.2", "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
   end
 
   context "with versions" do

data/spec/functional/version_spec.rb

@@ -19,13 +19,13 @@ require "spec_helper"
 require "chef/mixin/shell_out"
 require "chef/version"
 require "ohai/version"
-require "chef/dist"
+require "chef-utils/dist"
 
 describe "Chef Versions", :executables do
   include Chef::Mixin::ShellOut
-  let(:chef_dir) { File.join(File.dirname(__FILE__), "..", "..") }
+  let(:chef_dir) { File.join(__dir__, "..", "..") }
 
-  binaries = [ Chef::Dist::CLIENT, "chef-shell", "chef-apply", "knife", Chef::Dist::SOLOEXEC ]
+  binaries = [ ChefUtils::Dist::Infra::CLIENT, "chef-shell", "chef-apply", "knife", ChefUtils::Dist::Solo::EXEC ]
 
   binaries.each do |binary|
     it "#{binary} version should be sane" do

data/spec/integration/client/client_spec.rb

@@ -3,7 +3,7 @@ require "support/shared/integration/integration_helper"
 require "chef/mixin/shell_out"
 require "tiny_server"
 require "tmpdir"
-require "chef/dist"
+require "chef-utils/dist"
 
 describe "chef-client" do
 
@@ -34,7 +34,7 @@ describe "chef-client" do
   include IntegrationSupport
   include Chef::Mixin::ShellOut
 
-  let(:chef_dir) { File.join(File.dirname(__FILE__), "..", "..", "..", "bin") }
+  let(:chef_dir) { File.join(__dir__, "..", "..", "..", "bin") }
 
   # Invoke `chef-client` as `ruby PATH/TO/chef-client`. This ensures the
   # following constraints are satisfied:
@@ -45,8 +45,8 @@ describe "chef-client" do
   # machine that has omnibus chef installed. In that case we need to ensure
   # we're running `chef-client` from the source tree and not the external one.
   # cf. CHEF-4914
-  let(:chef_client) { "bundle exec #{Chef::Dist::CLIENT} --minimal-ohai" }
-  let(:chef_solo) { "bundle exec #{Chef::Dist::SOLOEXEC} --legacy-mode --minimal-ohai" }
+  let(:chef_client) { "bundle exec #{ChefUtils::Dist::Infra::CLIENT} --minimal-ohai" }
+  let(:chef_solo) { "bundle exec #{ChefUtils::Dist::Solo::EXEC} --legacy-mode --minimal-ohai" }
 
   when_the_repository "has a cookbook with a no-op recipe" do
     before { file "cookbooks/x/recipes/default.rb", "" }
@@ -97,7 +97,8 @@ describe "chef-client" do
       before { file ".chef/knife.rb", "xxx.xxx" }
 
       it "should load .chef/knife.rb when -z is specified" do
-        result = shell_out("#{chef_client} -z -o 'x::default'", cwd: path_to(""))
+        # On Solaris shell_out will invoke /bin/sh which doesn't understand how to correctly update ENV['PWD']
+        result = shell_out("#{chef_client} -z -o 'x::default'", cwd: path_to(""), env: { "PWD" => nil })
         # FATAL: Configuration error NoMethodError: undefined method `xxx' for nil:NilClass
         expect(result.stdout).to include("xxx")
       end