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
@@ -27,27 +27,63 @@ class Chef
27
27
  def initialize(new_resource, run_context)
28
28
  super(new_resource, run_context)
29
29
  @config_template = %{
30
- <% if new_resource.device %>DEVICE=<%= new_resource.device %><% end %>
31
- <% if new_resource.onboot == "yes" %>ONBOOT=<%= new_resource.onboot %><% end %>
32
- <% if new_resource.bootproto %>BOOTPROTO=<%= new_resource.bootproto %><% end %>
33
- <% if new_resource.target %>IPADDR=<%= new_resource.target %><% end %>
34
- <% if new_resource.mask %>NETMASK=<%= new_resource.mask %><% end %>
35
- <% if new_resource.network %>NETWORK=<%= new_resource.network %><% end %>
36
- <% if new_resource.bcast %>BROADCAST=<%= new_resource.bcast %><% end %>
37
- <% if new_resource.onparent %>ONPARENT=<%= new_resource.onparent %><% end %>
38
- <% if new_resource.hwaddr %>HWADDR=<%= new_resource.hwaddr %><% end %>
39
- <% if new_resource.metric %>METRIC=<%= new_resource.metric %><% end %>
40
- <% if new_resource.mtu %>MTU=<%= new_resource.mtu %><% end %>
41
- <% if new_resource.ethtool_opts %>ETHTOOL_OPTS="<%= new_resource.ethtool_opts %>"<% end %>
42
- <% if new_resource.bonding_opts %>BONDING_OPTS="<%= new_resource.bonding_opts %>"<% end %>
43
- <% if new_resource.master %>MASTER=<%= new_resource.master %><% end %>
44
- <% if new_resource.slave %>SLAVE=<%= new_resource.slave %><% end %>
45
- <% if new_resource.vlan %>VLAN=<%= new_resource.vlan %><% end %>
46
- <% if new_resource.gateway %>GATEWAY=<%= new_resource.gateway %><% end %>
30
+ <% if new_resource.device -%>
31
+ DEVICE=<%= new_resource.device %>
32
+ <% end -%>
33
+ <% if new_resource.onboot == "yes" -%>
34
+ ONBOOT=<%= new_resource.onboot %>
35
+ <% end -%>
36
+ <% if new_resource.bootproto -%>
37
+ BOOTPROTO=<%= new_resource.bootproto %>
38
+ <% end -%>
39
+ <% if new_resource.target -%>
40
+ IPADDR=<%= new_resource.target %>
41
+ <% end -%>
42
+ <% if new_resource.mask -%>
43
+ NETMASK=<%= new_resource.mask %>
44
+ <% end -%>
45
+ <% if new_resource.network -%>
46
+ NETWORK=<%= new_resource.network %>
47
+ <% end -%>
48
+ <% if new_resource.bcast -%>
49
+ BROADCAST=<%= new_resource.bcast %>
50
+ <% end -%>
51
+ <% if new_resource.onparent -%>
52
+ ONPARENT=<%= new_resource.onparent %>
53
+ <% end -%>
54
+ <% if new_resource.hwaddr -%>
55
+ HWADDR=<%= new_resource.hwaddr %>
56
+ <% end -%>
57
+ <% if new_resource.metric -%>
58
+ METRIC=<%= new_resource.metric %>
59
+ <% end -%>
60
+ <% if new_resource.mtu -%>
61
+ MTU=<%= new_resource.mtu %>
62
+ <% end -%>
63
+ <% if new_resource.ethtool_opts -%>
64
+ ETHTOOL_OPTS="<%= new_resource.ethtool_opts %>"
65
+ <% end -%>
66
+ <% if new_resource.bonding_opts -%>
67
+ BONDING_OPTS="<%= new_resource.bonding_opts %>"
68
+ <% end -%>
69
+ <% if new_resource.master -%>
70
+ MASTER=<%= new_resource.master %>
71
+ <% end -%>
72
+ <% if new_resource.slave -%>
73
+ SLAVE=<%= new_resource.slave %>
74
+ <% end -%>
75
+ <% if new_resource.vlan -%>
76
+ VLAN=<%= new_resource.vlan %>
77
+ <% end -%>
78
+ <% if new_resource.gateway -%>
79
+ GATEWAY=<%= new_resource.gateway %>
80
+ <% end -%>
81
+ <% if new_resource.bridge -%>
82
+ BRIDGE=<%= new_resource.bridge %>
83
+ <% end -%>
47
84
  }
48
85
  @config_path = "/etc/sysconfig/network-scripts/ifcfg-#{new_resource.device}"
49
86
  end
50
-
51
87
  end
52
88
  end
53
89
  end
@@ -29,17 +29,7 @@ class Chef
29
29
  extend Forwardable
30
30
  provides :launchd, os: "darwin"
31
31
 
32
- def_delegators :new_resource, *%i{
33
- backup
34
- cookbook
35
- group
36
- label
37
- mode
38
- owner
39
- source
40
- session_type
41
- type
42
- }
32
+ def_delegators :new_resource, :backup, :cookbook, :group, :label, :mode, :owner, :source, :session_type, :type
43
33
 
44
34
  def load_current_resource
45
35
  current_resource = Chef::Resource::Launchd.new(new_resource.name)
@@ -33,15 +33,6 @@ class Chef
33
33
  include Chef::Mixin::EnforceOwnershipAndPermissions
34
34
  include Chef::Mixin::FileClass
35
35
 
36
- def negative_complement(big)
37
- if big > 1073741823 # Fixnum max
38
- big -= (2**32) # diminished radix wrap to negative
39
- end
40
- big
41
- end
42
-
43
- private :negative_complement
44
-
45
36
  def load_current_resource
46
37
  @current_resource = Chef::Resource::Link.new(new_resource.name)
47
38
  current_resource.target_file(new_resource.target_file)
@@ -122,8 +122,11 @@ class Chef
122
122
  # we need to be able to update fstab to conform with their wishes
123
123
  # without necessarily needing to remount the device.
124
124
  # See #6851 for more.
125
+ # We have to compare current resource device with device_fstab value
126
+ # because entry in /etc/fstab will be as per device_type.
127
+ # For Ex: 'LABEL=/tmp/ /mnt ext3 defaults 0 2', where 'device_type' is :label.
125
128
  def device_unchanged?
126
- @current_resource.device == @new_resource.device
129
+ @current_resource.device == device_fstab
127
130
  end
128
131
 
129
132
  #
@@ -169,6 +172,20 @@ class Chef
169
172
  sleep 0.1
170
173
  end
171
174
  end
175
+
176
+ # Returns the new_resource device as per device_type
177
+ def device_fstab
178
+ # Removed "/" from the end of str, because it was causing idempotency issue.
179
+ device = @new_resource.device == "/" ? @new_resource.device : @new_resource.device.chomp("/")
180
+ case @new_resource.device_type
181
+ when :device
182
+ device
183
+ when :label
184
+ "LABEL=#{device}"
185
+ when :uuid
186
+ "UUID=#{device}"
187
+ end
188
+ end
172
189
  end
173
190
  end
174
191
  end
@@ -53,6 +53,10 @@ class Chef
53
53
  when %r{\A#{Regexp.escape(real_mount_point)}\s+([/\w])+\[#{device_mount_regex}\]\s}
54
54
  mounted = true
55
55
  logger.trace("Bind device #{device_logstring} mounted as #{real_mount_point}")
56
+ # Permalink for network device mounted to an existing mount point: https://rubular.com/r/JRTXXGFdQtwCD6
57
+ when /\A#{Regexp.escape(real_mount_point)}\s+#{device_mount_regex}\[/
58
+ mounted = true
59
+ logger.trace("Network device #{device_logstring} mounted as #{real_mount_point}")
56
60
  end
57
61
  end
58
62
  @current_resource.mounted(mounted)
@@ -70,10 +70,6 @@ class Chef
70
70
  @current_resource.dump($4.to_i)
71
71
  @current_resource.pass($5.to_i)
72
72
  logger.trace("Found mount #{device_fstab} to #{@new_resource.mount_point} in /etc/fstab")
73
- next
74
- when %r{^[/\w]+\s+#{Regexp.escape(@new_resource.mount_point)}\s+}
75
- enabled = false
76
- logger.trace("Found conflicting mount point #{@new_resource.mount_point} in /etc/fstab")
77
73
  end
78
74
  end
79
75
  @current_resource.enabled(enabled)
@@ -168,40 +164,23 @@ class Chef
168
164
 
169
165
  if @current_resource.enabled
170
166
  # The current options don't match what we have, so
171
- # disable, then enable.
172
- disable_fs
173
- end
174
- ::File.open("/etc/fstab", "a") do |fstab|
175
- fstab.puts("#{device_fstab} #{@new_resource.mount_point} #{@new_resource.fstype} #{@new_resource.options.nil? ? default_mount_options : @new_resource.options.join(",")} #{@new_resource.dump} #{@new_resource.pass}")
176
- logger.trace("#{@new_resource} is enabled at #{@new_resource.mount_point}")
167
+ # update the last matching entry with current option
168
+ # and order will remain the same.
169
+ edit_fstab
170
+ else
171
+ ::File.open("/etc/fstab", "a") do |fstab|
172
+ fstab.puts("#{device_fstab} #{@new_resource.mount_point} #{@new_resource.fstype} #{@new_resource.options.nil? ? default_mount_options : @new_resource.options.join(",")} #{@new_resource.dump} #{@new_resource.pass}")
173
+ logger.trace("#{@new_resource} is enabled at #{@new_resource.mount_point}")
174
+ end
177
175
  end
178
176
  end
179
177
 
180
178
  def disable_fs
181
- if @current_resource.enabled
182
- contents = []
183
-
184
- found = false
185
- ::File.readlines("/etc/fstab").reverse_each do |line|
186
- if !found && line =~ /^#{device_fstab_regex}\s+#{Regexp.escape(@new_resource.mount_point)}\s/
187
- found = true
188
- logger.trace("#{@new_resource} is removed from fstab")
189
- next
190
- else
191
- contents << line
192
- end
193
- end
194
-
195
- ::File.open("/etc/fstab", "w") do |fstab|
196
- contents.reverse_each { |line| fstab.puts line }
197
- end
198
- else
199
- logger.trace("#{@new_resource} is not enabled - nothing to do")
200
- end
179
+ edit_fstab(remove: true)
201
180
  end
202
181
 
203
182
  def network_device?
204
- @new_resource.device =~ /:/ || @new_resource.device =~ %r{//}
183
+ @new_resource.device.include?(":") || @new_resource.device.include?("//")
205
184
  end
206
185
 
207
186
  def device_should_exist?
@@ -212,17 +191,6 @@ class Chef
212
191
 
213
192
  private
214
193
 
215
- def device_fstab
216
- case @new_resource.device_type
217
- when :device
218
- @new_resource.device
219
- when :label
220
- "LABEL=#{@new_resource.device}"
221
- when :uuid
222
- "UUID=#{@new_resource.device}"
223
- end
224
- end
225
-
226
194
  def device_real
227
195
  if @real_device.nil?
228
196
  if @new_resource.device_type == :device
@@ -234,7 +202,8 @@ class Chef
234
202
  @real_device = device_line.chomp unless device_line.nil?
235
203
  end
236
204
  end
237
- @real_device
205
+ # Removed "/" from the end of str, because it was causing idempotency issue.
206
+ @real_device == "/" ? @real_device : @real_device.chomp("/")
238
207
  end
239
208
 
240
209
  def device_logstring
@@ -278,6 +247,35 @@ class Chef
278
247
  @current_resource.pass == @new_resource.pass
279
248
  end
280
249
 
250
+ # It will update or delete the entry from fstab.
251
+ def edit_fstab(remove: false)
252
+ if @current_resource.enabled
253
+ contents = []
254
+
255
+ found = false
256
+ ::File.readlines("/etc/fstab").reverse_each do |line|
257
+ if !found && line =~ /^#{device_fstab_regex}\s+#{Regexp.escape(@new_resource.mount_point)}\s/
258
+ found = true
259
+ if remove
260
+ logger.trace("#{@new_resource} is removed from fstab")
261
+ else
262
+ contents << ("#{device_fstab} #{@new_resource.mount_point} #{@new_resource.fstype} #{@new_resource.options.nil? ? default_mount_options : @new_resource.options.join(",")} #{@new_resource.dump} #{@new_resource.pass}")
263
+ logger.trace("#{@new_resource} is updated with new content in fstab")
264
+ end
265
+ next
266
+ else
267
+ contents << line
268
+ end
269
+ end
270
+
271
+ ::File.open("/etc/fstab", "w") do |fstab|
272
+ contents.reverse_each { |line| fstab.puts line }
273
+ end
274
+ else
275
+ logger.trace("#{@new_resource} is not enabled - nothing to do")
276
+ end
277
+ end
278
+
281
279
  end
282
280
  end
283
281
  end
@@ -443,6 +443,9 @@ class Chef
443
443
  elsif current_version && !allow_downgrade && version_compare(current_version, new_version) == 1
444
444
  logger.warn("#{new_resource} #{package_name} has installed version #{current_version}, which is newer than available version #{new_version}. Skipping...)")
445
445
  target_version_array.push(nil)
446
+ elsif version_equals?(current_version, candidate_version)
447
+ logger.trace("#{new_resource} #{package_name} #{candidate_version} is already installed")
448
+ target_version_array.push(nil)
446
449
  else
447
450
  logger.trace("#{new_resource} #{package_name} #{current_version} needs updating to #{new_version}")
448
451
  target_version_array.push(new_version)
@@ -161,7 +161,7 @@ class Chef
161
161
 
162
162
  def config_file_options
163
163
  # If the user has specified config file options previously, respect those.
164
- return if Array(options).any? { |opt| opt =~ /--force-conf/ }
164
+ return if Array(options).any? { |opt| opt.include?("--force-conf") }
165
165
 
166
166
  # It doesn't make sense to install packages in a scenario that can
167
167
  # result in a prompt. Have users decide up-front whether they want to
@@ -79,7 +79,7 @@ class Chef
79
79
  name_versions_to_install = desired_name_versions.select { |n, v| lowercase_names(names).include?(n) }
80
80
 
81
81
  name_nil_versions = name_versions_to_install.select { |n, v| v.nil? }
82
- name_has_versions = name_versions_to_install.reject { |n, v| v.nil? }
82
+ name_has_versions = name_versions_to_install.compact
83
83
 
84
84
  # choco does not support installing multiple packages with version pins
85
85
  name_has_versions.each do |name, version|
@@ -101,7 +101,7 @@ class Chef
101
101
  name_versions_to_install = desired_name_versions.select { |n, v| lowercase_names(names).include?(n) }
102
102
 
103
103
  name_nil_versions = name_versions_to_install.select { |n, v| v.nil? }
104
- name_has_versions = name_versions_to_install.reject { |n, v| v.nil? }
104
+ name_has_versions = name_versions_to_install.compact
105
105
 
106
106
  # choco does not support installing multiple packages with version pins
107
107
  name_has_versions.each do |name, version|
@@ -151,7 +151,7 @@ class Chef
151
151
  @choco_exe ||= begin
152
152
  # if this check is in #define_resource_requirements, it won't get
153
153
  # run before choco.exe gets called from #load_current_resource.
154
- exe_path = ::File.join(choco_install_path.to_s, "bin", "choco.exe")
154
+ exe_path = ::File.join(choco_install_path, "bin", "choco.exe")
155
155
  raise Chef::Exceptions::MissingLibrary, CHOCO_MISSING_MSG unless ::File.exist?(exe_path)
156
156
 
157
157
  exe_path
@@ -160,9 +160,9 @@ class Chef
160
160
 
161
161
  # lets us mock out an incorrect value for testing.
162
162
  def choco_install_path
163
- @choco_install_path ||= powershell_out!(
164
- PATHFINDING_POWERSHELL_COMMAND
165
- ).stdout.chomp
163
+ result = powershell_exec!(PATHFINDING_POWERSHELL_COMMAND).result
164
+ result = "" if result.empty?
165
+ result
166
166
  end
167
167
 
168
168
  # Helper to dispatch a choco command through shell_out using the timeout
@@ -164,10 +164,7 @@ class Chef
164
164
  #
165
165
  # @return [Hash] Mapping of package names to sources
166
166
  def name_sources
167
- @name_sources =
168
- begin
169
- Hash[*package_name_array.zip(resolved_source_array).flatten]
170
- end
167
+ @name_sources ||= Hash[*package_name_array.zip(resolved_source_array).flatten]
171
168
  end
172
169
 
173
170
  # Helper to construct Hash of names-to-package-information.
@@ -186,17 +183,11 @@ class Chef
186
183
  end
187
184
 
188
185
  def name_candidate_version
189
- @name_candidate_version ||=
190
- begin
191
- Hash[name_pkginfo.map { |k, v| [k, v ? v.split("\t")[1].strip : nil] }]
192
- end
186
+ @name_candidate_version ||= name_pkginfo.transform_values { |v| v ? v.split("\t")[1]&.strip : nil }
193
187
  end
194
188
 
195
189
  def name_package_name
196
- @name_package_name ||=
197
- begin
198
- Hash[name_pkginfo.map { |k, v| [k, v ? v.split("\t")[0] : nil] }]
199
- end
190
+ @name_package_name ||= name_pkginfo.transform_values { |v| v ? v.split("\t")[0] : nil }
200
191
  end
201
192
 
202
193
  # Return candidate version array from pkg-deb -W against the source file(s).
@@ -58,9 +58,10 @@ class Chef
58
58
 
59
59
  def makefile_variable_value(variable, dir = nil)
60
60
  options = dir ? { cwd: dir } : {}
61
- options.merge!(env: nil, returns: [0, 1])
61
+ options[:env] = nil
62
+ options[:returns] = [0, 1]
62
63
  make_v = shell_out!("make", "-V", variable, **options)
63
- make_v.exitstatus == 0 ? make_v.stdout.strip.split($OUTPUT_RECORD_SEPARATOR).first : nil # $\ is the line separator, i.e. newline.
64
+ make_v.exitstatus == 0 ? make_v.stdout.strip.split($OUTPUT_RECORD_SEPARATOR).first : nil
64
65
  end
65
66
  end
66
67
 
@@ -62,7 +62,7 @@ class Chef
62
62
  end
63
63
 
64
64
  pkg_query = shell_out!("pkg", "rquery", options, "%v", new_resource.package_name, env: nil)
65
- pkg_query.exitstatus == 0 ? pkg_query.stdout.strip.split(/\n/).last : nil
65
+ pkg_query.exitstatus == 0 ? pkg_query.stdout.strip.split('\n').last : nil
66
66
  end
67
67
 
68
68
  def repo_regex
@@ -127,7 +127,7 @@ class Chef
127
127
 
128
128
  # check each item in the hash to see if we were passed an alias
129
129
  brew_info.each_value do |p|
130
- return p if p["aliases"].include?(package_name)
130
+ return p if p["full_name"] == package_name || p["aliases"].include?(package_name)
131
131
  end
132
132
 
133
133
  {}
@@ -26,7 +26,7 @@ class Chef
26
26
  class Package
27
27
  class Ips < Chef::Provider::Package
28
28
 
29
- provides :package, platform: %w{openindiana opensolaris omnios solaris2}
29
+ provides :package, platform: %w{openindiana omnios solaris2}
30
30
  provides :ips_package
31
31
 
32
32
  attr_accessor :virtual
@@ -53,9 +53,6 @@ class Chef
53
53
 
54
54
  # Installs the package specified with the version passed else latest version will be installed
55
55
  def install_package(names, versions)
56
- # To enable tls 1.2, which is disabled by default in some OS
57
- powershell_out("[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12")
58
-
59
56
  names.each_with_index do |name, index|
60
57
  cmd = powershell_out(build_powershell_package_command("Install-Package '#{name}'", versions[index]), timeout: new_resource.timeout)
61
58
  next if cmd.nil?
@@ -118,6 +115,8 @@ class Chef
118
115
  command = [command] unless command.is_a?(Array)
119
116
  cmdlet_name = command.first
120
117
  command.unshift("(")
118
+ # PowerShell Gallery requires tls 1.2
119
+ command.unshift("if ([Net.ServicePointManager]::SecurityProtocol -lt [Net.SecurityProtocolType]::Tls12) { [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 };")
121
120
  # -WarningAction SilentlyContinue is used to suppress the warnings from stdout
122
121
  %w{-Force -ForceBootstrap -WarningAction SilentlyContinue}.each do |arg|
123
122
  command.push(arg)
@@ -427,7 +427,7 @@ class Chef
427
427
  logger.trace("#{new_resource} detected omnibus installation in #{RbConfig::CONFIG["bindir"]}")
428
428
  # Omnibus installs to a static path because of linking on unix, find it.
429
429
  true
430
- elsif RbConfig::CONFIG["bindir"].sub(/^[\w]:/, "") == "/opscode/chef/embedded/bin"
430
+ elsif RbConfig::CONFIG["bindir"].sub(/^\w:/, "") == "/opscode/chef/embedded/bin"
431
431
  logger.trace("#{new_resource} detected omnibus installation in #{RbConfig::CONFIG["bindir"]}")
432
432
  # windows, with the drive letter removed
433
433
  true