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
@@ -16,25 +16,27 @@
16
16
  # limitations under the License.
17
17
  #
18
18
 
19
- require_relative "../powershell/cmdlet"
19
+ require_relative "../../mixin/powershell_exec"
20
20
  require_relative "lcm_output_parser"
21
21
 
22
22
  class Chef::Util::DSC
23
23
  class LocalConfigurationManager
24
+ include Chef::Mixin::PowershellExec
25
+
24
26
  def initialize(node, configuration_path)
25
27
  @node = node
26
28
  @configuration_path = configuration_path
27
29
  clear_execution_time
28
30
  end
29
31
 
30
- def test_configuration(configuration_document, shellout_flags)
31
- status = run_configuration_cmdlet(configuration_document, false, shellout_flags)
32
- log_dsc_exception(status.stderr) unless status.succeeded?
33
- configuration_update_required?(status.return_value)
32
+ def test_configuration(configuration_document)
33
+ status = run_configuration_cmdlet(configuration_document, false)
34
+ log_dsc_exception(status.errors.join("\n")) if status.error?
35
+ configuration_update_required?(status.result)
34
36
  end
35
37
 
36
- def set_configuration(configuration_document, shellout_flags)
37
- run_configuration_cmdlet(configuration_document, true, shellout_flags)
38
+ def set_configuration(configuration_document)
39
+ run_configuration_cmdlet(configuration_document, true)
38
40
  end
39
41
 
40
42
  def last_operation_execution_time_seconds
@@ -45,7 +47,7 @@ class Chef::Util::DSC
45
47
 
46
48
  private
47
49
 
48
- def run_configuration_cmdlet(configuration_document, apply_configuration, shellout_flags)
50
+ def run_configuration_cmdlet(configuration_document, apply_configuration)
49
51
  Chef::Log.trace("DSC: Calling DSC Local Config Manager to #{apply_configuration ? "set" : "test"} configuration document.")
50
52
 
51
53
  start_operation_timing
@@ -53,11 +55,12 @@ class Chef::Util::DSC
53
55
 
54
56
  begin
55
57
  save_configuration_document(configuration_document)
56
- cmdlet = ::Chef::Util::Powershell::Cmdlet.new(@node, lcm_command(apply_configuration))
58
+ cmd = lcm_command(apply_configuration)
59
+ Chef::Log.trace("DSC: Calling DSC Local Config Manager with:\n#{cmd}")
60
+
61
+ status = powershell_exec(cmd)
57
62
  if apply_configuration
58
- status = cmdlet.run!({}, shellout_flags)
59
- else
60
- status = cmdlet.run({}, shellout_flags)
63
+ status.error!
61
64
  end
62
65
  ensure
63
66
  end_operation_timing
@@ -77,7 +80,7 @@ class Chef::Util::DSC
77
80
  ps4_base_command
78
81
  else
79
82
  if ps_version_gte_5?
80
- "#{common_command_prefix} Test-DscConfiguration -path #{@configuration_path} | format-list"
83
+ "#{common_command_prefix} Test-DscConfiguration -path #{@configuration_path} | format-list | Out-String"
81
84
  else
82
85
  ps4_base_command + " -whatif; if (! $?) { exit 1 }"
83
86
  end
@@ -100,12 +103,12 @@ class Chef::Util::DSC
100
103
  end
101
104
 
102
105
  def whatif_not_supported?(dsc_exception_output)
103
- !! (dsc_exception_output.gsub(/[\r\n]+/, "").gsub(/\s+/, " ") =~ /A parameter cannot be found that matches parameter name 'Whatif'/i)
106
+ !! (dsc_exception_output.gsub(/[\n]+/, "").gsub(/\s+/, " ") =~ /A parameter cannot be found that matches parameter name 'Whatif'/i)
104
107
  end
105
108
 
106
109
  def dsc_module_import_failure?(command_output)
107
110
  !! (command_output =~ /\sCimException/ &&
108
- command_output =~ /ProviderOperationExecutionFailure/ &&
111
+ command_output.include?("ProviderOperationExecutionFailure") &&
109
112
  command_output =~ /\smodule\s+is\s+installed/)
110
113
  end
111
114
 
@@ -16,14 +16,14 @@
16
16
  # limitations under the License.
17
17
  #
18
18
 
19
- require_relative "../powershell/cmdlet"
20
- require_relative "../powershell/cmdlet_result"
19
+ require_relative "../../mixin/powershell_exec"
21
20
  require_relative "../../exceptions"
22
21
 
23
22
  class Chef
24
23
  class Util
25
24
  class DSC
26
25
  class ResourceStore
26
+ include Chef::Mixin::PowershellExec
27
27
 
28
28
  def self.instance
29
29
  @@instance ||= ResourceStore.new.tap do |store|
@@ -83,19 +83,13 @@ class Chef
83
83
 
84
84
  # Returns a list of dsc resources
85
85
  def query_resources
86
- cmdlet = Chef::Util::Powershell::Cmdlet.new(nil, "get-dscresource",
87
- :object)
88
- result = cmdlet.run
89
- result.return_value
86
+ powershell_exec("get-dscresource").result
90
87
  end
91
88
 
92
89
  # Returns a list of dsc resources matching the provided name
93
90
  def query_resource(resource_name)
94
- cmdlet = Chef::Util::Powershell::Cmdlet.new(nil, "get-dscresource #{resource_name}",
95
- :object)
96
- result = cmdlet.run
97
- ret_val = result.return_value
98
- if ret_val.nil?
91
+ ret_val = powershell_exec("get-dscresource #{resource_name}").result
92
+ if ret_val.empty?
99
93
  []
100
94
  elsif ret_val.is_a? Array
101
95
  ret_val
@@ -23,7 +23,7 @@ require_relative "version_string"
23
23
 
24
24
  class Chef
25
25
  CHEF_ROOT = File.expand_path("..", __dir__)
26
- VERSION = Chef::VersionString.new("16.5.64")
26
+ VERSION = Chef::VersionString.new("16.8.14")
27
27
  end
28
28
 
29
29
  #
@@ -316,6 +316,7 @@ typedef struct _REPARSE_DATA_BUFFER {
316
316
  string_pointer.read_wstring(self[:PrintNameLength] / 2)
317
317
  end
318
318
  end
319
+
319
320
  class REPARSE_DATA_BUFFER_MOUNT_POINT < FFI::Struct
320
321
  layout :SubstituteNameOffset, :ushort,
321
322
  :SubstituteNameLength, :ushort,
@@ -333,14 +334,17 @@ typedef struct _REPARSE_DATA_BUFFER {
333
334
  string_pointer.read_wstring(self[:PrintNameLength] / 2)
334
335
  end
335
336
  end
337
+
336
338
  class REPARSE_DATA_BUFFER_GENERIC < FFI::Struct
337
339
  layout :DataBuffer, :uchar
338
340
  end
341
+
339
342
  class REPARSE_DATA_BUFFER_UNION < FFI::Union
340
343
  layout :SymbolicLinkReparseBuffer, REPARSE_DATA_BUFFER_SYMBOLIC_LINK,
341
344
  :MountPointReparseBuffer, REPARSE_DATA_BUFFER_MOUNT_POINT,
342
345
  :GenericReparseBuffer, REPARSE_DATA_BUFFER_GENERIC
343
346
  end
347
+
344
348
  class REPARSE_DATA_BUFFER < FFI::Struct
345
349
  layout :ReparseTag, :uint32,
346
350
  :ReparseDataLength, :ushort,
@@ -124,7 +124,7 @@ class Chef
124
124
  # Return the link destination (strip off \??\ at the beginning, which is a local filesystem thing)
125
125
  link_dest = reparse_buffer.reparse_buffer.substitute_name
126
126
  if /^\\\?\?\\/.match?(link_dest)
127
- link_dest = link_dest[4..-1]
127
+ link_dest = link_dest[4..]
128
128
  end
129
129
  link_dest
130
130
  end
@@ -321,7 +321,7 @@ class Chef
321
321
  while status == ERROR_MORE_DATA
322
322
  status = NetUserEnum(servername, level, filter, bufptr, prefmaxlen, entriesread, totalentries, resume_handle)
323
323
 
324
- if status == NERR_Success || status == ERROR_MORE_DATA
324
+ if [NERR_Success, ERROR_MORE_DATA].include?(status)
325
325
  Array.new(entriesread.read_long) do |i|
326
326
  user_info = USER_INFO_3.new(bufptr.read_pointer + i * USER_INFO_3.size)
327
327
  # Check if the account is the Administrator account
@@ -40,7 +40,7 @@ module FFI
40
40
  last_char = nil
41
41
  while last_char != "\000\000"
42
42
  length += 1
43
- last_char = get_bytes(0, length * 2)[-2..-1]
43
+ last_char = get_bytes(0, length * 2)[-2..]
44
44
  end
45
45
 
46
46
  num_wchars = length
@@ -18,12 +18,20 @@
18
18
  require "spec_helper"
19
19
  require "chef/mixin/powershell_out"
20
20
 
21
- describe Chef::Mixin::PowershellOut, windows_only: true do
21
+ describe Chef::Mixin::PowershellOut, :windows_only do
22
22
  include Chef::Mixin::PowershellOut
23
23
 
24
24
  describe "#powershell_out" do
25
25
  it "runs a powershell command and collects stdout" do
26
- expect(powershell_out("get-process").run_command.stdout).to match /Handles/
26
+ expect(powershell_out("get-process").run_command.stdout).to match(/Handles/)
27
+ end
28
+
29
+ it "uses :powershell by default" do
30
+ expect(powershell_out("$PSVersionTable").run_command.stdout).to match(/CLRVersion/)
31
+ end
32
+
33
+ it ":pwsh interpreter uses core edition", :pwsh_installed do
34
+ expect(powershell_out("$PSVersionTable", :pwsh).run_command.stdout).to match(/Core/)
27
35
  end
28
36
 
29
37
  it "does not raise exceptions when the command is invalid" do
@@ -33,7 +41,7 @@ describe Chef::Mixin::PowershellOut, windows_only: true do
33
41
 
34
42
  describe "#powershell_out!" do
35
43
  it "runs a powershell command and collects stdout" do
36
- expect(powershell_out!("get-process").run_command.stdout).to match /Handles/
44
+ expect(powershell_out!("get-process").run_command.stdout).to match(/Handles/)
37
45
  end
38
46
 
39
47
  it "raises exceptions when the command is invalid" do
@@ -39,9 +39,7 @@ module AptServer
39
39
  def tcp_test_port(hostname, port)
40
40
  tcp_socket = TCPSocket.new(hostname, port)
41
41
  true
42
- rescue Errno::ETIMEDOUT
43
- false
44
- rescue Errno::ECONNREFUSED
42
+ rescue Errno::ETIMEDOUT, Errno::ECONNREFUSED
45
43
  false
46
44
  ensure
47
45
  tcp_socket && tcp_socket.close
@@ -326,7 +324,7 @@ describe Chef::Resource::AptPackage, metadata do
326
324
  pkg_check = shell_out!("dpkg -l chef-integration-test", returns: [0, 1])
327
325
 
328
326
  if pkg_check.exitstatus == 0
329
- expect(pkg_check.stdout).to match(/un[\s]+chef-integration-test/)
327
+ expect(pkg_check.stdout).to match(/un\s+chef-integration-test/)
330
328
  end
331
329
  end
332
330
 
@@ -359,7 +357,7 @@ describe Chef::Resource::AptPackage, metadata do
359
357
  it "upgrades the package for action :upgrade" do
360
358
  package_resource.run_action(:upgrade)
361
359
  dpkg_l = shell_out!("dpkg -l chef-integration-test", returns: [0])
362
- expect(dpkg_l.stdout).to match(/chef\-integration\-test[\s]+1\.1\-1/)
360
+ expect(dpkg_l.stdout).to match(/chef\-integration\-test\s+1\.1\-1/)
363
361
  expect(package_resource).to be_updated_by_last_action
364
362
  end
365
363
 
@@ -373,7 +371,7 @@ describe Chef::Resource::AptPackage, metadata do
373
371
  it "upgrades the package for action :install" do
374
372
  package_resource.run_action(:install)
375
373
  dpkg_l = shell_out!("dpkg -l chef-integration-test", returns: [0])
376
- expect(dpkg_l.stdout).to match(/chef\-integration\-test[\s]+1\.1\-1/)
374
+ expect(dpkg_l.stdout).to match(/chef\-integration\-test\s+1\.1\-1/)
377
375
  expect(package_resource).to be_updated_by_last_action
378
376
  end
379
377
  end
@@ -16,13 +16,13 @@
16
16
  # limitations under the License.
17
17
  #
18
18
  require "spec_helper"
19
- require "chef/mixin/powershell_out"
19
+ require "chef/mixin/shell_out"
20
20
 
21
21
  describe Chef::Resource::ChocolateyPackage, :windows_only, :choco_installed do
22
- include Chef::Mixin::PowershellOut
22
+ include Chef::Mixin::ShellOut
23
23
 
24
24
  let(:package_name) { "test-A" }
25
- let(:package_list) { proc { powershell_out!("choco list -lo -r #{Array(package_name).join(" ")}").stdout.chomp } }
25
+ let(:package_list) { proc { shell_out!("choco list -lo -r #{Array(package_name).join(" ")}").stdout.chomp } }
26
26
  let(:package_source) { File.join(CHEF_SPEC_ASSETS, "chocolatey_feed") }
27
27
 
28
28
  let(:run_context) do
@@ -26,7 +26,7 @@ describe Chef::Resource::Cron, :requires_root, :unix_only do
26
26
  # Platform specific validation routines.
27
27
  def cron_should_exists(cron_name, command)
28
28
  case ohai[:platform]
29
- when "aix", "opensolaris", "solaris2", "omnios"
29
+ when "aix", "solaris2", "omnios"
30
30
  expect(shell_out("crontab -l #{new_resource.user} | grep \"#{cron_name}\"").exitstatus).to eq(0)
31
31
  expect(shell_out("crontab -l #{new_resource.user} | grep \"#{cron_name}\"").stdout.lines.to_a.size).to eq(1)
32
32
  expect(shell_out("crontab -l #{new_resource.user} | grep \"#{command}\"").exitstatus).to eq(0)
@@ -41,7 +41,7 @@ describe Chef::Resource::Cron, :requires_root, :unix_only do
41
41
 
42
42
  def cron_should_not_exists(cron_name)
43
43
  case ohai[:platform]
44
- when "aix", "opensolaris", "solaris2", "omnios"
44
+ when "aix", "solaris2", "omnios"
45
45
  expect(shell_out("crontab -l #{new_resource.user} | grep \"#{cron_name}\"").exitstatus).to eq(1)
46
46
  expect(shell_out("crontab -l #{new_resource.user} | grep \"#{new_resource.command}\"").stdout.lines.to_a.size).to eq(0)
47
47
  else
@@ -113,7 +113,7 @@ describe Chef::Resource::Cron, :requires_root, :unix_only do
113
113
  end
114
114
  end
115
115
 
116
- exclude_solaris = %w{solaris opensolaris solaris2 omnios}.include?(ohai[:platform])
116
+ exclude_solaris = %w{solaris solaris2 omnios}.include?(ohai[:platform])
117
117
  describe "create action with various attributes", external: exclude_solaris do
118
118
  def create_and_validate_with_property(resource, attribute, value)
119
119
  if ohai[:platform] == "aix"
@@ -17,13 +17,13 @@
17
17
  #
18
18
 
19
19
  require "spec_helper"
20
- require "chef/mixin/powershell_out"
20
+ require "chef/mixin/powershell_exec"
21
21
  require "chef/mixin/windows_architecture_helper"
22
22
  require "support/shared/integration/integration_helper"
23
23
 
24
- describe Chef::Resource::DscScript, :windows_powershell_dsc_only do
24
+ describe Chef::Resource::DscScript, :windows_powershell_dsc_only, :ruby64_only do
25
25
  include Chef::Mixin::WindowsArchitectureHelper
26
- include Chef::Mixin::PowershellOut
26
+ include Chef::Mixin::PowershellExec
27
27
  before(:all) do
28
28
  @temp_dir = ::Dir.mktmpdir("dsc-functional-test")
29
29
  # enable the HTTP listener if it is not already enabled needed by underlying DSC engine
@@ -33,7 +33,7 @@ describe Chef::Resource::DscScript, :windows_powershell_dsc_only do
33
33
  winrm create winrm/config/Listener?Address=*+Transport=HTTP
34
34
  }
35
35
  CODE
36
- powershell_out!(winrm_code)
36
+ powershell_exec!(winrm_code)
37
37
  end
38
38
 
39
39
  after(:all) do
@@ -261,12 +261,9 @@ describe Chef::Resource::DscScript, :windows_powershell_dsc_only do
261
261
 
262
262
  it "should raise an exception if the cwd is etc" do
263
263
  dsc_test_resource.cwd(dsc_environment_fail_etc_directory)
264
- expect { dsc_test_resource.run_action(:run) }.to raise_error(Chef::Exceptions::PowershellCmdletException)
265
- begin
264
+ expect {
266
265
  dsc_test_resource.run_action(:run)
267
- rescue Chef::Exceptions::PowershellCmdletException => e
268
- expect(e.message).to match(exception_message_signature)
269
- end
266
+ }.to raise_error(Chef::PowerShell::CommandFailed, /#{exception_message_signature}/)
270
267
  end
271
268
  end
272
269
  end
@@ -129,8 +129,9 @@ describe Chef::Resource::Mount, :requires_root, external: include_flag do
129
129
  end
130
130
 
131
131
  # Actual tests begin here.
132
- before(:all) do
132
+ before do |test|
133
133
  @device, @fstype = setup_device_for_mount
134
+ @device = "/" if test.metadata[:skip_before]
134
135
 
135
136
  @mount_point = Dir.mktmpdir("testmount")
136
137
 
@@ -145,13 +146,20 @@ describe Chef::Resource::Mount, :requires_root, external: include_flag do
145
146
  end
146
147
 
147
148
  after(:all) do
148
- Dir.rmdir(@mount_point)
149
+ Dir.rmdir(@mount_point) if @mount_point
149
150
  end
150
151
 
151
152
  after(:each) do
152
153
  cleanup_mount(new_resource.mount_point)
153
154
  end
154
155
 
156
+ describe "when device is '/'" do
157
+ it "should mount the filesystem if device is '/'", :skip_before do
158
+ new_resource.run_action(:mount)
159
+ mount_should_exist(new_resource.mount_point, new_resource.device)
160
+ end
161
+ end
162
+
155
163
  describe "when the target state is a mounted filesystem" do
156
164
  it "should mount the filesystem if it isn't mounted" do
157
165
  expect(current_resource.enabled).to be_falsey
@@ -0,0 +1,107 @@
1
+ #
2
+ # Author:: Matt Wrock (<matt@mattwrock.com>)
3
+ # Copyright:: Copyright (c) Chef Software Inc.
4
+ # License:: Apache License, Version 2.0
5
+ #
6
+ # Licensed under the Apache License, Version 2.0 (the "License");
7
+ # you may not use this file except in compliance with the License.
8
+ # You may obtain a copy of the License at
9
+ #
10
+ # http://www.apache.org/licenses/LICENSE-2.0
11
+ #
12
+ # Unless required by applicable law or agreed to in writing, software
13
+ # distributed under the License is distributed on an "AS IS" BASIS,
14
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15
+ # See the License for the specific language governing permissions and
16
+ # limitations under the License.
17
+ #
18
+ require "spec_helper"
19
+ require "chef/mixin/powershell_exec"
20
+
21
+ describe Chef::Resource::PowershellPackageSource, :windows_gte_10 do
22
+ include Chef::Mixin::PowershellExec
23
+
24
+ let(:source_name) { "fake" }
25
+ let(:url) { "https://www.nuget.org/api/v2" }
26
+ let(:trusted) { true }
27
+
28
+ let(:run_context) do
29
+ Chef::RunContext.new(Chef::Node.new, {}, Chef::EventDispatch::Dispatcher.new)
30
+ end
31
+
32
+ subject do
33
+ new_resource = Chef::Resource::PowershellPackageSource.new("test powershell package source", run_context)
34
+ new_resource.source_name source_name
35
+ new_resource.url url
36
+ new_resource.trusted trusted
37
+ new_resource.provider_name provider_name
38
+ new_resource
39
+ end
40
+
41
+ let(:provider) do
42
+ provider = subject.provider_for_action(subject.action)
43
+ provider
44
+ end
45
+
46
+ shared_examples "package_source" do
47
+ context "register a package source" do
48
+ after { remove_package_source }
49
+
50
+ it "registers the package source" do
51
+ subject.run_action(:register)
52
+ expect(get_installed_package_source_name).to eq(source_name)
53
+ end
54
+
55
+ it "does not register the package source if already installed" do
56
+ subject.run_action(:register)
57
+ subject.run_action(:register)
58
+ expect(subject).not_to be_updated_by_last_action
59
+ end
60
+
61
+ it "updates an existing package source if changed" do
62
+ subject.run_action(:register)
63
+ subject.trusted !trusted
64
+ subject.run_action(:register)
65
+ expect(subject).to be_updated_by_last_action
66
+ end
67
+ end
68
+
69
+ context "unregister a package source" do
70
+ it "unregisters the package source" do
71
+ subject.run_action(:register)
72
+ subject.run_action(:unregister)
73
+ expect(get_installed_package_source_name).to be_empty
74
+ end
75
+
76
+ it "does not unregister the package source if not already installed" do
77
+ subject.run_action(:unregister)
78
+ expect(subject).not_to be_updated_by_last_action
79
+ end
80
+ end
81
+ end
82
+
83
+ context "with NuGet provider" do
84
+ let(:provider_name) { "NuGet" }
85
+
86
+ before(:all) do
87
+ powershell_exec!("[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;Install-PackageProvider -Name NuGet -Force")
88
+ end
89
+
90
+ it_behaves_like "package_source"
91
+ end
92
+
93
+ context "with PowerShellGet provider" do
94
+ let(:provider_name) { "PowerShellGet" }
95
+
96
+ it_behaves_like "package_source"
97
+ end
98
+
99
+ def get_installed_package_source_name
100
+ powershell_exec!("(Get-PackageSource -Name #{source_name} -ErrorAction SilentlyContinue).Name").result
101
+ end
102
+
103
+ def remove_package_source
104
+ pkg_to_remove = Chef::Resource::PowershellPackageSource.new(source_name, run_context)
105
+ pkg_to_remove.run_action(:unregister)
106
+ end
107
+ end