chef 16.4.38 → 16.7.61

Sign up to get free protection for your applications and to get access to all the features.
Files changed (457) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +5 -12
  3. data/Rakefile +22 -15
  4. data/bin/knife +1 -1
  5. data/chef-universal-mingw32.gemspec +1 -1
  6. data/chef.gemspec +2 -1
  7. data/lib/chef/application.rb +19 -17
  8. data/lib/chef/application/apply.rb +12 -7
  9. data/lib/chef/application/base.rb +26 -23
  10. data/lib/chef/application/client.rb +16 -5
  11. data/lib/chef/application/exit_code.rb +13 -4
  12. data/lib/chef/application/knife.rb +22 -11
  13. data/lib/chef/application/solo.rb +2 -1
  14. data/lib/chef/application/windows_service.rb +14 -14
  15. data/lib/chef/application/windows_service_manager.rb +6 -6
  16. data/lib/chef/chef_fs/chef_fs_data_store.rb +1 -1
  17. data/lib/chef/chef_fs/data_handler/cookbook_data_handler.rb +1 -1
  18. data/lib/chef/chef_fs/file_pattern.rb +1 -1
  19. data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_entry.rb +1 -1
  20. data/lib/chef/chef_fs/knife.rb +2 -2
  21. data/lib/chef/chef_fs/parallelizer.rb +0 -1
  22. data/lib/chef/client.rb +13 -43
  23. data/lib/chef/cookbook/cookbook_version_loader.rb +1 -1
  24. data/lib/chef/cookbook/gem_installer.rb +1 -1
  25. data/lib/chef/cookbook/synchronizer.rb +2 -2
  26. data/lib/chef/cookbook_manifest.rb +1 -1
  27. data/lib/chef/cookbook_site_streaming_uploader.rb +13 -11
  28. data/lib/chef/cookbook_uploader.rb +1 -1
  29. data/lib/chef/cookbook_version.rb +2 -5
  30. data/lib/chef/data_collector.rb +7 -6
  31. data/lib/chef/data_collector/config_validation.rb +22 -13
  32. data/lib/chef/data_collector/run_end_message.rb +2 -2
  33. data/lib/chef/data_collector/run_start_message.rb +1 -1
  34. data/lib/chef/deprecated.rb +1 -1
  35. data/lib/chef/deprecation/warnings.rb +2 -2
  36. data/lib/chef/digester.rb +2 -2
  37. data/lib/chef/dsl/chef_vault.rb +1 -1
  38. data/lib/chef/dsl/data_query.rb +2 -2
  39. data/lib/chef/dsl/platform_introspection.rb +1 -1
  40. data/lib/chef/encrypted_data_bag_item.rb +3 -4
  41. data/lib/chef/encrypted_data_bag_item/decryptor.rb +3 -3
  42. data/lib/chef/encrypted_data_bag_item/encryptor.rb +3 -3
  43. data/lib/chef/environment.rb +3 -3
  44. data/lib/chef/event_loggers/windows_eventlog.rb +2 -2
  45. data/lib/chef/exceptions.rb +5 -5
  46. data/lib/chef/file_access_control/windows.rb +6 -5
  47. data/lib/chef/file_content_management/tempfile.rb +1 -1
  48. data/lib/chef/formatters/doc.rb +7 -6
  49. data/lib/chef/formatters/error_inspectors/api_error_formatting.rb +6 -5
  50. data/lib/chef/formatters/error_inspectors/compile_error_inspector.rb +2 -2
  51. data/lib/chef/formatters/error_inspectors/node_load_error_inspector.rb +3 -3
  52. data/lib/chef/formatters/error_inspectors/registration_error_inspector.rb +9 -9
  53. data/lib/chef/formatters/error_inspectors/resource_failure_inspector.rb +6 -6
  54. data/lib/chef/formatters/error_inspectors/run_list_expansion_error_inspector.rb +3 -3
  55. data/lib/chef/formatters/indentable_output_stream.rb +2 -2
  56. data/lib/chef/formatters/minimal.rb +5 -4
  57. data/lib/chef/guard_interpreter/resource_guard_interpreter.rb +28 -39
  58. data/lib/chef/http.rb +6 -14
  59. data/lib/chef/http/auth_credentials.rb +5 -1
  60. data/lib/chef/http/authenticator.rb +1 -1
  61. data/lib/chef/http/basic_client.rb +4 -2
  62. data/lib/chef/http/decompressor.rb +1 -1
  63. data/lib/chef/http/http_request.rb +7 -5
  64. data/lib/chef/http/socketless_chef_zero_client.rb +5 -2
  65. data/lib/chef/http/ssl_policies.rb +1 -1
  66. data/lib/chef/json_compat.rb +3 -8
  67. data/lib/chef/key.rb +1 -1
  68. data/lib/chef/knife.rb +4 -4
  69. data/lib/chef/knife/bootstrap.rb +18 -15
  70. data/lib/chef/knife/bootstrap/chef_vault_handler.rb +1 -1
  71. data/lib/chef/knife/bootstrap/templates/chef-full.erb +3 -3
  72. data/lib/chef/knife/bootstrap/templates/windows-chef-client-msi.erb +9 -9
  73. data/lib/chef/knife/client_create.rb +3 -3
  74. data/lib/chef/knife/config_get.rb +8 -97
  75. data/lib/chef/knife/config_get_profile.rb +9 -9
  76. data/lib/chef/knife/config_list.rb +139 -0
  77. data/lib/chef/knife/config_list_profiles.rb +8 -98
  78. data/lib/chef/knife/config_show.rb +127 -0
  79. data/lib/chef/knife/config_use.rb +61 -0
  80. data/lib/chef/knife/config_use_profile.rb +9 -24
  81. data/lib/chef/knife/configure.rb +4 -2
  82. data/lib/chef/knife/core/bootstrap_context.rb +2 -2
  83. data/lib/chef/knife/core/cookbook_scm_repo.rb +1 -1
  84. data/lib/chef/knife/core/gem_glob_loader.rb +1 -1
  85. data/lib/chef/knife/core/object_loader.rb +1 -1
  86. data/lib/chef/knife/core/ui.rb +1 -1
  87. data/lib/chef/knife/core/windows_bootstrap_context.rb +18 -15
  88. data/lib/chef/knife/exec.rb +2 -2
  89. data/lib/chef/knife/node_policy_set.rb +2 -2
  90. data/lib/chef/knife/node_run_list_add.rb +1 -1
  91. data/lib/chef/knife/node_run_list_remove.rb +1 -1
  92. data/lib/chef/knife/node_run_list_set.rb +1 -1
  93. data/lib/chef/knife/node_show.rb +2 -2
  94. data/lib/chef/knife/role_env_run_list_add.rb +1 -1
  95. data/lib/chef/knife/role_env_run_list_set.rb +1 -1
  96. data/lib/chef/knife/role_run_list_add.rb +1 -1
  97. data/lib/chef/knife/role_run_list_set.rb +1 -1
  98. data/lib/chef/knife/search.rb +0 -1
  99. data/lib/chef/knife/serve.rb +3 -3
  100. data/lib/chef/knife/ssh.rb +18 -3
  101. data/lib/chef/knife/ssl_check.rb +3 -3
  102. data/lib/chef/knife/status.rb +2 -2
  103. data/lib/chef/knife/tag_create.rb +1 -1
  104. data/lib/chef/knife/tag_delete.rb +1 -1
  105. data/lib/chef/knife/user_create.rb +2 -2
  106. data/lib/chef/knife/yaml_convert.rb +1 -1
  107. data/lib/chef/local_mode.rb +2 -2
  108. data/lib/chef/log/syslog.rb +2 -2
  109. data/lib/chef/log/winevt.rb +2 -2
  110. data/lib/chef/mixin/convert_to_class_name.rb +0 -56
  111. data/lib/chef/mixin/deep_merge.rb +0 -12
  112. data/lib/chef/mixin/openssl_helper.rb +2 -5
  113. data/lib/chef/mixin/powershell_exec.rb +22 -10
  114. data/lib/chef/mixin/powershell_out.rb +12 -5
  115. data/lib/chef/mixin/properties.rb +2 -0
  116. data/lib/chef/mixin/template.rb +3 -3
  117. data/lib/chef/mixin/unformatter.rb +1 -1
  118. data/lib/chef/mixin/uris.rb +4 -2
  119. data/lib/chef/mixin/versioned_api.rb +1 -2
  120. data/lib/chef/node/attribute_collections.rb +2 -6
  121. data/lib/chef/node/mixin/immutablize_hash.rb +2 -0
  122. data/lib/chef/node_map.rb +4 -4
  123. data/lib/chef/policy_builder/dynamic.rb +2 -0
  124. data/lib/chef/policy_builder/policyfile.rb +2 -2
  125. data/lib/chef/powershell.rb +8 -4
  126. data/lib/chef/property.rb +1 -1
  127. data/lib/chef/provider.rb +1 -5
  128. data/lib/chef/provider/cron.rb +2 -13
  129. data/lib/chef/provider/file.rb +2 -2
  130. data/lib/chef/provider/group.rb +14 -6
  131. data/lib/chef/provider/group/windows.rb +12 -1
  132. data/lib/chef/provider/ifconfig.rb +9 -9
  133. data/lib/chef/provider/ifconfig/debian.rb +38 -22
  134. data/lib/chef/provider/ifconfig/redhat.rb +54 -18
  135. data/lib/chef/provider/launchd.rb +3 -13
  136. data/lib/chef/provider/link.rb +0 -9
  137. data/lib/chef/provider/mount.rb +18 -1
  138. data/lib/chef/provider/mount/linux.rb +67 -0
  139. data/lib/chef/provider/mount/mount.rb +41 -43
  140. data/lib/chef/provider/package.rb +3 -0
  141. data/lib/chef/provider/package/apt.rb +1 -1
  142. data/lib/chef/provider/package/chocolatey.rb +6 -6
  143. data/lib/chef/provider/package/dpkg.rb +3 -12
  144. data/lib/chef/provider/package/freebsd/base.rb +3 -2
  145. data/lib/chef/provider/package/freebsd/pkgng.rb +1 -1
  146. data/lib/chef/provider/package/homebrew.rb +1 -1
  147. data/lib/chef/provider/package/ips.rb +1 -1
  148. data/lib/chef/provider/package/powershell.rb +2 -3
  149. data/lib/chef/provider/package/rubygems.rb +22 -19
  150. data/lib/chef/provider/package/snap.rb +1 -4
  151. data/lib/chef/provider/package/solaris.rb +0 -2
  152. data/lib/chef/provider/package/windows.rb +2 -2
  153. data/lib/chef/provider/package/windows/registry_uninstall_entry.rb +3 -1
  154. data/lib/chef/provider/package/yum/rpm_utils.rb +1 -1
  155. data/lib/chef/provider/package/zypper.rb +99 -72
  156. data/lib/chef/provider/powershell_script.rb +12 -1
  157. data/lib/chef/provider/registry_key.rb +4 -3
  158. data/lib/chef/provider/remote_file/content.rb +3 -0
  159. data/lib/chef/provider/remote_file/ftp.rb +6 -4
  160. data/lib/chef/provider/remote_file/sftp.rb +6 -4
  161. data/lib/chef/provider/route.rb +4 -8
  162. data/lib/chef/provider/service/debian.rb +2 -1
  163. data/lib/chef/provider/service/macosx.rb +2 -2
  164. data/lib/chef/provider/service/redhat.rb +1 -1
  165. data/lib/chef/provider/template_finder.rb +2 -10
  166. data/lib/chef/provider/user.rb +17 -9
  167. data/lib/chef/provider/user/aix.rb +1 -1
  168. data/lib/chef/provider/user/dscl.rb +5 -5
  169. data/lib/chef/provider/user/mac.rb +15 -7
  170. data/lib/chef/provider/user/solaris.rb +1 -1
  171. data/lib/chef/provider/user/windows.rb +10 -3
  172. data/lib/chef/provider/zypper_repository.rb +2 -2
  173. data/lib/chef/provider_resolver.rb +1 -1
  174. data/lib/chef/providers.rb +1 -3
  175. data/lib/chef/pwsh.rb +71 -0
  176. data/lib/chef/recipe.rb +2 -2
  177. data/lib/chef/resource.rb +2 -2
  178. data/lib/chef/resource/apt_repository.rb +6 -5
  179. data/lib/chef/resource/bash.rb +119 -1
  180. data/lib/chef/resource/batch.rb +1 -1
  181. data/lib/chef/resource/bff_package.rb +22 -0
  182. data/lib/chef/resource/breakpoint.rb +59 -2
  183. data/lib/chef/resource/build_essential.rb +5 -8
  184. data/lib/chef/resource/cab_package.rb +29 -0
  185. data/lib/chef/resource/chef_client_config.rb +313 -0
  186. data/lib/chef/resource/chef_client_cron.rb +35 -28
  187. data/lib/chef/resource/chef_client_launchd.rb +194 -0
  188. data/lib/chef/resource/chef_client_scheduled_task.rb +24 -21
  189. data/lib/chef/resource/chef_client_systemd_timer.rb +27 -20
  190. data/lib/chef/resource/chef_client_trusted_certificate.rb +101 -0
  191. data/lib/chef/resource/chef_gem.rb +10 -10
  192. data/lib/chef/resource/chef_handler.rb +149 -4
  193. data/lib/chef/resource/chef_sleep.rb +3 -3
  194. data/lib/chef/resource/chef_vault_secret.rb +1 -1
  195. data/lib/chef/resource/cookbook_file.rb +2 -2
  196. data/lib/chef/resource/cron/_cron_shared.rb +1 -0
  197. data/lib/chef/resource/cron/cron_d.rb +2 -3
  198. data/lib/chef/resource/csh.rb +2 -2
  199. data/lib/chef/resource/dnf_package.rb +2 -2
  200. data/lib/chef/resource/dsc_resource.rb +0 -1
  201. data/lib/chef/resource/dsc_script.rb +2 -2
  202. data/lib/chef/resource/execute.rb +10 -8
  203. data/lib/chef/resource/file.rb +4 -4
  204. data/lib/chef/resource/gem_package.rb +5 -5
  205. data/lib/chef/resource/homebrew_package.rb +3 -3
  206. data/lib/chef/resource/homebrew_update.rb +9 -6
  207. data/lib/chef/resource/hostname.rb +4 -4
  208. data/lib/chef/resource/ifconfig.rb +52 -5
  209. data/lib/chef/resource/kernel_module.rb +1 -1
  210. data/lib/chef/resource/ksh.rb +3 -3
  211. data/lib/chef/resource/launchd.rb +17 -16
  212. data/lib/chef/resource/locale.rb +2 -2
  213. data/lib/chef/resource/lwrp_base.rb +3 -5
  214. data/lib/chef/resource/macos_userdefaults.rb +3 -3
  215. data/lib/chef/resource/mount.rb +8 -2
  216. data/lib/chef/resource/notify_group.rb +0 -1
  217. data/lib/chef/resource/ohai.rb +46 -3
  218. data/lib/chef/resource/ohai_hint.rb +33 -0
  219. data/lib/chef/resource/openssl_dhparam.rb +27 -5
  220. data/lib/chef/resource/openssl_ec_private_key.rb +6 -3
  221. data/lib/chef/resource/openssl_ec_public_key.rb +2 -2
  222. data/lib/chef/resource/openssl_rsa_private_key.rb +6 -3
  223. data/lib/chef/resource/openssl_x509_certificate.rb +14 -14
  224. data/lib/chef/resource/openssl_x509_crl.rb +19 -10
  225. data/lib/chef/resource/openssl_x509_request.rb +14 -16
  226. data/lib/chef/resource/osx_profile.rb +77 -13
  227. data/lib/chef/resource/perl.rb +2 -2
  228. data/lib/chef/resource/plist.rb +3 -7
  229. data/lib/chef/resource/powershell_package_source.rb +24 -23
  230. data/lib/chef/resource/powershell_script.rb +14 -11
  231. data/lib/chef/resource/python.rb +2 -2
  232. data/lib/chef/resource/reboot.rb +2 -2
  233. data/lib/chef/resource/registry_key.rb +93 -2
  234. data/lib/chef/resource/remote_file.rb +3 -3
  235. data/lib/chef/resource/rhsm_register.rb +22 -10
  236. data/lib/chef/resource/route.rb +1 -1
  237. data/lib/chef/resource/ruby.rb +2 -2
  238. data/lib/chef/resource/ruby_block.rb +2 -2
  239. data/lib/chef/resource/scm/_scm.rb +2 -1
  240. data/lib/chef/resource/scm/git.rb +82 -1
  241. data/lib/chef/resource/scm/subversion.rb +14 -2
  242. data/lib/chef/resource/script.rb +2 -2
  243. data/lib/chef/resource/service.rb +3 -3
  244. data/lib/chef/resource/solaris_package.rb +0 -2
  245. data/lib/chef/resource/ssh_known_hosts_entry.rb +2 -2
  246. data/lib/chef/resource/sudo.rb +1 -1
  247. data/lib/chef/resource/support/client.erb +64 -0
  248. data/lib/chef/resource/support/cron.d.erb +1 -1
  249. data/lib/chef/resource/support/cron_access.erb +1 -1
  250. data/lib/chef/resource/support/sudoer.erb +1 -1
  251. data/lib/chef/resource/support/ulimit.erb +1 -1
  252. data/lib/chef/resource/sysctl.rb +1 -5
  253. data/lib/chef/resource/systemd_unit.rb +44 -3
  254. data/lib/chef/resource/template.rb +2 -2
  255. data/lib/chef/resource/timezone.rb +112 -73
  256. data/lib/chef/resource/windows_ad_join.rb +19 -12
  257. data/lib/chef/resource/windows_audit_policy.rb +26 -24
  258. data/lib/chef/resource/windows_certificate.rb +12 -10
  259. data/lib/chef/resource/windows_dfs_server.rb +7 -4
  260. data/lib/chef/resource/windows_env.rb +173 -0
  261. data/lib/chef/resource/windows_feature.rb +2 -0
  262. data/lib/chef/resource/windows_firewall_profile.rb +28 -31
  263. data/lib/chef/resource/windows_firewall_rule.rb +9 -11
  264. data/lib/chef/resource/windows_font.rb +1 -1
  265. data/lib/chef/resource/windows_package.rb +29 -5
  266. data/lib/chef/resource/windows_path.rb +38 -0
  267. data/lib/chef/resource/windows_printer.rb +5 -3
  268. data/lib/chef/resource/windows_printer_port.rb +6 -4
  269. data/lib/chef/resource/windows_security_policy.rb +5 -5
  270. data/lib/chef/resource/windows_service.rb +108 -0
  271. data/lib/chef/resource/windows_share.rb +18 -18
  272. data/lib/chef/resource/windows_task.rb +629 -28
  273. data/lib/chef/resource/windows_user_privilege.rb +53 -54
  274. data/lib/chef/resource/windows_workgroup.rb +9 -7
  275. data/lib/chef/resource/yum_package.rb +2 -2
  276. data/lib/chef/resource/yum_repository.rb +1 -1
  277. data/lib/chef/resource_collection/resource_set.rb +1 -5
  278. data/lib/chef/resource_inspector.rb +77 -75
  279. data/lib/chef/resource_reporter.rb +0 -2
  280. data/lib/chef/resources.rb +4 -1
  281. data/lib/chef/run_context.rb +2 -2
  282. data/lib/chef/run_context/cookbook_compiler.rb +1 -1
  283. data/lib/chef/run_lock.rb +3 -3
  284. data/lib/chef/search/query.rb +6 -5
  285. data/lib/chef/server_api.rb +0 -4
  286. data/lib/chef/shell.rb +31 -26
  287. data/lib/chef/shell/ext.rb +12 -12
  288. data/lib/chef/shell/shell_session.rb +2 -2
  289. data/lib/chef/train_transport.rb +5 -104
  290. data/lib/chef/util/backup.rb +1 -1
  291. data/lib/chef/util/diff.rb +3 -3
  292. data/lib/chef/util/dsc/lcm_output_parser.rb +1 -3
  293. data/lib/chef/util/dsc/local_configuration_manager.rb +1 -1
  294. data/lib/chef/util/powershell/cmdlet.rb +6 -10
  295. data/lib/chef/util/powershell/ps_credential.rb +18 -14
  296. data/lib/chef/util/threaded_job_queue.rb +0 -2
  297. data/lib/chef/version.rb +1 -1
  298. data/lib/chef/win32/crypto.rb +1 -1
  299. data/lib/chef/win32/file.rb +1 -1
  300. data/lib/chef/win32/registry.rb +1 -2
  301. data/lib/chef/win32/security/sid.rb +1 -1
  302. data/lib/chef/win32/unicode.rb +1 -1
  303. data/spec/data/shef-config.rb +1 -1
  304. data/spec/functional/event_loggers/windows_eventlog_spec.rb +6 -5
  305. data/spec/functional/mixin/powershell_out_spec.rb +11 -3
  306. data/spec/functional/resource/aix_service_spec.rb +2 -2
  307. data/spec/functional/resource/aixinit_service_spec.rb +1 -1
  308. data/spec/functional/resource/apt_package_spec.rb +4 -6
  309. data/spec/functional/resource/chocolatey_package_spec.rb +3 -3
  310. data/spec/functional/resource/cron_spec.rb +3 -3
  311. data/spec/functional/resource/dsc_script_spec.rb +3 -3
  312. data/spec/functional/resource/insserv_spec.rb +1 -1
  313. data/spec/functional/resource/mount_spec.rb +10 -2
  314. data/spec/functional/resource/powershell_package_source_spec.rb +107 -0
  315. data/spec/functional/resource/powershell_script_spec.rb +57 -14
  316. data/spec/functional/resource/user/dscl_spec.rb +1 -1
  317. data/spec/functional/resource/user/mac_user_spec.rb +1 -1
  318. data/spec/functional/resource/windows_certificate_spec.rb +10 -6
  319. data/spec/functional/resource/windows_firewall_rule_spec.rb +93 -0
  320. data/spec/functional/resource/windows_package_spec.rb +36 -10
  321. data/spec/functional/resource/windows_share_spec.rb +103 -0
  322. data/spec/functional/resource/windows_task_spec.rb +15 -16
  323. data/spec/functional/resource/zypper_package_spec.rb +11 -0
  324. data/spec/functional/version_spec.rb +3 -3
  325. data/spec/integration/client/client_spec.rb +4 -4
  326. data/spec/integration/client/exit_code_spec.rb +3 -2
  327. data/spec/integration/client/ipv6_spec.rb +1 -1
  328. data/spec/integration/knife/client_key_create_spec.rb +1 -1
  329. data/spec/integration/knife/{config_list_profiles_spec.rb → config_list_spec.rb} +30 -29
  330. data/spec/integration/knife/{config_get_spec.rb → config_show_spec.rb} +3 -3
  331. data/spec/integration/knife/{config_use_profile_spec.rb → config_use_spec.rb} +53 -10
  332. data/spec/integration/knife/cookbook_api_ipv6_spec.rb +1 -1
  333. data/spec/integration/knife/node_create_spec.rb +1 -1
  334. data/spec/integration/knife/node_environment_set_spec.rb +1 -1
  335. data/spec/integration/knife/node_run_list_add_spec.rb +4 -4
  336. data/spec/integration/knife/node_run_list_remove_spec.rb +1 -1
  337. data/spec/integration/knife/node_run_list_set_spec.rb +1 -1
  338. data/spec/integration/knife/node_show_spec.rb +1 -1
  339. data/spec/integration/ohai/ohai_spec.rb +61 -0
  340. data/spec/integration/recipes/notifies_spec.rb +1 -1
  341. data/spec/integration/recipes/provider_choice.rb +2 -2
  342. data/spec/integration/recipes/remote_directory.rb +1 -1
  343. data/spec/integration/solo/solo_spec.rb +5 -5
  344. data/spec/spec_helper.rb +8 -6
  345. data/spec/stress/win32/file_spec.rb +1 -1
  346. data/spec/support/chef_helpers.rb +2 -2
  347. data/spec/support/lib/chef/resource/cat.rb +1 -1
  348. data/spec/support/lib/chef/resource/one_two_three_four.rb +1 -1
  349. data/spec/support/matchers/leak.rb +2 -2
  350. data/spec/support/mock/platform.rb +24 -16
  351. data/spec/support/platform_helpers.rb +27 -38
  352. data/spec/support/shared/functional/securable_resource.rb +108 -27
  353. data/spec/support/shared/functional/win32_service.rb +1 -1
  354. data/spec/support/shared/unit/application_dot_d.rb +5 -3
  355. data/spec/support/shared/unit/knife_shared.rb +1 -1
  356. data/spec/support/shared/unit/script_resource.rb +4 -4
  357. data/spec/support/shared/unit/windows_script_resource.rb +1 -1
  358. data/spec/tiny_server.rb +0 -1
  359. data/spec/unit/application/client_spec.rb +2 -2
  360. data/spec/unit/application/exit_code_spec.rb +10 -0
  361. data/spec/unit/application_spec.rb +4 -6
  362. data/spec/unit/chef_fs/config_spec.rb +1 -1
  363. data/spec/unit/chef_fs/data_handler/data_bag_item_data_handler.rb +1 -1
  364. data/spec/unit/chef_fs/parallelizer_spec.rb +5 -1
  365. data/spec/unit/chef_fs/path_util_spec.rb +1 -1
  366. data/spec/unit/client_spec.rb +16 -0
  367. data/spec/unit/cookbook/synchronizer_spec.rb +2 -2
  368. data/spec/unit/cookbook_spec.rb +2 -2
  369. data/spec/unit/data_collector/config_validation_spec.rb +208 -0
  370. data/spec/unit/data_collector_spec.rb +0 -117
  371. data/spec/unit/dsl/declare_resource_spec.rb +1 -1
  372. data/spec/unit/file_access_control_spec.rb +1 -1
  373. data/spec/unit/guard_interpreter/resource_guard_interpreter_spec.rb +11 -11
  374. data/spec/unit/knife/bootstrap_spec.rb +6 -6
  375. data/spec/unit/knife/client_create_spec.rb +2 -2
  376. data/spec/unit/knife/configure_client_spec.rb +5 -5
  377. data/spec/unit/knife/configure_spec.rb +3 -3
  378. data/spec/unit/knife/cookbook_delete_spec.rb +2 -2
  379. data/spec/unit/knife/cookbook_download_spec.rb +2 -2
  380. data/spec/unit/knife/cookbook_list_spec.rb +2 -2
  381. data/spec/unit/knife/cookbook_metadata_spec.rb +3 -3
  382. data/spec/unit/knife/core/ui_spec.rb +1 -0
  383. data/spec/unit/knife/environment_compare_spec.rb +3 -3
  384. data/spec/unit/knife/ssh_spec.rb +2 -2
  385. data/spec/unit/knife/supermarket_download_spec.rb +8 -8
  386. data/spec/unit/knife/supermarket_list_spec.rb +3 -3
  387. data/spec/unit/knife/supermarket_search_spec.rb +1 -1
  388. data/spec/unit/knife/tag_create_spec.rb +1 -1
  389. data/spec/unit/knife/tag_delete_spec.rb +1 -1
  390. data/spec/unit/knife/user_create_spec.rb +1 -1
  391. data/spec/unit/lwrp_spec.rb +3 -3
  392. data/spec/unit/mixin/deep_merge_spec.rb +15 -0
  393. data/spec/unit/mixin/openssl_helper_spec.rb +1 -1
  394. data/spec/unit/mixin/powershell_exec_spec.rb +39 -2
  395. data/spec/unit/mixin/powershell_out_spec.rb +14 -0
  396. data/spec/unit/mixin/securable_spec.rb +2 -2
  397. data/spec/unit/mixin/which.rb +1 -1
  398. data/spec/unit/node/immutable_collections_spec.rb +2 -2
  399. data/spec/unit/provider/group/windows_spec.rb +6 -0
  400. data/spec/unit/provider/group_spec.rb +1 -1
  401. data/spec/unit/provider/mount/linux_spec.rb +107 -0
  402. data/spec/unit/provider/mount/mount_spec.rb +21 -10
  403. data/spec/unit/provider/mount/solaris_spec.rb +1 -1
  404. data/spec/unit/provider/mount_spec.rb +31 -0
  405. data/spec/unit/provider/package/chocolatey_spec.rb +2 -3
  406. data/spec/unit/provider/package/powershell_spec.rb +88 -96
  407. data/spec/unit/provider/package/rubygems_spec.rb +4 -1
  408. data/spec/unit/provider/package/zypper_spec.rb +0 -25
  409. data/spec/unit/provider/package_spec.rb +2 -2
  410. data/spec/unit/provider/powershell_script_spec.rb +11 -0
  411. data/spec/unit/provider/route_spec.rb +0 -2
  412. data/spec/unit/provider/subversion_spec.rb +0 -3
  413. data/spec/unit/provider/user_spec.rb +7 -1
  414. data/spec/unit/provider/windows_env_spec.rb +18 -34
  415. data/spec/unit/provider/windows_path_spec.rb +6 -11
  416. data/spec/unit/provider/windows_task_spec.rb +7 -6
  417. data/spec/unit/recipe_spec.rb +1 -1
  418. data/spec/unit/resource/breakpoint_spec.rb +1 -1
  419. data/spec/unit/resource/build_essential_spec.rb +0 -12
  420. data/spec/unit/resource/chef_client_config_spec.rb +137 -0
  421. data/spec/unit/resource/chef_client_cron_spec.rb +35 -14
  422. data/spec/unit/resource/chef_client_launchd_spec.rb +127 -0
  423. data/spec/unit/resource/chef_client_systemd_timer_spec.rb +36 -1
  424. data/spec/unit/resource/chef_client_trusted_certificate_spec.rb +54 -0
  425. data/spec/unit/resource/ifconfig_spec.rb +2 -10
  426. data/spec/unit/resource/launchd_spec.rb +8 -0
  427. data/spec/unit/resource/mount_spec.rb +18 -5
  428. data/spec/unit/resource/osx_profile_spec.rb +67 -1
  429. data/spec/unit/resource/powershell_package_source_spec.rb +20 -20
  430. data/spec/unit/resource/powershell_script_spec.rb +4 -74
  431. data/spec/unit/resource/rhsm_register_spec.rb +56 -18
  432. data/spec/unit/resource/service_spec.rb +2 -2
  433. data/spec/unit/resource/solaris_package_spec.rb +8 -10
  434. data/spec/unit/resource/timezone_spec.rb +63 -0
  435. data/spec/unit/resource/windows_uac_spec.rb +1 -1
  436. data/spec/unit/resource/windows_user_privilege_spec.rb +55 -0
  437. data/spec/unit/resource_inspector_spec.rb +3 -3
  438. data/spec/unit/run_lock_spec.rb +5 -1
  439. data/spec/unit/runner_spec.rb +1 -2
  440. data/spec/unit/shell/shell_ext_spec.rb +46 -3
  441. data/spec/unit/shell/shell_session_spec.rb +35 -64
  442. data/spec/unit/shell_spec.rb +18 -21
  443. data/spec/unit/train_transport_spec.rb +14 -13
  444. data/spec/unit/util/selinux_spec.rb +2 -0
  445. data/tasks/rspec.rb +1 -3
  446. metadata +49 -27
  447. data/lib/chef/dist.rb +0 -68
  448. data/lib/chef/monkey_patches/net_http.rb +0 -22
  449. data/lib/chef/provider/windows_env.rb +0 -210
  450. data/lib/chef/provider/windows_path.rb +0 -61
  451. data/lib/chef/provider/windows_task.rb +0 -632
  452. data/spec/integration/knife/config_get_profile_spec.rb +0 -114
  453. data/spec/support/mock/constant.rb +0 -52
  454. data/spec/unit/monkey_patches/uri_spec.rb +0 -34
  455. data/spec/unit/provider_resolver_spec.rb +0 -885
  456. data/spec/unit/resource/data/InstallHistory_with_CLT.plist +0 -92
  457. data/spec/unit/resource/data/InstallHistory_without_CLT.plist +0 -38
@@ -87,58 +87,58 @@ describe Chef::Resource::PowershellPackageSource do
87
87
 
88
88
  context "#register" do
89
89
  it "builds a minimal command" do
90
- expect(provider.build_ps_repository_command("Register", resource)).to eql("Register-PSRepository -Name 'MyGallery' -SourceLocation 'https://mygallery.company.co/api/v2/' -InstallationPolicy 'Untrusted'")
90
+ expect(provider.build_ps_repository_command("Register", resource)).to eql("Register-PSRepository -Name 'MyGallery' -SourceLocation 'https://mygallery.company.co/api/v2/' -InstallationPolicy 'Untrusted' | Out-Null")
91
91
  end
92
92
 
93
93
  it "builds a command with trusted set to true" do
94
94
  resource.trusted(true)
95
- expect(provider.build_ps_repository_command("Register", resource)).to eql("Register-PSRepository -Name 'MyGallery' -SourceLocation 'https://mygallery.company.co/api/v2/' -InstallationPolicy 'Trusted'")
95
+ expect(provider.build_ps_repository_command("Register", resource)).to eql("Register-PSRepository -Name 'MyGallery' -SourceLocation 'https://mygallery.company.co/api/v2/' -InstallationPolicy 'Trusted' | Out-Null")
96
96
  end
97
97
 
98
98
  it "builds a command with a publish location" do
99
99
  resource.publish_location("https://mygallery.company.co/api/v2/package")
100
- expect(provider.build_ps_repository_command("Register", resource)).to eql("Register-PSRepository -Name 'MyGallery' -SourceLocation 'https://mygallery.company.co/api/v2/' -InstallationPolicy 'Untrusted' -PublishLocation 'https://mygallery.company.co/api/v2/package'")
100
+ expect(provider.build_ps_repository_command("Register", resource)).to eql("Register-PSRepository -Name 'MyGallery' -SourceLocation 'https://mygallery.company.co/api/v2/' -InstallationPolicy 'Untrusted' -PublishLocation 'https://mygallery.company.co/api/v2/package' | Out-Null")
101
101
  end
102
102
 
103
103
  it "builds a command with a script source location" do
104
104
  resource.script_source_location("https://mygallery.company.co/api/v2/scripts")
105
- expect(provider.build_ps_repository_command("Register", resource)).to eql("Register-PSRepository -Name 'MyGallery' -SourceLocation 'https://mygallery.company.co/api/v2/' -InstallationPolicy 'Untrusted' -ScriptSourceLocation 'https://mygallery.company.co/api/v2/scripts'")
105
+ expect(provider.build_ps_repository_command("Register", resource)).to eql("Register-PSRepository -Name 'MyGallery' -SourceLocation 'https://mygallery.company.co/api/v2/' -InstallationPolicy 'Untrusted' -ScriptSourceLocation 'https://mygallery.company.co/api/v2/scripts' | Out-Null")
106
106
  end
107
107
 
108
108
  it "builds a command with a script publish location" do
109
109
  resource.script_publish_location("https://mygallery.company.co/api/v2/scripts/package")
110
- expect(provider.build_ps_repository_command("Register", resource)).to eql("Register-PSRepository -Name 'MyGallery' -SourceLocation 'https://mygallery.company.co/api/v2/' -InstallationPolicy 'Untrusted' -ScriptPublishLocation 'https://mygallery.company.co/api/v2/scripts/package'")
110
+ expect(provider.build_ps_repository_command("Register", resource)).to eql("Register-PSRepository -Name 'MyGallery' -SourceLocation 'https://mygallery.company.co/api/v2/' -InstallationPolicy 'Untrusted' -ScriptPublishLocation 'https://mygallery.company.co/api/v2/scripts/package' | Out-Null")
111
111
  end
112
112
  end
113
113
 
114
114
  context "#set" do
115
115
  it "builds a minimal command" do
116
- expect(provider.build_ps_repository_command("Set", resource)).to eql("Set-PSRepository -Name 'MyGallery' -SourceLocation 'https://mygallery.company.co/api/v2/' -InstallationPolicy 'Untrusted'")
116
+ expect(provider.build_ps_repository_command("Set", resource)).to eql("Set-PSRepository -Name 'MyGallery' -SourceLocation 'https://mygallery.company.co/api/v2/' -InstallationPolicy 'Untrusted' | Out-Null")
117
117
  end
118
118
 
119
119
  it "builds a command to change the url" do
120
120
  resource.url("https://othergallery.company.co/api/v2/")
121
- expect(provider.build_ps_repository_command("Set", resource)).to eql("Set-PSRepository -Name 'MyGallery' -SourceLocation 'https://othergallery.company.co/api/v2/' -InstallationPolicy 'Untrusted'")
121
+ expect(provider.build_ps_repository_command("Set", resource)).to eql("Set-PSRepository -Name 'MyGallery' -SourceLocation 'https://othergallery.company.co/api/v2/' -InstallationPolicy 'Untrusted' | Out-Null")
122
122
  end
123
123
 
124
124
  it "builds a command with trusted set to true" do
125
125
  resource.trusted(true)
126
- expect(provider.build_ps_repository_command("Set", resource)).to eql("Set-PSRepository -Name 'MyGallery' -SourceLocation 'https://mygallery.company.co/api/v2/' -InstallationPolicy 'Trusted'")
126
+ expect(provider.build_ps_repository_command("Set", resource)).to eql("Set-PSRepository -Name 'MyGallery' -SourceLocation 'https://mygallery.company.co/api/v2/' -InstallationPolicy 'Trusted' | Out-Null")
127
127
  end
128
128
 
129
129
  it "builds a command with a publish location" do
130
130
  resource.publish_location("https://mygallery.company.co/api/v2/package")
131
- expect(provider.build_ps_repository_command("Set", resource)).to eql("Set-PSRepository -Name 'MyGallery' -SourceLocation 'https://mygallery.company.co/api/v2/' -InstallationPolicy 'Untrusted' -PublishLocation 'https://mygallery.company.co/api/v2/package'")
131
+ expect(provider.build_ps_repository_command("Set", resource)).to eql("Set-PSRepository -Name 'MyGallery' -SourceLocation 'https://mygallery.company.co/api/v2/' -InstallationPolicy 'Untrusted' -PublishLocation 'https://mygallery.company.co/api/v2/package' | Out-Null")
132
132
  end
133
133
 
134
134
  it "builds a command with a script source location" do
135
135
  resource.script_source_location("https://mygallery.company.co/api/v2/scripts")
136
- expect(provider.build_ps_repository_command("Set", resource)).to eql("Set-PSRepository -Name 'MyGallery' -SourceLocation 'https://mygallery.company.co/api/v2/' -InstallationPolicy 'Untrusted' -ScriptSourceLocation 'https://mygallery.company.co/api/v2/scripts'")
136
+ expect(provider.build_ps_repository_command("Set", resource)).to eql("Set-PSRepository -Name 'MyGallery' -SourceLocation 'https://mygallery.company.co/api/v2/' -InstallationPolicy 'Untrusted' -ScriptSourceLocation 'https://mygallery.company.co/api/v2/scripts' | Out-Null")
137
137
  end
138
138
 
139
139
  it "builds a command with a script publish location" do
140
140
  resource.script_publish_location("https://mygallery.company.co/api/v2/scripts/package")
141
- expect(provider.build_ps_repository_command("Set", resource)).to eql("Set-PSRepository -Name 'MyGallery' -SourceLocation 'https://mygallery.company.co/api/v2/' -InstallationPolicy 'Untrusted' -ScriptPublishLocation 'https://mygallery.company.co/api/v2/scripts/package'")
141
+ expect(provider.build_ps_repository_command("Set", resource)).to eql("Set-PSRepository -Name 'MyGallery' -SourceLocation 'https://mygallery.company.co/api/v2/' -InstallationPolicy 'Untrusted' -ScriptPublishLocation 'https://mygallery.company.co/api/v2/scripts/package' | Out-Null")
142
142
  end
143
143
  end
144
144
  end
@@ -151,42 +151,42 @@ describe Chef::Resource::PowershellPackageSource do
151
151
 
152
152
  context "#register" do
153
153
  it "builds a minimal command" do
154
- expect(provider.build_package_source_command("Register", resource)).to eql("Register-PackageSource -Name 'NuGet' -Location 'http://nuget.org/api/v2/' -Trusted:$false -ProviderName 'NuGet'")
154
+ expect(provider.build_package_source_command("Register", resource)).to eql("Register-PackageSource -Name 'NuGet' -Location 'http://nuget.org/api/v2/' -Trusted:$false -ProviderName 'NuGet' | Out-Null")
155
155
  end
156
156
 
157
157
  it "builds a command with trusted set to true" do
158
158
  resource.trusted(true)
159
- expect(provider.build_package_source_command("Register", resource)).to eql("Register-PackageSource -Name 'NuGet' -Location 'http://nuget.org/api/v2/' -Trusted:$true -ProviderName 'NuGet'")
159
+ expect(provider.build_package_source_command("Register", resource)).to eql("Register-PackageSource -Name 'NuGet' -Location 'http://nuget.org/api/v2/' -Trusted:$true -ProviderName 'NuGet' | Out-Null")
160
160
  end
161
161
 
162
162
  it "builds a command with a different provider" do
163
163
  resource.source_name("choco")
164
164
  resource.url("https://chocolatey.org/api/v2/")
165
165
  resource.provider_name("chocolatey")
166
- expect(provider.build_package_source_command("Register", resource)).to eql("Register-PackageSource -Name 'choco' -Location 'https://chocolatey.org/api/v2/' -Trusted:$false -ProviderName 'chocolatey'")
166
+ expect(provider.build_package_source_command("Register", resource)).to eql("Register-PackageSource -Name 'choco' -Location 'https://chocolatey.org/api/v2/' -Trusted:$false -ProviderName 'chocolatey' | Out-Null")
167
167
  end
168
168
  end
169
169
 
170
170
  context "#set" do
171
171
  it "builds a minimal command" do
172
- expect(provider.build_package_source_command("Set", resource)).to eql("Set-PackageSource -Name 'NuGet' -Location 'http://nuget.org/api/v2/' -Trusted:$false -ProviderName 'NuGet'")
172
+ expect(provider.build_package_source_command("Set", resource)).to eql("Set-PackageSource -Name 'NuGet' -Location 'http://nuget.org/api/v2/' -Trusted:$false -ProviderName 'NuGet' | Out-Null")
173
173
  end
174
174
 
175
175
  it "builds a command to change the url" do
176
176
  resource.url("https://nuget.company.co/api/v2/")
177
- expect(provider.build_package_source_command("Set", resource)).to eql("Set-PackageSource -Name 'NuGet' -Location 'https://nuget.company.co/api/v2/' -Trusted:$false -ProviderName 'NuGet'")
177
+ expect(provider.build_package_source_command("Set", resource)).to eql("Set-PackageSource -Name 'NuGet' -Location 'https://nuget.company.co/api/v2/' -Trusted:$false -ProviderName 'NuGet' | Out-Null")
178
178
  end
179
179
 
180
180
  it "builds a command with trusted set to true" do
181
181
  resource.trusted(true)
182
- expect(provider.build_package_source_command("Set", resource)).to eql("Set-PackageSource -Name 'NuGet' -Location 'http://nuget.org/api/v2/' -Trusted:$true -ProviderName 'NuGet'")
182
+ expect(provider.build_package_source_command("Set", resource)).to eql("Set-PackageSource -Name 'NuGet' -Location 'http://nuget.org/api/v2/' -Trusted:$true -ProviderName 'NuGet' | Out-Null")
183
183
  end
184
184
 
185
185
  it "builds a command with a different provider" do
186
186
  resource.source_name("choco")
187
187
  resource.url("https://chocolatey.org/api/v2/")
188
188
  resource.provider_name("chocolatey")
189
- expect(provider.build_package_source_command("Set", resource)).to eql("Set-PackageSource -Name 'choco' -Location 'https://chocolatey.org/api/v2/' -Trusted:$false -ProviderName 'chocolatey'")
189
+ expect(provider.build_package_source_command("Set", resource)).to eql("Set-PackageSource -Name 'choco' -Location 'https://chocolatey.org/api/v2/' -Trusted:$false -ProviderName 'chocolatey' | Out-Null")
190
190
  end
191
191
  end
192
192
  end
@@ -205,13 +205,13 @@ describe Chef::Resource::PowershellPackageSource do
205
205
 
206
206
  describe "#package_source_exists?" do
207
207
  it "returns true if it exists" do
208
- allow(provider).to receive(:powershell_out!).with("(Get-PackageSource -Name 'MyGallery' -WarningAction SilentlyContinue).Name").and_return(double("powershell_out!", stdout: "MyGallery\r\n"))
208
+ allow(provider).to receive(:powershell_exec!).with("(Get-PackageSource -Name 'MyGallery' -ErrorAction SilentlyContinue).Name").and_return(double("powershell_exec!", result: "MyGallery\r\n"))
209
209
  resource.source_name("MyGallery")
210
210
  expect(provider.package_source_exists?).to eql(true)
211
211
  end
212
212
 
213
213
  it "returns false if it doesn't exist" do
214
- allow(provider).to receive(:powershell_out!).with("(Get-PackageSource -Name 'MyGallery' -WarningAction SilentlyContinue).Name").and_return(double("powershell_out!", stdout: ""))
214
+ allow(provider).to receive(:powershell_exec!).with("(Get-PackageSource -Name 'MyGallery' -ErrorAction SilentlyContinue).Name").and_return(double("powershell_exec!", result: ""))
215
215
  resource.source_name("MyGallery")
216
216
  expect(provider.package_source_exists?).to eql(false)
217
217
  end
@@ -47,81 +47,11 @@ describe Chef::Resource::PowershellScript do
47
47
  expect(resource.convert_boolean_return).to eq(false)
48
48
  end
49
49
 
50
- context "when using guards" do
51
- before(:each) do
52
- allow(resource).to receive(:run_action)
53
- allow(resource).to receive(:updated).and_return(true)
54
- end
50
+ it "inherits exactly the :cwd, :domain, :environment, :group, :password, :path, :user, :umask, :architecture, :elevated, :interpreter properties from a parent resource class" do
51
+ inherited_difference = Chef::Resource::PowershellScript.guard_inherited_attributes -
52
+ %i{cwd domain environment group password path user umask architecture elevated interpreter}
55
53
 
56
- it "inherits exactly the :cwd, :environment, :group, :path, :user, :umask, :architecture, :elevated properties from a parent resource class" do
57
- inherited_difference = Chef::Resource::PowershellScript.guard_inherited_attributes -
58
- %i{cwd environment group path user umask architecture elevated}
59
-
60
- expect(inherited_difference).to eq([])
61
- end
62
-
63
- it "allows guard interpreter to be set to Chef::Resource::Script" do
64
- resource.guard_interpreter(:script)
65
- allow_any_instance_of(Chef::GuardInterpreter::ResourceGuardInterpreter).to receive(:evaluate_action).and_return(false)
66
- resource.only_if("echo hi")
67
- end
68
-
69
- it "allows guard interpreter to be set to Chef::Resource::Bash derived from Chef::Resource::Script" do
70
- resource.guard_interpreter(:bash)
71
- allow_any_instance_of(Chef::GuardInterpreter::ResourceGuardInterpreter).to receive(:evaluate_action).and_return(false)
72
- resource.only_if("echo hi")
73
- end
74
-
75
- it "allows guard interpreter to be set to Chef::Resource::PowershellScript derived indirectly from Chef::Resource::Script" do
76
- resource.guard_interpreter(:powershell_script)
77
- allow_any_instance_of(Chef::GuardInterpreter::ResourceGuardInterpreter).to receive(:evaluate_action).and_return(false)
78
- resource.only_if("echo hi")
79
- end
80
-
81
- it "enables convert_boolean_return by default for guards in the context of powershell_script when no guard params are specified" do
82
- allow_any_instance_of(Chef::GuardInterpreter::ResourceGuardInterpreter).to receive(:evaluate_action).and_return(true)
83
- allow_any_instance_of(Chef::GuardInterpreter::ResourceGuardInterpreter).to receive(:block_from_attributes).with(
84
- { convert_boolean_return: true, code: "$true" }
85
- ).and_return(Proc.new {})
86
- resource.only_if("$true")
87
- end
88
-
89
- it "enables convert_boolean_return by default for guards in non-Chef::Resource::Script derived resources when no guard params are specified" do
90
- node = Chef::Node.new
91
- run_context = Chef::RunContext.new(node, nil, nil)
92
- file_resource = Chef::Resource::File.new("idontexist", run_context)
93
- file_resource.guard_interpreter :powershell_script
94
-
95
- allow_any_instance_of(Chef::GuardInterpreter::ResourceGuardInterpreter).to receive(:block_from_attributes).with(
96
- { convert_boolean_return: true, code: "$true" }
97
- ).and_return(Proc.new {})
98
- resource.only_if("$true")
99
- end
100
-
101
- it "enables convert_boolean_return by default for guards in the context of powershell_script when guard params are specified" do
102
- guard_parameters = { cwd: "/etc/chef", architecture: :x86_64 }
103
- allow_any_instance_of(Chef::GuardInterpreter::ResourceGuardInterpreter).to receive(:block_from_attributes).with(
104
- { convert_boolean_return: true, code: "$true" }.merge(guard_parameters)
105
- ).and_return(Proc.new {})
106
- resource.only_if("$true", guard_parameters)
107
- end
108
-
109
- it "passes convert_boolean_return as true if it was specified as true in a guard parameter" do
110
- guard_parameters = { cwd: "/etc/chef", convert_boolean_return: true, architecture: :x86_64 }
111
- allow_any_instance_of(Chef::GuardInterpreter::ResourceGuardInterpreter).to receive(:block_from_attributes).with(
112
- { convert_boolean_return: true, code: "$true" }.merge(guard_parameters)
113
- ).and_return(Proc.new {})
114
- resource.only_if("$true", guard_parameters)
115
- end
116
-
117
- it "passes convert_boolean_return as false if it was specified as true in a guard parameter" do
118
- other_guard_parameters = { cwd: "/etc/chef", architecture: :x86_64 }
119
- parameters_with_boolean_disabled = other_guard_parameters.merge({ convert_boolean_return: false, code: "$true" })
120
- allow_any_instance_of(Chef::GuardInterpreter::ResourceGuardInterpreter).to receive(:block_from_attributes).with(
121
- parameters_with_boolean_disabled
122
- ).and_return(Proc.new {})
123
- resource.only_if("$true", parameters_with_boolean_disabled)
124
- end
54
+ expect(inherited_difference).to eq([])
125
55
  end
126
56
 
127
57
  context "as a script running in Windows-based scripting language" do
@@ -41,23 +41,34 @@ describe Chef::Resource::RhsmRegister do
41
41
  end
42
42
 
43
43
  describe "#katello_cert_rpm_installed?" do
44
- let(:cmd) { double("cmd") }
45
-
46
- before do
47
- allow(Mixlib::ShellOut).to receive(:new).and_return(cmd)
48
- allow(cmd).to receive(:run_command)
49
- end
50
-
51
44
  context "when the output contains katello-ca-consumer" do
45
+ let(:with_katello) { double("shell_out", stdout: <<~RPM) }
46
+ libevent-2.0.21-4.el7.x86_64
47
+ gettext-libs-0.19.8.1-3.el7.x86_64
48
+ yum-metadata-parser-1.1.4-10.el7.x86_64
49
+ pyliblzma-0.5.3-11.el7.x86_64
50
+ python-IPy-0.75-6.el7.noarch
51
+ grubby-8.28-26.el7.x86_64
52
+ fipscheck-lib-1.4.1-6.el7.x86_64
53
+ centos-logos-70.0.6-3.el7.centos.noarch
54
+ nss-tools-3.44.0-7.el7_7.x86_64
55
+ katello-ca-consumer-somehostname-1.0-1.el7.x86_64
56
+ rpm-4.11.3-43.el7.x86_64
57
+ gpgme-1.3.2-5.el7.x86_64
58
+ libnfsidmap-0.25-19.el7.x86_64
59
+ RPM
60
+
52
61
  it "returns true" do
53
- allow(cmd).to receive(:stdout).and_return("katello-ca-consumer-somehostname-1.0-1")
62
+ allow(provider).to receive(:shell_out).and_return(with_katello)
54
63
  expect(provider.katello_cert_rpm_installed?).to eq(true)
55
64
  end
56
65
  end
57
66
 
58
67
  context "when the output does not contain katello-ca-consumer" do
68
+ let(:without_katello) { double("shell_out", stdout: "") }
69
+
59
70
  it "returns false" do
60
- allow(cmd).to receive(:stdout).and_return("katello-agent-but-not-the-ca")
71
+ allow(provider).to receive(:shell_out).and_return(without_katello)
61
72
  expect(provider.katello_cert_rpm_installed?).to eq(false)
62
73
  end
63
74
  end
@@ -89,6 +100,22 @@ describe Chef::Resource::RhsmRegister do
89
100
  end
90
101
  end
91
102
 
103
+ context "when a system_name is provided" do
104
+ it "returns a command containing the system name" do
105
+ allow(resource).to receive(:organization).and_return("myorg")
106
+ allow(resource).to receive(:system_name).and_return("myname")
107
+ expect(provider.register_command).to match("--name=myname")
108
+ end
109
+ end
110
+
111
+ context "when a system_name is not provided" do
112
+ it "returns a command containing the system name" do
113
+ allow(resource).to receive(:organization).and_return("myorg")
114
+ allow(resource).to receive(:system_name).and_return(nil)
115
+ expect(provider.register_command).not_to match("--name")
116
+ end
117
+ end
118
+
92
119
  context "when auto_attach is true" do
93
120
  it "does not return a command with --auto-attach since it is not supported with activation keys" do
94
121
  allow(resource).to receive(:organization).and_return("myorg")
@@ -124,6 +151,20 @@ describe Chef::Resource::RhsmRegister do
124
151
  end
125
152
  end
126
153
 
154
+ context "when a system_name is provided" do
155
+ it "returns a command containing the system name" do
156
+ allow(resource).to receive(:system_name).and_return("myname")
157
+ expect(provider.register_command).to match("--name=myname")
158
+ end
159
+ end
160
+
161
+ context "when a system_name is not provided" do
162
+ it "returns a command containing the system name" do
163
+ allow(resource).to receive(:system_name).and_return(nil)
164
+ expect(provider.register_command).not_to match("--name")
165
+ end
166
+ end
167
+
127
168
  context "when auto_attach is nil" do
128
169
  it "returns a command that does not contain --auto-attach" do
129
170
  allow(resource).to receive(:auto_attach).and_return(nil)
@@ -204,23 +245,20 @@ describe Chef::Resource::RhsmRegister do
204
245
  end
205
246
 
206
247
  describe "#registered_with_rhsm?" do
207
- let(:cmd) { double("cmd") }
208
-
209
- before do
210
- allow(Mixlib::ShellOut).to receive(:new).and_return(cmd)
211
- allow(cmd).to receive(:run_command)
212
- end
213
-
214
248
  context "when the status is Unknown" do
249
+ let(:unknown_status) { double("shell_out", stdout: "Overall Status: Unknown") }
250
+
215
251
  it "returns false" do
216
- allow(cmd).to receive(:stdout).and_return("Overall Status: Unknown")
252
+ allow(provider).to receive(:shell_out).and_return(unknown_status)
217
253
  expect(provider.registered_with_rhsm?).to eq(false)
218
254
  end
219
255
  end
220
256
 
221
257
  context "when the status is anything else" do
258
+ let(:known_status) { double("shell_out", stdout: "Overall Status: Insufficient") }
259
+
222
260
  it "returns true" do
223
- allow(cmd).to receive(:stdout).and_return("Overall Status: Insufficient")
261
+ allow(provider).to receive(:shell_out).and_return(known_status)
224
262
  expect(provider.registered_with_rhsm?).to eq(true)
225
263
  end
226
264
  end
@@ -62,7 +62,7 @@ describe Chef::Resource::Service do
62
62
 
63
63
  it "does not accept a regexp for the service pattern" do
64
64
  expect do
65
- resource.pattern /.*/
65
+ resource.pattern(/.*/)
66
66
  end.to raise_error(ArgumentError)
67
67
  end
68
68
 
@@ -89,7 +89,7 @@ describe Chef::Resource::Service do
89
89
 
90
90
  it "does not accept a regexp for the init_command property" do
91
91
  expect do
92
- resource.init_command /.*/
92
+ resource.init_command(/.*/)
93
93
  end.to raise_error(ArgumentError)
94
94
  end
95
95
 
@@ -21,16 +21,14 @@ require "support/shared/unit/resource/static_provider_resolution"
21
21
 
22
22
  describe Chef::Resource::SolarisPackage, "initialize" do
23
23
 
24
- %w{solaris2 nexentacore}.each do |platform_family|
25
- static_provider_resolution(
26
- resource: Chef::Resource::SolarisPackage,
27
- provider: Chef::Provider::Package::Solaris,
28
- name: :solaris_package,
29
- action: :install,
30
- os: "solaris2",
31
- platform_family: platform_family
32
- )
33
- end
24
+ static_provider_resolution(
25
+ resource: Chef::Resource::SolarisPackage,
26
+ provider: Chef::Provider::Package::Solaris,
27
+ name: :solaris_package,
28
+ action: :install,
29
+ os: "solaris2",
30
+ platform_family: "solaris2"
31
+ )
34
32
 
35
33
  let(:resource) { Chef::Resource::SolarisPackage.new("foo") }
36
34
 
@@ -20,6 +20,31 @@ require "spec_helper"
20
20
  describe Chef::Resource::Timezone do
21
21
  let(:resource) { Chef::Resource::Timezone.new("fakey_fakerton") }
22
22
 
23
+ let(:shellout_tzutil) do
24
+ double("shell_out", stdout: "UTC\n", exitstatus: 0, error?: false)
25
+ end
26
+
27
+ # note: This weird indention is correct
28
+ let(:shellout_timedatectl) do
29
+ double("shell_out", exitstatus: 0, error?: false, stdout: <<-OUTPUT)
30
+ Local time: Tue 2020-08-18 20:55:05 UTC
31
+ Universal time: Tue 2020-08-18 20:55:05 UTC
32
+ RTC time: Tue 2020-08-18 20:55:05
33
+ Time zone: Etc/UTC (UTC, +0000)
34
+ System clock synchronized: yes
35
+ systemd-timesyncd.service active: yes
36
+ RTC in local TZ: no
37
+ OUTPUT
38
+ end
39
+
40
+ let(:shellout_systemsetup_fail) do
41
+ double("shell_out!", stdout: "You need administrator access to run this tool... exiting!", exitstatus: 0, error?: false) # yes it's a non-error exit
42
+ end
43
+
44
+ let(:shellout_systemsetup) do
45
+ double("shell_out!", stdout: "Time Zone: UTC", exitstatus: 0, error?: false)
46
+ end
47
+
23
48
  it "sets resource name as :timezone" do
24
49
  expect(resource.resource_name).to eql(:timezone)
25
50
  end
@@ -36,4 +61,42 @@ describe Chef::Resource::Timezone do
36
61
  expect { resource.action :set }.not_to raise_error
37
62
  expect { resource.action :unset }.to raise_error(Chef::Exceptions::ValidationFailed)
38
63
  end
64
+
65
+ describe "#current_macos_tz" do
66
+ context "with admin privs" do
67
+ it "returns the TZ" do
68
+ expect(resource).to receive(:shell_out!).and_return(shellout_systemsetup)
69
+ expect(resource.current_macos_tz).to eql("UTC")
70
+ end
71
+ end
72
+
73
+ context "without admin privs" do
74
+ it "returns the TZ" do
75
+ expect(resource).to receive(:shell_out!).and_return(shellout_systemsetup_fail)
76
+ expect { resource.current_macos_tz }.to raise_error(RuntimeError, "The timezone resource requires administrative privileges to run on macOS hosts!")
77
+ end
78
+ end
79
+ end
80
+
81
+ describe "#current_systemd_tz" do
82
+ it "returns the TZ" do
83
+ expect(resource).to receive(:shell_out).and_return(shellout_timedatectl)
84
+ expect(resource.current_systemd_tz).to eql("Etc/UTC")
85
+ end
86
+ end
87
+
88
+ describe "#current_windows_tz" do
89
+ it "returns the TZ" do
90
+ expect(resource).to receive(:shell_out).and_return(shellout_tzutil)
91
+ expect(resource.current_windows_tz).to eql("UTC")
92
+ end
93
+ end
94
+
95
+ describe "#current_rhel_tz" do
96
+ it "returns the TZ" do
97
+ allow(File).to receive(:exist?).with("/etc/sysconfig/clock").and_return true
98
+ expect(File).to receive(:read).with("/etc/sysconfig/clock").and_return 'ZONE="UTC"'
99
+ expect(resource.current_rhel_tz).to eql("UTC")
100
+ end
101
+ end
39
102
  end