chef 16.2.44 → 16.4.35

Sign up to get free protection for your applications and to get access to all the features.
Files changed (385) 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 +8 -8
  8. data/lib/chef/application.rb +18 -1
  9. data/lib/chef/application/apply.rb +6 -5
  10. data/lib/chef/application/base.rb +2 -0
  11. data/lib/chef/application/client.rb +3 -0
  12. data/lib/chef/application/windows_service.rb +27 -27
  13. data/lib/chef/{whitelist.rb → attribute_allowlist.rb} +11 -11
  14. data/lib/chef/{blacklist.rb → attribute_blocklist.rb} +9 -9
  15. data/lib/chef/chef_class.rb +0 -1
  16. data/lib/chef/chef_fs/chef_fs_data_store.rb +54 -54
  17. data/lib/chef/chef_fs/data_handler/organization_data_handler.rb +1 -2
  18. data/lib/chef/chef_fs/file_system/chef_server/acl_entry.rb +10 -10
  19. data/lib/chef/chef_fs/file_system/chef_server/cookbook_file.rb +2 -2
  20. data/lib/chef/chef_fs/file_system/chef_server/cookbooks_dir.rb +1 -5
  21. data/lib/chef/chef_fs/file_system/chef_server/organization_invites_entry.rb +8 -8
  22. data/lib/chef/chef_fs/file_system/chef_server/organization_members_entry.rb +8 -8
  23. data/lib/chef/chef_fs/file_system/repository/base_file.rb +1 -0
  24. data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_dir.rb +2 -2
  25. data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_entry.rb +1 -1
  26. data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb +18 -18
  27. data/lib/chef/chef_fs/file_system/repository/directory.rb +1 -1
  28. data/lib/chef/chef_fs/file_system/repository/file_system_entry.rb +1 -1
  29. data/lib/chef/chef_fs/parallelizer/parallel_enumerable.rb +1 -1
  30. data/lib/chef/client.rb +14 -14
  31. data/lib/chef/cookbook/remote_file_vendor.rb +1 -3
  32. data/lib/chef/cookbook/syntax_check.rb +1 -2
  33. data/lib/chef/cookbook_loader.rb +15 -29
  34. data/lib/chef/data_bag.rb +1 -2
  35. data/lib/chef/data_collector/run_end_message.rb +11 -1
  36. data/lib/chef/deprecated.rb +8 -0
  37. data/lib/chef/digester.rb +3 -2
  38. data/lib/chef/dsl/platform_introspection.rb +9 -7
  39. data/lib/chef/encrypted_data_bag_item/decryptor.rb +1 -1
  40. data/lib/chef/environment.rb +3 -4
  41. data/lib/chef/exceptions.rb +4 -1
  42. data/lib/chef/file_access_control/windows.rb +2 -2
  43. data/lib/chef/file_content_management/deploy/mv_unix.rb +1 -1
  44. data/lib/chef/file_content_management/tempfile.rb +9 -9
  45. data/lib/chef/handler.rb +2 -0
  46. data/lib/chef/http.rb +12 -12
  47. data/lib/chef/http/authenticator.rb +3 -1
  48. data/lib/chef/json_compat.rb +1 -1
  49. data/lib/chef/knife.rb +4 -4
  50. data/lib/chef/knife/bootstrap.rb +18 -15
  51. data/lib/chef/knife/bootstrap/train_connector.rb +1 -0
  52. data/lib/chef/knife/config_get.rb +1 -0
  53. data/lib/chef/knife/config_list_profiles.rb +4 -1
  54. data/lib/chef/knife/config_use_profile.rb +15 -5
  55. data/lib/chef/knife/configure.rb +1 -1
  56. data/lib/chef/knife/cookbook_download.rb +1 -1
  57. data/lib/chef/knife/cookbook_metadata.rb +1 -1
  58. data/lib/chef/knife/cookbook_upload.rb +29 -37
  59. data/lib/chef/knife/core/bootstrap_context.rb +1 -1
  60. data/lib/chef/knife/core/gem_glob_loader.rb +1 -1
  61. data/lib/chef/knife/core/generic_presenter.rb +1 -1
  62. data/lib/chef/knife/core/hashed_command_loader.rb +3 -2
  63. data/lib/chef/knife/core/subcommand_loader.rb +20 -1
  64. data/lib/chef/knife/core/ui.rb +8 -2
  65. data/lib/chef/knife/core/windows_bootstrap_context.rb +33 -26
  66. data/lib/chef/knife/delete.rb +15 -15
  67. data/lib/chef/knife/exec.rb +2 -2
  68. data/lib/chef/knife/rehash.rb +3 -21
  69. data/lib/chef/knife/ssh.rb +11 -7
  70. data/lib/chef/knife/xargs.rb +19 -19
  71. data/lib/chef/knife/yaml_convert.rb +1 -1
  72. data/lib/chef/log.rb +7 -2
  73. data/lib/chef/mixin/checksum.rb +0 -1
  74. data/{spec/functional/resource/base.rb → lib/chef/mixin/chef_utils_wiring.rb} +24 -12
  75. data/lib/chef/mixin/deep_merge.rb +35 -6
  76. data/{spec/unit/log_spec.rb → lib/chef/mixin/default_paths.rb} +13 -5
  77. data/lib/chef/mixin/openssl_helper.rb +30 -6
  78. data/lib/chef/mixin/path_sanity.rb +5 -4
  79. data/lib/chef/mixin/shell_out.rb +4 -188
  80. data/lib/chef/mixin/template.rb +1 -0
  81. data/lib/chef/mixin/which.rb +6 -3
  82. data/lib/chef/mixins.rb +1 -0
  83. data/lib/chef/monkey_patches/webrick-utils.rb +10 -10
  84. data/lib/chef/node.rb +36 -12
  85. data/lib/chef/node/attribute.rb +2 -4
  86. data/lib/chef/node_map.rb +21 -18
  87. data/lib/chef/platform/service_helpers.rb +31 -28
  88. data/lib/chef/property.rb +1 -1
  89. data/lib/chef/provider/cron/unix.rb +0 -2
  90. data/lib/chef/provider/git.rb +17 -9
  91. data/lib/chef/provider/group.rb +0 -2
  92. data/lib/chef/provider/group/suse.rb +5 -5
  93. data/lib/chef/provider/ifconfig.rb +1 -4
  94. data/lib/chef/provider/mount.rb +0 -2
  95. data/lib/chef/provider/mount/solaris.rb +0 -1
  96. data/lib/chef/provider/package.rb +0 -2
  97. data/lib/chef/provider/package/rubygems.rb +1 -1
  98. data/lib/chef/provider/package/snap.rb +3 -4
  99. data/lib/chef/provider/package/windows.rb +9 -4
  100. data/lib/chef/provider/package/windows/registry_uninstall_entry.rb +9 -9
  101. data/lib/chef/provider/package/zypper.rb +0 -1
  102. data/lib/chef/provider/powershell_script.rb +21 -5
  103. data/lib/chef/provider/route.rb +1 -1
  104. data/lib/chef/provider/service.rb +2 -2
  105. data/lib/chef/provider/service/arch.rb +1 -1
  106. data/lib/chef/provider/service/debian.rb +1 -1
  107. data/lib/chef/provider/service/gentoo.rb +2 -2
  108. data/lib/chef/provider/service/macosx.rb +2 -2
  109. data/lib/chef/provider/service/openbsd.rb +1 -4
  110. data/lib/chef/provider/service/redhat.rb +2 -2
  111. data/lib/chef/provider/service/upstart.rb +1 -1
  112. data/lib/chef/provider/service/windows.rb +10 -10
  113. data/lib/chef/provider/systemd_unit.rb +0 -2
  114. data/lib/chef/provider/template/content.rb +1 -0
  115. data/lib/chef/provider/user/dscl.rb +2 -2
  116. data/lib/chef/provider/user/mac.rb +9 -9
  117. data/lib/chef/provider/windows_task.rb +0 -3
  118. data/lib/chef/provider/yum_repository.rb +1 -1
  119. data/lib/chef/provider/zypper_repository.rb +1 -2
  120. data/lib/chef/providers.rb +0 -1
  121. data/lib/chef/recipe.rb +1 -1
  122. data/lib/chef/resource.rb +9 -11
  123. data/lib/chef/resource/alternatives.rb +1 -1
  124. data/lib/chef/resource/apt_repository.rb +1 -10
  125. data/lib/chef/resource/build_essential.rb +2 -2
  126. data/lib/chef/resource/chef_client_scheduled_task.rb +1 -1
  127. data/lib/chef/resource/chef_client_systemd_timer.rb +2 -2
  128. data/lib/chef/resource/chef_gem.rb +57 -21
  129. data/lib/chef/resource/chef_vault_secret.rb +13 -13
  130. data/lib/chef/resource/chocolatey_feature.rb +1 -2
  131. data/lib/chef/resource/cron/cron_d.rb +1 -1
  132. data/lib/chef/resource/cron_access.rb +2 -2
  133. data/lib/chef/resource/dmg_package.rb +2 -2
  134. data/lib/chef/resource/execute.rb +4 -5
  135. data/lib/chef/resource/gem_package.rb +35 -2
  136. data/lib/chef/resource/homebrew_update.rb +2 -2
  137. data/lib/chef/resource/hostname.rb +18 -18
  138. data/lib/chef/resource/launchd.rb +1 -1
  139. data/lib/chef/resource/lwrp_base.rb +1 -0
  140. data/lib/chef/resource/macos_userdefaults.rb +176 -61
  141. data/lib/chef/resource/openssl_dhparam.rb +2 -0
  142. data/lib/chef/resource/openssl_ec_private_key.rb +2 -0
  143. data/lib/chef/resource/openssl_ec_public_key.rb +2 -0
  144. data/lib/chef/resource/openssl_rsa_private_key.rb +2 -0
  145. data/lib/chef/resource/openssl_rsa_public_key.rb +2 -0
  146. data/lib/chef/resource/openssl_x509_certificate.rb +35 -35
  147. data/lib/chef/resource/openssl_x509_crl.rb +3 -2
  148. data/lib/chef/resource/openssl_x509_request.rb +23 -20
  149. data/lib/chef/resource/osx_profile.rb +227 -5
  150. data/lib/chef/resource/powershell_package_source.rb +1 -1
  151. data/lib/chef/resource/powershell_script.rb +24 -30
  152. data/lib/chef/resource/service.rb +2 -2
  153. data/lib/chef/resource/ssh_known_hosts_entry.rb +16 -1
  154. data/lib/chef/resource/sudo.rb +31 -4
  155. data/lib/chef/resource/swap_file.rb +17 -0
  156. data/lib/chef/resource/sysctl.rb +5 -5
  157. data/lib/chef/resource/timezone.rb +15 -0
  158. data/lib/chef/resource/user_ulimit.rb +1 -1
  159. data/lib/chef/resource/windows_ad_join.rb +2 -0
  160. data/lib/chef/resource/windows_audit_policy.rb +3 -0
  161. data/lib/chef/resource/windows_auto_run.rb +2 -0
  162. data/lib/chef/resource/windows_certificate.rb +2 -0
  163. data/lib/chef/resource/windows_dfs_folder.rb +2 -0
  164. data/lib/chef/resource/windows_dfs_namespace.rb +2 -0
  165. data/lib/chef/resource/windows_dfs_server.rb +2 -0
  166. data/lib/chef/resource/windows_dns_record.rb +25 -5
  167. data/lib/chef/resource/windows_dns_zone.rb +12 -7
  168. data/lib/chef/resource/windows_feature.rb +2 -0
  169. data/lib/chef/resource/windows_feature_dism.rb +10 -0
  170. data/lib/chef/resource/windows_feature_powershell.rb +14 -2
  171. data/lib/chef/resource/windows_firewall_profile.rb +199 -0
  172. data/lib/chef/resource/windows_firewall_rule.rb +5 -3
  173. data/lib/chef/resource/windows_font.rb +3 -1
  174. data/lib/chef/resource/windows_pagefile.rb +4 -0
  175. data/lib/chef/resource/windows_printer.rb +17 -18
  176. data/lib/chef/resource/windows_printer_port.rb +14 -13
  177. data/lib/chef/resource/windows_security_policy.rb +52 -21
  178. data/lib/chef/resource/windows_share.rb +5 -3
  179. data/lib/chef/resource/windows_shortcut.rb +2 -0
  180. data/lib/chef/resource/windows_uac.rb +2 -0
  181. data/lib/chef/resource/windows_user_privilege.rb +27 -2
  182. data/lib/chef/resource/windows_workgroup.rb +2 -3
  183. data/lib/chef/resource_collection/stepable_iterator.rb +1 -2
  184. data/lib/chef/resource_inspector.rb +7 -1
  185. data/lib/chef/resources.rb +1 -0
  186. data/lib/chef/role.rb +3 -4
  187. data/lib/chef/run_context/cookbook_compiler.rb +20 -20
  188. data/lib/chef/run_status.rb +2 -6
  189. data/lib/chef/server_api_versions.rb +4 -0
  190. data/lib/chef/shell.rb +1 -1
  191. data/lib/chef/shell/shell_session.rb +2 -0
  192. data/lib/chef/util/backup.rb +1 -1
  193. data/lib/chef/util/diff.rb +11 -12
  194. data/lib/chef/util/powershell/cmdlet.rb +1 -1
  195. data/lib/chef/version.rb +2 -2
  196. data/lib/chef/win32/file.rb +2 -2
  197. data/lib/chef/win32/file/version_info.rb +5 -5
  198. data/lib/chef/win32/registry.rb +1 -2
  199. data/spec/data/ssl/chef-rspec.cert +15 -15
  200. data/spec/functional/knife/configure_spec.rb +1 -1
  201. data/spec/functional/knife/ssh_spec.rb +5 -16
  202. data/spec/functional/resource/aix_service_spec.rb +9 -2
  203. data/spec/functional/resource/aixinit_service_spec.rb +8 -9
  204. data/spec/functional/resource/apt_package_spec.rb +0 -1
  205. data/spec/functional/resource/bash_spec.rb +3 -2
  206. data/spec/functional/resource/bff_spec.rb +3 -3
  207. data/spec/functional/resource/chocolatey_package_spec.rb +4 -0
  208. data/spec/functional/resource/cookbook_file_spec.rb +1 -1
  209. data/spec/functional/resource/cron_spec.rb +10 -2
  210. data/spec/functional/resource/dnf_package_spec.rb +4 -1
  211. data/spec/functional/resource/dsc_resource_spec.rb +1 -1
  212. data/spec/functional/resource/dsc_script_spec.rb +0 -1
  213. data/spec/functional/resource/execute_spec.rb +1 -1
  214. data/spec/functional/resource/git_spec.rb +23 -1
  215. data/spec/functional/resource/group_spec.rb +21 -9
  216. data/spec/functional/resource/ifconfig_spec.rb +9 -1
  217. data/spec/functional/resource/insserv_spec.rb +7 -7
  218. data/spec/functional/resource/link_spec.rb +22 -25
  219. data/spec/functional/resource/mount_spec.rb +9 -1
  220. data/spec/functional/resource/msu_package_spec.rb +9 -3
  221. data/spec/functional/resource/powershell_script_spec.rb +8 -8
  222. data/spec/functional/resource/remote_file_spec.rb +7 -13
  223. data/spec/functional/resource/rpm_spec.rb +3 -3
  224. data/spec/functional/resource/timezone_spec.rb +2 -0
  225. data/spec/functional/resource/windows_certificate_spec.rb +3 -3
  226. data/spec/functional/resource/windows_font_spec.rb +49 -0
  227. data/spec/functional/resource/windows_package_spec.rb +0 -1
  228. data/spec/functional/resource/windows_path_spec.rb +4 -0
  229. data/spec/functional/resource/windows_security_policy_spec.rb +0 -4
  230. data/spec/functional/resource/windows_service_spec.rb +4 -0
  231. data/spec/functional/resource/windows_task_spec.rb +4 -3
  232. data/spec/functional/resource/windows_user_privilege_spec.rb +1 -2
  233. data/spec/functional/resource/yum_package_spec.rb +4 -1
  234. data/spec/functional/resource/zypper_package_spec.rb +4 -1
  235. data/spec/functional/run_lock_spec.rb +26 -25
  236. data/spec/functional/shell_spec.rb +5 -6
  237. data/spec/functional/util/powershell/cmdlet_spec.rb +1 -1
  238. data/spec/functional/version_spec.rb +1 -1
  239. data/spec/functional/win32/crypto_spec.rb +1 -1
  240. data/spec/functional/win32/registry_spec.rb +8 -8
  241. data/spec/functional/win32/service_manager_spec.rb +1 -1
  242. data/spec/integration/knife/common_options_spec.rb +12 -12
  243. data/spec/integration/knife/config_get_profile_spec.rb +69 -68
  244. data/spec/integration/knife/config_get_spec.rb +126 -125
  245. data/spec/integration/knife/config_list_profiles_spec.rb +181 -152
  246. data/spec/integration/knife/config_use_profile_spec.rb +115 -61
  247. data/spec/integration/knife/cookbook_upload_spec.rb +28 -1
  248. data/spec/integration/knife/data_bag_from_file_spec.rb +1 -1
  249. data/spec/integration/knife/diff_spec.rb +3 -1
  250. data/spec/integration/knife/download_spec.rb +3 -1
  251. data/spec/integration/knife/environment_from_file_spec.rb +1 -1
  252. data/spec/integration/knife/node_from_file_spec.rb +1 -1
  253. data/spec/integration/knife/role_from_file_spec.rb +1 -1
  254. data/spec/integration/knife/serve_spec.rb +5 -5
  255. data/spec/integration/knife/upload_spec.rb +3 -1
  256. data/spec/integration/recipes/accumulator_spec.rb +1 -1
  257. data/spec/integration/recipes/lwrp_inline_resources_spec.rb +2 -2
  258. data/spec/integration/recipes/lwrp_spec.rb +1 -1
  259. data/spec/integration/recipes/notifies_spec.rb +1 -1
  260. data/spec/integration/recipes/notifying_block_spec.rb +1 -1
  261. data/spec/integration/recipes/recipe_dsl_spec.rb +5 -1
  262. data/spec/integration/recipes/resource_converge_if_changed_spec.rb +2 -0
  263. data/spec/integration/recipes/resource_load_spec.rb +4 -2
  264. data/spec/integration/recipes/unified_mode_spec.rb +1 -1
  265. data/spec/integration/recipes/use_partial_spec.rb +1 -1
  266. data/spec/scripts/ssl-serve.rb +1 -1
  267. data/spec/spec_helper.rb +16 -10
  268. data/spec/support/chef_helpers.rb +1 -20
  269. data/spec/support/platform_helpers.rb +9 -11
  270. data/spec/support/platforms/win32/spec_service.rb +1 -1
  271. data/spec/support/shared/functional/directory_resource.rb +1 -1
  272. data/spec/support/shared/functional/execute_resource.rb +1 -1
  273. data/spec/support/shared/functional/file_resource.rb +20 -21
  274. data/spec/support/shared/functional/securable_resource.rb +1 -2
  275. data/spec/support/shared/functional/securable_resource_with_reporting.rb +0 -1
  276. data/spec/support/shared/functional/win32_service.rb +1 -1
  277. data/spec/support/shared/functional/windows_script.rb +5 -5
  278. data/spec/support/shared/integration/integration_helper.rb +22 -52
  279. data/spec/support/shared/integration/knife_support.rb +2 -9
  280. data/spec/support/shared/unit/application_dot_d.rb +0 -1
  281. data/spec/support/shared/unit/provider/file.rb +12 -8
  282. data/spec/support/shared/unit/script_resource.rb +6 -20
  283. data/spec/support/shared/unit/windows_script_resource.rb +15 -28
  284. data/spec/unit/application/solo_spec.rb +4 -2
  285. data/spec/unit/application_spec.rb +4 -2
  286. data/spec/unit/chef_fs/config_spec.rb +2 -2
  287. data/spec/unit/chef_fs/diff_spec.rb +8 -8
  288. data/spec/unit/chef_fs/file_system/operation_failed_error_spec.rb +2 -4
  289. data/spec/unit/chef_fs/{parallelizer.rb → parallelizer_spec.rb} +1 -1
  290. data/spec/unit/client_spec.rb +4 -1
  291. data/spec/unit/cookbook/gem_installer_spec.rb +2 -1
  292. data/spec/unit/cookbook/synchronizer_spec.rb +26 -24
  293. data/spec/unit/data_bag_spec.rb +6 -3
  294. data/spec/unit/data_collector_spec.rb +23 -1
  295. data/spec/unit/decorator_spec.rb +23 -23
  296. data/spec/unit/dsl/platform_introspection_spec.rb +1 -0
  297. data/spec/unit/environment_spec.rb +12 -8
  298. data/spec/unit/event_dispatch/dispatcher_spec.rb +3 -0
  299. data/spec/unit/guard_interpreter_spec.rb +1 -1
  300. data/spec/unit/http/api_versions_spec.rb +20 -2
  301. data/spec/unit/json_compat_spec.rb +1 -1
  302. data/spec/unit/knife/bootstrap_spec.rb +17 -20
  303. data/spec/unit/knife/cookbook_download_spec.rb +6 -6
  304. data/spec/unit/knife/cookbook_metadata_from_file_spec.rb +1 -1
  305. data/spec/unit/knife/cookbook_show_spec.rb +6 -7
  306. data/spec/unit/knife/cookbook_upload_spec.rb +7 -10
  307. data/spec/unit/knife/core/hashed_command_loader_spec.rb +3 -3
  308. data/spec/unit/knife/core/windows_bootstrap_context_spec.rb +21 -12
  309. data/spec/unit/knife/data_bag_edit_spec.rb +1 -1
  310. data/spec/unit/knife/supermarket_share_spec.rb +1 -1
  311. data/spec/unit/log/syslog_spec.rb +6 -10
  312. data/spec/unit/log/winevt_spec.rb +21 -13
  313. data/spec/unit/lwrp_spec.rb +9 -6
  314. data/spec/unit/mixin/{path_sanity_spec.rb → default_paths_spec.rb} +14 -14
  315. data/spec/unit/mixin/powershell_exec_spec.rb +1 -1
  316. data/spec/unit/mixin/powershell_out_spec.rb +2 -4
  317. data/spec/unit/mixin/powershell_type_coercions_spec.rb +1 -1
  318. data/spec/unit/mixin/securable_spec.rb +0 -1
  319. data/spec/unit/mixin/shell_out_spec.rb +25 -26
  320. data/spec/unit/mixin/subclass_directive_spec.rb +2 -2
  321. data/spec/unit/mixin/template_spec.rb +30 -30
  322. data/spec/unit/mixin/unformatter_spec.rb +2 -2
  323. data/spec/unit/mixin/uris_spec.rb +1 -1
  324. data/spec/unit/mixin/which.rb +8 -0
  325. data/spec/unit/mixin/windows_architecture_helper_spec.rb +4 -4
  326. data/spec/unit/node/immutable_collections_spec.rb +6 -2
  327. data/spec/unit/node_spec.rb +103 -16
  328. data/spec/unit/property_spec.rb +5 -5
  329. data/spec/unit/provider/batch_spec.rb +1 -1
  330. data/spec/unit/provider/cron/unix_spec.rb +1 -1
  331. data/spec/unit/provider/dsc_resource_spec.rb +22 -38
  332. data/spec/unit/provider/dsc_script_spec.rb +10 -10
  333. data/spec/unit/provider/execute_spec.rb +1 -8
  334. data/spec/unit/provider/git_spec.rb +3 -3
  335. data/spec/unit/provider/ifconfig_spec.rb +0 -1
  336. data/spec/unit/provider/mdadm_spec.rb +1 -3
  337. data/spec/unit/provider/package/dnf/python_helper_spec.rb +1 -1
  338. data/spec/unit/provider/package/openbsd_spec.rb +1 -1
  339. data/spec/unit/provider/package/pacman_spec.rb +17 -20
  340. data/spec/unit/provider/package/rubygems_spec.rb +5 -10
  341. data/spec/unit/provider/package/smartos_spec.rb +1 -1
  342. data/spec/unit/provider/package/windows/registry_uninstall_entry_spec.rb +3 -3
  343. data/spec/unit/provider/package/windows_spec.rb +30 -53
  344. data/spec/unit/provider/powershell_script_spec.rb +11 -4
  345. data/spec/unit/provider/remote_directory_spec.rb +9 -9
  346. data/spec/unit/provider/service/arch_service_spec.rb +3 -2
  347. data/spec/unit/provider/service/debian_service_spec.rb +1 -1
  348. data/spec/unit/provider/service/gentoo_service_spec.rb +7 -7
  349. data/spec/unit/provider/service/macosx_spec.rb +3 -3
  350. data/spec/unit/provider/service/redhat_spec.rb +3 -3
  351. data/spec/unit/provider/service/upstart_service_spec.rb +3 -3
  352. data/spec/unit/provider/service/windows_spec.rb +2 -6
  353. data/spec/unit/provider/systemd_unit_spec.rb +28 -24
  354. data/spec/unit/provider/user/dscl_spec.rb +2 -2
  355. data/spec/unit/provider/windows_env_spec.rb +5 -4
  356. data/spec/unit/provider_resolver_spec.rb +6 -6
  357. data/spec/unit/provider_spec.rb +1 -0
  358. data/spec/unit/resource/batch_spec.rb +6 -6
  359. data/spec/unit/resource/chef_client_cron_spec.rb +23 -7
  360. data/spec/unit/resource/chef_client_systemd_timer_spec.rb +7 -4
  361. data/spec/unit/resource/execute_spec.rb +123 -118
  362. data/spec/unit/resource/file/verification_spec.rb +2 -1
  363. data/spec/unit/resource/macos_user_defaults_spec.rb +103 -2
  364. data/spec/unit/resource/osx_profile_spec.rb +233 -0
  365. data/spec/unit/resource/powershell_script_spec.rb +11 -29
  366. data/spec/unit/resource/script_spec.rb +6 -1
  367. data/spec/unit/resource/windows_feature_powershell_spec.rb +30 -4
  368. data/spec/unit/resource/windows_firewall_profile_spec.rb +77 -0
  369. data/spec/unit/resource/windows_package_spec.rb +1 -0
  370. data/spec/unit/resource_reporter_spec.rb +1 -1
  371. data/spec/unit/resource_spec.rb +25 -8
  372. data/spec/unit/role_spec.rb +30 -28
  373. data/spec/unit/run_context/cookbook_compiler_spec.rb +1 -1
  374. data/spec/unit/run_lock_spec.rb +1 -1
  375. data/spec/unit/scan_access_control_spec.rb +1 -1
  376. data/spec/unit/server_api_spec.rb +43 -16
  377. data/spec/unit/util/backup_spec.rb +1 -1
  378. data/spec/unit/util/diff_spec.rb +1 -15
  379. data/spec/unit/util/powershell/ps_credential_spec.rb +2 -2
  380. data/spec/unit/util/selinux_spec.rb +2 -1
  381. data/spec/unit/win32/security_spec.rb +4 -3
  382. data/tasks/rspec.rb +1 -1
  383. metadata +45 -24
  384. data/lib/chef/provider/osx_profile.rb +0 -255
  385. data/spec/unit/provider/osx_profile_spec.rb +0 -255
@@ -22,80 +22,134 @@ describe "knife config use-profile", :workstation do
22
22
  include KnifeSupport
23
23
 
24
24
  include_context "default config options"
25
- include_context "with a chef repo"
26
25
 
27
26
  let(:cmd_args) { [] }
28
27
 
29
- let(:knife_use_profile) do
30
- knife("config", "use-profile", *cmd_args, instance_filter: lambda { |instance|
31
- # Fake the failsafe check because this command doesn't actually process knife.rb.
32
- $__KNIFE_INTEGRATION_FAILSAFE_CHECK << " ole"
33
- })
34
- end
28
+ when_the_repository("has a custom env") do
29
+ let(:knife_use_profile) do
30
+ knife("config", "use-profile", *cmd_args, instance_filter: lambda { |instance|
31
+ # Fake the failsafe check because this command doesn't actually process knife.rb.
32
+ $__KNIFE_INTEGRATION_FAILSAFE_CHECK << " ole"
33
+ allow(File).to receive(:file?).and_call_original
34
+ })
35
+ end
36
+
37
+ subject { knife_use_profile.stdout }
38
+
39
+ around do |ex|
40
+ # Store and reset the value of some env vars.
41
+ old_chef_home = ENV["CHEF_HOME"]
42
+ old_knife_home = ENV["KNIFE_HOME"]
43
+ old_home = ENV["HOME"]
44
+ old_wd = Dir.pwd
45
+ ChefConfig::PathHelper.per_tool_home_environment = "KNIFE_HOME"
46
+ # Clear these out because they are cached permanently.
47
+ ChefConfig::PathHelper.class_exec { remove_class_variable(:@@home_dir) }
48
+ Chef::Knife::ConfigUseProfile.reset_config_loader!
49
+ begin
50
+ ex.run
51
+ ensure
52
+ ENV["CHEF_HOME"] = old_chef_home
53
+ ENV["KNIFE_HOME"] = old_knife_home
54
+ ENV["HOME"] = old_home
55
+ Dir.chdir(old_wd)
56
+ ENV[ChefUtils.windows? ? "CD" : "PWD"] = Dir.pwd
57
+ ChefConfig::PathHelper.per_tool_home_environment = nil
58
+ end
59
+ end
35
60
 
36
- subject { knife_use_profile.stdout }
37
-
38
- around do |ex|
39
- # Store and reset the value of some env vars.
40
- old_chef_home = ENV["CHEF_HOME"]
41
- old_knife_home = ENV["KNIFE_HOME"]
42
- old_home = ENV["HOME"]
43
- old_wd = Dir.pwd
44
- ChefConfig::PathHelper.per_tool_home_environment = "KNIFE_HOME"
45
- # Clear these out because they are cached permanently.
46
- ChefConfig::PathHelper.class_exec { remove_class_variable(:@@home_dir) }
47
- Chef::Knife::ConfigUseProfile.reset_config_loader!
48
- begin
49
- ex.run
50
- ensure
51
- ENV["CHEF_HOME"] = old_chef_home
52
- ENV["KNIFE_HOME"] = old_knife_home
53
- ENV["HOME"] = old_home
54
- Dir.chdir(old_wd)
61
+ before do
62
+ # Always run from the temp folder. This can't be in the `around` block above
63
+ # because it has to run after the before set in the "with a chef repo" shared context.
64
+ directory("repo")
65
+ Dir.chdir(path_to("repo"))
55
66
  ENV[ChefUtils.windows? ? "CD" : "PWD"] = Dir.pwd
56
- ChefConfig::PathHelper.per_tool_home_environment = nil
67
+ ENV["HOME"] = path_to(".")
57
68
  end
58
- end
59
69
 
60
- before do
61
- # Always run from the temp folder. This can't be in the `around` block above
62
- # because it has to run after the before set in the "with a chef repo" shared context.
63
- directory("repo")
64
- Dir.chdir(path_to("repo"))
65
- ENV[ChefUtils.windows? ? "CD" : "PWD"] = Dir.pwd
66
- ENV["HOME"] = path_to(".")
67
- end
70
+ context "with no argument" do
71
+ subject { knife_use_profile.stderr }
72
+ it { is_expected.to eq "FATAL: You must specify a profile\n" }
73
+ end
68
74
 
69
- context "with no argument" do
70
- subject { knife_use_profile.stderr }
71
- it { is_expected.to eq "FATAL: You must specify a profile\n" }
72
- end
75
+ context "with an argument" do
76
+ let(:cmd_args) { %w{production} }
77
+ before { file(".chef/credentials", <<~EOH) }
78
+ [production]
79
+ client_name = "testuser"
80
+ client_key = "testkey.pem"
81
+ chef_server_url = "https://example.com/organizations/testorg"
82
+ EOH
83
+ it do
84
+ is_expected.to eq "Set default profile to production\n"
85
+ expect(File.read(path_to(".chef/context"))).to eq "production\n"
86
+ end
87
+ end
73
88
 
74
- context "with an argument" do
75
- let(:cmd_args) { %w{production} }
76
- it do
77
- is_expected.to eq "Set default profile to production\n"
78
- expect(File.read(path_to(".chef/context"))).to eq "production\n"
89
+ context "with no credentials file" do
90
+ let(:cmd_args) { %w{production} }
91
+ subject { knife_use_profile.stderr }
92
+ it { is_expected.to eq "FATAL: No profiles found, #{path_to(".chef/credentials")} does not exist or is empty\n" }
79
93
  end
80
- end
81
94
 
82
- context "with $CHEF_HOME" do
83
- let(:cmd_args) { %w{staging} }
84
- before { ENV["CHEF_HOME"] = path_to("chefhome"); file("chefhome/tmp", "") }
85
- it do
86
- is_expected.to eq "Set default profile to staging\n"
87
- expect(File.read(path_to("chefhome/.chef/context"))).to eq "staging\n"
88
- expect(File.exist?(path_to(".chef/context"))).to be_falsey
95
+ context "with an empty credentials file" do
96
+ let(:cmd_args) { %w{production} }
97
+ before { file(".chef/credentials", "") }
98
+ subject { knife_use_profile.stderr }
99
+ it { is_expected.to eq "FATAL: No profiles found, #{path_to(".chef/credentials")} does not exist or is empty\n" }
89
100
  end
90
- end
91
101
 
92
- context "with $KNIFE_HOME" do
93
- let(:cmd_args) { %w{development} }
94
- before { ENV["KNIFE_HOME"] = path_to("knifehome"); file("knifehome/tmp", "") }
95
- it do
96
- is_expected.to eq "Set default profile to development\n"
97
- expect(File.read(path_to("knifehome/.chef/context"))).to eq "development\n"
98
- expect(File.exist?(path_to(".chef/context"))).to be_falsey
102
+ context "with an wrong argument" do
103
+ let(:cmd_args) { %w{staging} }
104
+ before { file(".chef/credentials", <<~EOH) }
105
+ [production]
106
+ client_name = "testuser"
107
+ client_key = "testkey.pem"
108
+ chef_server_url = "https://example.com/organizations/testorg"
109
+ EOH
110
+ subject { knife_use_profile }
111
+ it { expect { subject }.to raise_error ChefConfig::ConfigurationError, "Profile staging doesn't exist. Please add it to #{path_to(".chef/credentials")} and if it is profile with DNS name check that you are not missing single quotes around it as per docs https://docs.chef.io/workstation/knife_setup/#knife-profiles." }
112
+ end
113
+
114
+ context "with $CHEF_HOME" do
115
+ let(:cmd_args) { %w{staging} }
116
+ before do
117
+ ENV["CHEF_HOME"] = path_to("chefhome"); file("chefhome/tmp", "")
118
+ file("chefhome/.chef/credentials", <<~EOH
119
+ [staging]
120
+ client_name = "testuser"
121
+ client_key = "testkey.pem"
122
+ chef_server_url = "https://example.com/organizations/testorg"
123
+ EOH
124
+ )
125
+ end
126
+
127
+ it do
128
+ is_expected.to eq "Set default profile to staging\n"
129
+ expect(File.read(path_to("chefhome/.chef/context"))).to eq "staging\n"
130
+ expect(File.exist?(path_to(".chef/context"))).to be_falsey
131
+ end
132
+ end
133
+
134
+ context "with $KNIFE_HOME" do
135
+ let(:cmd_args) { %w{development} }
136
+
137
+ before do
138
+ ENV["KNIFE_HOME"] = path_to("knifehome"); file("knifehome/tmp", "")
139
+ file("knifehome/.chef/credentials", <<~EOH
140
+ [development]
141
+ client_name = "testuser"
142
+ client_key = "testkey.pem"
143
+ chef_server_url = "https://example.com/organizations/testorg"
144
+ EOH
145
+ )
146
+ end
147
+
148
+ it do
149
+ is_expected.to eq "Set default profile to development\n"
150
+ expect(File.read(path_to("knifehome/.chef/context"))).to eq "development\n"
151
+ expect(File.exist?(path_to(".chef/context"))).to be_falsey
152
+ end
99
153
  end
100
154
  end
101
155
  end
@@ -25,7 +25,7 @@ describe "knife cookbook upload", :workstation do
25
25
 
26
26
  include_context "default config options"
27
27
 
28
- let (:cb_dir) { "#{@repository_dir}/cookbooks" }
28
+ let(:cb_dir) { "#{@repository_dir}/cookbooks" }
29
29
 
30
30
  when_the_chef_server "is empty" do
31
31
  when_the_repository "has a cookbook" do
@@ -97,5 +97,32 @@ describe "knife cookbook upload", :workstation do
97
97
  expect { knife("cookbook upload x -o #{cb_dir}") }.to raise_error(Chef::Exceptions::MetadataNotValid)
98
98
  end
99
99
  end
100
+
101
+ when_the_repository "has cookbooks at multiple paths" do
102
+
103
+ let(:cb_dir_first) do
104
+ File.join(@repository_dir, "cookbooks")
105
+ .gsub(File::SEPARATOR, File::ALT_SEPARATOR || File::SEPARATOR)
106
+ end
107
+
108
+ let(:cb_dir_second) do
109
+ File.join(@repository_dir, "test_cookbooks")
110
+ .gsub(File::SEPARATOR, File::ALT_SEPARATOR || File::SEPARATOR)
111
+ end
112
+
113
+ before(:each) do
114
+ file "cookbooks/x/metadata.rb", cb_metadata("x", "1.0.0")
115
+ file "test_cookbooks/y/metadata.rb", cb_metadata("y", "1.0.0")
116
+ end
117
+
118
+ it "knife cookbook upload with -o or --cookbook-path" do
119
+ knife("cookbook upload x y -o #{cb_dir_first}#{File::PATH_SEPARATOR}#{cb_dir_second}").should_succeed stderr: <<~EOM
120
+ Uploading x [1.0.0]
121
+ Uploading y [1.0.0]
122
+ Uploaded 2 cookbooks.
123
+ EOM
124
+ end
125
+
126
+ end
100
127
  end
101
128
  end
@@ -24,7 +24,7 @@ describe "knife data bag from file", :workstation do
24
24
 
25
25
  include_context "default config options"
26
26
 
27
- let (:db_dir) { "#{@repository_dir}/data_bags" }
27
+ let(:db_dir) { "#{@repository_dir}/data_bags" }
28
28
 
29
29
  when_the_chef_server "has an empty data bag" do
30
30
  before do
@@ -318,7 +318,9 @@ describe "knife diff", :workstation do
318
318
  end
319
319
  end # without versioned cookbooks
320
320
 
321
- with_versioned_cookbooks do
321
+ context "with versioned cookbooks" do
322
+ before { Chef::Config[:versioned_cookbooks] = true }
323
+
322
324
  when_the_chef_server "has one of each thing" do
323
325
  before do
324
326
  client "x", "{}"
@@ -594,7 +594,9 @@ describe "knife download", :workstation do
594
594
  end
595
595
  end # without versioned cookbooks
596
596
 
597
- with_versioned_cookbooks do
597
+ context "with versioned cookbooks" do
598
+ before { Chef::Config[:versioned_cookbooks] = true }
599
+
598
600
  when_the_chef_server "has one of each thing" do
599
601
  before do
600
602
  client "x", {}
@@ -24,7 +24,7 @@ describe "knife environment from file", :workstation do
24
24
 
25
25
  # include_context "default config options"
26
26
 
27
- let (:env_dir) { "#{@repository_dir}/environments" }
27
+ let(:env_dir) { "#{@repository_dir}/environments" }
28
28
 
29
29
  when_the_chef_server "is empty" do
30
30
  when_the_repository "has some environments" do
@@ -24,7 +24,7 @@ describe "knife node from file", :workstation do
24
24
 
25
25
  # include_context "default config options"
26
26
 
27
- let (:node_dir) { "#{@repository_dir}/nodes" }
27
+ let(:node_dir) { "#{@repository_dir}/nodes" }
28
28
 
29
29
  when_the_chef_server "is empty" do
30
30
  when_the_repository "has some nodes" do
@@ -24,7 +24,7 @@ describe "knife role from file", :workstation do
24
24
 
25
25
  # include_context "default config options"
26
26
 
27
- let (:role_dir) { "#{@repository_dir}/roles" }
27
+ let(:role_dir) { "#{@repository_dir}/roles" }
28
28
 
29
29
  when_the_chef_server "is empty" do
30
30
  when_the_repository "has some roles" do
@@ -26,11 +26,11 @@ describe "knife serve", :workstation do
26
26
  def with_knife_serve
27
27
  exception = nil
28
28
  t = Thread.new do
29
- begin
30
- knife("serve --chef-zero-port=8890")
31
- rescue
32
- exception = $!
33
- end
29
+
30
+ knife("serve --chef-zero-port=8890")
31
+ rescue
32
+ exception = $!
33
+
34
34
  end
35
35
  begin
36
36
  Chef::Config.log_level = :debug
@@ -800,7 +800,9 @@ describe "knife upload", :workstation do
800
800
  end
801
801
  end # without versioned cookbooks
802
802
 
803
- with_versioned_cookbooks do
803
+ context "with versioned cookbooks" do
804
+ before { Chef::Config[:versioned_cookbooks] = true }
805
+
804
806
  when_the_chef_server "has one of each thing" do
805
807
 
806
808
  before do
@@ -6,7 +6,7 @@ describe "Accumulators" do
6
6
  include IntegrationSupport
7
7
  include Chef::Mixin::ShellOut
8
8
 
9
- let(:chef_dir) { File.expand_path("../../../../bin", __FILE__) }
9
+ let(:chef_dir) { File.expand_path("../../../bin", __dir__) }
10
10
 
11
11
  # Invoke `chef-client` as `ruby PATH/TO/chef-client`. This ensures the
12
12
  # following constraints are satisfied:
@@ -6,7 +6,7 @@ describe "LWRPs with inline resources" do
6
6
  include IntegrationSupport
7
7
  include Chef::Mixin::ShellOut
8
8
 
9
- let(:chef_dir) { File.expand_path("../../../../bin", __FILE__) }
9
+ let(:chef_dir) { File.expand_path("../../../bin", __dir__) }
10
10
 
11
11
  # Invoke `chef-client` as `ruby PATH/TO/chef-client`. This ensures the
12
12
  # following constraints are satisfied:
@@ -59,7 +59,7 @@ describe "LWRPs with inline resources" do
59
59
  end
60
60
  end
61
61
 
62
- after { File.delete(LwrpShadowedPropertyTest::PATH) if File.exists?(LwrpShadowedPropertyTest::PATH) }
62
+ after { File.delete(LwrpShadowedPropertyTest::PATH) if File.exist?(LwrpShadowedPropertyTest::PATH) }
63
63
 
64
64
  # https://github.com/chef/chef/issues/4334
65
65
  it "does not warn spuriously" do
@@ -6,7 +6,7 @@ describe "LWRPs" do
6
6
  include IntegrationSupport
7
7
  include Chef::Mixin::ShellOut
8
8
 
9
- let(:chef_dir) { File.expand_path("../../../../bin", __FILE__) }
9
+ let(:chef_dir) { File.expand_path("../../../bin", __dir__) }
10
10
 
11
11
  # Invoke `chef-client` as `ruby PATH/TO/chef-client`. This ensures the
12
12
  # following constraints are satisfied:
@@ -22,7 +22,7 @@ describe "notifications" do
22
22
  include IntegrationSupport
23
23
  include Chef::Mixin::ShellOut
24
24
 
25
- let(:chef_dir) { File.expand_path("../../../../bin", __FILE__) }
25
+ let(:chef_dir) { File.expand_path("../../../bin", __dir__) }
26
26
  let(:chef_client) { "bundle exec chef-client --minimal-ohai" }
27
27
 
28
28
  when_the_repository "notifies a nameless resource" do
@@ -23,7 +23,7 @@ describe "notifying_block" do
23
23
  include IntegrationSupport
24
24
  include Chef::Mixin::ShellOut
25
25
 
26
- let(:chef_dir) { File.expand_path("../../../../bin", __FILE__) }
26
+ let(:chef_dir) { File.expand_path("../../../bin", __dir__) }
27
27
  let(:chef_client) { "bundle exec chef-client --minimal-ohai" }
28
28
 
29
29
  when_the_repository "notifying_block test one" do
@@ -1221,7 +1221,7 @@ describe "Recipe DSL methods" do
1221
1221
 
1222
1222
  it "utf-8 dsl names work" do
1223
1223
  recipe = converge do
1224
- Straße("blah") {}
1224
+ Straße("blah") {} # rubocop: disable Naming/AsciiIdentifiers
1225
1225
  end
1226
1226
  expect(recipe.logged_warnings).to eq ""
1227
1227
  expect(BaseThingy.created_resource).to eq(UTF8Thingy)
@@ -1233,6 +1233,10 @@ describe "Recipe DSL methods" do
1233
1233
  before { Namer.current_index += 1 }
1234
1234
 
1235
1235
  context "with an LWRP that declares actions" do
1236
+ let(:run_context) do
1237
+ Chef::RunContext.new(Chef::Node.new, {}, Chef::EventDispatch::Dispatcher.new)
1238
+ end
1239
+
1236
1240
  let(:resource_class) do
1237
1241
  Class.new(Chef::Resource::LWRPBase) do
1238
1242
  provides :"recipe_dsl_spec#{Namer.current_index}"
@@ -6,6 +6,7 @@ describe "Resource::ActionClass#converge_if_changed" do
6
6
  module Namer
7
7
  extend self
8
8
  attr_accessor :current_index
9
+
9
10
  def incrementing_value
10
11
  @incrementing_value += 1
11
12
  @incrementing_value
@@ -30,6 +31,7 @@ describe "Resource::ActionClass#converge_if_changed" do
30
31
  property :state2, default: "default_state2"
31
32
  property :sensitive1, default: "default_dontprintme", sensitive: true
32
33
  attr_accessor :converged
34
+
33
35
  def initialize(*args)
34
36
  super
35
37
  @converged = 0
@@ -6,6 +6,7 @@ describe "Resource.load_current_value" do
6
6
  module Namer
7
7
  extend self
8
8
  attr_accessor :current_index
9
+
9
10
  def incrementing_value
10
11
  @incrementing_value += 1
11
12
  @incrementing_value
@@ -119,10 +120,10 @@ describe "Resource.load_current_value" do
119
120
  end
120
121
  end
121
122
 
122
- let (:subresource_name) do
123
+ let(:subresource_name) do
123
124
  :"load_current_value_subresource_dsl#{Namer.current_index}"
124
125
  end
125
- let (:subresource_class) do
126
+ let(:subresource_class) do
126
127
  r = Class.new(resource_class) do
127
128
  property :y, default: lazy { "default_y #{Namer.incrementing_value}" }
128
129
  end
@@ -194,6 +195,7 @@ describe "simple load_current_value tests" do
194
195
  let(:resource_class) do
195
196
  Class.new(Chef::Resource) do
196
197
  attr_writer :index # this is our hacky global state
198
+
197
199
  def index; @index ||= 1; end
198
200
 
199
201
  property :myindex, Integer