chef 16.5.64 → 16.8.14

Sign up to get free protection for your applications and to get access to all the features.
Files changed (317) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +6 -14
  3. data/README.md +1 -1
  4. data/Rakefile +21 -14
  5. data/chef-universal-mingw32.gemspec +1 -1
  6. data/chef.gemspec +3 -2
  7. data/lib/chef/application.rb +2 -2
  8. data/lib/chef/application/base.rb +1 -1
  9. data/lib/chef/application/client.rb +7 -2
  10. data/lib/chef/application/knife.rb +1 -1
  11. data/lib/chef/application/solo.rb +1 -1
  12. data/lib/chef/chef_fs/chef_fs_data_store.rb +1 -1
  13. data/lib/chef/chef_fs/data_handler/cookbook_data_handler.rb +1 -1
  14. data/lib/chef/chef_fs/file_pattern.rb +1 -1
  15. data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_entry.rb +1 -1
  16. data/lib/chef/client.rb +6 -32
  17. data/lib/chef/compliance/default_attributes.rb +89 -0
  18. data/lib/chef/compliance/fetcher/automate.rb +69 -0
  19. data/lib/chef/compliance/fetcher/chef_server.rb +134 -0
  20. data/lib/chef/compliance/reporter/automate.rb +202 -0
  21. data/lib/chef/compliance/reporter/chef_server_automate.rb +94 -0
  22. data/lib/chef/compliance/reporter/compliance_enforcer.rb +20 -0
  23. data/lib/chef/compliance/reporter/json_file.rb +19 -0
  24. data/lib/chef/compliance/runner.rb +261 -0
  25. data/lib/chef/cookbook/gem_installer.rb +1 -1
  26. data/lib/chef/cookbook_manifest.rb +2 -1
  27. data/lib/chef/cookbook_site_streaming_uploader.rb +1 -1
  28. data/lib/chef/cookbook_version.rb +2 -5
  29. data/lib/chef/data_collector.rb +1 -1
  30. data/lib/chef/encrypted_data_bag_item/assertions.rb +1 -1
  31. data/lib/chef/environment.rb +1 -1
  32. data/lib/chef/event_loggers/windows_eventlog.rb +1 -1
  33. data/lib/chef/exceptions.rb +5 -1
  34. data/lib/chef/file_access_control/windows.rb +1 -4
  35. data/lib/chef/file_content_management/tempfile.rb +1 -1
  36. data/lib/chef/formatters/error_inspectors/compile_error_inspector.rb +2 -2
  37. data/lib/chef/formatters/error_inspectors/resource_failure_inspector.rb +5 -5
  38. data/lib/chef/formatters/indentable_output_stream.rb +2 -2
  39. data/lib/chef/guard_interpreter/resource_guard_interpreter.rb +28 -39
  40. data/lib/chef/http.rb +2 -12
  41. data/lib/chef/http/basic_client.rb +1 -1
  42. data/lib/chef/http/http_request.rb +1 -1
  43. data/lib/chef/http/socketless_chef_zero_client.rb +1 -1
  44. data/lib/chef/http/ssl_policies.rb +6 -0
  45. data/lib/chef/json_compat.rb +2 -7
  46. data/lib/chef/key.rb +1 -1
  47. data/lib/chef/knife/bootstrap.rb +2 -1
  48. data/lib/chef/knife/bootstrap/templates/windows-chef-client-msi.erb +2 -2
  49. data/lib/chef/knife/bootstrap/train_connector.rb +1 -1
  50. data/lib/chef/knife/config_show.rb +1 -1
  51. data/lib/chef/knife/core/cookbook_scm_repo.rb +1 -1
  52. data/lib/chef/knife/core/gem_glob_loader.rb +1 -1
  53. data/lib/chef/knife/core/ui.rb +5 -2
  54. data/lib/chef/knife/core/windows_bootstrap_context.rb +7 -4
  55. data/lib/chef/knife/node_policy_set.rb +2 -2
  56. data/lib/chef/knife/node_run_list_add.rb +1 -1
  57. data/lib/chef/knife/node_run_list_remove.rb +1 -1
  58. data/lib/chef/knife/node_run_list_set.rb +1 -1
  59. data/lib/chef/knife/role_env_run_list_add.rb +1 -1
  60. data/lib/chef/knife/role_env_run_list_set.rb +1 -1
  61. data/lib/chef/knife/role_run_list_add.rb +1 -1
  62. data/lib/chef/knife/role_run_list_set.rb +1 -1
  63. data/lib/chef/knife/search.rb +0 -1
  64. data/lib/chef/knife/ssh.rb +5 -3
  65. data/lib/chef/knife/tag_create.rb +1 -1
  66. data/lib/chef/knife/tag_delete.rb +1 -1
  67. data/lib/chef/local_mode.rb +1 -1
  68. data/lib/chef/mixin/convert_to_class_name.rb +0 -56
  69. data/lib/chef/mixin/openssl_helper.rb +1 -1
  70. data/lib/chef/mixin/powershell_exec.rb +24 -10
  71. data/lib/chef/mixin/powershell_out.rb +12 -5
  72. data/lib/chef/mixin/properties.rb +2 -0
  73. data/lib/chef/mixin/template.rb +1 -1
  74. data/lib/chef/mixin/unformatter.rb +1 -1
  75. data/lib/chef/mixin/uris.rb +3 -1
  76. data/lib/chef/node/attribute_collections.rb +2 -6
  77. data/lib/chef/node/mixin/immutablize_hash.rb +2 -0
  78. data/lib/chef/node_map.rb +2 -2
  79. data/lib/chef/platform/query_helpers.rb +4 -4
  80. data/lib/chef/policy_builder/dynamic.rb +2 -0
  81. data/lib/chef/powershell.rb +10 -4
  82. data/lib/chef/property.rb +1 -1
  83. data/lib/chef/provider.rb +1 -1
  84. data/lib/chef/provider/cron.rb +2 -13
  85. data/lib/chef/provider/dsc_resource.rb +12 -24
  86. data/lib/chef/provider/dsc_script.rb +16 -20
  87. data/lib/chef/provider/file.rb +1 -1
  88. data/lib/chef/provider/git.rb +5 -5
  89. data/lib/chef/provider/group.rb +14 -6
  90. data/lib/chef/provider/group/windows.rb +12 -1
  91. data/lib/chef/provider/ifconfig.rb +8 -8
  92. data/lib/chef/provider/ifconfig/debian.rb +38 -22
  93. data/lib/chef/provider/ifconfig/redhat.rb +54 -18
  94. data/lib/chef/provider/launchd.rb +1 -11
  95. data/lib/chef/provider/link.rb +0 -9
  96. data/lib/chef/provider/mount.rb +18 -1
  97. data/lib/chef/provider/mount/linux.rb +4 -0
  98. data/lib/chef/provider/mount/mount.rb +41 -43
  99. data/lib/chef/provider/package.rb +3 -0
  100. data/lib/chef/provider/package/apt.rb +1 -1
  101. data/lib/chef/provider/package/chocolatey.rb +6 -6
  102. data/lib/chef/provider/package/dpkg.rb +3 -12
  103. data/lib/chef/provider/package/freebsd/base.rb +3 -2
  104. data/lib/chef/provider/package/freebsd/pkgng.rb +1 -1
  105. data/lib/chef/provider/package/homebrew.rb +1 -1
  106. data/lib/chef/provider/package/ips.rb +1 -1
  107. data/lib/chef/provider/package/powershell.rb +2 -3
  108. data/lib/chef/provider/package/rubygems.rb +1 -1
  109. data/lib/chef/provider/package/snap.rb +1 -3
  110. data/lib/chef/provider/package/solaris.rb +0 -2
  111. data/lib/chef/provider/package/yum/rpm_utils.rb +1 -1
  112. data/lib/chef/provider/package/zypper.rb +98 -71
  113. data/lib/chef/provider/powershell_script.rb +12 -1
  114. data/lib/chef/provider/registry_key.rb +4 -3
  115. data/lib/chef/provider/route.rb +2 -2
  116. data/lib/chef/provider/service/debian.rb +2 -1
  117. data/lib/chef/provider/service/redhat.rb +1 -1
  118. data/lib/chef/provider/user.rb +17 -9
  119. data/lib/chef/provider/user/aix.rb +1 -1
  120. data/lib/chef/provider/user/dscl.rb +2 -2
  121. data/lib/chef/provider/user/mac.rb +14 -6
  122. data/lib/chef/provider/user/solaris.rb +1 -1
  123. data/lib/chef/provider/user/windows.rb +10 -3
  124. data/lib/chef/providers.rb +0 -3
  125. data/lib/chef/pwsh.rb +71 -0
  126. data/lib/chef/resource.rb +1 -1
  127. data/lib/chef/resource/apt_repository.rb +6 -5
  128. data/lib/chef/resource/bash.rb +119 -1
  129. data/lib/chef/resource/batch.rb +1 -1
  130. data/lib/chef/resource/breakpoint.rb +3 -1
  131. data/lib/chef/resource/build_essential.rb +5 -8
  132. data/lib/chef/resource/chef_client_config.rb +313 -0
  133. data/lib/chef/resource/chef_client_cron.rb +5 -5
  134. data/lib/chef/resource/chef_client_scheduled_task.rb +4 -4
  135. data/lib/chef/resource/chef_client_systemd_timer.rb +5 -5
  136. data/lib/chef/resource/chef_handler.rb +1 -0
  137. data/lib/chef/resource/chef_sleep.rb +1 -1
  138. data/lib/chef/resource/cron/_cron_shared.rb +1 -0
  139. data/lib/chef/resource/cron/cron_d.rb +2 -2
  140. data/lib/chef/resource/csh.rb +2 -2
  141. data/lib/chef/resource/dsc_script.rb +8 -1
  142. data/lib/chef/resource/execute.rb +6 -4
  143. data/lib/chef/resource/file.rb +2 -2
  144. data/lib/chef/resource/homebrew_update.rb +4 -1
  145. data/lib/chef/resource/hostname.rb +5 -5
  146. data/lib/chef/resource/ifconfig.rb +52 -5
  147. data/lib/chef/resource/kernel_module.rb +1 -1
  148. data/lib/chef/resource/ksh.rb +3 -3
  149. data/lib/chef/resource/launchd.rb +15 -15
  150. data/lib/chef/resource/lwrp_base.rb +3 -5
  151. data/lib/chef/resource/mount.rb +8 -2
  152. data/lib/chef/resource/perl.rb +2 -2
  153. data/lib/chef/resource/plist.rb +2 -6
  154. data/lib/chef/resource/powershell_package_source.rb +19 -18
  155. data/lib/chef/resource/powershell_script.rb +14 -11
  156. data/lib/chef/resource/python.rb +2 -2
  157. data/lib/chef/resource/registry_key.rb +93 -2
  158. data/lib/chef/resource/route.rb +1 -1
  159. data/lib/chef/resource/ruby.rb +2 -2
  160. data/lib/chef/resource/scm/_scm.rb +2 -1
  161. data/lib/chef/resource/scm/git.rb +82 -1
  162. data/lib/chef/resource/scm/subversion.rb +12 -0
  163. data/lib/chef/resource/script.rb +2 -2
  164. data/lib/chef/resource/solaris_package.rb +0 -2
  165. data/lib/chef/resource/sudo.rb +1 -1
  166. data/lib/chef/resource/support/client.erb +64 -0
  167. data/lib/chef/resource/systemd_unit.rb +42 -1
  168. data/lib/chef/resource/template.rb +2 -2
  169. data/lib/chef/resource/windows_ad_join.rb +9 -9
  170. data/lib/chef/resource/windows_audit_policy.rb +26 -24
  171. data/lib/chef/resource/windows_certificate.rb +13 -7
  172. data/lib/chef/resource/windows_dfs_server.rb +7 -4
  173. data/lib/chef/resource/windows_env.rb +173 -0
  174. data/lib/chef/resource/windows_feature.rb +2 -0
  175. data/lib/chef/resource/windows_firewall_profile.rb +7 -12
  176. data/lib/chef/resource/windows_firewall_rule.rb +9 -11
  177. data/lib/chef/resource/windows_font.rb +1 -1
  178. data/lib/chef/resource/windows_package.rb +1 -0
  179. data/lib/chef/resource/windows_path.rb +38 -0
  180. data/lib/chef/resource/windows_security_policy.rb +5 -5
  181. data/lib/chef/resource/windows_service.rb +108 -0
  182. data/lib/chef/resource/windows_share.rb +18 -18
  183. data/lib/chef/resource/windows_task.rb +629 -28
  184. data/lib/chef/resource/windows_workgroup.rb +6 -4
  185. data/lib/chef/resource/yum_repository.rb +1 -1
  186. data/lib/chef/resource_collection/resource_set.rb +2 -6
  187. data/lib/chef/resource_inspector.rb +77 -75
  188. data/lib/chef/resource_reporter.rb +0 -2
  189. data/lib/chef/resources.rb +1 -0
  190. data/lib/chef/run_lock.rb +2 -2
  191. data/lib/chef/search/query.rb +3 -1
  192. data/lib/chef/server_api.rb +0 -4
  193. data/lib/chef/shell/ext.rb +1 -1
  194. data/lib/chef/util/backup.rb +1 -1
  195. data/lib/chef/util/dsc/configuration_generator.rb +52 -11
  196. data/lib/chef/util/dsc/lcm_output_parser.rb +4 -7
  197. data/lib/chef/util/dsc/local_configuration_manager.rb +18 -15
  198. data/lib/chef/util/dsc/resource_store.rb +5 -11
  199. data/lib/chef/version.rb +1 -1
  200. data/lib/chef/win32/api/file.rb +4 -0
  201. data/lib/chef/win32/file.rb +1 -1
  202. data/lib/chef/win32/security/sid.rb +1 -1
  203. data/lib/chef/win32/unicode.rb +1 -1
  204. data/spec/functional/mixin/powershell_out_spec.rb +11 -3
  205. data/spec/functional/resource/apt_package_spec.rb +4 -6
  206. data/spec/functional/resource/chocolatey_package_spec.rb +3 -3
  207. data/spec/functional/resource/cron_spec.rb +3 -3
  208. data/spec/functional/resource/dsc_script_spec.rb +6 -9
  209. data/spec/functional/resource/mount_spec.rb +10 -2
  210. data/spec/functional/resource/powershell_package_source_spec.rb +107 -0
  211. data/spec/functional/resource/powershell_script_spec.rb +57 -14
  212. data/spec/functional/resource/windows_certificate_spec.rb +10 -6
  213. data/spec/functional/resource/windows_firewall_rule_spec.rb +93 -0
  214. data/spec/functional/resource/windows_package_spec.rb +36 -10
  215. data/spec/functional/resource/windows_share_spec.rb +103 -0
  216. data/spec/functional/resource/windows_task_spec.rb +2 -3
  217. data/spec/functional/resource/zypper_package_spec.rb +11 -0
  218. data/spec/integration/client/client_spec.rb +2 -1
  219. data/spec/integration/compliance/compliance_spec.rb +81 -0
  220. data/spec/integration/knife/client_key_create_spec.rb +1 -1
  221. data/spec/integration/knife/node_create_spec.rb +1 -1
  222. data/spec/integration/knife/node_environment_set_spec.rb +1 -1
  223. data/spec/integration/knife/node_run_list_add_spec.rb +4 -4
  224. data/spec/integration/knife/node_run_list_remove_spec.rb +1 -1
  225. data/spec/integration/knife/node_run_list_set_spec.rb +1 -1
  226. data/spec/integration/knife/node_show_spec.rb +1 -1
  227. data/spec/integration/recipes/notifies_spec.rb +1 -1
  228. data/spec/integration/recipes/provider_choice.rb +2 -2
  229. data/spec/integration/recipes/recipe_dsl_spec.rb +1 -0
  230. data/spec/spec_helper.rb +3 -4
  231. data/spec/support/lib/chef/resource/cat.rb +1 -1
  232. data/spec/support/lib/chef/resource/one_two_three_four.rb +1 -1
  233. data/spec/support/mock/platform.rb +24 -16
  234. data/spec/support/platform_helpers.rb +11 -4
  235. data/spec/support/shared/unit/knife_shared.rb +1 -1
  236. data/spec/support/shared/unit/script_resource.rb +4 -4
  237. data/spec/support/shared/unit/windows_script_resource.rb +1 -1
  238. data/spec/unit/chef_fs/config_spec.rb +1 -1
  239. data/spec/unit/chef_fs/data_handler/data_bag_item_data_handler.rb +1 -1
  240. data/spec/unit/client_spec.rb +17 -0
  241. data/spec/unit/compliance/fetcher/automate_spec.rb +134 -0
  242. data/spec/unit/compliance/fetcher/chef_server_spec.rb +93 -0
  243. data/spec/unit/compliance/reporter/automate_spec.rb +427 -0
  244. data/spec/unit/compliance/reporter/chef_server_automate_spec.rb +177 -0
  245. data/spec/unit/compliance/reporter/compliance_enforcer_spec.rb +48 -0
  246. data/spec/unit/compliance/runner_spec.rb +140 -0
  247. data/spec/unit/data_collector_spec.rb +0 -4
  248. data/spec/unit/guard_interpreter/resource_guard_interpreter_spec.rb +11 -11
  249. data/spec/unit/http/ssl_policies_spec.rb +11 -0
  250. data/spec/unit/knife/client_create_spec.rb +2 -2
  251. data/spec/unit/knife/configure_client_spec.rb +5 -5
  252. data/spec/unit/knife/configure_spec.rb +3 -3
  253. data/spec/unit/knife/cookbook_delete_spec.rb +2 -2
  254. data/spec/unit/knife/cookbook_download_spec.rb +2 -2
  255. data/spec/unit/knife/cookbook_list_spec.rb +2 -2
  256. data/spec/unit/knife/cookbook_metadata_spec.rb +3 -3
  257. data/spec/unit/knife/core/node_editor_spec.rb +1 -1
  258. data/spec/unit/knife/environment_compare_spec.rb +3 -3
  259. data/spec/unit/knife/supermarket_download_spec.rb +8 -8
  260. data/spec/unit/knife/supermarket_list_spec.rb +3 -3
  261. data/spec/unit/knife/supermarket_search_spec.rb +1 -1
  262. data/spec/unit/knife/tag_create_spec.rb +1 -1
  263. data/spec/unit/knife/tag_delete_spec.rb +1 -1
  264. data/spec/unit/knife/user_create_spec.rb +1 -1
  265. data/spec/unit/mixin/powershell_exec_spec.rb +41 -4
  266. data/spec/unit/mixin/powershell_out_spec.rb +14 -0
  267. data/spec/unit/mixin/which.rb +1 -1
  268. data/spec/unit/platform/query_helpers_spec.rb +11 -12
  269. data/spec/unit/provider/dsc_resource_spec.rb +10 -27
  270. data/spec/unit/provider/dsc_script_spec.rb +1 -1
  271. data/spec/unit/provider/group/windows_spec.rb +6 -0
  272. data/spec/unit/provider/group_spec.rb +1 -1
  273. data/spec/unit/provider/mount/linux_spec.rb +10 -0
  274. data/spec/unit/provider/mount/mount_spec.rb +21 -10
  275. data/spec/unit/provider/mount/solaris_spec.rb +1 -1
  276. data/spec/unit/provider/mount/windows_spec.rb +1 -0
  277. data/spec/unit/provider/mount_spec.rb +31 -0
  278. data/spec/unit/provider/package/chocolatey_spec.rb +1 -2
  279. data/spec/unit/provider/package/powershell_spec.rb +87 -95
  280. data/spec/unit/provider/package/zypper_spec.rb +0 -25
  281. data/spec/unit/provider/package_spec.rb +2 -2
  282. data/spec/unit/provider/powershell_script_spec.rb +11 -0
  283. data/spec/unit/provider/subversion_spec.rb +0 -3
  284. data/spec/unit/provider/systemd_unit_spec.rb +1 -1
  285. data/spec/unit/provider/user_spec.rb +7 -1
  286. data/spec/unit/provider/windows_env_spec.rb +18 -34
  287. data/spec/unit/provider/windows_path_spec.rb +6 -11
  288. data/spec/unit/provider/windows_task_spec.rb +7 -6
  289. data/spec/unit/resource/breakpoint_spec.rb +1 -1
  290. data/spec/unit/resource/build_essential_spec.rb +0 -12
  291. data/spec/unit/resource/chef_client_config_spec.rb +137 -0
  292. data/spec/unit/resource/ifconfig_spec.rb +2 -10
  293. data/spec/unit/resource/mount_spec.rb +18 -5
  294. data/spec/unit/resource/powershell_package_source_spec.rb +20 -20
  295. data/spec/unit/resource/powershell_script_spec.rb +4 -74
  296. data/spec/unit/resource/service_spec.rb +2 -2
  297. data/spec/unit/resource/solaris_package_spec.rb +8 -10
  298. data/spec/unit/resource/windows_certificate_spec.rb +12 -0
  299. data/spec/unit/resource_inspector_spec.rb +3 -3
  300. data/spec/unit/shell_spec.rb +2 -2
  301. data/spec/unit/util/dsc/configuration_generator_spec.rb +79 -0
  302. data/spec/unit/util/dsc/local_configuration_manager_spec.rb +27 -35
  303. data/tasks/rspec.rb +1 -1
  304. metadata +47 -24
  305. data/lib/chef/monkey_patches/net_http.rb +0 -22
  306. data/lib/chef/provider/windows_env.rb +0 -210
  307. data/lib/chef/provider/windows_path.rb +0 -61
  308. data/lib/chef/provider/windows_task.rb +0 -631
  309. data/lib/chef/util/powershell/cmdlet.rb +0 -175
  310. data/lib/chef/util/powershell/cmdlet_result.rb +0 -61
  311. data/spec/functional/util/powershell/cmdlet_spec.rb +0 -111
  312. data/spec/support/mock/constant.rb +0 -52
  313. data/spec/unit/monkey_patches/uri_spec.rb +0 -34
  314. data/spec/unit/provider_resolver_spec.rb +0 -885
  315. data/spec/unit/resource/data/InstallHistory_with_CLT.plist +0 -92
  316. data/spec/unit/resource/data/InstallHistory_without_CLT.plist +0 -38
  317. data/spec/unit/util/powershell/cmdlet_spec.rb +0 -106
@@ -45,7 +45,7 @@ class Chef
45
45
 
46
46
  # Set policy name and group to node
47
47
  def set_policy(node)
48
- policy_group, policy_name = @name_args[1..-1]
48
+ policy_group, policy_name = @name_args[1..]
49
49
  node.policy_name = policy_name
50
50
  node.policy_group = policy_group
51
51
  end
@@ -70,7 +70,7 @@ class Chef
70
70
 
71
71
  # True if one of policy_name or policy_group was given, but not both
72
72
  def incomplete_policyfile_options?
73
- policy_group, policy_name = @name_args[1..-1]
73
+ policy_group, policy_name = @name_args[1..]
74
74
  (policy_group.nil? || policy_name.nil? || @name_args[1..-1].size > 2)
75
75
  end
76
76
 
@@ -43,7 +43,7 @@ class Chef
43
43
  node = Chef::Node.load(@name_args[0])
44
44
  if @name_args.size > 2
45
45
  # Check for nested lists and create a single plain one
46
- entries = @name_args[1..-1].map do |entry|
46
+ entries = @name_args[1..].map do |entry|
47
47
  entry.split(",").map(&:strip)
48
48
  end.flatten
49
49
  else
@@ -34,7 +34,7 @@ class Chef
34
34
 
35
35
  if @name_args.size > 2
36
36
  # Check for nested lists and create a single plain one
37
- entries = @name_args[1..-1].map do |entry|
37
+ entries = @name_args[1..].map do |entry|
38
38
  entry.split(",").map(&:strip)
39
39
  end.flatten
40
40
  else
@@ -36,7 +36,7 @@ class Chef
36
36
  exit 1
37
37
  elsif @name_args.size > 2
38
38
  # Check for nested lists and create a single plain one
39
- entries = @name_args[1..-1].map do |entry|
39
+ entries = @name_args[1..].map do |entry|
40
40
  entry.split(",").map(&:strip)
41
41
  end.flatten
42
42
  else
@@ -68,7 +68,7 @@ class Chef
68
68
 
69
69
  if @name_args.size > 2
70
70
  # Check for nested lists and create a single plain one
71
- entries = @name_args[2..-1].map do |entry|
71
+ entries = @name_args[2..].map do |entry|
72
72
  entry.split(",").map(&:strip)
73
73
  end.flatten
74
74
  else
@@ -51,7 +51,7 @@ class Chef
51
51
  exit 1
52
52
  elsif @name_args.size > 2
53
53
  # Check for nested lists and create a single plain one
54
- entries = @name_args[2..-1].map do |entry|
54
+ entries = @name_args[2..].map do |entry|
55
55
  entry.split(",").map(&:strip)
56
56
  end.flatten
57
57
  else
@@ -68,7 +68,7 @@ class Chef
68
68
 
69
69
  if @name_args.size > 1
70
70
  # Check for nested lists and create a single plain one
71
- entries = @name_args[1..-1].map do |entry|
71
+ entries = @name_args[1..].map do |entry|
72
72
  entry.split(",").map(&:strip)
73
73
  end.flatten
74
74
  else
@@ -50,7 +50,7 @@ class Chef
50
50
  exit 1
51
51
  elsif @name_args.size > 1
52
52
  # Check for nested lists and create a single plain one
53
- entries = @name_args[1..-1].map do |entry|
53
+ entries = @name_args[1..].map do |entry|
54
54
  entry.split(",").map(&:strip)
55
55
  end.flatten
56
56
  else
@@ -26,7 +26,6 @@ class Chef
26
26
  include Knife::Core::MultiAttributeReturnOption
27
27
 
28
28
  deps do
29
- require "addressable/uri" unless defined?(Addressable::URI)
30
29
  require_relative "../node"
31
30
  require_relative "../environment"
32
31
  require_relative "../api_client"
@@ -289,7 +289,7 @@ class Chef
289
289
  opts[:port] = port unless port.nil?
290
290
  opts[:logger] = Chef::Log.with_child(subsystem: "net/ssh") if Chef::Log.level == :trace
291
291
  unless config[:host_key_verify]
292
- opts[:verify_host_key] = false
292
+ opts[:verify_host_key] = :never
293
293
  opts[:user_known_hosts_file] = "/dev/null"
294
294
  end
295
295
  if ssh_config[:keepalive]
@@ -385,6 +385,8 @@ class Chef
385
385
  end
386
386
 
387
387
  ch.on_extended_data do |_, _type, data|
388
+ raise ArgumentError if data.eql?("sudo: no tty present and no askpass program specified\n")
389
+
388
390
  stderr += data
389
391
  end
390
392
 
@@ -489,7 +491,7 @@ class Chef
489
491
 
490
492
  new_window_cmds = lambda do
491
493
  if session.servers_for.size > 1
492
- [""] + session.servers_for[1..-1].map do |server|
494
+ [""] + session.servers_for[1..].map do |server|
493
495
  if config[:tmux_split]
494
496
  "split-window #{ssh_dest.call(server)}; tmux select-layout tiled"
495
497
  else
@@ -625,7 +627,7 @@ class Chef
625
627
  when "cssh"
626
628
  cssh
627
629
  else
628
- ssh_command(@name_args[1..-1].join(" "))
630
+ ssh_command(@name_args[1..].join(" "))
629
631
  end
630
632
 
631
633
  session.close
@@ -32,7 +32,7 @@ class Chef
32
32
 
33
33
  def run
34
34
  name = @name_args[0]
35
- tags = @name_args[1..-1]
35
+ tags = @name_args[1..]
36
36
 
37
37
  if name.nil? || tags.nil? || tags.empty?
38
38
  show_usage
@@ -32,7 +32,7 @@ class Chef
32
32
 
33
33
  def run
34
34
  name = @name_args[0]
35
- tags = @name_args[1..-1]
35
+ tags = @name_args[1..]
36
36
 
37
37
  if name.nil? || tags.nil? || tags.empty?
38
38
  show_usage
@@ -15,7 +15,7 @@
15
15
  # See the License for the specific language governing permissions and
16
16
  # limitations under the License.
17
17
 
18
- require "chef-utils" unless defined?(ChefUtils)
18
+ require "chef-utils" unless defined?(ChefUtils::CANARY)
19
19
  require_relative "config"
20
20
  require_relative "monkey_patches/webrick-utils" if ChefUtils.windows?
21
21
 
@@ -66,62 +66,6 @@ class Chef
66
66
  str = base.to_s + (file_base == "default" ? "" : "_#{file_base}")
67
67
  normalize_snake_case_name(str)
68
68
  end
69
-
70
- # Copied from rails activesupport. In ruby >= 2.0 const_get will just do this, so this can
71
- # be deprecated and removed.
72
- #
73
- # MIT LICENSE is here: https://github.com/rails/rails/blob/master/activesupport/MIT-LICENSE
74
-
75
- # Tries to find a constant with the name specified in the argument string.
76
- #
77
- # 'Module'.constantize # => Module
78
- # 'Test::Unit'.constantize # => Test::Unit
79
- #
80
- # The name is assumed to be the one of a top-level constant, no matter
81
- # whether it starts with "::" or not. No lexical context is taken into
82
- # account:
83
- #
84
- # C = 'outside'
85
- # module M
86
- # C = 'inside'
87
- # C # => 'inside'
88
- # 'C'.constantize # => 'outside', same as ::C
89
- # end
90
- #
91
- # NameError is raised when the name is not in CamelCase or the constant is
92
- # unknown.
93
- def constantize(camel_cased_word)
94
- names = camel_cased_word.split("::")
95
-
96
- # Trigger a built-in NameError exception including the ill-formed constant in the message.
97
- Object.const_get(camel_cased_word) if names.empty?
98
-
99
- # Remove the first blank element in case of '::ClassName' notation.
100
- names.shift if names.size > 1 && names.first.empty?
101
-
102
- names.inject(Object) do |constant, name|
103
- if constant == Object
104
- constant.const_get(name)
105
- else
106
- candidate = constant.const_get(name)
107
- next candidate if constant.const_defined?(name, false)
108
- next candidate unless Object.const_defined?(name)
109
-
110
- # Go down the ancestors to check if it is owned directly. The check
111
- # stops when we reach Object or the end of ancestors tree.
112
- constant = constant.ancestors.inject do |const, ancestor|
113
- break const if ancestor == Object
114
- break ancestor if ancestor.const_defined?(name, false)
115
-
116
- const
117
- end
118
-
119
- # owner is in Object, so raise
120
- constant.const_get(name, false)
121
- end
122
- end
123
- end
124
-
125
69
  end
126
70
  end
127
71
  end
@@ -155,7 +155,7 @@ class Chef
155
155
  # @return [OpenSSL::PKey::DH]
156
156
  def gen_ec_priv_key(curve)
157
157
  raise TypeError, "curve must be a string" unless curve.is_a?(String)
158
- raise ArgumentError, "Specified curve is not available on this system" unless curve == "prime256v1" || curve == "secp384r1" || curve == "secp521r1"
158
+ raise ArgumentError, "Specified curve is not available on this system" unless %w{prime256v1 secp384r1 secp521r1}.include?(curve)
159
159
 
160
160
  ::OpenSSL::PKey::EC.new(curve).generate_key
161
161
  end
@@ -16,14 +16,19 @@
16
16
  # limitations under the License.
17
17
 
18
18
  require_relative "../powershell"
19
+ require_relative "../pwsh"
19
20
 
20
- # The powershell_exec mixin provides in-process access to PowerShell engine via
21
- # a COM interop (installed by the Chef Client installer).
21
+ # The powershell_exec mixin provides in-process access to the PowerShell engine.
22
22
  #
23
- # powershell_exec returns a Chef::PowerShell object that provides 4 methods:
23
+ # powershell_exec is initialized with a string that should be set to the script
24
+ # to run and also takes an optional interpreter argument which must be either
25
+ # :powershell (Windows PowerShell which is the default) or :pwsh (PowerShell
26
+ # Core). It will return a Chef::PowerShell object that provides 5 methods:
24
27
  #
25
28
  # .result - returns a hash representing the results returned by executing the
26
29
  # PowerShell script block
30
+ # .verbose - this is an array of string containing any messages written to the
31
+ # PowerShell verbose stream during execution
27
32
  # .errors - this is an array of string containing any messages written to the
28
33
  # PowerShell error stream during execution
29
34
  # .error? - returns true if there were error messages written to the PowerShell
@@ -42,6 +47,9 @@ require_relative "../powershell"
42
47
  # > powershell_exec("$a = $true; $a").result
43
48
  # => true
44
49
  #
50
+ # > powershell_exec("$PSVersionTable", :pwsh).result["PSEdition"]
51
+ # => "Core"
52
+ #
45
53
  # > powershell_exec("not-found").errors
46
54
  # => ["ObjectNotFound: (not-found:String) [], CommandNotFoundException: The
47
55
  # term 'not-found' is not recognized as the name of a cmdlet, function, script
@@ -90,22 +98,28 @@ require_relative "../powershell"
90
98
  class Chef
91
99
  module Mixin
92
100
  module PowershellExec
93
- # Run a command under PowerShell via a managed (.NET) COM interop API.
94
- # This implementation requires the managed dll to be registered on the
95
- # target machine.
101
+ # Run a command under PowerShell via a managed (.NET) API.
96
102
  #
97
103
  # Requires: .NET Framework 4.0 or higher on the target machine.
98
104
  #
99
105
  # @param script [String] script to run
106
+ # @param interpreter [Symbol] the interpreter type, `:powershell` or `:pwsh`
100
107
  # @return [Chef::PowerShell] output
101
- def powershell_exec(script)
102
- Chef::PowerShell.new(script)
108
+ def powershell_exec(script, interpreter = :powershell)
109
+ case interpreter
110
+ when :powershell
111
+ Chef::PowerShell.new(script)
112
+ when :pwsh
113
+ Chef::Pwsh.new(script)
114
+ else
115
+ raise ArgumentError, "Expected interpreter of :powershell or :pwsh"
116
+ end
103
117
  end
104
118
 
105
119
  # The same as the #powershell_exec method except this will raise
106
120
  # Chef::PowerShell::CommandFailed if the command fails
107
- def powershell_exec!(script)
108
- cmd = Chef::PowerShell.new(script)
121
+ def powershell_exec!(script, interpreter = :powershell)
122
+ cmd = powershell_exec(script, interpreter)
109
123
  cmd.error!
110
124
  cmd
111
125
  end
@@ -28,19 +28,24 @@ class Chef
28
28
  # can be set to :i386 or :x86_64 to force the windows architecture.
29
29
  #
30
30
  # @param script [String] script to run
31
+ # @param interpreter [Symbol] the interpreter type, `:powershell` or `:pwsh`
31
32
  # @param options [Hash] options hash
32
33
  # @return [Mixlib::Shellout] mixlib-shellout object
33
34
  def powershell_out(*command_args)
34
35
  script = command_args.first
35
36
  options = command_args.last.is_a?(Hash) ? command_args.last : nil
37
+ interpreter = command_args[1].is_a?(Symbol) ? command_args[1] : :powershell
36
38
 
37
- run_command_with_os_architecture(script, options)
39
+ raise ArgumentError, "Expected interpreter of :powershell or :pwsh" unless %i{powershell pwsh}.include?(interpreter)
40
+
41
+ run_command_with_os_architecture(script, interpreter, options)
38
42
  end
39
43
 
40
44
  # Run a command under powershell with the same API as shell_out!
41
45
  # (raises exceptions on errors)
42
46
  #
43
47
  # @param script [String] script to run
48
+ # @param interpreter [Symbol] the interpreter type, `:powershell` or `:pwsh`
44
49
  # @param options [Hash] options hash
45
50
  # @return [Mixlib::Shellout] mixlib-shellout object
46
51
  def powershell_out!(*command_args)
@@ -56,16 +61,17 @@ class Chef
56
61
  # because chef-client runs as a 32-bit app on 64-bit windows).
57
62
  #
58
63
  # @param script [String] script to run
64
+ # @param interpreter [Symbol] the interpreter type, `:powershell` or `:pwsh`
59
65
  # @param options [Hash] options hash
60
66
  # @return [Mixlib::Shellout] mixlib-shellout object
61
- def run_command_with_os_architecture(script, options)
67
+ def run_command_with_os_architecture(script, interpreter, options)
62
68
  options ||= {}
63
69
  options = options.dup
64
70
  arch = options.delete(:architecture)
65
71
 
66
72
  with_os_architecture(nil, architecture: arch) do
67
73
  shell_out(
68
- build_powershell_command(script),
74
+ build_powershell_command(script, interpreter),
69
75
  **options
70
76
  )
71
77
  end
@@ -74,8 +80,9 @@ class Chef
74
80
  # Helper to build a powershell command around the script to run.
75
81
  #
76
82
  # @param script [String] script to run
83
+ # @param interpreter [Symbol] the interpreter type, `:powershell` or `:pwsh`
77
84
  # @return [String] powershell command to execute
78
- def build_powershell_command(script)
85
+ def build_powershell_command(script, interpreter)
79
86
  flags = [
80
87
  # Hides the copyright banner at startup.
81
88
  "-NoLogo",
@@ -91,7 +98,7 @@ class Chef
91
98
  "-InputFormat None",
92
99
  ]
93
100
 
94
- "powershell.exe #{flags.join(" ")} -Command \"#{script.gsub('"', '\"')}\""
101
+ "#{interpreter}.exe #{flags.join(" ")} -Command \"#{script.gsub('"', '\"')}\""
95
102
  end
96
103
  end
97
104
  end
@@ -135,6 +135,8 @@ class Chef
135
135
  property.emit_dsl
136
136
  end
137
137
 
138
+ alias :attribute :property
139
+
138
140
  #
139
141
  # Create a reusable property type that can be used in multiple properties
140
142
  # in different resources.
@@ -204,7 +204,7 @@ class Chef
204
204
  all_ivars.delete(:@_extension_modules)
205
205
  all_ivars.inject({}) do |ivar_map, ivar_symbol_name|
206
206
  value = instance_variable_get(ivar_symbol_name)
207
- name_without_at = ivar_symbol_name.to_s[1..-1].to_sym
207
+ name_without_at = ivar_symbol_name.to_s[1..].to_sym
208
208
  ivar_map[name_without_at] = value
209
209
  ivar_map
210
210
  end
@@ -21,7 +21,7 @@ class Chef
21
21
  module Unformatter
22
22
 
23
23
  def write(message)
24
- data = message.match(/(\[.+?\] )?([\w]+):(.*)$/)
24
+ data = message.match(/(\[.+?\] )?(\w+):(.*)$/)
25
25
  send(data[2].downcase.chomp.to_sym, data[3].strip)
26
26
  rescue NoMethodError
27
27
  send(:info, message)
@@ -17,7 +17,9 @@
17
17
  #
18
18
 
19
19
  autoload :URI, "uri"
20
- autoload :Addressable, "addressable/uri"
20
+ module Addressable
21
+ autoload :URI, "addressable/uri"
22
+ end
21
23
 
22
24
  class Chef
23
25
  module Mixin
@@ -73,9 +73,7 @@ class Chef
73
73
 
74
74
  def convert_value(value)
75
75
  case value
76
- when VividMash
77
- value
78
- when AttrArray
76
+ when VividMash, AttrArray
79
77
  value
80
78
  when Hash
81
79
  VividMash.new(value, __root__, __node__, __precedence__)
@@ -159,9 +157,7 @@ class Chef
159
157
  # attribute tree will have the correct cache invalidation behavior.
160
158
  def convert_value(value)
161
159
  case value
162
- when VividMash
163
- value
164
- when AttrArray
160
+ when VividMash, AttrArray
165
161
  value
166
162
  when Hash
167
163
  VividMash.new(value, __root__, __node__, __precedence__)
@@ -58,6 +58,7 @@ class Chef
58
58
  each_with_object
59
59
  empty?
60
60
  entries
61
+ except
61
62
  fetch
62
63
  fetch_values
63
64
  filter
@@ -137,6 +138,7 @@ class Chef
137
138
  default_proc=
138
139
  delete
139
140
  delete_if
141
+ except!
140
142
  filter!
141
143
  keep_if
142
144
  map!