chef 15.11.3-universal-mingw32 → 16.1.16-universal-mingw32

Sign up to get free protection for your applications and to get access to all the features.
Files changed (513) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +3 -7
  3. data/README.md +1 -1
  4. data/Rakefile +44 -16
  5. data/chef.gemspec +6 -4
  6. data/distro/powershell/chef/chef.psm1 +3 -3
  7. data/distro/templates/powershell/chef/chef.psm1.erb +3 -3
  8. data/lib/chef/action_collection.rb +16 -5
  9. data/lib/chef/application.rb +33 -54
  10. data/lib/chef/application/apply.rb +18 -1
  11. data/lib/chef/application/base.rb +8 -3
  12. data/lib/chef/application/knife.rb +1 -1
  13. data/lib/chef/chef_class.rb +4 -4
  14. data/lib/chef/chef_fs/file_system/chef_server/acls_dir.rb +1 -1
  15. data/lib/chef/chef_fs/file_system/chef_server/cookbook_file.rb +1 -1
  16. data/lib/chef/chef_fs/file_system/chef_server/rest_list_entry.rb +6 -2
  17. data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb +3 -3
  18. data/lib/chef/chef_fs/file_system/repository/directory.rb +1 -1
  19. data/lib/chef/chef_fs/parallelizer/parallel_enumerable.rb +1 -1
  20. data/lib/chef/chef_fs/path_utils.rb +3 -3
  21. data/lib/chef/client.rb +16 -14
  22. data/lib/chef/config.rb +1 -1
  23. data/lib/chef/cookbook/file_system_file_vendor.rb +1 -1
  24. data/lib/chef/cookbook/gem_installer.rb +1 -1
  25. data/lib/chef/cookbook/metadata.rb +45 -22
  26. data/lib/chef/cookbook_loader.rb +1 -1
  27. data/lib/chef/cookbook_manifest.rb +1 -1
  28. data/lib/chef/cookbook_site_streaming_uploader.rb +1 -1
  29. data/lib/chef/cookbook_version.rb +38 -3
  30. data/lib/chef/data_collector.rb +1 -1
  31. data/lib/chef/data_collector/error_handlers.rb +1 -1
  32. data/lib/chef/data_collector/run_end_message.rb +7 -1
  33. data/lib/chef/decorator/lazy_array.rb +2 -2
  34. data/lib/chef/deprecated.rb +4 -0
  35. data/lib/chef/digester.rb +4 -4
  36. data/lib/chef/dist.rb +8 -0
  37. data/lib/chef/dsl/chef_vault.rb +84 -0
  38. data/lib/chef/dsl/declare_resource.rb +7 -5
  39. data/lib/chef/dsl/platform_introspection.rb +3 -2
  40. data/lib/chef/dsl/recipe.rb +7 -12
  41. data/lib/chef/dsl/universal.rb +3 -7
  42. data/lib/chef/encrypted_data_bag_item/decryptor.rb +1 -1
  43. data/lib/chef/encrypted_data_bag_item/encryptor.rb +1 -1
  44. data/lib/chef/event_dispatch/base.rb +3 -0
  45. data/lib/chef/formatters/base.rb +1 -1
  46. data/lib/chef/formatters/doc.rb +1 -1
  47. data/lib/chef/formatters/indentable_output_stream.rb +7 -16
  48. data/lib/chef/http.rb +1 -1
  49. data/lib/chef/http/decompressor.rb +1 -1
  50. data/lib/chef/http/http_request.rb +3 -2
  51. data/lib/chef/json_compat.rb +1 -1
  52. data/lib/chef/key.rb +1 -1
  53. data/lib/chef/knife.rb +2 -4
  54. data/lib/chef/knife/acl_add.rb +57 -0
  55. data/lib/chef/knife/acl_base.rb +183 -0
  56. data/lib/chef/knife/acl_bulk_add.rb +78 -0
  57. data/lib/chef/knife/acl_bulk_remove.rb +83 -0
  58. data/lib/chef/knife/acl_remove.rb +62 -0
  59. data/lib/chef/knife/acl_show.rb +56 -0
  60. data/lib/chef/knife/bootstrap.rb +84 -90
  61. data/lib/chef/knife/bootstrap/chef_vault_handler.rb +2 -2
  62. data/lib/chef/knife/bootstrap/client_builder.rb +2 -2
  63. data/lib/chef/knife/bootstrap/templates/chef-full.erb +11 -11
  64. data/lib/chef/knife/bootstrap/templates/windows-chef-client-msi.erb +12 -12
  65. data/lib/chef/knife/core/bootstrap_context.rb +63 -60
  66. data/lib/chef/knife/core/generic_presenter.rb +4 -3
  67. data/lib/chef/knife/core/hashed_command_loader.rb +1 -1
  68. data/lib/chef/knife/core/node_presenter.rb +2 -2
  69. data/lib/chef/knife/core/status_presenter.rb +5 -5
  70. data/lib/chef/knife/core/subcommand_loader.rb +1 -1
  71. data/lib/chef/knife/core/ui.rb +17 -1
  72. data/lib/chef/knife/core/windows_bootstrap_context.rb +44 -42
  73. data/lib/chef/knife/data_bag_secret_options.rb +18 -45
  74. data/lib/chef/knife/group_add.rb +55 -0
  75. data/lib/chef/knife/{cookbook_site_download.rb → group_create.rb} +21 -12
  76. data/lib/chef/knife/group_destroy.rb +53 -0
  77. data/lib/chef/knife/{cookbook_site_list.rb → group_list.rb} +14 -11
  78. data/lib/chef/knife/group_remove.rb +56 -0
  79. data/lib/chef/knife/{cookbook_site_install.rb → group_show.rb} +21 -12
  80. data/lib/chef/knife/key_create_base.rb +1 -1
  81. data/lib/chef/knife/key_edit_base.rb +1 -1
  82. data/lib/chef/knife/ssh.rb +12 -31
  83. data/lib/chef/knife/status.rb +3 -3
  84. data/lib/chef/knife/supermarket_download.rb +1 -2
  85. data/lib/chef/knife/supermarket_install.rb +2 -3
  86. data/lib/chef/knife/supermarket_list.rb +1 -2
  87. data/lib/chef/knife/supermarket_search.rb +1 -2
  88. data/lib/chef/knife/supermarket_share.rb +1 -2
  89. data/lib/chef/knife/supermarket_show.rb +1 -2
  90. data/lib/chef/knife/supermarket_unshare.rb +1 -2
  91. data/lib/chef/knife/{cookbook_site_show.rb → user_dissociate.rb} +15 -13
  92. data/lib/chef/knife/{cookbook_site_search.rb → user_invite_add.rb} +16 -13
  93. data/lib/chef/knife/user_invite_list.rb +34 -0
  94. data/lib/chef/knife/user_invite_rescind.rb +63 -0
  95. data/lib/chef/knife/yaml_convert.rb +91 -0
  96. data/lib/chef/mixin/api_version_request_handling.rb +1 -1
  97. data/lib/chef/mixin/checksum.rb +0 -1
  98. data/lib/chef/mixin/openssl_helper.rb +4 -4
  99. data/lib/chef/mixin/powershell_exec.rb +10 -1
  100. data/lib/chef/mixin/powershell_out.rb +1 -1
  101. data/lib/chef/mixin/properties.rb +16 -2
  102. data/lib/chef/mixin/shell_out.rb +1 -5
  103. data/lib/chef/monkey_patches/net_http.rb +0 -4
  104. data/lib/chef/node.rb +18 -6
  105. data/lib/chef/node/attribute.rb +2 -2
  106. data/lib/chef/node/immutable_collections.rb +1 -1
  107. data/lib/chef/node/mixin/immutablize_array.rb +4 -0
  108. data/lib/chef/node/mixin/immutablize_hash.rb +3 -0
  109. data/lib/chef/node_map.rb +5 -31
  110. data/lib/chef/platform/priority_map.rb +4 -4
  111. data/lib/chef/platform/query_helpers.rb +6 -34
  112. data/lib/chef/policy_builder/policyfile.rb +1 -1
  113. data/lib/chef/powershell.rb +14 -0
  114. data/lib/chef/property.rb +24 -6
  115. data/lib/chef/provider.rb +40 -6
  116. data/lib/chef/provider/cron.rb +2 -2
  117. data/lib/chef/provider/directory.rb +3 -3
  118. data/lib/chef/provider/dsc_resource.rb +1 -1
  119. data/lib/chef/provider/dsc_script.rb +1 -1
  120. data/lib/chef/provider/execute.rb +3 -9
  121. data/lib/chef/provider/file.rb +6 -6
  122. data/lib/chef/provider/git.rb +84 -27
  123. data/lib/chef/provider/group.rb +4 -4
  124. data/lib/chef/provider/http_request.rb +6 -6
  125. data/lib/chef/provider/ifconfig.rb +4 -4
  126. data/lib/chef/provider/launchd.rb +45 -64
  127. data/lib/chef/provider/link.rb +2 -2
  128. data/lib/chef/provider/mount.rb +5 -5
  129. data/lib/chef/provider/osx_profile.rb +7 -3
  130. data/lib/chef/provider/package.rb +2 -2
  131. data/lib/chef/provider/package/cab.rb +5 -6
  132. data/lib/chef/provider/package/chocolatey.rb +1 -3
  133. data/lib/chef/provider/package/dnf.rb +66 -10
  134. data/lib/chef/provider/package/dnf/dnf_helper.py +85 -26
  135. data/lib/chef/provider/package/dnf/python_helper.rb +79 -36
  136. data/lib/chef/provider/package/dnf/version.rb +5 -1
  137. data/lib/chef/provider/package/dpkg.rb +1 -1
  138. data/lib/chef/provider/package/freebsd/base.rb +2 -1
  139. data/lib/chef/provider/package/homebrew.rb +107 -43
  140. data/lib/chef/provider/package/macports.rb +0 -2
  141. data/lib/chef/provider/package/msu.rb +4 -1
  142. data/lib/chef/provider/package/pacman.rb +25 -34
  143. data/lib/chef/provider/package/portage.rb +1 -0
  144. data/lib/chef/provider/package/powershell.rb +1 -1
  145. data/lib/chef/provider/package/rubygems.rb +30 -3
  146. data/lib/chef/provider/package/windows.rb +29 -53
  147. data/lib/chef/provider/package/windows/msi.rb +2 -2
  148. data/lib/chef/provider/package/yum.rb +1 -9
  149. data/lib/chef/provider/package/yum/yum_cache.rb +1 -1
  150. data/lib/chef/provider/package/zypper.rb +0 -1
  151. data/lib/chef/provider/powershell_script.rb +5 -11
  152. data/lib/chef/provider/registry_key.rb +4 -4
  153. data/lib/chef/provider/remote_directory.rb +5 -5
  154. data/lib/chef/provider/remote_file/ftp.rb +3 -2
  155. data/lib/chef/provider/remote_file/local_file.rb +2 -1
  156. data/lib/chef/provider/remote_file/sftp.rb +3 -2
  157. data/lib/chef/provider/route.rb +5 -3
  158. data/lib/chef/provider/ruby_block.rb +1 -1
  159. data/lib/chef/provider/script.rb +2 -2
  160. data/lib/chef/provider/service.rb +8 -8
  161. data/lib/chef/provider/service/aixinit.rb +1 -1
  162. data/lib/chef/provider/service/arch.rb +1 -1
  163. data/lib/chef/provider/service/debian.rb +30 -28
  164. data/lib/chef/provider/service/macosx.rb +16 -10
  165. data/lib/chef/provider/service/systemd.rb +12 -12
  166. data/lib/chef/provider/service/upstart.rb +1 -1
  167. data/lib/chef/provider/service/windows.rb +5 -11
  168. data/lib/chef/provider/subversion.rb +25 -5
  169. data/lib/chef/provider/systemd_unit.rb +26 -25
  170. data/lib/chef/provider/user.rb +6 -6
  171. data/lib/chef/provider/user/aix.rb +1 -1
  172. data/lib/chef/provider/user/dscl.rb +6 -6
  173. data/lib/chef/provider/user/mac.rb +20 -15
  174. data/lib/chef/provider/whyrun_safe_ruby_block.rb +1 -1
  175. data/lib/chef/provider/windows_env.rb +3 -3
  176. data/lib/chef/provider/windows_script.rb +2 -2
  177. data/lib/chef/provider/windows_task.rb +10 -10
  178. data/lib/chef/providers.rb +0 -6
  179. data/lib/chef/recipe.rb +36 -0
  180. data/lib/chef/resource.rb +44 -57
  181. data/lib/chef/resource/action_class.rb +24 -22
  182. data/lib/chef/resource/alternatives.rb +210 -0
  183. data/lib/chef/resource/apt_package.rb +33 -3
  184. data/lib/chef/resource/apt_preference.rb +103 -7
  185. data/lib/chef/resource/apt_repository.rb +357 -18
  186. data/lib/chef/resource/apt_update.rb +58 -5
  187. data/lib/chef/resource/archive_file.rb +6 -5
  188. data/lib/chef/resource/bash.rb +3 -1
  189. data/lib/chef/resource/batch.rb +1 -1
  190. data/lib/chef/resource/bff_package.rb +10 -2
  191. data/lib/chef/resource/breakpoint.rb +1 -2
  192. data/lib/chef/resource/build_essential.rb +49 -51
  193. data/lib/chef/resource/cab_package.rb +9 -2
  194. data/lib/chef/resource/chef_client_cron.rb +228 -0
  195. data/lib/chef/resource/chef_client_scheduled_task.rb +201 -0
  196. data/lib/chef/resource/chef_client_systemd_timer.rb +180 -0
  197. data/lib/chef/resource/chef_gem.rb +15 -18
  198. data/lib/chef/resource/chef_handler.rb +5 -4
  199. data/lib/chef/resource/chef_sleep.rb +7 -5
  200. data/lib/chef/resource/chef_vault_secret.rb +135 -0
  201. data/lib/chef/resource/chocolatey_config.rb +8 -4
  202. data/lib/chef/resource/chocolatey_feature.rb +7 -4
  203. data/lib/chef/resource/chocolatey_package.rb +7 -4
  204. data/lib/chef/resource/chocolatey_source.rb +7 -4
  205. data/lib/chef/resource/cookbook_file.rb +4 -3
  206. data/lib/chef/resource/cron.rb +34 -80
  207. data/lib/chef/resource/cron_access.rb +10 -6
  208. data/lib/chef/resource/cron_d.rb +44 -95
  209. data/lib/chef/resource/csh.rb +3 -1
  210. data/lib/chef/resource/directory.rb +3 -3
  211. data/lib/chef/resource/dmg_package.rb +22 -19
  212. data/lib/chef/resource/dnf_package.rb +3 -4
  213. data/lib/chef/resource/dpkg_package.rb +3 -2
  214. data/lib/chef/resource/dsc_resource.rb +6 -4
  215. data/lib/chef/resource/dsc_script.rb +3 -2
  216. data/lib/chef/resource/execute.rb +15 -14
  217. data/lib/chef/resource/file.rb +14 -9
  218. data/lib/chef/resource/freebsd_package.rb +3 -2
  219. data/lib/chef/resource/gem_package.rb +19 -11
  220. data/lib/chef/resource/group.rb +5 -2
  221. data/lib/chef/resource/helpers/cron_validations.rb +98 -0
  222. data/lib/chef/resource/homebrew_cask.rb +3 -2
  223. data/lib/chef/resource/homebrew_package.rb +5 -3
  224. data/lib/chef/resource/homebrew_tap.rb +3 -2
  225. data/lib/chef/resource/hostname.rb +26 -20
  226. data/lib/chef/resource/http_request.rb +1 -2
  227. data/lib/chef/resource/ifconfig.rb +8 -8
  228. data/lib/chef/resource/ips_package.rb +11 -3
  229. data/lib/chef/resource/kernel_module.rb +30 -30
  230. data/lib/chef/resource/ksh.rb +3 -1
  231. data/lib/chef/resource/launchd.rb +3 -3
  232. data/lib/chef/resource/link.rb +5 -27
  233. data/lib/chef/resource/locale.rb +60 -26
  234. data/lib/chef/resource/log.rb +13 -2
  235. data/lib/chef/resource/lwrp_base.rb +1 -1
  236. data/lib/chef/resource/macos_userdefaults.rb +18 -10
  237. data/lib/chef/resource/macosx_service.rb +3 -2
  238. data/lib/chef/resource/macports_package.rb +10 -2
  239. data/lib/chef/resource/mdadm.rb +63 -3
  240. data/lib/chef/resource/mount.rb +4 -1
  241. data/lib/chef/resource/msu_package.rb +19 -2
  242. data/lib/chef/resource/notify_group.rb +8 -3
  243. data/lib/chef/resource/ohai.rb +20 -4
  244. data/lib/chef/resource/ohai_hint.rb +4 -13
  245. data/lib/chef/resource/openbsd_package.rb +10 -2
  246. data/lib/chef/resource/openssl_dhparam.rb +11 -2
  247. data/lib/chef/resource/openssl_ec_private_key.rb +24 -2
  248. data/lib/chef/resource/openssl_ec_public_key.rb +22 -2
  249. data/lib/chef/resource/openssl_rsa_private_key.rb +21 -2
  250. data/lib/chef/resource/openssl_rsa_public_key.rb +23 -2
  251. data/lib/chef/resource/openssl_x509_certificate.rb +38 -2
  252. data/lib/chef/resource/openssl_x509_crl.rb +13 -2
  253. data/lib/chef/resource/openssl_x509_request.rb +38 -2
  254. data/lib/chef/resource/osx_profile.rb +4 -3
  255. data/lib/chef/resource/package.rb +3 -2
  256. data/lib/chef/resource/pacman_package.rb +3 -2
  257. data/lib/chef/resource/paludis_package.rb +13 -4
  258. data/lib/chef/resource/perl.rb +3 -1
  259. data/lib/chef/resource/plist.rb +207 -0
  260. data/lib/chef/resource/portage_package.rb +14 -4
  261. data/lib/chef/resource/powershell_package.rb +2 -4
  262. data/lib/chef/resource/powershell_package_source.rb +4 -2
  263. data/lib/chef/resource/powershell_script.rb +8 -18
  264. data/lib/chef/resource/python.rb +3 -1
  265. data/lib/chef/resource/reboot.rb +1 -2
  266. data/lib/chef/resource/registry_key.rb +2 -3
  267. data/lib/chef/resource/remote_directory.rb +3 -1
  268. data/lib/chef/resource/remote_file.rb +3 -2
  269. data/lib/chef/resource/rhsm_errata.rb +1 -4
  270. data/lib/chef/resource/rhsm_errata_level.rb +1 -2
  271. data/lib/chef/resource/rhsm_register.rb +3 -3
  272. data/lib/chef/resource/rhsm_repo.rb +4 -3
  273. data/lib/chef/resource/rhsm_subscription.rb +5 -4
  274. data/lib/chef/resource/route.rb +6 -2
  275. data/lib/chef/resource/rpm_package.rb +13 -3
  276. data/lib/chef/resource/ruby.rb +3 -1
  277. data/lib/chef/resource/ruby_block.rb +2 -5
  278. data/lib/chef/resource/scm/_scm.rb +49 -0
  279. data/lib/chef/resource/{scm.rb → scm/git.rb} +16 -30
  280. data/lib/chef/resource/{subversion.rb → scm/subversion.rb} +10 -7
  281. data/lib/chef/resource/script.rb +7 -4
  282. data/lib/chef/resource/service.rb +7 -8
  283. data/lib/chef/resource/smartos_package.rb +10 -2
  284. data/lib/chef/resource/snap_package.rb +4 -2
  285. data/lib/chef/resource/solaris_package.rb +10 -2
  286. data/lib/chef/resource/ssh_known_hosts_entry.rb +6 -3
  287. data/lib/chef/resource/sudo.rb +11 -11
  288. data/lib/chef/resource/support/cron.d.erb +1 -1
  289. data/lib/chef/resource/support/cron_access.erb +1 -1
  290. data/lib/chef/resource/support/sudoer.erb +1 -2
  291. data/lib/chef/resource/support/ulimit.erb +41 -0
  292. data/lib/chef/resource/swap_file.rb +7 -5
  293. data/lib/chef/resource/sysctl.rb +63 -4
  294. data/lib/chef/resource/systemd_unit.rb +6 -4
  295. data/lib/chef/resource/template.rb +0 -1
  296. data/lib/chef/resource/timezone.rb +8 -19
  297. data/lib/chef/resource/user.rb +3 -5
  298. data/lib/chef/resource/user/aix_user.rb +0 -2
  299. data/lib/chef/resource/user/dscl_user.rb +1 -1
  300. data/lib/chef/resource/user/linux_user.rb +0 -2
  301. data/lib/chef/resource/user/mac_user.rb +1 -1
  302. data/lib/chef/resource/user/pw_user.rb +0 -2
  303. data/lib/chef/resource/user/solaris_user.rb +0 -2
  304. data/lib/chef/resource/user/windows_user.rb +0 -2
  305. data/lib/chef/resource/user_ulimit.rb +116 -0
  306. data/lib/chef/resource/whyrun_safe_ruby_block.rb +1 -0
  307. data/lib/chef/resource/windows_ad_join.rb +20 -7
  308. data/lib/chef/resource/windows_auto_run.rb +2 -3
  309. data/lib/chef/resource/windows_certificate.rb +3 -3
  310. data/lib/chef/resource/windows_dfs_folder.rb +1 -2
  311. data/lib/chef/resource/windows_dfs_namespace.rb +1 -2
  312. data/lib/chef/resource/windows_dfs_server.rb +2 -3
  313. data/lib/chef/resource/windows_dns_record.rb +0 -1
  314. data/lib/chef/resource/windows_dns_zone.rb +0 -1
  315. data/lib/chef/resource/windows_env.rb +12 -4
  316. data/lib/chef/resource/windows_feature.rb +59 -4
  317. data/lib/chef/resource/windows_feature_dism.rb +24 -24
  318. data/lib/chef/resource/windows_feature_powershell.rb +44 -78
  319. data/lib/chef/resource/windows_firewall_rule.rb +121 -8
  320. data/lib/chef/resource/windows_font.rb +10 -2
  321. data/lib/chef/resource/windows_package.rb +76 -7
  322. data/lib/chef/resource/windows_pagefile.rb +31 -4
  323. data/lib/chef/resource/windows_path.rb +18 -2
  324. data/lib/chef/resource/windows_printer.rb +26 -7
  325. data/lib/chef/resource/windows_printer_port.rb +29 -2
  326. data/lib/chef/resource/windows_script.rb +3 -4
  327. data/lib/chef/resource/windows_security_policy.rb +119 -0
  328. data/lib/chef/resource/windows_service.rb +46 -32
  329. data/lib/chef/resource/windows_share.rb +22 -6
  330. data/lib/chef/resource/windows_shortcut.rb +13 -3
  331. data/lib/chef/resource/windows_task.rb +129 -16
  332. data/lib/chef/resource/windows_uac.rb +20 -2
  333. data/lib/chef/resource/windows_user_privilege.rb +199 -0
  334. data/lib/chef/resource/windows_workgroup.rb +19 -4
  335. data/lib/chef/resource/yum_package.rb +91 -7
  336. data/lib/chef/resource/yum_repository.rb +30 -12
  337. data/lib/chef/resource/zypper_package.rb +32 -5
  338. data/lib/chef/resource/zypper_repository.rb +19 -6
  339. data/lib/chef/resource_builder.rb +8 -0
  340. data/lib/chef/resource_inspector.rb +3 -2
  341. data/lib/chef/resource_resolver.rb +7 -14
  342. data/lib/chef/resources.rb +11 -3
  343. data/lib/chef/run_context/cookbook_compiler.rb +29 -5
  344. data/lib/chef/scan_access_control.rb +1 -1
  345. data/lib/chef/shell.rb +22 -0
  346. data/lib/chef/shell/ext.rb +1 -1
  347. data/lib/chef/version.rb +1 -1
  348. data/lib/chef/win32/api.rb +2 -2
  349. data/lib/chef/win32/api/error.rb +3 -1
  350. data/lib/chef/win32/api/file.rb +1 -1
  351. data/lib/chef/win32/api/net.rb +1 -0
  352. data/lib/chef/win32/api/security.rb +6 -0
  353. data/lib/chef/win32/file.rb +1 -9
  354. data/lib/chef/win32/mutex.rb +1 -1
  355. data/lib/chef/win32/net.rb +1 -0
  356. data/lib/chef/win32/security.rb +40 -2
  357. data/lib/chef/win32/security/sid.rb +4 -4
  358. data/spec/functional/assets/inittest +8 -7
  359. data/spec/functional/knife/ssh_spec.rb +23 -19
  360. data/spec/functional/resource/cron_spec.rb +10 -29
  361. data/spec/functional/resource/dnf_package_spec.rb +441 -156
  362. data/spec/functional/resource/git_spec.rb +184 -134
  363. data/spec/functional/resource/insserv_spec.rb +1 -1
  364. data/spec/functional/resource/launchd_spec.rb +232 -0
  365. data/spec/functional/resource/link_spec.rb +3 -3
  366. data/spec/functional/resource/locale_spec.rb +13 -2
  367. data/spec/functional/resource/msu_package_spec.rb +5 -2
  368. data/spec/functional/resource/powershell_script_spec.rb +7 -68
  369. data/spec/functional/resource/remote_file_spec.rb +1 -1
  370. data/spec/functional/resource/windows_security_policy_spec.rb +90 -0
  371. data/spec/functional/resource/windows_task_spec.rb +4 -4
  372. data/spec/functional/resource/windows_user_privilege_spec.rb +193 -0
  373. data/spec/functional/run_lock_spec.rb +1 -1
  374. data/spec/functional/shell_spec.rb +1 -1
  375. data/spec/functional/util/powershell/cmdlet_spec.rb +1 -1
  376. data/spec/functional/version_spec.rb +1 -1
  377. data/spec/functional/win32/registry_spec.rb +0 -6
  378. data/spec/functional/win32/security_spec.rb +22 -0
  379. data/spec/integration/client/client_spec.rb +123 -2
  380. data/spec/integration/knife/cookbook_show_spec.rb +28 -26
  381. data/spec/integration/knife/data_bag_show_spec.rb +1 -1
  382. data/spec/integration/knife/raw_spec.rb +34 -6
  383. data/spec/integration/knife/redirection_spec.rb +2 -2
  384. data/spec/integration/knife/show_spec.rb +32 -3
  385. data/spec/integration/recipes/lwrp_inline_resources_spec.rb +3 -3
  386. data/spec/integration/recipes/noop_resource_spec.rb +1 -1
  387. data/spec/integration/recipes/notifies_spec.rb +49 -20
  388. data/spec/integration/recipes/notifying_block_spec.rb +8 -5
  389. data/spec/integration/recipes/provider_choice.rb +2 -0
  390. data/spec/integration/recipes/recipe_dsl_spec.rb +45 -143
  391. data/spec/integration/recipes/resource_action_spec.rb +16 -11
  392. data/spec/integration/recipes/resource_converge_if_changed_spec.rb +1 -1
  393. data/spec/integration/recipes/resource_load_spec.rb +133 -12
  394. data/spec/integration/recipes/use_partial_spec.rb +112 -0
  395. data/spec/integration/solo/solo_spec.rb +3 -3
  396. data/spec/spec_helper.rb +18 -3
  397. data/spec/support/chef_helpers.rb +2 -2
  398. data/spec/support/lib/chef/resource/zen_follower.rb +2 -0
  399. data/spec/support/platform_helpers.rb +2 -20
  400. data/spec/support/recipe_dsl_helper.rb +83 -0
  401. data/spec/support/shared/functional/http.rb +2 -2
  402. data/spec/support/shared/functional/windows_script.rb +3 -16
  403. data/spec/support/shared/integration/knife_support.rb +9 -6
  404. data/spec/support/shared/unit/mock_shellout.rb +1 -1
  405. data/spec/support/shared/unit/provider/useradd_based_user_provider.rb +4 -4
  406. data/spec/unit/application/apply_spec.rb +3 -0
  407. data/spec/unit/application/client_spec.rb +5 -1
  408. data/spec/unit/application_spec.rb +1 -2
  409. data/spec/unit/client_spec.rb +7 -5
  410. data/spec/unit/cookbook/gem_installer_spec.rb +2 -2
  411. data/spec/unit/cookbook/metadata_spec.rb +38 -19
  412. data/spec/unit/data_collector_spec.rb +39 -18
  413. data/spec/unit/file_access_control_spec.rb +1 -1
  414. data/spec/unit/json_compat_spec.rb +1 -1
  415. data/spec/unit/knife/bootstrap/chef_vault_handler_spec.rb +15 -15
  416. data/spec/unit/knife/bootstrap/client_builder_spec.rb +9 -9
  417. data/spec/unit/knife/bootstrap_spec.rb +20 -38
  418. data/spec/unit/knife/cookbook_show_spec.rb +1 -0
  419. data/spec/unit/knife/core/bootstrap_context_spec.rb +23 -43
  420. data/spec/unit/knife/core/ui_spec.rb +16 -0
  421. data/spec/unit/knife/core/windows_bootstrap_context_spec.rb +9 -63
  422. data/spec/unit/knife/data_bag_secret_options_spec.rb +22 -14
  423. data/spec/unit/knife/ssh_spec.rb +8 -111
  424. data/spec/unit/knife/status_spec.rb +1 -1
  425. data/spec/unit/knife_spec.rb +18 -0
  426. data/spec/unit/mixin/openssl_helper_spec.rb +4 -4
  427. data/spec/unit/mixin/powershell_exec_spec.rb +10 -0
  428. data/spec/unit/mixin/shell_out_spec.rb +25 -31
  429. data/spec/unit/node/attribute_spec.rb +3 -3
  430. data/spec/unit/node_spec.rb +24 -0
  431. data/spec/unit/platform/query_helpers_spec.rb +0 -143
  432. data/spec/unit/property/state_spec.rb +12 -7
  433. data/spec/unit/property/validation_spec.rb +25 -1
  434. data/spec/unit/property_spec.rb +12 -9
  435. data/spec/unit/provider/apt_preference_spec.rb +14 -10
  436. data/spec/unit/provider/apt_repository_spec.rb +34 -36
  437. data/spec/unit/provider/apt_update_spec.rb +12 -11
  438. data/spec/unit/provider/cookbook_file_spec.rb +4 -4
  439. data/spec/unit/provider/cron_spec.rb +2 -2
  440. data/spec/unit/provider/directory_spec.rb +4 -15
  441. data/spec/unit/provider/file_spec.rb +4 -4
  442. data/spec/unit/provider/git_spec.rb +41 -1
  443. data/spec/unit/provider/group/groupadd_spec.rb +1 -1
  444. data/spec/unit/provider/launchd_spec.rb +8 -50
  445. data/spec/unit/provider/link_spec.rb +0 -1
  446. data/spec/unit/provider/log_spec.rb +3 -3
  447. data/spec/unit/provider/mdadm_spec.rb +3 -3
  448. data/spec/unit/provider/package/dnf/python_helper_spec.rb +1 -1
  449. data/spec/unit/provider/package/homebrew_spec.rb +280 -174
  450. data/spec/unit/provider/package/pacman_spec.rb +65 -147
  451. data/spec/unit/provider/package/portage_spec.rb +2 -2
  452. data/spec/unit/provider/package/powershell_spec.rb +3 -2
  453. data/spec/unit/provider/package/rubygems_spec.rb +211 -26
  454. data/spec/unit/provider/package/windows/exe_spec.rb +1 -1
  455. data/spec/unit/provider/powershell_script_spec.rb +21 -61
  456. data/spec/unit/provider/remote_file_spec.rb +3 -4
  457. data/spec/unit/provider/service/debian_service_spec.rb +34 -13
  458. data/spec/unit/provider/service/macosx_spec.rb +210 -214
  459. data/spec/unit/provider/service/systemd_service_spec.rb +23 -23
  460. data/spec/unit/provider/subversion_spec.rb +4 -2
  461. data/spec/unit/provider/template_spec.rb +3 -4
  462. data/spec/unit/provider/zypper_repository_spec.rb +17 -17
  463. data/spec/unit/provider_resolver_spec.rb +4 -4
  464. data/spec/unit/recipe_spec.rb +68 -0
  465. data/spec/unit/resource/alternatives_spec.rb +120 -0
  466. data/spec/unit/resource/apt_preference_spec.rb +0 -18
  467. data/spec/unit/resource/apt_repository_spec.rb +0 -18
  468. data/spec/unit/resource/apt_update_spec.rb +0 -18
  469. data/spec/unit/resource/chef_client_cron_spec.rb +119 -0
  470. data/spec/unit/resource/chef_client_scheduled_task_spec.rb +102 -0
  471. data/spec/unit/resource/chef_client_systemd_timer_spec.rb +70 -0
  472. data/spec/unit/resource/chef_vault_secret_spec.rb +40 -0
  473. data/spec/unit/resource/chocolatey_source_spec.rb +2 -1
  474. data/spec/unit/resource/cron_d_spec.rb +6 -48
  475. data/spec/unit/resource/cron_spec.rb +4 -10
  476. data/spec/unit/resource/gem_package_spec.rb +3 -3
  477. data/spec/unit/resource/helpers/cron_validations_spec.rb +77 -0
  478. data/spec/unit/resource/link_spec.rb +0 -4
  479. data/spec/unit/resource/locale_spec.rb +0 -34
  480. data/spec/unit/resource/msu_package_spec.rb +4 -0
  481. data/spec/unit/resource/ohai_spec.rb +56 -2
  482. data/spec/unit/resource/plist_spec.rb +130 -0
  483. data/spec/unit/resource/powershell_script_spec.rb +0 -5
  484. data/spec/unit/resource/{git_spec.rb → scm/git_spec.rb} +50 -2
  485. data/spec/unit/resource/{scm_spec.rb → scm/scm.rb} +1 -52
  486. data/spec/unit/resource/{subversion_spec.rb → scm/subversion_spec.rb} +2 -3
  487. data/spec/unit/resource/service_spec.rb +4 -0
  488. data/spec/unit/resource/user_spec.rb +2 -2
  489. data/spec/unit/resource/user_ulimit_spec.rb +53 -0
  490. data/spec/unit/resource/windows_feature_dism_spec.rb +2 -17
  491. data/spec/unit/resource/windows_feature_powershell_spec.rb +2 -17
  492. data/spec/unit/resource/windows_firewall_rule_spec.rb +88 -41
  493. data/spec/unit/resource/windows_package_spec.rb +14 -0
  494. data/spec/unit/resource/windows_service_spec.rb +9 -0
  495. data/spec/unit/resource_reporter_spec.rb +2 -6
  496. data/spec/unit/resource_spec.rb +10 -3
  497. data/spec/unit/run_lock_spec.rb +1 -1
  498. data/spec/unit/scan_access_control_spec.rb +1 -1
  499. data/spec/unit/search/query_spec.rb +1 -1
  500. data/spec/unit/win32/registry_spec.rb +1 -1
  501. data/tasks/rspec.rb +6 -14
  502. metadata +92 -37
  503. data/lib/chef/dsl/core.rb +0 -52
  504. data/lib/chef/knife/cookbook_site_share.rb +0 -41
  505. data/lib/chef/knife/cookbook_site_unshare.rb +0 -41
  506. data/lib/chef/provider/apt_preference.rb +0 -93
  507. data/lib/chef/provider/apt_repository.rb +0 -358
  508. data/lib/chef/provider/apt_update.rb +0 -79
  509. data/lib/chef/provider/log.rb +0 -43
  510. data/lib/chef/provider/mdadm.rb +0 -85
  511. data/lib/chef/provider/ohai.rb +0 -45
  512. data/lib/chef/resource/git.rb +0 -37
  513. data/spec/unit/provider/ohai_spec.rb +0 -84
@@ -17,18 +17,23 @@
17
17
  #
18
18
 
19
19
  require_relative "../resource"
20
+ require_relative "../http/simple"
21
+ require "tmpdir" unless defined?(Dir.mktmpdir)
22
+ require "addressable" unless defined?(Addressable)
20
23
 
21
24
  class Chef
22
25
  class Resource
23
26
  class AptRepository < Chef::Resource
24
- resource_name :apt_repository
27
+ unified_mode true
28
+
25
29
  provides(:apt_repository) { true }
26
30
 
27
- description "Use the apt_repository resource to specify additional APT repositories. Adding a new repository will update the APT package cache immediately."
31
+ description "Use the **apt_repository** resource to specify additional APT repositories. Adding a new repository will update the APT package cache immediately."
28
32
  introduced "12.9"
29
33
 
30
34
  examples <<~DOC
31
- Add repository with basic settings
35
+ **Add repository with basic settings**:
36
+
32
37
  ```ruby
33
38
  apt_repository 'nginx' do
34
39
  uri 'http://nginx.org/packages/ubuntu/'
@@ -36,29 +41,32 @@ class Chef
36
41
  end
37
42
  ```
38
43
 
39
- Enable Ubuntu multiverse repositories
44
+ **Enable Ubuntu multiverse repositories**:
45
+
40
46
  ```ruby
41
47
  apt_repository 'security-ubuntu-multiverse' do
42
48
  uri 'http://security.ubuntu.com/ubuntu'
43
- distribution 'trusty-security'
49
+ distribution 'xenial-security'
44
50
  components ['multiverse']
45
51
  deb_src true
46
52
  end
47
53
  ```
48
54
 
49
- Add the Nginx PPA, autodetect the key and repository url
55
+ **Add the Nginx PPA, autodetect the key and repository url**:
56
+
50
57
  ```ruby
51
58
  apt_repository 'nginx-php' do
52
59
  uri 'ppa:nginx/stable'
53
60
  end
54
61
  ```
55
62
 
56
- Add the JuJu PPA, grab the key from the keyserver, and add source repo
63
+ **Add the JuJu PPA, grab the key from the keyserver, and add source repo**:
64
+
57
65
  ```ruby
58
66
  apt_repository 'juju' do
59
67
  uri 'http://ppa.launchpad.net/juju/stable/ubuntu'
60
68
  components ['main']
61
- distribution 'trusty'
69
+ distribution 'xenial'
62
70
  key 'C8068B11'
63
71
  keyserver 'keyserver.ubuntu.com'
64
72
  action :add
@@ -66,7 +74,8 @@ class Chef
66
74
  end
67
75
  ```
68
76
 
69
- Add repository that requires multiple keys to authenticate packages
77
+ **Add repository that requires multiple keys to authenticate packages**:
78
+
70
79
  ```ruby
71
80
  apt_repository 'rundeck' do
72
81
  uri 'https://dl.bintray.com/rundeck/rundeck-deb'
@@ -77,18 +86,20 @@ class Chef
77
86
  end
78
87
  ```
79
88
 
80
- Add the Cloudera Repo of CDH4 packages for Ubuntu 12.04 on AMD64
89
+ **Add the Cloudera Repo of CDH4 packages for Ubuntu 16.04 on AMD64**:
90
+
81
91
  ```ruby
82
92
  apt_repository 'cloudera' do
83
- uri 'http://archive.cloudera.com/cdh4/ubuntu/precise/amd64/cdh'
93
+ uri 'http://archive.cloudera.com/cdh4/ubuntu/xenial/amd64/cdh'
84
94
  arch 'amd64'
85
- distribution 'precise-cdh4'
95
+ distribution 'xenial-cdh4'
86
96
  components ['contrib']
87
97
  key 'http://archive.cloudera.com/debian/archive.key'
88
98
  end
89
99
  ```
90
100
 
91
- Remove a repository from the list
101
+ **Remove a repository from the list**:
102
+
92
103
  ```ruby
93
104
  apt_repository 'zenoss' do
94
105
  action :remove
@@ -111,15 +122,15 @@ class Chef
111
122
  description: "The base of the Debian distribution."
112
123
 
113
124
  property :distribution, [ String, nil, FalseClass ],
114
- description: "Usually a distribution's codename, such as trusty, xenial or bionic. Default value: the codename of the node's distro.",
115
- default: lazy { node["lsb"]["codename"] }, default_description: "The LSB codename of the host such as 'bionic'."
125
+ description: "Usually a distribution's codename, such as `xenial`, `bionic`, or `focal`.",
126
+ default: lazy { node["lsb"]["codename"] }, default_description: "The LSB codename of the node such as 'focal'."
116
127
 
117
128
  property :components, Array,
118
129
  description: "Package groupings, such as 'main' and 'stable'.",
119
- default: lazy { [] }
130
+ default: lazy { [] }, default_description: "`main` if using a PPA repository."
120
131
 
121
132
  property :arch, [String, nil, FalseClass],
122
- description: "Constrain packages to a particular CPU architecture such as 'i386' or 'amd64'."
133
+ description: "Constrain packages to a particular CPU architecture such as `i386` or `amd64`."
123
134
 
124
135
  property :trusted, [TrueClass, FalseClass],
125
136
  description: "Determines whether you should treat all packages from this repository as authenticated regardless of signature.",
@@ -138,7 +149,7 @@ class Chef
138
149
  default: lazy { [] }, coerce: proc { |x| x ? Array(x) : x }
139
150
 
140
151
  property :key_proxy, [String, nil, FalseClass],
141
- description: "If set, a specified proxy is passed to GPG via http-proxy=."
152
+ description: "If set, a specified proxy is passed to GPG via `http-proxy=`."
142
153
 
143
154
  property :cookbook, [String, nil, FalseClass],
144
155
  description: "If key should be a cookbook_file, specify a cookbook where the key is located for files/default. Default value is nil, so it will use the cookbook where the resource is used.",
@@ -150,6 +161,334 @@ class Chef
150
161
 
151
162
  default_action :add
152
163
  allowed_actions :add, :remove
164
+
165
+ action_class do
166
+ LIST_APT_KEY_FINGERPRINTS = %w{apt-key adv --list-public-keys --with-fingerprint --with-colons}.freeze
167
+
168
+ # is the provided ID a key ID from a keyserver. Looks at length and HEX only values
169
+ # @param [String] id the key value passed by the user that *may* be an ID
170
+ def is_key_id?(id)
171
+ id = id[2..-1] if id.start_with?("0x")
172
+ id =~ /^\h+$/ && [8, 16, 40].include?(id.length)
173
+ end
174
+
175
+ # run the specified command and extract the fingerprints from the output
176
+ # accepts a command so it can be used to extract both the current key's fingerprints
177
+ # and the fingerprint of the new key
178
+ # @param [Array<String>] cmd the command to run
179
+ #
180
+ # @return [Array] an array of fingerprints
181
+ def extract_fingerprints_from_cmd(*cmd)
182
+ so = shell_out(*cmd)
183
+ so.stdout.split(/\n/).map do |t|
184
+ if z = t.match(/^fpr:+([0-9A-F]+):/)
185
+ z[1].split.join
186
+ end
187
+ end.compact
188
+ end
189
+
190
+ # validate the key against the apt keystore to see if that version is expired
191
+ # @param [String] key
192
+ #
193
+ # @return [Boolean] is the key valid or not
194
+ def key_is_valid?(key)
195
+ valid = true
196
+
197
+ so = shell_out("apt-key", "list")
198
+ so.stdout.split(/\n/).map do |t|
199
+ if t =~ %r{^\/#{key}.*\[expired: .*\]$}
200
+ logger.debug "Found expired key: #{t}"
201
+ valid = false
202
+ break
203
+ end
204
+ end
205
+
206
+ logger.debug "key #{key} #{valid ? "is valid" : "is not valid"}"
207
+ valid
208
+ end
209
+
210
+ # return the specified cookbook name or the cookbook containing the
211
+ # resource.
212
+ #
213
+ # @return [String] name of the cookbook
214
+ def cookbook_name
215
+ new_resource.cookbook || new_resource.cookbook_name
216
+ end
217
+
218
+ # determine if a cookbook file is available in the run
219
+ # @param [String] fn the path to the cookbook file
220
+ #
221
+ # @return [Boolean] cookbook file exists or doesn't
222
+ def has_cookbook_file?(fn)
223
+ run_context.has_cookbook_file_in_cookbook?(cookbook_name, fn)
224
+ end
225
+
226
+ # determine if there are any new keys by comparing the fingerprints of installed
227
+ # keys to those of the passed file
228
+ # @param [String] file the keyfile of the new repository
229
+ #
230
+ # @return [Boolean] true: no new keys in the file. false: there are new keys
231
+ def no_new_keys?(file)
232
+ # Now we are using the option --with-colons that works across old os versions
233
+ # as well as the latest (16.10). This for both `apt-key` and `gpg` commands
234
+ installed_keys = extract_fingerprints_from_cmd(*LIST_APT_KEY_FINGERPRINTS)
235
+ proposed_keys = extract_fingerprints_from_cmd("gpg", "--with-fingerprint", "--with-colons", file)
236
+ (installed_keys & proposed_keys).sort == proposed_keys.sort
237
+ end
238
+
239
+ # Given the provided key URI determine what kind of chef resource we need
240
+ # to fetch the key
241
+ # @param [String] uri the uri of the gpg key (local path or http URL)
242
+ #
243
+ # @raise [Chef::Exceptions::FileNotFound] Key isn't remote or found in the current run
244
+ #
245
+ # @return [Symbol] :remote_file or :cookbook_file
246
+ def key_type(uri)
247
+ if uri.start_with?("http")
248
+ :remote_file
249
+ elsif has_cookbook_file?(uri)
250
+ :cookbook_file
251
+ else
252
+ raise Chef::Exceptions::FileNotFound, "Cannot locate key file: #{uri}"
253
+ end
254
+ end
255
+
256
+ # Fetch the key using either cookbook_file or remote_file, validate it,
257
+ # and install it with apt-key add
258
+ # @param [String] key the key to install
259
+ #
260
+ # @raise [RuntimeError] Invalid key which can't verify the apt repository
261
+ #
262
+ # @return [void]
263
+ def install_key_from_uri(key)
264
+ key_name = key.gsub(/[^0-9A-Za-z\-]/, "_")
265
+ cached_keyfile = ::File.join(Chef::Config[:file_cache_path], key_name)
266
+ tmp_dir = Dir.mktmpdir(".gpg")
267
+ at_exit { FileUtils.remove_entry(tmp_dir) }
268
+
269
+ declare_resource(key_type(key), cached_keyfile) do
270
+ source key
271
+ mode "0644"
272
+ sensitive new_resource.sensitive
273
+ action :create
274
+ verify "gpg --homedir #{tmp_dir} %{path}"
275
+ end
276
+
277
+ execute "apt-key add #{cached_keyfile}" do
278
+ command [ "apt-key", "add", cached_keyfile ]
279
+ default_env true
280
+ sensitive new_resource.sensitive
281
+ action :run
282
+ not_if { no_new_keys?(cached_keyfile) }
283
+ notifies :run, "execute[apt-cache gencaches]", :immediately
284
+ end
285
+ end
286
+
287
+ # build the apt-key command to install the keyserver
288
+ # @param [String] key the key to install
289
+ # @param [String] keyserver the key server to use
290
+ #
291
+ # @return [String] the full apt-key command to run
292
+ def keyserver_install_cmd(key, keyserver)
293
+ cmd = "apt-key adv --no-tty --recv"
294
+ cmd << " --keyserver-options http-proxy=#{new_resource.key_proxy}" if new_resource.key_proxy
295
+ cmd << " --keyserver "
296
+ cmd << if keyserver.start_with?("hkp://")
297
+ keyserver
298
+ else
299
+ "hkp://#{keyserver}:80"
300
+ end
301
+
302
+ cmd << " #{key}"
303
+ cmd
304
+ end
305
+
306
+ # @param [String] key
307
+ # @param [String] keyserver
308
+ #
309
+ # @raise [RuntimeError] Invalid key which can't verify the apt repository
310
+ #
311
+ # @return [void]
312
+ def install_key_from_keyserver(key, keyserver = new_resource.keyserver)
313
+ execute "install-key #{key}" do
314
+ command keyserver_install_cmd(key, keyserver)
315
+ default_env true
316
+ sensitive new_resource.sensitive
317
+ not_if do
318
+ present = extract_fingerprints_from_cmd(*LIST_APT_KEY_FINGERPRINTS).any? do |fp|
319
+ fp.end_with? key.upcase
320
+ end
321
+ present && key_is_valid?(key.upcase)
322
+ end
323
+ notifies :run, "execute[apt-cache gencaches]", :immediately
324
+ end
325
+
326
+ raise "The key #{key} is invalid and cannot be used to verify an apt repository." unless key_is_valid?(key.upcase)
327
+ end
328
+
329
+ # @param [String] owner
330
+ # @param [String] repo
331
+ #
332
+ # @raise [RuntimeError] Could not access the Launchpad PPA API
333
+ #
334
+ # @return [void]
335
+ def install_ppa_key(owner, repo)
336
+ url = "https://launchpad.net/api/1.0/~#{owner}/+archive/#{repo}"
337
+ key_id = Chef::HTTP::Simple.new(url).get("signing_key_fingerprint").delete('"')
338
+ install_key_from_keyserver(key_id, "keyserver.ubuntu.com")
339
+ rescue Net::HTTPClientException => e
340
+ raise "Could not access Launchpad ppa API: #{e.message}"
341
+ end
342
+
343
+ # determine if the repository URL is a PPA
344
+ # @param [String] url the url of the repository
345
+ #
346
+ # @return [Boolean] is the repo URL a PPA
347
+ def is_ppa_url?(url)
348
+ url.start_with?("ppa:")
349
+ end
350
+
351
+ # determine the repository's components:
352
+ # - "components" property if defined
353
+ # - "main" if "components" not defined and the repo is a PPA URL
354
+ # - otherwise nothing
355
+ #
356
+ # @return [String] the repository component
357
+ def repo_components
358
+ if is_ppa_url?(new_resource.uri) && new_resource.components.empty?
359
+ "main"
360
+ else
361
+ new_resource.components
362
+ end
363
+ end
364
+
365
+ # given a PPA return a PPA URL in http://ppa.launchpad.net format
366
+ # @param [String] ppa the ppa URL
367
+ #
368
+ # @return [String] full PPA URL
369
+ def make_ppa_url(ppa)
370
+ owner, repo = ppa[4..-1].split("/")
371
+ repo ||= "ppa"
372
+
373
+ install_ppa_key(owner, repo)
374
+ "http://ppa.launchpad.net/#{owner}/#{repo}/ubuntu"
375
+ end
376
+
377
+ # build complete repo text that will be written to the config
378
+ # @param [String] uri
379
+ # @param [Array] components
380
+ # @param [Boolean] trusted
381
+ # @param [String] arch
382
+ # @param [Boolean] add_src
383
+ #
384
+ # @return [String] complete repo config text
385
+ def build_repo(uri, distribution, components, trusted, arch, add_src = false)
386
+ uri = make_ppa_url(uri) if is_ppa_url?(uri)
387
+
388
+ uri = Addressable::URI.parse(uri)
389
+ components = Array(components).join(" ")
390
+ options = []
391
+ options << "arch=#{arch}" if arch
392
+ options << "trusted=yes" if trusted
393
+ optstr = unless options.empty?
394
+ "[" + options.join(" ") + "]"
395
+ end
396
+ info = [ optstr, uri.normalize.to_s, distribution, components ].compact.join(" ")
397
+ repo = "deb #{info}\n"
398
+ repo << "deb-src #{info}\n" if add_src
399
+ repo
400
+ end
401
+
402
+ # clean up a potentially legacy file from before we fixed the usage of
403
+ # new_resource.name vs. new_resource.repo_name. We might have the
404
+ # name.list file hanging around and need to clean it up.
405
+ #
406
+ # @return [void]
407
+ def cleanup_legacy_file!
408
+ legacy_path = "/etc/apt/sources.list.d/#{new_resource.name}.list"
409
+ if new_resource.name != new_resource.repo_name && ::File.exist?(legacy_path)
410
+ converge_by "Cleaning up legacy #{legacy_path} repo file" do
411
+ file legacy_path do
412
+ action :delete
413
+ # Not triggering an update since it isn't super likely to be needed.
414
+ end
415
+ end
416
+ end
417
+ end
418
+ end
419
+
420
+ action :add do
421
+ return unless debian?
422
+
423
+ execute "apt-cache gencaches" do
424
+ command %w{apt-cache gencaches}
425
+ default_env true
426
+ ignore_failure true
427
+ action :nothing
428
+ end
429
+
430
+ apt_update new_resource.name do
431
+ ignore_failure true
432
+ action :nothing
433
+ end
434
+
435
+ if new_resource.key.nil?
436
+ logger.debug "No 'key' property specified skipping key import"
437
+ else
438
+ new_resource.key.each do |k|
439
+ if is_key_id?(k) && !has_cookbook_file?(k)
440
+ install_key_from_keyserver(k)
441
+ else
442
+ install_key_from_uri(k)
443
+ end
444
+ end
445
+ end
446
+
447
+ cleanup_legacy_file!
448
+
449
+ repo = build_repo(
450
+ new_resource.uri,
451
+ new_resource.distribution,
452
+ repo_components,
453
+ new_resource.trusted,
454
+ new_resource.arch,
455
+ new_resource.deb_src
456
+ )
457
+
458
+ file "/etc/apt/sources.list.d/#{new_resource.repo_name}.list" do
459
+ owner "root"
460
+ group "root"
461
+ mode "0644"
462
+ content repo
463
+ sensitive new_resource.sensitive
464
+ action :create
465
+ notifies :run, "execute[apt-cache gencaches]", :immediately
466
+ notifies :update, "apt_update[#{new_resource.name}]", :immediately if new_resource.cache_rebuild
467
+ end
468
+ end
469
+
470
+ action :remove do
471
+ return unless debian?
472
+
473
+ cleanup_legacy_file!
474
+ if ::File.exist?("/etc/apt/sources.list.d/#{new_resource.repo_name}.list")
475
+ converge_by "Removing #{new_resource.repo_name} repository from /etc/apt/sources.list.d/" do
476
+ apt_update new_resource.name do
477
+ ignore_failure true
478
+ action :nothing
479
+ end
480
+
481
+ file "/etc/apt/sources.list.d/#{new_resource.repo_name}.list" do
482
+ sensitive new_resource.sensitive
483
+ action :delete
484
+ notifies :update, "apt_update[#{new_resource.name}]", :immediately if new_resource.cache_rebuild
485
+ end
486
+ end
487
+ else
488
+ logger.trace("/etc/apt/sources.list.d/#{new_resource.repo_name}.list does not exist. Nothing to do")
489
+ end
490
+ end
491
+
153
492
  end
154
493
  end
155
494
  end