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
@@ -21,6 +21,8 @@ require "chef-utils/dist" unless defined?(ChefUtils::Dist)
21
21
  class Chef
22
22
  class Resource
23
23
  class WindowsWorkgroup < Chef::Resource
24
+ unified_mode true
25
+
24
26
  provides :windows_workgroup
25
27
 
26
28
  description "Use the **windows_workgroup** resource to join or change the workgroup of a Windows host."
@@ -90,8 +92,8 @@ class Chef
90
92
 
91
93
  unless workgroup_member?
92
94
  converge_by("join workstation workgroup #{new_resource.workgroup_name}") do
93
- ps_run = powershell_out(join_command)
94
- raise "Failed to join the workgroup #{new_resource.workgroup_name}: #{ps_run.stderr}}" if ps_run.error?
95
+ ps_run = powershell_exec(join_command)
96
+ raise "Failed to join the workgroup #{new_resource.workgroup_name}: #{ps_run.errors}}" if ps_run.error?
95
97
 
96
98
  unless new_resource.reboot == :never
97
99
  reboot "Reboot to join workgroup #{new_resource.workgroup_name}" do
@@ -117,10 +119,10 @@ class Chef
117
119
 
118
120
  # @return [Boolean] is the node a member of the workgroup specified in the resource
119
121
  def workgroup_member?
120
- node_workgroup = powershell_out!("(Get-WmiObject -Class Win32_ComputerSystem).Workgroup")
122
+ node_workgroup = powershell_exec!("(Get-WmiObject -Class Win32_ComputerSystem).Workgroup")
121
123
  raise "Failed to determine if system already a member of workgroup #{new_resource.workgroup_name}" if node_workgroup.error?
122
124
 
123
- node_workgroup.stdout.downcase.strip == new_resource.workgroup_name.downcase
125
+ String(node_workgroup.result).downcase.strip == new_resource.workgroup_name.downcase
124
126
  end
125
127
  end
126
128
  end
@@ -37,7 +37,7 @@ class Chef
37
37
  gpgkey 'http://artifacts.ourco.org/pub/yum/RPM-GPG-KEY-OURCO-8'
38
38
  action :create
39
39
  end
40
- ```ruby
40
+ ```
41
41
 
42
42
  **Delete a repository**:
43
43
 
@@ -123,11 +123,7 @@ class Chef
123
123
  # * Chef::Exceptions::InvalidResourceSpecification for all invalid input.
124
124
  def validate_lookup_spec!(query_object)
125
125
  case query_object
126
- when Chef::Resource
127
- true
128
- when SINGLE_RESOURCE_MATCH, MULTIPLE_RESOURCE_MATCH, NAMELESS_RESOURCE_MATCH
129
- true
130
- when Hash
126
+ when Chef::Resource, SINGLE_RESOURCE_MATCH, MULTIPLE_RESOURCE_MATCH, NAMELESS_RESOURCE_MATCH, Hash
131
127
  true
132
128
  when String
133
129
  raise Chef::Exceptions::InvalidResourceSpecification,
@@ -135,7 +131,7 @@ class Chef
135
131
  else
136
132
  raise Chef::Exceptions::InvalidResourceSpecification,
137
133
  "The object `#{query_object.inspect}' is not valid for resource collection lookup. " +
138
- "Use a String like `resource_type[resource_name]' or a Chef::Resource object"
134
+ "Use a String like `resource_type[resource_name]' or a Chef::Resource object"
139
135
  end
140
136
  end
141
137
 
@@ -23,94 +23,96 @@ require_relative "node"
23
23
  require_relative "resources"
24
24
  require_relative "json_compat"
25
25
 
26
- module ResourceInspector
27
- def self.get_default(default)
28
- if default.is_a?(Chef::DelayedEvaluator)
29
- # ideally we'd get the block we pass to `lazy`, but the best we can do
30
- # is to get the source location, which then results in reparsing the source
31
- # code for the resource ourselves and just no
32
- "lazy default"
33
- else
34
- default.is_a?(Symbol) ? default.inspect : default # inspect properly returns symbols
26
+ class Chef
27
+ module ResourceInspector
28
+ def self.get_default(default)
29
+ if default.is_a?(Chef::DelayedEvaluator)
30
+ # ideally we'd get the block we pass to `lazy`, but the best we can do
31
+ # is to get the source location, which then results in reparsing the source
32
+ # code for the resource ourselves and just no
33
+ "lazy default"
34
+ else
35
+ default.is_a?(Symbol) ? default.inspect : default # inspect properly returns symbols
36
+ end
35
37
  end
36
- end
37
38
 
38
- def self.extract_resource(resource, complete = false)
39
- data = {}
40
- data[:description] = resource.description
41
- # data[:deprecated] = resource.deprecated || false
42
- data[:default_action] = resource.default_action
43
- data[:actions] = resource.allowed_actions
44
- data[:examples] = resource.examples
45
- data[:introduced] = resource.introduced
46
- data[:preview] = resource.preview_resource
39
+ def self.extract_resource(resource, complete = false)
40
+ data = {}
41
+ data[:description] = resource.description
42
+ # data[:deprecated] = resource.deprecated || false
43
+ data[:default_action] = resource.default_action
44
+ data[:actions] = resource.allowed_actions
45
+ data[:examples] = resource.examples
46
+ data[:introduced] = resource.introduced
47
+ data[:preview] = resource.preview_resource
47
48
 
48
- properties = unless complete
49
- resource.properties.reject { |_, k| k.options[:declared_in] == Chef::Resource || k.options[:skip_docs] }
50
- else
51
- resource.properties.reject { |_, k| k.options[:skip_docs] }
52
- end
49
+ properties = unless complete
50
+ resource.properties.reject { |_, k| k.options[:declared_in] == Chef::Resource || k.options[:skip_docs] }
51
+ else
52
+ resource.properties.reject { |_, k| k.options[:skip_docs] }
53
+ end
53
54
 
54
- data[:properties] = properties.each_with_object([]) do |(n, k), acc|
55
- opts = k.options
56
- acc << { name: n, description: opts[:description],
57
- introduced: opts[:introduced], is: opts[:is],
58
- deprecated: opts[:deprecated] || false,
59
- required: opts[:required] || false,
60
- default: opts[:default_description] || get_default(opts[:default]),
61
- name_property: opts[:name_property] || false,
62
- equal_to: sort_equal_to(opts[:equal_to]) }
55
+ data[:properties] = properties.each_with_object([]) do |(n, k), acc|
56
+ opts = k.options
57
+ acc << { name: n, description: opts[:description],
58
+ introduced: opts[:introduced], is: opts[:is],
59
+ deprecated: opts[:deprecated] || false,
60
+ required: opts[:required] || false,
61
+ default: opts[:default_description] || get_default(opts[:default]),
62
+ name_property: opts[:name_property] || false,
63
+ equal_to: sort_equal_to(opts[:equal_to]) }
64
+ end
65
+ data
63
66
  end
64
- data
65
- end
66
67
 
67
- def self.sort_equal_to(equal_to)
68
- Array(equal_to).sort.map(&:inspect)
69
- rescue ArgumentError
70
- Array(equal_to).map(&:inspect)
71
- end
68
+ def self.sort_equal_to(equal_to)
69
+ Array(equal_to).sort.map(&:inspect)
70
+ rescue ArgumentError
71
+ Array(equal_to).map(&:inspect)
72
+ end
72
73
 
73
- def self.extract_cookbook(path, complete)
74
- path = File.expand_path(path)
75
- dir, name = File.split(path)
76
- Chef::Cookbook::FileVendor.fetch_from_disk(path)
77
- loader = Chef::CookbookLoader.new(dir)
78
- cookbook = loader.load_cookbook(name)
79
- resources = cookbook.files_for(:resources)
74
+ def self.extract_cookbook(path, complete)
75
+ path = File.expand_path(path)
76
+ dir, name = File.split(path)
77
+ Chef::Cookbook::FileVendor.fetch_from_disk(path)
78
+ loader = Chef::CookbookLoader.new(dir)
79
+ cookbook = loader.load_cookbook(name)
80
+ resources = cookbook.files_for(:resources)
80
81
 
81
- resources.each_with_object({}) do |r, res|
82
- pth = r["full_path"]
83
- cur = Chef::Resource::LWRPBase.build_from_file(name, pth, Chef::RunContext.new(Chef::Node.new, nil, nil))
84
- res[cur.resource_name] = extract_resource(cur, complete)
82
+ resources.each_with_object({}) do |r, res|
83
+ pth = r["full_path"]
84
+ cur = Chef::Resource::LWRPBase.build_from_file(name, pth, Chef::RunContext.new(Chef::Node.new, nil, nil))
85
+ res[cur.resource_name] = extract_resource(cur, complete)
86
+ end
85
87
  end
86
- end
87
88
 
88
- # If we're given no resources, dump all of Chef's built ins
89
- # otherwise, if we have a path then extract all the resources from the cookbook
90
- # or else do a list of built in resources
91
- #
92
- # @param arguments [Array, String] One of more paths to a cookbook or a resource file to inspect
93
- # @param complete [TrueClass, FalseClass] Whether to show properties defined in the base Resource class
94
- # @return [String] JSON formatting of all resources
95
- def self.inspect(arguments = [], complete: false)
96
- output = if arguments.empty?
97
- ObjectSpace.each_object(Class).select { |k| k < Chef::Resource }.each_with_object({}) { |klass, acc| acc[klass.resource_name] = extract_resource(klass) }
98
- else
99
- Array(arguments).each_with_object({}) do |arg, acc|
100
- if File.directory?(arg)
101
- extract_cookbook(arg, complete).each { |k, v| acc[k] = v }
102
- else
103
- r = Chef::ResourceResolver.resolve(arg.to_sym)
104
- acc[r.resource_name] = extract_resource(r, complete)
89
+ # If we're given no resources, dump all of Chef's built ins
90
+ # otherwise, if we have a path then extract all the resources from the cookbook
91
+ # or else do a list of built in resources
92
+ #
93
+ # @param arguments [Array, String] One of more paths to a cookbook or a resource file to inspect
94
+ # @param complete [TrueClass, FalseClass] Whether to show properties defined in the base Resource class
95
+ # @return [String] JSON formatting of all resources
96
+ def self.inspect(arguments = [], complete: false)
97
+ output = if arguments.empty?
98
+ ObjectSpace.each_object(Class).select { |k| k < Chef::Resource }.each_with_object({}) { |klass, acc| acc[klass.resource_name] = extract_resource(klass) }
99
+ else
100
+ Array(arguments).each_with_object({}) do |arg, acc|
101
+ if File.directory?(arg)
102
+ extract_cookbook(arg, complete).each { |k, v| acc[k] = v }
103
+ else
104
+ r = Chef::ResourceResolver.resolve(arg.to_sym)
105
+ acc[r.resource_name] = extract_resource(r, complete)
106
+ end
105
107
  end
106
108
  end
107
- end
108
109
 
109
- Chef::JSONCompat.to_json_pretty(output)
110
- end
110
+ Chef::JSONCompat.to_json_pretty(output)
111
+ end
111
112
 
112
- def self.start
113
- puts inspect(ARGV, complete: true)
114
- end
113
+ def self.start
114
+ puts inspect(ARGV, complete: true)
115
+ end
115
116
 
117
+ end
116
118
  end
@@ -19,8 +19,6 @@
19
19
  # limitations under the License.
20
20
  #
21
21
 
22
- require "uri" unless defined?(URI)
23
- require "securerandom" unless defined?(SecureRandom)
24
22
  require_relative "event_dispatch/base"
25
23
 
26
24
  class Chef
@@ -27,6 +27,7 @@ require_relative "resource/batch"
27
27
  require_relative "resource/breakpoint"
28
28
  require_relative "resource/build_essential"
29
29
  require_relative "resource/cookbook_file"
30
+ require_relative "resource/chef_client_config"
30
31
  require_relative "resource/chef_client_cron"
31
32
  require_relative "resource/chef_client_launchd"
32
33
  require_relative "resource/chef_client_scheduled_task"
@@ -23,7 +23,7 @@ end
23
23
  require_relative "config"
24
24
  require_relative "exceptions"
25
25
  require "timeout" unless defined?(Timeout)
26
- require "chef-utils" unless defined?(ChefUtils)
26
+ require "chef-utils" unless defined?(ChefUtils::CANARY)
27
27
 
28
28
  class Chef
29
29
 
@@ -173,7 +173,7 @@ class Chef
173
173
  # Mutex name is case-sensitive contrary to other things in
174
174
  # windows. "\" is the only invalid character.
175
175
  def acquire_win32_mutex
176
- @mutex = Chef::ReservedNames::Win32::Mutex.new("Global\\#{runlock_file.gsub(/[\\]/, "/").downcase}")
176
+ @mutex = Chef::ReservedNames::Win32::Mutex.new("Global\\#{runlock_file.tr('\\', "/").downcase}")
177
177
  mutex.test
178
178
  end
179
179
 
@@ -21,7 +21,9 @@ require_relative "../exceptions"
21
21
  require_relative "../server_api"
22
22
 
23
23
  autoload :URI, "uri"
24
- autoload :Addressable, "addressable/uri"
24
+ module Addressable
25
+ autoload :URI, "addressable/uri"
26
+ end
25
27
 
26
28
  class Chef
27
29
  class Search
@@ -71,10 +71,6 @@ class Chef
71
71
  return_value
72
72
  rescue Exception => exception
73
73
  log_failed_request(response, return_value) unless response.nil?
74
-
75
- if exception.respond_to?(:chef_rest_request=)
76
- exception.chef_rest_request = rest_request
77
- end
78
74
  raise
79
75
  end
80
76
  end
@@ -62,7 +62,7 @@ module Shell
62
62
  if subsession = jobs.select_shell_session(context_obj)
63
63
  jobs.switch(subsession)
64
64
  else
65
- irb(context_obj)
65
+ irb(context_obj) # rubocop: disable Lint/Debugger
66
66
  end
67
67
  end
68
68
 
@@ -36,7 +36,7 @@ class Chef
36
36
  slice_number = @new_resource.backup
37
37
  backup_files = sorted_backup_files
38
38
  if backup_files.length >= @new_resource.backup
39
- remainder = backup_files.slice(slice_number..-1)
39
+ remainder = backup_files.slice(slice_number..)
40
40
  remainder.each do |backup_to_delete|
41
41
  delete_backup(backup_to_delete)
42
42
  end
@@ -16,36 +16,34 @@
16
16
  # limitations under the License.
17
17
  #
18
18
 
19
- require_relative "../powershell/cmdlet"
19
+ require_relative "../../mixin/powershell_exec"
20
20
 
21
21
  class Chef::Util::DSC
22
22
  class ConfigurationGenerator
23
+ include Chef::Mixin::PowershellExec
24
+
23
25
  def initialize(node, config_directory)
24
26
  @node = node
25
27
  @config_directory = config_directory
26
28
  end
27
29
 
28
- def configuration_document_from_script_code(code, configuration_flags, imports, shellout_flags)
30
+ def configuration_document_from_script_code(code, configuration_flags, imports)
29
31
  Chef::Log.trace("DSC: DSC code:\n '#{code}'")
30
32
  generated_script_path = write_document_generation_script(code, "chef_dsc", imports)
31
33
  begin
32
- configuration_document_from_script_path(generated_script_path, "chef_dsc", configuration_flags, shellout_flags)
34
+ configuration_document_from_script_path(generated_script_path, "chef_dsc", configuration_flags)
33
35
  ensure
34
36
  ::FileUtils.rm(generated_script_path)
35
37
  end
36
38
  end
37
39
 
38
- def configuration_document_from_script_path(script_path, configuration_name, configuration_flags, shellout_flags)
40
+ def configuration_document_from_script_path(script_path, configuration_name, configuration_flags)
39
41
  validate_configuration_name!(configuration_name)
40
42
 
41
- document_generation_cmdlet = Chef::Util::Powershell::Cmdlet.new(
42
- @node,
43
- configuration_document_generation_code(script_path, configuration_name)
44
- )
45
-
46
- merged_configuration_flags = get_merged_configuration_flags!(configuration_flags, configuration_name)
43
+ config_generation_code = configuration_document_generation_code(script_path, configuration_name)
44
+ switches_string = command_switches_string(get_merged_configuration_flags!(configuration_flags, configuration_name))
47
45
 
48
- document_generation_cmdlet.run!(merged_configuration_flags, shellout_flags)
46
+ powershell_exec!("#{config_generation_code} #{switches_string}")
49
47
  configuration_document_location = find_configuration_document(configuration_name)
50
48
 
51
49
  unless configuration_document_location
@@ -59,6 +57,49 @@ class Chef::Util::DSC
59
57
 
60
58
  protected
61
59
 
60
+ def validate_switch_name!(switch_parameter_name)
61
+ unless switch_parameter_name.match?(/\A[A-Za-z]+[_a-zA-Z0-9]*\Z/)
62
+ raise ArgumentError, "`#{switch_parameter_name}` is not a valid PowerShell cmdlet switch parameter name"
63
+ end
64
+ end
65
+
66
+ def escape_parameter_value(parameter_value)
67
+ parameter_value.gsub(/(`|'|"|#)/, '`\1')
68
+ end
69
+
70
+ def escape_string_parameter_value(parameter_value)
71
+ "'#{escape_parameter_value(parameter_value)}'"
72
+ end
73
+
74
+ def command_switches_string(switches)
75
+ command_switches = switches.map do |switch_name, switch_value|
76
+ if switch_name.class != Symbol
77
+ raise ArgumentError, "Invalid type `#{switch_name} `for PowerShell switch '#{switch_name}'. The switch must be specified as a Symbol'"
78
+ end
79
+
80
+ validate_switch_name!(switch_name)
81
+
82
+ switch_argument = ""
83
+ switch_present = true
84
+
85
+ case switch_value
86
+ when Numeric, Float
87
+ switch_argument = switch_value.to_s
88
+ when FalseClass
89
+ switch_present = false
90
+ when TrueClass
91
+ when String
92
+ switch_argument = escape_string_parameter_value(switch_value)
93
+ else
94
+ raise ArgumentError, "Invalid argument type `#{switch_value.class}` specified for PowerShell switch `:#{switch_name}`. Arguments to PowerShell must be of type `String`, `Numeric`, `Float`, `FalseClass`, or `TrueClass`"
95
+ end
96
+
97
+ switch_present ? ["-#{switch_name.to_s.downcase}", switch_argument].join(" ").strip : ""
98
+ end
99
+
100
+ command_switches.join(" ")
101
+ end
102
+
62
103
  # From PowerShell error help for the Configuration language element:
63
104
  # Standard names may only contain letters (a-z, A-Z), numbers (0-9), and underscore (_).
64
105
  # The name may not be null or empty, and should start with a letter.
@@ -75,23 +75,21 @@ class Chef
75
75
  #
76
76
 
77
77
  def self.parse(lcm_output, test_dsc_configuration)
78
+ lcm_output = String(lcm_output).split("\n")
78
79
  test_dsc_configuration ? test_dsc_parser(lcm_output) : what_if_parser(lcm_output)
79
80
  end
80
81
 
81
82
  def self.test_dsc_parser(lcm_output)
82
- lcm_output ||= ""
83
83
  current_resource = {}
84
84
 
85
85
  resources = []
86
- lcm_output.lines.each do |line|
86
+ lcm_output.each do |line|
87
87
  op_action , op_value = line.strip.split(":")
88
88
  op_action&.strip!
89
89
  case op_action
90
90
  when "InDesiredState"
91
91
  current_resource[:skipped] = op_value.strip == "True" ? true : false
92
- when "ResourcesInDesiredState"
93
- current_resource[:name] = op_value.strip if op_value
94
- when "ResourcesNotInDesiredState"
92
+ when "ResourcesInDesiredState", "ResourcesNotInDesiredState"
95
93
  current_resource[:name] = op_value.strip if op_value
96
94
  when "ReturnValue"
97
95
  current_resource[:context] = nil
@@ -109,11 +107,10 @@ class Chef
109
107
  end
110
108
 
111
109
  def self.what_if_parser(lcm_output)
112
- lcm_output ||= ""
113
110
  current_resource = {}
114
111
 
115
112
  resources = []
116
- lcm_output.lines.each do |line|
113
+ lcm_output.each do |line|
117
114
  op_action, op_type, info = parse_line(line)
118
115
 
119
116
  case op_action