chef 16.1.16-universal-mingw32 → 16.3.45-universal-mingw32

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (364) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +6 -7
  3. data/README.md +3 -3
  4. data/Rakefile +3 -16
  5. data/chef-universal-mingw32.gemspec +2 -2
  6. data/chef.gemspec +7 -6
  7. data/lib/chef/application.rb +12 -0
  8. data/lib/chef/application/apply.rb +2 -1
  9. data/lib/chef/application/base.rb +1 -1
  10. data/lib/chef/application/client.rb +1 -1
  11. data/lib/chef/application/windows_service_manager.rb +1 -1
  12. data/lib/chef/{whitelist.rb → attribute_allowlist.rb} +11 -11
  13. data/lib/chef/{blacklist.rb → attribute_blocklist.rb} +9 -9
  14. data/lib/chef/chef_fs/data_handler/data_bag_item_data_handler.rb +1 -1
  15. data/lib/chef/chef_fs/data_handler/organization_data_handler.rb +1 -2
  16. data/lib/chef/chef_fs/file_system/chef_server/cookbook_file.rb +2 -2
  17. data/lib/chef/chef_fs/file_system/chef_server/cookbooks_dir.rb +1 -5
  18. data/lib/chef/chef_fs/file_system/repository/base_file.rb +1 -0
  19. data/lib/chef/chef_fs/parallelizer/parallel_enumerable.rb +1 -1
  20. data/lib/chef/chef_fs/path_utils.rb +1 -1
  21. data/lib/chef/client.rb +3 -3
  22. data/lib/chef/cookbook/chefignore.rb +1 -1
  23. data/lib/chef/cookbook/metadata.rb +1 -1
  24. data/lib/chef/cookbook/remote_file_vendor.rb +1 -3
  25. data/lib/chef/cookbook/syntax_check.rb +1 -2
  26. data/lib/chef/cookbook_loader.rb +15 -29
  27. data/lib/chef/cookbook_version.rb +2 -2
  28. data/lib/chef/data_bag.rb +5 -6
  29. data/lib/chef/deprecated.rb +12 -0
  30. data/lib/chef/digester.rb +3 -2
  31. data/lib/chef/dsl/platform_introspection.rb +2 -0
  32. data/lib/chef/environment.rb +1 -2
  33. data/lib/chef/exceptions.rb +3 -0
  34. data/lib/chef/file_access_control.rb +1 -1
  35. data/lib/chef/file_access_control/windows.rb +2 -2
  36. data/lib/chef/file_content_management/deploy/mv_unix.rb +1 -1
  37. data/lib/chef/formatters/error_inspectors/compile_error_inspector.rb +1 -1
  38. data/lib/chef/formatters/error_inspectors/resource_failure_inspector.rb +3 -3
  39. data/lib/chef/handler.rb +2 -0
  40. data/lib/chef/http.rb +27 -13
  41. data/lib/chef/http/authenticator.rb +3 -1
  42. data/lib/chef/http/http_request.rb +1 -1
  43. data/lib/chef/http/json_output.rb +1 -1
  44. data/lib/chef/http/ssl_policies.rb +18 -0
  45. data/lib/chef/knife.rb +5 -5
  46. data/lib/chef/knife/bootstrap.rb +19 -19
  47. data/lib/chef/knife/bootstrap/templates/chef-full.erb +9 -9
  48. data/lib/chef/knife/bootstrap/train_connector.rb +1 -0
  49. data/lib/chef/knife/client_bulk_delete.rb +1 -1
  50. data/lib/chef/knife/config_get.rb +2 -1
  51. data/lib/chef/knife/config_list_profiles.rb +4 -1
  52. data/lib/chef/knife/config_use_profile.rb +15 -5
  53. data/lib/chef/knife/configure.rb +1 -1
  54. data/lib/chef/knife/cookbook_delete.rb +1 -1
  55. data/lib/chef/knife/cookbook_upload.rb +6 -14
  56. data/lib/chef/knife/core/bootstrap_context.rb +1 -1
  57. data/lib/chef/knife/core/cookbook_scm_repo.rb +1 -1
  58. data/lib/chef/knife/core/gem_glob_loader.rb +1 -1
  59. data/lib/chef/knife/core/hashed_command_loader.rb +1 -0
  60. data/lib/chef/knife/core/subcommand_loader.rb +20 -1
  61. data/lib/chef/knife/core/ui.rb +8 -2
  62. data/lib/chef/knife/core/windows_bootstrap_context.rb +2 -3
  63. data/lib/chef/knife/data_bag_create.rb +1 -1
  64. data/lib/chef/knife/node_bulk_delete.rb +1 -1
  65. data/lib/chef/knife/node_run_list_remove.rb +1 -1
  66. data/lib/chef/knife/rehash.rb +3 -21
  67. data/lib/chef/knife/role_bulk_delete.rb +1 -1
  68. data/lib/chef/knife/ssh.rb +6 -2
  69. data/lib/chef/knife/supermarket_share.rb +1 -1
  70. data/lib/chef/knife/supermarket_unshare.rb +1 -1
  71. data/lib/chef/log.rb +8 -3
  72. data/{spec/functional/resource/base.rb → lib/chef/mixin/chef_utils_wiring.rb} +24 -12
  73. data/{spec/unit/log_spec.rb → lib/chef/mixin/default_paths.rb} +13 -5
  74. data/lib/chef/mixin/openssl_helper.rb +27 -5
  75. data/lib/chef/mixin/path_sanity.rb +5 -4
  76. data/lib/chef/mixin/securable.rb +2 -2
  77. data/lib/chef/mixin/shell_out.rb +4 -188
  78. data/lib/chef/mixin/template.rb +1 -0
  79. data/lib/chef/mixin/which.rb +6 -3
  80. data/lib/chef/mixins.rb +1 -0
  81. data/lib/chef/node.rb +36 -12
  82. data/lib/chef/node_map.rb +21 -18
  83. data/lib/chef/platform/service_helpers.rb +31 -28
  84. data/lib/chef/powershell.rb +1 -1
  85. data/lib/chef/provider/batch.rb +3 -10
  86. data/lib/chef/provider/cron.rb +2 -14
  87. data/lib/chef/provider/execute.rb +2 -1
  88. data/lib/chef/provider/git.rb +12 -4
  89. data/lib/chef/provider/group/dscl.rb +2 -2
  90. data/lib/chef/provider/group/windows.rb +1 -1
  91. data/lib/chef/provider/ifconfig.rb +7 -7
  92. data/lib/chef/provider/mount/aix.rb +1 -1
  93. data/lib/chef/provider/mount/solaris.rb +0 -1
  94. data/lib/chef/provider/mount/windows.rb +2 -2
  95. data/lib/chef/provider/noop.rb +1 -1
  96. data/lib/chef/provider/package/openbsd.rb +1 -1
  97. data/lib/chef/provider/package/portage.rb +2 -2
  98. data/lib/chef/provider/package/powershell.rb +6 -2
  99. data/lib/chef/provider/package/rubygems.rb +2 -2
  100. data/lib/chef/provider/package/snap.rb +97 -29
  101. data/lib/chef/provider/package/windows.rb +9 -4
  102. data/lib/chef/provider/package/windows/msi.rb +3 -3
  103. data/lib/chef/provider/package/windows/registry_uninstall_entry.rb +1 -1
  104. data/lib/chef/provider/package/zypper.rb +0 -1
  105. data/lib/chef/provider/powershell_script.rb +10 -14
  106. data/lib/chef/provider/remote_file/http.rb +4 -1
  107. data/lib/chef/provider/script.rb +4 -75
  108. data/lib/chef/provider/service.rb +2 -2
  109. data/lib/chef/provider/service/arch.rb +1 -1
  110. data/lib/chef/provider/service/debian.rb +2 -2
  111. data/lib/chef/provider/service/openbsd.rb +4 -4
  112. data/lib/chef/provider/service/redhat.rb +1 -1
  113. data/lib/chef/provider/service/windows.rb +1 -1
  114. data/lib/chef/provider/subversion.rb +2 -2
  115. data/lib/chef/provider/user/dscl.rb +4 -4
  116. data/lib/chef/provider/user/linux.rb +3 -3
  117. data/lib/chef/provider/user/mac.rb +5 -5
  118. data/lib/chef/provider/windows_script.rb +87 -25
  119. data/lib/chef/provider/yum_repository.rb +1 -1
  120. data/lib/chef/provider/zypper_repository.rb +31 -11
  121. data/lib/chef/resource.rb +24 -11
  122. data/lib/chef/resource/alternatives.rb +1 -1
  123. data/lib/chef/resource/apt_package.rb +1 -1
  124. data/lib/chef/resource/archive_file.rb +28 -8
  125. data/lib/chef/resource/bash.rb +0 -1
  126. data/lib/chef/resource/batch.rb +4 -2
  127. data/lib/chef/resource/build_essential.rb +2 -2
  128. data/lib/chef/resource/chef_client_scheduled_task.rb +14 -2
  129. data/lib/chef/resource/chef_gem.rb +57 -21
  130. data/lib/chef/resource/chocolatey_feature.rb +1 -2
  131. data/lib/chef/resource/cron/_cron_shared.rb +98 -0
  132. data/lib/chef/resource/cron/cron.rb +46 -0
  133. data/lib/chef/resource/{cron_d.rb → cron/cron_d.rb} +7 -87
  134. data/lib/chef/resource/cron_access.rb +13 -5
  135. data/lib/chef/resource/csh.rb +0 -1
  136. data/lib/chef/resource/dmg_package.rb +2 -2
  137. data/lib/chef/resource/execute.rb +479 -9
  138. data/lib/chef/resource/file.rb +1 -1
  139. data/lib/chef/resource/freebsd_package.rb +1 -1
  140. data/lib/chef/resource/gem_package.rb +35 -2
  141. data/lib/chef/resource/helpers/cron_validations.rb +6 -3
  142. data/lib/chef/resource/homebrew_package.rb +30 -1
  143. data/lib/chef/resource/homebrew_update.rb +107 -0
  144. data/lib/chef/resource/hostname.rb +23 -36
  145. data/lib/chef/resource/kernel_module.rb +14 -1
  146. data/lib/chef/resource/launchd.rb +1 -1
  147. data/lib/chef/resource/lwrp_base.rb +1 -0
  148. data/lib/chef/resource/macos_userdefaults.rb +176 -61
  149. data/lib/chef/resource/mount.rb +1 -1
  150. data/lib/chef/resource/openssl_x509_certificate.rb +11 -14
  151. data/lib/chef/resource/openssl_x509_crl.rb +1 -2
  152. data/lib/chef/resource/perl.rb +0 -1
  153. data/lib/chef/resource/plist.rb +23 -4
  154. data/lib/chef/resource/powershell_script.rb +4 -2
  155. data/lib/chef/resource/python.rb +0 -1
  156. data/lib/chef/resource/remote_file.rb +26 -10
  157. data/lib/chef/resource/ruby.rb +0 -1
  158. data/lib/chef/resource/service.rb +2 -2
  159. data/lib/chef/resource/ssh_known_hosts_entry.rb +16 -1
  160. data/lib/chef/resource/sudo.rb +30 -3
  161. data/lib/chef/resource/swap_file.rb +17 -0
  162. data/lib/chef/resource/template.rb +1 -1
  163. data/lib/chef/resource/timezone.rb +15 -0
  164. data/lib/chef/resource/user_ulimit.rb +1 -1
  165. data/lib/chef/resource/windows_ad_join.rb +30 -1
  166. data/lib/chef/resource/windows_audit_policy.rb +227 -0
  167. data/lib/chef/resource/windows_auto_run.rb +11 -0
  168. data/lib/chef/resource/windows_certificate.rb +26 -0
  169. data/lib/chef/resource/windows_dns_record.rb +17 -0
  170. data/lib/chef/resource/windows_firewall_profile.rb +197 -0
  171. data/lib/chef/resource/windows_font.rb +3 -3
  172. data/lib/chef/resource/windows_package.rb +1 -1
  173. data/lib/chef/resource/windows_pagefile.rb +1 -1
  174. data/lib/chef/resource/windows_script.rb +2 -16
  175. data/lib/chef/resource/windows_security_policy.rb +67 -36
  176. data/lib/chef/resource/windows_shortcut.rb +1 -2
  177. data/lib/chef/resource/windows_task.rb +4 -4
  178. data/lib/chef/resource/windows_user_privilege.rb +30 -7
  179. data/lib/chef/resource/yum_repository.rb +9 -9
  180. data/lib/chef/resource_inspector.rb +7 -1
  181. data/lib/chef/resources.rb +5 -2
  182. data/lib/chef/role.rb +1 -2
  183. data/lib/chef/search/query.rb +1 -1
  184. data/lib/chef/server_api_versions.rb +4 -0
  185. data/lib/chef/shell/shell_session.rb +2 -0
  186. data/lib/chef/util/diff.rb +2 -3
  187. data/lib/chef/util/windows/net_user.rb +1 -1
  188. data/lib/chef/util/windows/volume.rb +1 -1
  189. data/lib/chef/version.rb +2 -2
  190. data/lib/chef/win32/file.rb +1 -1
  191. data/lib/chef/win32/registry.rb +3 -4
  192. data/lib/chef/win32/security.rb +1 -1
  193. data/spec/data/lwrp/providers/buck_passer.rb +1 -1
  194. data/spec/data/lwrp/providers/buck_passer_2.rb +1 -1
  195. data/spec/data/lwrp/providers/embedded_resource_accesses_providers_scope.rb +1 -1
  196. data/spec/functional/knife/configure_spec.rb +1 -1
  197. data/spec/functional/knife/ssh_spec.rb +5 -16
  198. data/spec/functional/resource/aix_service_spec.rb +9 -2
  199. data/spec/functional/resource/aixinit_service_spec.rb +1 -2
  200. data/spec/functional/resource/apt_package_spec.rb +0 -1
  201. data/spec/functional/resource/bash_spec.rb +3 -2
  202. data/spec/functional/resource/bff_spec.rb +1 -1
  203. data/spec/functional/resource/chocolatey_package_spec.rb +4 -0
  204. data/spec/functional/resource/cron_spec.rb +20 -2
  205. data/spec/functional/resource/dnf_package_spec.rb +4 -1
  206. data/spec/functional/resource/execute_spec.rb +1 -1
  207. data/spec/functional/resource/git_spec.rb +23 -1
  208. data/spec/functional/resource/group_spec.rb +15 -3
  209. data/spec/functional/resource/ifconfig_spec.rb +9 -1
  210. data/spec/functional/resource/insserv_spec.rb +3 -3
  211. data/spec/functional/resource/link_spec.rb +2 -5
  212. data/spec/functional/resource/mount_spec.rb +9 -1
  213. data/spec/functional/resource/msu_package_spec.rb +9 -3
  214. data/spec/functional/resource/powershell_script_spec.rb +4 -4
  215. data/spec/functional/resource/remote_file_spec.rb +9 -15
  216. data/spec/functional/resource/rpm_spec.rb +1 -1
  217. data/spec/functional/resource/timezone_spec.rb +2 -0
  218. data/spec/functional/resource/windows_package_spec.rb +0 -1
  219. data/spec/functional/resource/windows_path_spec.rb +4 -0
  220. data/spec/functional/resource/windows_security_policy_spec.rb +0 -1
  221. data/spec/functional/resource/windows_service_spec.rb +4 -0
  222. data/spec/functional/resource/windows_task_spec.rb +12 -11
  223. data/spec/functional/resource/windows_user_privilege_spec.rb +1 -2
  224. data/spec/functional/resource/yum_package_spec.rb +4 -1
  225. data/spec/functional/resource/zypper_package_spec.rb +4 -1
  226. data/spec/functional/run_lock_spec.rb +2 -1
  227. data/spec/functional/shell_spec.rb +5 -6
  228. data/spec/functional/util/powershell/cmdlet_spec.rb +1 -1
  229. data/spec/functional/version_spec.rb +1 -1
  230. data/spec/functional/win32/crypto_spec.rb +1 -1
  231. data/spec/integration/knife/config_list_profiles_spec.rb +30 -2
  232. data/spec/integration/knife/config_use_profile_spec.rb +55 -2
  233. data/spec/integration/knife/cookbook_upload_spec.rb +28 -1
  234. data/spec/integration/knife/data_bag_from_file_spec.rb +1 -1
  235. data/spec/integration/knife/environment_from_file_spec.rb +1 -1
  236. data/spec/integration/knife/node_from_file_spec.rb +1 -1
  237. data/spec/integration/knife/role_from_file_spec.rb +1 -1
  238. data/spec/integration/recipes/accumulator_spec.rb +1 -1
  239. data/spec/integration/recipes/lwrp_inline_resources_spec.rb +1 -1
  240. data/spec/integration/recipes/lwrp_spec.rb +1 -1
  241. data/spec/integration/recipes/notifies_spec.rb +1 -1
  242. data/spec/integration/recipes/notifying_block_spec.rb +1 -1
  243. data/spec/integration/recipes/recipe_dsl_spec.rb +5 -1
  244. data/spec/integration/recipes/resource_converge_if_changed_spec.rb +2 -0
  245. data/spec/integration/recipes/resource_load_spec.rb +4 -2
  246. data/spec/integration/recipes/unified_mode_spec.rb +1 -1
  247. data/spec/integration/recipes/use_partial_spec.rb +1 -1
  248. data/spec/scripts/ssl-serve.rb +1 -1
  249. data/spec/spec_helper.rb +10 -4
  250. data/spec/support/chef_helpers.rb +1 -20
  251. data/spec/support/platform_helpers.rb +1 -3
  252. data/spec/support/platforms/win32/spec_service.rb +1 -1
  253. data/spec/support/shared/functional/execute_resource.rb +1 -1
  254. data/spec/support/shared/functional/file_resource.rb +0 -1
  255. data/spec/support/shared/functional/securable_resource.rb +1 -2
  256. data/spec/support/shared/functional/securable_resource_with_reporting.rb +0 -1
  257. data/spec/support/shared/functional/windows_script.rb +2 -2
  258. data/spec/support/shared/integration/knife_support.rb +2 -9
  259. data/spec/support/shared/unit/application_dot_d.rb +0 -1
  260. data/spec/support/shared/unit/execute_resource.rb +1 -1
  261. data/spec/support/shared/unit/provider/file.rb +12 -8
  262. data/spec/unit/application/solo_spec.rb +4 -2
  263. data/spec/unit/application_spec.rb +11 -2
  264. data/spec/unit/chef_fs/config_spec.rb +2 -2
  265. data/spec/unit/chef_fs/diff_spec.rb +8 -8
  266. data/spec/unit/chef_fs/file_system/operation_failed_error_spec.rb +2 -4
  267. data/spec/unit/chef_fs/{parallelizer.rb → parallelizer_spec.rb} +1 -1
  268. data/spec/unit/client_spec.rb +4 -1
  269. data/spec/unit/cookbook/gem_installer_spec.rb +2 -1
  270. data/spec/unit/cookbook/synchronizer_spec.rb +26 -24
  271. data/spec/unit/data_bag_spec.rb +6 -3
  272. data/spec/unit/data_collector_spec.rb +1 -1
  273. data/spec/unit/decorator_spec.rb +23 -23
  274. data/spec/unit/dsl/platform_introspection_spec.rb +1 -0
  275. data/spec/unit/environment_spec.rb +5 -1
  276. data/spec/unit/event_dispatch/dispatcher_spec.rb +3 -0
  277. data/spec/unit/guard_interpreter_spec.rb +1 -1
  278. data/spec/unit/http/api_versions_spec.rb +20 -2
  279. data/spec/unit/http/ssl_policies_spec.rb +20 -0
  280. data/spec/unit/json_compat_spec.rb +1 -1
  281. data/spec/unit/knife/bootstrap_spec.rb +5 -8
  282. data/spec/unit/knife/cookbook_download_spec.rb +2 -2
  283. data/spec/unit/knife/cookbook_show_spec.rb +6 -7
  284. data/spec/unit/knife/cookbook_upload_spec.rb +7 -10
  285. data/spec/unit/knife/data_bag_edit_spec.rb +1 -1
  286. data/spec/unit/log/syslog_spec.rb +6 -10
  287. data/spec/unit/log/winevt_spec.rb +21 -13
  288. data/spec/unit/lwrp_spec.rb +9 -6
  289. data/spec/unit/mixin/{path_sanity_spec.rb → default_paths_spec.rb} +14 -14
  290. data/spec/unit/mixin/powershell_exec_spec.rb +1 -1
  291. data/spec/unit/mixin/powershell_out_spec.rb +2 -4
  292. data/spec/unit/mixin/powershell_type_coercions_spec.rb +1 -1
  293. data/spec/unit/mixin/securable_spec.rb +0 -1
  294. data/spec/unit/mixin/shell_out_spec.rb +25 -26
  295. data/spec/unit/mixin/subclass_directive_spec.rb +2 -2
  296. data/spec/unit/mixin/unformatter_spec.rb +2 -2
  297. data/spec/unit/mixin/uris_spec.rb +1 -1
  298. data/spec/unit/mixin/user_context_spec.rb +1 -9
  299. data/spec/unit/mixin/which.rb +8 -0
  300. data/spec/unit/node_spec.rb +98 -11
  301. data/spec/unit/property_spec.rb +6 -6
  302. data/spec/unit/provider/batch_spec.rb +130 -0
  303. data/spec/unit/provider/cron/unix_spec.rb +1 -1
  304. data/spec/unit/provider/cron_spec.rb +9 -49
  305. data/spec/unit/provider/dsc_resource_spec.rb +22 -38
  306. data/spec/unit/provider/dsc_script_spec.rb +10 -10
  307. data/spec/unit/provider/execute_spec.rb +1 -8
  308. data/spec/unit/provider/git_spec.rb +3 -3
  309. data/spec/unit/provider/ifconfig_spec.rb +0 -1
  310. data/spec/unit/provider/mdadm_spec.rb +1 -3
  311. data/spec/unit/provider/package/dnf/python_helper_spec.rb +1 -1
  312. data/spec/unit/provider/package/openbsd_spec.rb +1 -1
  313. data/spec/unit/provider/package/pacman_spec.rb +17 -20
  314. data/spec/unit/provider/package/powershell_spec.rb +95 -86
  315. data/spec/unit/provider/package/rubygems_spec.rb +5 -10
  316. data/spec/unit/provider/package/smartos_spec.rb +1 -1
  317. data/spec/unit/provider/package/snap_spec.rb +1 -1
  318. data/spec/unit/provider/package/windows/registry_uninstall_entry_spec.rb +3 -3
  319. data/spec/unit/provider/package/windows_spec.rb +30 -53
  320. data/spec/unit/provider/powershell_script_spec.rb +3 -45
  321. data/spec/unit/provider/script_spec.rb +20 -110
  322. data/spec/unit/provider/service/redhat_spec.rb +1 -1
  323. data/spec/unit/provider/service/windows_spec.rb +2 -6
  324. data/spec/unit/provider/systemd_unit_spec.rb +28 -24
  325. data/spec/unit/provider/user/dscl_spec.rb +2 -2
  326. data/spec/unit/provider/windows_env_spec.rb +5 -4
  327. data/spec/unit/provider/zypper_repository_spec.rb +60 -10
  328. data/spec/unit/provider_spec.rb +1 -0
  329. data/spec/unit/resource/archive_file_spec.rb +11 -2
  330. data/spec/unit/resource/chef_client_cron_spec.rb +23 -7
  331. data/spec/unit/resource/chef_client_scheduled_task_spec.rb +17 -7
  332. data/spec/unit/resource/chef_client_systemd_timer_spec.rb +7 -4
  333. data/spec/unit/resource/cron_spec.rb +2 -2
  334. data/spec/unit/resource/execute_spec.rb +10 -0
  335. data/spec/unit/resource/file/verification_spec.rb +2 -1
  336. data/spec/unit/resource/helpers/cron_validations_spec.rb +5 -1
  337. data/spec/unit/resource/homebrew_update_spec.rb +30 -0
  338. data/spec/unit/resource/macos_user_defaults_spec.rb +103 -2
  339. data/spec/unit/resource/powershell_script_spec.rb +10 -15
  340. data/spec/unit/resource/timezone_spec.rb +1 -1
  341. data/spec/unit/resource/windows_audit_policy_spec.rb +64 -0
  342. data/spec/unit/resource/windows_dns_record_spec.rb +3 -3
  343. data/spec/unit/resource/windows_dns_zone_spec.rb +2 -2
  344. data/spec/unit/resource/windows_firewall_profile_spec.rb +77 -0
  345. data/spec/unit/resource/windows_package_spec.rb +1 -0
  346. data/spec/unit/resource/windows_task_spec.rb +1 -1
  347. data/spec/unit/resource/windows_uac_spec.rb +2 -2
  348. data/spec/unit/resource/yum_repository_spec.rb +21 -21
  349. data/spec/unit/resource_reporter_spec.rb +1 -1
  350. data/spec/unit/resource_spec.rb +84 -1
  351. data/spec/unit/role_spec.rb +23 -21
  352. data/spec/unit/run_context/cookbook_compiler_spec.rb +1 -1
  353. data/spec/unit/run_lock_spec.rb +1 -1
  354. data/spec/unit/scan_access_control_spec.rb +1 -1
  355. data/spec/unit/server_api_spec.rb +43 -16
  356. data/spec/unit/util/backup_spec.rb +1 -1
  357. data/spec/unit/util/diff_spec.rb +1 -15
  358. data/spec/unit/util/dsc/configuration_generator_spec.rb +1 -1
  359. data/spec/unit/util/powershell/ps_credential_spec.rb +2 -2
  360. data/spec/unit/util/selinux_spec.rb +2 -1
  361. data/spec/unit/util/threaded_job_queue_spec.rb +9 -0
  362. data/spec/unit/win32/security_spec.rb +4 -3
  363. metadata +68 -40
  364. data/lib/chef/resource/cron.rb +0 -157
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 16446752a5b3310a65316f551db71838f811ebd759c901742ce9bc181ab7a896
4
- data.tar.gz: 4556d20c75650ec32194e4c9f8ac2c0d11b19166251ad50f4e3d189f48f2437b
3
+ metadata.gz: db6729febd434b9728dea685c0d05d36143e1ee0ccd03e9142cf03ce08ea9eef
4
+ data.tar.gz: 81380fee7ddf96c867e00acb9d83703fd9f9200561bd816eeaae56a0c2a72770
5
5
  SHA512:
6
- metadata.gz: 2b4fd7b272ac8a7ebd8c461c5e53d0878af6bea12a1cb4323aba9bd5920e3b24d2b114b6bdcd196267124eb0825c23593d06d61ed6a84c6cbd2566aab8cce739
7
- data.tar.gz: 628d1a87ed7ba0d2cd83d6374ee97258e83444f0f12e3bf55c442c122ddc40250f3002cfd6d6d3aa9e5b125a8c06ac4f5a7fb8b1b98f6e72b697582a9ab7da84
6
+ metadata.gz: 7ab132c6f2ecb0d419170246976dedbdffba7679acc50ce4b9eeaf25313cd576b64bacaa6bbd324a73fa035dbd83e066d575d3d5d351f11a82b5a479a20fc148
7
+ data.tar.gz: 89f5a714181003a970cf70a114534075cd8fcbb8e96636ec62313d09ccba16d1790d81a798ebd725278a88b9768e7fb1507738e663404d6573de48eda03c6c4f
data/Gemfile CHANGED
@@ -9,12 +9,12 @@ gem "chef", path: "."
9
9
 
10
10
  gem "ohai", git: "https://github.com/chef/ohai.git", branch: "master"
11
11
 
12
- gem "chef-utils", path: File.expand_path("../chef-utils", __FILE__) if File.exist?(File.expand_path("../chef-utils", __FILE__))
13
- gem "chef-config", path: File.expand_path("../chef-config", __FILE__) if File.exist?(File.expand_path("../chef-config", __FILE__))
12
+ gem "chef-utils", path: File.expand_path("chef-utils", __dir__) if File.exist?(File.expand_path("chef-utils", __dir__))
13
+ gem "chef-config", path: File.expand_path("chef-config", __dir__) if File.exist?(File.expand_path("chef-config", __dir__))
14
14
 
15
- if File.exist?(File.expand_path("../chef-bin", __FILE__))
15
+ if File.exist?(File.expand_path("chef-bin", __dir__))
16
16
  # bundling in a git checkout
17
- gem "chef-bin", path: File.expand_path("../chef-bin", __FILE__)
17
+ gem "chef-bin", path: File.expand_path("chef-bin", __dir__)
18
18
  else
19
19
  # bundling in omnibus
20
20
  gem "chef-bin" # rubocop:disable Bundler/DuplicatedGem
@@ -22,8 +22,7 @@ end
22
22
 
23
23
  gem "cheffish", ">= 14"
24
24
 
25
- # avoid bringing in the new http 4 gem that comes with other ffi baggage which breaks builds
26
- gem "chef-telemetry", "=1.0.3"
25
+ gem "chef-telemetry", ">=1.0.8" # 1.0.8 removes the http dep
27
26
 
28
27
  group(:omnibus_package) do
29
28
  gem "appbundler"
@@ -85,7 +84,7 @@ eval_gemfile("./Gemfile.local") if File.exist?("./Gemfile.local")
85
84
  #
86
85
  # We copy (and overwrite) these files every time "bundle <exec|install>" is
87
86
  # executed, just in case they have changed.
88
- if RUBY_PLATFORM =~ /mswin|mingw|windows/
87
+ if RUBY_PLATFORM.match?(/mswin|mingw|windows/)
89
88
  instance_eval do
90
89
  ruby_exe_dir = RbConfig::CONFIG["bindir"]
91
90
  assemblies = Dir.glob(File.expand_path("distro/ruby_bin_folder", Dir.pwd) + "/*.dll")
data/README.md CHANGED
@@ -18,7 +18,7 @@ Chef Infra is a configuration management tool designed to bring automation to yo
18
18
 
19
19
  ### Want to try Chef Infra?
20
20
 
21
- For Chef Infra usage, please refer to our [Learn Chef Rally](https://learn.chef.io/) website, which includes module-based training for Chef Infra, as well as Automate, Habitat, and InSpec.
21
+ For Chef Infra usage, please refer to [Learn Chef](https://learn.chef.io/), our self-paced, entirely free learning platform. Learn Chef also includes module-based training for Chef Infra, as well as Chef Automate, Chef Habitat, and Chef InSpec.
22
22
 
23
23
  Other useful resources for Chef Infra users:
24
24
 
@@ -26,7 +26,7 @@ Other useful resources for Chef Infra users:
26
26
  - Source: <https://github.com/chef/chef/tree/master>
27
27
  - Tickets/Issues: <https://github.com/chef/chef/issues>
28
28
  - Slack: [Chef Community Slack](https://community-slack.chef.io/)
29
- - Mailing list: <https://discourse.chef.io>
29
+ - Mailing list/Forum: <https://discourse.chef.io>
30
30
 
31
31
  ## Reporting Issues
32
32
 
@@ -46,7 +46,7 @@ We'd love to have your help developing Chef Infra. See our [Contributing Documen
46
46
 
47
47
  ## License and Copyright
48
48
 
49
- Copyright 2008-2019, Chef Software, Inc.
49
+ Copyright 2008-2020, Chef Software, Inc.
50
50
 
51
51
  ```
52
52
  Licensed under the Apache License, Version 2.0 (the "License");
data/Rakefile CHANGED
@@ -18,13 +18,14 @@
18
18
  #
19
19
 
20
20
  # we need this to resolve files required by lib/chef/dist
21
- $LOAD_PATH.unshift(File.expand_path("../chef-config/lib", __FILE__))
21
+ $LOAD_PATH.unshift(File.expand_path("chef-config/lib", __dir__))
22
22
 
23
23
  begin
24
24
  require_relative "tasks/rspec"
25
25
  require_relative "tasks/dependencies"
26
26
  require_relative "tasks/announce"
27
27
  require_relative "tasks/docs"
28
+ require_relative "tasks/spellcheck"
28
29
  require_relative "lib/chef/dist"
29
30
  rescue LoadError => e
30
31
  puts "Skipping missing rake dep: #{e}"
@@ -107,18 +108,4 @@ begin
107
108
  end
108
109
  rescue LoadError
109
110
  puts "yard is not available. bundle install first to make sure all dependencies are installed."
110
- end
111
-
112
- namespace :spellcheck do
113
- task :run do
114
- sh 'cspell "**/*" "*.md"'
115
- end
116
-
117
- desc "List the unique unrecognized words in the project."
118
- task :unknown_words do
119
- sh 'cspell "**/*" "*.md" --wordsOnly --no-summary | sort | uniq'
120
- end
121
- end
122
-
123
- desc "Run spellcheck on the project."
124
- task spellcheck: "spellcheck:run"
111
+ end
@@ -1,4 +1,4 @@
1
- gemspec = eval(IO.read(File.expand_path("../chef.gemspec", __FILE__)))
1
+ gemspec = eval(IO.read(File.expand_path("chef.gemspec", __dir__)))
2
2
 
3
3
  gemspec.platform = Gem::Platform.new(%w{universal mingw32})
4
4
 
@@ -14,7 +14,7 @@ gemspec.add_dependency "win32-process", "~> 0.8.2"
14
14
  gemspec.add_dependency "win32-service", ">= 2.1.5", "< 3.0"
15
15
  gemspec.add_dependency "wmi-lite", "~> 1.0"
16
16
  gemspec.add_dependency "win32-taskscheduler", "~> 2.0"
17
- gemspec.add_dependency "iso8601", "~> 0.12.1"
17
+ gemspec.add_dependency "iso8601", ">= 0.12.1", "< 0.14" # validate 0.14 when it comes out
18
18
  gemspec.add_dependency "win32-certstore", "~> 0.3"
19
19
  gemspec.extensions << "ext/win32-eventlog/Rakefile"
20
20
  gemspec.files += Dir.glob("{distro,ext}/**/*")
@@ -24,23 +24,24 @@ Gem::Specification.new do |s|
24
24
  s.add_dependency "mixlib-cli", ">= 2.1.1", "< 3.0"
25
25
  s.add_dependency "mixlib-log", ">= 2.0.3", "< 4.0"
26
26
  s.add_dependency "mixlib-authentication", ">= 2.1", "< 4"
27
- s.add_dependency "mixlib-shellout", ">= 3.0.3", "< 4.0"
27
+ s.add_dependency "mixlib-shellout", ">= 3.1.1", "< 4.0"
28
28
  s.add_dependency "mixlib-archive", ">= 0.4", "< 2.0"
29
29
  s.add_dependency "ohai", "~> 16.0"
30
30
 
31
- s.add_dependency "ffi", "~> 1.9", ">= 1.9.25"
31
+ s.add_dependency "ffi", ">= 1.9.25"
32
32
  s.add_dependency "ffi-yajl", "~> 2.2"
33
- s.add_dependency "net-ssh", ">= 4.2", "< 6"
33
+ s.add_dependency "net-ssh", ">= 4.2", "< 7"
34
34
  s.add_dependency "net-ssh-multi", "~> 1.2", ">= 1.2.1"
35
- s.add_dependency "net-sftp", "~> 2.1", ">= 2.1.2"
35
+ s.add_dependency "net-sftp", ">= 2.1.2", "< 4.0"
36
36
  s.add_dependency "ed25519", "~> 1.2" # ed25519 ssh key support
37
37
  s.add_dependency "bcrypt_pbkdf", "= 1.1.0.rc1" # ed25519 ssh key support
38
38
  s.add_dependency "highline", ">= 1.6.9", "< 3"
39
+ s.add_dependency "tty-prompt", "~> 0.21" # knife ui.ask prompt
39
40
  s.add_dependency "tty-screen", "~> 0.6" # knife list
40
41
  s.add_dependency "pastel" # knife ui.color
41
42
  s.add_dependency "erubis", "~> 2.7"
42
- s.add_dependency "diff-lcs", "~> 1.2", ">= 1.2.4"
43
- s.add_dependency "ffi-libarchive"
43
+ s.add_dependency "diff-lcs", ">= 1.2.4", "< 1.4.0" # 1.4 breaks output
44
+ s.add_dependency "ffi-libarchive", "~> 1.0", ">= 1.0.3"
44
45
  s.add_dependency "chef-zero", ">= 14.0.11"
45
46
  s.add_dependency "chef-vault"
46
47
 
@@ -194,8 +194,10 @@ class Chef
194
194
  chef_config[:log_location].map! do |log_location|
195
195
  case log_location
196
196
  when :syslog, "syslog"
197
+ force_force_logger
197
198
  logger::Syslog.new
198
199
  when :win_evt, "win_evt"
200
+ force_force_logger
199
201
  logger::WinEvt.new
200
202
  else
201
203
  # should be a path or STDOUT
@@ -204,6 +206,16 @@ class Chef
204
206
  end
205
207
  end
206
208
 
209
+ # Force the logger by default for the :winevt and :syslog loggers. Since we do not and cannot
210
+ # support multiple log levels in a mix-and-match situation with formatters and loggers, and the
211
+ # formatters do not support syslog, we force the formatter off by default and the log level is
212
+ # thus info by default. Users can add `--force-formatter -l info` to get back formatter output
213
+ # on STDOUT along with syslog logging.
214
+ #
215
+ def force_force_logger
216
+ chef_config[:force_logger] = true unless chef_config[:force_formatter]
217
+ end
218
+
207
219
  # Use of output formatters is assumed if `force_formatter` is set or if `force_logger` is not set
208
220
  def using_output_formatter?
209
221
  chef_config[:force_formatter] || !chef_config[:force_logger]
@@ -21,6 +21,7 @@ require_relative "../../chef"
21
21
  require_relative "../application"
22
22
  require_relative "../client"
23
23
  require_relative "../config"
24
+ require_relative "../config_fetcher"
24
25
  require_relative "../log"
25
26
  require "fileutils" unless defined?(FileUtils)
26
27
  require "tempfile" unless defined?(Tempfile)
@@ -233,7 +234,7 @@ class Chef::Application::Apply < Chef::Application
233
234
  end
234
235
 
235
236
  # Get this party started
236
- def run(enforce_license = false)
237
+ def run(enforce_license: false)
237
238
  reconfigure
238
239
  check_license_acceptance if enforce_license
239
240
  run_application
@@ -363,7 +363,7 @@ class Chef::Application::Base < Chef::Application
363
363
  Chef::Log.trace("Download recipes tarball from #{url} to #{path}")
364
364
  if File.exist?(url)
365
365
  FileUtils.cp(url, path)
366
- elsif url =~ URI.regexp
366
+ elsif URI.regexp.match?(url)
367
367
  File.open(path, "wb") do |f|
368
368
  open(url) do |r|
369
369
  f.write(r.read)
@@ -39,7 +39,7 @@ class Chef::Application::Client < Chef::Application::Base
39
39
  long: "--daemonize [WAIT]",
40
40
  description: "Daemonize the process. Accepts an optional integer which is the " \
41
41
  "number of seconds to wait before the first daemonized run.",
42
- proc: lambda { |wait| wait =~ /^\d+$/ ? wait.to_i : true }
42
+ proc: lambda { |wait| /^\d+$/.match?(wait) ? wait.to_i : true }
43
43
  end
44
44
 
45
45
  option :pid_file,
@@ -16,7 +16,7 @@
16
16
  # limitations under the License.
17
17
  #
18
18
 
19
- if RUBY_PLATFORM =~ /mswin|mingw32|windows/
19
+ if RUBY_PLATFORM.match?(/mswin|mingw32|windows/)
20
20
  require "win32/service"
21
21
  end
22
22
  require_relative "../config"
@@ -2,14 +2,14 @@
2
2
  require_relative "exceptions"
3
3
 
4
4
  class Chef
5
- class Whitelist
5
+ class AttributeAllowlist
6
6
 
7
- # filter takes two arguments - the data you want to filter, and a whitelisted array
8
- # of keys you want included. You can capture a subtree of the data to filter by
7
+ # filter takes two arguments - the data you want to filter, and an array of
8
+ # keys you want included. You can capture a subtree of the data to filter by
9
9
  # providing a "/"-delimited string of keys. If some key includes "/"-characters,
10
10
  # you must provide an array of keys instead.
11
11
  #
12
- # Whitelist.filter(
12
+ # AttributeAllowlist.filter(
13
13
  # { "filesystem" => {
14
14
  # "/dev/disk" => {
15
15
  # "size" => "10mb"
@@ -27,18 +27,18 @@ class Chef
27
27
  # },
28
28
  # ["network/interfaces/eth0", ["filesystem", "/dev/disk"]])
29
29
  # will capture the eth0 and /dev/disk subtrees.
30
- def self.filter(data, whitelist = nil)
31
- return data if whitelist.nil?
30
+ def self.filter(data, allowlist = nil)
31
+ return data if allowlist.nil?
32
32
 
33
33
  new_data = {}
34
- whitelist.each do |item|
34
+ allowlist.each do |item|
35
35
  add_data(data, new_data, item)
36
36
  end
37
37
  new_data
38
38
  end
39
39
 
40
- # Walk the data has according to the keys provided by the whitelisted item
41
- # and add the data to the whitelisting result.
40
+ # Walk the data has according to the keys provided by the allowlisted item
41
+ # and add the data to the allowlisting result.
42
42
  def self.add_data(data, new_data, item)
43
43
  parts = to_array(item)
44
44
 
@@ -46,7 +46,7 @@ class Chef
46
46
  filtered_data = new_data
47
47
  parts[0..-2].each do |part|
48
48
  unless all_data.key?(part)
49
- Chef::Log.warn("Could not find whitelist attribute #{item}.")
49
+ Chef::Log.warn("Could not find allowlist attribute #{item}.")
50
50
  return nil
51
51
  end
52
52
 
@@ -58,7 +58,7 @@ class Chef
58
58
  # Note: You can't do all_data[parts[-1]] here because the value
59
59
  # may be false-y
60
60
  unless all_data.key?(parts[-1])
61
- Chef::Log.warn("Could not find whitelist attribute #{item}.")
61
+ Chef::Log.warn("Could not find allowlist attribute #{item}.")
62
62
  return nil
63
63
  end
64
64
 
@@ -2,14 +2,14 @@
2
2
  require_relative "exceptions"
3
3
 
4
4
  class Chef
5
- class Blacklist
5
+ class AttributeBlocklist
6
6
 
7
- # filter takes two arguments - the data you want to filter, and a blacklisted array
7
+ # filter takes two arguments - the data you want to filter, and an array
8
8
  # of keys you want discarded. You can capture a subtree of the data to filter by
9
9
  # providing a "/"-delimited string of keys. If some key includes "/"-characters,
10
10
  # you must provide an array of keys instead.
11
11
  #
12
- # Blacklist.filter(
12
+ # AttributeBlocklist.filter(
13
13
  # { "filesystem" => {
14
14
  # "/dev/disk" => {
15
15
  # "size" => "10mb"
@@ -27,17 +27,17 @@ class Chef
27
27
  # },
28
28
  # ["network/interfaces/eth0", ["filesystem", "/dev/disk"]])
29
29
  # will exclude the eth0 and /dev/disk subtrees.
30
- def self.filter(data, blacklist = nil)
31
- return data if blacklist.nil?
30
+ def self.filter(data, blocklist = nil)
31
+ return data if blocklist.nil?
32
32
 
33
- blacklist.each do |item|
33
+ blocklist.each do |item|
34
34
  Chef::Log.warn("Removing item #{item}")
35
35
  remove_data(data, item)
36
36
  end
37
37
  data
38
38
  end
39
39
 
40
- # Walk the data according to the keys provided by the blacklisted item
40
+ # Walk the data according to the keys provided by the blocklisted item
41
41
  # to get a reference to the item that will be removed.
42
42
  def self.remove_data(data, item)
43
43
  parts = to_array(item)
@@ -45,7 +45,7 @@ class Chef
45
45
  item_ref = data
46
46
  parts[0..-2].each do |part|
47
47
  unless item_ref[part]
48
- Chef::Log.warn("Could not find blacklist attribute #{item}.")
48
+ Chef::Log.warn("Could not find blocklist attribute #{item}.")
49
49
  return nil
50
50
  end
51
51
 
@@ -53,7 +53,7 @@ class Chef
53
53
  end
54
54
 
55
55
  unless item_ref.key?(parts[-1])
56
- Chef::Log.warn("Could not find blacklist attribute #{item}.")
56
+ Chef::Log.warn("Could not find blocklist attribute #{item}.")
57
57
  return nil
58
58
  end
59
59
 
@@ -55,7 +55,7 @@ class Chef
55
55
  base_name = remove_dot_json(entry.name)
56
56
  if object["raw_data"]["id"] != base_name
57
57
  yield("ID in #{entry.path_for_printing} must be '#{base_name}' (is '#{object["raw_data"]["id"]}')")
58
- elsif entry.parent.name =~ RESERVED_NAMES
58
+ elsif RESERVED_NAMES.match?(entry.parent.name)
59
59
  yield("Data bag name ('#{entry.parent.name}') must not match #{RESERVED_NAMES.inspect}")
60
60
  end
61
61
  end
@@ -5,14 +5,13 @@ class Chef
5
5
  module DataHandler
6
6
  class OrganizationDataHandler < DataHandlerBase
7
7
  def normalize(organization, entry)
8
- result = normalize_hash(organization, {
8
+ normalize_hash(organization, {
9
9
  "name" => entry.org,
10
10
  "full_name" => entry.org,
11
11
  "org_type" => "Business",
12
12
  "clientname" => "#{entry.org}-validator",
13
13
  "billing_plan" => "platform-free",
14
14
  })
15
- result
16
15
  end
17
16
 
18
17
  def preserve_key?(key)
@@ -18,7 +18,7 @@
18
18
 
19
19
  require_relative "../base_fs_object"
20
20
  require_relative "../../../http/simple"
21
- require "openssl" unless defined?(OpenSSL)
21
+ require "digest" unless defined?(Digest)
22
22
 
23
23
  class Chef
24
24
  module ChefFS
@@ -69,7 +69,7 @@ class Chef
69
69
  private
70
70
 
71
71
  def calc_checksum(value)
72
- OpenSSL::Digest.hexdigest("MD5", value)
72
+ ::Digest::MD5.hexdigest(value)
73
73
  end
74
74
  end
75
75
  end
@@ -76,8 +76,7 @@ class Chef
76
76
  raise Chef::Exceptions::MetadataNotFound.new(cookbook.root_paths[0], cookbook.name) unless cookbook.has_metadata_file?
77
77
 
78
78
  if cookbook
79
- begin
80
- tmp_cl = Chef::CookbookLoader.copy_to_tmp_dir_from_array([cookbook])
79
+ Chef::CookbookLoader.copy_to_tmp_dir_from_array([cookbook]) do |tmp_cl|
81
80
  tmp_cl.load_cookbooks
82
81
  tmp_cl.compile_metadata
83
82
  tmp_cl.freeze_versions if options[:freeze]
@@ -91,9 +90,6 @@ class Chef
91
90
  with_actual_cookbooks_dir(other.parent.file_path) do
92
91
  uploader.upload_cookbooks
93
92
  end
94
-
95
- ensure
96
- tmp_cl.unlink!
97
93
  end
98
94
  end
99
95
  end
@@ -92,6 +92,7 @@ class Chef
92
92
  end
93
93
 
94
94
  attr_writer :write_pretty_json
95
+
95
96
  def write_pretty_json
96
97
  @write_pretty_json.nil? ? root.write_pretty_json : @write_pretty_json
97
98
  end
@@ -145,7 +145,7 @@ class Chef
145
145
 
146
146
  def each_with_exceptions_unordered
147
147
  if @each_running
148
- raise "each() called on parallel enumerable twice simultaneously! Bad mojo"
148
+ raise "each() called on parallel enumerable twice simultaneously! Bad mojo"
149
149
  end
150
150
 
151
151
  @each_running = true
@@ -118,7 +118,7 @@ class Chef
118
118
 
119
119
  if ancestor.length == path.length
120
120
  ""
121
- elsif path[ancestor.length, 1] =~ /#{PathUtils.regexp_path_separator}/
121
+ elsif /#{PathUtils.regexp_path_separator}/.match?(path[ancestor.length, 1])
122
122
  path[ancestor.length + 1..-1]
123
123
  else
124
124
  nil
@@ -20,7 +20,7 @@
20
20
 
21
21
  require_relative "config"
22
22
  require_relative "mixin/params_validate"
23
- require "chef-utils/dsl/path_sanity" unless defined?(ChefUtils::DSL::PathSanity)
23
+ require "chef-utils/dsl/default_paths" unless defined?(ChefUtils::DSL::DefaultPaths)
24
24
  require_relative "log"
25
25
  require_relative "deprecated"
26
26
  require_relative "server_api"
@@ -250,7 +250,7 @@ class Chef
250
250
  logger.info "#{Chef::Dist::CLIENT.capitalize} pid: #{Process.pid}"
251
251
  logger.info "Targeting node: #{Chef::Config.target_mode.host}" if Chef::Config.target_mode?
252
252
  logger.debug("#{Chef::Dist::CLIENT.capitalize} request_id: #{request_id}")
253
- ENV["PATH"] = ChefUtils::DSL::PathSanity.sanitized_path if Chef::Config[:enforce_path_sanity]
253
+ ENV["PATH"] = ChefUtils::DSL::DefaultPaths.default_paths if Chef::Config[:enforce_default_paths] || Chef::Config[:enforce_path_sanity]
254
254
 
255
255
  if Chef::Config.target_mode?
256
256
  get_ohai_data_remotely
@@ -343,7 +343,7 @@ class Chef
343
343
  formatters_for_run.map do |formatter_name, output_path|
344
344
  if output_path.nil?
345
345
  Chef::Formatters.new(formatter_name, STDOUT_FD, STDERR_FD)
346
- else
346
+ elsif output_path.is_a?(String)
347
347
  io = File.open(output_path, "a+")
348
348
  io.sync = true
349
349
  Chef::Formatters.new(formatter_name, io, io)