chef 16.7.61 → 16.8.9

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.8.9
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-25 00:00:00.000000000 Z
+date: 2020-12-10 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.8.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 16.7.61
+        version: 16.8.9
 - !ruby/object:Gem::Dependency
   name: chef-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 16.7.61
+        version: 16.8.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 16.7.61
+        version: 16.8.9
 - !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'
@@ -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
@@ -1441,8 +1463,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
@@ -1989,7 +2009,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 +2020,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
@@ -2165,6 +2185,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
@@ -2700,7 +2726,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

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

@@ -1,169 +0,0 @@
-#
-# Author:: Adam Edwards (<adamed@chef.io>)
-#
-# Copyright:: Copyright (c) Chef Software Inc.
-#
-# 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.
-#
-
-module Mixlib
-  autoload :ShellOut, "mixlib/shellout"
-end
-require_relative "../../mixin/windows_architecture_helper"
-require_relative "cmdlet_result"
-
-class Chef
-  class Util
-    class Powershell
-      class Cmdlet
-        def initialize(node, cmdlet, output_format = nil, output_format_options = {})
-          @output_format = output_format
-          @node = node
-
-          case output_format
-          when nil, :text
-            @json_format = false
-          when :json, :object
-            @json_format = true
-          else
-            raise ArgumentError, "Invalid output format #{output_format} specified"
-          end
-
-          @cmdlet = cmdlet
-          @output_format_options = output_format_options
-        end
-
-        attr_reader :output_format
-
-        def run(switches = {}, execution_options = {}, *arguments)
-          streams = { json: CmdletStream.new("json"),
-                      verbose: CmdletStream.new("verbose"),
-                    }
-
-          arguments_string = arguments.join(" ")
-
-          switches_string = command_switches_string(switches)
-
-          json_depth = 5
-
-          if @json_format && @output_format_options.key?(:depth)
-            json_depth = @output_format_options[:depth]
-          end
-
-          json_command = if @json_format
-                           " | convertto-json -compress -depth #{json_depth} > #{streams[:json].path}"
-                         else
-                           ""
-                         end
-          redirections = "4> '#{streams[:verbose].path}'"
-          command_string = "powershell.exe -executionpolicy bypass -noprofile -noninteractive "\
-                           "-command \"trap [Exception] {write-error -exception "\
-                           "($_.Exception.Message);exit 1};#{@cmdlet} #{switches_string} "\
-                           "#{arguments_string} #{redirections}"\
-                           "#{json_command}\";if ( ! $? ) { exit 1 }"
-
-          augmented_options = { returns: [0], live_stream: false }.merge(execution_options)
-          command = Mixlib::ShellOut.new(command_string, augmented_options)
-
-          status = nil
-
-          with_os_architecture(@node) do
-            status = command.run_command
-          end
-
-          CmdletResult.new(status, streams, @output_format)
-        end
-
-        def run!(switches = {}, execution_options = {}, *arguments)
-          result = run(switches, execution_options, arguments)
-
-          unless result.succeeded?
-            raise Chef::Exceptions::PowershellCmdletException, "PowerShell Cmdlet failed: #{result.stderr}"
-          end
-
-          result
-        end
-
-        protected
-
-        include Chef::Mixin::WindowsArchitectureHelper
-
-        def validate_switch_name!(switch_parameter_name)
-          if !!(switch_parameter_name =~ /\A[A-Za-z]+[_a-zA-Z0-9]*\Z/) == false
-            raise ArgumentError, "`#{switch_parameter_name}` is not a valid PowerShell cmdlet switch parameter name"
-          end
-        end
-
-        def escape_parameter_value(parameter_value)
-          parameter_value.gsub(/(`|'|"|#)/, '`\1')
-        end
-
-        def escape_string_parameter_value(parameter_value)
-          "'#{escape_parameter_value(parameter_value)}'"
-        end
-
-        def command_switches_string(switches)
-          command_switches = switches.map do |switch_name, switch_value|
-            if switch_name.class != Symbol
-              raise ArgumentError, "Invalid type `#{switch_name} `for PowerShell switch '#{switch_name}'. The switch must be specified as a Symbol'"
-            end
-
-            validate_switch_name!(switch_name)
-
-            switch_argument = ""
-            switch_present = true
-
-            case switch_value
-            when Numeric, Float
-              switch_argument = switch_value.to_s
-            when FalseClass
-              switch_present = false
-            when TrueClass
-            when String
-              switch_argument = escape_string_parameter_value(switch_value)
-            else
-              raise ArgumentError, "Invalid argument type `#{switch_value.class}` specified for PowerShell switch `:#{switch_name}`. Arguments to PowerShell must be of type `String`, `Numeric`, `Float`, `FalseClass`, or `TrueClass`"
-            end
-
-            switch_present ? ["-#{switch_name.to_s.downcase}", switch_argument].join(" ").strip : ""
-          end
-
-          command_switches.join(" ")
-        end
-
-        class CmdletStream
-          def initialize(name)
-            @filename = Dir::Tmpname.create(name) {}
-            ObjectSpace.define_finalizer(self, self.class.destroy(@filename))
-          end
-
-          def path
-            @filename
-          end
-
-          def read
-            if File.exist? @filename
-              File.open(@filename, "rb:bom|UTF-16LE") do |f|
-                f.read.encode("UTF-8")
-              end
-            end
-          end
-
-          def self.destroy(name)
-            proc { File.delete(name) if File.exist? name }
-          end
-        end
-      end
-    end
-  end
-end