chef 11.16.4 → 11.18.0

data/spec/functional/resource/env_spec.rb

@@ -126,7 +126,8 @@ describe Chef::Resource::Env, :windows_only do
       context 'when using PATH' do
         let(:random_name) { Time.now.to_i }
         let(:env_val) { "#{env_value_expandable}_#{random_name}"}
-        let(:path_before) { test_resource.provider_for_action(test_resource.action).env_value('PATH') }
+        let!(:path_before) { test_resource.provider_for_action(test_resource.action).env_value('PATH') || '' }
+        let!(:env_path_before) { ENV['PATH'] }
 
         it 'should expand PATH' do
           path_before.should_not include(env_val)
@@ -142,9 +143,7 @@ describe Chef::Resource::Env, :windows_only do
           test_resource.key_name('PATH')
           test_resource.value(path_before)
           test_resource.run_action(:create)
-          if test_resource.provider_for_action(test_resource.action).env_value('PATH') != path_before
-            raise 'Failed to cleanup after ourselves'
-          end
+          ENV['PATH'] = env_path_before
         end
       end
 

data/spec/functional/util/powershell/cmdlet_spec.rb

@@ -16,7 +16,6 @@
 # limitations under the License.
 #
 
-require 'json'
 require File.expand_path('../../../../spec_helper', __FILE__)
 
 describe Chef::Util::Powershell::Cmdlet, :windows_only do
@@ -91,7 +90,7 @@ describe Chef::Util::Powershell::Cmdlet, :windows_only do
     it "returns json format data", :windows_powershell_dsc_only do
       result = cmdlet_alias_requires_switch_or_argument.run({},{},'ls')
       expect(result.succeeded?).to eq(true)
-      expect(lambda{JSON.parse(result.return_value)}).not_to raise_error
+      expect(lambda{Chef::JSONCompat.parse(result.return_value)}).not_to raise_error
     end
   end
 

data/spec/integration/knife/chef_fs_data_store_spec.rb

@@ -22,7 +22,7 @@ require 'chef/knife/show'
 require 'chef/knife/raw'
 require 'chef/knife/cookbook_upload'
 
-describe 'ChefFSDataStore tests' do
+describe 'ChefFSDataStore tests', :workstation do
   extend IntegrationSupport
   include KnifeSupport
 

data/spec/integration/knife/chef_repo_path_spec.rb

@@ -20,7 +20,7 @@ require 'support/shared/context/config'
 require 'chef/knife/list'
 require 'chef/knife/show'
 
-describe 'chef_repo_path tests' do
+describe 'chef_repo_path tests', :workstation do
   extend IntegrationSupport
   include KnifeSupport
 
@@ -287,6 +287,7 @@ EOM
             knife('show --local /clients/blah.json').should_succeed <<EOM
 /clients/blah.json:
 {
+
 }
 EOM
           end
@@ -374,6 +375,7 @@ EOM
             knife('show --local /environments/blah.json').should_succeed <<EOM
 /environments/blah.json:
 {
+
 }
 EOM
           end
@@ -386,6 +388,7 @@ EOM
             knife('show --local /nodes/blah.json').should_succeed <<EOM
 /nodes/blah.json:
 {
+
 }
 EOM
           end
@@ -398,6 +401,7 @@ EOM
             knife('show --local /roles/blah.json').should_succeed <<EOM
 /roles/blah.json:
 {
+
 }
 EOM
           end
@@ -410,6 +414,7 @@ EOM
             knife('show --local /users/blah.json').should_succeed <<EOM
 /users/blah.json:
 {
+
 }
 EOM
           end

data/spec/integration/knife/chef_repository_file_system_spec.rb

@@ -19,7 +19,7 @@ require 'support/shared/integration/integration_helper'
 require 'chef/knife/list'
 require 'chef/knife/show'
 
-describe 'General chef_repo file system checks' do
+describe 'General chef_repo file system checks', :workstation do
   extend IntegrationSupport
   include KnifeSupport
 

data/spec/integration/knife/chefignore_spec.rb

@@ -19,7 +19,7 @@ require 'support/shared/integration/integration_helper'
 require 'chef/knife/list'
 require 'chef/knife/show'
 
-describe 'chefignore tests' do
+describe 'chefignore tests', :workstation do
   extend IntegrationSupport
   include KnifeSupport
 

data/spec/integration/knife/common_options_spec.rb

@@ -18,7 +18,7 @@
 require 'support/shared/integration/integration_helper'
 require 'chef/knife/raw'
 
-describe 'knife common options' do
+describe 'knife common options', :workstation do
   extend IntegrationSupport
   include KnifeSupport
 

data/spec/integration/knife/cookbook_api_ipv6_spec.rb

@@ -18,7 +18,7 @@
 require 'support/shared/integration/integration_helper'
 require 'chef/mixin/shell_out'
 
-describe "Knife cookbook API integration with IPv6" do
+describe "Knife cookbook API integration with IPv6", :workstation do
   extend IntegrationSupport
   include Chef::Mixin::ShellOut
 

data/spec/integration/knife/delete_spec.rb

@@ -20,7 +20,7 @@ require 'chef/knife/delete'
 require 'chef/knife/list'
 require 'chef/knife/raw'
 
-describe 'knife delete' do
+describe 'knife delete', :workstation do
   extend IntegrationSupport
   include KnifeSupport
 

data/spec/integration/knife/deps_spec.rb

@@ -19,7 +19,7 @@ require 'support/shared/integration/integration_helper'
 require 'support/shared/context/config'
 require 'chef/knife/deps'
 
-describe 'knife deps' do
+describe 'knife deps', :workstation do
   extend IntegrationSupport
   include KnifeSupport
 

data/spec/integration/knife/diff_spec.rb

@@ -18,7 +18,7 @@
 require 'support/shared/integration/integration_helper'
 require 'chef/knife/diff'
 
-describe 'knife diff' do
+describe 'knife diff', :workstation do
   extend IntegrationSupport
   include KnifeSupport
 
@@ -275,7 +275,7 @@ EOM
       when_the_repository 'has an environment with bad JSON' do
         file 'environments/x.json', '{'
         it 'knife diff reports an error and does a textual diff' do
-          knife('diff /environments/x.json').should_succeed(/-  "name": "x"/, :stderr => "WARN: Parse error reading #{path_to('environments/x.json')} as JSON: A JSON text must at least contain two octets!\n")
+          knife('diff /environments/x.json').should_succeed(/-  "name": "x"/, :stderr => /WARN: Parse error reading #{path_to('environments/x.json')} as JSON: parse error: premature EOF\n/)
         end
       end
     end
@@ -528,7 +528,7 @@ EOM
       when_the_repository 'has an environment with bad JSON' do
         file 'environments/x.json', '{'
         it 'knife diff reports an error and does a textual diff' do
-          knife('diff /environments/x.json').should_succeed(/-  "name": "x"/, :stderr => "WARN: Parse error reading #{path_to('environments/x.json')} as JSON: A JSON text must at least contain two octets!\n")
+          knife('diff /environments/x.json').should_succeed(/-  "name": "x"/, :stderr => /WARN: Parse error reading #{path_to('environments/x.json')} as JSON: parse error: premature EOF\n/)
         end
       end
     end

data/spec/integration/knife/download_spec.rb

@@ -19,7 +19,7 @@ require 'support/shared/integration/integration_helper'
 require 'chef/knife/download'
 require 'chef/knife/diff'
 
-describe 'knife download' do
+describe 'knife download', :workstation do
   extend IntegrationSupport
   include KnifeSupport
 
@@ -496,7 +496,7 @@ EOM
       when_the_repository 'has an environment with bad JSON' do
         file 'environments/x.json', '{'
         it 'knife download succeeds' do
-          knife('download /environments/x.json').should_succeed "Updated /environments/x.json\n", :stderr => "WARN: Parse error reading #{path_to('environments/x.json')} as JSON: A JSON text must at least contain two octets!\n"
+          knife('download /environments/x.json').should_succeed "Updated /environments/x.json\n", :stderr => /WARN: Parse error reading #{path_to('environments/x.json')} as JSON: parse error: premature EOF\n/
           knife('diff --name-status /environments/x.json').should_succeed ''
         end
       end
@@ -946,7 +946,7 @@ EOM
       when_the_repository 'has an environment with bad JSON' do
         file 'environments/x.json', '{'
         it 'knife download succeeds' do
-          knife('download /environments/x.json').should_succeed "Updated /environments/x.json\n", :stderr => "WARN: Parse error reading #{path_to('environments/x.json')} as JSON: A JSON text must at least contain two octets!\n"
+          knife('download /environments/x.json').should_succeed "Updated /environments/x.json\n", :stderr => /WARN: Parse error reading #{path_to('environments/x.json')} as JSON: parse error: premature EOF\n/
           knife('diff --name-status /environments/x.json').should_succeed ''
         end
       end

data/spec/integration/knife/list_spec.rb

@@ -19,7 +19,7 @@ require 'support/shared/integration/integration_helper'
 require 'support/shared/context/config'
 require 'chef/knife/list'
 
-describe 'knife list' do
+describe 'knife list', :workstation do
   extend IntegrationSupport
   include KnifeSupport
 

data/spec/integration/knife/raw_spec.rb

@@ -20,7 +20,7 @@ require 'support/shared/context/config'
 require 'chef/knife/raw'
 require 'chef/knife/show'
 
-describe 'knife raw' do
+describe 'knife raw', :workstation do
   extend IntegrationSupport
   include KnifeSupport
   include AppServerSupport
@@ -44,12 +44,16 @@ describe 'knife raw' do
   "chef_type": "node",
   "chef_environment": "_default",
   "override": {
+
   },
   "normal": {
+
   },
   "default": {
+
   },
   "automatic": {
+
   },
   "run_list": [
 
@@ -70,13 +74,16 @@ EOM
   "json_class": "Chef::Role",
   "chef_type": "role",
   "default_attributes": {
+
   },
   "override_attributes": {
+
   },
   "run_list": [
 
   ],
   "env_run_lists": {
+
   }
 }
 EOM
@@ -111,13 +118,16 @@ EOM
   "json_class": "Chef::Role",
   "chef_type": "role",
   "default_attributes": {
+
   },
   "override_attributes": {
+
   },
   "run_list": [
 
   ],
   "env_run_lists": {
+
   }
 }
 EOM

data/spec/integration/knife/redirection_spec.rb

@@ -19,7 +19,7 @@ require 'support/shared/integration/integration_helper'
 require 'support/shared/context/config'
 require 'chef/knife/list'
 
-describe 'redirection' do
+describe 'redirection', :workstation do
   extend IntegrationSupport
   include KnifeSupport
   include AppServerSupport

data/spec/integration/knife/serve_spec.rb

@@ -19,7 +19,7 @@ require 'support/shared/integration/integration_helper'
 require 'chef/knife/serve'
 require 'chef/server_api'
 
-describe 'knife serve' do
+describe 'knife serve', :workstation do
   extend IntegrationSupport
   include KnifeSupport
   include AppServerSupport

data/spec/integration/knife/show_spec.rb

@@ -19,7 +19,7 @@ require 'support/shared/integration/integration_helper'
 require 'support/shared/context/config'
 require 'chef/knife/show'
 
-describe 'knife show' do
+describe 'knife show', :workstation do
   extend IntegrationSupport
   include KnifeSupport
 

data/spec/integration/knife/upload_spec.rb

@@ -20,7 +20,7 @@ require 'chef/knife/upload'
 require 'chef/knife/diff'
 require 'chef/knife/raw'
 
-describe 'knife upload' do
+describe 'knife upload', :workstation do
   extend IntegrationSupport
   include KnifeSupport
 
@@ -237,7 +237,7 @@ Created /data_bags/x/y.json
 EOM
           knife('diff --name-status /data_bags').should_succeed <<EOM
 EOM
-          JSON.parse(knife('raw /data/x/y').stdout, :create_additions => false).keys.sort.should == [ 'foo', 'id' ]
+          Chef::JSONCompat.parse(knife('raw /data/x/y').stdout, :create_additions => false).keys.sort.should == [ 'foo', 'id' ]
         end
 
         it 'knife upload /data_bags/x /data_bags/x/y.json uploads x once' do
@@ -256,7 +256,7 @@ Created /data_bags/x
 Created /data_bags/x/y.json
 EOM
           knife('diff --name-status /data_bags').should_succeed ''
-          result = JSON.parse(knife('raw /data/x/y').stdout, :create_additions => false)
+          result = Chef::JSONCompat.parse(knife('raw /data/x/y').stdout, :create_additions => false)
           result.keys.sort.should == [ 'chef_type', 'data_bag', 'id' ]
           result['chef_type'].should == 'aaa'
           result['data_bag'].should == 'bbb'
@@ -528,8 +528,8 @@ EOM
       when_the_repository 'has an environment with bad JSON' do
         file 'environments/x.json', '{'
         it 'knife upload tries and fails' do
-          knife('upload /environments/x.json').should_fail "WARN: Parse error reading #{path_to('environments/x.json')} as JSON: A JSON text must at least contain two octets!\nERROR: /environments/x.json failed to write: Parse error reading JSON: A JSON text must at least contain two octets!\n"
-          knife('diff --name-status /environments/x.json').should_succeed "M\t/environments/x.json\n", :stderr => "WARN: Parse error reading #{path_to('environments/x.json')} as JSON: A JSON text must at least contain two octets!\n"
+          knife('upload /environments/x.json').should_fail /WARN: Parse error reading #{path_to('environments/x.json')} as JSON: parse error: premature EOF\n.+ERROR: \/environments\/x.json failed to write: Parse error reading JSON: parse error: premature EOF\n/m
+          knife('diff --name-status /environments/x.json').should_succeed "M\t/environments/x.json\n", :stderr => /WARN: Parse error reading #{path_to('environments/x.json')} as JSON: parse error: premature EOF\n/
         end
       end
 
@@ -554,7 +554,7 @@ EOM
       when_the_repository 'has an environment with bad JSON' do
         file 'environments/x.json', '{'
         it 'knife upload tries and fails' do
-          knife('upload /environments/x.json').should_fail "ERROR: /environments failed to create_child: Parse error reading JSON creating child 'x.json': A JSON text must at least contain two octets!\n"
+          knife('upload /environments/x.json').should_fail /ERROR: \/environments failed to create_child: Parse error reading JSON creating child 'x.json': parse error: premature EOF\n/
           knife('diff --name-status /environments/x.json').should_succeed "A\t/environments/x.json\n"
         end
       end
@@ -1007,8 +1007,8 @@ EOM
       when_the_repository 'has an environment with bad JSON' do
         file 'environments/x.json', '{'
         it 'knife upload tries and fails' do
-          knife('upload /environments/x.json').should_fail "WARN: Parse error reading #{path_to('environments/x.json')} as JSON: A JSON text must at least contain two octets!\nERROR: /environments/x.json failed to write: Parse error reading JSON: A JSON text must at least contain two octets!\n"
-          knife('diff --name-status /environments/x.json').should_succeed "M\t/environments/x.json\n", :stderr => "WARN: Parse error reading #{path_to('environments/x.json')} as JSON: A JSON text must at least contain two octets!\n"
+          knife('upload /environments/x.json').should_fail /WARN: Parse error reading #{path_to('environments/x.json')} as JSON: parse error: premature EOF\n.+ERROR: \/environments\/x.json failed to write: Parse error reading JSON: parse error: premature EOF\n/m
+          knife('diff --name-status /environments/x.json').should_succeed "M\t/environments/x.json\n", :stderr => /WARN: Parse error reading #{path_to('environments/x.json')} as JSON: parse error: premature EOF\n/
         end
       end
 
@@ -1033,7 +1033,7 @@ EOM
       when_the_repository 'has an environment with bad JSON' do
         file 'environments/x.json', '{'
         it 'knife upload tries and fails' do
-          knife('upload /environments/x.json').should_fail "ERROR: /environments failed to create_child: Parse error reading JSON creating child 'x.json': A JSON text must at least contain two octets!\n"
+          knife('upload /environments/x.json').should_fail /ERROR: \/environments failed to create_child: Parse error reading JSON creating child 'x.json': parse error: premature EOF\n/
           knife('diff --name-status /environments/x.json').should_succeed "A\t/environments/x.json\n"
         end
       end

data/spec/spec_helper.rb

@@ -97,6 +97,9 @@ RSpec.configure do |config|
   config.filter_run :focus => true
   config.filter_run_excluding :external => true
 
+  # Only run these tests on platforms that are also chef workstations
+  config.filter_run_excluding :workstation if solaris?
+
   # Tests that randomly fail, but may have value.
   config.filter_run_excluding :volatile => true
   config.filter_run_excluding :volatile_on_solaris => true if solaris?
@@ -182,3 +185,6 @@ module WEBrick
     end
   end
 end
+
+# Enough stuff needs json serialization that I'm just adding it here for equality asserts
+require 'chef/json_compat'

data/spec/support/shared/integration/integration_helper.rb

@@ -21,7 +21,6 @@ require 'tmpdir'
 require 'fileutils'
 require 'chef/config'
 require 'chef_zero/rspec'
-require 'json'
 require 'support/shared/integration/knife_support'
 require 'support/shared/integration/app_server_support'
 require 'spec_helper'
@@ -69,7 +68,7 @@ module IntegrationSupport
         File.open(filename, 'w') do |file|
           raw = case contents
                 when Hash
-                  JSON.pretty_generate(contents)
+                  Chef::JSONCompat.to_json_pretty(contents)
                 when Array
                   contents.join("\n")
                 else

data/spec/support/shared/shared_examples.rb

@@ -0,0 +1,10 @@
+# For storing any examples shared between multiple tests
+
+# Any object which defines a .to_json should import this test
+shared_examples "to_json equalivent to Chef::JSONCompat.to_json" do
+
+  it "should allow consumers to call #to_json or Chef::JSONCompat.to_json" do
+    expect(subject.to_json).to eq(Chef::JSONCompat.to_json(subject))
+  end
+
+end

data/spec/tiny_server.rb

@@ -25,6 +25,7 @@ require 'singleton'
 require 'chef/json_compat'
 require 'open-uri'
 require 'chef/config'
+require 'chef/json_compat'
 
 module TinyServer
 
@@ -152,7 +153,7 @@ module TinyServer
                       :available_routes => @routes, :request => env}
         # Uncomment me for glorious debugging
         # pp :not_found => debug_info
-        [404, {'Content-Type' => 'application/json'}, [ debug_info.to_json ]]
+        [404, {'Content-Type' => 'application/json'}, [ Chef::JSONCompat.to_json(debug_info) ]]
       end
     end
 

data/spec/unit/api_client_spec.rb

@@ -92,7 +92,7 @@ describe Chef::ApiClient do
     before(:each) do
       @client.name("black")
       @client.public_key("crowes")
-      @json = @client.to_json
+      @json = Chef::JSONCompat.to_json(@client)
     end
 
     it "serializes as a JSON object" do
@@ -117,7 +117,7 @@ describe Chef::ApiClient do
 
     it "includes the private key when present" do
       @client.private_key("monkeypants")
-      @client.to_json.should include(%q{"private_key":"monkeypants"})
+      Chef::JSONCompat.to_json(@client).should include(%q{"private_key":"monkeypants"})
     end
 
     it "does not include the private key if not present" do
@@ -135,7 +135,7 @@ describe Chef::ApiClient do
       "validator" => true,
       "json_class" => "Chef::ApiClient"
       }
-      @client = Chef::JSONCompat.from_json(client.to_json)
+      @client = Chef::JSONCompat.from_json(Chef::JSONCompat.to_json(client))
     end
 
     it "should deserialize to a Chef::ApiClient object" do