chef 16.4.38 → 16.7.61

data/spec/functional/resource/powershell_script_spec.rb

@@ -47,7 +47,7 @@ describe Chef::Resource::WindowsScript::PowershellScript, :windows_only do
     r
   end
 
-  describe "when the run action is invoked on Windows" do
+  shared_examples_for "a running powershell script" do
     it "successfully executes a non-cmdlet Windows binary as the last command of the script" do
       resource.code(successful_executable_script_content + " | out-file -encoding ASCII #{script_output_path}")
       resource.returns(0)
@@ -231,22 +231,54 @@ describe Chef::Resource::WindowsScript::PowershellScript, :windows_only do
       resource.only_if { true }
       expect { resource.should_skip?(:run) }.to raise_error(ArgumentError, /guard_interpreter does not support blocks/)
     end
+  end
+
+  context "when using the powershell interpreter" do
+    before do
+      resource.interpreter "powershell"
+    end
+
+    it_behaves_like "a running powershell script"
+
+    it "runs Windows Powershell" do
+      resource.code("$PSVersionTable.PSVersion.Major | out-file -encoding ASCII #{script_output_path}")
+      resource.returns(0)
+      resource.run_action(:run)
+
+      expect(get_script_output.to_i).to be < 6
+    end
+  end
+
+  context "when using the pwsh interpreter", :pwsh_installed do
+    before do
+      resource.interpreter "pwsh"
+    end
+
+    it_behaves_like "a running powershell script"
 
-    context "when dsc is supported", :windows_powershell_dsc_only do
-      it "can execute LCM configuration code" do
-        resource.code <<~EOF
-          configuration LCM
+    it "runs a version of powershell greater than 6" do
+      resource.code("$PSVersionTable.PSVersion.Major | out-file -encoding ASCII #{script_output_path}")
+      resource.returns(0)
+      resource.run_action(:run)
+
+      expect(get_script_output.to_i).to be > 6
+    end
+  end
+
+  context "when dsc is supported", :windows_powershell_dsc_only do
+    it "can execute LCM configuration code" do
+      resource.code <<~EOF
+        configuration LCM
+        {
+          param ($thumbprint)
+          localconfigurationmanager
           {
-            param ($thumbprint)
-            localconfigurationmanager
-            {
-              RebootNodeIfNeeded = $false
-              ConfigurationMode = 'ApplyOnly'
-            }
+            RebootNodeIfNeeded = $false
+            ConfigurationMode = 'ApplyOnly'
           }
-        EOF
-        expect { resource.run_action(:run) }.not_to raise_error
-      end
+        }
+      EOF
+      expect { resource.run_action(:run) }.not_to raise_error
     end
   end
 
@@ -347,6 +379,17 @@ describe Chef::Resource::WindowsScript::PowershellScript, :windows_only do
 
     context "with powershell_script as the guard_interpreter" do
 
+      context "when pwsh is the interpreter", :pwsh_installed do
+        before do
+          resource.interpreter "pwsh"
+        end
+
+        it "uses powershell core to evaluate the guard" do
+          resource.not_if "$PSVersionTable.PSEdition -eq 'Core'"
+          expect(resource.should_skip?(:run)).to be_truthy
+        end
+      end
+
       it "has a guard_interpreter attribute set to :powershell_script" do
         expect(resource.guard_interpreter).to eq(:powershell_script)
       end

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

@@ -19,7 +19,7 @@ require "spec_helper"
 require "chef/mixin/shell_out"
 
 metadata = {
-  macos_only: true,
+  macos_1013: true,
   requires_root: true,
 }
 

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

@@ -19,7 +19,7 @@ require "spec_helper"
 require "chef/mixin/shell_out"
 
 metadata = {
-  macos_1014: true,
+  macos_gte_1014: true,
   requires_root: true,
 }
 

data/spec/functional/resource/windows_certificate_spec.rb

@@ -16,18 +16,18 @@
 #
 
 require "spec_helper"
-require "chef/mixin/powershell_out"
+require "chef/mixin/powershell_exec"
 require "chef/resource/windows_certificate"
 
 module WindowsCertificateHelper
-  include Chef::Mixin::PowershellOut
+  include Chef::Mixin::PowershellExec
 
   def create_store(store)
     path = "Cert:\\LocalMachine\\" + store
     command = <<~EOC
       New-Item -Path #{path}
     EOC
-    powershell_out(command)
+    powershell_exec(command)
   end
 
   def cleanup(store)
@@ -35,15 +35,19 @@ module WindowsCertificateHelper
     command = <<~EOC
       Remove-Item -Path #{path} -Recurse
     EOC
-    powershell_out(command)
+    powershell_exec(command)
   end
 
   def no_of_certificates
     path = "Cert:\\LocalMachine\\" + store
+    # Seems weird that we have to call dir twice right?
+    # The powershell pki module cache the last dir in module session state
+    # Issuing dir with a different arg (-Force) seems to refresh that state.
     command = <<~EOC
-      Write-Host (dir #{path} | measure).Count;
+      dir #{path} -Force | Out-Null
+      (dir #{path} | measure).Count
     EOC
-    powershell_out(command).stdout.to_i
+    powershell_exec(command).result.to_i
   end
 end
 

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