chef 16.1.16-universal-mingw32 → 16.3.45-universal-mingw32

Sign up to get free protection for your applications and to get access to all the features.
Files changed (364) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +6 -7
  3. data/README.md +3 -3
  4. data/Rakefile +3 -16
  5. data/chef-universal-mingw32.gemspec +2 -2
  6. data/chef.gemspec +7 -6
  7. data/lib/chef/application.rb +12 -0
  8. data/lib/chef/application/apply.rb +2 -1
  9. data/lib/chef/application/base.rb +1 -1
  10. data/lib/chef/application/client.rb +1 -1
  11. data/lib/chef/application/windows_service_manager.rb +1 -1
  12. data/lib/chef/{whitelist.rb → attribute_allowlist.rb} +11 -11
  13. data/lib/chef/{blacklist.rb → attribute_blocklist.rb} +9 -9
  14. data/lib/chef/chef_fs/data_handler/data_bag_item_data_handler.rb +1 -1
  15. data/lib/chef/chef_fs/data_handler/organization_data_handler.rb +1 -2
  16. data/lib/chef/chef_fs/file_system/chef_server/cookbook_file.rb +2 -2
  17. data/lib/chef/chef_fs/file_system/chef_server/cookbooks_dir.rb +1 -5
  18. data/lib/chef/chef_fs/file_system/repository/base_file.rb +1 -0
  19. data/lib/chef/chef_fs/parallelizer/parallel_enumerable.rb +1 -1
  20. data/lib/chef/chef_fs/path_utils.rb +1 -1
  21. data/lib/chef/client.rb +3 -3
  22. data/lib/chef/cookbook/chefignore.rb +1 -1
  23. data/lib/chef/cookbook/metadata.rb +1 -1
  24. data/lib/chef/cookbook/remote_file_vendor.rb +1 -3
  25. data/lib/chef/cookbook/syntax_check.rb +1 -2
  26. data/lib/chef/cookbook_loader.rb +15 -29
  27. data/lib/chef/cookbook_version.rb +2 -2
  28. data/lib/chef/data_bag.rb +5 -6
  29. data/lib/chef/deprecated.rb +12 -0
  30. data/lib/chef/digester.rb +3 -2
  31. data/lib/chef/dsl/platform_introspection.rb +2 -0
  32. data/lib/chef/environment.rb +1 -2
  33. data/lib/chef/exceptions.rb +3 -0
  34. data/lib/chef/file_access_control.rb +1 -1
  35. data/lib/chef/file_access_control/windows.rb +2 -2
  36. data/lib/chef/file_content_management/deploy/mv_unix.rb +1 -1
  37. data/lib/chef/formatters/error_inspectors/compile_error_inspector.rb +1 -1
  38. data/lib/chef/formatters/error_inspectors/resource_failure_inspector.rb +3 -3
  39. data/lib/chef/handler.rb +2 -0
  40. data/lib/chef/http.rb +27 -13
  41. data/lib/chef/http/authenticator.rb +3 -1
  42. data/lib/chef/http/http_request.rb +1 -1
  43. data/lib/chef/http/json_output.rb +1 -1
  44. data/lib/chef/http/ssl_policies.rb +18 -0
  45. data/lib/chef/knife.rb +5 -5
  46. data/lib/chef/knife/bootstrap.rb +19 -19
  47. data/lib/chef/knife/bootstrap/templates/chef-full.erb +9 -9
  48. data/lib/chef/knife/bootstrap/train_connector.rb +1 -0
  49. data/lib/chef/knife/client_bulk_delete.rb +1 -1
  50. data/lib/chef/knife/config_get.rb +2 -1
  51. data/lib/chef/knife/config_list_profiles.rb +4 -1
  52. data/lib/chef/knife/config_use_profile.rb +15 -5
  53. data/lib/chef/knife/configure.rb +1 -1
  54. data/lib/chef/knife/cookbook_delete.rb +1 -1
  55. data/lib/chef/knife/cookbook_upload.rb +6 -14
  56. data/lib/chef/knife/core/bootstrap_context.rb +1 -1
  57. data/lib/chef/knife/core/cookbook_scm_repo.rb +1 -1
  58. data/lib/chef/knife/core/gem_glob_loader.rb +1 -1
  59. data/lib/chef/knife/core/hashed_command_loader.rb +1 -0
  60. data/lib/chef/knife/core/subcommand_loader.rb +20 -1
  61. data/lib/chef/knife/core/ui.rb +8 -2
  62. data/lib/chef/knife/core/windows_bootstrap_context.rb +2 -3
  63. data/lib/chef/knife/data_bag_create.rb +1 -1
  64. data/lib/chef/knife/node_bulk_delete.rb +1 -1
  65. data/lib/chef/knife/node_run_list_remove.rb +1 -1
  66. data/lib/chef/knife/rehash.rb +3 -21
  67. data/lib/chef/knife/role_bulk_delete.rb +1 -1
  68. data/lib/chef/knife/ssh.rb +6 -2
  69. data/lib/chef/knife/supermarket_share.rb +1 -1
  70. data/lib/chef/knife/supermarket_unshare.rb +1 -1
  71. data/lib/chef/log.rb +8 -3
  72. data/{spec/functional/resource/base.rb → lib/chef/mixin/chef_utils_wiring.rb} +24 -12
  73. data/{spec/unit/log_spec.rb → lib/chef/mixin/default_paths.rb} +13 -5
  74. data/lib/chef/mixin/openssl_helper.rb +27 -5
  75. data/lib/chef/mixin/path_sanity.rb +5 -4
  76. data/lib/chef/mixin/securable.rb +2 -2
  77. data/lib/chef/mixin/shell_out.rb +4 -188
  78. data/lib/chef/mixin/template.rb +1 -0
  79. data/lib/chef/mixin/which.rb +6 -3
  80. data/lib/chef/mixins.rb +1 -0
  81. data/lib/chef/node.rb +36 -12
  82. data/lib/chef/node_map.rb +21 -18
  83. data/lib/chef/platform/service_helpers.rb +31 -28
  84. data/lib/chef/powershell.rb +1 -1
  85. data/lib/chef/provider/batch.rb +3 -10
  86. data/lib/chef/provider/cron.rb +2 -14
  87. data/lib/chef/provider/execute.rb +2 -1
  88. data/lib/chef/provider/git.rb +12 -4
  89. data/lib/chef/provider/group/dscl.rb +2 -2
  90. data/lib/chef/provider/group/windows.rb +1 -1
  91. data/lib/chef/provider/ifconfig.rb +7 -7
  92. data/lib/chef/provider/mount/aix.rb +1 -1
  93. data/lib/chef/provider/mount/solaris.rb +0 -1
  94. data/lib/chef/provider/mount/windows.rb +2 -2
  95. data/lib/chef/provider/noop.rb +1 -1
  96. data/lib/chef/provider/package/openbsd.rb +1 -1
  97. data/lib/chef/provider/package/portage.rb +2 -2
  98. data/lib/chef/provider/package/powershell.rb +6 -2
  99. data/lib/chef/provider/package/rubygems.rb +2 -2
  100. data/lib/chef/provider/package/snap.rb +97 -29
  101. data/lib/chef/provider/package/windows.rb +9 -4
  102. data/lib/chef/provider/package/windows/msi.rb +3 -3
  103. data/lib/chef/provider/package/windows/registry_uninstall_entry.rb +1 -1
  104. data/lib/chef/provider/package/zypper.rb +0 -1
  105. data/lib/chef/provider/powershell_script.rb +10 -14
  106. data/lib/chef/provider/remote_file/http.rb +4 -1
  107. data/lib/chef/provider/script.rb +4 -75
  108. data/lib/chef/provider/service.rb +2 -2
  109. data/lib/chef/provider/service/arch.rb +1 -1
  110. data/lib/chef/provider/service/debian.rb +2 -2
  111. data/lib/chef/provider/service/openbsd.rb +4 -4
  112. data/lib/chef/provider/service/redhat.rb +1 -1
  113. data/lib/chef/provider/service/windows.rb +1 -1
  114. data/lib/chef/provider/subversion.rb +2 -2
  115. data/lib/chef/provider/user/dscl.rb +4 -4
  116. data/lib/chef/provider/user/linux.rb +3 -3
  117. data/lib/chef/provider/user/mac.rb +5 -5
  118. data/lib/chef/provider/windows_script.rb +87 -25
  119. data/lib/chef/provider/yum_repository.rb +1 -1
  120. data/lib/chef/provider/zypper_repository.rb +31 -11
  121. data/lib/chef/resource.rb +24 -11
  122. data/lib/chef/resource/alternatives.rb +1 -1
  123. data/lib/chef/resource/apt_package.rb +1 -1
  124. data/lib/chef/resource/archive_file.rb +28 -8
  125. data/lib/chef/resource/bash.rb +0 -1
  126. data/lib/chef/resource/batch.rb +4 -2
  127. data/lib/chef/resource/build_essential.rb +2 -2
  128. data/lib/chef/resource/chef_client_scheduled_task.rb +14 -2
  129. data/lib/chef/resource/chef_gem.rb +57 -21
  130. data/lib/chef/resource/chocolatey_feature.rb +1 -2
  131. data/lib/chef/resource/cron/_cron_shared.rb +98 -0
  132. data/lib/chef/resource/cron/cron.rb +46 -0
  133. data/lib/chef/resource/{cron_d.rb → cron/cron_d.rb} +7 -87
  134. data/lib/chef/resource/cron_access.rb +13 -5
  135. data/lib/chef/resource/csh.rb +0 -1
  136. data/lib/chef/resource/dmg_package.rb +2 -2
  137. data/lib/chef/resource/execute.rb +479 -9
  138. data/lib/chef/resource/file.rb +1 -1
  139. data/lib/chef/resource/freebsd_package.rb +1 -1
  140. data/lib/chef/resource/gem_package.rb +35 -2
  141. data/lib/chef/resource/helpers/cron_validations.rb +6 -3
  142. data/lib/chef/resource/homebrew_package.rb +30 -1
  143. data/lib/chef/resource/homebrew_update.rb +107 -0
  144. data/lib/chef/resource/hostname.rb +23 -36
  145. data/lib/chef/resource/kernel_module.rb +14 -1
  146. data/lib/chef/resource/launchd.rb +1 -1
  147. data/lib/chef/resource/lwrp_base.rb +1 -0
  148. data/lib/chef/resource/macos_userdefaults.rb +176 -61
  149. data/lib/chef/resource/mount.rb +1 -1
  150. data/lib/chef/resource/openssl_x509_certificate.rb +11 -14
  151. data/lib/chef/resource/openssl_x509_crl.rb +1 -2
  152. data/lib/chef/resource/perl.rb +0 -1
  153. data/lib/chef/resource/plist.rb +23 -4
  154. data/lib/chef/resource/powershell_script.rb +4 -2
  155. data/lib/chef/resource/python.rb +0 -1
  156. data/lib/chef/resource/remote_file.rb +26 -10
  157. data/lib/chef/resource/ruby.rb +0 -1
  158. data/lib/chef/resource/service.rb +2 -2
  159. data/lib/chef/resource/ssh_known_hosts_entry.rb +16 -1
  160. data/lib/chef/resource/sudo.rb +30 -3
  161. data/lib/chef/resource/swap_file.rb +17 -0
  162. data/lib/chef/resource/template.rb +1 -1
  163. data/lib/chef/resource/timezone.rb +15 -0
  164. data/lib/chef/resource/user_ulimit.rb +1 -1
  165. data/lib/chef/resource/windows_ad_join.rb +30 -1
  166. data/lib/chef/resource/windows_audit_policy.rb +227 -0
  167. data/lib/chef/resource/windows_auto_run.rb +11 -0
  168. data/lib/chef/resource/windows_certificate.rb +26 -0
  169. data/lib/chef/resource/windows_dns_record.rb +17 -0
  170. data/lib/chef/resource/windows_firewall_profile.rb +197 -0
  171. data/lib/chef/resource/windows_font.rb +3 -3
  172. data/lib/chef/resource/windows_package.rb +1 -1
  173. data/lib/chef/resource/windows_pagefile.rb +1 -1
  174. data/lib/chef/resource/windows_script.rb +2 -16
  175. data/lib/chef/resource/windows_security_policy.rb +67 -36
  176. data/lib/chef/resource/windows_shortcut.rb +1 -2
  177. data/lib/chef/resource/windows_task.rb +4 -4
  178. data/lib/chef/resource/windows_user_privilege.rb +30 -7
  179. data/lib/chef/resource/yum_repository.rb +9 -9
  180. data/lib/chef/resource_inspector.rb +7 -1
  181. data/lib/chef/resources.rb +5 -2
  182. data/lib/chef/role.rb +1 -2
  183. data/lib/chef/search/query.rb +1 -1
  184. data/lib/chef/server_api_versions.rb +4 -0
  185. data/lib/chef/shell/shell_session.rb +2 -0
  186. data/lib/chef/util/diff.rb +2 -3
  187. data/lib/chef/util/windows/net_user.rb +1 -1
  188. data/lib/chef/util/windows/volume.rb +1 -1
  189. data/lib/chef/version.rb +2 -2
  190. data/lib/chef/win32/file.rb +1 -1
  191. data/lib/chef/win32/registry.rb +3 -4
  192. data/lib/chef/win32/security.rb +1 -1
  193. data/spec/data/lwrp/providers/buck_passer.rb +1 -1
  194. data/spec/data/lwrp/providers/buck_passer_2.rb +1 -1
  195. data/spec/data/lwrp/providers/embedded_resource_accesses_providers_scope.rb +1 -1
  196. data/spec/functional/knife/configure_spec.rb +1 -1
  197. data/spec/functional/knife/ssh_spec.rb +5 -16
  198. data/spec/functional/resource/aix_service_spec.rb +9 -2
  199. data/spec/functional/resource/aixinit_service_spec.rb +1 -2
  200. data/spec/functional/resource/apt_package_spec.rb +0 -1
  201. data/spec/functional/resource/bash_spec.rb +3 -2
  202. data/spec/functional/resource/bff_spec.rb +1 -1
  203. data/spec/functional/resource/chocolatey_package_spec.rb +4 -0
  204. data/spec/functional/resource/cron_spec.rb +20 -2
  205. data/spec/functional/resource/dnf_package_spec.rb +4 -1
  206. data/spec/functional/resource/execute_spec.rb +1 -1
  207. data/spec/functional/resource/git_spec.rb +23 -1
  208. data/spec/functional/resource/group_spec.rb +15 -3
  209. data/spec/functional/resource/ifconfig_spec.rb +9 -1
  210. data/spec/functional/resource/insserv_spec.rb +3 -3
  211. data/spec/functional/resource/link_spec.rb +2 -5
  212. data/spec/functional/resource/mount_spec.rb +9 -1
  213. data/spec/functional/resource/msu_package_spec.rb +9 -3
  214. data/spec/functional/resource/powershell_script_spec.rb +4 -4
  215. data/spec/functional/resource/remote_file_spec.rb +9 -15
  216. data/spec/functional/resource/rpm_spec.rb +1 -1
  217. data/spec/functional/resource/timezone_spec.rb +2 -0
  218. data/spec/functional/resource/windows_package_spec.rb +0 -1
  219. data/spec/functional/resource/windows_path_spec.rb +4 -0
  220. data/spec/functional/resource/windows_security_policy_spec.rb +0 -1
  221. data/spec/functional/resource/windows_service_spec.rb +4 -0
  222. data/spec/functional/resource/windows_task_spec.rb +12 -11
  223. data/spec/functional/resource/windows_user_privilege_spec.rb +1 -2
  224. data/spec/functional/resource/yum_package_spec.rb +4 -1
  225. data/spec/functional/resource/zypper_package_spec.rb +4 -1
  226. data/spec/functional/run_lock_spec.rb +2 -1
  227. data/spec/functional/shell_spec.rb +5 -6
  228. data/spec/functional/util/powershell/cmdlet_spec.rb +1 -1
  229. data/spec/functional/version_spec.rb +1 -1
  230. data/spec/functional/win32/crypto_spec.rb +1 -1
  231. data/spec/integration/knife/config_list_profiles_spec.rb +30 -2
  232. data/spec/integration/knife/config_use_profile_spec.rb +55 -2
  233. data/spec/integration/knife/cookbook_upload_spec.rb +28 -1
  234. data/spec/integration/knife/data_bag_from_file_spec.rb +1 -1
  235. data/spec/integration/knife/environment_from_file_spec.rb +1 -1
  236. data/spec/integration/knife/node_from_file_spec.rb +1 -1
  237. data/spec/integration/knife/role_from_file_spec.rb +1 -1
  238. data/spec/integration/recipes/accumulator_spec.rb +1 -1
  239. data/spec/integration/recipes/lwrp_inline_resources_spec.rb +1 -1
  240. data/spec/integration/recipes/lwrp_spec.rb +1 -1
  241. data/spec/integration/recipes/notifies_spec.rb +1 -1
  242. data/spec/integration/recipes/notifying_block_spec.rb +1 -1
  243. data/spec/integration/recipes/recipe_dsl_spec.rb +5 -1
  244. data/spec/integration/recipes/resource_converge_if_changed_spec.rb +2 -0
  245. data/spec/integration/recipes/resource_load_spec.rb +4 -2
  246. data/spec/integration/recipes/unified_mode_spec.rb +1 -1
  247. data/spec/integration/recipes/use_partial_spec.rb +1 -1
  248. data/spec/scripts/ssl-serve.rb +1 -1
  249. data/spec/spec_helper.rb +10 -4
  250. data/spec/support/chef_helpers.rb +1 -20
  251. data/spec/support/platform_helpers.rb +1 -3
  252. data/spec/support/platforms/win32/spec_service.rb +1 -1
  253. data/spec/support/shared/functional/execute_resource.rb +1 -1
  254. data/spec/support/shared/functional/file_resource.rb +0 -1
  255. data/spec/support/shared/functional/securable_resource.rb +1 -2
  256. data/spec/support/shared/functional/securable_resource_with_reporting.rb +0 -1
  257. data/spec/support/shared/functional/windows_script.rb +2 -2
  258. data/spec/support/shared/integration/knife_support.rb +2 -9
  259. data/spec/support/shared/unit/application_dot_d.rb +0 -1
  260. data/spec/support/shared/unit/execute_resource.rb +1 -1
  261. data/spec/support/shared/unit/provider/file.rb +12 -8
  262. data/spec/unit/application/solo_spec.rb +4 -2
  263. data/spec/unit/application_spec.rb +11 -2
  264. data/spec/unit/chef_fs/config_spec.rb +2 -2
  265. data/spec/unit/chef_fs/diff_spec.rb +8 -8
  266. data/spec/unit/chef_fs/file_system/operation_failed_error_spec.rb +2 -4
  267. data/spec/unit/chef_fs/{parallelizer.rb → parallelizer_spec.rb} +1 -1
  268. data/spec/unit/client_spec.rb +4 -1
  269. data/spec/unit/cookbook/gem_installer_spec.rb +2 -1
  270. data/spec/unit/cookbook/synchronizer_spec.rb +26 -24
  271. data/spec/unit/data_bag_spec.rb +6 -3
  272. data/spec/unit/data_collector_spec.rb +1 -1
  273. data/spec/unit/decorator_spec.rb +23 -23
  274. data/spec/unit/dsl/platform_introspection_spec.rb +1 -0
  275. data/spec/unit/environment_spec.rb +5 -1
  276. data/spec/unit/event_dispatch/dispatcher_spec.rb +3 -0
  277. data/spec/unit/guard_interpreter_spec.rb +1 -1
  278. data/spec/unit/http/api_versions_spec.rb +20 -2
  279. data/spec/unit/http/ssl_policies_spec.rb +20 -0
  280. data/spec/unit/json_compat_spec.rb +1 -1
  281. data/spec/unit/knife/bootstrap_spec.rb +5 -8
  282. data/spec/unit/knife/cookbook_download_spec.rb +2 -2
  283. data/spec/unit/knife/cookbook_show_spec.rb +6 -7
  284. data/spec/unit/knife/cookbook_upload_spec.rb +7 -10
  285. data/spec/unit/knife/data_bag_edit_spec.rb +1 -1
  286. data/spec/unit/log/syslog_spec.rb +6 -10
  287. data/spec/unit/log/winevt_spec.rb +21 -13
  288. data/spec/unit/lwrp_spec.rb +9 -6
  289. data/spec/unit/mixin/{path_sanity_spec.rb → default_paths_spec.rb} +14 -14
  290. data/spec/unit/mixin/powershell_exec_spec.rb +1 -1
  291. data/spec/unit/mixin/powershell_out_spec.rb +2 -4
  292. data/spec/unit/mixin/powershell_type_coercions_spec.rb +1 -1
  293. data/spec/unit/mixin/securable_spec.rb +0 -1
  294. data/spec/unit/mixin/shell_out_spec.rb +25 -26
  295. data/spec/unit/mixin/subclass_directive_spec.rb +2 -2
  296. data/spec/unit/mixin/unformatter_spec.rb +2 -2
  297. data/spec/unit/mixin/uris_spec.rb +1 -1
  298. data/spec/unit/mixin/user_context_spec.rb +1 -9
  299. data/spec/unit/mixin/which.rb +8 -0
  300. data/spec/unit/node_spec.rb +98 -11
  301. data/spec/unit/property_spec.rb +6 -6
  302. data/spec/unit/provider/batch_spec.rb +130 -0
  303. data/spec/unit/provider/cron/unix_spec.rb +1 -1
  304. data/spec/unit/provider/cron_spec.rb +9 -49
  305. data/spec/unit/provider/dsc_resource_spec.rb +22 -38
  306. data/spec/unit/provider/dsc_script_spec.rb +10 -10
  307. data/spec/unit/provider/execute_spec.rb +1 -8
  308. data/spec/unit/provider/git_spec.rb +3 -3
  309. data/spec/unit/provider/ifconfig_spec.rb +0 -1
  310. data/spec/unit/provider/mdadm_spec.rb +1 -3
  311. data/spec/unit/provider/package/dnf/python_helper_spec.rb +1 -1
  312. data/spec/unit/provider/package/openbsd_spec.rb +1 -1
  313. data/spec/unit/provider/package/pacman_spec.rb +17 -20
  314. data/spec/unit/provider/package/powershell_spec.rb +95 -86
  315. data/spec/unit/provider/package/rubygems_spec.rb +5 -10
  316. data/spec/unit/provider/package/smartos_spec.rb +1 -1
  317. data/spec/unit/provider/package/snap_spec.rb +1 -1
  318. data/spec/unit/provider/package/windows/registry_uninstall_entry_spec.rb +3 -3
  319. data/spec/unit/provider/package/windows_spec.rb +30 -53
  320. data/spec/unit/provider/powershell_script_spec.rb +3 -45
  321. data/spec/unit/provider/script_spec.rb +20 -110
  322. data/spec/unit/provider/service/redhat_spec.rb +1 -1
  323. data/spec/unit/provider/service/windows_spec.rb +2 -6
  324. data/spec/unit/provider/systemd_unit_spec.rb +28 -24
  325. data/spec/unit/provider/user/dscl_spec.rb +2 -2
  326. data/spec/unit/provider/windows_env_spec.rb +5 -4
  327. data/spec/unit/provider/zypper_repository_spec.rb +60 -10
  328. data/spec/unit/provider_spec.rb +1 -0
  329. data/spec/unit/resource/archive_file_spec.rb +11 -2
  330. data/spec/unit/resource/chef_client_cron_spec.rb +23 -7
  331. data/spec/unit/resource/chef_client_scheduled_task_spec.rb +17 -7
  332. data/spec/unit/resource/chef_client_systemd_timer_spec.rb +7 -4
  333. data/spec/unit/resource/cron_spec.rb +2 -2
  334. data/spec/unit/resource/execute_spec.rb +10 -0
  335. data/spec/unit/resource/file/verification_spec.rb +2 -1
  336. data/spec/unit/resource/helpers/cron_validations_spec.rb +5 -1
  337. data/spec/unit/resource/homebrew_update_spec.rb +30 -0
  338. data/spec/unit/resource/macos_user_defaults_spec.rb +103 -2
  339. data/spec/unit/resource/powershell_script_spec.rb +10 -15
  340. data/spec/unit/resource/timezone_spec.rb +1 -1
  341. data/spec/unit/resource/windows_audit_policy_spec.rb +64 -0
  342. data/spec/unit/resource/windows_dns_record_spec.rb +3 -3
  343. data/spec/unit/resource/windows_dns_zone_spec.rb +2 -2
  344. data/spec/unit/resource/windows_firewall_profile_spec.rb +77 -0
  345. data/spec/unit/resource/windows_package_spec.rb +1 -0
  346. data/spec/unit/resource/windows_task_spec.rb +1 -1
  347. data/spec/unit/resource/windows_uac_spec.rb +2 -2
  348. data/spec/unit/resource/yum_repository_spec.rb +21 -21
  349. data/spec/unit/resource_reporter_spec.rb +1 -1
  350. data/spec/unit/resource_spec.rb +84 -1
  351. data/spec/unit/role_spec.rb +23 -21
  352. data/spec/unit/run_context/cookbook_compiler_spec.rb +1 -1
  353. data/spec/unit/run_lock_spec.rb +1 -1
  354. data/spec/unit/scan_access_control_spec.rb +1 -1
  355. data/spec/unit/server_api_spec.rb +43 -16
  356. data/spec/unit/util/backup_spec.rb +1 -1
  357. data/spec/unit/util/diff_spec.rb +1 -15
  358. data/spec/unit/util/dsc/configuration_generator_spec.rb +1 -1
  359. data/spec/unit/util/powershell/ps_credential_spec.rb +2 -2
  360. data/spec/unit/util/selinux_spec.rb +2 -1
  361. data/spec/unit/util/threaded_job_queue_spec.rb +9 -0
  362. data/spec/unit/win32/security_spec.rb +4 -3
  363. metadata +68 -40
  364. data/lib/chef/resource/cron.rb +0 -157
@@ -213,6 +213,7 @@ class Chef
213
213
 
214
214
  class TemplateError < RuntimeError
215
215
  attr_reader :original_exception, :context, :options
216
+
216
217
  SOURCE_CONTEXT_WINDOW = 2
217
218
 
218
219
  def initialize(original_exception, template, context, options)
@@ -16,20 +16,23 @@
16
16
  # limitations under the License.
17
17
 
18
18
  require "chef-utils/dsl/which" unless defined?(ChefUtils::DSL::Which)
19
- require "chef-utils/dsl/path_sanity" unless defined?(ChefUtils::DSL::PathSanity)
19
+ require "chef-utils/dsl/default_paths" unless defined?(ChefUtils::DSL::DefaultPaths)
20
+ require "chef/mixin/chef_utils_wiring" unless defined?(Chef::Mixin::ChefUtilsWiring)
20
21
 
21
22
  class Chef
22
23
  module Mixin
23
24
  module Which
24
25
  include ChefUtils::DSL::Which
26
+ include ChefUtils::DSL::DefaultPaths
27
+ include ChefUtilsWiring
25
28
 
26
29
  private
27
30
 
28
- # we dep-inject path sanity into this API for historical reasons
31
+ # we dep-inject default paths into this API for historical reasons
29
32
  #
30
33
  # @api private
31
34
  def __extra_path
32
- ChefUtils::DSL::PathSanity.sane_paths
35
+ __default_paths
33
36
  end
34
37
  end
35
38
  end
@@ -6,6 +6,7 @@ require_relative "mixin/deep_merge"
6
6
  require_relative "mixin/enforce_ownership_and_permissions"
7
7
  require_relative "mixin/from_file"
8
8
  require_relative "mixin/params_validate"
9
+ require_relative "mixin/default_paths"
9
10
  require_relative "mixin/path_sanity"
10
11
  require_relative "mixin/template"
11
12
  require_relative "mixin/securable"
@@ -34,8 +34,8 @@ require_relative "node/attribute"
34
34
  require_relative "mash"
35
35
  require_relative "json_compat"
36
36
  require_relative "search/query"
37
- require_relative "whitelist"
38
- require_relative "blacklist"
37
+ require_relative "attribute_allowlist"
38
+ require_relative "attribute_blocklist"
39
39
 
40
40
  class Chef
41
41
  class Node
@@ -706,21 +706,45 @@ class Chef
706
706
  end
707
707
  end
708
708
 
709
+ # a method to handle the renamed configuration from whitelist -> allowed
710
+ # and to throw a deprecation warning when the old configuration is set
711
+ #
712
+ # @param [String] level the attribute level
713
+ def allowlist_or_whitelist_config(level)
714
+ if Chef::Config["#{level}_attribute_whitelist".to_sym]
715
+ Chef.deprecated(:attribute_blacklist_configuration, "Attribute whitelist configurations have been deprecated. Use the allowed_LEVEL_attribute configs instead")
716
+ Chef::Config["#{level}_attribute_whitelist".to_sym]
717
+ else
718
+ Chef::Config["allowed_#{level}_attributes".to_sym]
719
+ end
720
+ end
721
+
722
+ # a method to handle the renamed configuration from blacklist -> blocked
723
+ # and to throw a deprecation warning when the old configuration is set
724
+ #
725
+ # @param [String] level the attribute level
726
+ def blocklist_or_blacklist_config(level)
727
+ if Chef::Config["#{level}_attribute_blacklist".to_sym]
728
+ Chef.deprecated(:attribute_blacklist_configuration, "Attribute blacklist configurations have been deprecated. Use the blocked_LEVEL_attribute configs instead")
729
+ Chef::Config["#{level}_attribute_blacklist".to_sym]
730
+ else
731
+ Chef::Config["blocked_#{level}_attributes".to_sym]
732
+ end
733
+ end
734
+
709
735
  def data_for_save
710
736
  data = for_json
711
737
  %w{automatic default normal override}.each do |level|
712
- whitelist_config_option = "#{level}_attribute_whitelist".to_sym
713
- whitelist = Chef::Config[whitelist_config_option]
714
- unless whitelist.nil? # nil => save everything
715
- logger.info("Whitelisting #{level} node attributes for save.")
716
- data[level] = Chef::Whitelist.filter(data[level], whitelist)
738
+ allowlist = allowlist_or_whitelist_config(level)
739
+ unless allowlist.nil? # nil => save everything
740
+ logger.info("Allowing #{level} node attributes for save.")
741
+ data[level] = Chef::AttributeAllowlist.filter(data[level], allowlist)
717
742
  end
718
743
 
719
- blacklist_config_option = "#{level}_attribute_blacklist".to_sym
720
- blacklist = Chef::Config[blacklist_config_option]
721
- unless blacklist.nil? # nil => remove nothing
722
- logger.info("Blacklisting #{level} node attributes for save")
723
- data[level] = Chef::Blacklist.filter(data[level], blacklist)
744
+ blocklist = blocklist_or_blacklist_config(level)
745
+ unless blocklist.nil? # nil => remove nothing
746
+ logger.info("Blocking #{level} node attributes for save")
747
+ data[level] = Chef::AttributeBlocklist.filter(data[level], blocklist)
724
748
  end
725
749
  end
726
750
  data
@@ -35,10 +35,13 @@
35
35
  #
36
36
  # XXX: confusingly, in the *_priority_map the :klass may be an array of Strings of class names
37
37
  #
38
+
39
+ require_relative "dist"
40
+
38
41
  class Chef
39
42
  class NodeMap
40
43
  COLLISION_WARNING = <<~EOH.gsub(/\s+/, " ").strip
41
- %{type_caps} %{key} from the client is overriding the %{type} from a cookbook. Please upgrade your cookbook
44
+ %{type_caps} %{key} built into %{client_name} is being overridden by the %{type} from a cookbook. Please upgrade your cookbook
42
45
  or remove the cookbook from your run_list.
43
46
  EOH
44
47
 
@@ -83,7 +86,7 @@ class Chef
83
86
  else
84
87
  klass.superclass.to_s
85
88
  end
86
- Chef::Log.warn( COLLISION_WARNING % { type: type_of_thing, key: key, type_caps: type_of_thing.capitalize } )
89
+ Chef::Log.warn( COLLISION_WARNING % { type: type_of_thing, key: key, type_caps: type_of_thing.capitalize, client_name: Chef::Dist::PRODUCT } )
87
90
  end
88
91
 
89
92
  # The map is sorted in order of preference already; we just need to find
@@ -209,7 +212,7 @@ class Chef
209
212
  # - no negative matches (!value)
210
213
  # - at least one positive match (value or :all), or no positive filters
211
214
  #
212
- def matches_black_white_list?(node, filters, attribute)
215
+ def matches_block_allow_list?(node, filters, attribute)
213
216
  # It's super common for the filter to be nil. Catch that so we don't
214
217
  # spend any time here.
215
218
  return true unless filters[attribute]
@@ -217,21 +220,21 @@ class Chef
217
220
  filter_values = Array(filters[attribute])
218
221
  value = node[attribute]
219
222
 
220
- # Split the blacklist and whitelist
221
- blacklist, whitelist = filter_values.partition { |v| v.is_a?(String) && v.start_with?("!") }
223
+ # Split the blocklist and allowlist
224
+ blocklist, allowlist = filter_values.partition { |v| v.is_a?(String) && v.start_with?("!") }
222
225
 
223
226
  if attribute == :platform_family
224
- # If any blacklist value matches, we don't match
225
- return false if blacklist.any? { |v| v[1..-1] == value || platform_family_query_helper?(node, v[1..-1]) }
227
+ # If any blocklist value matches, we don't match
228
+ return false if blocklist.any? { |v| v[1..-1] == value || platform_family_query_helper?(node, v[1..-1]) }
226
229
 
227
- # If the whitelist is empty, or anything matches, we match.
228
- whitelist.empty? || whitelist.any? { |v| v == :all || v == value || platform_family_query_helper?(node, v) }
230
+ # If the allowlist is empty, or anything matches, we match.
231
+ allowlist.empty? || allowlist.any? { |v| v == :all || v == value || platform_family_query_helper?(node, v) }
229
232
  else
230
- # If any blacklist value matches, we don't match
231
- return false if blacklist.any? { |v| v[1..-1] == value }
233
+ # If any blocklist value matches, we don't match
234
+ return false if blocklist.any? { |v| v[1..-1] == value }
232
235
 
233
- # If the whitelist is empty, or anything matches, we match.
234
- whitelist.empty? || whitelist.any? { |v| v == :all || v == value }
236
+ # If the allowlist is empty, or anything matches, we match.
237
+ allowlist.empty? || allowlist.any? { |v| v == :all || v == value }
235
238
  end
236
239
  end
237
240
 
@@ -260,9 +263,9 @@ class Chef
260
263
  end
261
264
 
262
265
  def filters_match?(node, filters)
263
- matches_black_white_list?(node, filters, :os) &&
264
- matches_black_white_list?(node, filters, :platform_family) &&
265
- matches_black_white_list?(node, filters, :platform) &&
266
+ matches_block_allow_list?(node, filters, :os) &&
267
+ matches_block_allow_list?(node, filters, :platform_family) &&
268
+ matches_block_allow_list?(node, filters, :platform) &&
266
269
  matches_version_list?(node, filters, :platform_version) &&
267
270
  matches_target_mode?(filters)
268
271
  end
@@ -311,8 +314,8 @@ class Chef
311
314
  return -1 if !b && a
312
315
  return 0 if !a && !b
313
316
 
314
- # Check for blacklists ('!windows'). Those always come *after* positive
315
- # whitelists.
317
+ # Check for blocklists ('!windows'). Those always come *after* positive
318
+ # allowlists.
316
319
  a_negated = Array(a).any? { |f| f.is_a?(String) && f.start_with?("!") }
317
320
  b_negated = Array(b).any? { |f| f.is_a?(String) && f.start_with?("!") }
318
321
  return 1 if a_negated && !b_negated
@@ -17,38 +17,41 @@
17
17
  #
18
18
 
19
19
  require_relative "../chef_class"
20
- require "chef-utils" if defined?(ChefUtils::CANARY)
20
+ require "chef-utils" unless defined?(ChefUtils::CANARY)
21
+ require "chef/mixin/chef_utils_wiring" unless defined?(Chef::Mixin::ChefUtilsWiring)
21
22
 
22
23
  class Chef
23
24
  class Platform
24
- # @deprecated, use ChefUtils::DSL::Service instead (via the ChefUtils Universal DSL)
25
- class ServiceHelpers
26
- class << self
27
- def service_resource_providers
28
- providers = []
29
-
30
- providers << :debian if ChefUtils::DSL::Service.debianrcd?
31
- providers << :invokercd if ChefUtils::DSL::Service.invokercd?
32
- providers << :upstart if ChefUtils::DSL::Service.upstart?
33
- providers << :insserv if ChefUtils::DSL::Service.insserv?
34
- providers << :systemd if ChefUtils.systemd?
35
- providers << :redhat if ChefUtils::DSL::Service.redhatrcd?
36
-
37
- providers
38
- end
39
-
40
- def config_for_service(service_name)
41
- configs = []
42
-
43
- configs << :initd if ChefUtils::DSL::Service.service_script_exist?(:initd, service_name)
44
- configs << :upstart if ChefUtils::DSL::Service.service_script_exist?(:upstart, service_name)
45
- configs << :xinetd if ChefUtils::DSL::Service.service_script_exist?(:xinetd, service_name)
46
- configs << :systemd if ChefUtils::DSL::Service.service_script_exist?(:systemd, service_name)
47
- configs << :etc_rcd if ChefUtils::DSL::Service.service_script_exist?(:etc_rcd, service_name)
48
-
49
- configs
50
- end
25
+ module ServiceHelpers
26
+ include ChefUtils::DSL::Service
27
+ include Chef::Mixin::ChefUtilsWiring
28
+
29
+ def service_resource_providers
30
+ providers = []
31
+
32
+ providers << :debian if debianrcd?
33
+ providers << :invokercd if invokercd?
34
+ providers << :upstart if upstart?
35
+ providers << :insserv if insserv?
36
+ providers << :systemd if systemd?
37
+ providers << :redhat if redhatrcd?
38
+
39
+ providers
40
+ end
41
+
42
+ def config_for_service(service_name)
43
+ configs = []
44
+
45
+ configs << :initd if service_script_exist?(:initd, service_name)
46
+ configs << :upstart if service_script_exist?(:upstart, service_name)
47
+ configs << :xinetd if service_script_exist?(:xinetd, service_name)
48
+ configs << :systemd if service_script_exist?(:systemd, service_name)
49
+ configs << :etc_rcd if service_script_exist?(:etc_rcd, service_name)
50
+
51
+ configs
51
52
  end
53
+
54
+ extend self
52
55
  end
53
56
  end
54
57
  end
@@ -34,7 +34,7 @@ class Chef
34
34
  # @param script [String] script to run
35
35
  # @return [Object] output
36
36
  def initialize(script)
37
- raise "Chef::PowerShell can only be used on the Windows platform." unless RUBY_PLATFORM =~ /mswin|mingw32|windows/
37
+ raise "Chef::PowerShell can only be used on the Windows platform." unless RUBY_PLATFORM.match?(/mswin|mingw32|windows/)
38
38
 
39
39
  exec(script)
40
40
  end
@@ -24,22 +24,15 @@ class Chef
24
24
 
25
25
  provides :batch
26
26
 
27
- def initialize(new_resource, run_context)
28
- super(new_resource, run_context, ".bat")
29
- end
30
-
31
27
  def command
32
- basepath = is_forced_32bit ? wow64_directory : run_context.node["kernel"]["os_info"]["system_directory"]
33
-
34
28
  interpreter_path = Chef::Util::PathHelper.join(basepath, interpreter)
35
29
 
36
- "\"#{interpreter_path}\" #{flags} \"#{script_file.path}\""
30
+ "\"#{interpreter_path}\" #{new_resource.flags} /c \"#{script_file_path}\""
37
31
  end
38
32
 
39
- def flags
40
- new_resource.flags.nil? ? "/c" : new_resource.flags + " /c"
33
+ def script_extension
34
+ ".bat"
41
35
  end
42
-
43
36
  end
44
37
  end
45
38
  end
@@ -15,7 +15,6 @@
15
15
  # See the License for the specific language governing permissions and
16
16
  # limitations under the License.
17
17
  #
18
-
19
18
  require_relative "../log"
20
19
  require_relative "../provider"
21
20
 
@@ -27,8 +26,6 @@ class Chef
27
26
 
28
27
  SPECIAL_TIME_VALUES = %i{reboot yearly annually monthly weekly daily midnight hourly}.freeze
29
28
  CRON_ATTRIBUTES = %i{minute hour day month weekday time command mailto path shell home environment}.freeze
30
- WEEKDAY_SYMBOLS = %i{sunday monday tuesday wednesday thursday friday saturday}.freeze
31
-
32
29
  CRON_PATTERN = %r{\A([-0-9*,/]+)\s([-0-9*,/]+)\s([-0-9*,/]+)\s([-0-9*,/]+|[a-zA-Z]{3})\s([-0-9*,/]+|[a-zA-Z]{3})\s(.*)}.freeze
33
30
  SPECIAL_PATTERN = /\A(@(#{SPECIAL_TIME_VALUES.join('|')}))\s(.*)/.freeze
34
31
  ENV_PATTERN = /\A(\S+)=(\S*)/.freeze
@@ -259,8 +256,8 @@ class Chef
259
256
  return "" if new_resource.time_out.empty?
260
257
 
261
258
  str = " timeout"
262
- str << " --preserve-status" if new_resource.time_out["preserve-status"].to_s.downcase == "true"
263
- str << " --foreground" if new_resource.time_out["foreground"].to_s.downcase == "true"
259
+ str << " --preserve-status" if new_resource.time_out["preserve-status"].to_s.casecmp("true") == 0
260
+ str << " --foreground" if new_resource.time_out["foreground"].to_s.casecmp("true") == 0
264
261
  str << " --kill-after #{new_resource.time_out["kill-after"]}" if new_resource.time_out["kill-after"]
265
262
  str << " --signal #{new_resource.time_out["signal"]}" if new_resource.time_out["signal"]
266
263
  str << " #{new_resource.time_out["duration"]};"
@@ -288,15 +285,6 @@ class Chef
288
285
 
289
286
  newcron.join("\n")
290
287
  end
291
-
292
- def weekday_in_crontab
293
- weekday_in_crontab = WEEKDAY_SYMBOLS.index(new_resource.weekday)
294
- if weekday_in_crontab.nil?
295
- new_resource.weekday
296
- else
297
- weekday_in_crontab.to_s
298
- end
299
- end
300
288
  end
301
289
  end
302
290
  end
@@ -27,7 +27,7 @@ class Chef
27
27
 
28
28
  provides :execute, target_mode: true
29
29
 
30
- def_delegators :new_resource, :command, :returns, :environment, :user, :domain, :password, :group, :cwd, :umask, :creates, :elevated, :default_env, :timeout
30
+ def_delegators :new_resource, :command, :returns, :environment, :user, :domain, :password, :group, :cwd, :umask, :creates, :elevated, :default_env, :timeout, :input
31
31
 
32
32
  def load_current_resource
33
33
  current_resource = Chef::Resource::Execute.new(new_resource.name)
@@ -91,6 +91,7 @@ class Chef
91
91
  opts[:group] = group if group
92
92
  opts[:cwd] = cwd if cwd
93
93
  opts[:umask] = umask if umask
94
+ opts[:input] = input if input
94
95
  opts[:default_env] = default_env
95
96
  opts[:log_level] = :info
96
97
  opts[:log_tag] = new_resource.to_s
@@ -154,6 +154,11 @@ class Chef
154
154
  sha_hash?(result) ? result : nil
155
155
  end
156
156
 
157
+ def already_on_target_branch?
158
+ current_branch = git("rev-parse", "--abbrev-ref", "HEAD", cwd: cwd, returns: [0, 128]).stdout.strip
159
+ current_branch == (new_resource.checkout_branch || new_resource.revision)
160
+ end
161
+
157
162
  def add_remotes
158
163
  if new_resource.additional_remotes.length > 0
159
164
  new_resource.additional_remotes.each_pair do |remote_name, remote_url|
@@ -193,6 +198,9 @@ class Chef
193
198
  # detached head
194
199
  git("checkout", target_revision, cwd: cwd)
195
200
  logger.info "#{new_resource} checked out reference: #{target_revision}"
201
+ elsif already_on_target_branch?
202
+ # we are already on the proper branch
203
+ git("reset", "--hard", target_revision, cwd: cwd)
196
204
  else
197
205
  # need a branch with a tracking branch
198
206
  git("branch", "-f", new_resource.revision, target_revision, cwd: cwd)
@@ -222,13 +230,13 @@ class Chef
222
230
  logger.trace "Fetching updates from #{new_resource.remote} and resetting to revision #{target_revision}"
223
231
  git("fetch", "--prune", new_resource.remote, cwd: cwd)
224
232
  git("fetch", new_resource.remote, "--tags", cwd: cwd)
225
- if new_resource.checkout_branch
233
+ if sha_hash?(new_resource.revision) || is_tag? || already_on_target_branch?
234
+ # detached head or if we are already on the proper branch
235
+ git("reset", "--hard", target_revision, cwd: cwd)
236
+ elsif new_resource.checkout_branch
226
237
  # check out to a local branch
227
238
  git("branch", "-f", new_resource.checkout_branch, target_revision, cwd: cwd)
228
239
  git("checkout", new_resource.checkout_branch, cwd: cwd)
229
- elsif sha_hash?(new_resource.revision) || is_tag?
230
- # detached head
231
- git("reset", "--hard", target_revision, cwd: cwd)
232
240
  else
233
241
  # need a branch with a tracking branch
234
242
  git("branch", "-f", new_resource.revision, target_revision, cwd: cwd)
@@ -39,7 +39,7 @@ class Chef
39
39
  result = dscl(*args)
40
40
  return "" if ( args.first =~ /^delete/ ) && ( result[1].exitstatus != 0 )
41
41
  raise(Chef::Exceptions::Group, "dscl error: #{result.inspect}") unless result[1].exitstatus == 0
42
- raise(Chef::Exceptions::Group, "dscl error: #{result.inspect}") if result[2] =~ /No such key: /
42
+ raise(Chef::Exceptions::Group, "dscl error: #{result.inspect}") if /No such key: /.match?(result[2])
43
43
 
44
44
  result[2]
45
45
  end
@@ -77,7 +77,7 @@ class Chef
77
77
  gid = nil; next_gid_guess = 200
78
78
  groups_gids = safe_dscl("list", "/Groups", "gid")
79
79
  while next_gid_guess < search_limit + 200
80
- if groups_gids =~ Regexp.new("#{Regexp.escape(next_gid_guess.to_s)}\n")
80
+ if groups_gids&.match?(Regexp.new("#{Regexp.escape(next_gid_guess.to_s)}\n"))
81
81
  next_gid_guess += 1
82
82
  else
83
83
  gid = next_gid_guess
@@ -17,7 +17,7 @@
17
17
  #
18
18
 
19
19
  require_relative "../user"
20
- if RUBY_PLATFORM =~ /mswin|mingw32|windows/
20
+ if RUBY_PLATFORM.match?(/mswin|mingw32|windows/)
21
21
  require_relative "../../util/windows/net_group"
22
22
  end
23
23
 
@@ -59,12 +59,12 @@ class Chef
59
59
 
60
60
  @net_tools_version = shell_out("ifconfig", "--version")
61
61
  @net_tools_version.stdout.each_line do |line|
62
- if line =~ /^net-tools (\d+\.\d+)/
62
+ if /^net-tools (\d+\.\d+)/.match?(line)
63
63
  @ifconfig_version = line.match(/^net-tools (\d+\.\d+)/)[1]
64
64
  end
65
65
  end
66
66
  @net_tools_version.stderr.each_line do |line|
67
- if line =~ /^net-tools (\d+\.\d+)/
67
+ if /^net-tools (\d+\.\d+)/.match?(line)
68
68
  @ifconfig_version = line.match(/^net-tools (\d+\.\d+)/)[1]
69
69
  end
70
70
  end
@@ -88,11 +88,11 @@ class Chef
88
88
  @int_name = line[0..9].strip
89
89
  @interfaces[@int_name] = { "hwaddr" => (line =~ /(HWaddr)/ ? ($') : "nil").strip.chomp }
90
90
  else
91
- @interfaces[@int_name]["inet_addr"] = (line =~ /inet addr:(\S+)/ ? Regexp.last_match(1) : "nil") if line =~ /inet addr:/
92
- @interfaces[@int_name]["bcast"] = (line =~ /Bcast:(\S+)/ ? Regexp.last_match(1) : "nil") if line =~ /Bcast:/
93
- @interfaces[@int_name]["mask"] = (line =~ /Mask:(\S+)/ ? Regexp.last_match(1) : "nil") if line =~ /Mask:/
94
- @interfaces[@int_name]["mtu"] = (line =~ /MTU:(\S+)/ ? Regexp.last_match(1) : "nil") if line =~ /MTU:/
95
- @interfaces[@int_name]["metric"] = (line =~ /Metric:(\S+)/ ? Regexp.last_match(1) : "nil") if line =~ /Metric:/
91
+ @interfaces[@int_name]["inet_addr"] = (line =~ /inet addr:(\S+)/ ? Regexp.last_match(1) : "nil") if /inet addr:/.match?(line)
92
+ @interfaces[@int_name]["bcast"] = (line =~ /Bcast:(\S+)/ ? Regexp.last_match(1) : "nil") if /Bcast:/.match?(line)
93
+ @interfaces[@int_name]["mask"] = (line =~ /Mask:(\S+)/ ? Regexp.last_match(1) : "nil") if /Mask:/.match?(line)
94
+ @interfaces[@int_name]["mtu"] = (line =~ /MTU:(\S+)/ ? Regexp.last_match(1) : "nil") if /MTU:/.match?(line)
95
+ @interfaces[@int_name]["metric"] = (line =~ /Metric:(\S+)/ ? Regexp.last_match(1) : "nil") if /Metric:/.match?(line)
96
96
  end
97
97
 
98
98
  next unless @interfaces.key?(new_resource.device)