chef 14.2.0 → 14.3.37

data/lib/chef/win32/unicode.rb

@@ -48,6 +48,12 @@ module FFI
 
       wide_to_utf8(get_bytes(0, num_wchars * 2))
     end
+
+    def read_utf16string
+      offset = 0
+      offset += 2 while get_bytes(offset, 2) != "\x00\x00"
+      get_bytes(0, offset).force_encoding("utf-16le").encode("utf-8")
+    end
   end
 end
 

data/lib/chef/win32/version.rb

@@ -50,22 +50,22 @@ class Chef
       private_class_method :method_name_from_marketing_name
 
       WIN_VERSIONS = {
-        "Windows 10" => { :major => 10, :minor => 0, :callable => lambda { |product_type, suite_mask| product_type == VER_NT_WORKSTATION } },
-        "Windows Server 2016" => { :major => 10, :minor => 0, :callable => lambda { |product_type, suite_mask| product_type != VER_NT_WORKSTATION } },
-        "Windows 8.1" => { :major => 6, :minor => 3, :callable => lambda { |product_type, suite_mask| product_type == VER_NT_WORKSTATION } },
-        "Windows Server 2012 R2" => { :major => 6, :minor => 3, :callable => lambda { |product_type, suite_mask| product_type != VER_NT_WORKSTATION } },
-        "Windows 8" => { :major => 6, :minor => 2, :callable => lambda { |product_type, suite_mask| product_type == VER_NT_WORKSTATION } },
-        "Windows Server 2012" => { :major => 6, :minor => 2, :callable => lambda { |product_type, suite_mask| product_type != VER_NT_WORKSTATION } },
-        "Windows 7" => { :major => 6, :minor => 1, :callable => lambda { |product_type, suite_mask| product_type == VER_NT_WORKSTATION } },
-        "Windows Server 2008 R2" => { :major => 6, :minor => 1, :callable => lambda { |product_type, suite_mask| product_type != VER_NT_WORKSTATION } },
-        "Windows Server 2008" => { :major => 6, :minor => 0, :callable => lambda { |product_type, suite_mask| product_type != VER_NT_WORKSTATION } },
-        "Windows Vista" => { :major => 6, :minor => 0, :callable => lambda { |product_type, suite_mask| product_type == VER_NT_WORKSTATION } },
-        "Windows Server 2003 R2" => { :major => 5, :minor => 2, :callable => lambda { |product_type, suite_mask| get_system_metrics(SM_SERVERR2) != 0 } },
-        "Windows Home Server" => { :major => 5, :minor => 2, :callable => lambda { |product_type, suite_mask| (suite_mask & VER_SUITE_WH_SERVER) == VER_SUITE_WH_SERVER } },
-        "Windows Server 2003" => { :major => 5, :minor => 2, :callable => lambda { |product_type, suite_mask| get_system_metrics(SM_SERVERR2) == 0 } },
-        "Windows XP" => { :major => 5, :minor => 1 },
-        "Windows 2000" => { :major => 5, :minor => 0 },
-      }
+        "Windows 10" => { major: 10, minor: 0, callable: lambda { |product_type, suite_mask| product_type == VER_NT_WORKSTATION } },
+        "Windows Server 2016" => { major: 10, minor: 0, callable: lambda { |product_type, suite_mask| product_type != VER_NT_WORKSTATION } },
+        "Windows 8.1" => { major: 6, minor: 3, callable: lambda { |product_type, suite_mask| product_type == VER_NT_WORKSTATION } },
+        "Windows Server 2012 R2" => { major: 6, minor: 3, callable: lambda { |product_type, suite_mask| product_type != VER_NT_WORKSTATION } },
+        "Windows 8" => { major: 6, minor: 2, callable: lambda { |product_type, suite_mask| product_type == VER_NT_WORKSTATION } },
+        "Windows Server 2012" => { major: 6, minor: 2, callable: lambda { |product_type, suite_mask| product_type != VER_NT_WORKSTATION } },
+        "Windows 7" => { major: 6, minor: 1, callable: lambda { |product_type, suite_mask| product_type == VER_NT_WORKSTATION } },
+        "Windows Server 2008 R2" => { major: 6, minor: 1, callable: lambda { |product_type, suite_mask| product_type != VER_NT_WORKSTATION } },
+        "Windows Server 2008" => { major: 6, minor: 0, callable: lambda { |product_type, suite_mask| product_type != VER_NT_WORKSTATION } },
+        "Windows Vista" => { major: 6, minor: 0, callable: lambda { |product_type, suite_mask| product_type == VER_NT_WORKSTATION } },
+        "Windows Server 2003 R2" => { major: 5, minor: 2, callable: lambda { |product_type, suite_mask| get_system_metrics(SM_SERVERR2) != 0 } },
+        "Windows Home Server" => { major: 5, minor: 2, callable: lambda { |product_type, suite_mask| (suite_mask & VER_SUITE_WH_SERVER) == VER_SUITE_WH_SERVER } },
+        "Windows Server 2003" => { major: 5, minor: 2, callable: lambda { |product_type, suite_mask| get_system_metrics(SM_SERVERR2) == 0 } },
+        "Windows XP" => { major: 5, minor: 1 },
+        "Windows 2000" => { major: 5, minor: 0 },
+      }.freeze
 
       def initialize
         @major_version, @minor_version, @build_number = get_version

data/spec/functional/audit/rspec_formatter_spec.rb

@@ -30,7 +30,7 @@ describe Chef::Audit::RspecFormatter do
 
   let(:events) { double("events").as_null_object }
   let(:audits) { {} }
-  let(:run_context) { instance_double(Chef::RunContext, :events => events, :audits => audits) }
+  let(:run_context) { instance_double(Chef::RunContext, events: events, audits: audits) }
   let(:runner) { Chef::Audit::Runner.new(run_context) }
 
   let(:output) { double("output") }

data/spec/functional/audit/runner_spec.rb

@@ -49,7 +49,7 @@ describe Chef::Audit::Runner do
   describe "#run" do
 
     let(:audits) { {} }
-    let(:run_context) { instance_double(Chef::RunContext, :events => events, :audits => audits) }
+    let(:run_context) { instance_double(Chef::RunContext, events: events, audits: audits) }
     let(:control_group_name) { "control_group_name" }
 
     # Set cookbook path to include our parent, so that it will recognize this

data/spec/functional/dsl/reboot_pending_spec.rb

@@ -42,19 +42,19 @@ describe Chef::DSL::RebootPending, :windows_only do
 
     describe 'HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\PendingFileRenameOperations' do
       let(:reg_key) { 'HKLM\SYSTEM\CurrentControlSet\Control\Session Manager' }
-      let(:original_set) { registry.value_exists?(reg_key, { :name => "PendingFileRenameOperations" }) }
+      let(:original_set) { registry.value_exists?(reg_key, { name: "PendingFileRenameOperations" }) }
 
       it "returns true if the registry value exists" do
         skip "found existing registry key" if original_set
         registry.set_value(reg_key,
-            { :name => "PendingFileRenameOperations", :type => :multi_string, :data => ['\??\C:\foo.txt|\??\C:\bar.txt'] })
+            { name: "PendingFileRenameOperations", type: :multi_string, data: ['\??\C:\foo.txt|\??\C:\bar.txt'] })
 
         expect(recipe.reboot_pending?).to be_truthy
       end
 
       after do
         unless original_set
-          registry.delete_value(reg_key, { :name => "PendingFileRenameOperations" })
+          registry.delete_value(reg_key, { name: "PendingFileRenameOperations" })
         end
       end
     end

data/spec/functional/dsl/registry_helper_spec.rb

@@ -42,7 +42,7 @@ describe Chef::Resource::RegistryKey, :windows_only do
     end
     it "returns true if registry has specified value" do
       values = @resource.registry_get_values("HKCU\\Software\\Root")
-      expect(values.include?({ :name => "RootType1", :type => :string, :data => "fibrous" })).to eq(true)
+      expect(values.include?({ name: "RootType1", type: :string, data: "fibrous" })).to eq(true)
     end
     it "returns true if specified registry_has_subkey" do
       expect(@resource.registry_has_subkeys?("HKCU\\Software\\Root")).to eq(true)
@@ -52,10 +52,10 @@ describe Chef::Resource::RegistryKey, :windows_only do
       expect(subkeys.include?("Branch")).to eq(true)
     end
     it "returns true if registry_value_exists" do
-      expect(@resource.registry_value_exists?("HKCU\\Software\\Root", { :name => "RootType1", :type => :string, :data => "fibrous" })).to eq(true)
+      expect(@resource.registry_value_exists?("HKCU\\Software\\Root", { name: "RootType1", type: :string, data: "fibrous" })).to eq(true)
     end
     it "returns true if data_value_exists" do
-      expect(@resource.registry_data_exists?("HKCU\\Software\\Root", { :name => "RootType1", :type => :string, :data => "fibrous" })).to eq(true)
+      expect(@resource.registry_data_exists?("HKCU\\Software\\Root", { name: "RootType1", type: :string, data: "fibrous" })).to eq(true)
     end
   end
 end

data/spec/functional/http/simple_spec.rb

@@ -24,7 +24,7 @@ describe Chef::HTTP::Simple do
   include ChefHTTPShared
 
   let(:http_client) { described_class.new(source) }
-  let(:http_client_disable_gzip) { described_class.new(source, { :disable_gzip => true } ) }
+  let(:http_client_disable_gzip) { described_class.new(source, { disable_gzip: true } ) }
 
   before(:all) do
     start_tiny_server(RequestTimeout: 1)

data/spec/functional/knife/exec_spec.rb

@@ -21,7 +21,7 @@ require "tiny_server"
 
 describe Chef::Knife::Exec do
   before(:each) do
-    @server = TinyServer::Manager.new #(:debug => true)
+    @server = TinyServer::Manager.new # (:debug => true)
     @server.start
   end
 

data/spec/functional/knife/ssh_spec.rb

@@ -301,7 +301,7 @@ describe Chef::Knife::Ssh do
       end
 
       it "uses the ssh_gateway_identity file" do
-        expect(@knife.session).to receive(:via).with("ec2.public_hostname", "user", { :keys => File.expand_path("#{ENV['HOME']}/.ssh/aws-gateway.rsa").squeeze("/"), :keys_only => true })
+        expect(@knife.session).to receive(:via).with("ec2.public_hostname", "user", { keys: File.expand_path("#{ENV['HOME']}/.ssh/aws-gateway.rsa").squeeze("/"), keys_only: true })
         @knife.run
         expect(@knife.config[:ssh_gateway_identity]).to eq("~/.ssh/aws-gateway.rsa")
       end
@@ -315,7 +315,7 @@ describe Chef::Knife::Ssh do
       end
 
       it "uses the ssh_gateway_identity file" do
-        expect(@knife.session).to receive(:via).with("ec2.public_hostname", "user", { :keys => File.expand_path("#{ENV['HOME']}/.ssh/aws-gateway.rsa").squeeze("/"), :keys_only => true })
+        expect(@knife.session).to receive(:via).with("ec2.public_hostname", "user", { keys: File.expand_path("#{ENV['HOME']}/.ssh/aws-gateway.rsa").squeeze("/"), keys_only: true })
         @knife.run
         expect(@knife.config[:ssh_gateway_identity]).to eq("~/.ssh/aws-gateway.rsa")
       end

data/spec/functional/mixin/shell_out_spec.rb

@@ -21,6 +21,10 @@ describe Chef::Mixin::ShellOut do
   include Chef::Mixin::ShellOut
 
   describe "shell_out_with_systems_locale" do
+    before do
+      Chef::Config[:treat_deprecation_warnings_as_errors] = false
+    end
+
     describe "when environment['LC_ALL'] is not set" do
       it "should use the default shell_out setting" do
         cmd = if windows?
@@ -36,9 +40,9 @@ describe Chef::Mixin::ShellOut do
     describe "when environment['LC_ALL'] is set" do
       it "should use the option's setting" do
         cmd = if windows?
-                shell_out_with_systems_locale("echo %LC_ALL%", :environment => { "LC_ALL" => "POSIX" })
+                shell_out_with_systems_locale("echo %LC_ALL%", environment: { "LC_ALL" => "POSIX" })
               else
-                shell_out_with_systems_locale("echo $LC_ALL", :environment => { "LC_ALL" => "POSIX" })
+                shell_out_with_systems_locale("echo $LC_ALL", environment: { "LC_ALL" => "POSIX" })
               end
 
         expect(cmd.stdout.chomp).to eq "POSIX"
@@ -62,9 +66,9 @@ describe Chef::Mixin::ShellOut do
     describe "when environment['LC_ALL'] is set" do
       it "should use the option's setting" do
         cmd = if windows?
-                shell_out("echo %LC_ALL%", :environment => { "LC_ALL" => "POSIX" }, default_env: false)
+                shell_out("echo %LC_ALL%", environment: { "LC_ALL" => "POSIX" }, default_env: false)
               else
-                shell_out("echo $LC_ALL", :environment => { "LC_ALL" => "POSIX" }, default_env: false)
+                shell_out("echo $LC_ALL", environment: { "LC_ALL" => "POSIX" }, default_env: false)
               end
 
         expect(cmd.stdout.chomp).to eq "POSIX"

data/spec/functional/rebooter_spec.rb

@@ -22,9 +22,9 @@ describe Chef::Platform::Rebooter do
 
   let(:reboot_info) do
     {
-      :delay_mins => 5,
-      :requested_by => "reboot resource functional test",
-      :reason => "rebooter spec test",
+      delay_mins: 5,
+      requested_by: "reboot resource functional test",
+      reason: "rebooter spec test",
     }
   end
 
@@ -44,9 +44,9 @@ describe Chef::Platform::Rebooter do
 
   let(:expected) do
     {
-      :windows => "#{ENV['SYSTEMROOT']}/System32/shutdown.exe /r /t 300 /c \"rebooter spec test\"",
-      :linux => 'shutdown -r +5 "rebooter spec test" &',
-      :solaris => 'shutdown -i6 -g5 -y "rebooter spec test" &',
+      windows: "#{ENV['SYSTEMROOT']}/System32/shutdown.exe /r /t 300 /c \"rebooter spec test\"",
+      linux: 'shutdown -r +5 "rebooter spec test" &',
+      solaris: 'shutdown -i6 -g5 -y "rebooter spec test" &',
     }
   end
 

data/spec/functional/resource/aixinit_service_spec.rb

@@ -59,7 +59,7 @@ describe Chef::Resource::Service, :requires_root, :aix_only do
   let(:new_resource) do
     new_resource = Chef::Resource::Service.new("chefinittest", run_context)
     new_resource.provider Chef::Provider::Service::AixInit
-    new_resource.supports({ :status => true, :restart => true, :reload => true })
+    new_resource.supports({ status: true, restart: true, reload: true })
     new_resource
   end
 
@@ -70,7 +70,7 @@ describe Chef::Resource::Service, :requires_root, :aix_only do
 
   before(:all) do
     File.delete("/etc/rc.d/init.d/chefinittest") if File.exists?("/etc/rc.d/init.d/chefinittest")
-    FileUtils.cp("#{File.join(File.dirname(__FILE__), "/../assets/chefinittest")}", "/etc/rc.d/init.d/chefinittest")
+    FileUtils.cp((File.join(File.dirname(__FILE__), "/../assets/chefinittest")).to_s, "/etc/rc.d/init.d/chefinittest")
   end
 
   after(:all) do

data/spec/functional/resource/apt_package_spec.rb

@@ -50,11 +50,11 @@ module AptServer
 
   def apt_server
     @apt_server ||= WEBrick::HTTPServer.new(
-      :Port         => 9000,
-      :DocumentRoot => apt_data_dir + "/var/www/apt",
+      Port: 9000,
+      DocumentRoot: apt_data_dir + "/var/www/apt",
       # Make WEBrick quiet, comment out for debug.
-      :Logger       => Logger.new(StringIO.new),
-      :AccessLog    => [ StringIO.new, WEBrick::AccessLog::COMMON_LOG_FORMAT ]
+      Logger: Logger.new(StringIO.new),
+      AccessLog: [ StringIO.new, WEBrick::AccessLog::COMMON_LOG_FORMAT ]
     )
   end
 
@@ -86,10 +86,10 @@ module AptServer
   end
 end
 
-metadata = { :unix_only => true,
-             :requires_root => true,
-             :provider => { :package => Chef::Provider::Package::Apt },
-             :arch => "x86_64" # test packages are 64bit
+metadata = { unix_only: true,
+             requires_root: true,
+             provider: { package: Chef::Provider::Package::Apt },
+             arch: "x86_64" # test packages are 64bit
 }
 
 describe Chef::Resource::AptPackage, metadata do
@@ -169,13 +169,13 @@ describe Chef::Resource::AptPackage, metadata do
 
       it "does nothing for action :remove" do
         package_resource.run_action(:remove)
-        shell_out!("dpkg -l chef-integration-test", :returns => [1])
+        shell_out!("dpkg -l chef-integration-test", returns: [1])
         expect(package_resource).not_to be_updated_by_last_action
       end
 
       it "does nothing for action :purge" do
         package_resource.run_action(:purge)
-        shell_out!("dpkg -l chef-integration-test", :returns => [1])
+        shell_out!("dpkg -l chef-integration-test", returns: [1])
         expect(package_resource).not_to be_updated_by_last_action
       end
 
@@ -275,7 +275,7 @@ describe Chef::Resource::AptPackage, metadata do
               r = base_resource
               r.cookbook_name = "preseed"
               r.response_file("preseed-template-variables.seed")
-              r.response_file_variables({ :template_variable => "SUPPORTS VARIABLES" })
+              r.response_file_variables({ template_variable: "SUPPORTS VARIABLES" })
               r
             end
 
@@ -300,13 +300,13 @@ describe Chef::Resource::AptPackage, metadata do
 
       it "does nothing for action :install" do
         package_resource.run_action(:install)
-        shell_out!("dpkg -l chef-integration-test", :returns => [0])
+        shell_out!("dpkg -l chef-integration-test", returns: [0])
         expect(package_resource).not_to be_updated_by_last_action
       end
 
       it "does nothing for action :upgrade" do
         package_resource.run_action(:upgrade)
-        shell_out!("dpkg -l chef-integration-test", :returns => [0])
+        shell_out!("dpkg -l chef-integration-test", returns: [0])
         expect(package_resource).not_to be_updated_by_last_action
       end
 
@@ -324,7 +324,7 @@ describe Chef::Resource::AptPackage, metadata do
       # un  chef-integration-test             <none>                                    (no description available)
       def pkg_should_be_removed
         # will raise if exit code != 0,1
-        pkg_check = shell_out!("dpkg -l chef-integration-test", :returns => [0, 1])
+        pkg_check = shell_out!("dpkg -l chef-integration-test", returns: [0, 1])
 
         if pkg_check.exitstatus == 0
           expect(pkg_check.stdout).to match(/un[\s]+chef-integration-test/)
@@ -353,13 +353,13 @@ describe Chef::Resource::AptPackage, metadata do
 
       it "does nothing for action :install" do
         package_resource.run_action(:install)
-        shell_out!("dpkg -l chef-integration-test", :returns => [0])
+        shell_out!("dpkg -l chef-integration-test", returns: [0])
         expect(package_resource).not_to be_updated_by_last_action
       end
 
       it "upgrades the package for action :upgrade" do
         package_resource.run_action(:upgrade)
-        dpkg_l = shell_out!("dpkg -l chef-integration-test", :returns => [0])
+        dpkg_l = shell_out!("dpkg -l chef-integration-test", returns: [0])
         expect(dpkg_l.stdout).to match(/chef\-integration\-test[\s]+1\.1\-1/)
         expect(package_resource).to be_updated_by_last_action
       end
@@ -373,7 +373,7 @@ describe Chef::Resource::AptPackage, metadata do
 
         it "upgrades the package for action :install" do
           package_resource.run_action(:install)
-          dpkg_l = shell_out!("dpkg -l chef-integration-test", :returns => [0])
+          dpkg_l = shell_out!("dpkg -l chef-integration-test", returns: [0])
           expect(dpkg_l.stdout).to match(/chef\-integration\-test[\s]+1\.1\-1/)
           expect(package_resource).to be_updated_by_last_action
         end

data/spec/functional/resource/bash_spec.rb

@@ -27,7 +27,7 @@ describe Chef::Resource::Bash, :unix_only do
     resource
   end
 
-  describe "when setting the command attribute" do
+  describe "when setting the command property" do
     let (:command) { "wizard racket" }
 
     it "should raise an exception when trying to set the command" do

data/spec/functional/resource/bff_spec.rb

@@ -20,7 +20,7 @@ require "functional/resource/base"
 require "chef/mixin/shell_out"
 
 # Run the test only for AIX platform.
-describe Chef::Resource::BffPackage, :requires_root, :external => ohai[:platform] != "aix" do
+describe Chef::Resource::BffPackage, :requires_root, external: ohai[:platform] != "aix" do
   include Chef::Mixin::ShellOut
 
   let(:new_resource) do

data/spec/functional/resource/cron_spec.rb

@@ -105,7 +105,7 @@ describe Chef::Resource::Cron, :requires_root, :unix_only do
   end
 
   exclude_solaris = %w{solaris opensolaris solaris2 omnios}.include?(ohai[:platform])
-  describe "create action with various attributes", :external => exclude_solaris do
+  describe "create action with various attributes", external: exclude_solaris do
     def create_and_validate_with_attribute(resource, attribute, value)
       if ohai[:platform] == "aix"
         expect { resource.run_action(:create) }.to raise_error(Chef::Exceptions::Cron, /Aix cron entry does not support environment variables. Please set them in script and use script in cron./)

data/spec/functional/resource/dnf_package_spec.rb

@@ -21,7 +21,7 @@ require "chef/mixin/shell_out"
 
 # run this test only for following platforms.
 exclude_test = !(%w{rhel fedora}.include?(ohai[:platform_family]) && File.exist?("/usr/bin/dnf"))
-describe Chef::Resource::RpmPackage, :requires_root, :external => exclude_test do
+describe Chef::Resource::RpmPackage, :requires_root, external: exclude_test do
   include Chef::Mixin::ShellOut
 
   def flush_cache
@@ -39,12 +39,12 @@ describe Chef::Resource::RpmPackage, :requires_root, :external => exclude_test d
 
   before(:each) do
     File.open("/etc/yum.repos.d/chef-dnf-localtesting.repo", "w+") do |f|
-      f.write <<-EOF
-[chef-dnf-localtesting]
-name=Chef DNF spec testing repo
-baseurl=file://#{CHEF_SPEC_ASSETS}/yumrepo
-enable=1
-gpgcheck=0
+      f.write <<~EOF
+        [chef-dnf-localtesting]
+        name=Chef DNF spec testing repo
+        baseurl=file://#{CHEF_SPEC_ASSETS}/yumrepo
+        enable=1
+        gpgcheck=0
       EOF
     end
     shell_out!("rpm -qa | grep chef_rpm | xargs -r rpm -e")

data/spec/functional/resource/dsc_script_spec.rb

@@ -147,38 +147,38 @@ EOH
   let(:dsc_user_suffix_code) { dsc_user_suffix }
   let(:dsc_script_environment_attribute) { nil }
   let(:dsc_user_resources_code) do
-    <<-EOH
-  #{config_param_section}
-node localhost
-{
-$testuser = #{dsc_user_code}
-$testpassword = ConvertTo-SecureString -String "jf9a8m49jrajf4#" -AsPlainText -Force
-$testcred = New-Object -TypeName System.Management.Automation.PSCredential -ArgumentList $testuser, $testpassword
-
-User dsctestusercreate
-{
-    UserName = $testuser
-    Password = $testcred
-    Description = "DSC test user"
-    Ensure = "Present"
-    Disabled = $false
-    PasswordNeverExpires = $true
-    PasswordChangeRequired = $false
-}
-}
+    <<~EOH
+        #{config_param_section}
+      node localhost
+      {
+      $testuser = #{dsc_user_code}
+      $testpassword = ConvertTo-SecureString -String "jf9a8m49jrajf4#" -AsPlainText -Force
+      $testcred = New-Object -TypeName System.Management.Automation.PSCredential -ArgumentList $testuser, $testpassword
+
+      User dsctestusercreate
+      {
+          UserName = $testuser
+          Password = $testcred
+          Description = "DSC test user"
+          Ensure = "Present"
+          Disabled = $false
+          PasswordNeverExpires = $true
+          PasswordChangeRequired = $false
+      }
+      }
 EOH
   end
 
   let(:dsc_user_config_data) do
-    <<-EOH
-@{
-    AllNodes = @(
-        @{
-            NodeName = "localhost";
-            PSDscAllowPlainTextPassword = $true
-        }
-    )
-}
+    <<~EOH
+      @{
+          AllNodes = @(
+              @{
+                  NodeName = "localhost";
+                  PSDscAllowPlainTextPassword = $true
+              }
+          )
+      }
 
 EOH
   end
@@ -188,17 +188,17 @@ EOH
   let(:dsc_environment_fail_etc_directory) { "#{ENV['systemroot']}\\system32\\drivers\\etc" }
   let(:exception_message_signature) { "LL927-LL928" }
   let(:dsc_environment_config) do
-    <<-EOH
-if (($pwd.path -eq '#{dsc_environment_fail_etc_directory}') -and (test-path('#{dsc_environment_fail_etc_directory}')))
-{
-    throw 'Signature #{exception_message_signature}: Purposefully failing because cwd == #{dsc_environment_fail_etc_directory}'
-}
-environment "whatsmydir"
-{
-    Name = '#{dsc_environment_env_var_name}'
-    Value = $pwd.path
-    Ensure = 'Present'
-}
+    <<~EOH
+      if (($pwd.path -eq '#{dsc_environment_fail_etc_directory}') -and (test-path('#{dsc_environment_fail_etc_directory}')))
+      {
+          throw 'Signature #{exception_message_signature}: Purposefully failing because cwd == #{dsc_environment_fail_etc_directory}'
+      }
+      environment "whatsmydir"
+      {
+          Name = '#{dsc_environment_env_var_name}'
+          Value = $pwd.path
+          Ensure = 'Present'
+      }
 EOH
   end
 
@@ -234,7 +234,7 @@ EOH
       expect(dsc_test_resource.registry_key_exists?(test_registry_key)).to eq(false)
       dsc_test_resource.run_action(:run)
       expect(dsc_test_resource.registry_key_exists?(test_registry_key)).to eq(true)
-      expect(dsc_test_resource.registry_value_exists?(test_registry_key, { :name => test_registry_value, :type => :string, :data => test_registry_data })).to eq(true)
+      expect(dsc_test_resource.registry_value_exists?(test_registry_key, { name: test_registry_value, type: :string, data: test_registry_data })).to eq(true)
     end
 
     it_should_behave_like "a dsc_script resource with configuration affected by cwd"
@@ -243,12 +243,12 @@ EOH
   shared_examples_for "a dsc_script resource with configuration affected by cwd" do
     after(:each) do
       removal_resource = Chef::Resource::DscScript.new(dsc_test_resource_name, dsc_test_run_context)
-      removal_resource.code <<-EOH
-environment 'removethis'
-{
-   Name = '#{dsc_environment_env_var_name}'
-   Ensure = 'Absent'
-}
+      removal_resource.code <<~EOH
+        environment 'removethis'
+        {
+           Name = '#{dsc_environment_env_var_name}'
+           Ensure = 'Absent'
+        }
 EOH
       removal_resource.run_action(:run)
     end
@@ -314,7 +314,7 @@ EOH
         expect(dsc_test_resource.registry_key_exists?(test_registry_key)).to eq(false)
         dsc_test_resource.run_action(:run)
         expect(dsc_test_resource.registry_key_exists?(test_registry_key)).to eq(true)
-        expect(dsc_test_resource.registry_value_exists?(test_registry_key, { :name => test_registry_value, :type => :string, :data => test_registry_data })).to eq(true)
+        expect(dsc_test_resource.registry_value_exists?(test_registry_key, { name: test_registry_value, type: :string, data: test_registry_data })).to eq(true)
       end
     end
   end
@@ -347,7 +347,7 @@ EOH
   shared_examples_for "a dsc_script with configuration data that takes parameters" do
     let(:dsc_user_code) { dsc_user_param_code }
     let(:config_param_section) { config_params }
-    let(:config_flags) { { :"#{dsc_user_prefix_param_name}" => "#{dsc_user_prefix}", :"#{dsc_user_suffix_param_name}" => "#{dsc_user_suffix}" } }
+    let(:config_flags) { { :"#{dsc_user_prefix_param_name}" => (dsc_user_prefix).to_s, :"#{dsc_user_suffix_param_name}" => (dsc_user_suffix).to_s } }
     it "does not directly contain the user name" do
       configuration_script_content = ::File.open(dsc_test_resource.command) do |file|
         file.read
@@ -409,45 +409,45 @@ EOH
     end
 
     let(:dsc_configuration_script) do
-      <<-MYCODE
-cd c:\\
-configuration LCM
-{
-  param ($thumbprint)
-  localconfigurationmanager
-  {
-    RebootNodeIfNeeded = $false
-    ConfigurationMode = 'ApplyOnly'
-    CertificateID = $thumbprint
-  }
-}
-$cert = ls Cert:\\LocalMachine\\My\\ |
-  Where-Object {$_.Subject -match "ChefTest"} |
-  Select -first 1
-
-if($cert -eq $null) {
-  $pfxpath = '#{self_signed_cert_path}'
-  $password = ''
-  $cert = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2($pfxpath, $password, ([System.Security.Cryptography.X509Certificates.X509KeyStorageFlags]::PersistKeySet -bor [System.Security.Cryptography.X509Certificates.X509KeyStorageFlags]::MachineKeyset))
-  $store = New-Object System.Security.Cryptography.X509Certificates.X509Store "My", ([System.Security.Cryptography.X509Certificates.StoreLocation]::LocalMachine)
-  $store.Open([System.Security.Cryptography.X509Certificates.OpenFlags]::ReadWrite)
-  $store.Add($cert)
-  $store.Close()
-}
-
-lcm -thumbprint $cert.thumbprint
-set-dsclocalconfigurationmanager -path ./LCM
-$ConfigurationData = @"
-@{
-AllNodes = @(
-  @{
-  NodeName = "localhost";
-  CertificateID = '$($cert.thumbprint)';
-  };
-);
-}
-"@
-$ConfigurationData | out-file '#{configuration_data_path}' -force
+      <<~MYCODE
+        cd c:\\
+        configuration LCM
+        {
+          param ($thumbprint)
+          localconfigurationmanager
+          {
+            RebootNodeIfNeeded = $false
+            ConfigurationMode = 'ApplyOnly'
+            CertificateID = $thumbprint
+          }
+        }
+        $cert = ls Cert:\\LocalMachine\\My\\ |
+          Where-Object {$_.Subject -match "ChefTest"} |
+          Select -first 1
+
+        if($cert -eq $null) {
+          $pfxpath = '#{self_signed_cert_path}'
+          $password = ''
+          $cert = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2($pfxpath, $password, ([System.Security.Cryptography.X509Certificates.X509KeyStorageFlags]::PersistKeySet -bor [System.Security.Cryptography.X509Certificates.X509KeyStorageFlags]::MachineKeyset))
+          $store = New-Object System.Security.Cryptography.X509Certificates.X509Store "My", ([System.Security.Cryptography.X509Certificates.StoreLocation]::LocalMachine)
+          $store.Open([System.Security.Cryptography.X509Certificates.OpenFlags]::ReadWrite)
+          $store.Add($cert)
+          $store.Close()
+        }
+
+        lcm -thumbprint $cert.thumbprint
+        set-dsclocalconfigurationmanager -path ./LCM
+        $ConfigurationData = @"
+        @{
+        AllNodes = @(
+          @{
+          NodeName = "localhost";
+          CertificateID = '$($cert.thumbprint)';
+          };
+        );
+        }
+        "@
+        $ConfigurationData | out-file '#{configuration_data_path}' -force
   MYCODE
     end
 
@@ -460,13 +460,13 @@ $ConfigurationData | out-file '#{configuration_data_path}' -force
 
     let(:dsc_script_resource) do
       dsc_test_resource_base.tap do |r|
-        r.code <<-EOF
-User dsctestusercreate
-{
-    UserName = '#{dsc_user}'
-    Password = #{r.ps_credential('jf9a8m49jrajf4#')}
-    Ensure = "Present"
-}
+        r.code <<~EOF
+          User dsctestusercreate
+          {
+              UserName = '#{dsc_user}'
+              Password = #{r.ps_credential('jf9a8m49jrajf4#')}
+              Ensure = "Present"
+          }
 EOF
         r.configuration_data_script(configuration_data_path)
       end