chef 16.4.41 → 16.8.9

Sign up to get free protection for your applications and to get access to all the features.
Files changed (494) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +6 -14
  3. data/README.md +1 -1
  4. data/Rakefile +22 -15
  5. data/bin/knife +1 -1
  6. data/chef-universal-mingw32.gemspec +1 -1
  7. data/chef.gemspec +4 -2
  8. data/lib/chef/application.rb +19 -17
  9. data/lib/chef/application/apply.rb +12 -7
  10. data/lib/chef/application/base.rb +27 -24
  11. data/lib/chef/application/client.rb +16 -5
  12. data/lib/chef/application/exit_code.rb +13 -4
  13. data/lib/chef/application/knife.rb +22 -11
  14. data/lib/chef/application/solo.rb +2 -1
  15. data/lib/chef/application/windows_service.rb +14 -14
  16. data/lib/chef/application/windows_service_manager.rb +6 -6
  17. data/lib/chef/chef_fs/chef_fs_data_store.rb +1 -1
  18. data/lib/chef/chef_fs/data_handler/cookbook_data_handler.rb +1 -1
  19. data/lib/chef/chef_fs/file_pattern.rb +1 -1
  20. data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_entry.rb +1 -1
  21. data/lib/chef/chef_fs/knife.rb +2 -2
  22. data/lib/chef/chef_fs/parallelizer.rb +0 -1
  23. data/lib/chef/client.rb +16 -43
  24. data/lib/chef/compliance/default_attributes.rb +89 -0
  25. data/lib/chef/compliance/fetcher/automate.rb +69 -0
  26. data/lib/chef/compliance/fetcher/chef_server.rb +134 -0
  27. data/lib/chef/compliance/reporter/automate.rb +202 -0
  28. data/lib/chef/compliance/reporter/chef_server_automate.rb +92 -0
  29. data/lib/chef/compliance/reporter/compliance_enforcer.rb +20 -0
  30. data/lib/chef/compliance/reporter/json_file.rb +19 -0
  31. data/lib/chef/compliance/runner.rb +250 -0
  32. data/lib/chef/cookbook/cookbook_version_loader.rb +1 -1
  33. data/lib/chef/cookbook/gem_installer.rb +1 -1
  34. data/lib/chef/cookbook/synchronizer.rb +2 -2
  35. data/lib/chef/cookbook_manifest.rb +2 -1
  36. data/lib/chef/cookbook_site_streaming_uploader.rb +13 -11
  37. data/lib/chef/cookbook_uploader.rb +1 -1
  38. data/lib/chef/cookbook_version.rb +2 -5
  39. data/lib/chef/data_collector.rb +7 -6
  40. data/lib/chef/data_collector/config_validation.rb +22 -13
  41. data/lib/chef/data_collector/run_end_message.rb +2 -2
  42. data/lib/chef/data_collector/run_start_message.rb +1 -1
  43. data/lib/chef/deprecated.rb +1 -1
  44. data/lib/chef/deprecation/warnings.rb +2 -2
  45. data/lib/chef/digester.rb +2 -2
  46. data/lib/chef/dsl/chef_vault.rb +1 -1
  47. data/lib/chef/dsl/data_query.rb +2 -2
  48. data/lib/chef/dsl/platform_introspection.rb +1 -1
  49. data/lib/chef/encrypted_data_bag_item.rb +3 -4
  50. data/lib/chef/encrypted_data_bag_item/assertions.rb +1 -1
  51. data/lib/chef/encrypted_data_bag_item/decryptor.rb +3 -3
  52. data/lib/chef/encrypted_data_bag_item/encryptor.rb +3 -3
  53. data/lib/chef/environment.rb +3 -3
  54. data/lib/chef/event_loggers/windows_eventlog.rb +2 -2
  55. data/lib/chef/exceptions.rb +9 -5
  56. data/lib/chef/file_access_control/windows.rb +6 -5
  57. data/lib/chef/file_content_management/tempfile.rb +1 -1
  58. data/lib/chef/formatters/doc.rb +7 -6
  59. data/lib/chef/formatters/error_inspectors/api_error_formatting.rb +6 -5
  60. data/lib/chef/formatters/error_inspectors/compile_error_inspector.rb +2 -2
  61. data/lib/chef/formatters/error_inspectors/node_load_error_inspector.rb +3 -3
  62. data/lib/chef/formatters/error_inspectors/registration_error_inspector.rb +9 -9
  63. data/lib/chef/formatters/error_inspectors/resource_failure_inspector.rb +6 -6
  64. data/lib/chef/formatters/error_inspectors/run_list_expansion_error_inspector.rb +3 -3
  65. data/lib/chef/formatters/indentable_output_stream.rb +2 -2
  66. data/lib/chef/formatters/minimal.rb +5 -4
  67. data/lib/chef/guard_interpreter/resource_guard_interpreter.rb +28 -39
  68. data/lib/chef/http.rb +6 -14
  69. data/lib/chef/http/auth_credentials.rb +5 -1
  70. data/lib/chef/http/authenticator.rb +1 -1
  71. data/lib/chef/http/basic_client.rb +4 -2
  72. data/lib/chef/http/decompressor.rb +1 -1
  73. data/lib/chef/http/http_request.rb +7 -5
  74. data/lib/chef/http/socketless_chef_zero_client.rb +5 -2
  75. data/lib/chef/http/ssl_policies.rb +7 -1
  76. data/lib/chef/json_compat.rb +3 -8
  77. data/lib/chef/key.rb +1 -1
  78. data/lib/chef/knife.rb +4 -4
  79. data/lib/chef/knife/bootstrap.rb +18 -15
  80. data/lib/chef/knife/bootstrap/chef_vault_handler.rb +1 -1
  81. data/lib/chef/knife/bootstrap/templates/chef-full.erb +3 -3
  82. data/lib/chef/knife/bootstrap/templates/windows-chef-client-msi.erb +9 -9
  83. data/lib/chef/knife/bootstrap/train_connector.rb +1 -1
  84. data/lib/chef/knife/client_create.rb +3 -3
  85. data/lib/chef/knife/config_get.rb +8 -97
  86. data/lib/chef/knife/config_get_profile.rb +9 -9
  87. data/lib/chef/knife/config_list.rb +139 -0
  88. data/lib/chef/knife/config_list_profiles.rb +8 -98
  89. data/lib/chef/knife/config_show.rb +127 -0
  90. data/lib/chef/knife/config_use.rb +61 -0
  91. data/lib/chef/knife/config_use_profile.rb +9 -24
  92. data/lib/chef/knife/configure.rb +2 -2
  93. data/lib/chef/knife/core/bootstrap_context.rb +2 -2
  94. data/lib/chef/knife/core/cookbook_scm_repo.rb +1 -1
  95. data/lib/chef/knife/core/gem_glob_loader.rb +1 -1
  96. data/lib/chef/knife/core/object_loader.rb +1 -1
  97. data/lib/chef/knife/core/ui.rb +5 -2
  98. data/lib/chef/knife/core/windows_bootstrap_context.rb +18 -15
  99. data/lib/chef/knife/exec.rb +2 -2
  100. data/lib/chef/knife/node_policy_set.rb +2 -2
  101. data/lib/chef/knife/node_run_list_add.rb +1 -1
  102. data/lib/chef/knife/node_run_list_remove.rb +1 -1
  103. data/lib/chef/knife/node_run_list_set.rb +1 -1
  104. data/lib/chef/knife/node_show.rb +2 -2
  105. data/lib/chef/knife/role_env_run_list_add.rb +1 -1
  106. data/lib/chef/knife/role_env_run_list_set.rb +1 -1
  107. data/lib/chef/knife/role_run_list_add.rb +1 -1
  108. data/lib/chef/knife/role_run_list_set.rb +1 -1
  109. data/lib/chef/knife/search.rb +0 -1
  110. data/lib/chef/knife/serve.rb +3 -3
  111. data/lib/chef/knife/ssh.rb +19 -4
  112. data/lib/chef/knife/ssl_check.rb +3 -3
  113. data/lib/chef/knife/status.rb +2 -2
  114. data/lib/chef/knife/tag_create.rb +1 -1
  115. data/lib/chef/knife/tag_delete.rb +1 -1
  116. data/lib/chef/knife/user_create.rb +2 -2
  117. data/lib/chef/knife/yaml_convert.rb +1 -1
  118. data/lib/chef/local_mode.rb +2 -2
  119. data/lib/chef/log/syslog.rb +2 -2
  120. data/lib/chef/log/winevt.rb +2 -2
  121. data/lib/chef/mixin/convert_to_class_name.rb +0 -56
  122. data/lib/chef/mixin/deep_merge.rb +0 -12
  123. data/lib/chef/mixin/openssl_helper.rb +2 -5
  124. data/lib/chef/mixin/powershell_exec.rb +24 -10
  125. data/lib/chef/mixin/powershell_out.rb +12 -5
  126. data/lib/chef/mixin/properties.rb +2 -0
  127. data/lib/chef/mixin/template.rb +3 -3
  128. data/lib/chef/mixin/unformatter.rb +1 -1
  129. data/lib/chef/mixin/uris.rb +4 -2
  130. data/lib/chef/mixin/versioned_api.rb +1 -2
  131. data/lib/chef/node/attribute_collections.rb +2 -6
  132. data/lib/chef/node/mixin/immutablize_hash.rb +2 -0
  133. data/lib/chef/node_map.rb +4 -4
  134. data/lib/chef/platform/query_helpers.rb +4 -4
  135. data/lib/chef/policy_builder/dynamic.rb +2 -0
  136. data/lib/chef/policy_builder/policyfile.rb +2 -2
  137. data/lib/chef/powershell.rb +10 -4
  138. data/lib/chef/property.rb +1 -1
  139. data/lib/chef/provider.rb +1 -5
  140. data/lib/chef/provider/cron.rb +2 -13
  141. data/lib/chef/provider/dsc_resource.rb +12 -24
  142. data/lib/chef/provider/dsc_script.rb +16 -20
  143. data/lib/chef/provider/file.rb +2 -2
  144. data/lib/chef/provider/git.rb +5 -5
  145. data/lib/chef/provider/group.rb +14 -6
  146. data/lib/chef/provider/group/windows.rb +12 -1
  147. data/lib/chef/provider/ifconfig.rb +9 -9
  148. data/lib/chef/provider/ifconfig/debian.rb +38 -22
  149. data/lib/chef/provider/ifconfig/redhat.rb +54 -18
  150. data/lib/chef/provider/launchd.rb +3 -13
  151. data/lib/chef/provider/link.rb +0 -9
  152. data/lib/chef/provider/mount.rb +18 -1
  153. data/lib/chef/provider/mount/linux.rb +67 -0
  154. data/lib/chef/provider/mount/mount.rb +41 -43
  155. data/lib/chef/provider/package.rb +3 -0
  156. data/lib/chef/provider/package/apt.rb +1 -1
  157. data/lib/chef/provider/package/chocolatey.rb +6 -6
  158. data/lib/chef/provider/package/dpkg.rb +3 -12
  159. data/lib/chef/provider/package/freebsd/base.rb +3 -2
  160. data/lib/chef/provider/package/freebsd/pkgng.rb +1 -1
  161. data/lib/chef/provider/package/homebrew.rb +1 -1
  162. data/lib/chef/provider/package/ips.rb +1 -1
  163. data/lib/chef/provider/package/powershell.rb +2 -3
  164. data/lib/chef/provider/package/rubygems.rb +22 -19
  165. data/lib/chef/provider/package/snap.rb +1 -4
  166. data/lib/chef/provider/package/solaris.rb +0 -2
  167. data/lib/chef/provider/package/windows.rb +2 -2
  168. data/lib/chef/provider/package/windows/registry_uninstall_entry.rb +3 -1
  169. data/lib/chef/provider/package/yum/rpm_utils.rb +1 -1
  170. data/lib/chef/provider/package/zypper.rb +99 -72
  171. data/lib/chef/provider/powershell_script.rb +12 -1
  172. data/lib/chef/provider/registry_key.rb +4 -3
  173. data/lib/chef/provider/remote_file/content.rb +3 -0
  174. data/lib/chef/provider/remote_file/ftp.rb +6 -4
  175. data/lib/chef/provider/remote_file/sftp.rb +6 -4
  176. data/lib/chef/provider/route.rb +4 -8
  177. data/lib/chef/provider/service/debian.rb +2 -1
  178. data/lib/chef/provider/service/macosx.rb +2 -2
  179. data/lib/chef/provider/service/redhat.rb +1 -1
  180. data/lib/chef/provider/template_finder.rb +2 -10
  181. data/lib/chef/provider/user.rb +17 -9
  182. data/lib/chef/provider/user/aix.rb +1 -1
  183. data/lib/chef/provider/user/dscl.rb +5 -5
  184. data/lib/chef/provider/user/mac.rb +15 -7
  185. data/lib/chef/provider/user/solaris.rb +1 -1
  186. data/lib/chef/provider/user/windows.rb +10 -3
  187. data/lib/chef/provider/zypper_repository.rb +2 -2
  188. data/lib/chef/provider_resolver.rb +1 -1
  189. data/lib/chef/providers.rb +1 -3
  190. data/lib/chef/pwsh.rb +71 -0
  191. data/lib/chef/recipe.rb +2 -2
  192. data/lib/chef/resource.rb +2 -2
  193. data/lib/chef/resource/apt_repository.rb +6 -5
  194. data/lib/chef/resource/bash.rb +119 -1
  195. data/lib/chef/resource/batch.rb +1 -1
  196. data/lib/chef/resource/bff_package.rb +22 -0
  197. data/lib/chef/resource/breakpoint.rb +59 -2
  198. data/lib/chef/resource/build_essential.rb +5 -8
  199. data/lib/chef/resource/cab_package.rb +29 -0
  200. data/lib/chef/resource/chef_client_config.rb +313 -0
  201. data/lib/chef/resource/chef_client_cron.rb +35 -28
  202. data/lib/chef/resource/chef_client_launchd.rb +194 -0
  203. data/lib/chef/resource/chef_client_scheduled_task.rb +24 -21
  204. data/lib/chef/resource/chef_client_systemd_timer.rb +27 -20
  205. data/lib/chef/resource/chef_client_trusted_certificate.rb +101 -0
  206. data/lib/chef/resource/chef_gem.rb +10 -10
  207. data/lib/chef/resource/chef_handler.rb +149 -4
  208. data/lib/chef/resource/chef_sleep.rb +3 -3
  209. data/lib/chef/resource/chef_vault_secret.rb +1 -1
  210. data/lib/chef/resource/cookbook_file.rb +2 -2
  211. data/lib/chef/resource/cron/_cron_shared.rb +1 -0
  212. data/lib/chef/resource/cron/cron_d.rb +2 -3
  213. data/lib/chef/resource/csh.rb +2 -2
  214. data/lib/chef/resource/dnf_package.rb +2 -2
  215. data/lib/chef/resource/dsc_resource.rb +0 -1
  216. data/lib/chef/resource/dsc_script.rb +9 -2
  217. data/lib/chef/resource/execute.rb +10 -8
  218. data/lib/chef/resource/file.rb +4 -4
  219. data/lib/chef/resource/gem_package.rb +5 -5
  220. data/lib/chef/resource/homebrew_package.rb +3 -3
  221. data/lib/chef/resource/homebrew_update.rb +9 -6
  222. data/lib/chef/resource/hostname.rb +7 -7
  223. data/lib/chef/resource/ifconfig.rb +52 -5
  224. data/lib/chef/resource/kernel_module.rb +1 -1
  225. data/lib/chef/resource/ksh.rb +3 -3
  226. data/lib/chef/resource/launchd.rb +17 -16
  227. data/lib/chef/resource/locale.rb +2 -2
  228. data/lib/chef/resource/lwrp_base.rb +3 -5
  229. data/lib/chef/resource/macos_userdefaults.rb +3 -3
  230. data/lib/chef/resource/mount.rb +8 -2
  231. data/lib/chef/resource/notify_group.rb +0 -1
  232. data/lib/chef/resource/ohai.rb +46 -3
  233. data/lib/chef/resource/ohai_hint.rb +33 -0
  234. data/lib/chef/resource/openssl_dhparam.rb +27 -5
  235. data/lib/chef/resource/openssl_ec_private_key.rb +6 -3
  236. data/lib/chef/resource/openssl_ec_public_key.rb +2 -2
  237. data/lib/chef/resource/openssl_rsa_private_key.rb +6 -3
  238. data/lib/chef/resource/openssl_x509_certificate.rb +14 -14
  239. data/lib/chef/resource/openssl_x509_crl.rb +19 -10
  240. data/lib/chef/resource/openssl_x509_request.rb +14 -16
  241. data/lib/chef/resource/osx_profile.rb +77 -13
  242. data/lib/chef/resource/perl.rb +2 -2
  243. data/lib/chef/resource/plist.rb +3 -7
  244. data/lib/chef/resource/powershell_package_source.rb +24 -23
  245. data/lib/chef/resource/powershell_script.rb +14 -11
  246. data/lib/chef/resource/python.rb +2 -2
  247. data/lib/chef/resource/reboot.rb +2 -2
  248. data/lib/chef/resource/registry_key.rb +93 -2
  249. data/lib/chef/resource/remote_file.rb +3 -3
  250. data/lib/chef/resource/rhsm_register.rb +22 -10
  251. data/lib/chef/resource/route.rb +1 -1
  252. data/lib/chef/resource/ruby.rb +2 -2
  253. data/lib/chef/resource/ruby_block.rb +2 -2
  254. data/lib/chef/resource/scm/_scm.rb +2 -1
  255. data/lib/chef/resource/scm/git.rb +82 -1
  256. data/lib/chef/resource/scm/subversion.rb +14 -2
  257. data/lib/chef/resource/script.rb +2 -2
  258. data/lib/chef/resource/service.rb +3 -3
  259. data/lib/chef/resource/solaris_package.rb +0 -2
  260. data/lib/chef/resource/ssh_known_hosts_entry.rb +2 -2
  261. data/lib/chef/resource/sudo.rb +1 -1
  262. data/lib/chef/resource/support/client.erb +64 -0
  263. data/lib/chef/resource/support/cron.d.erb +1 -1
  264. data/lib/chef/resource/support/cron_access.erb +1 -1
  265. data/lib/chef/resource/support/sudoer.erb +1 -1
  266. data/lib/chef/resource/support/ulimit.erb +1 -1
  267. data/lib/chef/resource/sysctl.rb +1 -5
  268. data/lib/chef/resource/systemd_unit.rb +44 -3
  269. data/lib/chef/resource/template.rb +4 -4
  270. data/lib/chef/resource/windows_ad_join.rb +19 -12
  271. data/lib/chef/resource/windows_audit_policy.rb +26 -24
  272. data/lib/chef/resource/windows_certificate.rb +19 -11
  273. data/lib/chef/resource/windows_dfs_server.rb +7 -4
  274. data/lib/chef/resource/windows_env.rb +173 -0
  275. data/lib/chef/resource/windows_feature.rb +2 -0
  276. data/lib/chef/resource/windows_firewall_profile.rb +28 -31
  277. data/lib/chef/resource/windows_firewall_rule.rb +9 -11
  278. data/lib/chef/resource/windows_font.rb +1 -1
  279. data/lib/chef/resource/windows_package.rb +29 -5
  280. data/lib/chef/resource/windows_path.rb +38 -0
  281. data/lib/chef/resource/windows_printer.rb +5 -3
  282. data/lib/chef/resource/windows_printer_port.rb +6 -4
  283. data/lib/chef/resource/windows_security_policy.rb +5 -5
  284. data/lib/chef/resource/windows_service.rb +108 -0
  285. data/lib/chef/resource/windows_share.rb +18 -18
  286. data/lib/chef/resource/windows_task.rb +629 -28
  287. data/lib/chef/resource/windows_user_privilege.rb +53 -54
  288. data/lib/chef/resource/windows_workgroup.rb +9 -7
  289. data/lib/chef/resource/yum_package.rb +2 -2
  290. data/lib/chef/resource/yum_repository.rb +1 -1
  291. data/lib/chef/resource_collection/resource_set.rb +2 -6
  292. data/lib/chef/resource_inspector.rb +77 -75
  293. data/lib/chef/resource_reporter.rb +0 -2
  294. data/lib/chef/resources.rb +4 -1
  295. data/lib/chef/run_context.rb +2 -2
  296. data/lib/chef/run_context/cookbook_compiler.rb +1 -1
  297. data/lib/chef/run_lock.rb +3 -3
  298. data/lib/chef/search/query.rb +6 -5
  299. data/lib/chef/server_api.rb +0 -4
  300. data/lib/chef/shell.rb +31 -26
  301. data/lib/chef/shell/ext.rb +12 -12
  302. data/lib/chef/shell/shell_session.rb +2 -2
  303. data/lib/chef/train_transport.rb +5 -104
  304. data/lib/chef/util/backup.rb +1 -1
  305. data/lib/chef/util/diff.rb +3 -3
  306. data/lib/chef/util/dsc/configuration_generator.rb +52 -11
  307. data/lib/chef/util/dsc/lcm_output_parser.rb +4 -7
  308. data/lib/chef/util/dsc/local_configuration_manager.rb +18 -15
  309. data/lib/chef/util/dsc/resource_store.rb +5 -11
  310. data/lib/chef/util/powershell/ps_credential.rb +18 -14
  311. data/lib/chef/util/threaded_job_queue.rb +0 -2
  312. data/lib/chef/version.rb +1 -1
  313. data/lib/chef/win32/api/file.rb +4 -0
  314. data/lib/chef/win32/crypto.rb +1 -1
  315. data/lib/chef/win32/file.rb +1 -1
  316. data/lib/chef/win32/registry.rb +1 -2
  317. data/lib/chef/win32/security/sid.rb +1 -1
  318. data/lib/chef/win32/unicode.rb +1 -1
  319. data/spec/data/shef-config.rb +1 -1
  320. data/spec/functional/event_loggers/windows_eventlog_spec.rb +6 -5
  321. data/spec/functional/mixin/powershell_out_spec.rb +11 -3
  322. data/spec/functional/resource/aix_service_spec.rb +2 -2
  323. data/spec/functional/resource/aixinit_service_spec.rb +1 -1
  324. data/spec/functional/resource/apt_package_spec.rb +4 -6
  325. data/spec/functional/resource/chocolatey_package_spec.rb +3 -3
  326. data/spec/functional/resource/cron_spec.rb +3 -3
  327. data/spec/functional/resource/dsc_script_spec.rb +6 -9
  328. data/spec/functional/resource/insserv_spec.rb +1 -1
  329. data/spec/functional/resource/mount_spec.rb +10 -2
  330. data/spec/functional/resource/powershell_package_source_spec.rb +107 -0
  331. data/spec/functional/resource/powershell_script_spec.rb +57 -14
  332. data/spec/functional/resource/user/dscl_spec.rb +1 -1
  333. data/spec/functional/resource/user/mac_user_spec.rb +1 -1
  334. data/spec/functional/resource/windows_certificate_spec.rb +10 -6
  335. data/spec/functional/resource/windows_firewall_rule_spec.rb +93 -0
  336. data/spec/functional/resource/windows_package_spec.rb +36 -10
  337. data/spec/functional/resource/windows_share_spec.rb +103 -0
  338. data/spec/functional/resource/windows_task_spec.rb +15 -16
  339. data/spec/functional/resource/zypper_package_spec.rb +11 -0
  340. data/spec/functional/version_spec.rb +3 -3
  341. data/spec/integration/client/client_spec.rb +6 -5
  342. data/spec/integration/client/exit_code_spec.rb +3 -2
  343. data/spec/integration/client/ipv6_spec.rb +1 -1
  344. data/spec/integration/compliance/compliance_spec.rb +81 -0
  345. data/spec/integration/knife/client_key_create_spec.rb +1 -1
  346. data/spec/integration/knife/{config_list_profiles_spec.rb → config_list_spec.rb} +30 -29
  347. data/spec/integration/knife/{config_get_spec.rb → config_show_spec.rb} +3 -3
  348. data/spec/integration/knife/{config_use_profile_spec.rb → config_use_spec.rb} +53 -10
  349. data/spec/integration/knife/cookbook_api_ipv6_spec.rb +1 -1
  350. data/spec/integration/knife/node_create_spec.rb +1 -1
  351. data/spec/integration/knife/node_environment_set_spec.rb +1 -1
  352. data/spec/integration/knife/node_run_list_add_spec.rb +4 -4
  353. data/spec/integration/knife/node_run_list_remove_spec.rb +1 -1
  354. data/spec/integration/knife/node_run_list_set_spec.rb +1 -1
  355. data/spec/integration/knife/node_show_spec.rb +1 -1
  356. data/spec/integration/ohai/ohai_spec.rb +61 -0
  357. data/spec/integration/recipes/notifies_spec.rb +1 -1
  358. data/spec/integration/recipes/provider_choice.rb +2 -2
  359. data/spec/integration/recipes/recipe_dsl_spec.rb +1 -0
  360. data/spec/integration/recipes/remote_directory.rb +1 -1
  361. data/spec/integration/solo/solo_spec.rb +5 -5
  362. data/spec/spec_helper.rb +9 -7
  363. data/spec/stress/win32/file_spec.rb +1 -1
  364. data/spec/support/chef_helpers.rb +2 -2
  365. data/spec/support/lib/chef/resource/cat.rb +1 -1
  366. data/spec/support/lib/chef/resource/one_two_three_four.rb +1 -1
  367. data/spec/support/matchers/leak.rb +2 -2
  368. data/spec/support/mock/platform.rb +24 -16
  369. data/spec/support/platform_helpers.rb +27 -38
  370. data/spec/support/shared/functional/securable_resource.rb +108 -27
  371. data/spec/support/shared/functional/win32_service.rb +1 -1
  372. data/spec/support/shared/unit/application_dot_d.rb +5 -3
  373. data/spec/support/shared/unit/knife_shared.rb +1 -1
  374. data/spec/support/shared/unit/script_resource.rb +4 -4
  375. data/spec/support/shared/unit/windows_script_resource.rb +1 -1
  376. data/spec/tiny_server.rb +0 -1
  377. data/spec/unit/application/client_spec.rb +2 -2
  378. data/spec/unit/application/exit_code_spec.rb +10 -0
  379. data/spec/unit/application_spec.rb +4 -6
  380. data/spec/unit/chef_fs/config_spec.rb +1 -1
  381. data/spec/unit/chef_fs/data_handler/data_bag_item_data_handler.rb +1 -1
  382. data/spec/unit/chef_fs/parallelizer_spec.rb +5 -1
  383. data/spec/unit/chef_fs/path_util_spec.rb +1 -1
  384. data/spec/unit/client_spec.rb +17 -0
  385. data/spec/unit/compliance/fetcher/automate_spec.rb +134 -0
  386. data/spec/unit/compliance/fetcher/chef_server_spec.rb +93 -0
  387. data/spec/unit/compliance/reporter/automate_spec.rb +427 -0
  388. data/spec/unit/compliance/reporter/chef_server_automate_spec.rb +177 -0
  389. data/spec/unit/compliance/reporter/compliance_enforcer_spec.rb +48 -0
  390. data/spec/unit/compliance/runner_spec.rb +113 -0
  391. data/spec/unit/cookbook/synchronizer_spec.rb +2 -2
  392. data/spec/unit/cookbook_spec.rb +2 -2
  393. data/spec/unit/data_collector/config_validation_spec.rb +208 -0
  394. data/spec/unit/data_collector_spec.rb +0 -117
  395. data/spec/unit/dsl/declare_resource_spec.rb +1 -1
  396. data/spec/unit/file_access_control_spec.rb +1 -1
  397. data/spec/unit/guard_interpreter/resource_guard_interpreter_spec.rb +11 -11
  398. data/spec/unit/http/ssl_policies_spec.rb +11 -0
  399. data/spec/unit/knife/bootstrap_spec.rb +6 -6
  400. data/spec/unit/knife/client_create_spec.rb +2 -2
  401. data/spec/unit/knife/configure_client_spec.rb +5 -5
  402. data/spec/unit/knife/configure_spec.rb +3 -3
  403. data/spec/unit/knife/cookbook_delete_spec.rb +2 -2
  404. data/spec/unit/knife/cookbook_download_spec.rb +2 -2
  405. data/spec/unit/knife/cookbook_list_spec.rb +2 -2
  406. data/spec/unit/knife/cookbook_metadata_spec.rb +3 -3
  407. data/spec/unit/knife/core/node_editor_spec.rb +1 -1
  408. data/spec/unit/knife/core/ui_spec.rb +1 -0
  409. data/spec/unit/knife/environment_compare_spec.rb +3 -3
  410. data/spec/unit/knife/ssh_spec.rb +2 -2
  411. data/spec/unit/knife/supermarket_download_spec.rb +8 -8
  412. data/spec/unit/knife/supermarket_list_spec.rb +3 -3
  413. data/spec/unit/knife/supermarket_search_spec.rb +1 -1
  414. data/spec/unit/knife/tag_create_spec.rb +1 -1
  415. data/spec/unit/knife/tag_delete_spec.rb +1 -1
  416. data/spec/unit/knife/user_create_spec.rb +1 -1
  417. data/spec/unit/lwrp_spec.rb +3 -3
  418. data/spec/unit/mixin/deep_merge_spec.rb +15 -0
  419. data/spec/unit/mixin/openssl_helper_spec.rb +1 -1
  420. data/spec/unit/mixin/powershell_exec_spec.rb +40 -3
  421. data/spec/unit/mixin/powershell_out_spec.rb +14 -0
  422. data/spec/unit/mixin/securable_spec.rb +2 -2
  423. data/spec/unit/mixin/which.rb +1 -1
  424. data/spec/unit/node/immutable_collections_spec.rb +2 -2
  425. data/spec/unit/platform/query_helpers_spec.rb +11 -12
  426. data/spec/unit/provider/dsc_resource_spec.rb +10 -27
  427. data/spec/unit/provider/dsc_script_spec.rb +1 -1
  428. data/spec/unit/provider/group/windows_spec.rb +6 -0
  429. data/spec/unit/provider/group_spec.rb +1 -1
  430. data/spec/unit/provider/mount/linux_spec.rb +107 -0
  431. data/spec/unit/provider/mount/mount_spec.rb +21 -10
  432. data/spec/unit/provider/mount/solaris_spec.rb +1 -1
  433. data/spec/unit/provider/mount/windows_spec.rb +1 -0
  434. data/spec/unit/provider/mount_spec.rb +31 -0
  435. data/spec/unit/provider/package/chocolatey_spec.rb +2 -3
  436. data/spec/unit/provider/package/powershell_spec.rb +88 -96
  437. data/spec/unit/provider/package/rubygems_spec.rb +4 -1
  438. data/spec/unit/provider/package/zypper_spec.rb +0 -25
  439. data/spec/unit/provider/package_spec.rb +2 -2
  440. data/spec/unit/provider/powershell_script_spec.rb +11 -0
  441. data/spec/unit/provider/route_spec.rb +0 -2
  442. data/spec/unit/provider/subversion_spec.rb +0 -3
  443. data/spec/unit/provider/systemd_unit_spec.rb +1 -1
  444. data/spec/unit/provider/user_spec.rb +7 -1
  445. data/spec/unit/provider/windows_env_spec.rb +18 -34
  446. data/spec/unit/provider/windows_path_spec.rb +6 -11
  447. data/spec/unit/provider/windows_task_spec.rb +7 -6
  448. data/spec/unit/recipe_spec.rb +1 -1
  449. data/spec/unit/resource/breakpoint_spec.rb +1 -1
  450. data/spec/unit/resource/build_essential_spec.rb +0 -12
  451. data/spec/unit/resource/chef_client_config_spec.rb +137 -0
  452. data/spec/unit/resource/chef_client_cron_spec.rb +35 -14
  453. data/spec/unit/resource/chef_client_launchd_spec.rb +127 -0
  454. data/spec/unit/resource/chef_client_systemd_timer_spec.rb +36 -1
  455. data/spec/unit/resource/chef_client_trusted_certificate_spec.rb +54 -0
  456. data/spec/unit/resource/ifconfig_spec.rb +2 -10
  457. data/spec/unit/resource/launchd_spec.rb +8 -0
  458. data/spec/unit/resource/mount_spec.rb +18 -5
  459. data/spec/unit/resource/osx_profile_spec.rb +67 -1
  460. data/spec/unit/resource/powershell_package_source_spec.rb +20 -20
  461. data/spec/unit/resource/powershell_script_spec.rb +4 -74
  462. data/spec/unit/resource/rhsm_register_spec.rb +56 -18
  463. data/spec/unit/resource/service_spec.rb +2 -2
  464. data/spec/unit/resource/solaris_package_spec.rb +8 -10
  465. data/spec/unit/resource/windows_certificate_spec.rb +12 -0
  466. data/spec/unit/resource/windows_uac_spec.rb +1 -1
  467. data/spec/unit/resource/windows_user_privilege_spec.rb +55 -0
  468. data/spec/unit/resource_inspector_spec.rb +3 -3
  469. data/spec/unit/run_lock_spec.rb +5 -1
  470. data/spec/unit/runner_spec.rb +1 -2
  471. data/spec/unit/shell/shell_ext_spec.rb +46 -3
  472. data/spec/unit/shell/shell_session_spec.rb +35 -64
  473. data/spec/unit/shell_spec.rb +18 -21
  474. data/spec/unit/train_transport_spec.rb +14 -13
  475. data/spec/unit/util/dsc/configuration_generator_spec.rb +79 -0
  476. data/spec/unit/util/dsc/local_configuration_manager_spec.rb +27 -35
  477. data/spec/unit/util/selinux_spec.rb +2 -0
  478. data/tasks/rspec.rb +1 -3
  479. metadata +80 -33
  480. data/lib/chef/dist.rb +0 -68
  481. data/lib/chef/monkey_patches/net_http.rb +0 -22
  482. data/lib/chef/provider/windows_env.rb +0 -210
  483. data/lib/chef/provider/windows_path.rb +0 -61
  484. data/lib/chef/provider/windows_task.rb +0 -632
  485. data/lib/chef/util/powershell/cmdlet.rb +0 -173
  486. data/lib/chef/util/powershell/cmdlet_result.rb +0 -61
  487. data/spec/functional/util/powershell/cmdlet_spec.rb +0 -111
  488. data/spec/integration/knife/config_get_profile_spec.rb +0 -114
  489. data/spec/support/mock/constant.rb +0 -52
  490. data/spec/unit/monkey_patches/uri_spec.rb +0 -34
  491. data/spec/unit/provider_resolver_spec.rb +0 -885
  492. data/spec/unit/resource/data/InstallHistory_with_CLT.plist +0 -92
  493. data/spec/unit/resource/data/InstallHistory_without_CLT.plist +0 -38
  494. data/spec/unit/util/powershell/cmdlet_spec.rb +0 -106
@@ -283,10 +283,10 @@ describe Chef::Knife::Ssh do
283
283
  end
284
284
 
285
285
  describe "#ssh_command" do
286
- let(:execution_channel) { double(:execution_channel, on_data: nil) }
286
+ let(:execution_channel) { double(:execution_channel, on_data: nil, on_extended_data: nil) }
287
287
  let(:session_channel) { double(:session_channel, request_pty: nil) }
288
288
 
289
- let(:execution_channel2) { double(:execution_channel, on_data: nil) }
289
+ let(:execution_channel2) { double(:execution_channel, on_data: nil, on_extended_data: nil) }
290
290
  let(:session_channel2) { double(:session_channel, request_pty: nil) }
291
291
 
292
292
  let(:session) { double(:session, loop: nil) }
@@ -86,8 +86,8 @@ describe Chef::Knife::SupermarketDownload do
86
86
  .with(/.+deprecated.+replaced by other_apache2.+/i)
87
87
  expect(FileUtils).to receive(:cp).with(@temp_file.path, @file)
88
88
  @knife.run
89
- expect(@stderr.string).to match /downloading apache2.+version.+#{Regexp.escape(@version)}/i
90
- expect(@stderr.string).to match /cookbook save.+#{Regexp.escape(@file)}/i
89
+ expect(@stderr.string).to match(/downloading apache2.+version.+#{Regexp.escape(@version)}/i)
90
+ expect(@stderr.string).to match(/cookbook save.+#{Regexp.escape(@file)}/i)
91
91
  end
92
92
 
93
93
  end
@@ -95,8 +95,8 @@ describe Chef::Knife::SupermarketDownload do
95
95
  it "should download the latest version" do
96
96
  expect(FileUtils).to receive(:cp).with(@temp_file.path, @file)
97
97
  @knife.run
98
- expect(@stderr.string).to match /downloading apache2.+version.+#{Regexp.escape(@version)}/i
99
- expect(@stderr.string).to match /cookbook save.+#{Regexp.escape(@file)}/i
98
+ expect(@stderr.string).to match(/downloading apache2.+version.+#{Regexp.escape(@version)}/i)
99
+ expect(@stderr.string).to match(/cookbook save.+#{Regexp.escape(@file)}/i)
100
100
  end
101
101
 
102
102
  context "with -f or --file" do
@@ -108,8 +108,8 @@ describe Chef::Knife::SupermarketDownload do
108
108
 
109
109
  it "should download the cookbook to the desired file" do
110
110
  @knife.run
111
- expect(@stderr.string).to match /downloading apache2.+version.+#{Regexp.escape(@version)}/i
112
- expect(@stderr.string).to match /cookbook save.+#{Regexp.escape(@file)}/i
111
+ expect(@stderr.string).to match(/downloading apache2.+version.+#{Regexp.escape(@version)}/i)
112
+ expect(@stderr.string).to match(/cookbook save.+#{Regexp.escape(@file)}/i)
113
113
  end
114
114
  end
115
115
 
@@ -140,8 +140,8 @@ describe Chef::Knife::SupermarketDownload do
140
140
  .and_return(@temp_file)
141
141
  expect(FileUtils).to receive(:cp).with(@temp_file.path, @file)
142
142
  @knife.run
143
- expect(@stderr.string).to match /downloading apache2.+version.+#{Regexp.escape(@version)}/i
144
- expect(@stderr.string).to match /cookbook save.+#{Regexp.escape(@file)}/i
143
+ expect(@stderr.string).to match(/downloading apache2.+version.+#{Regexp.escape(@version)}/i)
144
+ expect(@stderr.string).to match(/cookbook save.+#{Regexp.escape(@file)}/i)
145
145
  end
146
146
  end
147
147
 
@@ -52,7 +52,7 @@ describe Chef::Knife::SupermarketList do
52
52
  it "should display all supermarket cookbooks" do
53
53
  knife.run
54
54
  cookbooks_data.each do |item|
55
- expect(stdout.string).to match /#{item["cookbook_name"]}\s/
55
+ expect(stdout.string).to match(/#{item["cookbook_name"]}\s/)
56
56
  end
57
57
  end
58
58
 
@@ -61,8 +61,8 @@ describe Chef::Knife::SupermarketList do
61
61
  knife.config[:with_uri] = true
62
62
  knife.run
63
63
  cookbooks_data.each do |item|
64
- expect(stdout.string).to match /#{item["cookbook_name"]}\s/
65
- expect(stdout.string).to match /#{item["cookbook"]}\s/
64
+ expect(stdout.string).to match(/#{item["cookbook_name"]}\s/)
65
+ expect(stdout.string).to match(/#{item["cookbook"]}\s/)
66
66
  end
67
67
  end
68
68
  end
@@ -65,7 +65,7 @@ describe Chef::Knife::SupermarketSearch do
65
65
  knife.name_args = ["mysql"]
66
66
  knife.run
67
67
  cookbooks_data.each do |item|
68
- expect(stdout.string).to match /#{item["cookbook_name"]}\s/
68
+ expect(stdout.string).to match(/#{item["cookbook_name"]}\s/)
69
69
  end
70
70
  end
71
71
  end
@@ -17,7 +17,7 @@ describe Chef::Knife::TagCreate do
17
17
  it "can create tags on a node" do
18
18
  @knife.run
19
19
  expect(@node.tags).to eq(["happytag"])
20
- expect(@stderr.string).to match /created tags happytag.+node webmonkey.example.com/i
20
+ expect(@stderr.string).to match(/created tags happytag.+node webmonkey.example.com/i)
21
21
  end
22
22
  end
23
23
  end
@@ -19,7 +19,7 @@ describe Chef::Knife::TagDelete do
19
19
  expect(@node.tags).to eq(%w{sadtag happytag})
20
20
  @knife.run
21
21
  expect(@node.tags).to eq(["happytag"])
22
- expect(@stderr.string).to match /deleted.+sadtag/i
22
+ expect(@stderr.string).to match(/deleted.+sadtag/i)
23
23
  end
24
24
  end
25
25
  end
@@ -112,7 +112,7 @@ describe Chef::Knife::UserCreate do
112
112
 
113
113
  it "prints a relevant error message" do
114
114
  expect { knife.run }.to raise_error(SystemExit)
115
- expect(stderr.string).to match /You cannot pass --user-key and --prevent-keygen/
115
+ expect(stderr.string).to match(/You cannot pass --user-key and --prevent-keygen/)
116
116
  end
117
117
  end
118
118
 
@@ -169,7 +169,7 @@ describe "LWRP" do
169
169
  describe "Lightweight Chef::Resource" do
170
170
 
171
171
  before do
172
- Dir[File.expand_path(File.join(File.dirname(__FILE__), "..", "data", "lwrp", "resources", "*"))].each do |file|
172
+ Dir[File.expand_path(File.join(__dir__, "..", "data", "lwrp", "resources", "*"))].each do |file|
173
173
  Chef::Resource::LWRPBase.build_from_file("lwrp", file, nil)
174
174
  end
175
175
  end
@@ -211,7 +211,7 @@ describe "LWRP" do
211
211
  node.normal[:penguin_name] = "jackass"
212
212
  run_context = Chef::RunContext.new(node, Chef::CookbookCollection.new, @events)
213
213
 
214
- Dir[File.expand_path(File.join(File.dirname(__FILE__), "..", "data", "lwrp", "resources_with_default_attributes", "*"))].each do |file|
214
+ Dir[File.expand_path(File.join(__dir__, "..", "data", "lwrp", "resources_with_default_attributes", "*"))].each do |file|
215
215
  Chef::Resource::LWRPBase.build_from_file("lwrp", file, run_context)
216
216
  end
217
217
 
@@ -654,7 +654,7 @@ describe "LWRP" do
654
654
  end
655
655
 
656
656
  let(:run_context) do
657
- cookbook_repo = File.expand_path(File.join(File.dirname(__FILE__), "..", "data", "cookbooks"))
657
+ cookbook_repo = File.expand_path(File.join(__dir__, "..", "data", "cookbooks"))
658
658
  cookbook_loader = Chef::CookbookLoader.new(cookbook_repo)
659
659
  cookbook_loader.load_cookbooks
660
660
  cookbook_collection = Chef::CookbookCollection.new(cookbook_loader)
@@ -236,6 +236,14 @@ describe Chef::Mixin::DeepMerge, "deep_merge!" do
236
236
  @dm.deep_merge!(hash_src, hash_dst)
237
237
  expect(hash_dst).to eq({ "item" => "orange" })
238
238
  end
239
+
240
+ it "should overwrite a string with a nil when merging nil values" do
241
+ hash_src = { "item" => nil }
242
+ hash_dst = { "item" => "orange" }
243
+ @dm.deep_merge!(hash_src, hash_dst)
244
+ expect(hash_dst).to eq({ "item" => nil })
245
+ end
246
+
239
247
  end # deep_merge!
240
248
 
241
249
  # Chef specific
@@ -338,5 +346,12 @@ describe Chef::Mixin::DeepMerge do
338
346
  merge_with_hash = { "top_level_a" => 2, "top_level_b" => true }
339
347
  @dm.hash_only_merge(merge_ee_hash, merge_with_hash)
340
348
  end
349
+
350
+ it "should overwrite a string with a nil when merging nil values" do
351
+ hash_src = { "item" => nil }
352
+ hash_dst = { "item" => "orange" }
353
+ merged_result = @dm.hash_only_merge(hash_dst, hash_src)
354
+ expect(merged_result).to eq({ "item" => nil })
355
+ end
341
356
  end
342
357
  end
@@ -99,7 +99,7 @@ describe Chef::Mixin::OpenSSLHelper do
99
99
 
100
100
  context "When the dhparam.pem file does exist, and does contain a vaild dhparam key" do
101
101
  it "returns true" do
102
- @dhparam_file.puts(::OpenSSL::PKey::DH.new(1024).to_pem)
102
+ @dhparam_file.puts(::OpenSSL::PKey::DH.new(256).to_pem) # this is 256 to speed up specs
103
103
  @dhparam_file.close
104
104
  expect(instance.dhparam_pem_valid?(@dhparam_file.path)).to be_truthy
105
105
  end
@@ -24,8 +24,37 @@ describe Chef::Mixin::PowershellExec, :windows_only do
24
24
  subject(:object) { powershell_mixin.new }
25
25
 
26
26
  describe "#powershell_exec" do
27
- it "runs a basic command and returns a Chef::PowerShell object" do
28
- expect(object.powershell_exec("$PSVersionTable")).to be_kind_of(Chef::PowerShell)
27
+ context "not specifying an interpreter" do
28
+ it "runs a basic command and returns a Chef::PowerShell object" do
29
+ expect(object.powershell_exec("$PSVersionTable")).to be_kind_of(Chef::PowerShell)
30
+ end
31
+
32
+ it "uses less than version 6" do
33
+ execution = object.powershell_exec("$PSVersionTable")
34
+ expect(execution.result["PSVersion"].to_s.to_i).to be < 6
35
+ end
36
+ end
37
+
38
+ context "using pwsh interpreter" do
39
+ it "runs a basic command and returns a Chef::PowerShell object" do
40
+ expect(object.powershell_exec("$PSVersionTable", :pwsh)).to be_kind_of(Chef::Pwsh)
41
+ end
42
+
43
+ it "uses greater than version 6" do
44
+ execution = object.powershell_exec("$PSVersionTable", :pwsh)
45
+ expect(execution.result["PSVersion"]["Major"]).to be > 6
46
+ end
47
+ end
48
+
49
+ context "using powershell interpreter" do
50
+ it "runs a basic command and returns a Chef::PowerShell object" do
51
+ expect(object.powershell_exec("$PSVersionTable", :powershell)).to be_kind_of(Chef::PowerShell)
52
+ end
53
+
54
+ it "uses less than version 6" do
55
+ execution = object.powershell_exec("$PSVersionTable", :powershell)
56
+ expect(execution.result["PSVersion"].to_s.to_i).to be < 6
57
+ end
29
58
  end
30
59
 
31
60
  it "runs a command that fails with a non-terminating error and can trap the error via .error?" do
@@ -37,7 +66,11 @@ describe Chef::Mixin::PowershellExec, :windows_only do
37
66
  execution = object.powershell_exec("this-should-error")
38
67
  expect(execution.errors).to be_a_kind_of(Array)
39
68
  expect(execution.errors[0]).to be_a_kind_of(String)
40
- expect(execution.errors[0]).to include("Runtime exception: this-should-error")
69
+ expect(execution.errors[0]).to include("The term 'this-should-error' is not recognized")
70
+ end
71
+
72
+ it "raises an error if the interpreter is invalid" do
73
+ expect { object.powershell_exec("this-should-error", :powerfart) }.to raise_error(ArgumentError)
41
74
  end
42
75
  end
43
76
 
@@ -49,5 +82,9 @@ describe Chef::Mixin::PowershellExec, :windows_only do
49
82
  it "raises an error if the command fails" do
50
83
  expect { object.powershell_exec!("this-should-error") }.to raise_error(Chef::PowerShell::CommandFailed)
51
84
  end
85
+
86
+ it "raises an error if the interpreter is invalid" do
87
+ expect { object.powershell_exec!("this-should-error", :powerfart) }.to raise_error(ArgumentError)
88
+ end
52
89
  end
53
90
  end
@@ -44,6 +44,20 @@ describe Chef::Mixin::PowershellOut, :windows_only do
44
44
  expect(object.powershell_out("Get-Process", timeout: 600)).to eql(ret)
45
45
  end
46
46
 
47
+ it "uses pwsh.exe when given :pwsh interpreter" do
48
+ ret = double("Mixlib::ShellOut")
49
+ expect(object).to receive(:shell_out).with(
50
+ "pwsh.exe #{flags} -Command \"Get-Process\"",
51
+ timeout: 600
52
+ ).and_return(ret)
53
+ expect(object.powershell_out("Get-Process", :pwsh, timeout: 600)).to eql(ret)
54
+ end
55
+
56
+ it "raises error if interpreter is invalid" do
57
+ ret = double("Mixlib::ShellOut")
58
+ expect { object.powershell_out("Get-Process", :blah, timeout: 600) }.to raise_error(ArgumentError)
59
+ end
60
+
47
61
  context "when double quote is passed in the powershell command" do
48
62
  it "passes if double quote is appended with single escape" do
49
63
  result = object.powershell_out("Write-Verbose \"Some String\" -Verbose")
@@ -45,7 +45,7 @@ describe Chef::Mixin::Securable do
45
45
  describe "unix-specific behavior" do
46
46
  before(:each) do
47
47
  platform_mock :unix do
48
- load File.join(File.dirname(__FILE__), "..", "..", "..", "lib", "chef", "mixin", "securable.rb")
48
+ load File.join(__dir__, "..", "..", "..", "lib", "chef", "mixin", "securable.rb")
49
49
  @securable = Object.new
50
50
  @securable.send(:extend, Chef::Mixin::Securable)
51
51
  @securable.send(:extend, Chef::Mixin::ParamsValidate)
@@ -176,7 +176,7 @@ describe Chef::Mixin::Securable do
176
176
  describe "windows-specific behavior" do
177
177
  before(:each) do
178
178
  platform_mock :windows do
179
- load File.join(File.dirname(__FILE__), "..", "..", "..", "lib", "chef", "mixin", "securable.rb")
179
+ load File.join(__dir__, "..", "..", "..", "lib", "chef", "mixin", "securable.rb")
180
180
  securable_class = Class.new do
181
181
  include Chef::Mixin::Securable
182
182
  include Chef::Mixin::ParamsValidate
@@ -93,7 +93,7 @@ describe Chef::Mixin::Which do
93
93
  end
94
94
 
95
95
  test_which("arrays with blocks", "foo1", "foo2", finds: "/dir2/foo1", others: [ "/dir1/foo2" ]) do |f|
96
- raise "bad arg to block" unless f == "/dir2/foo1" || f == "/dir1/foo2"
96
+ raise "bad arg to block" unless ["/dir2/foo1", "/dir1/foo2"].include?(f)
97
97
 
98
98
  true
99
99
  end
@@ -130,7 +130,7 @@ describe Chef::Node::ImmutableMash do
130
130
  end
131
131
 
132
132
  %w{to_h to_hash dup}.each do |immutable_meth|
133
- describe "#{immutable_meth}" do
133
+ describe immutable_meth do
134
134
  include_examples "ImmutableMash module", description
135
135
  end
136
136
  end
@@ -238,7 +238,7 @@ describe Chef::Node::ImmutableArray do
238
238
  end
239
239
 
240
240
  %w{to_a to_array dup}.each do |immutable_meth|
241
- describe "#{immutable_meth}" do
241
+ describe immutable_meth do
242
242
  include_examples "ImmutableArray module", description
243
243
  end
244
244
  end
@@ -41,24 +41,23 @@ end
41
41
 
42
42
  describe "Chef::Platform#dsc_refresh_mode_disabled?" do
43
43
  let(:node) { instance_double("Chef::Node") }
44
- let(:cmdlet) { instance_double("Chef::Util::Powershell::Cmdlet") }
45
- let(:cmdlet_result) { instance_double("Chef::Util::Powershell::CmdletResult") }
44
+ let(:powershell) { instance_double("Chef::PowerShell") }
46
45
 
47
46
  it "returns true when RefreshMode is Disabled" do
48
- expect(Chef::Util::Powershell::Cmdlet).to receive(:new)
49
- .with(node, "Get-DscLocalConfigurationManager", :object)
50
- .and_return(cmdlet)
51
- expect(cmdlet).to receive(:run!).and_return(cmdlet_result)
52
- expect(cmdlet_result).to receive(:return_value).and_return({ "RefreshMode" => "Disabled" })
47
+ expect(Chef::PowerShell).to receive(:new)
48
+ .with("Get-DscLocalConfigurationManager")
49
+ .and_return(powershell)
50
+ expect(powershell).to receive(:error!)
51
+ expect(powershell).to receive(:result).and_return({ "RefreshMode" => "Disabled" })
53
52
  expect(Chef::Platform.dsc_refresh_mode_disabled?(node)).to be true
54
53
  end
55
54
 
56
55
  it "returns false when RefreshMode is not Disabled" do
57
- expect(Chef::Util::Powershell::Cmdlet).to receive(:new)
58
- .with(node, "Get-DscLocalConfigurationManager", :object)
59
- .and_return(cmdlet)
60
- expect(cmdlet).to receive(:run!).and_return(cmdlet_result)
61
- expect(cmdlet_result).to receive(:return_value).and_return({ "RefreshMode" => "LaLaLa" })
56
+ expect(Chef::PowerShell).to receive(:new)
57
+ .with("Get-DscLocalConfigurationManager")
58
+ .and_return(powershell)
59
+ expect(powershell).to receive(:error!)
60
+ expect(powershell).to receive(:result).and_return({ "RefreshMode" => "LaLaLa" })
62
61
  expect(Chef::Platform.dsc_refresh_mode_disabled?(node)).to be false
63
62
  end
64
63
  end
@@ -85,14 +85,13 @@ describe Chef::Provider::DscResource do
85
85
  node.automatic[:languages][:powershell][:version] = "5.0.10018.0"
86
86
  node
87
87
  end
88
- let(:resource_result) { double("CmdletResult", return_value: { "InDesiredState" => true }, stream: "description") }
89
- let(:invoke_dsc_resource) { double("cmdlet", run!: resource_result) }
88
+ let(:resource_result) { double("PowerShell", result: { "InDesiredState" => true }, verbose: ["description"]) }
90
89
  let(:store) { double("ResourceStore", find: resource_records) }
91
90
  let(:resource_records) { [] }
92
91
 
93
92
  before do
94
93
  allow(Chef::Util::DSC::ResourceStore).to receive(:instance).and_return(store)
95
- allow(Chef::Util::Powershell::Cmdlet).to receive(:new).and_return(invoke_dsc_resource)
94
+ allow(provider).to receive(:powershell_exec!).and_return(resource_result)
96
95
  allow(provider).to receive(:dsc_refresh_mode_disabled?).and_return(true)
97
96
  end
98
97
 
@@ -112,9 +111,8 @@ describe Chef::Provider::DscResource do
112
111
  it "flags the resource as reboot required when required" do
113
112
  expect(provider).to receive(:test_resource).and_return(false)
114
113
  expect(provider).to receive(:invoke_resource)
115
- .and_return(double(stdout: "", return_value: nil))
114
+ .and_return(double(result: { "RebootRequired" => true }))
116
115
  expect(provider).to receive(:add_dsc_verbose_log)
117
- expect(provider).to receive(:return_dsc_resource_result).and_return(true)
118
116
  expect(provider).to receive(:create_reboot_resource)
119
117
  provider.run_action(:run)
120
118
  end
@@ -122,9 +120,8 @@ describe Chef::Provider::DscResource do
122
120
  it "does not flag the resource as reboot required when not required" do
123
121
  expect(provider).to receive(:test_resource).and_return(false)
124
122
  expect(provider).to receive(:invoke_resource)
125
- .and_return(double(stdout: "", return_value: nil))
123
+ .and_return(double(stdout: "", result: {}))
126
124
  expect(provider).to receive(:add_dsc_verbose_log)
127
- expect(provider).to receive(:return_dsc_resource_result).and_return(false)
128
125
  expect(provider).to_not receive(:create_reboot_resource)
129
126
  provider.run_action(:run)
130
127
  end
@@ -142,9 +139,7 @@ describe Chef::Provider::DscResource do
142
139
  let(:resource_records) { [{}] }
143
140
 
144
141
  it "returns the default dsc resource module" do
145
- expect(Chef::Util::Powershell::Cmdlet).to receive(:new) do |node, cmdlet, format|
146
- expect(cmdlet).to match(/Module PSDesiredStateConfiguration /)
147
- end.and_return(invoke_dsc_resource)
142
+ expect(provider).to receive(:powershell_exec!).with(/Module PSDesiredStateConfiguration /).and_return(resource_result)
148
143
  provider.run_action(:run)
149
144
  end
150
145
  end
@@ -153,9 +148,7 @@ describe Chef::Provider::DscResource do
153
148
  let(:resource_records) { [{ "Module" => { "Name" => "ModuleName" } }] }
154
149
 
155
150
  it "returns the default dsc resource module" do
156
- expect(Chef::Util::Powershell::Cmdlet).to receive(:new) do |node, cmdlet, format|
157
- expect(cmdlet).to match(/Module ModuleName /)
158
- end.and_return(invoke_dsc_resource)
151
+ expect(provider).to receive(:powershell_exec!).with(/Module ModuleName /).and_return(resource_result)
159
152
  provider.run_action(:run)
160
153
  end
161
154
  end
@@ -286,8 +279,6 @@ describe Chef::Provider::DscResource do
286
279
  end
287
280
 
288
281
  describe "invoke_resource" do
289
- let(:cmdlet) { double(run!: nil) }
290
-
291
282
  before(:each) do
292
283
  allow(provider).to receive(:translate_type).and_return("my_properties")
293
284
  provider.instance_variable_set(:@new_resource, double(
@@ -301,12 +292,8 @@ describe Chef::Provider::DscResource do
301
292
  end
302
293
 
303
294
  it "invokes Invoke-DscResource command with module name" do
304
- expect(Chef::Util::Powershell::Cmdlet).to receive(:new).with(
305
- node,
306
- "Invoke-DscResource -Method my_method -Name my_resource -Property my_properties -Module my_module -Verbose",
307
- "my_output_format"
308
- ).and_return(cmdlet)
309
- provider.send(:invoke_resource, "my_method", "my_output_format")
295
+ expect(provider).to receive(:powershell_exec!).with("Invoke-DscResource -Method my_method -Name my_resource -Property my_properties -Module my_module -Verbose").and_return(nil)
296
+ provider.send(:invoke_resource, "my_method")
310
297
  end
311
298
  end
312
299
 
@@ -318,12 +305,8 @@ describe Chef::Provider::DscResource do
318
305
  end
319
306
 
320
307
  it "invokes Invoke-DscResource command with module info object" do
321
- expect(Chef::Util::Powershell::Cmdlet).to receive(:new).with(
322
- node,
323
- "Invoke-DscResource -Method my_method -Name my_resource -Property my_properties -Module @{ModuleName='my_module';ModuleVersion='my_module_version'} -Verbose",
324
- "my_output_format"
325
- ).and_return(cmdlet)
326
- provider.send(:invoke_resource, "my_method", "my_output_format")
308
+ expect(provider).to receive(:powershell_exec!).with("Invoke-DscResource -Method my_method -Name my_resource -Property my_properties -Module @{ModuleName='my_module';ModuleVersion='my_module_version'} -Verbose").and_return(nil)
309
+ provider.send(:invoke_resource, "my_method")
327
310
  end
328
311
  end
329
312
  end
@@ -99,7 +99,7 @@ describe Chef::Provider::DscScript do
99
99
  it "should noop if neither code or command are provided" do
100
100
  allow(provider).to receive(:load_current_resource)
101
101
  generator = double("Chef::Util::DSC::ConfigurationGenerator")
102
- expect(generator).to receive(:configuration_document_from_script_code).with("", anything, anything, anything)
102
+ expect(generator).to receive(:configuration_document_from_script_code).with("", anything, anything)
103
103
  allow(Chef::Util::DSC::ConfigurationGenerator).to receive(:new).and_return(generator)
104
104
  provider.send(:generate_configuration_document, "tmp", nil)
105
105
  end