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
@@ -54,7 +54,18 @@ class Chef
54
54
 
55
55
  def interpreter_path
56
56
  # Powershell.exe is always in "v1.0" folder (for backwards compatibility)
57
- Chef::Util::PathHelper.join(basepath, "WindowsPowerShell", "v1.0", interpreter)
57
+ # pwsh is the other interpreter and we will assume that it is on the path.
58
+ # It will exist in different folders depending on the installed version.
59
+ # There can also be multiple versions installed. Depending on how it was installed,
60
+ # there might be a registry entry pointing to the installation path. The key will
61
+ # differ depending on version and architecture. It seems best to let the PATH
62
+ # determine the file path to use since that will provide the same pwsh.exe one
63
+ # would invoke from any shell.
64
+ if interpreter == "powershell"
65
+ Chef::Util::PathHelper.join(basepath, "WindowsPowerShell", "v1.0", "#{interpreter}.exe")
66
+ else
67
+ interpreter
68
+ end
58
69
  end
59
70
 
60
71
  def code
@@ -35,6 +35,8 @@ class Chef
35
35
 
36
36
  include Chef::Mixin::Checksum
37
37
 
38
+ WORD_TYPES = %i{dword dword_big_endian qword}.freeze
39
+
38
40
  def running_on_windows!
39
41
  unless ChefUtils.windows?
40
42
  raise Chef::Exceptions::Win32NotWindows, "Attempt to manipulate the windows registry on a non-windows node"
@@ -122,9 +124,8 @@ class Chef
122
124
  new_resource.unscrubbed_values.each do |value|
123
125
  if @name_hash.key?(value[:name].downcase)
124
126
  current_value = @name_hash[value[:name].downcase]
125
- if %i{dword dword_big_endian qword}.include? value[:type]
126
- value[:data] = value[:data].to_i
127
- end
127
+ value[:data] = value[:data].to_i if WORD_TYPES.include?(value[:type])
128
+
128
129
  unless current_value[:type] == value[:type] && current_value[:data] == value[:data]
129
130
  converge_by_value = if new_resource.sensitive
130
131
  value.merge(data: "*sensitive value suppressed*")
@@ -21,6 +21,9 @@ require "uri" unless defined?(URI)
21
21
  require "tempfile" unless defined?(Tempfile)
22
22
  require_relative "../../file_content_management/content_base"
23
23
  require_relative "../../mixin/uris"
24
+ module Net
25
+ autoload :FTPError, "net/ftp"
26
+ end
24
27
 
25
28
  class Chef
26
29
  class Provider
@@ -16,10 +16,12 @@
16
16
  # limitations under the License.
17
17
  #
18
18
 
19
- require "uri" unless defined?(URI)
20
- require "cgi" unless defined?(CGI)
21
- require "tempfile" unless defined?(Tempfile)
22
- require "net/ftp"
19
+ autoload :URI, "uri"
20
+ autoload :CGI, "cgi"
21
+ autoload :Tempfile, "tempfile"
22
+ module Net
23
+ autoload :FTP, "net/ftp"
24
+ end
23
25
  require_relative "../remote_file"
24
26
  require_relative "../../file_content_management/tempfile"
25
27
 
@@ -16,10 +16,12 @@
16
16
  # limitations under the License.
17
17
  #
18
18
 
19
- require "uri" unless defined?(URI)
20
- require "cgi" unless defined?(CGI)
21
- require "tempfile" unless defined?(Tempfile)
22
- require "net/sftp"
19
+ autoload :URI, "uri"
20
+ autoload :CGI, "cgi"
21
+ autoload :Tempfile, "tempfile"
22
+ module Net
23
+ autoload :SFTP, "net/sftp"
24
+ end
23
25
  require_relative "../remote_file"
24
26
  require_relative "../../file_content_management/tempfile"
25
27
 
@@ -19,7 +19,7 @@
19
19
 
20
20
  require_relative "../log"
21
21
  require_relative "../provider"
22
- require "ipaddr" unless defined?(IPAddr)
22
+ autoload :IPAddr, "ipaddr"
23
23
 
24
24
  class Chef
25
25
  class Provider
@@ -169,11 +169,7 @@ class Chef
169
169
  next unless resource.is_a? Chef::Resource::Route
170
170
 
171
171
  # default to eth0
172
- dev = if resource.device
173
- resource.device
174
- else
175
- "eth0"
176
- end
172
+ dev = resource.device || "eth0"
177
173
 
178
174
  conf[dev] = "" if conf[dev].nil?
179
175
  case @action
@@ -192,8 +188,8 @@ class Chef
192
188
  logger.trace("#{new_resource} writing default route #{new_resource.gateway} to #{network_file_name}")
193
189
  if ::File.exist?(network_file_name)
194
190
  network_file = ::Chef::Util::FileEdit.new(network_file_name)
195
- network_file.search_file_replace_line /^GATEWAY=/, "GATEWAY=#{new_resource.gateway}"
196
- network_file.insert_line_if_no_match /^GATEWAY=/, "GATEWAY=#{new_resource.gateway}"
191
+ network_file.search_file_replace_line(/^GATEWAY=/, "GATEWAY=#{new_resource.gateway}")
192
+ network_file.insert_line_if_no_match(/^GATEWAY=/, "GATEWAY=#{new_resource.gateway}")
197
193
  network_file.write_file
198
194
  else
199
195
  network_file = ::File.new(network_file_name, "w")
@@ -28,6 +28,7 @@ class Chef
28
28
 
29
29
  UPDATE_RC_D_ENABLED_MATCHES = %r{/rc[\dS].d/S|not installed}i.freeze
30
30
  UPDATE_RC_D_PRIORITIES = %r{/rc([\dS]).d/([SK])(\d\d)}i.freeze
31
+ RUNLEVELS = %w{ 1 2 3 4 5 S }.freeze
31
32
 
32
33
  def self.supports?(resource, action)
33
34
  service_script_exist?(:initd, resource.service_name)
@@ -121,7 +122,7 @@ class Chef
121
122
  priority.each do |runlevel, arguments|
122
123
  logger.trace("#{new_resource} runlevel #{runlevel}, action #{arguments[0]}, priority #{arguments[1]}")
123
124
  # if we are in a update-rc.d default startup runlevel && we start in this runlevel
124
- if %w{ 1 2 3 4 5 S }.include?(runlevel) && arguments[0] == :start
125
+ if RUNLEVELS.include?(runlevel) && arguments[0] == :start
125
126
  enabled = true
126
127
  end
127
128
  end
@@ -18,7 +18,7 @@
18
18
  #
19
19
 
20
20
  require "etc" unless defined?(Etc)
21
- require "rexml/document" unless defined?(REXML::Document)
21
+ autoload :REXML, "rexml/document"
22
22
  require_relative "../../resource/service"
23
23
  require_relative "../../resource/macosx_service"
24
24
  require_relative "simple"
@@ -47,7 +47,7 @@ class Chef
47
47
  @current_resource = Chef::Resource::MacosxService.new(@new_resource.name)
48
48
  @current_resource.service_name(@new_resource.service_name)
49
49
  @plist_size = 0
50
- @plist = @new_resource.plist ? @new_resource.plist : find_service_plist
50
+ @plist = @new_resource.plist || find_service_plist
51
51
  @service_label = find_service_label
52
52
  # LaunchAgents should be loaded as the console user.
53
53
  @console_user = @plist ? @plist.include?("LaunchAgents") : false
@@ -84,7 +84,7 @@ class Chef
84
84
  chkconfig = shell_out!("/sbin/chkconfig --list #{current_resource.service_name}", returns: [0, 1])
85
85
  unless run_levels.nil? || run_levels.empty?
86
86
  all_levels_match = true
87
- chkconfig.stdout.split(/\s+/)[1..-1].each do |level|
87
+ chkconfig.stdout.split(/\s+/)[1..].each do |level|
88
88
  index = level.split(":").first
89
89
  status = level.split(":").last
90
90
  if CHKCONFIG_ON.match?(level)
@@ -43,19 +43,11 @@ class Chef
43
43
  protected
44
44
 
45
45
  def template_source_name(name, options)
46
- if options[:source]
47
- options[:source]
48
- else
49
- name
50
- end
46
+ options[:source] || name
51
47
  end
52
48
 
53
49
  def find_cookbook_name(options)
54
- if options[:cookbook]
55
- options[:cookbook]
56
- else
57
- @cookbook_name
58
- end
50
+ options[:cookbook] || @cookbook_name
59
51
  end
60
52
  end
61
53
  end
@@ -24,6 +24,7 @@ class Chef
24
24
  class User < Chef::Provider
25
25
 
26
26
  attr_accessor :user_exists, :locked
27
+ attr_accessor :change_desc
27
28
 
28
29
  def initialize(new_resource, run_context)
29
30
  super
@@ -107,13 +108,20 @@ class Chef
107
108
  # <true>:: If a change is required
108
109
  # <false>:: If the users are identical
109
110
  def compare_user
110
- return true if !new_resource.home.nil? && Pathname.new(new_resource.home).cleanpath != Pathname.new(current_resource.home).cleanpath
111
+ @change_desc = []
112
+ if !new_resource.home.nil? && Pathname.new(new_resource.home).cleanpath != Pathname.new(current_resource.home).cleanpath
113
+ @change_desc << "change homedir from #{current_resource.home} to #{new_resource.home}"
114
+ end
111
115
 
112
116
  %i{comment shell password uid gid}.each do |user_attrib|
113
- return true if !new_resource.send(user_attrib).nil? && new_resource.send(user_attrib).to_s != current_resource.send(user_attrib).to_s
117
+ new_val = new_resource.send(user_attrib)
118
+ cur_val = current_resource.send(user_attrib)
119
+ if !new_val.nil? && new_val.to_s != cur_val.to_s
120
+ @change_desc << "change #{user_attrib} from #{cur_val} to #{new_val}"
121
+ end
114
122
  end
115
123
 
116
- false
124
+ !@change_desc.empty?
117
125
  end
118
126
 
119
127
  action :create do
@@ -123,9 +131,9 @@ class Chef
123
131
  logger.info("#{new_resource} created")
124
132
  end
125
133
  elsif compare_user
126
- converge_by("alter user #{new_resource.username}") do
134
+ converge_by(["alter user #{new_resource.username}"] + change_desc) do
127
135
  manage_user
128
- logger.info("#{new_resource} altered")
136
+ logger.info("#{new_resource} altered, #{change_desc.join(", ")}")
129
137
  end
130
138
  end
131
139
  end
@@ -142,18 +150,18 @@ class Chef
142
150
  action :manage do
143
151
  return unless @user_exists && compare_user
144
152
 
145
- converge_by("manage user #{new_resource.username}") do
153
+ converge_by(["manage user #{new_resource.username}"] + change_desc) do
146
154
  manage_user
147
- logger.info("#{new_resource} managed")
155
+ logger.info("#{new_resource} managed: #{change_desc.join(", ")}")
148
156
  end
149
157
  end
150
158
 
151
159
  action :modify do
152
160
  return unless compare_user
153
161
 
154
- converge_by("modify user #{new_resource.username}") do
162
+ converge_by(["modify user #{new_resource.username}"] + change_desc) do
155
163
  manage_user
156
- logger.info("#{new_resource} modified")
164
+ logger.info("#{new_resource} modified: #{change_desc.join(", ")}")
157
165
  end
158
166
  end
159
167
 
@@ -68,7 +68,7 @@ class Chef
68
68
 
69
69
  def check_lock
70
70
  lock_info = shell_out!("lsuser", "-a", "account_locked", new_resource.username)
71
- if whyrun_mode? && passwd_s.stdout.empty? && lock_info.stderr.match(/does not exist/)
71
+ if whyrun_mode? && passwd_s.stdout.empty? && lock_info.stderr.include?("does not exist")
72
72
  # if we're in whyrun mode and the user is not yet created we assume it would be
73
73
  return false
74
74
  end
@@ -19,8 +19,8 @@
19
19
  require_relative "../../mixin/shell_out"
20
20
  require_relative "../user"
21
21
  require_relative "../../resource/user/dscl_user"
22
- require "openssl" unless defined?(OpenSSL)
23
- require "plist"
22
+ autoload :OpenSSL, "openssl"
23
+ autoload :Plist, "plist"
24
24
  require_relative "../../util/path_helper"
25
25
 
26
26
  class Chef
@@ -584,16 +584,16 @@ in 'password', with the associated 'salt' and 'iterations'.")
584
584
  #
585
585
 
586
586
  def run_dscl(*args)
587
- result = shell_out("dscl", ".", "-#{args[0]}", args[1..-1])
587
+ result = shell_out("dscl", ".", "-#{args[0]}", args[1..])
588
588
  return "" if ( args.first =~ /^delete/ ) && ( result.exitstatus != 0 )
589
589
  raise(Chef::Exceptions::DsclCommandFailed, "dscl error: #{result.inspect}") unless result.exitstatus == 0
590
- raise(Chef::Exceptions::DsclCommandFailed, "dscl error: #{result.inspect}") if /No such key: /.match?(result.stdout)
590
+ raise(Chef::Exceptions::DsclCommandFailed, "dscl error: #{result.inspect}") if result.stdout.include?("No such key: ")
591
591
 
592
592
  result.stdout
593
593
  end
594
594
 
595
595
  def run_plutil(*args)
596
- result = shell_out("plutil", "-#{args[0]}", args[1..-1])
596
+ result = shell_out("plutil", "-#{args[0]}", args[1..])
597
597
  raise(Chef::Exceptions::PlistUtilCommandFailed, "plutil error: #{result.inspect}") unless result.exitstatus == 0
598
598
 
599
599
  if result.stdout.encoding == Encoding::ASCII_8BIT
@@ -22,7 +22,7 @@ require_relative "../../mixin/shell_out"
22
22
  require_relative "../../mixin/which"
23
23
  require_relative "../user"
24
24
  require_relative "../../resource/user/mac_user"
25
- require "plist"
25
+ autoload :Plist, "plist"
26
26
 
27
27
  class Chef
28
28
  class Provider
@@ -221,7 +221,17 @@ class Chef
221
221
  end
222
222
 
223
223
  def compare_user
224
- %i{comment shell uid gid salt password admin secure_token hidden}.any? { |m| diverged?(m) }
224
+ @change_desc = []
225
+ %i{comment shell uid gid salt password admin secure_token hidden}.each do |attr|
226
+ if diverged?(attr)
227
+ desc = "Update #{attr}"
228
+ unless %i{password gid secure_token hidden}.include?(attr)
229
+ desc << " from #{current_resource.send(attr)} to #{new_resource.send(attr)}"
230
+ end
231
+ @change_desc << desc
232
+ end
233
+ end
234
+ !@change_desc.empty?
225
235
  end
226
236
 
227
237
  def manage_user
@@ -290,9 +300,7 @@ class Chef
290
300
  end
291
301
 
292
302
  if diverged?(:hidden)
293
- converge_by("alter hidden") do
294
- set_hidden
295
- end
303
+ converge_by("alter hidden") { set_hidden }
296
304
  end
297
305
 
298
306
  reload_user_plist
@@ -608,7 +616,7 @@ class Chef
608
616
  end
609
617
 
610
618
  def run_dscl(*args)
611
- result = shell_out("dscl", "-plist", ".", "-#{args[0]}", args[1..-1])
619
+ result = shell_out("dscl", "-plist", ".", "-#{args[0]}", args[1..])
612
620
  return "" if ( args.first =~ /^delete/ ) && ( result.exitstatus != 0 )
613
621
  raise(Chef::Exceptions::DsclCommandFailed, "dscl error: #{result.inspect}") unless result.exitstatus == 0
614
622
  raise(Chef::Exceptions::DsclCommandFailed, "dscl error: #{result.inspect}") if /No such key: /.match?(result.stdout)
@@ -617,7 +625,7 @@ class Chef
617
625
  end
618
626
 
619
627
  def run_plutil(*args)
620
- result = shell_out("plutil", "-#{args[0]}", args[1..-1])
628
+ result = shell_out("plutil", "-#{args[0]}", args[1..])
621
629
  raise(Chef::Exceptions::PlistUtilCommandFailed, "plutil error: #{result.inspect}") unless result.exitstatus == 0
622
630
 
623
631
  result.stdout
@@ -25,7 +25,7 @@ class Chef
25
25
  class User
26
26
  class Solaris < Chef::Provider::User
27
27
  provides :solaris_user
28
- provides :user, os: %w{openindiana opensolaris illumos omnios solaris2 smartos}
28
+ provides :user, os: %w{openindiana illumos omnios solaris2 smartos}
29
29
 
30
30
  PASSWORD_FILE = "/etc/shadow".freeze
31
31
 
@@ -61,13 +61,20 @@ class Chef
61
61
  # <true>:: If a change is required
62
62
  # <false>:: If the users are identical
63
63
  def compare_user
64
+ @change_desc = []
64
65
  unless @net_user.validate_credentials(new_resource.password)
65
- logger.trace("#{new_resource} password has changed")
66
- return true
66
+ @change_desc << "update password"
67
67
  end
68
+
68
69
  %i{uid comment home shell full_name}.any? do |user_attrib|
69
- !new_resource.send(user_attrib).nil? && new_resource.send(user_attrib) != current_resource.send(user_attrib)
70
+ new_val = new_resource.send(user_attrib)
71
+ cur_val = current_resource.send(user_attrib)
72
+ if !new_val.nil? && new_val != cur_val
73
+ @change_desc << "change #{user_attrib} from #{cur_val} to #{new_val}"
74
+ end
70
75
  end
76
+
77
+ !@change_desc.empty?
71
78
  end
72
79
 
73
80
  def create_user
@@ -20,7 +20,7 @@ require_relative "../resource"
20
20
  require_relative "../dsl/declare_resource"
21
21
  require_relative "noop"
22
22
  require "shellwords" unless defined?(Shellwords)
23
- require_relative "../dist"
23
+ require "chef-utils/dist" unless defined?(ChefUtils::Dist)
24
24
 
25
25
  class Chef
26
26
  class Provider
@@ -110,7 +110,7 @@ class Chef
110
110
  logger.trace("Will use :cookbook_file resource to cache the gpg key locally")
111
111
  :cookbook_file
112
112
  else
113
- raise Chef::Exceptions::FileNotFound, "Cannot determine location of gpgkey. Must start with 'http' or be a file managed by #{Chef::Dist::PRODUCT}."
113
+ raise Chef::Exceptions::FileNotFound, "Cannot determine location of gpgkey. Must start with 'http' or be a file managed by #{ChefUtils::Dist::Infra::PRODUCT}."
114
114
  end
115
115
  end
116
116
 
@@ -113,7 +113,7 @@ class Chef
113
113
 
114
114
  # if resource.provider is set, just return one of those objects
115
115
  def maybe_explicit_provider(resource)
116
- resource.provider if resource.provider
116
+ resource.provider
117
117
  end
118
118
 
119
119
  # try dynamically finding a provider based on querying the providers to see what they support
@@ -47,11 +47,8 @@ require_relative "provider/systemd_unit"
47
47
  require_relative "provider/template"
48
48
  require_relative "provider/user"
49
49
  require_relative "provider/whyrun_safe_ruby_block"
50
- require_relative "provider/windows_env"
51
50
  require_relative "provider/yum_repository"
52
- require_relative "provider/windows_task"
53
51
  require_relative "provider/zypper_repository"
54
- require_relative "provider/windows_path"
55
52
 
56
53
  require_relative "provider/package/apt"
57
54
  require_relative "provider/package/chocolatey"
@@ -119,6 +116,7 @@ require_relative "provider/mount/mount"
119
116
  require_relative "provider/mount/aix"
120
117
  require_relative "provider/mount/solaris"
121
118
  require_relative "provider/mount/windows"
119
+ require_relative "provider/mount/linux"
122
120
 
123
121
  require_relative "provider/remote_file/ftp"
124
122
  require_relative "provider/remote_file/sftp"
@@ -0,0 +1,71 @@
1
+ #
2
+ # Author:: Matt Wrock (<mwrock@chef.io>)
3
+ # Copyright:: Copyright (c) Chef Software Inc.
4
+ # License:: Apache License, Version 2.0
5
+ #
6
+ # Licensed under the Apache License, Version 2.0 (the "License");
7
+ # you may not use this file except in compliance with the License.
8
+ # You may obtain a copy of the License at
9
+ #
10
+ # http://www.apache.org/licenses/LICENSE-2.0
11
+ #
12
+ # Unless required by applicable law or agreed to in writing, software
13
+ # distributed under the License is distributed on an "AS IS" BASIS,
14
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15
+ # See the License for the specific language governing permissions and
16
+ # limitations under the License.
17
+
18
+ class Chef
19
+ class Pwsh < Chef::PowerShell
20
+
21
+ # Run a command under pwsh (powershell core) via FFI
22
+ # This implementation requires the managed dll, native wrapper and a
23
+ # published, self contained dotnet core directory tree to exist in the
24
+ # bindir directory.
25
+ #
26
+ # @param script [String] script to run
27
+ # @return [Object] output
28
+ def initialize(script)
29
+ @dll = Pwsh.dll
30
+ super
31
+ end
32
+
33
+ protected
34
+
35
+ def exec(script)
36
+ # Note that we need to override the location of the shared dotnet core library
37
+ # location. With most .net core applications, you can simply publish them as a
38
+ # "self-contained" application allowing consumers of the application to run them
39
+ # and use its own stand alone version of the .net core runtime. However because
40
+ # this is simply a dll and not an exe, it will look for the runtime in the shared
41
+ # .net core installation folder. By setting DOTNET_MULTILEVEL_LOOKUP to 0 we can
42
+ # override that folder's location with DOTNET_ROOT. To avoid the possibility of
43
+ # interfering with other .net core processes that might rely on the common shared
44
+ # location, we revert these variables after the script completes.
45
+ original_dml = ENV["DOTNET_MULTILEVEL_LOOKUP"]
46
+ original_dotnet_root = ENV["DOTNET_ROOT"]
47
+ original_dotnet_root_x86 = ENV["DOTNET_ROOT(x86)"]
48
+
49
+ ENV["DOTNET_MULTILEVEL_LOOKUP"] = "0"
50
+ ENV["DOTNET_ROOT"] = RbConfig::CONFIG["bindir"]
51
+ ENV["DOTNET_ROOT(x86)"] = RbConfig::CONFIG["bindir"]
52
+
53
+ super
54
+ ensure
55
+ ENV["DOTNET_MULTILEVEL_LOOKUP"] = original_dml
56
+ ENV["DOTNET_ROOT"] = original_dotnet_root
57
+ ENV["DOTNET_ROOT(x86)"] = original_dotnet_root_x86
58
+ end
59
+
60
+ def self.dll
61
+ # This Powershell DLL source lives here: https://github.com/chef/chef-powershell-shim
62
+ # Every merge into that repo triggers a Habitat build and promotion. Running
63
+ # the rake :update_chef_exec_dll task in this (chef/chef) repo will pull down
64
+ # the built packages and copy the binaries to distro/ruby_bin_folder. Bundle install
65
+ # ensures that the correct architecture binaries are installed into the path.
66
+ # Also note that the version of pwsh is determined by which assemblies the dll was
67
+ # built with. To update powershell, those dependencies must be bumped.
68
+ @dll ||= Dir.glob("#{RbConfig::CONFIG["bindir"]}/**/Chef.PowerShell.Wrapper.Core.dll").last
69
+ end
70
+ end
71
+ end