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
@@ -20,7 +20,14 @@
20
20
  require_relative "base"
21
21
  require_relative "../handler/error_report"
22
22
  require_relative "../workstation_config_loader"
23
- require "uri" unless defined?(URI)
23
+ autoload :URI, "uri"
24
+ require "chef-utils" unless defined?(ChefUtils::CANARY)
25
+ module Mixlib
26
+ module Authentication
27
+ autoload :Log, "mixlib/authentication"
28
+ end
29
+ end
30
+ autoload :Train, "train"
24
31
 
25
32
  # DO NOT MAKE EDITS, see Chef::Application::Base
26
33
  #
@@ -45,7 +52,7 @@ class Chef::Application::Client < Chef::Application::Base
45
52
  option :pid_file,
46
53
  short: "-P PID_FILE",
47
54
  long: "--pid PIDFILE",
48
- description: "Set the PID file location, for the #{Chef::Dist::CLIENT} daemon process. Defaults to /tmp/chef-client.pid.",
55
+ description: "Set the PID file location, for the #{ChefUtils::Dist::Infra::CLIENT} daemon process. Defaults to /tmp/chef-client.pid.",
49
56
  proc: nil
50
57
 
51
58
  option :runlist,
@@ -100,7 +107,7 @@ class Chef::Application::Client < Chef::Application::Base
100
107
  tarball_path = File.join(Chef::Config.chef_repo_path, "recipes.tgz")
101
108
  fetch_recipe_tarball(Chef::Config[:recipe_url], tarball_path)
102
109
  Mixlib::Archive.new(tarball_path).extract(Chef::Config.chef_repo_path, perms: false, ignore: /^\.$/)
103
- config_path = File.join(Chef::Config.chef_repo_path, "#{Chef::Dist::USER_CONF_DIR}/config.rb")
110
+ config_path = File.join(Chef::Config.chef_repo_path, "#{ChefUtils::Dist::Infra::USER_CONF_DIR}/config.rb")
104
111
  Chef::Config.from_string(IO.read(config_path), config_path) if File.file?(config_path)
105
112
  end
106
113
  end
@@ -109,8 +116,12 @@ class Chef::Application::Client < Chef::Application::Base
109
116
  Chef::Config.chef_zero.port = config[:chef_zero_port] if config[:chef_zero_port]
110
117
 
111
118
  if config[:target] || Chef::Config.target
112
- Chef::Config.target_mode.enabled = true
113
119
  Chef::Config.target_mode.host = config[:target] || Chef::Config.target
120
+ if URI.parse(Chef::Config.target_mode.host).scheme
121
+ train_config = Train.unpack_target_from_uri(Chef::Config.target_mode.host)
122
+ Chef::Config.target_mode = train_config
123
+ end
124
+ Chef::Config.target_mode.enabled = true
114
125
  Chef::Config.node_name = Chef::Config.target_mode.host unless Chef::Config.node_name
115
126
  end
116
127
 
@@ -147,7 +158,7 @@ class Chef::Application::Client < Chef::Application::Base
147
158
  if config[:local_mode]
148
159
  config[:config_file] = Chef::WorkstationConfigLoader.new(nil, Chef::Log).config_location
149
160
  else
150
- config[:config_file] = Chef::Config.platform_specific_path("#{Chef::Dist::CONF_DIR}/client.rb")
161
+ config[:config_file] = Chef::Config.platform_specific_path("#{ChefConfig::Config.etc_chef_dir}/client.rb")
151
162
  end
152
163
  end
153
164
 
@@ -22,7 +22,7 @@ class Chef
22
22
  # These are the exit codes defined in Chef RFC 062
23
23
  # https://github.com/chef/chef-rfc/blob/master/rfc062-exit-status.md
24
24
  class ExitCode
25
- require_relative "../dist"
25
+ require "chef-utils/dist" unless defined?(ChefUtils::Dist)
26
26
 
27
27
  # -1 is defined as DEPRECATED_FAILURE in RFC 062, so it is
28
28
  # not enumerated in an active constant.
@@ -36,6 +36,7 @@ class Chef
36
36
  REBOOT_NEEDED: 37,
37
37
  REBOOT_FAILED: 41,
38
38
  # 42 was used by audit mode and should not be reused
39
+ CONFIG_FAILURE: 43,
39
40
  CLIENT_UPGRADED: 213,
40
41
  }.freeze
41
42
 
@@ -79,6 +80,8 @@ class Chef
79
80
  VALID_RFC_062_EXIT_CODES[:REBOOT_NEEDED]
80
81
  elsif reboot_failed?(exception)
81
82
  VALID_RFC_062_EXIT_CODES[:REBOOT_FAILED]
83
+ elsif configuration_failure?(exception)
84
+ VALID_RFC_062_EXIT_CODES[:CONFIG_FAILURE]
82
85
  elsif client_upgraded?(exception)
83
86
  VALID_RFC_062_EXIT_CODES[:CLIENT_UPGRADED]
84
87
  else
@@ -104,6 +107,12 @@ class Chef
104
107
  end
105
108
  end
106
109
 
110
+ def configuration_failure?(exception)
111
+ resolve_exception_array(exception).any? do |e|
112
+ e.is_a? Chef::Exceptions::ConfigurationError
113
+ end
114
+ end
115
+
107
116
  def client_upgraded?(exception)
108
117
  resolve_exception_array(exception).any? do |e|
109
118
  e.is_a? Chef::Exceptions::ClientUpgraded
@@ -144,9 +153,9 @@ class Chef
144
153
  end
145
154
 
146
155
  def non_standard_exit_code_warning(exit_code)
147
- "#{Chef::Dist::CLIENT} attempted to exit with a non-standard exit code of #{exit_code}." \
148
- " The #{Chef::Dist::PRODUCT} Exit Codes design document (https://github.com/chef/chef-rfc/blob/master/rfc062-exit-status.md)" \
149
- " defines the exit codes that should be used with #{Chef::Dist::CLIENT}. Chef::Application::ExitCode defines" \
156
+ "#{ChefUtils::Dist::Infra::CLIENT} attempted to exit with a non-standard exit code of #{exit_code}." \
157
+ " The #{ChefUtils::Dist::Infra::PRODUCT} Exit Codes design document (https://github.com/chef/chef-rfc/blob/master/rfc062-exit-status.md)" \
158
+ " defines the exit codes that should be used with #{ChefUtils::Dist::Infra::CLIENT}. Chef::Application::ExitCode defines" \
150
159
  " valid exit codes Non-standard exit codes are redefined as GENERIC_FAILURE."
151
160
  end
152
161
 
@@ -19,8 +19,10 @@ require_relative "../knife"
19
19
  require_relative "../application"
20
20
  require "mixlib/log"
21
21
  require "ohai/config"
22
- require "chef/monkey_patches/net_http.rb"
23
- require_relative "../dist"
22
+ module Net
23
+ autoload :HTTP, "net/http"
24
+ end
25
+ require "chef-utils/dist" unless defined?(ChefUtils::Dist)
24
26
 
25
27
  class Chef::Application::Knife < Chef::Application
26
28
 
@@ -59,7 +61,7 @@ class Chef::Application::Knife < Chef::Application
59
61
  option :environment,
60
62
  short: "-E ENVIRONMENT",
61
63
  long: "--environment ENVIRONMENT",
62
- description: "Set the #{Chef::Dist::PRODUCT} environment (except for in searches, where this will be flagrantly ignored)."
64
+ description: "Set the #{ChefUtils::Dist::Infra::PRODUCT} environment (except for in searches, where this will be flagrantly ignored)."
63
65
 
64
66
  option :editor,
65
67
  short: "-e EDITOR",
@@ -84,18 +86,18 @@ class Chef::Application::Knife < Chef::Application
84
86
  option :node_name,
85
87
  short: "-u USER",
86
88
  long: "--user USER",
87
- description: "#{Chef::Dist::SERVER_PRODUCT} API client username."
89
+ description: "#{ChefUtils::Dist::Server::PRODUCT} API client username."
88
90
 
89
91
  option :client_key,
90
92
  short: "-k KEY",
91
93
  long: "--key KEY",
92
- description: "#{Chef::Dist::SERVER_PRODUCT} API client key.",
94
+ description: "#{ChefUtils::Dist::Server::PRODUCT} API client key.",
93
95
  proc: lambda { |path| File.expand_path(path, Dir.pwd) }
94
96
 
95
97
  option :chef_server_url,
96
98
  short: "-s URL",
97
99
  long: "--server-url URL",
98
- description: "#{Chef::Dist::SERVER_PRODUCT} URL."
100
+ description: "#{ChefUtils::Dist::Server::PRODUCT} URL."
99
101
 
100
102
  option :yes,
101
103
  short: "-y",
@@ -120,16 +122,16 @@ class Chef::Application::Knife < Chef::Application
120
122
  option :local_mode,
121
123
  short: "-z",
122
124
  long: "--local-mode",
123
- description: "Point knife commands at local repository instead of #{Chef::Dist::SERVER_PRODUCT}.",
125
+ description: "Point knife commands at local repository instead of #{ChefUtils::Dist::Server::PRODUCT}.",
124
126
  boolean: true
125
127
 
126
128
  option :chef_zero_host,
127
129
  long: "--chef-zero-host HOST",
128
- description: "Host to start #{Chef::Dist::ZERO} on."
130
+ description: "Host to start #{ChefUtils::Dist::Zero::PRODUCT} on."
129
131
 
130
132
  option :chef_zero_port,
131
133
  long: "--chef-zero-port PORT",
132
- description: "Port (or port range) to start #{Chef::Dist::ZERO} on. Port ranges like 1000,1010 or 8889-9999 will try all given ports until one works."
134
+ description: "Port (or port range) to start #{ChefUtils::Dist::Zero::PRODUCT} on. Port ranges like 1000,1010 or 8889-9999 will try all given ports until one works."
133
135
 
134
136
  option :listen,
135
137
  long: "--[no-]listen",
@@ -139,9 +141,9 @@ class Chef::Application::Knife < Chef::Application
139
141
  option :version,
140
142
  short: "-v",
141
143
  long: "--version",
142
- description: "Show #{Chef::Dist::PRODUCT} version.",
144
+ description: "Show #{ChefUtils::Dist::Infra::PRODUCT} version.",
143
145
  boolean: true,
144
- proc: lambda { |v| puts "#{Chef::Dist::PRODUCT}: #{::Chef::VERSION}" },
146
+ proc: lambda { |v| puts "#{ChefUtils::Dist::Infra::PRODUCT}: #{::Chef::VERSION}" },
145
147
  exit: 0
146
148
 
147
149
  option :fips,
@@ -214,6 +216,15 @@ class Chef::Application::Knife < Chef::Application
214
216
  rescue OptionParser::InvalidOption => e
215
217
  puts "#{e}\n"
216
218
  end
219
+
220
+ if want_help?
221
+ puts "#{ChefUtils::Dist::Infra::PRODUCT}: #{Chef::VERSION}"
222
+ puts
223
+ puts "Docs: #{ChefUtils::Dist::Org::KNIFE_DOCS}"
224
+ puts "Patents: #{ChefUtils::Dist::Org::PATENTS}"
225
+ puts
226
+ end
227
+
217
228
  puts opt_parser
218
229
  puts
219
230
  Chef::Knife.list_commands
@@ -21,6 +21,7 @@ require_relative "../../chef"
21
21
  require_relative "client"
22
22
  require "fileutils" unless defined?(FileUtils)
23
23
  require "pathname" unless defined?(Pathname)
24
+ require "chef-utils" unless defined?(ChefUtils::CANARY)
24
25
 
25
26
  # DO NOT MAKE EDITS, see Chef::Application::Base
26
27
  #
@@ -33,7 +34,7 @@ class Chef::Application::Solo < Chef::Application::Base
33
34
  option :config_file,
34
35
  short: "-c CONFIG",
35
36
  long: "--config CONFIG",
36
- default: Chef::Config.platform_specific_path("#{Chef::Dist::CONF_DIR}/solo.rb"),
37
+ default: Chef::Config.platform_specific_path("#{ChefConfig::Config.etc_chef_dir}/solo.rb"),
37
38
  description: "The configuration file to use."
38
39
 
39
40
  unless ChefUtils.windows?
@@ -29,7 +29,7 @@ require "socket" unless defined?(Socket)
29
29
  require "uri" unless defined?(URI)
30
30
  require "win32/daemon"
31
31
  require_relative "../mixin/shell_out"
32
- require_relative "../dist"
32
+ require "chef-utils/dist" unless defined?(ChefUtils::Dist)
33
33
 
34
34
  class Chef
35
35
  class Application
@@ -41,7 +41,7 @@ class Chef
41
41
  short: "-c CONFIG",
42
42
  long: "--config CONFIG",
43
43
  default: "#{Chef::Config.etc_chef_dir}/client.rb",
44
- description: "The configuration file to use for #{Chef::Dist::PRODUCT} runs."
44
+ description: "The configuration file to use for #{ChefUtils::Dist::Infra::PRODUCT} runs."
45
45
 
46
46
  option :log_location,
47
47
  short: "-L LOGLOCATION",
@@ -57,7 +57,7 @@ class Chef
57
57
  option :interval,
58
58
  short: "-i SECONDS",
59
59
  long: "--interval SECONDS",
60
- description: "Set the number of seconds to wait between #{Chef::Dist::PRODUCT} runs.",
60
+ description: "Set the number of seconds to wait between #{ChefUtils::Dist::Infra::PRODUCT} runs.",
61
61
  proc: lambda { |s| s.to_i }
62
62
 
63
63
  DEFAULT_LOG_LOCATION ||= "#{Chef::Config.c_chef_dir}/client.log".freeze
@@ -67,7 +67,7 @@ class Chef
67
67
  @service_signal = ConditionVariable.new
68
68
 
69
69
  reconfigure
70
- Chef::Log.info("#{Chef::Dist::CLIENT} Service initialized")
70
+ Chef::Log.info("#{ChefUtils::Dist::Infra::CLIENT} Service initialized")
71
71
  end
72
72
 
73
73
  def service_main(*startup_parameters)
@@ -79,7 +79,7 @@ class Chef
79
79
  # Grab the service_action_mutex to make a chef-client run
80
80
  @service_action_mutex.synchronize do
81
81
 
82
- Chef::Log.info("Next #{Chef::Dist::CLIENT} run will happen in #{timeout} seconds")
82
+ Chef::Log.info("Next #{ChefUtils::Dist::Infra::CLIENT} run will happen in #{timeout} seconds")
83
83
  @service_signal.wait(@service_action_mutex, timeout)
84
84
 
85
85
  # Continue only if service is RUNNING
@@ -96,7 +96,7 @@ class Chef
96
96
  # run chef-client only if service is in RUNNING state
97
97
  next if state != RUNNING
98
98
 
99
- Chef::Log.info("#{Chef::Dist::CLIENT} service is starting a #{Chef::Dist::CLIENT} run...")
99
+ Chef::Log.info("#{ChefUtils::Dist::Infra::CLIENT} service is starting a #{ChefUtils::Dist::Infra::CLIENT} run...")
100
100
  run_chef_client
101
101
  rescue SystemExit => e
102
102
  # Do not raise any of the errors here in order to
@@ -131,12 +131,12 @@ class Chef
131
131
  break
132
132
  else
133
133
  unless run_warning_displayed
134
- Chef::Log.info("Currently a #{Chef::Dist::PRODUCT} run is happening on this system.")
134
+ Chef::Log.info("Currently a #{ChefUtils::Dist::Infra::PRODUCT} run is happening on this system.")
135
135
  Chef::Log.info("Service will stop when run is completed.")
136
136
  run_warning_displayed = true
137
137
  end
138
138
 
139
- Chef::Log.trace("Waiting for #{Chef::Dist::PRODUCT} run...")
139
+ Chef::Log.trace("Waiting for #{ChefUtils::Dist::Infra::PRODUCT} run...")
140
140
  sleep 1
141
141
  end
142
142
  end
@@ -150,7 +150,7 @@ class Chef
150
150
  # since this is a PAUSE signal.
151
151
 
152
152
  if @service_action_mutex.locked?
153
- Chef::Log.info("Currently a #{Chef::Dist::PRODUCT} run is happening.")
153
+ Chef::Log.info("Currently a #{ChefUtils::Dist::Infra::PRODUCT} run is happening.")
154
154
  Chef::Log.info("Service will pause once it's completed.")
155
155
  else
156
156
  Chef::Log.info("Service is pausing....")
@@ -185,7 +185,7 @@ class Chef
185
185
  # The log_location and config_file of the parent process is passed to the new chef-client process.
186
186
  # We need to add the --no-fork, as by default it is set to fork=true.
187
187
 
188
- Chef::Log.info "Starting #{Chef::Dist::CLIENT} in a new process"
188
+ Chef::Log.info "Starting #{ChefUtils::Dist::Infra::CLIENT} in a new process"
189
189
  # Pass config params to the new process
190
190
  config_params = " --no-fork"
191
191
  config_params += " -c #{Chef::Config[:config_file]}" unless Chef::Config[:config_file].nil?
@@ -197,20 +197,20 @@ class Chef
197
197
  # Starts a new process and waits till the process exits
198
198
 
199
199
  result = shell_out(
200
- "#{Chef::Dist::CLIENT}.bat #{config_params}",
200
+ "#{ChefUtils::Dist::Infra::CLIENT}.bat #{config_params}",
201
201
  timeout: Chef::Config[:windows_service][:watchdog_timeout],
202
202
  logger: Chef::Log
203
203
  )
204
204
  Chef::Log.trace (result.stdout).to_s
205
205
  Chef::Log.trace (result.stderr).to_s
206
206
  rescue Mixlib::ShellOut::CommandTimeout => e
207
- Chef::Log.error "#{Chef::Dist::CLIENT} timed out\n(#{e})"
207
+ Chef::Log.error "#{ChefUtils::Dist::Infra::CLIENT} timed out\n(#{e})"
208
208
  Chef::Log.error(<<-EOF)
209
- Your #{Chef::Dist::CLIENT} run timed out. You can increase the time #{Chef::Dist::CLIENT} is given
209
+ Your #{ChefUtils::Dist::Infra::CLIENT} run timed out. You can increase the time #{ChefUtils::Dist::Infra::CLIENT} is given
210
210
  to complete by configuring windows_service.watchdog_timeout in your client.rb.
211
211
  EOF
212
212
  rescue Mixlib::ShellOut::ShellCommandFailed => e
213
- Chef::Log.warn "Not able to start #{Chef::Dist::CLIENT} in new process (#{e})"
213
+ Chef::Log.warn "Not able to start #{ChefUtils::Dist::Infra::CLIENT} in new process (#{e})"
214
214
  rescue => e
215
215
  Chef::Log.error e
216
216
  ensure
@@ -21,7 +21,7 @@ if RUBY_PLATFORM.match?(/mswin|mingw32|windows/)
21
21
  end
22
22
  require_relative "../config"
23
23
  require "mixlib/cli" unless defined?(Mixlib::CLI)
24
- require_relative "../dist"
24
+ require "chef-utils/dist" unless defined?(ChefUtils::Dist)
25
25
 
26
26
  class Chef
27
27
  class Application
@@ -41,18 +41,18 @@ class Chef
41
41
  short: "-a ACTION",
42
42
  long: "--action ACTION",
43
43
  default: "status",
44
- description: "Action to carry out on #{Chef::Dist::SHORT}-service (install, uninstall, status, start, stop, pause, or resume)."
44
+ description: "Action to carry out on #{ChefUtils::Dist::Infra::SHORT}-service (install, uninstall, status, start, stop, pause, or resume)."
45
45
 
46
46
  option :config_file,
47
47
  short: "-c CONFIG",
48
48
  long: "--config CONFIG",
49
49
  default: "#{ChefConfig::Config.c_chef_dir}/client.rb",
50
- description: "The configuration file to use for #{Chef::Dist::PRODUCT} runs."
50
+ description: "The configuration file to use for #{ChefUtils::Dist::Infra::PRODUCT} runs."
51
51
 
52
52
  option :log_location,
53
53
  short: "-L LOGLOCATION",
54
54
  long: "--logfile LOGLOCATION",
55
- description: "Set the log file location for #{Chef::Dist::SHORT}-service."
55
+ description: "Set the log file location for #{ChefUtils::Dist::Infra::SHORT}-service."
56
56
 
57
57
  option :help,
58
58
  short: "-h",
@@ -66,9 +66,9 @@ class Chef
66
66
  option :version,
67
67
  short: "-v",
68
68
  long: "--version",
69
- description: "Show #{Chef::Dist::PRODUCT} version.",
69
+ description: "Show #{ChefUtils::Dist::Infra::PRODUCT} version.",
70
70
  boolean: true,
71
- proc: lambda { |v| puts "#{Chef::Dist::PRODUCT}: #{::Chef::VERSION}" },
71
+ proc: lambda { |v| puts "#{ChefUtils::Dist::Infra::PRODUCT}: #{::Chef::VERSION}" },
72
72
  exit: 0
73
73
 
74
74
  def initialize(service_options)
@@ -265,7 +265,7 @@ class Chef
265
265
  @memory_store.get(path)
266
266
 
267
267
  elsif path[0] == "file_store" && path[1] == "repo"
268
- entry = Chef::ChefFS::FileSystem.resolve_path(chef_fs, path[2..-1].join("/"))
268
+ entry = Chef::ChefFS::FileSystem.resolve_path(chef_fs, path[2..].join("/"))
269
269
  begin
270
270
  entry.read
271
271
  rescue Chef::ChefFS::FileSystem::NotFoundError => e
@@ -24,7 +24,7 @@ class Chef
24
24
  end
25
25
 
26
26
  def preserve_key?(key)
27
- key == "cookbook_name" || key == "version"
27
+ %w{cookbook_name version}.include?(key)
28
28
  end
29
29
 
30
30
  def chef_class
@@ -204,7 +204,7 @@ class Chef
204
204
  end
205
205
 
206
206
  # Skip // and /./ (pretend it's not there)
207
- if exact == "" || exact == "."
207
+ if ["", "."].include?(exact)
208
208
  next
209
209
  end
210
210
 
@@ -64,7 +64,7 @@ class Chef
64
64
  if is_dir
65
65
  return recursive && name != "." && name != ".."
66
66
  elsif ruby_only
67
- return false if name[-3..-1] != ".rb"
67
+ return false if name[-3..] != ".rb"
68
68
  end
69
69
 
70
70
  # Check chefignore
@@ -18,7 +18,7 @@
18
18
 
19
19
  require_relative "../knife"
20
20
  require "pathname" unless defined?(Pathname)
21
- require_relative "../dist"
21
+ require "chef-utils/dist" unless defined?(ChefUtils::Dist)
22
22
 
23
23
  class Chef
24
24
  module ChefFS
@@ -49,7 +49,7 @@ class Chef
49
49
 
50
50
  option :chef_repo_path,
51
51
  long: "--chef-repo-path PATH",
52
- description: "Overrides the location of #{Chef::Dist::PRODUCT} repo. Default is specified by chef_repo_path in the config"
52
+ description: "Overrides the location of #{ChefUtils::Dist::Infra::PRODUCT} repo. Default is specified by chef_repo_path in the config"
53
53
 
54
54
  option :concurrency,
55
55
  long: "--concurrency THREADS",
@@ -1,4 +1,3 @@
1
- require "thread"
2
1
  require_relative "parallelizer/parallel_enumerable"
3
2
 
4
3
  class Chef
@@ -29,7 +29,7 @@ require_relative "api_client/registration"
29
29
  require_relative "node"
30
30
  require_relative "role"
31
31
  require_relative "file_cache"
32
- require_relative "run_context"
32
+ Chef.autoload :RunContext, File.expand_path("run_context", __dir__)
33
33
  require_relative "runner"
34
34
  require_relative "run_status"
35
35
  require_relative "cookbook/cookbook_collection"
@@ -48,16 +48,17 @@ require_relative "action_collection"
48
48
  require_relative "resource_reporter"
49
49
  require_relative "data_collector"
50
50
  require_relative "run_lock"
51
- require_relative "policy_builder"
51
+ Chef.autoload :PolicyBuilder, File.expand_path("policy_builder", __dir__)
52
52
  require_relative "request_id"
53
53
  require_relative "platform/rebooter"
54
54
  require_relative "mixin/deprecation"
55
55
  require "chef-utils" unless defined?(ChefUtils::CANARY)
56
56
  require "ohai" unless defined?(Ohai::System)
57
57
  require "rbconfig" unless defined?(RbConfig)
58
- require_relative "dist"
59
58
  require "forwardable" unless defined?(Forwardable)
60
59
 
60
+ require_relative "compliance/runner"
61
+
61
62
  class Chef
62
63
  # == Chef::Client
63
64
  # The main object in a Chef run. Preps a Chef::Node and Chef::RunContext,
@@ -236,6 +237,7 @@ class Chef
236
237
 
237
238
  events.register(Chef::DataCollector::Reporter.new(events))
238
239
  events.register(Chef::ActionCollection.new(events))
240
+ events.register(Chef::Compliance::Runner.new)
239
241
 
240
242
  run_status.run_id = request_id = Chef::RequestID.instance.request_id
241
243
 
@@ -244,19 +246,15 @@ class Chef
244
246
  run_status.run_context = run_context
245
247
 
246
248
  events.run_start(Chef::VERSION, run_status)
247
-
248
- logger.info("*** #{Chef::Dist::PRODUCT} #{Chef::VERSION} ***")
249
+ logger.info("*** #{ChefUtils::Dist::Infra::PRODUCT} #{Chef::VERSION} ***")
249
250
  logger.info("Platform: #{RUBY_PLATFORM}")
250
- logger.info "#{Chef::Dist::CLIENT.capitalize} pid: #{Process.pid}"
251
+ logger.info "#{ChefUtils::Dist::Infra::CLIENT.capitalize} pid: #{Process.pid}"
251
252
  logger.info "Targeting node: #{Chef::Config.target_mode.host}" if Chef::Config.target_mode?
252
- logger.debug("#{Chef::Dist::CLIENT.capitalize} request_id: #{request_id}")
253
+ logger.debug("#{ChefUtils::Dist::Infra::CLIENT.capitalize} request_id: #{request_id}")
254
+ logger.warn("`enforce_path_sanity` is deprecated, please use `enforce_default_paths` instead!") if Chef::Config[:enforce_path_sanity]
253
255
  ENV["PATH"] = ChefUtils::DSL::DefaultPaths.default_paths if Chef::Config[:enforce_default_paths] || Chef::Config[:enforce_path_sanity]
254
256
 
255
- if Chef::Config.target_mode?
256
- get_ohai_data_remotely
257
- else
258
- run_ohai
259
- end
257
+ run_ohai
260
258
 
261
259
  unless Chef::Config[:solo_legacy_mode]
262
260
  register
@@ -273,7 +271,7 @@ class Chef
273
271
  build_node
274
272
 
275
273
  run_status.start_clock
276
- logger.info("Starting #{Chef::Dist::PRODUCT} Run for #{node.name}")
274
+ logger.info("Starting #{ChefUtils::Dist::Infra::PRODUCT} Run for #{node.name}")
277
275
  run_started
278
276
 
279
277
  do_windows_admin_check
@@ -288,7 +286,7 @@ class Chef
288
286
  converge_and_save(run_context)
289
287
 
290
288
  run_status.stop_clock
291
- logger.info("#{Chef::Dist::PRODUCT} Run complete in #{run_status.elapsed_time} seconds")
289
+ logger.info("#{ChefUtils::Dist::Infra::PRODUCT} Run complete in #{run_status.elapsed_time} seconds")
292
290
  run_completed_successfully
293
291
  events.run_completed(node, run_status)
294
292
 
@@ -334,7 +332,7 @@ class Chef
334
332
  eol_year = 2006 + Gem::Version.new(Chef::VERSION).segments.first
335
333
 
336
334
  if Time.now > Time.new(eol_year, 5, 01)
337
- logger.warn("This release of #{Chef::Dist::PRODUCT} became end of life (EOL) on May 1st #{eol_year}. Please update to a supported release to receive new features, bug fixes, and security updates.")
335
+ logger.warn("This release of #{ChefUtils::Dist::Infra::PRODUCT} became end of life (EOL) on May 1st #{eol_year}. Please update to a supported release to receive new features, bug fixes, and security updates.")
338
336
  end
339
337
  end
340
338
 
@@ -576,32 +574,6 @@ class Chef
576
574
  end
577
575
  end
578
576
 
579
- #
580
- # Populate the minimal ohai attributes defined in #run_ohai with data train collects.
581
- #
582
- # Eventually ohai may support colleciton of data.
583
- #
584
- def get_ohai_data_remotely
585
- ohai.data[:fqdn] = if transport_connection.respond_to?(:hostname)
586
- transport_connection.hostname
587
- else
588
- Chef::Config[:target_mode][:host]
589
- end
590
- if transport_connection.respond_to?(:os)
591
- ohai.data[:platform] = transport_connection.os.name
592
- ohai.data[:platform_version] = transport_connection.os.release
593
- ohai.data[:os] = transport_connection.os.family_hierarchy[1]
594
- ohai.data[:platform_family] = transport_connection.os.family
595
- end
596
- # train does not collect these specifically
597
- # ohai.data[:machinename] = nil
598
- # ohai.data[:hostname] = nil
599
- # ohai.data[:os_version] = nil # kernel version
600
-
601
- ohai.data[:ohai_time] = Time.now.to_f
602
- events.ohai_completed(node)
603
- end
604
-
605
577
  #
606
578
  # Run ohai plugins. Runs all ohai plugins unless minimal_ohai is specified.
607
579
  #
@@ -614,6 +586,7 @@ class Chef
614
586
  #
615
587
  def run_ohai
616
588
  filter = Chef::Config[:minimal_ohai] ? %w{fqdn machinename hostname platform platform_version ohai_time os os_version init_package} : nil
589
+ ohai.transport_connection = transport_connection if Chef::Config.target_mode?
617
590
  ohai.all_plugins(filter)
618
591
  events.ohai_completed(node)
619
592
  end
@@ -763,7 +736,7 @@ class Chef
763
736
  logger.trace("Checking for administrator privileges....")
764
737
 
765
738
  if !has_admin_privileges?
766
- message = "#{Chef::Dist::CLIENT} doesn't have administrator privileges on node #{node_name}."
739
+ message = "#{ChefUtils::Dist::Infra::CLIENT} doesn't have administrator privileges on node #{node_name}."
767
740
  if Chef::Config[:fatal_windows_admin_check]
768
741
  logger.fatal(message)
769
742
  logger.fatal("fatal_windows_admin_check is set to TRUE.")
@@ -772,7 +745,7 @@ class Chef
772
745
  logger.warn("#{message} This might cause unexpected resource failures.")
773
746
  end
774
747
  else
775
- logger.trace("#{Chef::Dist::CLIENT} has administrator privileges on node #{node_name}.")
748
+ logger.trace("#{ChefUtils::Dist::Infra::CLIENT} has administrator privileges on node #{node_name}.")
776
749
  end
777
750
  end
778
751
  end