chef 16.4.41-universal-mingw32 → 16.5.64-universal-mingw32

Sign up to get free protection for your applications and to get access to all the features.
Files changed (271) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +1 -1
  3. data/Rakefile +2 -2
  4. data/bin/knife +1 -1
  5. data/chef.gemspec +2 -1
  6. data/distro/templates/powershell/chef/chef.psm1.erb +18 -18
  7. data/ext/win32-eventlog/Rakefile +2 -2
  8. data/ext/win32-eventlog/chef-log.man.erb +4 -4
  9. data/lib/chef/application.rb +18 -16
  10. data/lib/chef/application/apply.rb +12 -7
  11. data/lib/chef/application/base.rb +26 -23
  12. data/lib/chef/application/client.rb +10 -4
  13. data/lib/chef/application/exit_code.rb +13 -4
  14. data/lib/chef/application/knife.rb +22 -11
  15. data/lib/chef/application/solo.rb +2 -1
  16. data/lib/chef/application/windows_service.rb +14 -14
  17. data/lib/chef/application/windows_service_manager.rb +6 -6
  18. data/lib/chef/chef_fs/knife.rb +2 -2
  19. data/lib/chef/chef_fs/parallelizer.rb +0 -1
  20. data/lib/chef/client.rb +10 -11
  21. data/lib/chef/cookbook/cookbook_version_loader.rb +1 -1
  22. data/lib/chef/cookbook/synchronizer.rb +2 -2
  23. data/lib/chef/cookbook_site_streaming_uploader.rb +13 -11
  24. data/lib/chef/cookbook_uploader.rb +1 -1
  25. data/lib/chef/data_collector.rb +6 -5
  26. data/lib/chef/data_collector/config_validation.rb +22 -13
  27. data/lib/chef/data_collector/run_end_message.rb +2 -2
  28. data/lib/chef/data_collector/run_start_message.rb +1 -1
  29. data/lib/chef/deprecated.rb +1 -1
  30. data/lib/chef/deprecation/warnings.rb +2 -2
  31. data/lib/chef/digester.rb +2 -2
  32. data/lib/chef/dsl/chef_vault.rb +1 -1
  33. data/lib/chef/dsl/data_query.rb +2 -2
  34. data/lib/chef/dsl/platform_introspection.rb +1 -1
  35. data/lib/chef/encrypted_data_bag_item.rb +3 -4
  36. data/lib/chef/encrypted_data_bag_item/decryptor.rb +3 -3
  37. data/lib/chef/encrypted_data_bag_item/encryptor.rb +3 -3
  38. data/lib/chef/environment.rb +2 -2
  39. data/lib/chef/event_loggers/windows_eventlog.rb +2 -2
  40. data/lib/chef/exceptions.rb +4 -4
  41. data/lib/chef/file_access_control/windows.rb +5 -1
  42. data/lib/chef/formatters/doc.rb +7 -6
  43. data/lib/chef/formatters/error_inspectors/api_error_formatting.rb +6 -5
  44. data/lib/chef/formatters/error_inspectors/node_load_error_inspector.rb +3 -3
  45. data/lib/chef/formatters/error_inspectors/registration_error_inspector.rb +9 -9
  46. data/lib/chef/formatters/error_inspectors/resource_failure_inspector.rb +2 -2
  47. data/lib/chef/formatters/error_inspectors/run_list_expansion_error_inspector.rb +3 -3
  48. data/lib/chef/formatters/minimal.rb +5 -4
  49. data/lib/chef/http.rb +6 -4
  50. data/lib/chef/http/auth_credentials.rb +5 -1
  51. data/lib/chef/http/authenticator.rb +1 -1
  52. data/lib/chef/http/basic_client.rb +4 -2
  53. data/lib/chef/http/decompressor.rb +1 -1
  54. data/lib/chef/http/http_request.rb +7 -5
  55. data/lib/chef/http/socketless_chef_zero_client.rb +5 -2
  56. data/lib/chef/http/ssl_policies.rb +1 -1
  57. data/lib/chef/json_compat.rb +1 -1
  58. data/lib/chef/knife.rb +4 -4
  59. data/lib/chef/knife/bootstrap.rb +16 -14
  60. data/lib/chef/knife/bootstrap/chef_vault_handler.rb +1 -1
  61. data/lib/chef/knife/bootstrap/templates/chef-full.erb +3 -3
  62. data/lib/chef/knife/bootstrap/templates/windows-chef-client-msi.erb +7 -7
  63. data/lib/chef/knife/client_create.rb +3 -3
  64. data/lib/chef/knife/config_get.rb +8 -97
  65. data/lib/chef/knife/config_get_profile.rb +9 -9
  66. data/lib/chef/knife/config_list.rb +139 -0
  67. data/lib/chef/knife/config_list_profiles.rb +8 -98
  68. data/lib/chef/knife/config_show.rb +127 -0
  69. data/lib/chef/knife/config_use.rb +61 -0
  70. data/lib/chef/knife/config_use_profile.rb +9 -24
  71. data/lib/chef/knife/configure.rb +2 -2
  72. data/lib/chef/knife/core/bootstrap_context.rb +2 -2
  73. data/lib/chef/knife/core/object_loader.rb +1 -1
  74. data/lib/chef/knife/core/windows_bootstrap_context.rb +11 -11
  75. data/lib/chef/knife/exec.rb +2 -2
  76. data/lib/chef/knife/node_show.rb +2 -2
  77. data/lib/chef/knife/serve.rb +3 -3
  78. data/lib/chef/knife/ssh.rb +16 -1
  79. data/lib/chef/knife/ssl_check.rb +3 -3
  80. data/lib/chef/knife/status.rb +2 -2
  81. data/lib/chef/knife/user_create.rb +2 -2
  82. data/lib/chef/knife/yaml_convert.rb +1 -1
  83. data/lib/chef/local_mode.rb +2 -2
  84. data/lib/chef/log/syslog.rb +2 -2
  85. data/lib/chef/log/winevt.rb +2 -2
  86. data/lib/chef/mixin/deep_merge.rb +0 -12
  87. data/lib/chef/mixin/openssl_helper.rb +1 -4
  88. data/lib/chef/mixin/template.rb +2 -2
  89. data/lib/chef/mixin/uris.rb +2 -2
  90. data/lib/chef/mixin/versioned_api.rb +1 -2
  91. data/lib/chef/monkey_patches/net_http.rb +4 -4
  92. data/lib/chef/node_map.rb +2 -2
  93. data/lib/chef/policy_builder/policyfile.rb +2 -2
  94. data/lib/chef/provider.rb +0 -4
  95. data/lib/chef/provider/file.rb +2 -2
  96. data/lib/chef/provider/ifconfig.rb +1 -1
  97. data/lib/chef/provider/launchd.rb +2 -2
  98. data/lib/chef/provider/mount/linux.rb +63 -0
  99. data/lib/chef/provider/package/rubygems.rb +21 -18
  100. data/lib/chef/provider/package/snap.rb +0 -1
  101. data/lib/chef/provider/package/windows.rb +2 -2
  102. data/lib/chef/provider/package/windows/registry_uninstall_entry.rb +3 -1
  103. data/lib/chef/provider/package/zypper.rb +1 -1
  104. data/lib/chef/provider/remote_file/content.rb +3 -0
  105. data/lib/chef/provider/remote_file/ftp.rb +6 -4
  106. data/lib/chef/provider/remote_file/sftp.rb +6 -4
  107. data/lib/chef/provider/route.rb +2 -6
  108. data/lib/chef/provider/service/macosx.rb +2 -2
  109. data/lib/chef/provider/template_finder.rb +2 -10
  110. data/lib/chef/provider/user/dscl.rb +3 -3
  111. data/lib/chef/provider/user/mac.rb +1 -1
  112. data/lib/chef/provider/windows_task.rb +1 -2
  113. data/lib/chef/provider/zypper_repository.rb +2 -2
  114. data/lib/chef/provider_resolver.rb +1 -1
  115. data/lib/chef/providers.rb +1 -0
  116. data/lib/chef/recipe.rb +2 -2
  117. data/lib/chef/resource.rb +1 -1
  118. data/lib/chef/resource/apt_repository.rb +1 -1
  119. data/lib/chef/resource/bff_package.rb +22 -0
  120. data/lib/chef/resource/breakpoint.rb +57 -2
  121. data/lib/chef/resource/build_essential.rb +1 -1
  122. data/lib/chef/resource/cab_package.rb +29 -0
  123. data/lib/chef/resource/chef_client_cron.rb +32 -25
  124. data/lib/chef/resource/chef_client_launchd.rb +194 -0
  125. data/lib/chef/resource/chef_client_scheduled_task.rb +21 -18
  126. data/lib/chef/resource/chef_client_systemd_timer.rb +24 -17
  127. data/lib/chef/resource/chef_client_trusted_certificate.rb +101 -0
  128. data/lib/chef/resource/chef_gem.rb +10 -10
  129. data/lib/chef/resource/chef_handler.rb +148 -4
  130. data/lib/chef/resource/chef_sleep.rb +2 -2
  131. data/lib/chef/resource/chef_vault_secret.rb +1 -1
  132. data/lib/chef/resource/cookbook_file.rb +2 -2
  133. data/lib/chef/resource/cron/cron_d.rb +0 -1
  134. data/lib/chef/resource/dnf_package.rb +2 -2
  135. data/lib/chef/resource/dsc_resource.rb +0 -1
  136. data/lib/chef/resource/dsc_script.rb +2 -2
  137. data/lib/chef/resource/execute.rb +6 -6
  138. data/lib/chef/resource/file.rb +4 -4
  139. data/lib/chef/resource/gem_package.rb +5 -5
  140. data/lib/chef/resource/homebrew_package.rb +3 -3
  141. data/lib/chef/resource/homebrew_update.rb +5 -5
  142. data/lib/chef/resource/hostname.rb +2 -2
  143. data/lib/chef/resource/launchd.rb +2 -1
  144. data/lib/chef/resource/locale.rb +2 -2
  145. data/lib/chef/resource/macos_userdefaults.rb +3 -3
  146. data/lib/chef/resource/notify_group.rb +0 -1
  147. data/lib/chef/resource/ohai.rb +46 -3
  148. data/lib/chef/resource/ohai_hint.rb +33 -0
  149. data/lib/chef/resource/openssl_dhparam.rb +27 -5
  150. data/lib/chef/resource/openssl_ec_private_key.rb +6 -3
  151. data/lib/chef/resource/openssl_ec_public_key.rb +2 -2
  152. data/lib/chef/resource/openssl_rsa_private_key.rb +6 -3
  153. data/lib/chef/resource/openssl_x509_certificate.rb +14 -14
  154. data/lib/chef/resource/openssl_x509_crl.rb +19 -10
  155. data/lib/chef/resource/openssl_x509_request.rb +14 -16
  156. data/lib/chef/resource/osx_profile.rb +77 -13
  157. data/lib/chef/resource/plist.rb +1 -1
  158. data/lib/chef/resource/powershell_package_source.rb +5 -5
  159. data/lib/chef/resource/reboot.rb +2 -2
  160. data/lib/chef/resource/remote_file.rb +3 -3
  161. data/lib/chef/resource/rhsm_register.rb +22 -10
  162. data/lib/chef/resource/ruby_block.rb +2 -2
  163. data/lib/chef/resource/scm/subversion.rb +2 -2
  164. data/lib/chef/resource/service.rb +3 -3
  165. data/lib/chef/resource/ssh_known_hosts_entry.rb +2 -2
  166. data/lib/chef/resource/support/cron.d.erb +1 -1
  167. data/lib/chef/resource/support/cron_access.erb +1 -1
  168. data/lib/chef/resource/support/sudoer.erb +1 -1
  169. data/lib/chef/resource/support/ulimit.erb +1 -1
  170. data/lib/chef/resource/sysctl.rb +1 -5
  171. data/lib/chef/resource/systemd_unit.rb +2 -2
  172. data/lib/chef/resource/template.rb +2 -2
  173. data/lib/chef/resource/windows_ad_join.rb +10 -3
  174. data/lib/chef/resource/windows_certificate.rb +6 -4
  175. data/lib/chef/resource/windows_firewall_profile.rb +22 -20
  176. data/lib/chef/resource/windows_package.rb +28 -5
  177. data/lib/chef/resource/windows_printer.rb +5 -3
  178. data/lib/chef/resource/windows_printer_port.rb +6 -4
  179. data/lib/chef/resource/windows_user_privilege.rb +53 -54
  180. data/lib/chef/resource/windows_workgroup.rb +3 -3
  181. data/lib/chef/resource/yum_package.rb +2 -2
  182. data/lib/chef/resources.rb +3 -1
  183. data/lib/chef/run_context.rb +2 -2
  184. data/lib/chef/run_context/cookbook_compiler.rb +1 -1
  185. data/lib/chef/run_lock.rb +2 -2
  186. data/lib/chef/search/query.rb +4 -5
  187. data/lib/chef/shell.rb +31 -26
  188. data/lib/chef/shell/ext.rb +11 -11
  189. data/lib/chef/shell/shell_session.rb +2 -2
  190. data/lib/chef/train_transport.rb +5 -104
  191. data/lib/chef/util/diff.rb +3 -3
  192. data/lib/chef/util/powershell/cmdlet.rb +3 -1
  193. data/lib/chef/util/powershell/ps_credential.rb +18 -14
  194. data/lib/chef/util/threaded_job_queue.rb +0 -2
  195. data/lib/chef/version.rb +1 -1
  196. data/lib/chef/win32/crypto.rb +1 -1
  197. data/lib/chef/win32/registry.rb +1 -2
  198. data/spec/data/shef-config.rb +1 -1
  199. data/spec/functional/event_loggers/windows_eventlog_spec.rb +6 -5
  200. data/spec/functional/resource/aix_service_spec.rb +2 -2
  201. data/spec/functional/resource/aixinit_service_spec.rb +1 -1
  202. data/spec/functional/resource/insserv_spec.rb +1 -1
  203. data/spec/functional/resource/user/dscl_spec.rb +1 -1
  204. data/spec/functional/resource/user/mac_user_spec.rb +1 -1
  205. data/spec/functional/resource/windows_task_spec.rb +13 -13
  206. data/spec/functional/version_spec.rb +3 -3
  207. data/spec/integration/client/client_spec.rb +4 -4
  208. data/spec/integration/client/exit_code_spec.rb +3 -2
  209. data/spec/integration/client/ipv6_spec.rb +1 -1
  210. data/spec/integration/knife/{config_list_profiles_spec.rb → config_list_spec.rb} +30 -29
  211. data/spec/integration/knife/{config_get_spec.rb → config_show_spec.rb} +3 -3
  212. data/spec/integration/knife/{config_use_profile_spec.rb → config_use_spec.rb} +53 -10
  213. data/spec/integration/knife/cookbook_api_ipv6_spec.rb +1 -1
  214. data/spec/integration/ohai/ohai_spec.rb +61 -0
  215. data/spec/integration/recipes/remote_directory.rb +1 -1
  216. data/spec/integration/solo/solo_spec.rb +5 -5
  217. data/spec/spec_helper.rb +6 -3
  218. data/spec/stress/win32/file_spec.rb +1 -1
  219. data/spec/support/chef_helpers.rb +2 -2
  220. data/spec/support/matchers/leak.rb +2 -2
  221. data/spec/support/platform_helpers.rb +16 -34
  222. data/spec/support/shared/functional/securable_resource.rb +108 -27
  223. data/spec/support/shared/functional/win32_service.rb +1 -1
  224. data/spec/support/shared/unit/application_dot_d.rb +5 -3
  225. data/spec/tiny_server.rb +0 -1
  226. data/spec/unit/application/client_spec.rb +2 -2
  227. data/spec/unit/application/exit_code_spec.rb +10 -0
  228. data/spec/unit/application_spec.rb +4 -6
  229. data/spec/unit/chef_fs/parallelizer_spec.rb +5 -1
  230. data/spec/unit/chef_fs/path_util_spec.rb +1 -1
  231. data/spec/unit/cookbook/synchronizer_spec.rb +2 -2
  232. data/spec/unit/cookbook_spec.rb +2 -2
  233. data/spec/unit/data_collector/config_validation_spec.rb +208 -0
  234. data/spec/unit/data_collector_spec.rb +0 -113
  235. data/spec/unit/dsl/declare_resource_spec.rb +1 -1
  236. data/spec/unit/file_access_control_spec.rb +1 -1
  237. data/spec/unit/knife/bootstrap_spec.rb +6 -6
  238. data/spec/unit/knife/core/ui_spec.rb +1 -0
  239. data/spec/unit/knife/ssh_spec.rb +2 -2
  240. data/spec/unit/lwrp_spec.rb +3 -3
  241. data/spec/unit/mixin/deep_merge_spec.rb +15 -0
  242. data/spec/unit/mixin/openssl_helper_spec.rb +1 -1
  243. data/spec/unit/mixin/powershell_exec_spec.rb +1 -1
  244. data/spec/unit/mixin/securable_spec.rb +2 -2
  245. data/spec/unit/node/immutable_collections_spec.rb +2 -2
  246. data/spec/unit/provider/mount/linux_spec.rb +97 -0
  247. data/spec/unit/provider/package/chocolatey_spec.rb +1 -1
  248. data/spec/unit/provider/package/powershell_spec.rb +1 -1
  249. data/spec/unit/provider/package/rubygems_spec.rb +4 -1
  250. data/spec/unit/provider/route_spec.rb +0 -2
  251. data/spec/unit/recipe_spec.rb +1 -1
  252. data/spec/unit/resource/chef_client_cron_spec.rb +35 -14
  253. data/spec/unit/resource/chef_client_launchd_spec.rb +127 -0
  254. data/spec/unit/resource/chef_client_systemd_timer_spec.rb +36 -1
  255. data/spec/unit/resource/chef_client_trusted_certificate_spec.rb +54 -0
  256. data/spec/unit/resource/launchd_spec.rb +8 -0
  257. data/spec/unit/resource/osx_profile_spec.rb +67 -1
  258. data/spec/unit/resource/rhsm_register_spec.rb +56 -18
  259. data/spec/unit/resource/windows_uac_spec.rb +1 -1
  260. data/spec/unit/resource/windows_user_privilege_spec.rb +55 -0
  261. data/spec/unit/run_lock_spec.rb +5 -1
  262. data/spec/unit/runner_spec.rb +1 -2
  263. data/spec/unit/shell/shell_ext_spec.rb +46 -3
  264. data/spec/unit/shell/shell_session_spec.rb +35 -64
  265. data/spec/unit/shell_spec.rb +16 -19
  266. data/spec/unit/train_transport_spec.rb +14 -13
  267. data/spec/unit/util/selinux_spec.rb +2 -0
  268. data/tasks/rspec.rb +0 -2
  269. metadata +41 -17
  270. data/lib/chef/dist.rb +0 -68
  271. data/spec/integration/knife/config_get_profile_spec.rb +0 -114
@@ -19,7 +19,7 @@ require "spec_helper"
19
19
 
20
20
  describe Chef::ResourceCollection do
21
21
  let(:run_context) do
22
- cookbook_repo = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "data", "cookbooks"))
22
+ cookbook_repo = File.expand_path(File.join(__dir__, "..", "..", "data", "cookbooks"))
23
23
  cookbook_loader = Chef::CookbookLoader.new(cookbook_repo)
24
24
  cookbook_loader.load_cookbooks
25
25
  node = Chef::Node.new
@@ -26,7 +26,7 @@ describe Chef::FileAccessControl do
26
26
  # we have to re-load the file so the proper
27
27
  # platform specific module is mixed in
28
28
  @node = Chef::Node.new
29
- load File.join(File.dirname(__FILE__), "..", "..", "lib", "chef", "file_access_control.rb")
29
+ load File.join(__dir__, "..", "..", "lib", "chef", "file_access_control.rb")
30
30
  @resource = Chef::Resource::File.new("/tmp/a_file.txt")
31
31
  @resource.owner("toor")
32
32
  @resource.group("wheel")
@@ -185,7 +185,7 @@ describe Chef::Knife::Bootstrap do
185
185
  context "when :bootstrap_template config is set to a template name" do
186
186
  let(:bootstrap_template) { "example" }
187
187
 
188
- let(:builtin_template_path) { File.expand_path(File.join(File.dirname(__FILE__), "../../../lib/chef/knife/bootstrap/templates", "example.erb")) }
188
+ let(:builtin_template_path) { File.expand_path(File.join(__dir__, "../../../lib/chef/knife/bootstrap/templates", "example.erb")) }
189
189
 
190
190
  let(:chef_config_dir_template_path) { "/knife/chef/config/bootstrap/example.erb" }
191
191
 
@@ -472,7 +472,7 @@ describe Chef::Knife::Bootstrap do
472
472
  end
473
473
 
474
474
  describe "when transferring trusted certificates" do
475
- let(:trusted_certs_dir) { Chef::Util::PathHelper.cleanpath(File.join(File.dirname(__FILE__), "../../data/trusted_certs")) }
475
+ let(:trusted_certs_dir) { Chef::Util::PathHelper.cleanpath(File.join(__dir__, "../../data/trusted_certs")) }
476
476
 
477
477
  let(:rendered_template) do
478
478
  knife.merge_configs
@@ -504,7 +504,7 @@ describe Chef::Knife::Bootstrap do
504
504
  end
505
505
 
506
506
  context "when :trusted_cets_dir is empty" do
507
- let(:trusted_certs_dir) { Chef::Util::PathHelper.cleanpath(File.join(File.dirname(__FILE__), "../../data/trusted_certs_empty")) }
507
+ let(:trusted_certs_dir) { Chef::Util::PathHelper.cleanpath(File.join(__dir__, "../../data/trusted_certs_empty")) }
508
508
  it "doesn't create /etc/chef/trusted_certs if :trusted_certs_dir is empty" do
509
509
  expect(rendered_template).not_to match(%r{mkdir -p /etc/chef/trusted_certs})
510
510
  end
@@ -514,7 +514,7 @@ describe Chef::Knife::Bootstrap do
514
514
 
515
515
  context "when doing fips things" do
516
516
  let(:template_file) { File.expand_path(File.join(CHEF_SPEC_DATA, "bootstrap", "no_proxy.erb")) }
517
- let(:trusted_certs_dir) { Chef::Util::PathHelper.cleanpath(File.join(File.dirname(__FILE__), "../../data/trusted_certs")) }
517
+ let(:trusted_certs_dir) { Chef::Util::PathHelper.cleanpath(File.join(__dir__, "../../data/trusted_certs")) }
518
518
 
519
519
  before do
520
520
  Chef::Config[:knife][:bootstrap_template] = template_file
@@ -570,7 +570,7 @@ describe Chef::Knife::Bootstrap do
570
570
  context "when client_d_dir is set" do
571
571
  let(:client_d_dir) do
572
572
  Chef::Util::PathHelper.cleanpath(
573
- File.join(File.dirname(__FILE__), "../../data/client.d_00")
573
+ File.join(__dir__, "../../data/client.d_00")
574
574
  )
575
575
  end
576
576
 
@@ -597,7 +597,7 @@ describe Chef::Knife::Bootstrap do
597
597
  context "a nested directory structure" do
598
598
  let(:client_d_dir) do
599
599
  Chef::Util::PathHelper.cleanpath(
600
- File.join(File.dirname(__FILE__), "../../data/client.d_01")
600
+ File.join(__dir__, "../../data/client.d_01")
601
601
  )
602
602
  end
603
603
  it "creates a file foo/bar.rb" do
@@ -510,6 +510,7 @@ describe Chef::Knife::UI do
510
510
  describe "color" do
511
511
  context "when ui.color? => true" do
512
512
  it "returns colored output" do
513
+ skip "doesn't work on systems that don't correctly have terminals setup for color"
513
514
  expect(@ui).to receive(:color?).and_return(true)
514
515
  expect(@ui.color("a_bus_is", :yellow)).to eql("\e[33ma_bus_is\e[0m")
515
516
  end
@@ -283,10 +283,10 @@ describe Chef::Knife::Ssh do
283
283
  end
284
284
 
285
285
  describe "#ssh_command" do
286
- let(:execution_channel) { double(:execution_channel, on_data: nil) }
286
+ let(:execution_channel) { double(:execution_channel, on_data: nil, on_extended_data: nil) }
287
287
  let(:session_channel) { double(:session_channel, request_pty: nil) }
288
288
 
289
- let(:execution_channel2) { double(:execution_channel, on_data: nil) }
289
+ let(:execution_channel2) { double(:execution_channel, on_data: nil, on_extended_data: nil) }
290
290
  let(:session_channel2) { double(:session_channel, request_pty: nil) }
291
291
 
292
292
  let(:session) { double(:session, loop: nil) }
@@ -169,7 +169,7 @@ describe "LWRP" do
169
169
  describe "Lightweight Chef::Resource" do
170
170
 
171
171
  before do
172
- Dir[File.expand_path(File.join(File.dirname(__FILE__), "..", "data", "lwrp", "resources", "*"))].each do |file|
172
+ Dir[File.expand_path(File.join(__dir__, "..", "data", "lwrp", "resources", "*"))].each do |file|
173
173
  Chef::Resource::LWRPBase.build_from_file("lwrp", file, nil)
174
174
  end
175
175
  end
@@ -211,7 +211,7 @@ describe "LWRP" do
211
211
  node.normal[:penguin_name] = "jackass"
212
212
  run_context = Chef::RunContext.new(node, Chef::CookbookCollection.new, @events)
213
213
 
214
- Dir[File.expand_path(File.join(File.dirname(__FILE__), "..", "data", "lwrp", "resources_with_default_attributes", "*"))].each do |file|
214
+ Dir[File.expand_path(File.join(__dir__, "..", "data", "lwrp", "resources_with_default_attributes", "*"))].each do |file|
215
215
  Chef::Resource::LWRPBase.build_from_file("lwrp", file, run_context)
216
216
  end
217
217
 
@@ -654,7 +654,7 @@ describe "LWRP" do
654
654
  end
655
655
 
656
656
  let(:run_context) do
657
- cookbook_repo = File.expand_path(File.join(File.dirname(__FILE__), "..", "data", "cookbooks"))
657
+ cookbook_repo = File.expand_path(File.join(__dir__, "..", "data", "cookbooks"))
658
658
  cookbook_loader = Chef::CookbookLoader.new(cookbook_repo)
659
659
  cookbook_loader.load_cookbooks
660
660
  cookbook_collection = Chef::CookbookCollection.new(cookbook_loader)
@@ -236,6 +236,14 @@ describe Chef::Mixin::DeepMerge, "deep_merge!" do
236
236
  @dm.deep_merge!(hash_src, hash_dst)
237
237
  expect(hash_dst).to eq({ "item" => "orange" })
238
238
  end
239
+
240
+ it "should overwrite a string with a nil when merging nil values" do
241
+ hash_src = { "item" => nil }
242
+ hash_dst = { "item" => "orange" }
243
+ @dm.deep_merge!(hash_src, hash_dst)
244
+ expect(hash_dst).to eq({ "item" => nil })
245
+ end
246
+
239
247
  end # deep_merge!
240
248
 
241
249
  # Chef specific
@@ -338,5 +346,12 @@ describe Chef::Mixin::DeepMerge do
338
346
  merge_with_hash = { "top_level_a" => 2, "top_level_b" => true }
339
347
  @dm.hash_only_merge(merge_ee_hash, merge_with_hash)
340
348
  end
349
+
350
+ it "should overwrite a string with a nil when merging nil values" do
351
+ hash_src = { "item" => nil }
352
+ hash_dst = { "item" => "orange" }
353
+ merged_result = @dm.hash_only_merge(hash_dst, hash_src)
354
+ expect(merged_result).to eq({ "item" => nil })
355
+ end
341
356
  end
342
357
  end
@@ -99,7 +99,7 @@ describe Chef::Mixin::OpenSSLHelper do
99
99
 
100
100
  context "When the dhparam.pem file does exist, and does contain a vaild dhparam key" do
101
101
  it "returns true" do
102
- @dhparam_file.puts(::OpenSSL::PKey::DH.new(1024).to_pem)
102
+ @dhparam_file.puts(::OpenSSL::PKey::DH.new(256).to_pem) # this is 256 to speed up specs
103
103
  @dhparam_file.close
104
104
  expect(instance.dhparam_pem_valid?(@dhparam_file.path)).to be_truthy
105
105
  end
@@ -19,7 +19,7 @@
19
19
  require "spec_helper"
20
20
  require "chef/mixin/powershell_exec"
21
21
 
22
- describe Chef::Mixin::PowershellExec, :windows_only do
22
+ describe Chef::Mixin::PowershellExec, :windows_only, :windows_gte_10 do
23
23
  let(:powershell_mixin) { Class.new { include Chef::Mixin::PowershellExec } }
24
24
  subject(:object) { powershell_mixin.new }
25
25
 
@@ -45,7 +45,7 @@ describe Chef::Mixin::Securable do
45
45
  describe "unix-specific behavior" do
46
46
  before(:each) do
47
47
  platform_mock :unix do
48
- load File.join(File.dirname(__FILE__), "..", "..", "..", "lib", "chef", "mixin", "securable.rb")
48
+ load File.join(__dir__, "..", "..", "..", "lib", "chef", "mixin", "securable.rb")
49
49
  @securable = Object.new
50
50
  @securable.send(:extend, Chef::Mixin::Securable)
51
51
  @securable.send(:extend, Chef::Mixin::ParamsValidate)
@@ -176,7 +176,7 @@ describe Chef::Mixin::Securable do
176
176
  describe "windows-specific behavior" do
177
177
  before(:each) do
178
178
  platform_mock :windows do
179
- load File.join(File.dirname(__FILE__), "..", "..", "..", "lib", "chef", "mixin", "securable.rb")
179
+ load File.join(__dir__, "..", "..", "..", "lib", "chef", "mixin", "securable.rb")
180
180
  securable_class = Class.new do
181
181
  include Chef::Mixin::Securable
182
182
  include Chef::Mixin::ParamsValidate
@@ -130,7 +130,7 @@ describe Chef::Node::ImmutableMash do
130
130
  end
131
131
 
132
132
  %w{to_h to_hash dup}.each do |immutable_meth|
133
- describe "#{immutable_meth}" do
133
+ describe immutable_meth do
134
134
  include_examples "ImmutableMash module", description
135
135
  end
136
136
  end
@@ -238,7 +238,7 @@ describe Chef::Node::ImmutableArray do
238
238
  end
239
239
 
240
240
  %w{to_a to_array dup}.each do |immutable_meth|
241
- describe "#{immutable_meth}" do
241
+ describe immutable_meth do
242
242
  include_examples "ImmutableArray module", description
243
243
  end
244
244
  end
@@ -0,0 +1,97 @@
1
+ require "spec_helper"
2
+
3
+ describe Chef::Provider::Mount::Linux do
4
+
5
+ let(:run_context) do
6
+ node = Chef::Node.new
7
+ events = Chef::EventDispatch::Dispatcher.new
8
+ run_context = Chef::RunContext.new(node, {}, events)
9
+ end
10
+
11
+ let(:new_resource) do
12
+ new_resource = Chef::Resource::Mount.new("/tmp/foo")
13
+ new_resource.device "/dev/sdz1"
14
+ new_resource.device_type :device
15
+ new_resource.fstype "ext3"
16
+ new_resource.supports remount: false
17
+ new_resource
18
+ end
19
+
20
+ let(:provider) do
21
+ Chef::Provider::Mount::Linux.new(new_resource, run_context)
22
+ end
23
+
24
+ before(:each) do
25
+ allow(::File).to receive(:exists?).with("/dev/sdz1").and_return true
26
+ allow(::File).to receive(:exists?).with("/tmp/foo").and_return true
27
+ allow(::File).to receive(:realpath).with("/dev/sdz1").and_return "/dev/sdz1"
28
+ allow(::File).to receive(:realpath).with("/tmp/foo").and_return "/tmp/foo"
29
+ end
30
+
31
+ context "to see if the volume is mounted" do
32
+
33
+ it "should set mounted true if the mount point is found in the mounts list" do
34
+ allow(provider).to receive(:shell_out!).and_return(double(stdout: "/tmp/foo /dev/sdz1 type ext3 (rw)\n"))
35
+ provider.load_current_resource
36
+ expect(provider.current_resource.mounted).to be_truthy
37
+ end
38
+
39
+ it "should set mounted false if another mount point beginning with the same path is found in the mounts list" do
40
+ allow(provider).to receive(:shell_out!).and_return(double(stdout: "/tmp/foobar /dev/sdz1 type ext3 (rw)\n"))
41
+ provider.load_current_resource
42
+ expect(provider.current_resource.mounted).to be_falsey
43
+ end
44
+
45
+ it "should set mounted true if the symlink target of the device is found in the mounts list" do
46
+ # expand the target path to correct specs on Windows
47
+ target = ::File.expand_path("/dev/mapper/target")
48
+
49
+ allow(::File).to receive(:symlink?).with((new_resource.device).to_s).and_return(true)
50
+ allow(::File).to receive(:readlink).with((new_resource.device).to_s).and_return(target)
51
+
52
+ allow(provider).to receive(:shell_out!).and_return(double(stdout: "/tmp/foo #{target} type ext3 (rw)\n"))
53
+ provider.load_current_resource
54
+ expect(provider.current_resource.mounted).to be_truthy
55
+ end
56
+
57
+ it "should set mounted true if the symlink target of the device is relative and is found in the mounts list - CHEF-4957" do
58
+ target = "xsdz1"
59
+
60
+ # expand the target path to correct specs on Windows
61
+ absolute_target = ::File.expand_path("/dev/xsdz1")
62
+
63
+ allow(::File).to receive(:symlink?).with((new_resource.device).to_s).and_return(true)
64
+ allow(::File).to receive(:readlink).with((new_resource.device).to_s).and_return(target)
65
+
66
+ allow(provider).to receive(:shell_out!).and_return(double(stdout: "/tmp/foo #{absolute_target} type ext3 (rw)\n"))
67
+ provider.load_current_resource
68
+ expect(provider.current_resource.mounted).to be_truthy
69
+ end
70
+
71
+ it "should set mounted true if the mount point is found last in the mounts list" do
72
+ mount = "#{new_resource.mount_point} /dev/sdy1 type ext3 (rw)\n"
73
+ mount << "#{new_resource.mount_point} #{new_resource.device} type ext3 (rw)\n"
74
+
75
+ allow(provider).to receive(:shell_out!).and_return(double(stdout: mount))
76
+ provider.load_current_resource
77
+ expect(provider.current_resource.mounted).to be_truthy
78
+ end
79
+
80
+ it "should set mounted false if the mount point is not last in the mounts list" do
81
+ mount = "#{new_resource.device} on #{new_resource.mount_point} type ext3 (rw)\n"
82
+ mount << "/dev/sdy1 on #{new_resource.mount_point} type ext3 (rw)\n"
83
+
84
+ allow(provider).to receive(:shell_out!).and_return(double(stdout: mount))
85
+ provider.load_current_resource
86
+ expect(provider.current_resource.mounted).to be_falsey
87
+ end
88
+
89
+ it "mounted should be false if the mount point is not found in the mounts list" do
90
+ allow(provider).to receive(:shell_out!).and_return(double(stdout: "/dev/sdy1 on /tmp/foo type ext3 (rw)\n"))
91
+ provider.load_current_resource
92
+ expect(provider.current_resource.mounted).to be_falsey
93
+ end
94
+
95
+ end
96
+
97
+ end
@@ -150,7 +150,7 @@ describe Chef::Provider::Package::Chocolatey, :windows_only do
150
150
  new_resource.package_name("package-does-not-exist")
151
151
  new_resource.returns([0])
152
152
  allow(provider).to receive(:shell_out_compacted!)
153
- .with(choco_exe, "list", "-r", "#{new_resource.package_name.first}", { returns: new_resource.returns, timeout: timeout })
153
+ .with(choco_exe, "list", "-r", new_resource.package_name.first, { returns: new_resource.returns, timeout: timeout })
154
154
  .and_raise(Mixlib::ShellOut::ShellCommandFailed, "Expected process to exit with [0], but received '2'")
155
155
  expect { provider.send(:available_packages) }.to raise_error(Mixlib::ShellOut::ShellCommandFailed, "Expected process to exit with [0], but received '2'")
156
156
  end
@@ -19,7 +19,7 @@
19
19
  require "spec_helper"
20
20
  require "chef/mixin/powershell_out"
21
21
 
22
- describe Chef::Provider::Package::Powershell, :windows_only do
22
+ describe Chef::Provider::Package::Powershell, :windows_only, :windows_gte_10 do
23
23
  include Chef::Mixin::PowershellOut
24
24
  let(:timeout) { 900 }
25
25
  let(:source) { nil }
@@ -387,8 +387,9 @@ describe Chef::Provider::Package::Rubygems do
387
387
  before(:each) do
388
388
  # We choose detect omnibus via RbConfig::CONFIG['bindir'] in Chef::Provider::Package::Rubygems.new
389
389
  allow(RbConfig::CONFIG).to receive(:[]).with("bindir").and_return(bindir)
390
- # Rubygems uses this interally
390
+ # Rubygems uses these two interally
391
391
  allow(RbConfig::CONFIG).to receive(:[]).with("arch").and_call_original
392
+ allow(RbConfig::CONFIG).to receive(:[]).with("ruby_install_name").and_call_original
392
393
  allow(File).to receive(:executable?).and_return false
393
394
  allow(File).to receive(:executable?).with("#{bindir}/gem").and_return true
394
395
  # XXX: we can't stub the provider object directly here because referencing it will create it and that
@@ -467,6 +468,7 @@ describe Chef::Provider::Package::Rubygems do
467
468
  it "searches for a gem binary when running on Omnibus on Unix" do
468
469
  platform_mock :unix do
469
470
  allow(ENV).to receive(:[]).with("PATH").and_return("/usr/bin:/usr/sbin:/opt/chef/embedded/bin")
471
+ allow(ENV).to receive(:[]).with("PATHEXT").and_return(nil)
470
472
  allow(File).to receive(:executable?).with("/usr/bin/gem").and_return(false)
471
473
  allow(File).to receive(:executable?).with("/usr/sbin/gem").and_return(true)
472
474
  allow(File).to receive(:executable?).with("/opt/chef/embedded/bin/gem").and_return(true) # should not get here
@@ -480,6 +482,7 @@ describe Chef::Provider::Package::Rubygems do
480
482
  it "searches for a gem binary when running on Omnibus on Windows" do
481
483
  platform_mock :windows do
482
484
  allow(ENV).to receive(:[]).with("PATH").and_return('C:\windows\system32;C:\windows;C:\Ruby186\bin')
485
+ allow(ENV).to receive(:[]).with("PATHEXT").and_return(nil)
483
486
  allow(File).to receive(:executable?).with('C:\\windows\\system32/gem').and_return(false)
484
487
  allow(File).to receive(:executable?).with('C:\\windows/gem').and_return(false)
485
488
  allow(File).to receive(:executable?).with('C:\\Ruby186\\bin/gem').and_return(true)
@@ -230,8 +230,6 @@ describe Chef::Provider::Route do
230
230
  @provider.generate_config
231
231
  end
232
232
 
233
- end
234
- %w{ rhel fedora amazon }.each do |platform_family|
235
233
  it "should write a default route file on #{platform_family} platform family" do
236
234
  @node.automatic_attrs[:platform_family] = platform_family
237
235
 
@@ -25,7 +25,7 @@ require "chef/platform/resource_priority_map"
25
25
  describe Chef::Recipe do
26
26
 
27
27
  let(:cookbook_collection) do
28
- cookbook_repo = File.expand_path(File.join(File.dirname(__FILE__), "..", "data", "cookbooks"))
28
+ cookbook_repo = File.expand_path(File.join(__dir__, "..", "data", "cookbooks"))
29
29
  cookbook_loader = Chef::CookbookLoader.new(cookbook_repo)
30
30
  cookbook_loader.load_cookbooks
31
31
  Chef::CookbookCollection.new(cookbook_loader)
@@ -29,6 +29,11 @@ describe Chef::Resource::ChefClientCron do
29
29
  expect(resource.action).to eql([:add])
30
30
  end
31
31
 
32
+ it "supports :add and :remove actions" do
33
+ expect { resource.action :add }.not_to raise_error
34
+ expect { resource.action :remove }.not_to raise_error
35
+ end
36
+
32
37
  it "coerces splay to an Integer" do
33
38
  resource.splay "10"
34
39
  expect(resource.splay).to eql(10)
@@ -42,6 +47,19 @@ describe Chef::Resource::ChefClientCron do
42
47
  expect(resource.chef_binary_path).to eql("/opt/chef/bin/chef-client")
43
48
  end
44
49
 
50
+ it "raises an error if nice is less than -20" do
51
+ expect { resource.nice(-21) }.to raise_error(Chef::Exceptions::ValidationFailed)
52
+ end
53
+
54
+ it "raises an error if nice is greater than 19" do
55
+ expect { resource.nice(20) }.to raise_error(Chef::Exceptions::ValidationFailed)
56
+ end
57
+
58
+ it "coerces nice to an Integer" do
59
+ resource.nice "10"
60
+ expect(resource.nice).to eql(10)
61
+ end
62
+
45
63
  it "log_directory is /Library/Logs/Chef on macOS systems" do
46
64
  node.automatic_attrs[:platform_family] = "mac_os_x"
47
65
  node.automatic_attrs[:platform] = "mac_os_x"
@@ -53,11 +71,6 @@ describe Chef::Resource::ChefClientCron do
53
71
  expect(resource.log_directory).to eql("/var/log/chef")
54
72
  end
55
73
 
56
- it "supports :add and :remove actions" do
57
- expect { resource.action :add }.not_to raise_error
58
- expect { resource.action :remove }.not_to raise_error
59
- end
60
-
61
74
  describe "#splay_sleep_time" do
62
75
  it "uses shard_seed attribute if present" do
63
76
  node.automatic_attrs[:shard_seed] = "73399073"
@@ -71,7 +84,7 @@ describe Chef::Resource::ChefClientCron do
71
84
  end
72
85
  end
73
86
 
74
- describe "#cron_command" do
87
+ describe "#client_command" do
75
88
  before do
76
89
  allow(provider).to receive(:splay_sleep_time).and_return("123")
77
90
  end
@@ -79,57 +92,65 @@ describe Chef::Resource::ChefClientCron do
79
92
  let(:root_path) { windows? ? "C:\\chef/client.rb" : "/etc/chef/client.rb" }
80
93
 
81
94
  it "creates a valid command if using all default properties" do
82
- expect(provider.cron_command).to eql(
95
+ expect(provider.client_command).to eql(
83
96
  "/bin/sleep 123; /opt/chef/bin/chef-client -c #{root_path} -L /var/log/chef/client.log"
84
97
  )
85
98
  end
86
99
 
87
100
  it "uses daemon_options if set" do
88
101
  resource.daemon_options ["--foo 1", "--bar 2"]
89
- expect(provider.cron_command).to eql(
102
+ expect(provider.client_command).to eql(
90
103
  "/bin/sleep 123; /opt/chef/bin/chef-client --foo 1 --bar 2 -c #{root_path} -L /var/log/chef/client.log"
91
104
  )
92
105
  end
93
106
 
94
107
  it "uses custom config dir if set" do
95
108
  resource.config_directory "/etc/some_other_dir"
96
- expect(provider.cron_command).to eql("/bin/sleep 123; /opt/chef/bin/chef-client -c /etc/some_other_dir/client.rb -L /var/log/chef/client.log")
109
+ expect(provider.client_command).to eql("/bin/sleep 123; /opt/chef/bin/chef-client -c /etc/some_other_dir/client.rb -L /var/log/chef/client.log")
97
110
  end
98
111
 
99
112
  it "uses custom log files / paths if set" do
100
113
  resource.log_file_name "my-client.log"
101
114
  resource.log_directory "/var/log/my-chef/"
102
- expect(provider.cron_command).to eql(
115
+ expect(provider.client_command).to eql(
103
116
  "/bin/sleep 123; /opt/chef/bin/chef-client -c #{root_path} -L /var/log/my-chef/my-client.log"
104
117
  )
105
118
  end
106
119
 
107
120
  it "uses mailto if set" do
108
121
  resource.mailto "bob@example.com"
109
- expect(provider.cron_command).to eql(
122
+ expect(provider.client_command).to eql(
110
123
  "/bin/sleep 123; /opt/chef/bin/chef-client -c #{root_path} -L /var/log/chef/client.log || echo \"Chef Infra Client execution failed\""
111
124
  )
112
125
  end
113
126
 
114
127
  it "uses custom chef-client binary if set" do
115
128
  resource.chef_binary_path "/usr/local/bin/chef-client"
116
- expect(provider.cron_command).to eql(
129
+ expect(provider.client_command).to eql(
117
130
  "/bin/sleep 123; /usr/local/bin/chef-client -c #{root_path} -L /var/log/chef/client.log"
118
131
  )
119
132
  end
120
133
 
121
134
  it "appends to the log file appending if set to false" do
122
135
  resource.append_log_file false
123
- expect(provider.cron_command).to eql(
136
+ expect(provider.client_command).to eql(
124
137
  "/bin/sleep 123; /opt/chef/bin/chef-client -c #{root_path} > /var/log/chef/client.log 2>&1"
125
138
  )
126
139
  end
127
140
 
128
141
  it "sets the license acceptance flag if set" do
129
142
  resource.accept_chef_license true
130
- expect(provider.cron_command).to eql(
143
+ expect(provider.client_command).to eql(
131
144
  "/bin/sleep 123; /opt/chef/bin/chef-client -c #{root_path} --chef-license accept -L /var/log/chef/client.log"
132
145
  )
133
146
  end
147
+
148
+ it "uses nice if set" do
149
+ allow(provider).to receive(:which).with("nice").and_return("/usr/bin/nice")
150
+ resource.nice(-15)
151
+ expect(provider.client_command).to eql(
152
+ "/bin/sleep 123; /usr/bin/nice -n -15 /opt/chef/bin/chef-client -c #{root_path} -L /var/log/chef/client.log"
153
+ )
154
+ end
134
155
  end
135
156
  end