chef 16.2.73-universal-mingw32 → 16.4.41-universal-mingw32

Sign up to get free protection for your applications and to get access to all the features.
Files changed (316) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +4 -4
  3. data/Rakefile +1 -1
  4. data/chef-universal-mingw32.gemspec +2 -3
  5. data/chef.gemspec +2 -1
  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 +5 -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/cookbooks_dir.rb +1 -5
  18. data/lib/chef/chef_fs/file_system/chef_server/organization_invites_entry.rb +8 -8
  19. data/lib/chef/chef_fs/file_system/chef_server/organization_members_entry.rb +8 -8
  20. data/lib/chef/chef_fs/file_system/repository/base_file.rb +1 -0
  21. data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_dir.rb +2 -2
  22. data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_entry.rb +1 -1
  23. data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb +18 -18
  24. data/lib/chef/chef_fs/file_system/repository/directory.rb +1 -1
  25. data/lib/chef/chef_fs/file_system/repository/file_system_entry.rb +1 -1
  26. data/lib/chef/chef_fs/parallelizer/parallel_enumerable.rb +1 -1
  27. data/lib/chef/client.rb +14 -14
  28. data/lib/chef/cookbook/remote_file_vendor.rb +1 -3
  29. data/lib/chef/cookbook/syntax_check.rb +1 -2
  30. data/lib/chef/cookbook_loader.rb +15 -29
  31. data/lib/chef/data_bag.rb +1 -2
  32. data/lib/chef/data_collector/run_end_message.rb +11 -1
  33. data/lib/chef/deprecated.rb +8 -0
  34. data/lib/chef/dsl/platform_introspection.rb +9 -7
  35. data/lib/chef/encrypted_data_bag_item/decryptor.rb +1 -1
  36. data/lib/chef/environment.rb +3 -4
  37. data/lib/chef/exceptions.rb +4 -1
  38. data/lib/chef/file_content_management/tempfile.rb +9 -9
  39. data/lib/chef/handler.rb +2 -0
  40. data/lib/chef/http.rb +11 -11
  41. data/lib/chef/http/authenticator.rb +3 -1
  42. data/lib/chef/json_compat.rb +1 -1
  43. data/lib/chef/knife.rb +4 -4
  44. data/lib/chef/knife/bootstrap.rb +6 -12
  45. data/lib/chef/knife/bootstrap/train_connector.rb +1 -0
  46. data/lib/chef/knife/config_get.rb +1 -0
  47. data/lib/chef/knife/config_list_profiles.rb +4 -1
  48. data/lib/chef/knife/configure.rb +3 -1
  49. data/lib/chef/knife/cookbook_download.rb +1 -1
  50. data/lib/chef/knife/cookbook_metadata.rb +1 -1
  51. data/lib/chef/knife/cookbook_upload.rb +28 -33
  52. data/lib/chef/knife/core/gem_glob_loader.rb +1 -1
  53. data/lib/chef/knife/core/generic_presenter.rb +1 -1
  54. data/lib/chef/knife/core/hashed_command_loader.rb +3 -2
  55. data/lib/chef/knife/core/subcommand_loader.rb +20 -1
  56. data/lib/chef/knife/core/ui.rb +8 -2
  57. data/lib/chef/knife/core/windows_bootstrap_context.rb +32 -25
  58. data/lib/chef/knife/delete.rb +15 -15
  59. data/lib/chef/knife/exec.rb +2 -2
  60. data/lib/chef/knife/rehash.rb +3 -21
  61. data/lib/chef/knife/ssh.rb +11 -7
  62. data/lib/chef/knife/xargs.rb +19 -19
  63. data/lib/chef/knife/yaml_convert.rb +1 -1
  64. data/lib/chef/log.rb +7 -2
  65. data/lib/chef/mixin/checksum.rb +0 -1
  66. data/lib/chef/mixin/chef_utils_wiring.rb +40 -0
  67. data/lib/chef/mixin/deep_merge.rb +35 -6
  68. data/{spec/unit/log_spec.rb → lib/chef/mixin/default_paths.rb} +13 -5
  69. data/lib/chef/mixin/openssl_helper.rb +30 -6
  70. data/lib/chef/mixin/path_sanity.rb +5 -4
  71. data/lib/chef/mixin/shell_out.rb +4 -188
  72. data/lib/chef/mixin/template.rb +1 -0
  73. data/lib/chef/mixin/which.rb +6 -3
  74. data/lib/chef/mixins.rb +1 -0
  75. data/lib/chef/monkey_patches/webrick-utils.rb +10 -10
  76. data/lib/chef/node.rb +36 -12
  77. data/lib/chef/node/attribute.rb +2 -4
  78. data/lib/chef/node_map.rb +21 -18
  79. data/lib/chef/platform/service_helpers.rb +31 -28
  80. data/lib/chef/property.rb +1 -1
  81. data/lib/chef/provider/cron/unix.rb +0 -2
  82. data/lib/chef/provider/git.rb +17 -9
  83. data/lib/chef/provider/group.rb +0 -2
  84. data/lib/chef/provider/group/suse.rb +5 -5
  85. data/lib/chef/provider/ifconfig.rb +1 -4
  86. data/lib/chef/provider/mount.rb +0 -2
  87. data/lib/chef/provider/mount/solaris.rb +0 -1
  88. data/lib/chef/provider/package.rb +0 -2
  89. data/lib/chef/provider/package/rubygems.rb +1 -1
  90. data/lib/chef/provider/package/snap.rb +3 -4
  91. data/lib/chef/provider/package/windows.rb +9 -4
  92. data/lib/chef/provider/package/windows/registry_uninstall_entry.rb +9 -9
  93. data/lib/chef/provider/package/zypper.rb +0 -1
  94. data/lib/chef/provider/powershell_script.rb +21 -5
  95. data/lib/chef/provider/route.rb +1 -1
  96. data/lib/chef/provider/service.rb +2 -2
  97. data/lib/chef/provider/service/arch.rb +1 -1
  98. data/lib/chef/provider/service/debian.rb +1 -1
  99. data/lib/chef/provider/service/gentoo.rb +2 -2
  100. data/lib/chef/provider/service/macosx.rb +2 -2
  101. data/lib/chef/provider/service/openbsd.rb +1 -4
  102. data/lib/chef/provider/service/redhat.rb +2 -2
  103. data/lib/chef/provider/service/upstart.rb +1 -1
  104. data/lib/chef/provider/service/windows.rb +10 -10
  105. data/lib/chef/provider/systemd_unit.rb +0 -2
  106. data/lib/chef/provider/template/content.rb +1 -0
  107. data/lib/chef/provider/user/dscl.rb +2 -2
  108. data/lib/chef/provider/user/mac.rb +9 -9
  109. data/lib/chef/provider/windows_task.rb +0 -3
  110. data/lib/chef/provider/yum_repository.rb +1 -1
  111. data/lib/chef/provider/zypper_repository.rb +1 -2
  112. data/lib/chef/providers.rb +0 -1
  113. data/lib/chef/recipe.rb +1 -1
  114. data/lib/chef/resource.rb +8 -10
  115. data/lib/chef/resource/apt_repository.rb +1 -10
  116. data/lib/chef/resource/build_essential.rb +2 -2
  117. data/lib/chef/resource/chef_client_scheduled_task.rb +1 -1
  118. data/lib/chef/resource/chef_client_systemd_timer.rb +2 -2
  119. data/lib/chef/resource/chef_vault_secret.rb +13 -13
  120. data/lib/chef/resource/chocolatey_feature.rb +1 -2
  121. data/lib/chef/resource/cron/cron_d.rb +1 -1
  122. data/lib/chef/resource/cron_access.rb +2 -2
  123. data/lib/chef/resource/execute.rb +4 -5
  124. data/lib/chef/resource/homebrew_update.rb +2 -2
  125. data/lib/chef/resource/hostname.rb +18 -18
  126. data/lib/chef/resource/lwrp_base.rb +1 -0
  127. data/lib/chef/resource/macos_userdefaults.rb +176 -61
  128. data/lib/chef/resource/openssl_dhparam.rb +2 -0
  129. data/lib/chef/resource/openssl_ec_private_key.rb +2 -0
  130. data/lib/chef/resource/openssl_ec_public_key.rb +2 -0
  131. data/lib/chef/resource/openssl_rsa_private_key.rb +2 -0
  132. data/lib/chef/resource/openssl_rsa_public_key.rb +2 -0
  133. data/lib/chef/resource/openssl_x509_certificate.rb +35 -35
  134. data/lib/chef/resource/openssl_x509_crl.rb +3 -2
  135. data/lib/chef/resource/openssl_x509_request.rb +23 -20
  136. data/lib/chef/resource/osx_profile.rb +227 -5
  137. data/lib/chef/resource/powershell_package_source.rb +1 -1
  138. data/lib/chef/resource/powershell_script.rb +24 -30
  139. data/lib/chef/resource/service.rb +2 -2
  140. data/lib/chef/resource/ssh_known_hosts_entry.rb +1 -1
  141. data/lib/chef/resource/sudo.rb +2 -2
  142. data/lib/chef/resource/sysctl.rb +5 -5
  143. data/lib/chef/resource/timezone.rb +112 -73
  144. data/lib/chef/resource/user_ulimit.rb +1 -1
  145. data/lib/chef/resource/windows_ad_join.rb +2 -0
  146. data/lib/chef/resource/windows_audit_policy.rb +3 -0
  147. data/lib/chef/resource/windows_auto_run.rb +2 -0
  148. data/lib/chef/resource/windows_certificate.rb +2 -0
  149. data/lib/chef/resource/windows_dfs_folder.rb +2 -0
  150. data/lib/chef/resource/windows_dfs_namespace.rb +2 -0
  151. data/lib/chef/resource/windows_dfs_server.rb +2 -0
  152. data/lib/chef/resource/windows_dns_record.rb +25 -5
  153. data/lib/chef/resource/windows_dns_zone.rb +12 -7
  154. data/lib/chef/resource/windows_feature.rb +2 -0
  155. data/lib/chef/resource/windows_feature_dism.rb +10 -0
  156. data/lib/chef/resource/windows_feature_powershell.rb +14 -2
  157. data/lib/chef/resource/windows_firewall_profile.rb +199 -0
  158. data/lib/chef/resource/windows_firewall_rule.rb +5 -3
  159. data/lib/chef/resource/windows_font.rb +3 -1
  160. data/lib/chef/resource/windows_pagefile.rb +4 -0
  161. data/lib/chef/resource/windows_printer.rb +17 -18
  162. data/lib/chef/resource/windows_printer_port.rb +14 -13
  163. data/lib/chef/resource/windows_security_policy.rb +51 -20
  164. data/lib/chef/resource/windows_share.rb +5 -3
  165. data/lib/chef/resource/windows_shortcut.rb +2 -0
  166. data/lib/chef/resource/windows_uac.rb +2 -0
  167. data/lib/chef/resource/windows_user_privilege.rb +2 -0
  168. data/lib/chef/resource/windows_workgroup.rb +2 -3
  169. data/lib/chef/resource_collection/stepable_iterator.rb +1 -2
  170. data/lib/chef/resource_inspector.rb +7 -1
  171. data/lib/chef/resources.rb +1 -0
  172. data/lib/chef/role.rb +3 -4
  173. data/lib/chef/run_context/cookbook_compiler.rb +20 -20
  174. data/lib/chef/run_status.rb +2 -6
  175. data/lib/chef/server_api_versions.rb +4 -0
  176. data/lib/chef/shell.rb +1 -1
  177. data/lib/chef/shell/shell_session.rb +2 -0
  178. data/lib/chef/util/backup.rb +1 -1
  179. data/lib/chef/util/diff.rb +11 -12
  180. data/lib/chef/util/powershell/cmdlet.rb +1 -1
  181. data/lib/chef/version.rb +2 -2
  182. data/lib/chef/win32/file.rb +2 -2
  183. data/lib/chef/win32/file/version_info.rb +5 -5
  184. data/lib/chef/win32/registry.rb +1 -2
  185. data/spec/data/ssl/chef-rspec.cert +15 -15
  186. data/spec/functional/knife/ssh_spec.rb +5 -16
  187. data/spec/functional/resource/aix_service_spec.rb +0 -2
  188. data/spec/functional/resource/aixinit_service_spec.rb +7 -8
  189. data/spec/functional/resource/apt_package_spec.rb +0 -1
  190. data/spec/functional/resource/bff_spec.rb +2 -2
  191. data/spec/functional/resource/cookbook_file_spec.rb +1 -1
  192. data/spec/functional/resource/cron_spec.rb +0 -1
  193. data/spec/functional/resource/dsc_resource_spec.rb +1 -1
  194. data/spec/functional/resource/dsc_script_spec.rb +0 -1
  195. data/spec/functional/resource/git_spec.rb +23 -1
  196. data/spec/functional/resource/group_spec.rb +12 -8
  197. data/spec/functional/resource/insserv_spec.rb +4 -5
  198. data/spec/functional/resource/link_spec.rb +20 -20
  199. data/spec/functional/resource/powershell_script_spec.rb +4 -4
  200. data/spec/functional/resource/remote_file_spec.rb +1 -7
  201. data/spec/functional/resource/rpm_spec.rb +2 -2
  202. data/spec/functional/resource/windows_certificate_spec.rb +3 -3
  203. data/spec/functional/resource/windows_font_spec.rb +49 -0
  204. data/spec/functional/resource/windows_security_policy_spec.rb +0 -3
  205. data/spec/functional/resource/windows_user_privilege_spec.rb +1 -1
  206. data/spec/functional/run_lock_spec.rb +26 -25
  207. data/spec/functional/shell_spec.rb +5 -5
  208. data/spec/functional/util/powershell/cmdlet_spec.rb +1 -1
  209. data/spec/functional/version_spec.rb +1 -1
  210. data/spec/functional/win32/registry_spec.rb +8 -8
  211. data/spec/functional/win32/service_manager_spec.rb +1 -1
  212. data/spec/integration/knife/common_options_spec.rb +12 -12
  213. data/spec/integration/knife/config_get_profile_spec.rb +69 -68
  214. data/spec/integration/knife/config_get_spec.rb +126 -125
  215. data/spec/integration/knife/config_list_profiles_spec.rb +181 -152
  216. data/spec/integration/knife/config_use_profile_spec.rb +110 -109
  217. data/spec/integration/knife/cookbook_upload_spec.rb +27 -0
  218. data/spec/integration/knife/diff_spec.rb +3 -1
  219. data/spec/integration/knife/download_spec.rb +3 -1
  220. data/spec/integration/knife/serve_spec.rb +5 -5
  221. data/spec/integration/knife/upload_spec.rb +3 -1
  222. data/spec/integration/recipes/accumulator_spec.rb +1 -1
  223. data/spec/integration/recipes/lwrp_inline_resources_spec.rb +2 -2
  224. data/spec/integration/recipes/lwrp_spec.rb +1 -1
  225. data/spec/integration/recipes/notifies_spec.rb +1 -1
  226. data/spec/integration/recipes/notifying_block_spec.rb +1 -1
  227. data/spec/integration/recipes/recipe_dsl_spec.rb +1 -1
  228. data/spec/integration/recipes/resource_converge_if_changed_spec.rb +2 -0
  229. data/spec/integration/recipes/resource_load_spec.rb +2 -0
  230. data/spec/integration/recipes/unified_mode_spec.rb +1 -1
  231. data/spec/integration/recipes/use_partial_spec.rb +1 -1
  232. data/spec/scripts/ssl-serve.rb +1 -1
  233. data/spec/spec_helper.rb +16 -10
  234. data/spec/support/chef_helpers.rb +1 -20
  235. data/spec/support/platform_helpers.rb +9 -11
  236. data/spec/support/platforms/win32/spec_service.rb +1 -1
  237. data/spec/support/shared/functional/directory_resource.rb +1 -1
  238. data/spec/support/shared/functional/execute_resource.rb +1 -1
  239. data/spec/support/shared/functional/file_resource.rb +20 -21
  240. data/spec/support/shared/functional/win32_service.rb +1 -1
  241. data/spec/support/shared/functional/windows_script.rb +3 -3
  242. data/spec/support/shared/integration/integration_helper.rb +22 -52
  243. data/spec/support/shared/integration/knife_support.rb +2 -9
  244. data/spec/support/shared/unit/application_dot_d.rb +0 -1
  245. data/spec/support/shared/unit/script_resource.rb +6 -20
  246. data/spec/support/shared/unit/windows_script_resource.rb +15 -28
  247. data/spec/unit/application_spec.rb +4 -2
  248. data/spec/unit/chef_fs/file_system/operation_failed_error_spec.rb +2 -4
  249. data/spec/unit/chef_fs/{parallelizer.rb → parallelizer_spec.rb} +1 -1
  250. data/spec/unit/cookbook/gem_installer_spec.rb +2 -1
  251. data/spec/unit/data_collector_spec.rb +29 -1
  252. data/spec/unit/dsl/platform_introspection_spec.rb +1 -0
  253. data/spec/unit/environment_spec.rb +7 -7
  254. data/spec/unit/event_dispatch/dispatcher_spec.rb +3 -0
  255. data/spec/unit/http/api_versions_spec.rb +19 -1
  256. data/spec/unit/json_compat_spec.rb +1 -1
  257. data/spec/unit/knife/bootstrap_spec.rb +16 -20
  258. data/spec/unit/knife/cookbook_download_spec.rb +4 -4
  259. data/spec/unit/knife/cookbook_metadata_from_file_spec.rb +1 -1
  260. data/spec/unit/knife/cookbook_upload_spec.rb +7 -10
  261. data/spec/unit/knife/core/hashed_command_loader_spec.rb +3 -3
  262. data/spec/unit/knife/core/windows_bootstrap_context_spec.rb +21 -12
  263. data/spec/unit/knife/supermarket_share_spec.rb +1 -1
  264. data/spec/unit/log/syslog_spec.rb +6 -10
  265. data/spec/unit/log/winevt_spec.rb +21 -13
  266. data/spec/unit/lwrp_spec.rb +4 -4
  267. data/spec/unit/mixin/{path_sanity_spec.rb → default_paths_spec.rb} +14 -14
  268. data/spec/unit/mixin/powershell_exec_spec.rb +1 -1
  269. data/spec/unit/mixin/securable_spec.rb +0 -1
  270. data/spec/unit/mixin/shell_out_spec.rb +25 -26
  271. data/spec/unit/mixin/template_spec.rb +30 -30
  272. data/spec/unit/mixin/which.rb +8 -0
  273. data/spec/unit/mixin/windows_architecture_helper_spec.rb +4 -4
  274. data/spec/unit/node/immutable_collections_spec.rb +6 -2
  275. data/spec/unit/node_spec.rb +103 -16
  276. data/spec/unit/property_spec.rb +5 -5
  277. data/spec/unit/provider/execute_spec.rb +0 -7
  278. data/spec/unit/provider/ifconfig_spec.rb +0 -1
  279. data/spec/unit/provider/package/dnf/python_helper_spec.rb +1 -1
  280. data/spec/unit/provider/package/rubygems_spec.rb +5 -10
  281. data/spec/unit/provider/package/smartos_spec.rb +1 -1
  282. data/spec/unit/provider/package/windows_spec.rb +30 -53
  283. data/spec/unit/provider/powershell_script_spec.rb +11 -4
  284. data/spec/unit/provider/remote_directory_spec.rb +9 -9
  285. data/spec/unit/provider/service/arch_service_spec.rb +3 -2
  286. data/spec/unit/provider/service/debian_service_spec.rb +1 -1
  287. data/spec/unit/provider/service/gentoo_service_spec.rb +7 -7
  288. data/spec/unit/provider/service/macosx_spec.rb +3 -3
  289. data/spec/unit/provider/service/redhat_spec.rb +3 -3
  290. data/spec/unit/provider/service/upstart_service_spec.rb +3 -3
  291. data/spec/unit/provider/service/windows_spec.rb +2 -6
  292. data/spec/unit/provider/systemd_unit_spec.rb +28 -24
  293. data/spec/unit/provider_resolver_spec.rb +6 -6
  294. data/spec/unit/provider_spec.rb +1 -0
  295. data/spec/unit/resource/batch_spec.rb +6 -6
  296. data/spec/unit/resource/execute_spec.rb +123 -118
  297. data/spec/unit/resource/macos_user_defaults_spec.rb +103 -2
  298. data/spec/unit/resource/osx_profile_spec.rb +233 -0
  299. data/spec/unit/resource/powershell_script_spec.rb +11 -29
  300. data/spec/unit/resource/script_spec.rb +6 -1
  301. data/spec/unit/resource/timezone_spec.rb +63 -0
  302. data/spec/unit/resource/windows_feature_powershell_spec.rb +30 -4
  303. data/spec/unit/resource/windows_firewall_profile_spec.rb +77 -0
  304. data/spec/unit/resource/windows_package_spec.rb +1 -0
  305. data/spec/unit/resource_reporter_spec.rb +1 -1
  306. data/spec/unit/role_spec.rb +11 -11
  307. data/spec/unit/run_context/cookbook_compiler_spec.rb +1 -1
  308. data/spec/unit/run_lock_spec.rb +1 -1
  309. data/spec/unit/scan_access_control_spec.rb +1 -1
  310. data/spec/unit/server_api_spec.rb +43 -16
  311. data/spec/unit/util/diff_spec.rb +1 -15
  312. data/spec/unit/win32/security_spec.rb +4 -3
  313. data/tasks/rspec.rb +1 -1
  314. metadata +39 -31
  315. data/lib/chef/provider/osx_profile.rb +0 -255
  316. data/spec/unit/provider/osx_profile_spec.rb +0 -255
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 3e032c1572a1691f3496d92bd9a9c2b89cec425037583d8d911cdfaa379aa8ff
4
- data.tar.gz: 454f454361c2c8a998275a14d8bfa6da74867e9213091923cf52c69f4a1df098
3
+ metadata.gz: 11fe48a3054797d5ccd6622aab868f9924c24994a0eca31713ebadae82069477
4
+ data.tar.gz: 6251429cdd24a722d1e621e18a5fe5a09c75be795ce2b4f706790e5baa991db3
5
5
  SHA512:
6
- metadata.gz: a701a20dea62009da9d384ba2f488cfcdc5b515da515329f4ff9d19d6ff3fe60a8167cd137b7544d58f0db251a27b51bbc77926ea932ed6385363080bb3ed825
7
- data.tar.gz: 1ab9c7cc9979aca504d9a268c1908f45c958935355a3b36dad3b2e4e9f1255afc2624feec6bde66e12e7978664b42b2a4683d236edca81555cebeebe3ebd8b7f
6
+ metadata.gz: 47a3e7c115c20ecfbc42173b551f812490e546ed4c1d417b5d180bc16942f35147551dae7f41c2c3d3801417c72f754ed26d9ef7d47ecdb316e5b486b29ca418
7
+ data.tar.gz: ab248bee2c350f4822800be24e26ba0899be504f0aa4643295412bf2971e687c6074d9dd3c2d2e765d9227aa661ac46b28279d94892826e1d286a00eec0b1e27
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
data/Rakefile CHANGED
@@ -18,7 +18,7 @@
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"
@@ -1,9 +1,8 @@
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
 
5
5
  gemspec.add_dependency "win32-api", "~> 1.5.3"
6
- gemspec.add_dependency "win32-dir", "~> 0.5.0"
7
6
  gemspec.add_dependency "win32-event", "~> 0.6.1"
8
7
  # TODO: Relax this pin and make the necessary updaets. The issue originally
9
8
  # leading to this pin has been fixed in 0.6.5.
@@ -14,7 +13,7 @@ gemspec.add_dependency "win32-process", "~> 0.8.2"
14
13
  gemspec.add_dependency "win32-service", ">= 2.1.5", "< 3.0"
15
14
  gemspec.add_dependency "wmi-lite", "~> 1.0"
16
15
  gemspec.add_dependency "win32-taskscheduler", "~> 2.0"
17
- gemspec.add_dependency "iso8601", "~> 0.12.1"
16
+ gemspec.add_dependency "iso8601", ">= 0.12.1", "< 0.14" # validate 0.14 when it comes out
18
17
  gemspec.add_dependency "win32-certstore", "~> 0.3"
19
18
  gemspec.extensions << "ext/win32-eventlog/Rakefile"
20
19
  gemspec.files += Dir.glob("{distro,ext}/**/*")
@@ -24,7 +24,7 @@ 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
 
@@ -36,6 +36,7 @@ Gem::Specification.new do |s|
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"
@@ -44,6 +44,9 @@ class Chef
44
44
  # @return [Exception] The exception that was thrown
45
45
  attr_accessor :exception
46
46
 
47
+ # @return [Hash] JSON-formatted error description from the Chef::Formatters::ErrorMapper
48
+ attr_accessor :error_description
49
+
47
50
  # @return [Numeric] The elapsed time in seconds with machine precision
48
51
  attr_accessor :elapsed_time
49
52
 
@@ -223,6 +226,7 @@ class Chef
223
226
 
224
227
  current_record.status = :failed
225
228
  current_record.exception = exception
229
+ current_record.error_description = Formatters::ErrorMapper.resource_failed(new_resource, action, exception).for_json
226
230
  end
227
231
 
228
232
  # Hook called after an action is completed. This is always called, even if the action fails.
@@ -72,14 +72,14 @@ class Chef
72
72
 
73
73
  def assert_destination_writable!
74
74
  abs_path = File.expand_path(destination)
75
- unless File.exists?(File.dirname(abs_path))
75
+ unless File.exist?(File.dirname(abs_path))
76
76
  begin
77
77
  FileUtils.mkdir_p(File.dirname(abs_path))
78
78
  rescue Errno::EACCES
79
79
  raise Chef::Exceptions::CannotWritePrivateKey, "I can't create the configuration directory at #{File.dirname(abs_path)} - check permissions?"
80
80
  end
81
81
  end
82
- if (File.exists?(abs_path) && !File.writable?(abs_path)) || !File.writable?(File.dirname(abs_path))
82
+ if (File.exist?(abs_path) && !File.writable?(abs_path)) || !File.writable?(File.dirname(abs_path))
83
83
  raise Chef::Exceptions::CannotWritePrivateKey, "I can't write your private key to #{abs_path} - check permissions?"
84
84
  end
85
85
  end
@@ -25,7 +25,7 @@ require_relative "log"
25
25
  require_relative "platform"
26
26
  require "mixlib/cli" unless defined?(Mixlib::CLI)
27
27
  require "tmpdir" unless defined?(Dir.mktmpdir)
28
- require "rbconfig"
28
+ require "rbconfig" unless defined?(RbConfig)
29
29
  require_relative "application/exit_code"
30
30
  require_relative "dist"
31
31
  require "license_acceptance/acceptor"
@@ -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]
@@ -213,11 +213,11 @@ class Chef::Application::Apply < Chef::Application
213
213
  end
214
214
  runner = Chef::Runner.new(run_context)
215
215
  catch(:end_client_run_early) do
216
- begin
217
- runner.converge
218
- ensure
219
- @recipe_fh.close
220
- end
216
+
217
+ runner.converge
218
+ ensure
219
+ @recipe_fh.close
220
+
221
221
  end
222
222
  Chef::Platform::Rebooter.reboot_if_needed!(runner)
223
223
  end
@@ -78,33 +78,33 @@ class Chef
78
78
  while running?
79
79
  # Grab the service_action_mutex to make a chef-client run
80
80
  @service_action_mutex.synchronize do
81
- begin
82
- Chef::Log.info("Next #{Chef::Dist::CLIENT} run will happen in #{timeout} seconds")
83
- @service_signal.wait(@service_action_mutex, timeout)
84
-
85
- # Continue only if service is RUNNING
86
- next if state != RUNNING
87
-
88
- # Reconfigure each time through to pick up any changes in the client file
89
- Chef::Log.info("Reconfiguring with startup parameters")
90
- reconfigure(startup_parameters)
91
- timeout = Chef::Config[:interval]
92
-
93
- # Honor splay sleep config
94
- timeout += rand Chef::Config[:splay]
95
-
96
- # run chef-client only if service is in RUNNING state
97
- next if state != RUNNING
98
-
99
- Chef::Log.info("#{Chef::Dist::CLIENT} service is starting a #{Chef::Dist::CLIENT} run...")
100
- run_chef_client
101
- rescue SystemExit => e
102
- # Do not raise any of the errors here in order to
103
- # prevent service crash
104
- Chef::Log.error("#{e.class}: #{e}")
105
- rescue Exception => e
106
- Chef::Log.error("#{e.class}: #{e}")
107
- end
81
+
82
+ Chef::Log.info("Next #{Chef::Dist::CLIENT} run will happen in #{timeout} seconds")
83
+ @service_signal.wait(@service_action_mutex, timeout)
84
+
85
+ # Continue only if service is RUNNING
86
+ next if state != RUNNING
87
+
88
+ # Reconfigure each time through to pick up any changes in the client file
89
+ Chef::Log.info("Reconfiguring with startup parameters")
90
+ reconfigure(startup_parameters)
91
+ timeout = Chef::Config[:interval]
92
+
93
+ # Honor splay sleep config
94
+ timeout += rand Chef::Config[:splay]
95
+
96
+ # run chef-client only if service is in RUNNING state
97
+ next if state != RUNNING
98
+
99
+ Chef::Log.info("#{Chef::Dist::CLIENT} service is starting a #{Chef::Dist::CLIENT} run...")
100
+ run_chef_client
101
+ rescue SystemExit => e
102
+ # Do not raise any of the errors here in order to
103
+ # prevent service crash
104
+ Chef::Log.error("#{e.class}: #{e}")
105
+ rescue Exception => e
106
+ Chef::Log.error("#{e.class}: #{e}")
107
+
108
108
  end
109
109
  end
110
110
 
@@ -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
 
@@ -32,7 +32,6 @@ require_relative "platform/provider_handler_map"
32
32
  require_relative "platform/resource_handler_map"
33
33
  require_relative "deprecated"
34
34
  require_relative "event_dispatch/dsl"
35
- require_relative "deprecated"
36
35
 
37
36
  class Chef
38
37
  class << self
@@ -172,11 +172,11 @@ class Chef
172
172
  @memory_store.create_dir(path, name, *options)
173
173
  else
174
174
  with_parent_dir(path + [name], *options) do |parent, name|
175
- begin
176
- parent.create_child(name, nil)
177
- rescue Chef::ChefFS::FileSystem::AlreadyExistsError => e
178
- raise ChefZero::DataStore::DataAlreadyExistsError.new(to_zero_path(e.entry), e)
179
- end
175
+
176
+ parent.create_child(name, nil)
177
+ rescue Chef::ChefFS::FileSystem::AlreadyExistsError => e
178
+ raise ChefZero::DataStore::DataAlreadyExistsError.new(to_zero_path(e.entry), e)
179
+
180
180
  end
181
181
  end
182
182
  end
@@ -251,11 +251,11 @@ class Chef
251
251
  end
252
252
 
253
253
  with_parent_dir(path + [name], *options) do |parent, name|
254
- begin
255
- parent.create_child(name, data)
256
- rescue Chef::ChefFS::FileSystem::AlreadyExistsError => e
257
- raise ChefZero::DataStore::DataAlreadyExistsError.new(to_zero_path(e.entry), e)
258
- end
254
+
255
+ parent.create_child(name, data)
256
+ rescue Chef::ChefFS::FileSystem::AlreadyExistsError => e
257
+ raise ChefZero::DataStore::DataAlreadyExistsError.new(to_zero_path(e.entry), e)
258
+
259
259
  end
260
260
  end
261
261
  end
@@ -349,11 +349,11 @@ class Chef
349
349
 
350
350
  else
351
351
  with_entry(path) do |entry|
352
- begin
353
- entry.read
354
- rescue Chef::ChefFS::FileSystem::NotFoundError => e
355
- raise ChefZero::DataStore::DataNotFoundError.new(to_zero_path(e.entry), e)
356
- end
352
+
353
+ entry.read
354
+ rescue Chef::ChefFS::FileSystem::NotFoundError => e
355
+ raise ChefZero::DataStore::DataNotFoundError.new(to_zero_path(e.entry), e)
356
+
357
357
  end
358
358
  end
359
359
  end
@@ -433,15 +433,15 @@ class Chef
433
433
 
434
434
  else
435
435
  with_entry(path) do |entry|
436
- begin
437
- if %w{cookbooks cookbook_artifacts}.include?(path[0]) && path.length >= 3
438
- entry.delete(true)
439
- else
440
- entry.delete(false)
441
- end
442
- rescue Chef::ChefFS::FileSystem::NotFoundError => e
443
- raise ChefZero::DataStore::DataNotFoundError.new(to_zero_path(e.entry), e)
436
+
437
+ if %w{cookbooks cookbook_artifacts}.include?(path[0]) && path.length >= 3
438
+ entry.delete(true)
439
+ else
440
+ entry.delete(false)
444
441
  end
442
+ rescue Chef::ChefFS::FileSystem::NotFoundError => e
443
+ raise ChefZero::DataStore::DataNotFoundError.new(to_zero_path(e.entry), e)
444
+
445
445
  end
446
446
  end
447
447
  end
@@ -471,11 +471,11 @@ class Chef
471
471
 
472
472
  else
473
473
  with_entry(path) do |entry|
474
- begin
475
- entry.delete(options.include?(:recursive))
476
- rescue Chef::ChefFS::FileSystem::NotFoundError => e
477
- raise ChefZero::DataStore::DataNotFoundError.new(to_zero_path(e.entry), e)
478
- end
474
+
475
+ entry.delete(options.include?(:recursive))
476
+ rescue Chef::ChefFS::FileSystem::NotFoundError => e
477
+ raise ChefZero::DataStore::DataNotFoundError.new(to_zero_path(e.entry), e)
478
+
479
479
  end
480
480
  end
481
481
  end
@@ -487,11 +487,11 @@ class Chef
487
487
  # LIST /policies
488
488
  elsif path == [ "policies" ]
489
489
  with_entry([ path[0] ]) do |policies|
490
- begin
491
- policies.children.map { |policy| policy.name[0..-6].rpartition("-")[0] }.uniq
492
- rescue Chef::ChefFS::FileSystem::NotFoundError
493
- []
494
- end
490
+
491
+ policies.children.map { |policy| policy.name[0..-6].rpartition("-")[0] }.uniq
492
+ rescue Chef::ChefFS::FileSystem::NotFoundError
493
+ []
494
+
495
495
  end
496
496
 
497
497
  # LIST /policies/POLICY/revisions
@@ -524,19 +524,19 @@ class Chef
524
524
 
525
525
  elsif %w{cookbooks cookbook_artifacts}.include?(path[0]) && path.length == 1
526
526
  with_entry(path) do |entry|
527
- begin
528
- if path[0] == "cookbook_artifacts"
529
- entry.children.map { |child| child.name.rpartition("-")[0] }.uniq
530
- elsif chef_fs.versioned_cookbooks
531
- # /cookbooks/name-version -> /cookbooks/name
532
- entry.children.map { |child| split_name_version(child.name)[0] }.uniq
533
- else
534
- entry.children.map(&:name)
535
- end
536
- rescue Chef::ChefFS::FileSystem::NotFoundError
537
- # If the cookbooks dir doesn't exist, we have no cookbooks (not 404)
538
- []
527
+
528
+ if path[0] == "cookbook_artifacts"
529
+ entry.children.map { |child| child.name.rpartition("-")[0] }.uniq
530
+ elsif chef_fs.versioned_cookbooks
531
+ # /cookbooks/name-version -> /cookbooks/name
532
+ entry.children.map { |child| split_name_version(child.name)[0] }.uniq
533
+ else
534
+ entry.children.map(&:name)
539
535
  end
536
+ rescue Chef::ChefFS::FileSystem::NotFoundError
537
+ # If the cookbooks dir doesn't exist, we have no cookbooks (not 404)
538
+ []
539
+
540
540
  end
541
541
 
542
542
  elsif %w{cookbooks cookbook_artifacts}.include?(path[0]) && path.length == 2
@@ -560,16 +560,16 @@ class Chef
560
560
 
561
561
  else
562
562
  result = with_entry(path) do |entry|
563
- begin
564
- entry.children.map { |c| zero_filename(c) }.sort
565
- rescue Chef::ChefFS::FileSystem::NotFoundError => e
566
- # /cookbooks, /data, etc. never return 404
567
- if path_always_exists?(path)
568
- []
569
- else
570
- raise ChefZero::DataStore::DataNotFoundError.new(to_zero_path(e.entry), e)
571
- end
563
+
564
+ entry.children.map { |c| zero_filename(c) }.sort
565
+ rescue Chef::ChefFS::FileSystem::NotFoundError => e
566
+ # /cookbooks, /data, etc. never return 404
567
+ if path_always_exists?(path)
568
+ []
569
+ else
570
+ raise ChefZero::DataStore::DataNotFoundError.new(to_zero_path(e.entry), e)
572
571
  end
572
+
573
573
  end
574
574
 
575
575
  # Older versions of chef-zero do not understand policies and cookbook_artifacts,