chef 16.2.73 → 16.3.38

Sign up to get free protection for your applications and to get access to all the features.
Files changed (155) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +4 -4
  3. data/Rakefile +1 -1
  4. data/chef-universal-mingw32.gemspec +2 -2
  5. data/chef.gemspec +2 -1
  6. data/lib/chef/application.rb +12 -0
  7. data/lib/chef/{whitelist.rb → attribute_allowlist.rb} +11 -11
  8. data/lib/chef/{blacklist.rb → attribute_blocklist.rb} +9 -9
  9. data/lib/chef/chef_fs/data_handler/organization_data_handler.rb +1 -2
  10. data/lib/chef/chef_fs/file_system/chef_server/cookbooks_dir.rb +1 -5
  11. data/lib/chef/chef_fs/file_system/repository/base_file.rb +1 -0
  12. data/lib/chef/chef_fs/parallelizer/parallel_enumerable.rb +1 -1
  13. data/lib/chef/client.rb +3 -3
  14. data/lib/chef/cookbook/remote_file_vendor.rb +1 -3
  15. data/lib/chef/cookbook/syntax_check.rb +1 -2
  16. data/lib/chef/cookbook_loader.rb +15 -29
  17. data/lib/chef/data_bag.rb +1 -2
  18. data/lib/chef/deprecated.rb +8 -0
  19. data/lib/chef/dsl/platform_introspection.rb +2 -0
  20. data/lib/chef/environment.rb +1 -2
  21. data/lib/chef/exceptions.rb +3 -0
  22. data/lib/chef/http/authenticator.rb +1 -1
  23. data/lib/chef/knife.rb +4 -4
  24. data/lib/chef/knife/bootstrap.rb +4 -10
  25. data/lib/chef/knife/bootstrap/train_connector.rb +1 -0
  26. data/lib/chef/knife/config_get.rb +1 -0
  27. data/lib/chef/knife/config_list_profiles.rb +4 -1
  28. data/lib/chef/knife/configure.rb +1 -1
  29. data/lib/chef/knife/cookbook_upload.rb +5 -10
  30. data/lib/chef/knife/core/gem_glob_loader.rb +1 -1
  31. data/lib/chef/knife/core/hashed_command_loader.rb +1 -0
  32. data/lib/chef/knife/core/subcommand_loader.rb +20 -1
  33. data/lib/chef/knife/core/ui.rb +8 -2
  34. data/lib/chef/knife/core/windows_bootstrap_context.rb +1 -2
  35. data/lib/chef/knife/rehash.rb +3 -21
  36. data/lib/chef/knife/ssh.rb +5 -1
  37. data/lib/chef/log.rb +7 -2
  38. data/lib/chef/mixin/chef_utils_wiring.rb +40 -0
  39. data/{spec/unit/log_spec.rb → lib/chef/mixin/default_paths.rb} +13 -5
  40. data/lib/chef/mixin/openssl_helper.rb +27 -5
  41. data/lib/chef/mixin/path_sanity.rb +5 -4
  42. data/lib/chef/mixin/shell_out.rb +4 -188
  43. data/lib/chef/mixin/template.rb +1 -0
  44. data/lib/chef/mixin/which.rb +6 -3
  45. data/lib/chef/mixins.rb +1 -0
  46. data/lib/chef/node.rb +36 -12
  47. data/lib/chef/node_map.rb +21 -18
  48. data/lib/chef/platform/service_helpers.rb +31 -28
  49. data/lib/chef/provider/git.rb +12 -4
  50. data/lib/chef/provider/mount/solaris.rb +0 -1
  51. data/lib/chef/provider/package/snap.rb +2 -3
  52. data/lib/chef/provider/package/windows.rb +9 -4
  53. data/lib/chef/provider/package/zypper.rb +0 -1
  54. data/lib/chef/provider/service.rb +2 -2
  55. data/lib/chef/provider/yum_repository.rb +1 -1
  56. data/lib/chef/provider/zypper_repository.rb +1 -1
  57. data/lib/chef/resource.rb +2 -0
  58. data/lib/chef/resource/build_essential.rb +2 -2
  59. data/lib/chef/resource/chef_client_scheduled_task.rb +1 -1
  60. data/lib/chef/resource/chocolatey_feature.rb +1 -2
  61. data/lib/chef/resource/cron/cron_d.rb +1 -1
  62. data/lib/chef/resource/cron_access.rb +2 -2
  63. data/lib/chef/resource/execute.rb +2 -2
  64. data/lib/chef/resource/lwrp_base.rb +1 -0
  65. data/lib/chef/resource/macos_userdefaults.rb +176 -61
  66. data/lib/chef/resource/openssl_x509_certificate.rb +11 -14
  67. data/lib/chef/resource/openssl_x509_crl.rb +1 -2
  68. data/lib/chef/resource/service.rb +2 -2
  69. data/lib/chef/resource/ssh_known_hosts_entry.rb +1 -1
  70. data/lib/chef/resource/sudo.rb +1 -1
  71. data/lib/chef/resource/user_ulimit.rb +1 -1
  72. data/lib/chef/resource/windows_dns_record.rb +17 -0
  73. data/lib/chef/resource/windows_firewall_profile.rb +197 -0
  74. data/lib/chef/resource/windows_security_policy.rb +49 -20
  75. data/lib/chef/resource_inspector.rb +7 -1
  76. data/lib/chef/resources.rb +1 -0
  77. data/lib/chef/role.rb +1 -2
  78. data/lib/chef/shell/shell_session.rb +2 -0
  79. data/lib/chef/util/diff.rb +0 -1
  80. data/lib/chef/version.rb +2 -2
  81. data/lib/chef/win32/registry.rb +1 -2
  82. data/spec/functional/knife/ssh_spec.rb +5 -16
  83. data/spec/functional/resource/aix_service_spec.rb +0 -2
  84. data/spec/functional/resource/aixinit_service_spec.rb +0 -1
  85. data/spec/functional/resource/apt_package_spec.rb +0 -1
  86. data/spec/functional/resource/cron_spec.rb +0 -1
  87. data/spec/functional/resource/git_spec.rb +23 -1
  88. data/spec/functional/resource/group_spec.rb +6 -2
  89. data/spec/functional/resource/insserv_spec.rb +0 -1
  90. data/spec/functional/resource/remote_file_spec.rb +1 -7
  91. data/spec/functional/resource/windows_user_privilege_spec.rb +1 -1
  92. data/spec/functional/run_lock_spec.rb +2 -1
  93. data/spec/functional/shell_spec.rb +5 -5
  94. data/spec/functional/util/powershell/cmdlet_spec.rb +1 -1
  95. data/spec/functional/version_spec.rb +1 -1
  96. data/spec/integration/knife/config_list_profiles_spec.rb +30 -2
  97. data/spec/integration/knife/cookbook_upload_spec.rb +27 -0
  98. data/spec/integration/recipes/accumulator_spec.rb +1 -1
  99. data/spec/integration/recipes/lwrp_inline_resources_spec.rb +1 -1
  100. data/spec/integration/recipes/lwrp_spec.rb +1 -1
  101. data/spec/integration/recipes/notifies_spec.rb +1 -1
  102. data/spec/integration/recipes/notifying_block_spec.rb +1 -1
  103. data/spec/integration/recipes/recipe_dsl_spec.rb +1 -1
  104. data/spec/integration/recipes/resource_converge_if_changed_spec.rb +2 -0
  105. data/spec/integration/recipes/resource_load_spec.rb +2 -0
  106. data/spec/integration/recipes/unified_mode_spec.rb +1 -1
  107. data/spec/integration/recipes/use_partial_spec.rb +1 -1
  108. data/spec/scripts/ssl-serve.rb +1 -1
  109. data/spec/spec_helper.rb +10 -4
  110. data/spec/support/chef_helpers.rb +1 -20
  111. data/spec/support/platform_helpers.rb +0 -2
  112. data/spec/support/shared/functional/file_resource.rb +0 -1
  113. data/spec/support/shared/integration/knife_support.rb +2 -9
  114. data/spec/support/shared/unit/application_dot_d.rb +0 -1
  115. data/spec/unit/application_spec.rb +4 -2
  116. data/spec/unit/chef_fs/file_system/operation_failed_error_spec.rb +2 -4
  117. data/spec/unit/chef_fs/{parallelizer.rb → parallelizer_spec.rb} +1 -1
  118. data/spec/unit/cookbook/gem_installer_spec.rb +2 -1
  119. data/spec/unit/data_collector_spec.rb +1 -1
  120. data/spec/unit/dsl/platform_introspection_spec.rb +1 -0
  121. data/spec/unit/event_dispatch/dispatcher_spec.rb +3 -0
  122. data/spec/unit/json_compat_spec.rb +1 -1
  123. data/spec/unit/knife/bootstrap_spec.rb +2 -6
  124. data/spec/unit/knife/cookbook_upload_spec.rb +7 -10
  125. data/spec/unit/log/syslog_spec.rb +6 -10
  126. data/spec/unit/log/winevt_spec.rb +21 -13
  127. data/spec/unit/lwrp_spec.rb +4 -4
  128. data/spec/unit/mixin/{path_sanity_spec.rb → default_paths_spec.rb} +14 -14
  129. data/spec/unit/mixin/powershell_exec_spec.rb +1 -1
  130. data/spec/unit/mixin/securable_spec.rb +0 -1
  131. data/spec/unit/mixin/shell_out_spec.rb +25 -26
  132. data/spec/unit/mixin/which.rb +8 -0
  133. data/spec/unit/node_spec.rb +98 -11
  134. data/spec/unit/property_spec.rb +5 -5
  135. data/spec/unit/provider/execute_spec.rb +0 -7
  136. data/spec/unit/provider/ifconfig_spec.rb +0 -1
  137. data/spec/unit/provider/package/dnf/python_helper_spec.rb +1 -1
  138. data/spec/unit/provider/package/rubygems_spec.rb +5 -10
  139. data/spec/unit/provider/package/smartos_spec.rb +1 -1
  140. data/spec/unit/provider/package/windows_spec.rb +30 -53
  141. data/spec/unit/provider/service/redhat_spec.rb +1 -1
  142. data/spec/unit/provider/service/windows_spec.rb +2 -6
  143. data/spec/unit/provider/systemd_unit_spec.rb +28 -24
  144. data/spec/unit/provider_spec.rb +1 -0
  145. data/spec/unit/resource/execute_spec.rb +10 -0
  146. data/spec/unit/resource/macos_user_defaults_spec.rb +103 -2
  147. data/spec/unit/resource/windows_firewall_profile_spec.rb +77 -0
  148. data/spec/unit/resource/windows_package_spec.rb +1 -0
  149. data/spec/unit/resource_reporter_spec.rb +1 -1
  150. data/spec/unit/run_context/cookbook_compiler_spec.rb +1 -1
  151. data/spec/unit/run_lock_spec.rb +1 -1
  152. data/spec/unit/scan_access_control_spec.rb +1 -1
  153. data/spec/unit/util/diff_spec.rb +1 -15
  154. data/spec/unit/win32/security_spec.rb +4 -3
  155. metadata +30 -13
@@ -19,32 +19,40 @@
19
19
 
20
20
  require "spec_helper"
21
21
 
22
- describe Chef::Log::WinEvt do
22
+ describe Chef::Log::WinEvt, :windows_only do
23
23
  let(:evtlog) { instance_double("Win32::EventLog") }
24
24
  let(:winevt) { Chef::Log::WinEvt.new(evtlog) }
25
25
  let(:app) { Chef::Application.new }
26
26
 
27
27
  before do
28
28
  Chef::Log.init(MonoLogger.new(winevt))
29
- @old_log_level = Chef::Log.level
30
29
  Chef::Log.level = :info
31
- @old_loggers = Chef::Log.loggers
32
- Chef::Log.use_log_devices([winevt])
33
- end
34
-
35
- after do
36
- Chef::Log.level = @old_log_level
37
- Chef::Log.use_log_devices(@old_loggers)
38
30
  end
39
31
 
40
32
  it "should send message with severity info to Windows Event Log." do
41
- expect(winevt).to receive(:add).with(1, "*** Chef 12.4.0.dev.0 ***", nil)
42
- Chef::Log.info("*** Chef 12.4.0.dev.0 ***")
33
+ expect(evtlog).to receive(:report_event).with(
34
+ event_type: ::Win32::EventLog::INFO_TYPE,
35
+ source: Chef::Log::WinEvt::SOURCE,
36
+ event_id: Chef::Log::WinEvt::INFO_EVENT_ID,
37
+ data: ["*** Chef 12.4.0.dev.0 ***"]
38
+ )
39
+
40
+ expect {
41
+ Chef::Log.info("*** Chef 12.4.0.dev.0 ***")
42
+ }.not_to output.to_stderr
43
43
  end
44
44
 
45
45
  it "should send message with severity warning to Windows Event Log." do
46
- expect(winevt).to receive(:add).with(2, "No config file found or specified on command line. Using command line options instead.", nil)
47
- Chef::Log.warn("No config file found or specified on command line. Using command line options instead.")
46
+ expect(evtlog).to receive(:report_event).with(
47
+ event_type: ::Win32::EventLog::WARN_TYPE,
48
+ source: Chef::Log::WinEvt::SOURCE,
49
+ event_id: Chef::Log::WinEvt::WARN_EVENT_ID,
50
+ data: ["No config file found or specified on command line. Using command line options instead."]
51
+ )
52
+
53
+ expect {
54
+ Chef::Log.warn("No config file found or specified on command line. Using command line options instead.")
55
+ }.not_to output.to_stderr
48
56
  end
49
57
 
50
58
  it "should fallback into send message with severity info to Windows Event Log when wrong format." do
@@ -140,7 +140,7 @@ describe "LWRP" do
140
140
  before do
141
141
  @tmpdir = Dir.mktmpdir("lwrp_test")
142
142
  @lwrp_path = File.join(@tmpdir, "foo.rb")
143
- content = IO.read(File.expand_path("../../data/lwrp/resources/foo.rb", __FILE__))
143
+ content = IO.read(File.expand_path("../data/lwrp/resources/foo.rb", __dir__))
144
144
  IO.write(@lwrp_path, content)
145
145
  Chef::Resource::LWRPBase.build_from_file("lwrp", @lwrp_path, nil)
146
146
  @original_resource = Chef::ResourceResolver.resolve(:lwrp_foo)
@@ -152,7 +152,7 @@ describe "LWRP" do
152
152
 
153
153
  context "And the LWRP is asked to load again, this time with different code" do
154
154
  before do
155
- content = IO.read(File.expand_path("../../data/lwrp_override/resources/foo.rb", __FILE__))
155
+ content = IO.read(File.expand_path("../data/lwrp_override/resources/foo.rb", __dir__))
156
156
  IO.write(@lwrp_path, content)
157
157
  Chef::Resource::LWRPBase.build_from_file("lwrp", @lwrp_path, nil)
158
158
  end
@@ -390,11 +390,11 @@ describe "LWRP" do
390
390
  end
391
391
 
392
392
  before(:each) do
393
- Dir[File.expand_path(File.expand_path("../../data/lwrp/resources/*", __FILE__))].each do |file|
393
+ Dir[File.expand_path(File.expand_path("../data/lwrp/resources/*", __dir__))].each do |file|
394
394
  Chef::Resource::LWRPBase.build_from_file(lwrp_cookbook_name, file, run_context)
395
395
  end
396
396
 
397
- Dir[File.expand_path(File.expand_path("../../data/lwrp/providers/*", __FILE__))].each do |file|
397
+ Dir[File.expand_path(File.expand_path("../data/lwrp/providers/*", __dir__))].each do |file|
398
398
  Chef::Provider::LWRPBase.build_from_file(lwrp_cookbook_name, file, run_context)
399
399
  end
400
400
  end
@@ -18,19 +18,19 @@
18
18
 
19
19
  require "spec_helper"
20
20
 
21
- class PathSanityTestHarness
22
- include Chef::Mixin::PathSanity
21
+ class DefaultPathsTestHarness
22
+ include Chef::Mixin::DefaultPaths
23
23
  end
24
24
 
25
- describe Chef::Mixin::PathSanity do
25
+ describe Chef::Mixin::DefaultPaths do
26
26
 
27
27
  before do
28
- @sanity = PathSanityTestHarness.new
28
+ @default_paths = DefaultPathsTestHarness.new
29
29
  end
30
30
 
31
- describe "when enforcing path sanity" do
31
+ describe "when enforcing default paths" do
32
32
  before do
33
- Chef::Config[:enforce_path_sanity] = true
33
+ Chef::Config[:enforce_default_paths] = true
34
34
  @ruby_bindir = "/some/ruby/bin"
35
35
  @gem_bindir = "/some/gem/bin"
36
36
  allow(Gem).to receive(:bindir).and_return(@gem_bindir)
@@ -40,41 +40,41 @@ describe Chef::Mixin::PathSanity do
40
40
 
41
41
  it "adds all useful PATHs even if environment is an empty hash" do
42
42
  env = {}
43
- @sanity.enforce_path_sanity(env)
43
+ @default_paths.enforce_default_paths(env)
44
44
  expect(env["PATH"]).to eq("#{@gem_bindir}:#{@ruby_bindir}:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin")
45
45
  end
46
46
 
47
47
  it "adds all useful PATHs that are not yet in PATH to PATH" do
48
48
  env = { "PATH" => "" }
49
- @sanity.enforce_path_sanity(env)
49
+ @default_paths.enforce_default_paths(env)
50
50
  expect(env["PATH"]).to eq("#{@gem_bindir}:#{@ruby_bindir}:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin")
51
51
  end
52
52
 
53
53
  it "does not re-add paths that already exist in PATH" do
54
54
  env = { "PATH" => "/usr/bin:/sbin:/bin" }
55
- @sanity.enforce_path_sanity(env)
55
+ @default_paths.enforce_default_paths(env)
56
56
  expect(env["PATH"]).to eq("#{@gem_bindir}:#{@ruby_bindir}:/usr/bin:/sbin:/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin")
57
57
  end
58
58
 
59
59
  it "creates path with utf-8 encoding" do
60
60
  env = { "PATH" => "/usr/bin:/sbin:/bin:/b#{0x81.chr}t".force_encoding("ISO-8859-1") }
61
- @sanity.enforce_path_sanity(env)
61
+ @default_paths.enforce_default_paths(env)
62
62
  expect(env["PATH"].encoding.to_s).to eq("UTF-8")
63
63
  end
64
64
 
65
65
  it "adds the current executing Ruby's bindir and Gem bindir to the PATH" do
66
66
  env = { "PATH" => "" }
67
- @sanity.enforce_path_sanity(env)
67
+ @default_paths.enforce_default_paths(env)
68
68
  expect(env["PATH"]).to eq("#{@gem_bindir}:#{@ruby_bindir}:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin")
69
69
  end
70
70
 
71
- it "does not create entries for Ruby/Gem bindirs if they exist in SANE_PATH or PATH" do
71
+ it "does not create entries for Ruby/Gem bindirs if they exist in PATH" do
72
72
  ruby_bindir = "/usr/bin"
73
73
  gem_bindir = "/yo/gabba/gabba"
74
74
  allow(Gem).to receive(:bindir).and_return(gem_bindir)
75
75
  allow(RbConfig::CONFIG).to receive(:[]).with("bindir").and_return(ruby_bindir)
76
76
  env = { "PATH" => gem_bindir }
77
- @sanity.enforce_path_sanity(env)
77
+ @default_paths.enforce_default_paths(env)
78
78
  expect(env["PATH"]).to eq("/usr/bin:/yo/gabba/gabba:/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin:/bin")
79
79
  end
80
80
 
@@ -85,7 +85,7 @@ describe Chef::Mixin::PathSanity do
85
85
  allow(RbConfig::CONFIG).to receive(:[]).with("bindir").and_return(ruby_bindir)
86
86
  allow(ChefUtils).to receive(:windows?).and_return(true)
87
87
  env = { "PATH" => 'C:\Windows\system32;C:\mr\softie' }
88
- @sanity.enforce_path_sanity(env)
88
+ @default_paths.enforce_default_paths(env)
89
89
  expect(env["PATH"]).to eq("#{gem_bindir};#{ruby_bindir};C:\\Windows\\system32;C:\\mr\\softie")
90
90
  end
91
91
  end
@@ -47,7 +47,7 @@ describe Chef::Mixin::PowershellExec, :windows_only do
47
47
  end
48
48
 
49
49
  it "raises an error if the command fails" do
50
- expect(object.powershell_exec!("$PSVersionTable")).to be_kind_of(Chef::PowerShell::CommandFailed)
50
+ expect { object.powershell_exec!("this-should-error") }.to raise_error(Chef::PowerShell::CommandFailed)
51
51
  end
52
52
  end
53
53
  end
@@ -1,4 +1,3 @@
1
- # encoding: UTF-8
2
1
  #
3
2
  # Author:: Mark Mzyk (<mmzyk@chef.io>)
4
3
  # Copyright:: Copyright (c) Chef Software Inc.
@@ -21,10 +21,9 @@
21
21
  #
22
22
 
23
23
  require "spec_helper"
24
- require "chef/mixin/path_sanity"
24
+ require "chef/mixin/default_paths"
25
25
 
26
26
  describe Chef::Mixin::ShellOut do
27
- include ChefUtils::DSL::PathSanity
28
27
  let(:shell_out_class) { Class.new { include Chef::Mixin::ShellOut } }
29
28
  subject(:shell_out_obj) { shell_out_class.new }
30
29
 
@@ -57,38 +56,38 @@ describe Chef::Mixin::ShellOut do
57
56
  describe "and environment is an option" do
58
57
  it "should not change environment language settings when they are set to nil" do
59
58
  options = { environment: { "LC_ALL" => nil, "LANGUAGE" => nil, "LANG" => nil, env_path => nil } }
60
- expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd, **options).and_return(retobj)
59
+ expect(shell_out_obj).to receive(:__shell_out_command).with(cmd, **options).and_return(retobj)
61
60
  shell_out_obj.send(method, cmd, **options)
62
61
  end
63
62
 
64
63
  it "should not change environment language settings when they are set to non-nil" do
65
64
  options = { environment: { "LC_ALL" => "en_US.UTF-8", "LANGUAGE" => "en_US.UTF-8", "LANG" => "en_US.UTF-8", env_path => "foo:bar:baz" } }
66
- expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd, **options).and_return(retobj)
65
+ expect(shell_out_obj).to receive(:__shell_out_command).with(cmd, **options).and_return(retobj)
67
66
  shell_out_obj.send(method, cmd, **options)
68
67
  end
69
68
 
70
69
  it "should set environment language settings to the configured internal locale when they are not present" do
71
70
  options = { environment: { "HOME" => "/Users/morty" } }
72
- expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd,
71
+ expect(shell_out_obj).to receive(:__shell_out_command).with(cmd,
73
72
  environment: {
74
73
  "HOME" => "/Users/morty",
75
74
  "LC_ALL" => Chef::Config[:internal_locale],
76
75
  "LANG" => Chef::Config[:internal_locale],
77
76
  "LANGUAGE" => Chef::Config[:internal_locale],
78
- env_path => sanitized_path,
77
+ env_path => shell_out_obj.default_paths,
79
78
  }).and_return(retobj)
80
79
  shell_out_obj.send(method, cmd, **options)
81
80
  end
82
81
 
83
82
  it "should not mutate the options hash when it adds language settings" do
84
83
  options = { environment: { "HOME" => "/Users/morty" } }
85
- expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd,
84
+ expect(shell_out_obj).to receive(:__shell_out_command).with(cmd,
86
85
  environment: {
87
86
  "HOME" => "/Users/morty",
88
87
  "LC_ALL" => Chef::Config[:internal_locale],
89
88
  "LANG" => Chef::Config[:internal_locale],
90
89
  "LANGUAGE" => Chef::Config[:internal_locale],
91
- env_path => sanitized_path,
90
+ env_path => shell_out_obj.default_paths,
92
91
  }).and_return(retobj)
93
92
  shell_out_obj.send(method, cmd, **options)
94
93
  expect(options[:environment].key?("LC_ALL")).to be false
@@ -98,38 +97,38 @@ describe Chef::Mixin::ShellOut do
98
97
  describe "and env is an option" do
99
98
  it "should not change env when langauge options are set to nil" do
100
99
  options = { env: { "LC_ALL" => nil, "LANG" => nil, "LANGUAGE" => nil, env_path => nil } }
101
- expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd, **options).and_return(retobj)
100
+ expect(shell_out_obj).to receive(:__shell_out_command).with(cmd, **options).and_return(retobj)
102
101
  shell_out_obj.send(method, cmd, **options)
103
102
  end
104
103
 
105
104
  it "should not change env when language options are set to non-nil" do
106
105
  options = { env: { "LC_ALL" => "de_DE.UTF-8", "LANG" => "de_DE.UTF-8", "LANGUAGE" => "de_DE.UTF-8", env_path => "foo:bar:baz" } }
107
- expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd, **options).and_return(retobj)
106
+ expect(shell_out_obj).to receive(:__shell_out_command).with(cmd, **options).and_return(retobj)
108
107
  shell_out_obj.send(method, cmd, **options)
109
108
  end
110
109
 
111
110
  it "should set environment language settings to the configured internal locale when they are not present" do
112
111
  options = { env: { "HOME" => "/Users/morty" } }
113
- expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd,
112
+ expect(shell_out_obj).to receive(:__shell_out_command).with(cmd,
114
113
  env: {
115
114
  "HOME" => "/Users/morty",
116
115
  "LC_ALL" => Chef::Config[:internal_locale],
117
116
  "LANG" => Chef::Config[:internal_locale],
118
117
  "LANGUAGE" => Chef::Config[:internal_locale],
119
- env_path => sanitized_path,
118
+ env_path => shell_out_obj.default_paths,
120
119
  }).and_return(retobj)
121
120
  shell_out_obj.send(method, cmd, **options)
122
121
  end
123
122
 
124
123
  it "should not mutate the options hash when it adds language settings" do
125
124
  options = { env: { "HOME" => "/Users/morty" } }
126
- expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd,
125
+ expect(shell_out_obj).to receive(:__shell_out_command).with(cmd,
127
126
  env: {
128
127
  "HOME" => "/Users/morty",
129
128
  "LC_ALL" => Chef::Config[:internal_locale],
130
129
  "LANG" => Chef::Config[:internal_locale],
131
130
  "LANGUAGE" => Chef::Config[:internal_locale],
132
- env_path => sanitized_path,
131
+ env_path => shell_out_obj.default_paths,
133
132
  }).and_return(retobj)
134
133
  shell_out_obj.send(method, cmd, **options)
135
134
  expect(options[:env].key?("LC_ALL")).to be false
@@ -139,13 +138,13 @@ describe Chef::Mixin::ShellOut do
139
138
  describe "and no env/environment option is present" do
140
139
  it "should set environment language settings to the configured internal locale" do
141
140
  options = { user: "morty" }
142
- expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd,
141
+ expect(shell_out_obj).to receive(:__shell_out_command).with(cmd,
143
142
  user: "morty",
144
143
  environment: {
145
144
  "LC_ALL" => Chef::Config[:internal_locale],
146
145
  "LANG" => Chef::Config[:internal_locale],
147
146
  "LANGUAGE" => Chef::Config[:internal_locale],
148
- env_path => sanitized_path,
147
+ env_path => shell_out_obj.default_paths,
149
148
  }).and_return(retobj)
150
149
  shell_out_obj.send(method, cmd, **options)
151
150
  end
@@ -154,12 +153,12 @@ describe Chef::Mixin::ShellOut do
154
153
 
155
154
  describe "when the last argument is not a Hash" do
156
155
  it "should set environment language settings to the configured internal locale" do
157
- expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd,
156
+ expect(shell_out_obj).to receive(:__shell_out_command).with(cmd,
158
157
  environment: {
159
158
  "LC_ALL" => Chef::Config[:internal_locale],
160
159
  "LANG" => Chef::Config[:internal_locale],
161
160
  "LANGUAGE" => Chef::Config[:internal_locale],
162
- env_path => sanitized_path,
161
+ env_path => shell_out_obj.default_paths,
163
162
  }).and_return(retobj)
164
163
  shell_out_obj.send(method, cmd)
165
164
  end
@@ -173,19 +172,19 @@ describe Chef::Mixin::ShellOut do
173
172
  describe "and environment is an option" do
174
173
  it "should not change environment['LC_ALL'] when set to nil" do
175
174
  options = { environment: { "LC_ALL" => nil } }
176
- expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd, options).and_return(true)
175
+ expect(shell_out_obj).to receive(:__shell_out_command).with(cmd, options).and_return(true)
177
176
  shell_out_obj.shell_out(cmd, **options, default_env: false)
178
177
  end
179
178
 
180
179
  it "should not change environment['LC_ALL'] when set to non-nil" do
181
180
  options = { environment: { "LC_ALL" => "en_US.UTF-8" } }
182
- expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd, options).and_return(true)
181
+ expect(shell_out_obj).to receive(:__shell_out_command).with(cmd, options).and_return(true)
183
182
  shell_out_obj.shell_out(cmd, **options, default_env: false)
184
183
  end
185
184
 
186
185
  it "should no longer set environment['LC_ALL'] to nil when 'LC_ALL' not present" do
187
186
  options = { environment: { "HOME" => "/Users/morty" } }
188
- expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd, options).and_return(true)
187
+ expect(shell_out_obj).to receive(:__shell_out_command).with(cmd, options).and_return(true)
189
188
  shell_out_obj.shell_out(cmd, **options, default_env: false)
190
189
  end
191
190
  end
@@ -193,19 +192,19 @@ describe Chef::Mixin::ShellOut do
193
192
  describe "and env is an option" do
194
193
  it "should not change env when set to nil" do
195
194
  options = { env: { "LC_ALL" => nil } }
196
- expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd, options).and_return(true)
195
+ expect(shell_out_obj).to receive(:__shell_out_command).with(cmd, options).and_return(true)
197
196
  shell_out_obj.shell_out(cmd, **options, default_env: false)
198
197
  end
199
198
 
200
199
  it "should not change env when set to non-nil" do
201
200
  options = { env: { "LC_ALL" => "en_US.UTF-8" } }
202
- expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd, options).and_return(true)
201
+ expect(shell_out_obj).to receive(:__shell_out_command).with(cmd, options).and_return(true)
203
202
  shell_out_obj.shell_out(cmd, **options, default_env: false)
204
203
  end
205
204
 
206
205
  it "should no longer set env['LC_ALL'] to nil when 'LC_ALL' not present" do
207
206
  options = { env: { "HOME" => "/Users/morty" } }
208
- expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd, options).and_return(true)
207
+ expect(shell_out_obj).to receive(:__shell_out_command).with(cmd, options).and_return(true)
209
208
  shell_out_obj.shell_out(cmd, **options, default_env: false)
210
209
  end
211
210
  end
@@ -213,7 +212,7 @@ describe Chef::Mixin::ShellOut do
213
212
  describe "and no env/environment option is present" do
214
213
  it "should no longer add environment option and set environment['LC_ALL'] to nil" do
215
214
  options = { user: "morty" }
216
- expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd, options).and_return(true)
215
+ expect(shell_out_obj).to receive(:__shell_out_command).with(cmd, options).and_return(true)
217
216
  shell_out_obj.shell_out(cmd, **options, default_env: false)
218
217
  end
219
218
  end
@@ -221,7 +220,7 @@ describe Chef::Mixin::ShellOut do
221
220
 
222
221
  describe "when the last argument is not a Hash" do
223
222
  it "should no longer add environment options and set environment['LC_ALL'] to nil" do
224
- expect(Chef::Mixin::ShellOut).to receive(:shell_out_command).with(cmd).and_return(true)
223
+ expect(shell_out_obj).to receive(:__shell_out_command).with(cmd).and_return(true)
225
224
  shell_out_obj.shell_out(cmd, default_env: false)
226
225
  end
227
226
  end
@@ -159,4 +159,12 @@ describe Chef::Mixin::Which do
159
159
  end
160
160
  end
161
161
  end
162
+
163
+ describe "useful non-stubbed tests" do
164
+ it "works even when the PATH is nuked via adding default_paths", unix_only: true do
165
+ old_path = ENV["PATH"]
166
+ expect(test.which("ls")).to be_truthy
167
+ ENV["PATH"] = old_path
168
+ end
169
+ end
162
170
  end
@@ -1483,9 +1483,9 @@ describe Chef::Node do
1483
1483
  end
1484
1484
  end
1485
1485
 
1486
- context "with whitelisted attributes configured" do
1487
- it "should only save whitelisted attributes (and subattributes)" do
1488
- Chef::Config[:default_attribute_whitelist] = [
1486
+ context "with allowed attributes configured" do
1487
+ it "should only save allowed attributes (and subattributes)" do
1488
+ Chef::Config[:allowed_default_attributes] = [
1489
1489
  ["filesystem", "/dev/disk0s2"],
1490
1490
  "network/interfaces/eth0",
1491
1491
  ]
@@ -1525,8 +1525,8 @@ describe Chef::Node do
1525
1525
  node.save
1526
1526
  end
1527
1527
 
1528
- it "should save false-y whitelisted attributes" do
1529
- Chef::Config[:default_attribute_whitelist] = [
1528
+ it "should save false-y allowed attributes" do
1529
+ Chef::Config[:allowed_default_attributes] = [
1530
1530
  "foo/bar/baz",
1531
1531
  ]
1532
1532
 
@@ -1560,8 +1560,8 @@ describe Chef::Node do
1560
1560
  node.save
1561
1561
  end
1562
1562
 
1563
- it "should not save any attributes if the whitelist is empty" do
1564
- Chef::Config[:default_attribute_whitelist] = []
1563
+ it "should not save any attributes if the allowed is empty" do
1564
+ Chef::Config[:allowed_default_attributes] = []
1565
1565
 
1566
1566
  node.default = {
1567
1567
  "filesystem" => {
@@ -1583,8 +1583,52 @@ describe Chef::Node do
1583
1583
  end
1584
1584
  end
1585
1585
 
1586
- context "with blacklisted attributes configured" do
1587
- it "should only save non-blacklisted attributes (and subattributes)" do
1586
+ context "with deprecated whitelist attributes configured" do
1587
+ it "should only save allowed attributes (and subattributes)" do
1588
+ Chef::Config[:default_attribute_whitelist] = [
1589
+ ["filesystem", "/dev/disk0s2"],
1590
+ "network/interfaces/eth0",
1591
+ ]
1592
+
1593
+ node.default = {
1594
+ "filesystem" => {
1595
+ "/dev/disk0s2" => { "size" => "10mb" },
1596
+ "map - autohome" => { "size" => "10mb" },
1597
+ },
1598
+ "network" => {
1599
+ "interfaces" => {
1600
+ "eth0" => {},
1601
+ "eth1" => {},
1602
+ },
1603
+ },
1604
+ }
1605
+ node.automatic = {}
1606
+ node.normal = {}
1607
+ node.override = {}
1608
+
1609
+ selected_data = {
1610
+ "default" => {
1611
+ "filesystem" => {
1612
+ "/dev/disk0s2" => { "size" => "10mb" },
1613
+ },
1614
+ "network" => {
1615
+ "interfaces" => {
1616
+ "eth0" => {},
1617
+ },
1618
+ },
1619
+ },
1620
+ "automatic" => {}, "normal" => {}, "override" => {}
1621
+ }
1622
+
1623
+ node.name("picky-monkey")
1624
+ Chef::Config[:treat_deprecation_warnings_as_errors] = false
1625
+ expect(@rest).to receive(:put).with("nodes/picky-monkey", hash_including(selected_data)).and_return("foo")
1626
+ node.save
1627
+ end
1628
+ end
1629
+
1630
+ context "with deprecated blacklist attributes configured" do
1631
+ it "should only save non-blocklisted attributes (and subattributes)" do
1588
1632
  Chef::Config[:default_attribute_blacklist] = [
1589
1633
  ["filesystem", "/dev/disk0s2"],
1590
1634
  "network/interfaces/eth0",
@@ -1606,6 +1650,49 @@ describe Chef::Node do
1606
1650
  node.normal = {}
1607
1651
  node.override = {}
1608
1652
 
1653
+ selected_data = {
1654
+ "default" => {
1655
+ "filesystem" => {
1656
+ "map - autohome" => { "size" => "10mb" },
1657
+ },
1658
+ "network" => {
1659
+ "interfaces" => {
1660
+ "eth1" => {},
1661
+ },
1662
+ },
1663
+ },
1664
+ "automatic" => {}, "normal" => {}, "override" => {}
1665
+ }
1666
+ node.name("picky-monkey")
1667
+ Chef::Config[:treat_deprecation_warnings_as_errors] = false
1668
+ expect(@rest).to receive(:put).with("nodes/picky-monkey", hash_including(selected_data)).and_return("foo")
1669
+ node.save
1670
+ end
1671
+ end
1672
+
1673
+ context "with blocklisted attributes configured" do
1674
+ it "should only save non-blocklisted attributes (and subattributes)" do
1675
+ Chef::Config[:blocked_default_attributes] = [
1676
+ ["filesystem", "/dev/disk0s2"],
1677
+ "network/interfaces/eth0",
1678
+ ]
1679
+
1680
+ node.default = {
1681
+ "filesystem" => {
1682
+ "/dev/disk0s2" => { "size" => "10mb" },
1683
+ "map - autohome" => { "size" => "10mb" },
1684
+ },
1685
+ "network" => {
1686
+ "interfaces" => {
1687
+ "eth0" => {},
1688
+ "eth1" => {},
1689
+ },
1690
+ },
1691
+ }
1692
+ node.automatic = {}
1693
+ node.normal = {}
1694
+ node.override = {}
1695
+
1609
1696
  selected_data = {
1610
1697
  "default" => {
1611
1698
  "filesystem" => {
@@ -1624,8 +1711,8 @@ describe Chef::Node do
1624
1711
  node.save
1625
1712
  end
1626
1713
 
1627
- it "should save all attributes if the blacklist is empty" do
1628
- Chef::Config[:default_attribute_blacklist] = []
1714
+ it "should save all attributes if the blocklist is empty" do
1715
+ Chef::Config[:blocked_default_attributes] = []
1629
1716
 
1630
1717
  node.default = {
1631
1718
  "filesystem" => {