chef 16.7.61 → 16.9.20

data/spec/unit/util/dsc/configuration_generator_spec.rb

@@ -25,6 +25,85 @@ describe Chef::Util::DSC::ConfigurationGenerator do
     Chef::Util::DSC::ConfigurationGenerator.new(node, "tmp")
   end
 
+  describe "#validate_switch_name!" do
+    it "should not raise an error if a name contains all upper case letters" do
+      conf_man.send(:validate_switch_name!, "HELLO")
+    end
+
+    it "should not raise an error if the name contains all lower case letters" do
+      conf_man.send(:validate_switch_name!, "hello")
+    end
+
+    it "should not raise an error if no special characters are used except _" do
+      conf_man.send(:validate_switch_name!, "hello_world")
+    end
+
+    %w{! @ # $ % ^ & * & * ( ) - = + \{ \} . ? < > \\ /}.each do |sym|
+      it "raises an ArgumentError if configuration name contains #{sym}" do
+        expect do
+          conf_man.send(:validate_switch_name!, "Hello#{sym}")
+        end.to raise_error(ArgumentError)
+      end
+    end
+  end
+
+  describe "#escape_parameter_value" do
+    # Is this list really complete?
+    %w{` " # '}.each do |c|
+      it "escapes #{c}" do
+        expect(conf_man.send(:escape_parameter_value, "stuff #{c}")).to eql("stuff `#{c}")
+      end
+    end
+
+    it "does not do anything to a string without special characters" do
+      expect(conf_man.send(:escape_parameter_value, "stuff")).to eql("stuff")
+    end
+  end
+
+  describe "#escape_string_parameter_value" do
+    it "surrounds a string with ''" do
+      expect(conf_man.send(:escape_string_parameter_value, "stuff")).to eql("'stuff'")
+    end
+  end
+
+  describe "#command_switches_string" do
+    it "raises an ArgumentError if the key is not a symbol" do
+      expect do
+        conf_man.send(:command_switches_string, { "foo" => "bar" })
+      end.to raise_error(ArgumentError)
+    end
+
+    it "does not allow invalid switch names" do
+      expect do
+        conf_man.send(:command_switches_string, { foo!: "bar" })
+      end.to raise_error(ArgumentError)
+    end
+
+    it "ignores switches with a false value" do
+      expect(conf_man.send(:command_switches_string, { foo: false })).to eql("")
+    end
+
+    it "should correctly handle a value type of string" do
+      expect(conf_man.send(:command_switches_string, { foo: "bar" })).to eql("-foo 'bar'")
+    end
+
+    it "should correctly handle a value type of string even when it is 0 length" do
+      expect(conf_man.send(:command_switches_string, { foo: "" })).to eql("-foo ''")
+    end
+
+    it "should not quote integers" do
+      expect(conf_man.send(:command_switches_string, { foo: 1 })).to eql("-foo 1")
+    end
+
+    it "should not quote floats" do
+      expect(conf_man.send(:command_switches_string, { foo: 1.0 })).to eql("-foo 1.0")
+    end
+
+    it "has just the switch when the value is true" do
+      expect(conf_man.send(:command_switches_string, { foo: true })).to eql("-foo")
+    end
+  end
+
   describe "#validate_configuration_name!" do
     it "should not raise an error if a name contains all upper case letters" do
       conf_man.send(:validate_configuration_name!, "HELLO")

data/spec/unit/util/dsc/local_configuration_manager_spec.rb

@@ -49,23 +49,22 @@ describe Chef::Util::DSC::LocalConfigurationManager do
     EOH
   end
 
-  let(:lcm_status) do
-    double("LCM cmdlet status", stderr: lcm_standard_error, return_value: lcm_standard_output, succeeded?: lcm_cmdlet_success)
+  let(:powershell) do
+    double("Chef::PowerShell", errors: lcm_errors, error?: !lcm_errors.empty?, result: lcm_result)
   end
 
   describe "test_configuration method invocation" do
     context "when interacting with the LCM using a PowerShell cmdlet" do
       before(:each) do
-        allow(lcm).to receive(:run_configuration_cmdlet).and_return(lcm_status)
+        allow(lcm).to receive(:run_configuration_cmdlet).and_return(powershell)
         allow(lcm).to receive(:ps_version_gte_5?).and_return(false)
       end
       context "that returns successfully" do
-        let(:lcm_standard_output) { normal_lcm_output }
-        let(:lcm_standard_error) { nil }
-        let(:lcm_cmdlet_success) { true }
+        let(:lcm_result) { normal_lcm_output }
+        let(:lcm_errors) { [] }
 
         it "successfully returns resource information for normally formatted output when cmdlet the cmdlet succeeds" do
-          test_configuration_result = lcm.test_configuration("config", {})
+          test_configuration_result = lcm.test_configuration("config")
           expect(test_configuration_result.class).to be(Array)
           expect(test_configuration_result.length).to be > 0
           expect(Chef::Log).not_to receive(:warn)
@@ -73,13 +72,12 @@ describe Chef::Util::DSC::LocalConfigurationManager do
       end
 
       context "when running on PowerShell version 5" do
-        let(:lcm_standard_output) { normal_lcm_output }
-        let(:lcm_standard_error) { nil }
-        let(:lcm_cmdlet_success) { true }
+        let(:lcm_result) { normal_lcm_output }
+        let(:lcm_errors) { [] }
 
         it "successfully returns resource information for normally formatted output when cmdlet the cmdlet succeeds" do
           allow(lcm).to receive(:ps_version_gte_5?).and_return(true)
-          test_configuration_result = lcm.test_configuration("config", {})
+          test_configuration_result = lcm.test_configuration("config")
           expect(test_configuration_result.class).to be(Array)
           expect(test_configuration_result.length).to be > 0
           expect(Chef::Log).not_to receive(:warn)
@@ -87,13 +85,12 @@ describe Chef::Util::DSC::LocalConfigurationManager do
       end
 
       context "when running on PowerShell version less than 5" do
-        let(:lcm_standard_output) { normal_lcm_output }
-        let(:lcm_standard_error) { nil }
-        let(:lcm_cmdlet_success) { true }
+        let(:lcm_result) { normal_lcm_output }
+        let(:lcm_errors) { [] }
 
         it "successfully returns resource information for normally formatted output when cmdlet the cmdlet succeeds" do
           allow(lcm).to receive(:ps_version_gte_5?).and_return(false)
-          test_configuration_result = lcm.test_configuration("config", {})
+          test_configuration_result = lcm.test_configuration("config")
           expect(test_configuration_result.class).to be(Array)
           expect(test_configuration_result.length).to be > 0
           expect(Chef::Log).not_to receive(:warn)
@@ -104,10 +101,9 @@ describe Chef::Util::DSC::LocalConfigurationManager do
         let(:common_command_prefix) { "$ProgressPreference = 'SilentlyContinue';" }
         let(:ps4_base_command) { "#{common_command_prefix} Start-DscConfiguration -path tmp -wait -erroraction 'stop' -force" }
         let(:lcm_command_ps4) { ps4_base_command + " -whatif; if (! $?) { exit 1 }" }
-        let(:lcm_command_ps5) { "#{common_command_prefix} Test-DscConfiguration -path tmp | format-list" }
-        let(:lcm_standard_output) { normal_lcm_output }
-        let(:lcm_standard_error) { nil }
-        let(:lcm_cmdlet_success) { true }
+        let(:lcm_command_ps5) { "#{common_command_prefix} Test-DscConfiguration -path tmp | format-list | Out-String" }
+        let(:lcm_result) { normal_lcm_output }
+        let(:lcm_errors) { [] }
 
         it "successfully returns command when apply_configuration true" do
           expect(lcm.send(:lcm_command, true)).to eq(ps4_base_command)
@@ -125,9 +121,8 @@ describe Chef::Util::DSC::LocalConfigurationManager do
       end
 
       context "that fails due to missing what-if switch in DSC resource cmdlet implementation" do
-        let(:lcm_standard_output) { "" }
-        let(:lcm_standard_error) { no_whatif_lcm_output }
-        let(:lcm_cmdlet_success) { false }
+        let(:lcm_result) { "" }
+        let(:lcm_errors) { [no_whatif_lcm_output] }
 
         it "returns true when passed to #whatif_not_supported?" do
           expect(lcm.send(:whatif_not_supported?, no_whatif_lcm_output)).to be_truthy
@@ -137,40 +132,38 @@ describe Chef::Util::DSC::LocalConfigurationManager do
           expect(Chef::Log).to receive(:warn).at_least(:once)
           expect(lcm).to receive(:whatif_not_supported?).and_call_original
           test_configuration_result = nil
-          expect { test_configuration_result = lcm.test_configuration("config", {}) }.not_to raise_error
+          expect { test_configuration_result = lcm.test_configuration("config") }.not_to raise_error
           expect(test_configuration_result.class).to be(Array)
         end
       end
 
       context "that fails due to a DSC resource not being imported before StartDSCConfiguration -whatif is executed" do
-        let(:lcm_standard_output) { "" }
-        let(:lcm_standard_error) { dsc_resource_import_failure_output }
-        let(:lcm_cmdlet_success) { false }
+        let(:lcm_result) { "" }
+        let(:lcm_errors) { [dsc_resource_import_failure_output] }
 
         it "logs a warning if the message is formatted as expected when a resource import failure occurs" do
           expect(Chef::Log).to receive(:warn).at_least(:once)
           expect(lcm).to receive(:dsc_module_import_failure?).and_call_original
           test_configuration_result = nil
-          expect { test_configuration_result = lcm.test_configuration("config", {}) }.not_to raise_error
+          expect { test_configuration_result = lcm.test_configuration("config") }.not_to raise_error
         end
 
         it "returns a (possibly empty) array of ResourceInfo instances" do
           expect(Chef::Log).to receive(:warn).at_least(:once)
           test_configuration_result = nil
-          expect { test_configuration_result = lcm.test_configuration("config", {}) }.not_to raise_error
+          expect { test_configuration_result = lcm.test_configuration("config") }.not_to raise_error
           expect(test_configuration_result.class).to be(Array)
         end
       end
 
       context "that fails due to an unknown PowerShell cmdlet error" do
-        let(:lcm_standard_output) { "some output" }
-        let(:lcm_standard_error) { "Abort, Retry, Fail?" }
-        let(:lcm_cmdlet_success) { false }
+        let(:lcm_result) { "some output" }
+        let(:lcm_errors) { ["Abort, Retry, Fail?"] }
 
         it "logs a warning" do
           expect(Chef::Log).to receive(:warn).at_least(:once)
           expect(lcm).to receive(:dsc_module_import_failure?).and_call_original
-          expect { lcm.test_configuration("config", {}) }.not_to raise_error
+          expect { lcm.test_configuration("config") }.not_to raise_error
         end
       end
     end
@@ -188,12 +181,11 @@ describe Chef::Util::DSC::LocalConfigurationManager do
     end
   end
 
-  describe "#run_configuration_cmdlet" do
+  describe "#run_configuration_cmdlet", :windows_powershell_dsc_only do
     context "when invalid dsc script is given" do
       it "raises exception" do
         configuration_document = "invalid-config"
-        shellout_flags = { cwd: nil, environment: nil, timeout: nil }
-        expect { lcm.send(:run_configuration_cmdlet, configuration_document, true, shellout_flags) }.to raise_error(Chef::Exceptions::PowershellCmdletException)
+        expect { lcm.send(:run_configuration_cmdlet, configuration_document, true) }.to raise_error(Chef::PowerShell::CommandFailed)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 16.7.61
+  version: 16.9.20
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-25 00:00:00.000000000 Z
+date: 2021-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 16.7.61
+        version: 16.9.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 16.7.61
+        version: 16.9.20
 - !ruby/object:Gem::Dependency
   name: chef-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 16.7.61
+        version: 16.9.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 16.7.61
+        version: 16.9.20
 - !ruby/object:Gem::Dependency
   name: train-core
   requirement: !ruby/object:Gem::Requirement
@@ -206,6 +206,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '16.0'
+- !ruby/object:Gem::Dependency
+  name: inspec-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.23'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.23'
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
@@ -240,7 +254,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -250,7 +264,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -314,14 +328,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc1
+        version: 1.1.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc1
+        version: 1.1.0.rc2
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -717,6 +731,14 @@ files:
 - lib/chef/chef_fs/parallelizer/parallel_enumerable.rb
 - lib/chef/chef_fs/path_utils.rb
 - lib/chef/client.rb
+- lib/chef/compliance/default_attributes.rb
+- lib/chef/compliance/fetcher/automate.rb
+- lib/chef/compliance/fetcher/chef_server.rb
+- lib/chef/compliance/reporter/automate.rb
+- lib/chef/compliance/reporter/chef_server_automate.rb
+- lib/chef/compliance/reporter/compliance_enforcer.rb
+- lib/chef/compliance/reporter/json_file.rb
+- lib/chef/compliance/runner.rb
 - lib/chef/config.rb
 - lib/chef/config_fetcher.rb
 - lib/chef/constants.rb
@@ -884,6 +906,7 @@ files:
 - lib/chef/knife/cookbook_upload.rb
 - lib/chef/knife/core/bootstrap_context.rb
 - lib/chef/knife/core/cookbook_scm_repo.rb
+- lib/chef/knife/core/formatting_options.rb
 - lib/chef/knife/core/gem_glob_loader.rb
 - lib/chef/knife/core/generic_presenter.rb
 - lib/chef/knife/core/hashed_command_loader.rb
@@ -1441,8 +1464,6 @@ files:
 - lib/chef/util/editor.rb
 - lib/chef/util/file_edit.rb
 - lib/chef/util/path_helper.rb
-- lib/chef/util/powershell/cmdlet.rb
-- lib/chef/util/powershell/cmdlet_result.rb
 - lib/chef/util/powershell/ps_credential.rb
 - lib/chef/util/selinux.rb
 - lib/chef/util/threaded_job_queue.rb
@@ -1754,6 +1775,10 @@ files:
 - spec/data/root_alias_cookbooks/simple/attributes.rb
 - spec/data/root_alias_cookbooks/simple/metadata.rb
 - spec/data/root_alias_cookbooks/simple/recipe.rb
+- spec/data/rubygems.org/latest_specs.4.8.gz
+- spec/data/rubygems.org/nonexistent_gem
+- spec/data/rubygems.org/sexp_processor
+- spec/data/rubygems.org/sexp_processor-4.15.1.gemspec.rz
 - spec/data/run_context/cookbooks/circular-dep1/attributes/default.rb
 - spec/data/run_context/cookbooks/circular-dep1/definitions/circular_dep1_res.rb
 - spec/data/run_context/cookbooks/circular-dep1/libraries/lib.rb
@@ -1835,6 +1860,8 @@ files:
 - spec/data/snap_package/get_conf_success.json
 - spec/data/snap_package/result_failure.json
 - spec/data/ssl/5e707473.0
+- spec/data/ssl/binary/chef-rspec-der.cert
+- spec/data/ssl/binary/chef-rspec-der.key
 - spec/data/ssl/chef-rspec.cert
 - spec/data/ssl/chef-rspec.key
 - spec/data/ssl/key.pem
@@ -1854,8 +1881,6 @@ files:
 - spec/data/trusted_certs/intermediate.pem
 - spec/data/trusted_certs/opscode.pem
 - spec/data/trusted_certs/root.pem
-- spec/data/trusted_certs_empty/.gitkeep
-- spec/data/trusted_certs_empty/README.md
 - spec/data/windows_certificates/base64_test.cer
 - spec/data/windows_certificates/othertest.cer
 - spec/data/windows_certificates/test.cer
@@ -1989,7 +2014,6 @@ files:
 - spec/functional/shell_spec.rb
 - spec/functional/tiny_server_spec.rb
 - spec/functional/util/path_helper_spec.rb
-- spec/functional/util/powershell/cmdlet_spec.rb
 - spec/functional/version_spec.rb
 - spec/functional/win32/crypto_spec.rb
 - spec/functional/win32/registry_spec.rb
@@ -2001,6 +2025,7 @@ files:
 - spec/integration/client/client_spec.rb
 - spec/integration/client/exit_code_spec.rb
 - spec/integration/client/ipv6_spec.rb
+- spec/integration/compliance/compliance_spec.rb
 - spec/integration/knife/chef_fs_data_store_spec.rb
 - spec/integration/knife/chef_repo_path_spec.rb
 - spec/integration/knife/chef_repository_file_system_spec.rb
@@ -2080,7 +2105,6 @@ files:
 - spec/integration/recipes/use_partial_spec.rb
 - spec/integration/solo/solo_spec.rb
 - spec/rcov.opts
-- spec/scripts/ssl-serve.rb
 - spec/spec_helper.rb
 - spec/stress/win32/file_spec.rb
 - spec/stress/win32/memory_spec.rb
@@ -2165,6 +2189,12 @@ files:
 - spec/unit/chef_fs/path_util_spec.rb
 - spec/unit/chef_spec.rb
 - spec/unit/client_spec.rb
+- spec/unit/compliance/fetcher/automate_spec.rb
+- spec/unit/compliance/fetcher/chef_server_spec.rb
+- spec/unit/compliance/reporter/automate_spec.rb
+- spec/unit/compliance/reporter/chef_server_automate_spec.rb
+- spec/unit/compliance/reporter/compliance_enforcer_spec.rb
+- spec/unit/compliance/runner_spec.rb
 - spec/unit/config_fetcher_spec.rb
 - spec/unit/config_spec.rb
 - spec/unit/cookbook/chefignore_spec.rb
@@ -2267,6 +2297,7 @@ files:
 - spec/unit/knife/core/hashed_command_loader_spec.rb
 - spec/unit/knife/core/node_editor_spec.rb
 - spec/unit/knife/core/object_loader_spec.rb
+- spec/unit/knife/core/status_presenter_spec.rb
 - spec/unit/knife/core/subcommand_loader_spec.rb
 - spec/unit/knife/core/ui_spec.rb
 - spec/unit/knife/core/windows_bootstrap_context_spec.rb
@@ -2626,6 +2657,7 @@ files:
 - spec/unit/resource/systemd_unit_spec.rb
 - spec/unit/resource/template_spec.rb
 - spec/unit/resource/timezone_spec.rb
+- spec/unit/resource/user/windows_user_spec.rb
 - spec/unit/resource/user_spec.rb
 - spec/unit/resource/user_ulimit_spec.rb
 - spec/unit/resource/windows_ad_join_spec.rb
@@ -2700,7 +2732,6 @@ files:
 - spec/unit/util/dsc/resource_store.rb
 - spec/unit/util/editor_spec.rb
 - spec/unit/util/file_edit_spec.rb
-- spec/unit/util/powershell/cmdlet_spec.rb
 - spec/unit/util/powershell/ps_credential_spec.rb
 - spec/unit/util/selinux_spec.rb
 - spec/unit/util/threaded_job_queue_spec.rb
@@ -2719,7 +2750,13 @@ files:
 homepage: https://www.chef.io
 licenses:
 - Apache-2.0
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/chef/chef/issues
+  changelog_uri: https://github.com/chef/chef/blob/master/CHANGELOG.md
+  documentation_uri: https://docs.chef.io/
+  homepage_uri: https://www.chef.io
+  mailing_list_uri: https://discourse.chef.io/
+  source_code_uri: https://github.com/chef/chef/
 post_install_message: 
 rdoc_options: []
 require_paths: