chef 16.2.50-universal-mingw32 → 16.4.38-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 (377) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +4 -4
  3. data/Rakefile +3 -16
  4. data/chef-universal-mingw32.gemspec +2 -3
  5. data/chef.gemspec +4 -3
  6. data/lib/chef/action_collection.rb +4 -0
  7. data/lib/chef/api_client/registration.rb +2 -2
  8. data/lib/chef/application.rb +13 -1
  9. data/lib/chef/application/apply.rb +6 -5
  10. data/lib/chef/application/windows_service.rb +27 -27
  11. data/lib/chef/{whitelist.rb → attribute_allowlist.rb} +11 -11
  12. data/lib/chef/{blacklist.rb → attribute_blocklist.rb} +9 -9
  13. data/lib/chef/chef_class.rb +0 -1
  14. data/lib/chef/chef_fs/chef_fs_data_store.rb +54 -54
  15. data/lib/chef/chef_fs/data_handler/organization_data_handler.rb +1 -2
  16. data/lib/chef/chef_fs/file_system/chef_server/acl_entry.rb +10 -10
  17. data/lib/chef/chef_fs/file_system/chef_server/cookbook_file.rb +2 -2
  18. data/lib/chef/chef_fs/file_system/chef_server/cookbooks_dir.rb +1 -5
  19. data/lib/chef/chef_fs/file_system/chef_server/organization_invites_entry.rb +8 -8
  20. data/lib/chef/chef_fs/file_system/chef_server/organization_members_entry.rb +8 -8
  21. data/lib/chef/chef_fs/file_system/repository/base_file.rb +1 -0
  22. data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_dir.rb +2 -2
  23. data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_entry.rb +1 -1
  24. data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb +18 -18
  25. data/lib/chef/chef_fs/file_system/repository/directory.rb +1 -1
  26. data/lib/chef/chef_fs/file_system/repository/file_system_entry.rb +1 -1
  27. data/lib/chef/chef_fs/parallelizer/parallel_enumerable.rb +1 -1
  28. data/lib/chef/client.rb +14 -14
  29. data/lib/chef/cookbook/remote_file_vendor.rb +1 -3
  30. data/lib/chef/cookbook/syntax_check.rb +1 -2
  31. data/lib/chef/cookbook_loader.rb +15 -29
  32. data/lib/chef/data_bag.rb +1 -2
  33. data/lib/chef/data_collector/run_end_message.rb +11 -1
  34. data/lib/chef/deprecated.rb +8 -0
  35. data/lib/chef/digester.rb +3 -2
  36. data/lib/chef/dsl/platform_introspection.rb +9 -7
  37. data/lib/chef/encrypted_data_bag_item/decryptor.rb +1 -1
  38. data/lib/chef/environment.rb +3 -4
  39. data/lib/chef/exceptions.rb +4 -1
  40. data/lib/chef/file_access_control/windows.rb +2 -2
  41. data/lib/chef/file_content_management/deploy/mv_unix.rb +1 -1
  42. data/lib/chef/file_content_management/tempfile.rb +9 -9
  43. data/lib/chef/handler.rb +2 -0
  44. data/lib/chef/http.rb +12 -12
  45. data/lib/chef/http/authenticator.rb +3 -1
  46. data/lib/chef/json_compat.rb +1 -1
  47. data/lib/chef/knife.rb +4 -4
  48. data/lib/chef/knife/bootstrap.rb +18 -15
  49. data/lib/chef/knife/bootstrap/train_connector.rb +1 -0
  50. data/lib/chef/knife/config_get.rb +1 -0
  51. data/lib/chef/knife/config_list_profiles.rb +4 -1
  52. data/lib/chef/knife/configure.rb +1 -1
  53. data/lib/chef/knife/cookbook_download.rb +1 -1
  54. data/lib/chef/knife/cookbook_metadata.rb +1 -1
  55. data/lib/chef/knife/cookbook_upload.rb +29 -37
  56. data/lib/chef/knife/core/bootstrap_context.rb +1 -1
  57. data/lib/chef/knife/core/gem_glob_loader.rb +1 -1
  58. data/lib/chef/knife/core/generic_presenter.rb +1 -1
  59. data/lib/chef/knife/core/hashed_command_loader.rb +3 -2
  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 +33 -26
  63. data/lib/chef/knife/delete.rb +15 -15
  64. data/lib/chef/knife/exec.rb +2 -2
  65. data/lib/chef/knife/rehash.rb +3 -21
  66. data/lib/chef/knife/ssh.rb +11 -7
  67. data/lib/chef/knife/xargs.rb +19 -19
  68. data/lib/chef/knife/yaml_convert.rb +1 -1
  69. data/lib/chef/log.rb +7 -2
  70. data/lib/chef/mixin/checksum.rb +0 -1
  71. data/{spec/functional/resource/base.rb → lib/chef/mixin/chef_utils_wiring.rb} +24 -12
  72. data/lib/chef/mixin/deep_merge.rb +35 -6
  73. data/{spec/unit/log_spec.rb → lib/chef/mixin/default_paths.rb} +13 -5
  74. data/lib/chef/mixin/openssl_helper.rb +30 -6
  75. data/lib/chef/mixin/path_sanity.rb +5 -4
  76. data/lib/chef/mixin/shell_out.rb +4 -188
  77. data/lib/chef/mixin/template.rb +1 -0
  78. data/lib/chef/mixin/which.rb +6 -3
  79. data/lib/chef/mixins.rb +1 -0
  80. data/lib/chef/monkey_patches/webrick-utils.rb +10 -10
  81. data/lib/chef/node.rb +36 -12
  82. data/lib/chef/node/attribute.rb +2 -4
  83. data/lib/chef/node_map.rb +21 -18
  84. data/lib/chef/platform/service_helpers.rb +31 -28
  85. data/lib/chef/property.rb +1 -1
  86. data/lib/chef/provider/cron/unix.rb +0 -2
  87. data/lib/chef/provider/git.rb +17 -9
  88. data/lib/chef/provider/group.rb +0 -2
  89. data/lib/chef/provider/group/suse.rb +5 -5
  90. data/lib/chef/provider/ifconfig.rb +1 -4
  91. data/lib/chef/provider/mount.rb +0 -2
  92. data/lib/chef/provider/mount/solaris.rb +0 -1
  93. data/lib/chef/provider/package.rb +0 -2
  94. data/lib/chef/provider/package/rubygems.rb +1 -1
  95. data/lib/chef/provider/package/snap.rb +3 -4
  96. data/lib/chef/provider/package/windows.rb +9 -4
  97. data/lib/chef/provider/package/windows/registry_uninstall_entry.rb +9 -9
  98. data/lib/chef/provider/package/zypper.rb +0 -1
  99. data/lib/chef/provider/powershell_script.rb +21 -5
  100. data/lib/chef/provider/route.rb +1 -1
  101. data/lib/chef/provider/service.rb +2 -2
  102. data/lib/chef/provider/service/arch.rb +1 -1
  103. data/lib/chef/provider/service/debian.rb +1 -1
  104. data/lib/chef/provider/service/gentoo.rb +2 -2
  105. data/lib/chef/provider/service/macosx.rb +2 -2
  106. data/lib/chef/provider/service/openbsd.rb +1 -4
  107. data/lib/chef/provider/service/redhat.rb +2 -2
  108. data/lib/chef/provider/service/upstart.rb +1 -1
  109. data/lib/chef/provider/service/windows.rb +10 -10
  110. data/lib/chef/provider/systemd_unit.rb +0 -2
  111. data/lib/chef/provider/template/content.rb +1 -0
  112. data/lib/chef/provider/user/dscl.rb +2 -2
  113. data/lib/chef/provider/user/mac.rb +9 -9
  114. data/lib/chef/provider/windows_task.rb +0 -3
  115. data/lib/chef/provider/yum_repository.rb +1 -1
  116. data/lib/chef/provider/zypper_repository.rb +1 -2
  117. data/lib/chef/providers.rb +0 -1
  118. data/lib/chef/recipe.rb +1 -1
  119. data/lib/chef/resource.rb +9 -11
  120. data/lib/chef/resource/apt_repository.rb +1 -10
  121. data/lib/chef/resource/build_essential.rb +2 -2
  122. data/lib/chef/resource/chef_client_scheduled_task.rb +1 -1
  123. data/lib/chef/resource/chef_client_systemd_timer.rb +2 -2
  124. data/lib/chef/resource/chef_vault_secret.rb +13 -13
  125. data/lib/chef/resource/chocolatey_feature.rb +1 -2
  126. data/lib/chef/resource/cron/cron_d.rb +1 -1
  127. data/lib/chef/resource/cron_access.rb +2 -2
  128. data/lib/chef/resource/dmg_package.rb +1 -1
  129. data/lib/chef/resource/execute.rb +4 -5
  130. data/lib/chef/resource/homebrew_update.rb +2 -2
  131. data/lib/chef/resource/hostname.rb +18 -18
  132. data/lib/chef/resource/launchd.rb +1 -1
  133. data/lib/chef/resource/lwrp_base.rb +1 -0
  134. data/lib/chef/resource/macos_userdefaults.rb +176 -61
  135. data/lib/chef/resource/openssl_dhparam.rb +2 -0
  136. data/lib/chef/resource/openssl_ec_private_key.rb +2 -0
  137. data/lib/chef/resource/openssl_ec_public_key.rb +2 -0
  138. data/lib/chef/resource/openssl_rsa_private_key.rb +2 -0
  139. data/lib/chef/resource/openssl_rsa_public_key.rb +2 -0
  140. data/lib/chef/resource/openssl_x509_certificate.rb +35 -35
  141. data/lib/chef/resource/openssl_x509_crl.rb +3 -2
  142. data/lib/chef/resource/openssl_x509_request.rb +23 -20
  143. data/lib/chef/resource/osx_profile.rb +227 -5
  144. data/lib/chef/resource/powershell_package_source.rb +1 -1
  145. data/lib/chef/resource/powershell_script.rb +24 -30
  146. data/lib/chef/resource/service.rb +2 -2
  147. data/lib/chef/resource/ssh_known_hosts_entry.rb +1 -1
  148. data/lib/chef/resource/sudo.rb +2 -2
  149. data/lib/chef/resource/sysctl.rb +5 -5
  150. data/lib/chef/resource/user_ulimit.rb +1 -1
  151. data/lib/chef/resource/windows_ad_join.rb +2 -0
  152. data/lib/chef/resource/windows_audit_policy.rb +3 -0
  153. data/lib/chef/resource/windows_auto_run.rb +2 -0
  154. data/lib/chef/resource/windows_certificate.rb +2 -0
  155. data/lib/chef/resource/windows_dfs_folder.rb +2 -0
  156. data/lib/chef/resource/windows_dfs_namespace.rb +2 -0
  157. data/lib/chef/resource/windows_dfs_server.rb +2 -0
  158. data/lib/chef/resource/windows_dns_record.rb +25 -5
  159. data/lib/chef/resource/windows_dns_zone.rb +12 -7
  160. data/lib/chef/resource/windows_feature.rb +2 -0
  161. data/lib/chef/resource/windows_feature_dism.rb +10 -0
  162. data/lib/chef/resource/windows_feature_powershell.rb +14 -2
  163. data/lib/chef/resource/windows_firewall_profile.rb +199 -0
  164. data/lib/chef/resource/windows_firewall_rule.rb +5 -3
  165. data/lib/chef/resource/windows_font.rb +3 -1
  166. data/lib/chef/resource/windows_pagefile.rb +4 -0
  167. data/lib/chef/resource/windows_printer.rb +17 -18
  168. data/lib/chef/resource/windows_printer_port.rb +14 -13
  169. data/lib/chef/resource/windows_security_policy.rb +51 -20
  170. data/lib/chef/resource/windows_share.rb +5 -3
  171. data/lib/chef/resource/windows_shortcut.rb +2 -0
  172. data/lib/chef/resource/windows_uac.rb +2 -0
  173. data/lib/chef/resource/windows_user_privilege.rb +27 -2
  174. data/lib/chef/resource/windows_workgroup.rb +2 -3
  175. data/lib/chef/resource_collection/stepable_iterator.rb +1 -2
  176. data/lib/chef/resource_inspector.rb +7 -1
  177. data/lib/chef/resources.rb +1 -0
  178. data/lib/chef/role.rb +3 -4
  179. data/lib/chef/run_context/cookbook_compiler.rb +20 -20
  180. data/lib/chef/run_status.rb +2 -6
  181. data/lib/chef/server_api_versions.rb +4 -0
  182. data/lib/chef/shell.rb +1 -1
  183. data/lib/chef/shell/shell_session.rb +2 -0
  184. data/lib/chef/util/backup.rb +1 -1
  185. data/lib/chef/util/diff.rb +11 -12
  186. data/lib/chef/util/powershell/cmdlet.rb +1 -1
  187. data/lib/chef/version.rb +2 -2
  188. data/lib/chef/win32/file.rb +2 -2
  189. data/lib/chef/win32/file/version_info.rb +5 -5
  190. data/lib/chef/win32/registry.rb +1 -2
  191. data/spec/data/ssl/chef-rspec.cert +15 -15
  192. data/spec/functional/knife/configure_spec.rb +1 -1
  193. data/spec/functional/knife/ssh_spec.rb +5 -16
  194. data/spec/functional/resource/aix_service_spec.rb +9 -2
  195. data/spec/functional/resource/aixinit_service_spec.rb +8 -9
  196. data/spec/functional/resource/apt_package_spec.rb +0 -1
  197. data/spec/functional/resource/bash_spec.rb +3 -2
  198. data/spec/functional/resource/bff_spec.rb +3 -3
  199. data/spec/functional/resource/chocolatey_package_spec.rb +4 -0
  200. data/spec/functional/resource/cookbook_file_spec.rb +1 -1
  201. data/spec/functional/resource/cron_spec.rb +10 -2
  202. data/spec/functional/resource/dnf_package_spec.rb +4 -1
  203. data/spec/functional/resource/dsc_resource_spec.rb +1 -1
  204. data/spec/functional/resource/dsc_script_spec.rb +0 -1
  205. data/spec/functional/resource/execute_spec.rb +1 -1
  206. data/spec/functional/resource/git_spec.rb +23 -1
  207. data/spec/functional/resource/group_spec.rb +21 -9
  208. data/spec/functional/resource/ifconfig_spec.rb +9 -1
  209. data/spec/functional/resource/insserv_spec.rb +7 -7
  210. data/spec/functional/resource/link_spec.rb +22 -25
  211. data/spec/functional/resource/mount_spec.rb +9 -1
  212. data/spec/functional/resource/msu_package_spec.rb +9 -3
  213. data/spec/functional/resource/powershell_script_spec.rb +8 -8
  214. data/spec/functional/resource/remote_file_spec.rb +7 -13
  215. data/spec/functional/resource/rpm_spec.rb +3 -3
  216. data/spec/functional/resource/timezone_spec.rb +2 -0
  217. data/spec/functional/resource/windows_certificate_spec.rb +3 -3
  218. data/spec/functional/resource/windows_font_spec.rb +49 -0
  219. data/spec/functional/resource/windows_package_spec.rb +0 -1
  220. data/spec/functional/resource/windows_path_spec.rb +4 -0
  221. data/spec/functional/resource/windows_security_policy_spec.rb +0 -4
  222. data/spec/functional/resource/windows_service_spec.rb +4 -0
  223. data/spec/functional/resource/windows_task_spec.rb +4 -3
  224. data/spec/functional/resource/windows_user_privilege_spec.rb +1 -2
  225. data/spec/functional/resource/yum_package_spec.rb +4 -1
  226. data/spec/functional/resource/zypper_package_spec.rb +4 -1
  227. data/spec/functional/run_lock_spec.rb +26 -25
  228. data/spec/functional/shell_spec.rb +5 -6
  229. data/spec/functional/util/powershell/cmdlet_spec.rb +1 -1
  230. data/spec/functional/version_spec.rb +1 -1
  231. data/spec/functional/win32/crypto_spec.rb +1 -1
  232. data/spec/functional/win32/registry_spec.rb +8 -8
  233. data/spec/functional/win32/service_manager_spec.rb +1 -1
  234. data/spec/integration/knife/common_options_spec.rb +12 -12
  235. data/spec/integration/knife/config_get_profile_spec.rb +69 -68
  236. data/spec/integration/knife/config_get_spec.rb +126 -125
  237. data/spec/integration/knife/config_list_profiles_spec.rb +181 -152
  238. data/spec/integration/knife/config_use_profile_spec.rb +110 -109
  239. data/spec/integration/knife/cookbook_upload_spec.rb +28 -1
  240. data/spec/integration/knife/data_bag_from_file_spec.rb +1 -1
  241. data/spec/integration/knife/diff_spec.rb +3 -1
  242. data/spec/integration/knife/download_spec.rb +3 -1
  243. data/spec/integration/knife/environment_from_file_spec.rb +1 -1
  244. data/spec/integration/knife/node_from_file_spec.rb +1 -1
  245. data/spec/integration/knife/role_from_file_spec.rb +1 -1
  246. data/spec/integration/knife/serve_spec.rb +5 -5
  247. data/spec/integration/knife/upload_spec.rb +3 -1
  248. data/spec/integration/recipes/accumulator_spec.rb +1 -1
  249. data/spec/integration/recipes/lwrp_inline_resources_spec.rb +2 -2
  250. data/spec/integration/recipes/lwrp_spec.rb +1 -1
  251. data/spec/integration/recipes/notifies_spec.rb +1 -1
  252. data/spec/integration/recipes/notifying_block_spec.rb +1 -1
  253. data/spec/integration/recipes/recipe_dsl_spec.rb +5 -1
  254. data/spec/integration/recipes/resource_converge_if_changed_spec.rb +2 -0
  255. data/spec/integration/recipes/resource_load_spec.rb +4 -2
  256. data/spec/integration/recipes/unified_mode_spec.rb +1 -1
  257. data/spec/integration/recipes/use_partial_spec.rb +1 -1
  258. data/spec/scripts/ssl-serve.rb +1 -1
  259. data/spec/spec_helper.rb +16 -10
  260. data/spec/support/chef_helpers.rb +1 -20
  261. data/spec/support/platform_helpers.rb +9 -11
  262. data/spec/support/platforms/win32/spec_service.rb +1 -1
  263. data/spec/support/shared/functional/directory_resource.rb +1 -1
  264. data/spec/support/shared/functional/execute_resource.rb +1 -1
  265. data/spec/support/shared/functional/file_resource.rb +20 -21
  266. data/spec/support/shared/functional/securable_resource.rb +1 -2
  267. data/spec/support/shared/functional/securable_resource_with_reporting.rb +0 -1
  268. data/spec/support/shared/functional/win32_service.rb +1 -1
  269. data/spec/support/shared/functional/windows_script.rb +5 -5
  270. data/spec/support/shared/integration/integration_helper.rb +22 -52
  271. data/spec/support/shared/integration/knife_support.rb +2 -9
  272. data/spec/support/shared/unit/application_dot_d.rb +0 -1
  273. data/spec/support/shared/unit/provider/file.rb +12 -8
  274. data/spec/support/shared/unit/script_resource.rb +6 -20
  275. data/spec/support/shared/unit/windows_script_resource.rb +15 -28
  276. data/spec/unit/application/solo_spec.rb +4 -2
  277. data/spec/unit/application_spec.rb +4 -2
  278. data/spec/unit/chef_fs/config_spec.rb +2 -2
  279. data/spec/unit/chef_fs/diff_spec.rb +8 -8
  280. data/spec/unit/chef_fs/file_system/operation_failed_error_spec.rb +2 -4
  281. data/spec/unit/chef_fs/{parallelizer.rb → parallelizer_spec.rb} +1 -1
  282. data/spec/unit/client_spec.rb +4 -1
  283. data/spec/unit/cookbook/gem_installer_spec.rb +2 -1
  284. data/spec/unit/cookbook/synchronizer_spec.rb +26 -24
  285. data/spec/unit/data_bag_spec.rb +6 -3
  286. data/spec/unit/data_collector_spec.rb +29 -1
  287. data/spec/unit/decorator_spec.rb +23 -23
  288. data/spec/unit/dsl/platform_introspection_spec.rb +1 -0
  289. data/spec/unit/environment_spec.rb +12 -8
  290. data/spec/unit/event_dispatch/dispatcher_spec.rb +3 -0
  291. data/spec/unit/guard_interpreter_spec.rb +1 -1
  292. data/spec/unit/http/api_versions_spec.rb +20 -2
  293. data/spec/unit/json_compat_spec.rb +1 -1
  294. data/spec/unit/knife/bootstrap_spec.rb +17 -20
  295. data/spec/unit/knife/cookbook_download_spec.rb +6 -6
  296. data/spec/unit/knife/cookbook_metadata_from_file_spec.rb +1 -1
  297. data/spec/unit/knife/cookbook_show_spec.rb +6 -7
  298. data/spec/unit/knife/cookbook_upload_spec.rb +7 -10
  299. data/spec/unit/knife/core/hashed_command_loader_spec.rb +3 -3
  300. data/spec/unit/knife/core/windows_bootstrap_context_spec.rb +21 -12
  301. data/spec/unit/knife/data_bag_edit_spec.rb +1 -1
  302. data/spec/unit/knife/supermarket_share_spec.rb +1 -1
  303. data/spec/unit/log/syslog_spec.rb +6 -10
  304. data/spec/unit/log/winevt_spec.rb +21 -13
  305. data/spec/unit/lwrp_spec.rb +9 -6
  306. data/spec/unit/mixin/{path_sanity_spec.rb → default_paths_spec.rb} +14 -14
  307. data/spec/unit/mixin/powershell_exec_spec.rb +1 -1
  308. data/spec/unit/mixin/powershell_out_spec.rb +2 -4
  309. data/spec/unit/mixin/powershell_type_coercions_spec.rb +1 -1
  310. data/spec/unit/mixin/securable_spec.rb +0 -1
  311. data/spec/unit/mixin/shell_out_spec.rb +25 -26
  312. data/spec/unit/mixin/subclass_directive_spec.rb +2 -2
  313. data/spec/unit/mixin/template_spec.rb +30 -30
  314. data/spec/unit/mixin/unformatter_spec.rb +2 -2
  315. data/spec/unit/mixin/uris_spec.rb +1 -1
  316. data/spec/unit/mixin/which.rb +8 -0
  317. data/spec/unit/mixin/windows_architecture_helper_spec.rb +4 -4
  318. data/spec/unit/node/immutable_collections_spec.rb +6 -2
  319. data/spec/unit/node_spec.rb +103 -16
  320. data/spec/unit/property_spec.rb +5 -5
  321. data/spec/unit/provider/batch_spec.rb +1 -1
  322. data/spec/unit/provider/cron/unix_spec.rb +1 -1
  323. data/spec/unit/provider/dsc_resource_spec.rb +22 -38
  324. data/spec/unit/provider/dsc_script_spec.rb +10 -10
  325. data/spec/unit/provider/execute_spec.rb +1 -8
  326. data/spec/unit/provider/git_spec.rb +3 -3
  327. data/spec/unit/provider/ifconfig_spec.rb +0 -1
  328. data/spec/unit/provider/mdadm_spec.rb +1 -3
  329. data/spec/unit/provider/package/dnf/python_helper_spec.rb +1 -1
  330. data/spec/unit/provider/package/openbsd_spec.rb +1 -1
  331. data/spec/unit/provider/package/pacman_spec.rb +17 -20
  332. data/spec/unit/provider/package/rubygems_spec.rb +5 -10
  333. data/spec/unit/provider/package/smartos_spec.rb +1 -1
  334. data/spec/unit/provider/package/windows/registry_uninstall_entry_spec.rb +3 -3
  335. data/spec/unit/provider/package/windows_spec.rb +30 -53
  336. data/spec/unit/provider/powershell_script_spec.rb +11 -4
  337. data/spec/unit/provider/remote_directory_spec.rb +9 -9
  338. data/spec/unit/provider/service/arch_service_spec.rb +3 -2
  339. data/spec/unit/provider/service/debian_service_spec.rb +1 -1
  340. data/spec/unit/provider/service/gentoo_service_spec.rb +7 -7
  341. data/spec/unit/provider/service/macosx_spec.rb +3 -3
  342. data/spec/unit/provider/service/redhat_spec.rb +3 -3
  343. data/spec/unit/provider/service/upstart_service_spec.rb +3 -3
  344. data/spec/unit/provider/service/windows_spec.rb +2 -6
  345. data/spec/unit/provider/systemd_unit_spec.rb +28 -24
  346. data/spec/unit/provider/user/dscl_spec.rb +2 -2
  347. data/spec/unit/provider/windows_env_spec.rb +5 -4
  348. data/spec/unit/provider_resolver_spec.rb +6 -6
  349. data/spec/unit/provider_spec.rb +1 -0
  350. data/spec/unit/resource/batch_spec.rb +6 -6
  351. data/spec/unit/resource/chef_client_cron_spec.rb +23 -7
  352. data/spec/unit/resource/chef_client_systemd_timer_spec.rb +7 -4
  353. data/spec/unit/resource/execute_spec.rb +123 -118
  354. data/spec/unit/resource/file/verification_spec.rb +2 -1
  355. data/spec/unit/resource/macos_user_defaults_spec.rb +103 -2
  356. data/spec/unit/resource/osx_profile_spec.rb +233 -0
  357. data/spec/unit/resource/powershell_script_spec.rb +11 -29
  358. data/spec/unit/resource/script_spec.rb +6 -1
  359. data/spec/unit/resource/windows_feature_powershell_spec.rb +30 -4
  360. data/spec/unit/resource/windows_firewall_profile_spec.rb +77 -0
  361. data/spec/unit/resource/windows_package_spec.rb +1 -0
  362. data/spec/unit/resource_reporter_spec.rb +1 -1
  363. data/spec/unit/resource_spec.rb +25 -8
  364. data/spec/unit/role_spec.rb +30 -28
  365. data/spec/unit/run_context/cookbook_compiler_spec.rb +1 -1
  366. data/spec/unit/run_lock_spec.rb +1 -1
  367. data/spec/unit/scan_access_control_spec.rb +1 -1
  368. data/spec/unit/server_api_spec.rb +43 -16
  369. data/spec/unit/util/backup_spec.rb +1 -1
  370. data/spec/unit/util/diff_spec.rb +1 -15
  371. data/spec/unit/util/powershell/ps_credential_spec.rb +2 -2
  372. data/spec/unit/util/selinux_spec.rb +2 -1
  373. data/spec/unit/win32/security_spec.rb +4 -3
  374. data/tasks/rspec.rb +1 -1
  375. metadata +53 -40
  376. data/lib/chef/provider/osx_profile.rb +0 -255
  377. data/spec/unit/provider/osx_profile_spec.rb +0 -255
@@ -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)
@@ -47,17 +47,17 @@ class Chef
47
47
  # ACL writes are fun.
48
48
  acls = data_handler.normalize(Chef::JSONCompat.parse(file_contents), self)
49
49
  PERMISSIONS.each do |permission|
50
- begin
51
- rest.put("#{api_path}/#{permission}", { permission => acls[permission] })
52
- rescue Timeout::Error => e
53
- raise Chef::ChefFS::FileSystem::OperationFailedError.new(:write, self, e, "Timeout writing: #{e}")
54
- rescue Net::HTTPClientException => e
55
- if e.response.code == "404"
56
- raise Chef::ChefFS::FileSystem::NotFoundError.new(self, e)
57
- else
58
- raise Chef::ChefFS::FileSystem::OperationFailedError.new(:write, self, e, "HTTP error writing: #{e}")
59
- end
50
+
51
+ rest.put("#{api_path}/#{permission}", { permission => acls[permission] })
52
+ rescue Timeout::Error => e
53
+ raise Chef::ChefFS::FileSystem::OperationFailedError.new(:write, self, e, "Timeout writing: #{e}")
54
+ rescue Net::HTTPClientException => e
55
+ if e.response.code == "404"
56
+ raise Chef::ChefFS::FileSystem::NotFoundError.new(self, e)
57
+ else
58
+ raise Chef::ChefFS::FileSystem::OperationFailedError.new(:write, self, e, "HTTP error writing: #{e}")
60
59
  end
60
+
61
61
  end
62
62
  end
63
63
  end
@@ -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
@@ -44,15 +44,15 @@ class Chef
44
44
  actual_invites = _read_json.inject({}) { |h, val| h[val["username"]] = val["id"]; h }
45
45
  invites = actual_invites.keys
46
46
  (desired_invites - invites).each do |invite|
47
- begin
48
- rest.post(api_path, { "user" => invite })
49
- rescue Net::HTTPClientException => e
50
- if e.response.code == "409"
51
- Chef::Log.warn("Could not invite #{invite} to organization #{org}: #{api_error_text(e.response)}")
52
- else
53
- raise
54
- end
47
+
48
+ rest.post(api_path, { "user" => invite })
49
+ rescue Net::HTTPClientException => e
50
+ if e.response.code == "409"
51
+ Chef::Log.warn("Could not invite #{invite} to organization #{org}: #{api_error_text(e.response)}")
52
+ else
53
+ raise
55
54
  end
55
+
56
56
  end
57
57
  (invites - desired_invites).each do |invite|
58
58
  rest.delete(File.join(api_path, actual_invites[invite]))
@@ -43,15 +43,15 @@ class Chef
43
43
  desired_members = minimize_value(Chef::JSONCompat.parse(contents, create_additions: false))
44
44
  members = minimize_value(_read_json)
45
45
  (desired_members - members).each do |member|
46
- begin
47
- rest.post(api_path, "username" => member)
48
- rescue Net::HTTPClientException => e
49
- if %w{404 405}.include?(e.response.code)
50
- raise "Chef server at #{api_path} does not allow you to directly add members. Please either upgrade your Chef server or move the users you want into invitations.json instead of members.json."
51
- else
52
- raise
53
- end
46
+
47
+ rest.post(api_path, "username" => member)
48
+ rescue Net::HTTPClientException => e
49
+ if %w{404 405}.include?(e.response.code)
50
+ raise "Chef server at #{api_path} does not allow you to directly add members. Please either upgrade your Chef server or move the users you want into invitations.json instead of members.json."
51
+ else
52
+ raise
54
53
  end
54
+
55
55
  end
56
56
  (members - desired_members).each do |member|
57
57
  rest.delete(File.join(api_path, member))
@@ -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
@@ -76,7 +76,7 @@ class Chef
76
76
 
77
77
  # Write out .uploaded-cookbook-version.json
78
78
  # cookbook_file_path = File.join(file_path, cookbook_name) <- this should be the same as self.file_path
79
- unless File.exists?(file_path)
79
+ unless File.exist?(file_path)
80
80
  FileUtils.mkdir_p(file_path)
81
81
  end
82
82
  uploaded_cookbook_version_path = File.join(file_path, Chef::Cookbook::CookbookVersionLoader::UPLOADED_COOKBOOK_VERSION_FILE)
@@ -132,7 +132,7 @@ class Chef
132
132
  end
133
133
 
134
134
  def can_upload?
135
- File.exists?(uploaded_cookbook_version_path) || children.size > 0
135
+ File.exist?(uploaded_cookbook_version_path) || children.size > 0
136
136
  end
137
137
 
138
138
  protected
@@ -137,7 +137,7 @@ class Chef
137
137
  end
138
138
 
139
139
  def exists?
140
- File.exists?(file_path) && (parent.nil? || parent.can_have_child?(name, dir?))
140
+ File.exist?(file_path) && (parent.nil? || parent.can_have_child?(name, dir?))
141
141
  end
142
142
 
143
143
  def read
@@ -109,23 +109,23 @@ class Chef
109
109
  child = root_dir.create_child(name, file_contents)
110
110
  else
111
111
  child_paths[name].each do |path|
112
- begin
113
- ::FileUtils.mkdir_p(path)
114
- ::FileUtils.chmod(0700, path)
115
- if ChefUtils.windows?
116
- all_mask = Chef::ReservedNames::Win32::API::Security::GENERIC_ALL
117
- administrators = Chef::ReservedNames::Win32::Security::SID.Administrators
118
- owner = Chef::ReservedNames::Win32::Security::SID.default_security_object_owner
119
- dacl = Chef::ReservedNames::Win32::Security::ACL.create([
120
- Chef::ReservedNames::Win32::Security::ACE.access_allowed(owner, all_mask),
121
- Chef::ReservedNames::Win32::Security::ACE.access_allowed(administrators, all_mask),
122
- ])
123
- so = Chef::ReservedNames::Win32::Security::SecurableObject.new(path)
124
- so.owner = owner
125
- so.set_dacl(dacl, false)
126
- end
127
- rescue Errno::EEXIST
112
+
113
+ ::FileUtils.mkdir_p(path)
114
+ ::FileUtils.chmod(0700, path)
115
+ if ChefUtils.windows?
116
+ all_mask = Chef::ReservedNames::Win32::API::Security::GENERIC_ALL
117
+ administrators = Chef::ReservedNames::Win32::Security::SID.Administrators
118
+ owner = Chef::ReservedNames::Win32::Security::SID.default_security_object_owner
119
+ dacl = Chef::ReservedNames::Win32::Security::ACL.create([
120
+ Chef::ReservedNames::Win32::Security::ACE.access_allowed(owner, all_mask),
121
+ Chef::ReservedNames::Win32::Security::ACE.access_allowed(administrators, all_mask),
122
+ ])
123
+ so = Chef::ReservedNames::Win32::Security::SecurableObject.new(path)
124
+ so.owner = owner
125
+ so.set_dacl(dacl, false)
128
126
  end
127
+ rescue Errno::EEXIST
128
+
129
129
  end
130
130
  child = make_child_entry(name)
131
131
  end
@@ -161,7 +161,7 @@ class Chef
161
161
  # members.json and org.json may be found.
162
162
  #
163
163
  def root_dir
164
- existing_paths = root_paths.select { |path| File.exists?(path) }
164
+ existing_paths = root_paths.select { |path| File.exist?(path) }
165
165
  if existing_paths.size > 0
166
166
  MultiplexedDir.new(existing_paths.map do |path|
167
167
  dir = FileSystemEntry.new(name, parent, path)
@@ -184,7 +184,7 @@ class Chef
184
184
  return root_dir.child(name)
185
185
  end
186
186
 
187
- paths = (child_paths[name] || []).select { |path| File.exists?(path) }
187
+ paths = (child_paths[name] || []).select { |path| File.exist?(path) }
188
188
  if paths.size == 0
189
189
  return NonexistentFSObject.new(name, self)
190
190
  end
@@ -151,7 +151,7 @@ class Chef
151
151
  end
152
152
 
153
153
  def exists?
154
- File.exists?(file_path)
154
+ File.exist?(file_path)
155
155
  end
156
156
 
157
157
  protected
@@ -122,7 +122,7 @@ class Chef
122
122
  end
123
123
 
124
124
  def exists?
125
- File.exists?(file_path) && (parent.nil? || parent.can_have_child?(name, dir?))
125
+ File.exist?(file_path) && (parent.nil? || parent.can_have_child?(name, dir?))
126
126
  end
127
127
 
128
128
  def read
@@ -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
@@ -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"
@@ -54,7 +54,7 @@ require_relative "platform/rebooter"
54
54
  require_relative "mixin/deprecation"
55
55
  require "chef-utils" unless defined?(ChefUtils::CANARY)
56
56
  require "ohai" unless defined?(Ohai::System)
57
- require "rbconfig"
57
+ require "rbconfig" unless defined?(RbConfig)
58
58
  require_relative "dist"
59
59
  require "forwardable" unless defined?(Forwardable)
60
60
 
@@ -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)
@@ -707,16 +707,16 @@ class Chef
707
707
  #
708
708
  def converge(run_context)
709
709
  catch(:end_client_run_early) do
710
- begin
711
- events.converge_start(run_context)
712
- logger.debug("Converging node #{node_name}")
713
- @runner = Chef::Runner.new(run_context)
714
- @runner.converge
715
- events.converge_complete
716
- rescue Exception => e
717
- events.converge_failed(e)
718
- raise e
719
- end
710
+
711
+ events.converge_start(run_context)
712
+ logger.debug("Converging node #{node_name}")
713
+ @runner = Chef::Runner.new(run_context)
714
+ @runner.converge
715
+ events.converge_complete
716
+ rescue Exception => e
717
+ events.converge_failed(e)
718
+ raise e
719
+
720
720
  end
721
721
  end
722
722
 
@@ -72,10 +72,8 @@ class Chef
72
72
  Chef::Log.trace("Current checksum: #{current_checksum}; manifest checksum: #{found_manifest_record["checksum"]})")
73
73
  end
74
74
 
75
- full_path_cache_filename = Chef::FileCache.load(cache_filename, false)
76
-
77
75
  # return the filename, not the contents (second argument= false)
78
- full_path_cache_filename
76
+ Chef::FileCache.load(cache_filename, false)
79
77
  end
80
78
 
81
79
  def validate_cached_copy(cache_filename)
@@ -120,8 +120,7 @@ class Chef
120
120
  path = Chef::Util::PathHelper.escape_glob_dir(cookbook_path)
121
121
  files = Dir[File.join(path, "**", "*.rb")]
122
122
  files = remove_ignored_files(files)
123
- files = remove_uninteresting_ruby_files(files)
124
- files
123
+ remove_uninteresting_ruby_files(files)
125
124
  end
126
125
 
127
126
  def untested_ruby_files
@@ -44,14 +44,11 @@ class Chef
44
44
  # @return [Array<String>] the array of repo paths containing cookbook dirs
45
45
  attr_reader :repo_paths
46
46
 
47
- attr_accessor :tmp_working_dir_path
48
-
49
47
  # XXX: this is highly questionable combined with the Hash-style each method
50
48
  include Enumerable
51
49
 
52
50
  # @param repo_paths [Array<String>] the array of repo paths containing cookbook dirs
53
51
  def initialize(*repo_paths)
54
- @tmp_working_dir_path = nil
55
52
  @repo_paths = repo_paths.flatten.compact.map { |p| File.expand_path(p) }
56
53
  raise ArgumentError, "You must specify at least one cookbook repo path" if @repo_paths.empty?
57
54
  end
@@ -140,27 +137,23 @@ class Chef
140
137
 
141
138
  # This method creates tmp directory and copies all cookbooks into it and creates cookbook loader object which points to tmp directory
142
139
  def self.copy_to_tmp_dir_from_array(cookbooks)
143
- tmp_cookbook_file = Tempfile.new("tmp_working_dir_path")
144
- tmp_cookbook_file.close
145
- @tmp_working_dir_path = tmp_cookbook_file.path
146
- File.unlink(@tmp_working_dir_path)
147
- FileUtils.mkdir_p(@tmp_working_dir_path)
148
- cookbooks.each do |cookbook|
149
- checksums_to_on_disk_paths = cookbook.checksums
150
- cookbook.each_file do |manifest_record|
151
- path_in_cookbook = manifest_record[:path]
152
- on_disk_path = checksums_to_on_disk_paths[manifest_record[:checksum]]
153
- dest = File.join(@tmp_working_dir_path, cookbook.name.to_s, path_in_cookbook)
154
- FileUtils.mkdir_p(File.dirname(dest))
155
- FileUtils.cp_r(on_disk_path, dest)
140
+ Dir.mktmpdir do |tmp_dir|
141
+ cookbooks.each do |cookbook|
142
+ checksums_to_on_disk_paths = cookbook.checksums
143
+ cookbook.each_file do |manifest_record|
144
+ path_in_cookbook = manifest_record[:path]
145
+ on_disk_path = checksums_to_on_disk_paths[manifest_record[:checksum]]
146
+ dest = File.join(tmp_dir, cookbook.name.to_s, path_in_cookbook)
147
+ FileUtils.mkdir_p(File.dirname(dest))
148
+ FileUtils.cp_r(on_disk_path, dest)
149
+ end
156
150
  end
151
+ tmp_cookbook_loader ||= begin
152
+ Chef::Cookbook::FileVendor.fetch_from_disk(tmp_dir)
153
+ CookbookLoader.new(tmp_dir)
154
+ end
155
+ yield tmp_cookbook_loader
157
156
  end
158
- tmp_cookbook_loader ||= begin
159
- Chef::Cookbook::FileVendor.fetch_from_disk(@tmp_working_dir_path)
160
- CookbookLoader.new(@tmp_working_dir_path)
161
- end
162
- tmp_cookbook_loader.tmp_working_dir_path = @tmp_working_dir_path
163
- tmp_cookbook_loader
164
157
  end
165
158
 
166
159
  # generates metadata.json adds it in the manifest
@@ -181,13 +174,6 @@ class Chef
181
174
  end
182
175
  end
183
176
 
184
- # removes the tmp_dir_path
185
- def unlink!
186
- raise "Invalid directory path." if @tmp_working_dir_path.nil?
187
-
188
- FileUtils.rm_rf(@tmp_working_dir_path)
189
- end
190
-
191
177
  alias :cookbooks :values
192
178
 
193
179
  private
@@ -59,12 +59,11 @@ class Chef
59
59
  end
60
60
 
61
61
  def to_h
62
- result = {
62
+ {
63
63
  "name" => @name,
64
64
  "json_class" => self.class.name,
65
65
  "chef_type" => "data_bag",
66
66
  }
67
- result
68
67
  end
69
68
 
70
69
  alias_method :to_hash, :to_h
@@ -133,7 +133,17 @@ class Chef
133
133
  end
134
134
 
135
135
  hash["conditional"] = action_record.conditional.to_text if action_record.status == :skipped
136
- hash["error_message"] = action_record.exception.message unless action_record.exception.nil?
136
+
137
+ unless action_record.exception.nil?
138
+ hash["error_message"] = action_record.exception.message
139
+
140
+ hash["error"] = {
141
+ "class" => action_record.exception.class,
142
+ "message" => action_record.exception.message,
143
+ "backtrace" => action_record.exception.backtrace,
144
+ "description" => action_record.error_description,
145
+ }
146
+ end
137
147
 
138
148
  hash
139
149
  end